diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b48136d2081..4aca50e70c7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,8 +1,8 @@ # This list auto requests reviews from the specified org members # when a PR that modifies the file in question is opened -# This list is alphabetized by User -> Filename KEEP IT THAT WAY -# In the event that multiple org members are to be informed of changes -# to the same file or dir, add them to the end under Multiple Owners +# This list is alphabetized by User -> Filename and separated into sections for Maintainers/Contributors KEEP IT THAT WAY +# In the event that people are to be informed of changes +# to the same file or dir, add them to the end of under Multiple Owners # EspeciallyStrange code/modules/projectiles/ @projectkepler-ru diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 10e6ea35b7f..f140c48a335 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -98,13 +98,13 @@ Our team is entirely voluntary, as such we extend our thanks to maintainers, iss ## Development Guides -#### Writing readable code +#### Writing readable code [Style guide](./guides/STYLE.md) -#### Writing sane code +#### Writing sane code [Code standards](./guides/STANDARDS.md) -#### Writing understandable code +#### Writing understandable code [Autodocumenting code](./guides/AUTODOC.md) #### Misc @@ -136,8 +136,6 @@ There is no strict process when it comes to merging pull requests. Pull requests * If your pull request is accepted, the code you add no longer belongs exclusively to you but to everyone; everyone is free to work on it, but you are also free to support or object to any changes being made, which will likely hold more weight, as you're the one who added the feature. It is a shame this has to be explicitly said, but there have been cases where this would've saved some trouble. -* Please explain why you are submitting the pull request, and how you think your change will be beneficial to the game. Failure to do so will be grounds for rejecting the PR. - * If your pull request is not finished, you may open it as a draft for potential review. If you open it as a full-fledged PR make sure it is at least testable in a live environment. Pull requests that do not at least meet this requirement will be closed. You may request a maintainer reopen the pull request when you're ready, or make a new one. * While we have no issue helping contributors (and especially new contributors) bring reasonably sized contributions up to standards via the pull request review process, larger contributions are expected to pass a higher bar of completeness and code quality *before* you open a pull request. Maintainers may close such pull requests that are deemed to be substantially flawed. You should take some time to discuss with maintainers or other contributors on how to improve the changes. @@ -145,6 +143,22 @@ There is no strict process when it comes to merging pull requests. Pull requests * After leaving reviews on an open pull request, maintainers may convert it to a draft. Once you have addressed all their comments to the best of your ability, feel free to mark the pull as `Ready for Review` again. * **Pull requests that include sprites must have in-game screenshots that were taken on your own test-server in the PR body.** For instance, if you're adding new clothes, a screenshot of those clothes being worn is expected in the PR body. Not every single direction needs to be displayed, but each icon that's actually being used in-game should be showcased. +## Justifying Your Changes + +You must explain why you are submitting the pull request in the "Why It's Good For The Game" section of your pull request, and how you think your change will be beneficial to the game. Failure to do so will be grounds for rejecting your pull request wholesale, or requiring that you fix it before your pull request is merged. A reasonable justification for your changes is a requirement. + +Your "How This Contributes To The Skyrat Roleplay Experience" section must make a good faith and reasonable attempt to: +* Assert and argue that the current state of affairs in the game is not good, and needs changing. +* Assert and argue that your pull request will either fix or help fix the problems you described. +* Assert and argue that any downsides introduced by your solution as a matter of design, if any, are worth it, and why they are worth it. + +More controversial changes have higher standards for justification to be considered reasonable. A bugfix for example does not typically require any effort at all in justification as its value to the game is usually self evident, however a major feature overhaul or balance change may require significant explanation to adequately justify its supposed benefit to the game. + +This is still a requirement if your pull request is supported and/or requested by maintainers before it is opened. This is still a requirement if your pull request is supported and/or requested by head coders before it is opened. The purpose of arguing for your changes is not to convince just the maintainer team of its merits, it is to document the "why" behind your changes to the game to a necessary level of detail. The reason behind a change must exist as it is the purpose of this codebase to improve the game, thus said reasoning must be adequately stated and explained. + +This is also still a requirement if your pull request has a corresponding design document that justifies your changes inside it. You must always properly justify changes (those that actually need justification) within the pull request, even if you also do it elsewhere. This is to ensure that: +1. All reviewers can easily see the reasoning behind your changes on the pull request itself, no reliance on other sites required. +2. The actual, manifested implementation of the idea behind the design document is being justified after said implementation is actually realized. This is in contrast to any reasoning put on the design document itself, which very well may have been made before any work was done on it, possibly even by an author different from the author of the pull request. Any idea in the design document may have had compromises put into it due to complications not seen in the original vision, thus the current state of the implementation (the pull request as it stands) must be defended, explained, and ultimately justified in and of itself. Of course, you should still list the design document the pull request is implementing, and may even use arguments from the design document if said arguments are applicable to the current reality of your proposed changes. ## Good Boy Points @@ -158,7 +172,7 @@ Negative GBP increases the likelihood of a maintainer closing your PR. With that There is no benefit to having a higher positive GBP score, since GBP only comes into consideration when it is negative. -You can see each tag and their GBP values [Here](https://github.com/tgstation/tgstation/blob/master/.github/gbp.toml). +You can see each tag and their GBP values [Here](https://github.com/tgstation/tgstation/blob/master/.github/gbp.toml). ## Porting features/sprites/sounds/tools from other codebases diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 472bd39a977..84504848a1d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -16,7 +16,7 @@
Screenshots/Videos - +
## Changelog diff --git a/.github/gbp.toml b/.github/gbp.toml index fe086e79b55..fd52ca827a1 100644 --- a/.github/gbp.toml +++ b/.github/gbp.toml @@ -23,3 +23,4 @@ reset_label = "GBP: Reset" "Sound" = 3 "Sprites" = 3 "Unit Tests" = 6 +"Wallening Revert Recovery" = 10 diff --git a/.github/guides/RUNNING_A_SERVER.md b/.github/guides/RUNNING_A_SERVER.md index 095c33d2071..a1b43e2bb2a 100644 --- a/.github/guides/RUNNING_A_SERVER.md +++ b/.github/guides/RUNNING_A_SERVER.md @@ -4,7 +4,7 @@ BYOND installed. You can get it from https://www.byond.com/download. Once you've that, extract the game files to wherever you want to keep them. This is a sourcecode-only release, so the next step is to compile the server files. -Double-click `BUILD.bat` in the root directory of the source code. This'll take +Double-click `BUILD.cmd` in the root directory of the source code. This'll take a little while, and if everything's done right you'll get a message like this: ``` diff --git a/.github/guides/STYLE.md b/.github/guides/STYLE.md index c9b284bd338..349933f38bf 100644 --- a/.github/guides/STYLE.md +++ b/.github/guides/STYLE.md @@ -27,23 +27,6 @@ Do not use tabs/spaces for indentation in the middle of a code line. Not only is #define SPECIES_FELINID "felinid" ``` -### Comments - -You mustn't use box comments as headers for code, nor for anything else. -While it may be slightly more aesthetically pleasing, it can cause problems with auto-documentation and makes it far harder to add anything after the fact. -It's much easier to stick down a new line than have to balance a bunch of whitespaces and forward slashes. - -```dm -////////////////////////////////// -// BAD. DON'T DO THIS. STOP IT. // -////////////////////////////////// - -/* -* GOOD! -* CONTINUE TO DO THIS -*/ -``` - ### Control statements (if, while, for, etc) @@ -457,7 +440,7 @@ Pop-quiz, what does this do? give_pizza(TRUE, 2) ``` -Well, obviously the `TRUE` makes the pizza hot, and `2` is the number of toppings. +Well, obviously the `TRUE` makes the pizza hot, and `2` is the number of toppings. Code like this can be very difficult to read, especially since our LSP does not show argument names at this time. Because of this, you should prefer to use named arguments where the meaning is not otherwise obvious. @@ -607,7 +590,7 @@ This is [a real bug that tends to come up](https://github.com/tgstation/tgstatio The same goes for arguments passed to a macro... ``` -// Guarantee +// Guarantee #define CALCULATE_TEMPERATURE(base) (T20C + (##base)) ``` diff --git a/.github/guides/VISUALS.md b/.github/guides/VISUALS.md index a56d9f17677..69194004d4c 100644 --- a/.github/guides/VISUALS.md +++ b/.github/guides/VISUALS.md @@ -367,6 +367,8 @@ You can actually force it to use a particular mob's sight to avoid aspects of th - [Table of Contents](#table-of-contents) - [Reference Entry](https://www.byond.com/docs/ref/#/mob/var/see_in_dark) +`/mob/var/see_in_dark` sets the radius of a square around the mob that cuts out BYOND darkness. + This is why when you stand in darkness you can see yourself, and why you can see a line of objects appear when you use mesons (horrible effect btw). It's quite simple, but worth describing. diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml index 82d164e0c7c..740b5d7d9eb 100644 --- a/.github/workflows/autowiki.yml +++ b/.github/workflows/autowiki.yml @@ -26,7 +26,7 @@ jobs: uses: actions/cache@v4 with: path: ~/BYOND - key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }} + key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} - 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 6463ccb4c2c..fcf44d00558 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -13,21 +13,35 @@ on: merge_group: branches: - master + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: - run_linters: + start_gate: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + name: Start Gate + runs-on: ubuntu-latest + steps: + - name: Mandatory Empty Step + run: exit 0 + + run_linters: name: Run Linters + needs: start_gate runs-on: ubuntu-22.04 - concurrency: - group: run_linters-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + timeout-minutes: 5 + steps: - uses: actions/checkout@v4 - name: Restore SpacemanDMM cache uses: actions/cache@v4 with: path: ~/SpacemanDMM - key: ${{ runner.os }}-spacemandmm + key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }} + restore-keys: | + ${{ runner.os }}-spacemandmm- - name: Restore Yarn cache uses: actions/cache@v4 with: @@ -53,33 +67,39 @@ jobs: uses: actions/cache@v4 with: path: ~/.cargo - key: ${{ runner.os }}-rust + key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}} + restore-keys: | + ${{ runner.os }}-rust- - name: Restore Cutter cache uses: actions/cache@v4 with: path: tools/icon_cutter/cache key: ${{ runner.os }}-cutter-${{ hashFiles('dependencies.sh') }} + - name: Install OpenDream + uses: robinraju/release-downloader@v1.9 + with: + repository: "OpenDreamProject/OpenDream" + tag: "latest" + fileName: "DMCompiler_linux-x64.tar.gz" + extract: true - name: Install Tools run: | pip3 install setuptools bash tools/ci/install_node.sh bash tools/ci/install_spaceman_dmm.sh dreamchecker - cargo install ripgrep --features pcre2 + bash tools/ci/install_ripgrep.sh 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 - bash skyrat/tools/skyrat_check_grep.sh # SKYRAT EDIT ADDITION - checking modular_skyrat code + run: bash tools/ci/check_grep.sh - name: Ticked File Enforcement if: steps.linter-setup.conclusion == 'success' && !cancelled() run: | 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 - tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/modular_skyrat.json # SKYRAT EDIT ADDITION - modular tick enforcement - name: Check Define Sanity if: steps.linter-setup.conclusion == 'success' && !cancelled() run: tools/bootstrap/python -m define_sanity.check @@ -90,6 +110,9 @@ jobs: if: steps.linter-setup.conclusion == 'success' && !cancelled() shell: bash run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh + - 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: | @@ -115,20 +138,18 @@ jobs: run: tools/build/build --ci lint tgui-test compile_all_maps: - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Compile Maps - needs: [collect_data] + needs: collect_data runs-on: ubuntu-22.04 - concurrency: - group: compile_all_maps-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + timeout-minutes: 5 + steps: - uses: actions/checkout@v4 - name: Restore BYOND cache uses: actions/cache@v4 with: path: ~/BYOND - key: ${{ runner.os }}-byond + key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} - name: Compile All Maps run: | bash tools/ci/install_byond.sh @@ -141,16 +162,15 @@ jobs: max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}} collect_data: - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Collect data for other tasks + needs: start_gate runs-on: ubuntu-22.04 + timeout-minutes: 5 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 - name: Find Maps @@ -172,32 +192,28 @@ jobs: echo "max_required_byond_client=$(grep -Ev '^[[:blank:]]{0,}#{1,}|^[[:blank:]]{0,}$' .github/max_required_byond_client.txt | tail -n1)" >> $GITHUB_OUTPUT run_all_tests: - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Integration Tests - needs: [collect_data] + 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.find_all_maps.outputs.alternate_tests != '[]' ) + if: needs.collect_data.outputs.alternate_tests != '[]' name: Alternate Tests - needs: [collect_data] + 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,18 +221,11 @@ jobs: minor: ${{ matrix.setup.minor }} 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.find_all_maps.outputs.alternate_tests != '[]' ) - name: Check Alternate Tests - needs: [run_alternate_tests] - runs-on: ubuntu-22.04 - steps: - - run: echo Alternate tests passed. - compare_screenshots: - if: ( !contains(github.event.head_commit.message, '[ci skip]') && (success() || failure()) ) - needs: [run_all_tests, run_alternate_tests] + if: needs.collect_data.outputs.alternate_tests == '[]' || needs.run_alternate_tests.result == 'success' + needs: [ collect_data, run_all_tests, run_alternate_tests ] name: Compare Screenshot Tests + timeout-minutes: 15 runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -251,13 +260,11 @@ jobs: path: artifacts/screenshot_comparisons test_windows: - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Windows Build needs: [collect_data] runs-on: windows-latest - concurrency: - group: test_windows-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + timeout-minutes: 5 + steps: - uses: actions/checkout@v4 - name: Restore Yarn cache @@ -276,3 +283,11 @@ jobs: with: dmb-location: tgstation.dmb max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}} + + completion_gate: # Serves as a non-moving target for branch rulesets + name: Completion Gate + needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ] + runs-on: ubuntu-latest + steps: + - name: Mandatory Empty Step + run: exit 0 diff --git a/.github/workflows/codeowner_reviews.yml b/.github/workflows/codeowner_reviews.yml index a9e78b35136..e6cfb980279 100644 --- a/.github/workflows/codeowner_reviews.yml +++ b/.github/workflows/codeowner_reviews.yml @@ -1,19 +1,23 @@ name: Codeowner Reviews # Controls when the workflow will run -on: pull_request_target +on: + pull_request_target: + types: [opened, synchronize, reopened, ready_for_review] 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 - #Parse the Codeowner file + #Parse the Codeowner file on non draft PRs - name: CodeOwnersParser + if: github.event.pull_request.draft == false id: CodeOwnersParser uses: tgstation/CodeOwnersParser@v1 diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index daf078d2d4c..6daec1ded10 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -1,10 +1,8 @@ name: Docker Build - on: - push: - branches: - - master - + schedule: + - cron: "19 1 * * *" + workflow_dispatch: jobs: publish: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index e2234ca7ee0..2ffef722183 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -1,11 +1,10 @@ name: Generate documentation on: - push: - branches: - - master + schedule: + - cron: "44 */6 * * *" + workflow_dispatch: permissions: contents: read - jobs: generate_documentation: permissions: diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 368430162d3..3485b90d474 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -16,9 +16,11 @@ on: max_required_byond_client: required: true type: string + jobs: run_integration_tests: runs-on: ubuntu-latest + timeout-minutes: 15 services: mysql: image: mysql:latest @@ -33,7 +35,7 @@ jobs: uses: actions/cache@v4 with: path: ~/BYOND - key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }} + key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} - name: Setup database run: | sudo systemctl start mysql @@ -44,9 +46,9 @@ jobs: - name: Install rust-g run: | bash tools/ci/install_rust_g.sh - - name: Install auxlua + - name: Install dreamluau run: | - bash tools/ci/install_auxlua.sh + bash tools/ci/install_dreamluau.sh - name: Configure version run: | echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV @@ -57,7 +59,7 @@ jobs: run: | bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup - tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -WError -NWTG0001 + tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werror -ITG0001 -I"loop_checks" - name: Run Tests run: | source $HOME/BYOND/byond/bin/byondsetup diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index 15d45b7935f..232c02c0ecb 100644 --- a/.github/workflows/update_tgs_dmapi.yml +++ b/.github/workflows/update_tgs_dmapi.yml @@ -21,6 +21,7 @@ jobs: - name: Apply DMAPI update uses: tgstation/tgs-dmapi-updater@v2 + id: dmapi-update with: header-path: 'code/__DEFINES/tgs.dm' library-path: 'code/modules/tgs' @@ -28,8 +29,8 @@ jobs: - name: Commit and Push continue-on-error: true run: | - git config user.name tgstation-server - git config user.email tgstation-server@users.noreply.github.com + git config user.name "tgstation-server-ci[bot]" + git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com" git add . git commit -m 'Update TGS DMAPI' git push -f -u origin tgs-dmapi-update @@ -41,7 +42,7 @@ jobs: source_branch: "tgs-dmapi-update" destination_branch: "master" pr_title: "Automatic TGS DMAPI Update" - pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging." + pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging.\n\n${{ steps.dmapi-update.outputs.release-notes }}" pr_label: "Tools" pr_allow_empty: false github_token: ${{ secrets.COMFY_ORANGE_PAT }} diff --git a/.gitignore b/.gitignore index 7889e8a6cf7..f4771f2ef16 100644 --- a/.gitignore +++ b/.gitignore @@ -211,16 +211,13 @@ Temporary Items /tools/tgs_test/bin/* /tools/tgs_test/obj/* -# Autowiki -/tools/autowiki/node_modules - # TGUI bundles - SKYRAT EDIT /tgui/public/tgui-common.bundle.js # Built auxtools libraries and intermediate files aux*.dll libaux*.so -aux*.pdb +*.pdb # byond-tracy, we intentionally do not ship this and do not want to maintain it # https://github.com/mafemergency/byond-tracy/ @@ -248,6 +245,7 @@ define_sanity_output.txt /db/ /config/ezdb.txt <<<<<<< HEAD +<<<<<<< HEAD ======= # Running OpenDream locally @@ -257,3 +255,8 @@ tgstation.json >>>>>>> 5d81843b3302 (Raptor faction fix (#85792)) ======= >>>>>>> 8fa9db8869f0 (Reverts accidental .gitignore changes (#86114)) +======= + +# Running OpenDream locally +tgstation.json +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/Dockerfile b/Dockerfile index 0ae4f82be80..a27c64574f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ # base = ubuntu + full apt update FROM ubuntu:xenial AS base - RUN dpkg --add-architecture i386 \ && apt-get update \ && apt-get upgrade -y \ diff --git a/README.md b/README.md index cf0f39bdcda..7a4a4f6d307 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/Skyrat-SS13/Skyrat-tg.svg)](https://isitmaintained.com/project/Skyrat-SS13/Skyrat-tg "Average time to resolve an issue") ![Coverage](https://img.shields.io/codecov/c/github/Skyrat-SS13/Skyrat-tg) +[![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) [![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) | Website | Link | @@ -44,6 +45,7 @@ You are responsible for the testing of your content and providing proof of such [Running on the server](.github/guides/RUNNING_A_SERVER.md) +[Maps and Away Missions](.github/guides/MAPS_AND_AWAY_MISSIONS.md) [Maps and Away Missions](.github/guides/MAPS_AND_AWAY_MISSIONS.md) ## Compilation @@ -73,6 +75,7 @@ All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 a See LICENSE and GPLv3.txt for more details. +The TGS DMAPI is licensed as a subproject under the MIT license. The TGS DMAPI is licensed as a subproject under the MIT license. See the footer of [code/__DEFINES/tgs.dm](./code/__DEFINES/tgs.dm) and [code/modules/tgs/LICENSE](./code/modules/tgs/LICENSE) for the MIT license. diff --git a/SQL/database_changelog.md b/SQL/database_changelog.md index bad8912ce93..7c6a6ece2b7 100644 --- a/SQL/database_changelog.md +++ b/SQL/database_changelog.md @@ -2,20 +2,35 @@ Any time you make a change to the schema files, remember to increment the databa Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`. +<<<<<<< HEAD The latest database version is 5.30 (5.27 for /tg/); The query to update the schema revision table is: ```sql INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 30); +======= +The latest database version is 5.27; The query to update the schema revision table is: + +```sql +INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 27); +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ``` or ```sql +<<<<<<< HEAD INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 30); +======= +INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 27); +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ``` In any query remember to add a prefix to the table names if you use one. ----------------------------------------------------- +<<<<<<< HEAD Version 5.30, 26 April 2024, by zephyrtfa +======= +Version 5.27, 26 April 2024, by zephyrtfa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Add the ip intel whitelist table ```sql DROP TABLE IF EXISTS `ipintel_whitelist`; @@ -29,6 +44,7 @@ CREATE TABLE `ipintel_whitelist` ( /*!40101 SET character_set_client = @saved_cs_client */; ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.29, 08 January 2024, by Useroth Add a new table for age-checking purposes. Optional if you don't ever intend to use the age prompt. @@ -43,20 +59,31 @@ CREATE TABLE `player_dob` ( ----------------------------------------------------- Version 5.28, 03 December 2023, by distributivgesetz +======= +Version 5.26, 03 December 2023, by distributivgesetz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Set the default value of cloneloss to 0, as it's obsolete and it won't be set by blackbox anymore. ```sql ALTER TABLE `death` MODIFY COLUMN `cloneloss` SMALLINT(5) UNSIGNED DEFAULT '0'; ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.27, 27 September 2023, by Jimmyl +======= +Version 5.25, 27 September 2023, by Jimmyl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Removes the text_adventures table because it is no longer used ```sql DROP TABLE IF EXISTS `text_adventures`; ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.26, 17 May 2023, by LemonInTheDark +======= +Version 5.24, 17 May 2023, by LemonInTheDark +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Modified the library action table to fit ckeys properly, and to properly store ips. ```sql ALTER TABLE `library_action` MODIFY COLUMN `ckey` varchar(32) NOT NULL; @@ -64,7 +91,11 @@ Modified the library action table to fit ckeys properly, and to properly store i ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.25, 28 December 2022, by Mothblocks +======= +Version 5.23, 28 December 2022, by Mothblocks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added `tutorial_completions` to mark what ckeys have completed contextual tutorials. ```sql @@ -77,7 +108,11 @@ CREATE TABLE `tutorial_completions` ( ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.24, 22 December 2021, by Mothblocks +======= +Version 5.22, 22 December 2021, by Mothblocks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fixes a bug in `telemetry_connections` that limited the range of IPs. ```sql @@ -85,7 +120,11 @@ ALTER TABLE `telemetry_connections` MODIFY COLUMN `address` INT(10) UNSIGNED NOT ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.23, 15 December 2021, by Mothblocks +======= +Version 5.21, 15 December 2021, by Mothblocks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Adds `telemetry_connections` table for tracking tgui telemetry. ```sql @@ -103,7 +142,11 @@ CREATE TABLE `telemetry_connections` ( ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.22, 11 November 2021, by Mothblocks +======= +Version 5.20, 11 November 2021, by Mothblocks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Adds `admin_ckey` field to the `known_alts` table to track who added what. ```sql @@ -112,7 +155,11 @@ ADD COLUMN `admin_ckey` VARCHAR(32) NOT NULL DEFAULT '*no key*' AFTER `ckey2`; ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.21, 10 November 2021, by WalterMeldron +======= +Version 5.19, 10 November 2021, by WalterMeldron +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Adds an urgent column to tickets for ahelps marked as urgent. ```sql @@ -120,7 +167,11 @@ ALTER TABLE `ticket` ADD COLUMN `urgent` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0 ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.20, 1 November 2021, by Mothblocks +======= +Version 5.18, 1 November 2021, by Mothblocks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added `known_alts` table for tracking who not to create suspicious logins for. ```sql @@ -134,7 +185,11 @@ CREATE TABLE `known_alts` ( ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.19, 8 October 2021, by MrStonedOne + Mothblocks +======= +Version 5.17, 8 October 2021, by MrStonedOne + Mothblocks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Changes any table that requrired a NOT NULL round ID to now accept NULL. In the BSQL past, these were handled as 0, but in the move to rust-g this behavior was lost. ```sql @@ -153,6 +208,7 @@ ALTER TABLE `ticket` CHANGE `round_id` `round_id` INT(11) UNSIGNED NULL; ``` ----------------------------------------------------- +<<<<<<< HEAD Version 5.18, 23 August 2021, by GoldenAlpharex Added `discord_report` column to the `ban table` @@ -162,6 +218,9 @@ Added `discord_report` column to the `ban table` ----------------------------------------------------- Version 5.17, 31 July 2021, by Atlanta-Ned +======= +Version 5.16, 31 July 2021, by Atlanta-Ned +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added `library_action` table for tracking reported library books and actions taken on them. ```sql @@ -180,7 +239,11 @@ CREATE TABLE `library_action` ( ----------------------------------------------------- +<<<<<<< HEAD Version 5.16, 2 June 2021, by Mothblocks +======= +Version 5.15, 2 June 2021, by Mothblocks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added verified admin connection log used for 2FA ```sql @@ -197,7 +260,11 @@ CREATE TABLE `admin_connections` ( ----------------------------------------------------- +<<<<<<< HEAD Version 5.15, xx May 2021, by Anturke +======= +Version 5.14, xx May 2021, by Anturke +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added exploration drone adventure table ```sql @@ -214,7 +281,11 @@ CREATE TABLE `text_adventures` ( ----------------------------------------------------- +<<<<<<< HEAD Version 5.14, 30 April 2021, by Atlanta Ned +======= +Version 5.13, 30 April 2021, by Atlanta Ned +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added the `citation` table for tracking security citations in the database. ```sql @@ -243,6 +314,7 @@ AUTO_INCREMENT=1 ----------------------------------------------------- +<<<<<<< HEAD Version 5.13, 9 March, 2021, by Useroth Implemented some features to help with running multiple servers on the same database and easily differentiate @@ -283,6 +355,12 @@ Modified table `messages`, adding column `playtime` to show the user's playtime ```sql ALTER TABLE `messages` ADD `playtime` INT(11) NULL DEFAULT(NULL) AFTER `severity` ``` +======= +Version 5.12, 29 December 2020, by Missfox +Modified table `messages`, adding column `playtime` to show the user's playtime when the note was created. + +ALTER TABLE `messages` ADD `playtime` INT(11) NULL DEFAULT(NULL) AFTER `severity` +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ----------------------------------------------------- diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql index fba7edfcb7a..1d875b61a0c 100644 --- a/SQL/tgstation_schema.sql +++ b/SQL/tgstation_schema.sql @@ -660,6 +660,7 @@ CREATE TABLE `discord_links` ( ) ENGINE=InnoDB; -- +<<<<<<< HEAD -- Table structure for table `game_log` -- DROP TABLE IF EXISTS `game_log`; @@ -675,6 +676,8 @@ CREATE TABLE `game_log` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -- Table structure for table `admin_connections` -- DROP TABLE IF EXISTS `admin_connections`; diff --git a/__odlint.dm b/__odlint.dm new file mode 100644 index 00000000000..b7c120514a1 --- /dev/null +++ b/__odlint.dm @@ -0,0 +1,10 @@ +// This file is included right at the start of the DME. +// Its purpose is to enable multiple lints (pragmas) that are supported by OpenDream to better validate the codebase +// These are essentially nitpicks the DM compiler should pick up on but doesnt + +#if !defined(SPACEMAN_DMM) && defined(OPENDREAM) +// This is in a separate file as a hack to avoid SpacemanDMM +// evaluating the #pragma lines, even if its outside a block it cares about +// (Also so people can code-own it. Shoutout to AA) +#include "tools/ci/od_lints.dm" +#endif diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm index 0e78558d6f3..121f9e4ea45 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm @@ -300,7 +300,6 @@ /area/ruin/pizzeria) "kr" = ( /obj/structure/table, -/obj/item/trash/waffles, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm index e910474b12c..e1acbbf4f28 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm @@ -2,7 +2,11 @@ "a" = ( /turf/closed/mineral/random/snow, /area/icemoon/surface/outdoors/nospawn) +<<<<<<< HEAD "c" = ( +======= +"b" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/circuitboard/machine/space_heater, /obj/item/stack/cable_coil/five, /obj/structure/frame/machine, @@ -173,6 +177,23 @@ /obj/effect/decal/cleanable/ash, /turf/open/floor/carpet/blue, /area/ruin/smoking_room/room) +<<<<<<< HEAD +======= +"E" = ( +/obj/item/trash/shrimp_chips, +/obj/item/cigarette/rollie/trippy{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/cigarette/rollie/trippy{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/effect/spawner/random/trash/bin, +/obj/effect/spawner/random/special_lighter, +/turf/open/floor/wood, +/area/ruin/smoking_room/house) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "F" = ( /obj/structure/table/wood/fancy/black, /obj/item/storage/fancy/cigarettes/cigars/cohiba, @@ -258,6 +279,7 @@ }, /turf/open/floor/wood, /area/ruin/smoking_room/house) +<<<<<<< HEAD "U" = ( /obj/item/trash/shrimp_chips, /obj/item/cigarette/rollie/trippy{ @@ -272,6 +294,8 @@ /obj/effect/spawner/random/special_lighter, /turf/open/floor/wood, /area/ruin/smoking_room/house) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "V" = ( /obj/structure/fireplace, /obj/effect/turf_decal/siding/wood, @@ -373,7 +397,11 @@ x B r S +<<<<<<< HEAD c +======= +b +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 I Q Q @@ -471,7 +499,11 @@ a a a I +<<<<<<< HEAD U +======= +E +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 u y L diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm index ff3417fefce..d5c344e9cd3 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm @@ -451,12 +451,8 @@ /area/ruin/comms_agent) "xq" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - pixel_x = 31; - syndie = 1; - freerange = 1; - name = "syndicate radio intercom"; - desc = "A custom-made Syndicate-issue intercom used to transmit on all Nanotrasen frequencies. Particularly expensive." +/obj/item/radio/intercom/syndicate/freerange{ + pixel_x = 31 }, /obj/structure/table/reinforced, /obj/machinery/fax{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index c2ea8382e46..83f08dce288 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -406,6 +406,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ruin/powered/beach) +<<<<<<< HEAD +======= +"mv" = ( +/obj/effect/spawner/message_in_a_bottle/low_prob, +/turf/open/misc/beach/coast, +/area/ruin/powered/beach) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mw" = ( /obj/structure/flora/coconuts, /turf/open/misc/beach/sand, @@ -548,6 +555,7 @@ /obj/item/toy/beach_ball, /turf/open/misc/beach/sand, /area/ruin/powered/beach) +<<<<<<< HEAD "sa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/chair/stool/bar/directional/south, @@ -560,6 +568,9 @@ /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/powered/beach) "sz" = ( +======= +"rU" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/condiment/enzyme, /obj/item/reagent_containers/cup/beaker{ pixel_x = 5 @@ -567,10 +578,28 @@ /obj/structure/table, /turf/open/floor/wood, /area/ruin/powered/beach) +<<<<<<< HEAD "sA" = ( /mob/living/basic/crab{ name = "Jon" }, +======= +"sa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/chair/stool/bar/directional/south, +/turf/open/floor/wood, +/area/ruin/powered/beach) +"sl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/closed/wall/mineral/wood/nonmetal, +/area/ruin/powered/beach) +"sA" = ( +/mob/living/basic/crab{ + name = "Jon" + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/sand, /area/ruin/powered/beach) "sV" = ( @@ -867,6 +896,7 @@ /area/ruin/powered/beach) "Fa" = ( /obj/structure/chair/stool/bar/directional/south, +<<<<<<< HEAD /turf/open/floor/wood, /area/ruin/powered/beach) "Fj" = ( @@ -876,6 +906,8 @@ /obj/item/storage/backpack/duffelbag, /obj/item/clothing/under/shorts/red, /obj/item/clothing/glasses/sunglasses, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/wood, /area/ruin/powered/beach) "Fr" = ( @@ -919,6 +951,22 @@ /obj/item/book/manual/wiki/cooking_to_serve_man, /obj/item/clothing/suit/apron/chef, /obj/item/clothing/head/utility/chefhat, +<<<<<<< HEAD +======= +/turf/open/floor/wood, +/area/ruin/powered/beach) +"Gf" = ( +/obj/structure/sign/poster/contraband/space_cola/directional/north, +/turf/open/misc/beach/sand, +/area/ruin/powered/beach) +"GA" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/chair/stool/directional/south, +/obj/item/storage/backpack/duffelbag, +/obj/item/clothing/under/shorts/red, +/obj/item/clothing/glasses/sunglasses, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/wood, /area/ruin/powered/beach) "Gf" = ( @@ -985,6 +1033,10 @@ dir = 1 }, /obj/machinery/light/directional/south, +<<<<<<< HEAD +======= +/obj/effect/spawner/message_in_a_bottle/low_prob, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/coast/corner{ dir = 8 }, @@ -1990,7 +2042,11 @@ bG bL VI VI +<<<<<<< HEAD yT +======= +mv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pz Eu pz @@ -2017,7 +2073,11 @@ Lm Lm rv VI +<<<<<<< HEAD Fj +======= +GA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bH bM VI diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index b99f9df9681..6df974f9ea2 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -4034,34 +4034,6 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron, /area/ruin/syndicate_lava_base/main) -"TM" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/item/turbine_parts/rotor{ - current_tier = 3 - }, -/obj/item/turbine_parts/stator{ - current_tier = 2 - }, -/obj/item/turbine_parts/compressor{ - current_tier = 3 - }, -/obj/item/pipe_dispenser, -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/mineral/plastitanium{ - amount = 30 - }, -/obj/item/stack/sheet/plastitaniumglass{ - amount = 15 - }, -/obj/item/holosign_creator/atmos, -/obj/item/circuitboard/machine/thermomachine, -/obj/item/circuitboard/machine/thermomachine, -/turf/open/floor/iron, -/area/ruin/syndicate_lava_base/engineering) "TN" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/east, @@ -4431,6 +4403,34 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/ruin/syndicate_lava_base/engineering) +"YJ" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/item/turbine_parts/rotor{ + current_tier = 3 + }, +/obj/item/turbine_parts/stator{ + current_tier = 2 + }, +/obj/item/turbine_parts/compressor{ + current_tier = 3 + }, +/obj/item/pipe_dispenser, +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 30 + }, +/obj/item/stack/sheet/plastitaniumglass{ + amount = 15 + }, +/obj/item/holosign_creator/atmos, +/obj/item/circuitboard/machine/thermomachine, +/obj/item/circuitboard/machine/thermomachine, +/turf/open/floor/iron, +/area/ruin/syndicate_lava_base/engineering) "YP" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -6614,7 +6614,7 @@ ju ju TO JE -TM +YJ ta vB LW diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm index 4b4daf0586b..9dfb448cffe 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm @@ -17,6 +17,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"ad" = ( +/obj/structure/table/reinforced, +/obj/item/restraints/handcuffs, +/obj/item/taperecorder, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) "ae" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -25,6 +33,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"af" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) "ag" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, @@ -46,6 +67,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"aj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) "ak" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -56,6 +83,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"al" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) "am" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/machinery/door/firedoor, @@ -87,6 +122,35 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"aq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) +"ar" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi"; + name = "Syndicate Research Experimentation Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ruin/syndicate_lava_base/testlab) +"as" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) "at" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -110,6 +174,43 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"aw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) +"ax" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) +"ay" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) +"az" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) "aA" = ( /obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, @@ -139,6 +240,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"aC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) "aD" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/syndicate_lava_base/testlab) @@ -155,6 +262,27 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"aF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/hatch{ + name = "Experimentation Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/structure/cable, +/obj/modular_map_connector, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) +"aG" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) "aH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, @@ -172,6 +300,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) +"aK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) "aL" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, @@ -207,6 +340,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/ruin/syndicate_lava_base/testlab) +"aR" = ( +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/ruin/syndicate_lava_base/testlab) "aS" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine, @@ -222,6 +365,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/ruin/syndicate_lava_base/testlab) +"aU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) +"aV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ruin/syndicate_lava_base/testlab) "aW" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/engine, diff --git a/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm b/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm index 449122260ef..32329cf4a5c 100644 --- a/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm +++ b/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm @@ -243,6 +243,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/ruin/space/has_grav/allamericandiner) +"nq" = ( +/obj/machinery/shower/directional/east, +/obj/structure/fluff/shower_drain, +/obj/item/soap, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/allamericandiner) "nr" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -597,6 +603,12 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/allamericandiner) +"CF" = ( +/obj/machinery/shower/directional/west, +/obj/structure/fluff/shower_drain, +/obj/item/soap, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/allamericandiner) "Du" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/condiment/peppermill{ @@ -612,12 +624,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/allamericandiner) -"DD" = ( -/obj/machinery/shower/directional/east, -/obj/structure/fluff/shower_drain, -/obj/item/soap, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/allamericandiner) "DQ" = ( /obj/structure/chair/sofa/right/maroon, /obj/effect/decal/cleanable/dirt, @@ -952,12 +958,6 @@ /obj/item/storage/dice, /turf/open/floor/iron, /area/ruin/space/has_grav/allamericandiner) -"OJ" = ( -/obj/machinery/shower/directional/west, -/obj/structure/fluff/shower_drain, -/obj/item/soap, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/allamericandiner) "Ph" = ( /obj/structure/chair/sofa/left/maroon{ dir = 4 @@ -2083,7 +2083,7 @@ Kp jx Kp Lp -OJ +CF EK oN oN @@ -2157,7 +2157,7 @@ YX Im YX bE -DD +nq EK oN oN diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index a7eac1fe1a8..adbc2cb5353 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -1062,7 +1062,11 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research/lab) "oJ" = ( +<<<<<<< HEAD /obj/structure/closet/crate/medical, +======= +/obj/structure/closet/crate/secure/interdyne, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/medical/suture/emergency, /obj/item/stack/medical/gauze/twelve, /obj/item/reagent_containers/hypospray/medipen/blood_loss, @@ -2155,7 +2159,11 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research/lab) "BG" = ( +<<<<<<< HEAD /obj/structure/closet/crate, +======= +/obj/structure/closet/crate/secure/interdyne, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/sheet/mineral/plasma/thirty, /obj/item/stack/sheet/mineral/wood/fifty, /obj/item/stack/sheet/iron/fifty, @@ -3658,7 +3666,11 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research) "VQ" = ( +<<<<<<< HEAD /obj/structure/closet/crate, +======= +/obj/structure/closet/crate/secure/interdyne, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/waterbottle/large, /obj/item/reagent_containers/cup/glass/waterbottle/large, /obj/item/reagent_containers/cup/glass/waterbottle/large, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm index 62cc4e2930d..2d7c9429777 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm @@ -253,6 +253,7 @@ /obj/structure/closet/secure_closet/freezer/empty, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) +<<<<<<< HEAD "jy" = ( /obj/structure/closet/cardboard, /obj/item/toy/plush/snakeplushie, @@ -260,6 +261,8 @@ /obj/item/cigarette/cigar/havana, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ki" = ( /obj/effect/spawner/random/trash/food_packaging, /obj/item/shard, @@ -480,6 +483,16 @@ }, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) +<<<<<<< HEAD +======= +"wv" = ( +/obj/structure/closet/cardboard, +/obj/item/toy/plush/snakeplushie, +/obj/item/clothing/glasses/eyepatch, +/obj/item/cigarette/cigar/havana, +/turf/open/floor/plating/dumpsterair, +/area/ruin/space/has_grav/garbagetruck/foodwaste) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wR" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/item/food/badrecipe/moldy/bacteria{ @@ -491,9 +504,12 @@ /area/ruin/space/has_grav/garbagetruck/foodwaste) "xf" = ( /obj/item/trash/tray, +<<<<<<< HEAD /obj/item/trash/waffles, /obj/item/trash/waffles, /obj/item/trash/waffles, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/grown/mushroom/plumphelmet, /obj/structure/closet/crate/trashcart, /mob/living/basic/mouse/rat, @@ -751,6 +767,15 @@ /obj/item/food/cornchips/random, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) +<<<<<<< HEAD +======= +"Fz" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/lead, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/garbagetruck/foodwaste) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FL" = ( /obj/structure/closet/cardboard, /obj/item/pen/blue, @@ -867,12 +892,15 @@ }, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/garbagetruck/foodwaste) +<<<<<<< HEAD "Ji" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/power_store/cell/lead, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/garbagetruck/foodwaste) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "JH" = ( /obj/item/petri_dish/random, /obj/item/petri_dish/random, @@ -888,6 +916,7 @@ /obj/effect/spawner/random/medical/surgery_tool, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) +<<<<<<< HEAD "Kj" = ( /obj/item/clothing/head/cone{ pixel_x = 8; @@ -902,6 +931,8 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/ruin/space/has_grav/garbagetruck/foodwaste) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "KD" = ( /obj/structure/closet/crate/critter, /obj/item/dog_bone{ @@ -1077,6 +1108,23 @@ /obj/effect/decal/cleanable/food/tomato_smudge, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) +<<<<<<< HEAD +======= +"PU" = ( +/obj/item/clothing/head/cone{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/machinery/light/warm, +/obj/machinery/power/apc{ + locked = 0; + pixel_y = -25; + start_charge = 0 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/ruin/space/has_grav/garbagetruck/foodwaste) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Qi" = ( /obj/item/book/bible, /obj/structure/closet/crate/cardboard, @@ -1282,7 +1330,11 @@ Sa XY Od kJ +<<<<<<< HEAD Ji +======= +Fz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gI OD Sa @@ -1291,7 +1343,11 @@ rL HC YB iH +<<<<<<< HEAD jy +======= +wv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 KD wR nS @@ -1415,7 +1471,11 @@ XY Od fI bF +<<<<<<< HEAD Kj +======= +PU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 OD Sa Qi diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm index 3e842bd1979..03a9b87ff4e 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm @@ -140,13 +140,13 @@ }, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) -"iC" = ( +"ih" = ( +/obj/item/bedsheet/purple, +/obj/item/cigarette/space_cigarette, +/obj/structure/bed/maint, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/fuel_pool, -/obj/effect/decal/cleanable/molten_object/large, -/obj/structure/broken_flooring/pile, -/obj/item/food/deadmouse/moldy, -/obj/item/stock_parts/water_recycler, -/obj/item/stock_parts/power_store/cell/lead, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) "iU" = ( @@ -154,14 +154,6 @@ /obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) -"ja" = ( -/obj/item/food/deadmouse, -/obj/item/clothing/shoes/sneakers/red, -/obj/item/cigarette/carp, -/obj/item/extinguisher/mini, -/obj/effect/decal/cleanable/fuel_pool, -/turf/open/floor/plating/dumpsterair, -/area/ruin/space/has_grav/garbagetruck/squat) "jl" = ( /obj/structure/table/reinforced, /obj/item/gps/spaceruin{ @@ -193,6 +185,13 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/squat) +"kb" = ( +/obj/effect/decal/cleanable/fuel_pool, +/obj/item/stock_parts/power_store/cell/crap/empty, +/obj/effect/decal/cleanable/plastic, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating/dumpsterair, +/area/ruin/space/has_grav/garbagetruck/squat) "kR" = ( /obj/structure/closet/crate/preopen, /obj/effect/decal/cleanable/shreds, @@ -318,15 +317,6 @@ /mob/living/basic/cockroach, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) -"ra" = ( -/obj/item/bedsheet/purple, -/obj/item/cigarette/space_cigarette, -/obj/structure/bed/maint, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/fuel_pool, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dumpsterair, -/area/ruin/space/has_grav/garbagetruck/squat) "rq" = ( /obj/effect/decal/cleanable/fuel_pool, /obj/effect/decal/cleanable/dirt, @@ -367,12 +357,6 @@ }, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) -"so" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/lead, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/garbagetruck/squat) "sF" = ( /obj/structure/table/reinforced, /obj/item/storage/box/gloves{ @@ -388,6 +372,14 @@ }, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/garbagetruck/squat) +"tu" = ( +/obj/item/cigarette/robust, +/obj/structure/closet/emcloset, +/obj/item/clothing/suit/utility/fire/heavy, +/obj/item/clothing/head/utility/hardhat/welding/atmos, +/obj/item/survivalcapsule/bathroom, +/turf/open/floor/plating/dumpsterair, +/area/ruin/space/has_grav/garbagetruck/squat) "tL" = ( /obj/structure/reagent_dispensers/fueltank/large, /obj/effect/decal/cleanable/fuel_pool, @@ -449,20 +441,21 @@ /obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) +"vJ" = ( +/obj/effect/decal/cleanable/fuel_pool, +/obj/effect/decal/cleanable/molten_object/large, +/obj/structure/broken_flooring/pile, +/obj/item/food/deadmouse/moldy, +/obj/item/stock_parts/water_recycler, +/obj/item/stock_parts/power_store/cell/lead, +/turf/open/floor/plating/dumpsterair, +/area/ruin/space/has_grav/garbagetruck/squat) "vW" = ( /obj/effect/spawner/random/engineering/material_cheap, /obj/structure/girder/displaced, /obj/item/stock_parts/scanning_module, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) -"wk" = ( -/obj/item/cigarette/robust, -/obj/structure/closet/emcloset, -/obj/item/clothing/suit/utility/fire/heavy, -/obj/item/clothing/head/utility/hardhat/welding/atmos, -/obj/item/survivalcapsule/bathroom, -/turf/open/floor/plating/dumpsterair, -/area/ruin/space/has_grav/garbagetruck/squat) "xg" = ( /obj/structure/chair/office, /obj/item/reagent_containers/cup/mortar, @@ -470,6 +463,20 @@ /obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) +"yo" = ( +/obj/item/clothing/head/cone{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/machinery/light/warm, +/obj/machinery/power/apc{ + locked = 0; + pixel_y = -25; + start_charge = 0 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/ruin/space/has_grav/garbagetruck/squat) "yF" = ( /obj/item/trash/spacers_sidekick, /obj/item/trash/flare, @@ -530,33 +537,6 @@ /obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) -"Cc" = ( -/obj/item/stock_parts/power_store/cell/crap/empty{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/cigarette/space_cigarette{ - pixel_x = -5; - pixel_y = 7 - }, -/obj/effect/decal/cleanable/fuel_pool, -/obj/item/crowbar/hammer{ - desc = "A large claw hammer. It's been heavily used, as evidenced by the dents and scratches covering its head."; - name = "claw hammer" - }, -/obj/item/storage/fancy/cigarettes/cigpack_cannabis{ - pixel_x = 6; - pixel_y = -2 - }, -/turf/open/floor/plating/dumpsterair, -/area/ruin/space/has_grav/garbagetruck/squat) -"Ci" = ( -/obj/effect/decal/cleanable/fuel_pool, -/obj/item/stock_parts/power_store/cell/crap/empty, -/obj/effect/decal/cleanable/plastic, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating/dumpsterair, -/area/ruin/space/has_grav/garbagetruck/squat) "Cm" = ( /obj/effect/decal/cleanable/fuel_pool, /obj/item/mod/module/jetpack{ @@ -685,6 +665,12 @@ /obj/item/organ/internal/tongue/robot, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) +"HN" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/lead, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/garbagetruck/squat) "HZ" = ( /turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/garbagetruck/squat) @@ -767,6 +753,26 @@ /obj/item/crowbar/large/emergency, /turf/open/space/basic, /area/ruin/space/has_grav/garbagetruck/squat) +"MQ" = ( +/obj/item/stock_parts/power_store/cell/crap/empty{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/cigarette/space_cigarette{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/fuel_pool, +/obj/item/crowbar/hammer{ + desc = "A large claw hammer. It's been heavily used, as evidenced by the dents and scratches covering its head."; + name = "claw hammer" + }, +/obj/item/storage/fancy/cigarettes/cigpack_cannabis{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/plating/dumpsterair, +/area/ruin/space/has_grav/garbagetruck/squat) "Nd" = ( /obj/item/binoculars, /obj/item/crowbar/large/old, @@ -800,20 +806,6 @@ /obj/item/food/drug/moon_rock, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) -"Qs" = ( -/obj/item/clothing/head/cone{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/machinery/light/warm, -/obj/machinery/power/apc{ - locked = 0; - pixel_y = -25; - start_charge = 0 - }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/ruin/space/has_grav/garbagetruck/squat) "Rw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/fuel_pool, @@ -910,6 +902,14 @@ "Xt" = ( /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) +"Xv" = ( +/obj/item/food/deadmouse, +/obj/item/clothing/shoes/sneakers/red, +/obj/item/cigarette/carp, +/obj/item/extinguisher/mini, +/obj/effect/decal/cleanable/fuel_pool, +/turf/open/floor/plating/dumpsterair, +/area/ruin/space/has_grav/garbagetruck/squat) "XS" = ( /obj/effect/decal/cleanable/fuel_pool, /obj/structure/firelock_frame, @@ -981,19 +981,19 @@ mV la gq sF -so +HN dC HZ mV bR -ra +ih un aI rq Fe lv pM -wk +tu hm pC fF @@ -1016,7 +1016,7 @@ za aG zo HD -Cc +MQ qF Cm mV @@ -1039,7 +1039,7 @@ uW XS nX BN -iC +vJ vW mV "} @@ -1061,7 +1061,7 @@ Hk vq zY Hn -Ci +kb le mV "} @@ -1114,7 +1114,7 @@ la gq Gn dF -Qs +yo HZ mV ui @@ -1150,7 +1150,7 @@ Dq yF Nd Er -ja +Xv Pz "} (11,1,1) = {" diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index a6da6eb66a9..fb6172ff2f3 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -43,6 +43,21 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"bi" = ( +/obj/structure/rack, +/obj/item/reagent_containers/syringe/bluespace{ + pixel_y = 2 + }, +/obj/item/reagent_containers/syringe/bluespace{ + pixel_y = 8 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bE" = ( /turf/open/floor/iron/stairs, /area/ruin/space/has_grav/powered/hilbertresearchfacility) @@ -240,6 +255,17 @@ /obj/structure/railing/corner, /turf/open/floor/glass, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"hB" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 5 + }, +/obj/item/stack/cable_coil/cut, +/turf/open/floor/mineral/titanium/tiled/purple, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hL" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/siding/thinplating_new/light{ @@ -474,6 +500,7 @@ /obj/item/transfer_valve, /turf/open/floor/plating/airless, /area/ruin/space) +<<<<<<< HEAD "mz" = ( /obj/structure/rack, /obj/item/clothing/suit/bio_suit/cmo, @@ -482,6 +509,8 @@ /obj/machinery/door/window/survival_pod/left/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mC" = ( /obj/machinery/chem_mass_spec, /turf/open/floor/mineral/titanium/tiled/blue, @@ -524,6 +553,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "nv" = ( /obj/structure/rack, /obj/item/reagent_containers/syringe/bluespace{ @@ -536,6 +566,8 @@ /obj/machinery/door/window/survival_pod/left/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nx" = ( /obj/machinery/door/window/left/directional/south, /obj/effect/decal/cleanable/dirt, @@ -551,12 +583,15 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "nK" = ( /obj/structure/rack, /obj/item/gun/syringe, /obj/machinery/door/window/survival_pod/left/directional/west, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nM" = ( /obj/structure/lattice, /turf/template_noop, @@ -580,6 +615,7 @@ /obj/item/assembly/signaler, /turf/open/floor/plating/airless, /area/ruin/space) +<<<<<<< HEAD "nY" = ( /obj/machinery/door/window/survival_pod/left/directional/east, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -588,6 +624,8 @@ /obj/item/stack/cable_coil/cut, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "og" = ( /obj/item/slime_extract/bluespace, /obj/effect/decal/cleanable/dirt, @@ -664,6 +702,7 @@ }, /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "qj" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -672,6 +711,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qC" = ( /obj/machinery/transport/tram_controller/hilbert, /turf/closed/indestructible/riveted/plastinum/nodiagonal, @@ -756,6 +797,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"th" = ( +/obj/structure/rack, +/obj/item/gun/syringe, +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ty" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/stock_parts/matter_bin/bluespace{ @@ -804,6 +854,16 @@ /obj/effect/turf_decal/trimline/neutral/mid_joiner, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"us" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 10 + }, +/turf/open/floor/mineral/titanium/tiled/purple, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uV" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 5 @@ -831,6 +891,17 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"vz" = ( +/obj/structure/rack, +/obj/item/clothing/suit/bio_suit/cmo, +/obj/item/clothing/head/bio_hood/cmo, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vG" = ( /obj/structure/fluff/tram_rail/end{ dir = 8 @@ -971,6 +1042,17 @@ /obj/item/grown/bananapeel/mimanapeel, /turf/open/floor/glass, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"yK" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium/tiled/purple, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yO" = ( /obj/structure/door_assembly/door_assembly_shuttle, /turf/open/floor/mineral/titanium/blue, @@ -1151,6 +1233,16 @@ /obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"BF" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 9 + }, +/turf/open/floor/mineral/titanium/tiled/purple, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BH" = ( /obj/item/kirbyplants/photosynthetic, /obj/effect/turf_decal/stripes/red/line, @@ -1216,6 +1308,7 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "CB" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -1223,6 +1316,8 @@ }, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "CO" = ( /turf/open/floor/glass, /area/ruin/space/has_grav/powered/hilbertresearchfacility) @@ -1257,6 +1352,17 @@ }, /turf/open/floor/engine, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"DO" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium/tiled/purple, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DR" = ( /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) @@ -1353,6 +1459,7 @@ /obj/item/paper_bin, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "Fy" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -1360,6 +1467,8 @@ }, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FB" = ( /obj/structure/table/wood, /obj/item/lighter, @@ -1386,6 +1495,7 @@ /obj/structure/table/reinforced, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "Gr" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -1395,6 +1505,8 @@ /mob/living/basic/slime/hilbert, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Gs" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -1590,6 +1702,7 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "JW" = ( /obj/effect/decal/remains/human, /obj/machinery/door/window/survival_pod/left/directional/east, @@ -1598,6 +1711,8 @@ }, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Kd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, @@ -1723,6 +1838,17 @@ /obj/structure/girder, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"NJ" = ( +/obj/effect/decal/remains/human, +/obj/machinery/door/window/survival_pod/left/directional/east, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 6 + }, +/turf/open/floor/mineral/titanium/tiled/purple, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "NU" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -1991,6 +2117,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD "SL" = ( /obj/machinery/door/window/survival_pod/left/directional/east, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -1999,6 +2126,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "SR" = ( /obj/structure/railing{ dir = 4 @@ -2166,6 +2295,18 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +<<<<<<< HEAD +======= +"WC" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/slime/hilbert, +/turf/open/floor/mineral/titanium/tiled/purple, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "WI" = ( /obj/structure/table/wood, /obj/item/food/cornchips/blue, @@ -3139,7 +3280,11 @@ Bo Bo Bo Bo +<<<<<<< HEAD nv +======= +bi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sz Bo Dk @@ -3178,7 +3323,11 @@ Dk Dk Dk Bo +<<<<<<< HEAD mz +======= +vz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 te Bo Dk @@ -3218,7 +3367,11 @@ Dk Dk Bo Ok +<<<<<<< HEAD nK +======= +th +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bo Dk Dk @@ -3581,11 +3734,19 @@ Bo Bk Bk Bo +<<<<<<< HEAD nY JW Bo SL JW +======= +hB +NJ +Bo +DO +NJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bo Dk Dk @@ -3893,11 +4054,19 @@ Bo Dk Dk Bo +<<<<<<< HEAD qj CB Bo Fy Gr +======= +yK +us +Bo +BF +WC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bo Dk Dk diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm index f8904976f72..b0a604d132d 100644 --- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm +++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm @@ -557,6 +557,18 @@ /obj/item/kirbyplants/random, /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/infested_frigate) +<<<<<<< HEAD +======= +"hX" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/icecream_vat{ + desc = "Waffle Corp. actually ordered these guys to steal one of these just to be sure." + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/infested_frigate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ie" = ( /obj/structure/showcase/machinery{ icon_state = "autolathe"; @@ -2475,6 +2487,7 @@ /obj/machinery/computer/operating, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) +<<<<<<< HEAD "NW" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/north, @@ -2484,6 +2497,8 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "NX" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/glass, @@ -3373,7 +3388,11 @@ fl wP EQ wP +<<<<<<< HEAD NW +======= +hX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SM ME KT diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index ec4126fafe5..3162898f725 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -45,6 +45,7 @@ "ak" = ( /turf/closed/wall/rust, /area/ruin/space/ancientstation/charlie/bridge) +<<<<<<< HEAD "al" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/monitor, @@ -54,6 +55,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ao" = ( /obj/structure/alien/weeds, /mob/living/basic/alien/drone, @@ -341,6 +344,7 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/mining) +<<<<<<< HEAD "bH" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -355,6 +359,8 @@ }, /turf/open/floor/plating, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bJ" = ( /turf/closed/wall, /area/ruin/space/ancientstation/beta/atmos) @@ -431,6 +437,21 @@ /obj/structure/sign/poster/official/science, /turf/closed/wall/rust, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD +======= +"cd" = ( +/obj/machinery/door/airlock/command{ + name = "Beta Station Access" + }, +/obj/machinery/door/poddoor{ + id = "ancient" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ce" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -730,6 +751,7 @@ /obj/structure/alien/weeds, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD "dg" = ( /obj/machinery/door/airlock/science{ name = "Biolab" @@ -746,10 +768,25 @@ /obj/effect/mapping_helpers/airlock/access/all/away/general, /turf/open/floor/iron/white/textured_large, /area/ruin/space/ancientstation/delta/biolab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD +======= +"dj" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/beta/mining) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -917,6 +954,7 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD "dW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light_switch/directional/west{ @@ -925,6 +963,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -981,11 +1021,34 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/bridge) +<<<<<<< HEAD +======= +"el" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "em" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) +<<<<<<< HEAD +======= +"en" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eo" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -1292,12 +1355,15 @@ /obj/machinery/light/small/broken/directional/east, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/ai) +<<<<<<< HEAD "fy" = ( /obj/machinery/atmospherics/components/unary/airlock_pump{ dir = 1 }, /turf/open/floor/iron/dark/airless, /area/ruin/space/ancientstation/beta/supermatter) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1718,6 +1784,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hydro) +<<<<<<< HEAD +======= +"hJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hM" = ( /obj/structure/sign/departments/science, /turf/closed/wall, @@ -1739,6 +1813,7 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) +<<<<<<< HEAD "hR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm/directional/south, @@ -1750,6 +1825,10 @@ /area/ruin/space/ancientstation/beta/supermatter) "hS" = ( /obj/effect/decal/cleanable/dirt, +======= +"hS" = ( +/obj/effect/decal/cleanable/dirt, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/white, /area/ruin/space/ancientstation/delta/rnd) @@ -1799,6 +1878,30 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hall) +<<<<<<< HEAD +======= +"ib" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/command{ + name = "Delta Station Access" + }, +/obj/machinery/door/poddoor{ + id = "ancient" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ic" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/transit_tube_pod{ @@ -2040,6 +2143,7 @@ }, /turf/open/floor/iron/airless, /area/ruin/space/ancientstation/beta/hall) +<<<<<<< HEAD "iS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -2048,6 +2152,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iU" = ( /obj/machinery/power/terminal{ dir = 4 @@ -2076,6 +2182,13 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/rnd) +<<<<<<< HEAD +======= +"iY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jc" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -2166,6 +2279,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hall) +<<<<<<< HEAD "jy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, @@ -2184,6 +2298,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jB" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -2904,6 +3020,22 @@ }, /turf/open/floor/plating, /area/ruin/space/ancientstation/beta/mining) +<<<<<<< HEAD +======= +"mB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/mining) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mC" = ( /turf/closed/wall/rust, /area/ruin/space/ancientstation/charlie/storage) @@ -2961,6 +3093,14 @@ /obj/machinery/mineral/processing_unit_console, /turf/closed/wall, /area/ruin/space/ancientstation/beta/mining) +<<<<<<< HEAD +======= +"mP" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/ancientstation/beta/supermatter) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -3034,6 +3174,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/hall) +<<<<<<< HEAD "nc" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -4372,6 +4513,9 @@ /area/ruin/space/ancientstation/charlie/hall) "wi" = ( /obj/effect/decal/cleanable/dirt, +======= +"nb" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock/command{ name = "Charlie Station Access" }, @@ -4740,6 +4884,7 @@ "zf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +<<<<<<< HEAD /turf/open/floor/iron/white, /area/ruin/space/ancientstation/delta/rnd) "zi" = ( @@ -4764,6 +4909,1919 @@ /turf/open/floor/plating, /area/ruin/space/ancientstation/beta/atmos) "zn" = ( +/obj/machinery/door/airlock/engineering{ + name = "Gravity Generator" + }, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +<<<<<<< HEAD +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"zp" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"zr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/random/dead, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"zt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"zw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 9 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"zy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"zA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"zC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"zI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron/white/textured_corner{ + dir = 8 + }, +/area/ruin/space/ancientstation/delta/biolab) +"zJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"zL" = ( +/turf/closed/mineral/random, +/area/ruin/space/ancientstation/delta/hall) +"zS" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/template_noop, +/area/space/nearstation) +"zU" = ( +======= +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"nc" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"nd" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/command{ + name = "Delta Station Access" + }, +/obj/machinery/door/poddoor{ + id = "ancient" + }, +/obj/effect/decal/cleanable/dirt, +<<<<<<< HEAD +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"Aa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"Ab" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"Ac" = ( +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) +"Ae" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/kitchen/rollingpin, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"Af" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"Al" = ( +/turf/closed/mineral/iron, +/area/space/nearstation) +"Ao" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"Ar" = ( +/obj/structure/transit_tube_pod{ + dir = 4; + anchored = 0 + }, +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, +/turf/template_noop, +/area/space/nearstation) +"Au" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +======= +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"nf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"nk" = ( +/turf/closed/wall, +/area/ruin/space/ancientstation/charlie/dorms) +"np" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"nr" = ( +/obj/item/stack/rods, +/turf/template_noop, +/area/template_noop) +"ns" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"ny" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"nz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"nA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/trinary/mixer/airmix{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"nB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"nD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/optable, +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/airless, +/area/ruin/space/ancientstation/beta/medbay) +"nG" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/table, +/obj/machinery/door/window/brigdoor/right/directional/east, +/obj/item/computer_disk, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/ai) +"nI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/science, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/closed, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"nJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Backup Generator Room" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/storage) +"nK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"nL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/alien/weeds, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/hall) +"nN" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/alien/drone, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/delta/rnd) +"nO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/bridge) +"nP" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"nS" = ( +/obj/effect/decal/cleanable/dirt, +/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/ruin/space/ancientstation/delta/rnd) +"nT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/pipedispenser, +/turf/open/floor/iron/airless, +/area/ruin/space/ancientstation/beta/hall) +"nU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"nX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/xenoblood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"ob" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/photosynthetic, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"oc" = ( +/obj/machinery/door/airlock/science, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/closed, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"oe" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"of" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"og" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/delta/rnd) +"oh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/washing_machine, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"ok" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/closed, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"ol" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/closed, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"oq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/xenoblood/xgibs/larva/body, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"ou" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/xenoblood/xgibs/up, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"oy" = ( +/obj/structure/table, +/obj/item/tank/internals/oxygen, +/obj/effect/decal/cleanable/dirt, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"oz" = ( +/obj/machinery/light/small/directional/east, +/obj/item/kirbyplants/random/dead, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hydro) +"oB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/airless, +/area/ruin/space/ancientstation/beta/medbay) +"oD" = ( +/obj/effect/decal/cleanable/xenoblood/xgibs/core, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/delta/rnd) +"oE" = ( +/obj/item/stack/rods, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/airless, +/area/ruin/space/ancientstation/beta/medbay) +"oF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/airless, +/area/ruin/space/ancientstation/beta/medbay) +"oH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/xenoblood/xgibs/core, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/delta/rnd) +"oL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"oM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/item/stack/rods, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"oP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"oQ" = ( +/obj/structure/cable, +/obj/item/shard{ + icon_state = "small" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/broken/directional/west, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"oR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/closed, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"oS" = ( +/obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"oU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/decal/cleanable/xenoblood/xgibs/up, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"oV" = ( +/obj/item/stack/rods, +/obj/effect/decal/cleanable/glass, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"oX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/random/dead, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"oZ" = ( +/obj/item/shard{ + icon_state = "small" + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"pc" = ( +/obj/item/kirbyplants/random/dead, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"pi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/shard{ + icon_state = "small" + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"pj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"pk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"pn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"pp" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"pq" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"pD" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"pF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"pI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/apc_control/away, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"pK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/textured_edge{ + dir = 4 + }, +/area/ruin/space/ancientstation/delta/biolab) +"pP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/tank_holder/oxygen/yellow, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/mining) +"pR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/shard{ + icon_state = "small" + }, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"pV" = ( +/obj/machinery/light/broken/directional/south, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/ruin/space/ancientstation/delta/rnd) +"pW" = ( +/obj/effect/decal/cleanable/oil, +/obj/structure/alien/weeds, +/obj/machinery/light/small/broken/directional/west, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/ai) +"qc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hydro) +"qf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/iron/white/textured, +/area/ruin/space/ancientstation/delta/proto) +"qh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/mining) +"ql" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"qo" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"qr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/soap/nanotrasen, +/obj/item/coin, +/obj/item/coin, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/bridge) +"qt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"qx" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"qF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2{ + dir = 4 + }, +/turf/closed/wall, +/area/ruin/space/ancientstation/beta/atmos) +"qK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/delta/hall) +"qL" = ( +/obj/structure/alien/weeds/node, +/obj/machinery/light/small/broken/directional/east, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/ai) +"qM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"qQ" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/ancientstation/charlie/engie) +"rc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/energy_accumulator/grounding_rod, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/supermatter) +"rf" = ( +/obj/machinery/door/firedoor, +/obj/structure/broken_flooring/singular/directional/east, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"rh" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"rl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/textured_large, +/area/ruin/space/ancientstation/delta/biolab) +"rm" = ( +/turf/closed/mineral/random, +/area/ruin/space/ancientstation/beta/supermatter) +"rn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/effect/decal/cleanable/generic, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hydro) +"rp" = ( +/turf/closed/wall/r_wall, +/area/ruin/space/ancientstation/delta/biolab) +"rq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/away_general_access, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"rt" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/mapping_helpers/damaged_window, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/biolab) +"rv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"rw" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/engine/n2, +/area/ruin/space/ancientstation/beta/atmos) +"rC" = ( +/obj/effect/decal/cleanable/blood/xtracks{ + dir = 8 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/engine, +/area/ruin/space/ancientstation/delta/biolab) +"rG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/gravity_generator/main/off, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"rJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/away_general_access, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"rL" = ( +/obj/machinery/atmospherics/components/unary/airlock_pump, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/beta/mining) +"rN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle{ + pixel_x = 4; + list_reagents = list(/datum/reagent/growthserum=30); + name = "Experimental solution"; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle{ + pixel_x = -4; + list_reagents = list(/datum/reagent/consumable/nutriment/peptides=30); + name = "Solution for Molly" + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/textured_edge, +/area/ruin/space/ancientstation/delta/biolab) +"rP" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/gravity) +"rQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/item/stack/sheet/iron/fifty, +/obj/machinery/light/small/directional/east, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/delta/hall) +"rR" = ( +/obj/effect/decal/cleanable/generic, +/obj/item/stack/rods, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"rT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/insectguts, +/turf/open/floor/iron/white/textured_large, +/area/ruin/space/ancientstation/delta/biolab) +"rU" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"rY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"si" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"sk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair, +/turf/open/floor/iron/white/textured, +/area/ruin/space/ancientstation/delta/proto) +"ss" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=charlie-2"; + location = "charlie-1" + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"st" = ( +/obj/machinery/washing_machine, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/structure/noticeboard/directional/west, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"sv" = ( +/obj/item/kirbyplants/fern, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/textured, +/area/ruin/space/ancientstation/delta/biolab) +"sw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/gun/energy/laser/retro/old{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/sec) +"sx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/mob/living/basic/alien, +/obj/structure/cable, +/obj/machinery/light/broken/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"sA" = ( +/turf/closed/wall, +/area/ruin/space/ancientstation/beta/gravity) +"sJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink/kitchen/directional/west{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink"; + has_water_reclaimer = 0 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"sL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"sM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/old{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/sec) +"sP" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/beta/hall) +"sR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/emitter{ + dir = 8; + active = 1; + welded = 1; + anchored = 1 + }, +/obj/structure/window/plasma/spawner/directional/west{ + anchored = 0 + }, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"sZ" = ( +/obj/machinery/conveyor{ + id = "beta" + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/mining) +"tc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/away_general_access, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/mining) +"td" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"tf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white/textured, +/area/ruin/space/ancientstation/delta/proto) +"tm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/mapping_helpers/damaged_window, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"tv" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/hall) +"tz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"tB" = ( +/obj/structure/transit_tube{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) +"tC" = ( +/turf/closed/mineral/gold, +/area/space/nearstation) +"tF" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"tH" = ( +/obj/structure/transit_tube{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) +"tJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"tS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/highsecurity, +/obj/machinery/door/firedoor, +/obj/structure/alien/weeds, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "oldstation-aisat" + }, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/hall) +"tT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/frame/machine, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"tW" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "oldstation_rnd" + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/rnd) +"tZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/food/pie_smudge, +/obj/item/plate_shard, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"ua" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/old, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/sec) +"uj" = ( +/turf/closed/wall/r_wall, +/area/ruin/space/ancientstation/delta/proto) +"um" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/shard, +/obj/effect/decal/cleanable/blood/xtracks{ + dir = 6 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/ruin/space/ancientstation/delta/biolab) +"un" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"uo" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/item/light/tube/broken, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/ruin/space/ancientstation/delta/biolab) +"up" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 8 + }, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"ur" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_storage_unit/void_old/jetpack, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/mining) +"uv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/warning/chem_diamond/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"uw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"ux" = ( +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/beta/hall) +"uy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"uB" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"uI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/away_general_access, +/turf/open/floor/iron/white/textured_edge{ + dir = 4 + }, +/area/ruin/space/ancientstation/delta/biolab) +"uO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"uR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"uS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"uT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/sec) +"uX" = ( +/obj/item/shard, +/obj/item/stack/rods, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/obj/structure/broken_flooring/corner/directional/east, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/dorms) +"uY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/sec) +"uZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/white/textured_corner{ + dir = 1 + }, +/area/ruin/space/ancientstation/delta/biolab) +"vh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"vk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/shard/plasma, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"vn" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/hydroponics/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hydro) +"vq" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"vs" = ( +/obj/machinery/light/small/red/directional/east, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/charlie/engie) +"vv" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/closet/crate, +/obj/item/stack/sheet/mineral/silver{ + amount = 25 + }, +/obj/item/stack/sheet/mineral/gold{ + amount = 25 + }, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) +"vy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/ruin/space/ancientstation/delta/biolab) +"vD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/away_general_access, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"vJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/broken/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"vL" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"vO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"vS" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"vU" = ( +/obj/effect/decal/cleanable/dirt, +/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/ruin/space/ancientstation/delta/hall) +"vY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash, +/obj/structure/cable, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"wa" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/gravity) +"wb" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"wi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/command{ + name = "Charlie Station Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"wl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/random/dead, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/bridge) +"wm" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/atmos) +"wn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/decal/remains/human, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"wo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"wp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"wr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/alien/drone, +/obj/machinery/duct, +/obj/machinery/light/broken/directional/south, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"wt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/old{ + dir = 1 + }, +/turf/open/floor/iron/white/textured, +/area/ruin/space/ancientstation/delta/proto) +"ww" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/bridge) +"wx" = ( +/turf/closed/wall, +/area/ruin/space/ancientstation/delta/rnd) +"wz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"wC" = ( +/obj/effect/decal/cleanable/dirt, +/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, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"wD" = ( +/turf/closed/mineral/uranium, +/area/space/nearstation) +"wE" = ( +/obj/machinery/door/airlock/engineering{ + name = "Supermatter Chamber" + }, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"wJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/old{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"wK" = ( +/obj/machinery/computer/pandemic{ + machine_stat = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/textured_edge, +/area/ruin/space/ancientstation/delta/biolab) +"wL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"wO" = ( +/obj/machinery/hydroponics/soil, +/obj/machinery/light/small/directional/south, +/turf/open/floor/grass, +/area/ruin/space/ancientstation/charlie/hydro) +"wP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/light/broken/directional/north, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"wR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/airlock_pump{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/charlie/engie) +"wS" = ( +/obj/item/stack/rods, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"xd" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/folder/white, +/obj/item/reagent_containers/cup/beaker, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/dropper, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"xi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/snack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/sec) +"xr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"xs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=delta-2"; + location = "delta-1" + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"xx" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/away_general_access, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"xz" = ( +/obj/machinery/duct, +/obj/structure/curtain, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/charlie/hall) +"xF" = ( +/obj/structure/transit_tube{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/mapping_helpers/damaged_window, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/hall) +"xH" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/cable, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"xM" = ( +/obj/machinery/door/window/right/directional/east{ + req_access = list("away_general") + }, +/turf/open/floor/engine, +/area/ruin/space/ancientstation/delta/biolab) +"xT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/broken_flooring/corner/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"xW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/reagent_containers/condiment/enzyme, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"xY" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/poddoor{ + id = "Beta Secure Storage"; + name = "Secure Storage" + }, +/turf/open/floor/iron/textured_large, +/area/ruin/space/ancientstation/beta/supermatter) +"yc" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/medbay) +"ye" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"yk" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Air to Distro" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/hall) +"yq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/sign/warning/vacuum/directional/west, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"yr" = ( +/obj/structure/sign/warning/biohazard, +/turf/closed/wall/rust, +/area/ruin/space/ancientstation/delta/biolab) +"yu" = ( +/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/door/poddoor{ + id = "ancient" + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"yw" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/broken_flooring/pile/directional/north, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"yx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) +"yF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"yG" = ( +/obj/machinery/door/airlock/science/glass, +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"yQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/plasma/spawner/directional/south, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"yS" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"yZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/broken/directional/east, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"ze" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/autolathe, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"zf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/delta/rnd) +"zi" = ( +/obj/item/kirbyplants/random/dead, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/small/broken/directional/west, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/airless, +/area/ruin/space/ancientstation/beta/medbay) +"zj" = ( +/obj/machinery/door/airlock/science{ + name = "Biolab" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/closed, +/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/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron/white/textured_large, +/area/ruin/space/ancientstation/delta/biolab) +"zm" = ( +/obj/machinery/door/window/brigdoor/right/directional/west{ + name = "Plasma Canister Storage" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/atmos) +"zn" = ( /obj/machinery/door/airlock/engineering{ name = "Gravity Generator" }, @@ -4863,27 +6921,24 @@ }, /turf/template_noop, /area/space/nearstation) -"zU" = ( +"zX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/command{ - name = "Delta Station Access" - }, -/obj/machinery/door/poddoor{ - id = "ancient" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/duct, -/obj/effect/mapping_helpers/airlock/access/all/away/general, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, /turf/open/floor/iron, -/area/ruin/space/ancientstation/charlie/hall) +/area/ruin/space/ancientstation/charlie/engie) +"zZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) "Aa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4945,6 +7000,7 @@ "Au" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -5009,6 +7065,7 @@ /obj/structure/tank_dispenser/plasma, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/atmos) +<<<<<<< HEAD "AO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5019,6 +7076,8 @@ /obj/structure/sign/warning/vacuum/directional/west, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "AT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5119,6 +7178,18 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/hall) +<<<<<<< HEAD +======= +"By" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/monitor, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Bz" = ( /turf/open/floor/plating/airless, /area/ruin/space/ancientstation/beta/hall) @@ -5157,6 +7228,14 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/ruin/space/ancientstation/delta/rnd) +<<<<<<< HEAD +======= +"BP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BR" = ( /obj/machinery/shower/directional/west{ has_water_reclaimer = 0 @@ -5176,6 +7255,7 @@ /obj/item/ammo_box/strilka310, /turf/open/floor/plating, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD "BT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 @@ -5183,6 +7263,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/airless, /area/ruin/space/ancientstation/beta/supermatter) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Cc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -5404,6 +7486,110 @@ /obj/effect/decal/cleanable/blood/tracks, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "oldstation-aisat" +<<<<<<< HEAD + }, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/hall) +"DJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"DK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/broken_canister_frame, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"DM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/mop_bucket/janitorialcart{ + dir = 4 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/item/storage/bag/trash/filled, +/turf/open/floor/plating/rust{ + initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15" + }, +/area/ruin/space/ancientstation/delta/hall) +"DQ" = ( +/obj/item/kirbyplants/fern, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/turf/open/floor/iron/white/textured, +/area/ruin/space/ancientstation/delta/biolab) +"DX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/mapping_helpers/damaged_window, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/dorms) +"Eg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"Eh" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"Ei" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"Ej" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/lights/mixed, +/turf/open/floor/plating{ + initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15" + }, +/area/ruin/space/ancientstation/delta/hall) +"El" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/shard, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"En" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"EB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"ED" = ( +/obj/structure/transit_tube{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/hall) +"EE" = ( +======= }, /obj/effect/mapping_helpers/airlock/access/all/away/general, /turf/open/floor/iron/dark, @@ -5530,6 +7716,583 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +"EI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/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/ruin/space/ancientstation/delta/hall) +"EP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"ES" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/energy_accumulator/tesla_coil, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/supermatter) +"EW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 8 + }, +/obj/structure/sign/departments/medbay/directional/west, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"EX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/machinery/navbeacon{ + location = "delta-0"; + codes_txt = "patrol;next_patrol=delta-1" + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"Fa" = ( +/obj/structure/sink/directional/west{ + has_water_reclaimer = 0 + }, +/obj/structure/mirror/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/charlie/hall) +"Fd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"Fi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/delta/hall) +"Fm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/tank/internals/oxygen{ + pixel_y = -8; + pixel_x = 8 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"Fo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/item/stack/rods, +/obj/item/trash/sosjerky{ + pixel_y = 9; + pixel_x = -6 + }, +/turf/open/floor/plating/rust{ + initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15" + }, +/area/ruin/space/ancientstation/delta/hall) +"Fr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"Ft" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vatgrower, +/turf/open/floor/engine, +/area/ruin/space/ancientstation/delta/biolab) +"Fv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) +"Fw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"Fz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"FJ" = ( +/obj/structure/alien/weeds, +/obj/machinery/light/small/broken/directional/west, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/ai) +"FK" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/iron{ + amount = 50 + }, +/obj/item/stack/sheet/iron{ + amount = 25 + }, +/obj/item/clothing/gloves/color/yellow, +/obj/item/stack/sheet/glass{ + amount = 25 + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/hall) +"FM" = ( +/obj/structure/transit_tube{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, +/turf/template_noop, +/area/space/nearstation) +"FN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/wrench, +/obj/item/wirecutters, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/away_general_access, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/storage) +"FP" = ( +/obj/item/shard/plasma{ + icon_state = "plasmasmall" + }, +/obj/effect/decal/cleanable/glass/plasma, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"FR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"FV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"FX" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "oldstation_rnd" + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/rnd) +"FY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"Ga" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/food/flour, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"Gd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/stack/sheet/glass{ + amount = 25 + }, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/charlie/hall) +"Gf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/structure/sign/poster/official/no_erp/directional/west, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/charlie/hall) +"Gi" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2{ + dir = 4 + }, +/obj/structure/sign/warning/no_smoking/circle/directional/east, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/atmos) +"Go" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/ruin/space/ancientstation/delta/biolab) +"Gr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) +"Gt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/engie) +"Gv" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/proto) +"Gz" = ( +/turf/closed/wall/rust, +/area/ruin/space/ancientstation/delta/hall) +"GA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/components/binary/tank_compressor{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"GH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"GJ" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"GK" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Storage Room" + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/hall) +"GN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"GX" = ( +/turf/closed/wall/rust, +/area/ruin/space/ancientstation/delta/biolab) +"GY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/delta/rnd) +"Hf" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/mining) +"Hj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"Hk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/broken/directional/west, +/turf/open/floor/iron/white, +/area/ruin/space/ancientstation/delta/rnd) +"Hl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/highsecurity{ + name = "Prototype Laboratory" + }, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side, +/area/ruin/space/ancientstation/delta/proto) +"Hp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 9 + }, +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=charlie-0"; + location = "charlie-3" + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hall) +"Hr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/card/id/away/old/robo, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating{ + initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15" + }, +/area/ruin/space/ancientstation/delta/hall) +"Hw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/diagonal, +/area/ruin/space/ancientstation/beta/gravity) +"HA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) +"HC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/machinery/button/door/directional/south{ + name = "Research Shutters Control"; + id = "oldstation_rnd" + }, +/obj/structure/table, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/micro_laser, +/obj/item/stack/cable_coil, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"HE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor/closed, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"HG" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/hall) +"HK" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, +/turf/template_noop, +/area/space/nearstation) +"HL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general, +/obj/machinery/meter, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/charlie/hall) +"HN" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/item/paper/fluff/ruins/oldstation/biolab_note_emergency{ + pixel_x = 8; + pixel_y = 13 + }, +/obj/effect/decal/remains/human{ + pixel_x = 9 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/textured_edge{ + dir = 8 + }, +/area/ruin/space/ancientstation/delta/biolab) +"HQ" = ( +/obj/structure/transit_tube{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/duct, +/turf/template_noop, +/area/space/nearstation) +"HT" = ( +/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/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/textured_edge{ + dir = 4 + }, +/area/ruin/space/ancientstation/delta/biolab) +"Ib" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +"Ic" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/white/textured, +/area/ruin/space/ancientstation/delta/proto) +"Ie" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/structure/sign/departments/aisat/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"Ij" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) +"Ik" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/rust, +/area/ruin/space/ancientstation/delta/hall) +"Im" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light_switch/directional/west{ + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"Ip" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kitchen/fork{ + pixel_y = 10; + pixel_x = 9 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/ancientstation/charlie/kitchen) +"Is" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters{ + id = "oldstation_rnd" + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/rnd) +"Iu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/highsecurity{ + name = "Prototype Laboratory" + }, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/obj/structure/cable, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/side, +/area/ruin/space/ancientstation/delta/proto) +"Ix" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/hall) +"Iy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +<<<<<<< HEAD +/obj/structure/sign/departments/custodian/directional/west, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"EF" = ( +/obj/machinery/door/airlock/command{ + name = "Charlie Station Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) "EP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -6140,6 +8903,71 @@ /area/ruin/space/ancientstation/beta/supermatter) "IV" = ( /obj/effect/decal/cleanable/dirt, +======= +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/hall) +"IB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/hydro) +"IC" = ( +/obj/machinery/door/airlock/science/glass, +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) +"IM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/sec) +"IP" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/hall) +"IT" = ( +/obj/machinery/power/solar, +/obj/structure/cable, +/turf/open/floor/iron/solarpanel/airless, +/area/ruin/space/solars/ancientstation/charlie/solars) +"IU" = ( +/obj/structure/closet/crate/engineering, +/obj/item/circuitboard/machine/smes, +/obj/item/stock_parts/power_store/cell/high/empty, +/obj/item/stock_parts/power_store/cell/high/empty, +/obj/item/stock_parts/power_store/cell/high/empty, +/obj/item/stock_parts/power_store/cell/high/empty, +/obj/item/stock_parts/power_store/cell/high/empty, +/obj/item/stock_parts/capacitor, +/obj/effect/decal/cleanable/dirt, +/obj/item/circuitboard/machine/thermomachine, +/obj/item/circuitboard/machine/thermomachine, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/beta/supermatter) +"IV" = ( +/obj/effect/decal/cleanable/dirt, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -6335,6 +9163,15 @@ /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD +======= +"JR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor, +/area/ruin/space/ancientstation/delta/hall) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "JT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6444,11 +9281,14 @@ /obj/item/storage/backpack/duffelbag/sec, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/dorms) +<<<<<<< HEAD "Kt" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/mapping_helpers/airlock/access/all/away/general, /turf/open/floor/iron/dark/airless, /area/ruin/space/ancientstation/delta/hall) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ku" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -6538,12 +9378,15 @@ /obj/item/paper/guides/jobs/engi/gravity_gen, /turf/open/floor/iron/diagonal, /area/ruin/space/ancientstation/beta/gravity) +<<<<<<< HEAD "KW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/ruin/space/ancientstation/delta/hall) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "KX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6553,12 +9396,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/ruin/space/ancientstation/beta/hall) +<<<<<<< HEAD "Lb" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/hall) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Lc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6583,22 +9429,37 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD "Lg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/door/airlock/external/glass/ruin, +======= +"Lh" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/engine/o2, +/area/ruin/space/ancientstation/beta/atmos) +"Li" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 6 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 5 }, +<<<<<<< HEAD /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/charlie/engie) "Lh" = ( /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/engine/o2, /area/ruin/space/ancientstation/beta/atmos) +======= +/turf/open/floor/catwalk_floor, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Lm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6712,6 +9573,7 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/iron/white/textured_large, /area/ruin/space/ancientstation/delta/biolab) +<<<<<<< HEAD "LO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/command{ @@ -6732,6 +9594,8 @@ /obj/effect/mapping_helpers/airlock/access/all/away/general, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hall) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LS" = ( /obj/structure/table, /obj/item/stack/sheet/glass, @@ -6801,11 +9665,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hall) +<<<<<<< HEAD "Mh" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/mapping_helpers/airlock/access/all/away/general, /turf/open/floor/iron/dark/airless, /area/ruin/space/ancientstation/beta/mining) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Mr" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -6927,6 +9794,17 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/ruin/space/ancientstation/beta/supermatter) +<<<<<<< HEAD +======= +"Ni" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/safety_internals/directional/north, +/obj/machinery/atmospherics/components/unary/airlock_pump{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/hall) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Np" = ( /obj/effect/decal/cleanable/blood/xtracks{ dir = 10 @@ -6941,6 +9819,7 @@ /obj/structure/window/plasma/spawner/directional/west, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) +<<<<<<< HEAD "Nu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -6954,6 +9833,11 @@ "Nx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +======= +"Nx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, @@ -6980,12 +9864,27 @@ /obj/structure/table_frame, /turf/open/floor/iron/airless, /area/ruin/space/ancientstation/beta/medbay) +<<<<<<< HEAD "ND" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/portables_connector/layer4{ dir = 1 }, +======= +"NC" = ( +/obj/machinery/atmospherics/components/unary/airlock_pump{ + dir = 1 + }, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"ND" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -7038,6 +9937,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured_half, /area/ruin/space/ancientstation/beta/supermatter) +<<<<<<< HEAD "NV" = ( /obj/machinery/door/airlock/command{ name = "Beta Station Access" @@ -7057,6 +9957,8 @@ /obj/effect/mapping_helpers/airlock/access/all/away/general, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hall) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "NW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ @@ -7239,11 +10141,14 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/white/textured, /area/ruin/space/ancientstation/delta/proto) +<<<<<<< HEAD "Pa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Pd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7275,6 +10180,14 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/sec) +<<<<<<< HEAD +======= +"Po" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/ancientstation/delta/hall) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Pq" = ( /obj/machinery/door/airlock/science, /obj/effect/decal/cleanable/dirt, @@ -7506,15 +10419,19 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/rnd) +<<<<<<< HEAD "QW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "QZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) +<<<<<<< HEAD "Re" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7523,6 +10440,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +======= +"Rd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Rf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -7548,6 +10479,7 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD "Rs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -7556,6 +10488,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Rv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -7783,6 +10717,23 @@ "Td" = ( /turf/closed/mineral/random, /area/ruin/space/ancientstation/beta/hall) +<<<<<<< HEAD +======= +"Tf" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Tg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -7816,6 +10767,7 @@ /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/floor/plating, /area/ruin/space/ancientstation/charlie/storage) +<<<<<<< HEAD "Tn" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -7835,6 +10787,19 @@ pixel_y = 8; pixel_x = 2 }, +======= +"Tq" = ( +/obj/structure/alien/weeds, +/obj/machinery/light/small/broken/directional/east, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/ai) +"Tr" = ( +/obj/structure/table/glass, +/obj/structure/closet/mini_fridge/grimy{ + pixel_y = 8; + pixel_x = 2 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/petri_dish/oldstation, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 @@ -7950,6 +10915,7 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, /area/ruin/space/solars/ancientstation/charlie/solars) +<<<<<<< HEAD "Uc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -7980,6 +10946,31 @@ "Un" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, +======= +"Ui" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/hall) +"Uj" = ( +/obj/structure/girder, +/turf/closed/mineral/random, +/area/ruin/space/ancientstation/beta/hall) +"Ul" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass/plasma, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/ruin/space/ancientstation/beta/supermatter) +"Un" = ( +/obj/item/stack/rods, +/obj/effect/decal/cleanable/dirt, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/broken_flooring/pile/directional/south, /turf/open/floor/plating, /area/ruin/space/ancientstation/charlie/dorms) @@ -8002,6 +10993,18 @@ /obj/item/soap/nanotrasen, /turf/open/floor/iron/white, /area/ruin/space/ancientstation/charlie/hall) +<<<<<<< HEAD +======= +"Us" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/catwalk_floor, +/area/ruin/space/ancientstation/beta/mining) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Uu" = ( /turf/closed/mineral/plasma, /area/space/nearstation) @@ -8027,6 +11030,18 @@ "UJ" = ( /turf/open/floor/iron/white/textured, /area/ruin/space/ancientstation/delta/proto) +<<<<<<< HEAD +======= +"UN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "UP" = ( /turf/closed/mineral/random, /area/space/nearstation) @@ -8094,6 +11109,7 @@ /obj/machinery/griddle, /turf/open/floor/iron/cafeteria, /area/ruin/space/ancientstation/charlie/kitchen) +<<<<<<< HEAD "Vq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -8106,6 +11122,8 @@ }, /turf/open/floor/plating, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Vw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -8160,6 +11178,14 @@ }, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) +<<<<<<< HEAD +======= +"VU" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/mapping_helpers/airlock/access/all/away/general, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/ancientstation/beta/mining) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "VV" = ( /turf/open/floor/plating, /area/ruin/space/ancientstation/delta/hall) @@ -8167,6 +11193,21 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/engine, /area/ruin/space/ancientstation/delta/biolab) +<<<<<<< HEAD +======= +"Wa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/door/airlock/external/glass/ruin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Wd" = ( /obj/effect/decal/cleanable/blood/xtracks{ dir = 5 @@ -8182,6 +11223,19 @@ /obj/structure/lattice/catwalk, /turf/template_noop, /area/space/nearstation) +<<<<<<< HEAD +======= +"Wn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/sign/warning/vacuum/directional/west, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Wp" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -8309,6 +11363,7 @@ /obj/effect/mapping_helpers/apc/away_general_access, /turf/open/floor/iron/white/textured, /area/ruin/space/ancientstation/delta/proto) +<<<<<<< HEAD "Xr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -8320,6 +11375,8 @@ }, /turf/open/floor/plating, /area/ruin/space/ancientstation/charlie/engie) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Xs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/transit_tube/station/reverse/flipped{ @@ -8370,6 +11427,20 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD +======= +"XJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/charlie/engie) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "XK" = ( /obj/machinery/door/airlock/atmos/glass{ name = "Station Atmospherics" @@ -8722,6 +11793,17 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +<<<<<<< HEAD +======= +"ZN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ZP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -10588,9 +13670,15 @@ Hj rJ uw wn +<<<<<<< HEAD Pa dW hR +======= +BP +Im +UN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SK Jg Jg @@ -10656,7 +13744,11 @@ Hj vY Sk wo +<<<<<<< HEAD Tn +======= +GJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vl cx cx @@ -10722,11 +13814,19 @@ iv Qi ZD Hj +<<<<<<< HEAD iS xS BT fy HF +======= +ZN +qx +rY +NC +mP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jg aa aa @@ -11292,11 +14392,19 @@ aa aa aa aa +<<<<<<< HEAD Mh wI sF tg Uc +======= +VU +rL +Us +dj +mB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cm cm gh @@ -11508,7 +14616,11 @@ aa aa eI Ma +<<<<<<< HEAD qT +======= +qQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eI aa aa @@ -11573,8 +14685,13 @@ aa aa aa Ma +<<<<<<< HEAD QW qH +======= +iY +wR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ma aa aa @@ -11639,8 +14756,13 @@ aa aa aa Ma +<<<<<<< HEAD uq se +======= +vs +Li +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ma aa aa @@ -11706,7 +14828,11 @@ Ma eI dl eI +<<<<<<< HEAD Lg +======= +Wa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eI Ma eI @@ -11768,11 +14894,19 @@ mS jE aa Ma +<<<<<<< HEAD al YT fc AO bH +======= +By +YT +fc +Wn +Tf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 YM hl lo @@ -11834,11 +14968,19 @@ mS jE dl eI +<<<<<<< HEAD Ht ju hm Yi Nu +======= +pI +ju +hm +Yi +Gt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Yi hm em @@ -11904,7 +15046,11 @@ kJ em fe fE +<<<<<<< HEAD Vq +======= +Rd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fE fe em @@ -11966,11 +15112,19 @@ mY kQ AX em +<<<<<<< HEAD ue eM pn fF Xr +======= +hJ +eM +pn +fF +XJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wL QZ hP @@ -12032,10 +15186,17 @@ mY kQ lJ oP +<<<<<<< HEAD Rs jy jz xX +======= +en +zZ +zX +el +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kJ WA ho @@ -12093,8 +15254,13 @@ aT hi hi hi +<<<<<<< HEAD FF NV +======= +cd +nb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hi eI eI @@ -12248,7 +15414,11 @@ JJ XZ Ga HL +<<<<<<< HEAD tw +======= +yk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hT aT aa @@ -13150,7 +16320,11 @@ aT aT aT bX +<<<<<<< HEAD LO +======= +nd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bX eJ eJ @@ -13166,7 +16340,11 @@ eJ eJ eJ hM +<<<<<<< HEAD zU +======= +ib +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bX aT hi @@ -13884,7 +17062,11 @@ zL UP bE bE +<<<<<<< HEAD Kt +======= +Po +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bE bE hF @@ -13950,7 +17132,11 @@ Fo Hr cs Gz +<<<<<<< HEAD vQ +======= +Ni +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bE Ac TV @@ -14016,7 +17202,11 @@ LH Bu Ej Gz +<<<<<<< HEAD KW +======= +JR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Gz Ac Ik @@ -14082,7 +17272,11 @@ XD Gz Gz bE +<<<<<<< HEAD Lb +======= +Ui +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Gz bE Gz @@ -14148,7 +17342,11 @@ MS EE cD Dg +<<<<<<< HEAD Re +======= +EI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yq cD TA @@ -15204,7 +18402,11 @@ NG GX GX yr +<<<<<<< HEAD dg +======= +zj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rp rp rp diff --git a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm index fe750bec853..464332c4637 100644 --- a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm +++ b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm @@ -85,6 +85,16 @@ }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/the_outlet/researchrooms) +<<<<<<< HEAD +======= +"cL" = ( +/obj/effect/rune/apocalypse{ + req_cultists = 999 + }, +/obj/structure/destructible/cult/pants_altar, +/turf/open/floor/cult, +/area/ruin/space/has_grav/the_outlet/cultinfluence) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cZ" = ( /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood/gibs{ @@ -548,6 +558,21 @@ /obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/the_outlet/researchrooms) +<<<<<<< HEAD +======= +"oI" = ( +/obj/structure/rack, +/obj/item/clothing/head/cowboy/brown, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/under/costume/dutch, +/obj/item/clothing/suit/costume/poncho, +/obj/item/cigarette/cigar, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/eighties, +/area/ruin/space/has_grav/the_outlet/storefront) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ps" = ( /obj/structure/rack, /obj/item/clothing/under/misc/bouncer, @@ -1017,6 +1042,7 @@ }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/the_outlet/cultinfluence) +<<<<<<< HEAD "zk" = ( /obj/structure/rack, /obj/item/clothing/head/cowboy/brown, @@ -1029,6 +1055,8 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/eighties, /area/ruin/space/has_grav/the_outlet/storefront) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zm" = ( /obj/effect/spawner/random/vending/colavend, /turf/open/floor/eighties, @@ -1682,6 +1710,7 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/iron/white, /area/ruin/space/has_grav/the_outlet/researchrooms) +<<<<<<< HEAD "Ob" = ( /obj/effect/rune/apocalypse{ req_cultists = 999 @@ -1689,6 +1718,8 @@ /obj/structure/destructible/cult/pants_altar, /turf/open/floor/cult, /area/ruin/space/has_grav/the_outlet/cultinfluence) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Od" = ( /obj/effect/baseturf_helper/asteroid/airless, /turf/open/floor/cult, @@ -3430,7 +3461,11 @@ HV xI TM nq +<<<<<<< HEAD zk +======= +oI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HH HH Kp @@ -3635,7 +3670,11 @@ qy wl RO PE +<<<<<<< HEAD Ob +======= +cL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ML RO zc diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 1abeb5c67e6..41fcd3280d4 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -102,6 +102,17 @@ "bi" = ( /turf/open/floor/iron/white/textured_large, /area/awaymission/beach) +"bo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/tile/dark/half{ + pixel_y = -1; + pixel_x = 5; + dir = 8 + }, +/turf/open/water/beach, +/area/awaymission/beach) "bx" = ( /obj/effect/turf_decal/sand, /obj/machinery/door/airlock/wood{ @@ -355,10 +366,6 @@ }, /turf/open/floor/iron/white/textured_large, /area/awaymission/beach) -"fc" = ( -/obj/item/broken_bottle, -/turf/open/misc/beach/sand, -/area/awaymission/beach) "fd" = ( /obj/structure/table/bronze, /obj/structure/desk_bell{ @@ -499,6 +506,10 @@ }, /turf/closed/wall/mineral/wood, /area/awaymission/beach) +"gq" = ( +/obj/item/broken_bottle, +/turf/open/misc/beach/sand, +/area/awaymission/beach) "gw" = ( /obj/item/stack/sheet/mineral/sandstone{ pixel_x = -8 @@ -888,17 +899,6 @@ /obj/structure/table/wood, /turf/open/floor/wood/large, /area/awaymission/beach) -"lk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/effect/turf_decal/tile/dark/half{ - pixel_y = -1; - pixel_x = 5; - dir = 8 - }, -/turf/open/water/beach, -/area/awaymission/beach) "ll" = ( /obj/machinery/door/airlock/wood{ name = "Room 11"; @@ -1072,16 +1072,6 @@ /obj/structure/table/glass, /turf/open/floor/wood/large, /area/awaymission/beach) -"nu" = ( -/obj/structure/sign/directions/dorms/directional/north{ - pixel_y = 35 - }, -/obj/structure/sign/directions/medical/directional/north{ - pixel_y = 29 - }, -/obj/machinery/computer/slot_machine, -/turf/open/floor/wood/large, -/area/awaymission/beach) "nC" = ( /obj/effect/turf_decal/tile/dark_red/full, /turf/open/floor/iron/smooth_large, @@ -1195,6 +1185,10 @@ }, /turf/open/misc/beach/sand, /area/awaymission/beach) +"pq" = ( +/obj/effect/spawner/random/trash/cigbutt, +/turf/open/misc/beach/sand, +/area/awaymission/beach) "pr" = ( /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ pixel_x = -17; @@ -1630,10 +1624,6 @@ }, /turf/open/floor/iron/dark/diagonal, /area/awaymission/beach) -"uK" = ( -/obj/effect/spawner/random/trash/cigbutt, -/turf/open/misc/beach/sand, -/area/awaymission/beach) "uL" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -2345,11 +2335,6 @@ }, /turf/open/misc/beach/sand, /area/awaymission/beach) -"DS" = ( -/obj/effect/mob_spawn/corpse/human/old_pirate_captain, -/obj/structure/bed/maint, -/turf/open/misc/beach/sand, -/area/awaymission/beach) "DU" = ( /obj/structure/table/bronze, /turf/open/misc/beach/sand, @@ -2586,13 +2571,6 @@ }, /turf/open/misc/beach/sand, /area/awaymission/beach) -"FJ" = ( -/obj/item/instrument/guitar{ - pixel_y = 4; - pixel_x = -1 - }, -/turf/open/misc/beach/coast, -/area/awaymission/beach) "FK" = ( /obj/item/toy/seashell{ pixel_x = 12; @@ -2869,6 +2847,17 @@ /obj/machinery/light/directional/west, /turf/open/floor/wood/large, /area/awaymission/beach) +"Jv" = ( +/obj/item/paper/fluff/old_pirate_note{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/pen/fountain{ + pixel_y = -11; + pixel_x = -8 + }, +/turf/open/misc/beach/sand, +/area/awaymission/beach) "JF" = ( /obj/structure/marker_beacon/burgundy, /turf/open/water/beach, @@ -2973,6 +2962,13 @@ }, /turf/open/misc/beach/sand, /area/awaymission/beach) +"KQ" = ( +/obj/item/instrument/guitar{ + pixel_y = 4; + pixel_x = -1 + }, +/turf/open/misc/beach/coast, +/area/awaymission/beach) "KV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -3270,17 +3266,6 @@ }, /turf/open/floor/iron/white/textured_large, /area/awaymission/beach) -"Oa" = ( -/obj/item/paper/fluff/old_pirate_note{ - pixel_x = -5; - pixel_y = -7 - }, -/obj/item/pen/fountain{ - pixel_y = -11; - pixel_x = -8 - }, -/turf/open/misc/beach/sand, -/area/awaymission/beach) "Og" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, @@ -3354,6 +3339,12 @@ }, /turf/open/misc/beach/sand, /area/awaymission/beach) +"Pb" = ( +/obj/item/fishing_rod, +/obj/structure/closet/crate/trashcart, +/obj/item/reagent_containers/cup/glass/bottle/rum/aged, +/turf/open/misc/beach/sand, +/area/awaymission/beach) "Pe" = ( /turf/open/misc/beach/coast{ dir = 5 @@ -3402,6 +3393,11 @@ }, /turf/open/misc/beach/sand, /area/awaymission/beach) +"PU" = ( +/obj/effect/mob_spawn/corpse/human/old_pirate_captain, +/obj/structure/bed/maint, +/turf/open/misc/beach/sand, +/area/awaymission/beach) "Qe" = ( /obj/effect/turf_decal/sand, /obj/machinery/door/airlock/wood{ @@ -3418,12 +3414,6 @@ "Qg" = ( /turf/open/floor/wood/parquet, /area/awaymission/beach) -"Qj" = ( -/obj/item/fishing_rod, -/obj/structure/closet/crate/trashcart, -/obj/item/reagent_containers/cup/glass/bottle/rum/aged, -/turf/open/misc/beach/sand, -/area/awaymission/beach) "Qk" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/suit/jacket/miljacket, @@ -4026,6 +4016,16 @@ "Zp" = ( /turf/open/floor/wood/large, /area/awaymission/beach) +"Zs" = ( +/obj/structure/sign/directions/dorms/directional/north{ + pixel_y = 35 + }, +/obj/structure/sign/directions/medical/directional/north{ + pixel_y = 29 + }, +/obj/machinery/computer/slot_machine, +/turf/open/floor/wood/large, +/area/awaymission/beach) "Zt" = ( /obj/structure/table/bronze, /obj/item/storage/toolbox/fishing{ @@ -7445,8 +7445,8 @@ XB XB Vf YV -Qj -fc +Pb +gq hL ni XB @@ -7702,8 +7702,8 @@ XB XB Vf VY -uK -DS +pq +PU Er BK XB @@ -7959,7 +7959,7 @@ XB XB Vf VY -Oa +Jv VY VY BK @@ -8217,7 +8217,7 @@ XB Vf IZ VY -uK +pq VY BK XB @@ -13240,7 +13240,7 @@ xv xv xv xv -nu +Zs Zp Zp mb @@ -16314,7 +16314,7 @@ vx Bq Xd Ej -lk +bo LC XB XB @@ -29450,7 +29450,7 @@ VY VY Rn VY -FJ +KQ xv CG Gh diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 1dce7d2ab60..857064d96aa 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -1390,10 +1390,13 @@ }, /turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) +<<<<<<< HEAD "jE" = ( /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/blue, /area/awaymission/moonoutpost19/arrivals) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jH" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1906,6 +1909,20 @@ "mr" = ( /turf/open/floor/mineral/titanium/yellow, /area/awaymission/moonoutpost19/arrivals) +<<<<<<< HEAD +======= +"ms" = ( +/obj/effect/landmark/awaystart/moonoutpost, +/turf/open/floor/mineral/titanium/blue, +/area/awaymission/moonoutpost19/arrivals) +"mt" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/awaystart/moonoutpost, +/turf/open/floor/mineral/titanium/blue, +/area/awaymission/moonoutpost19/arrivals) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mu" = ( /obj/machinery/light/small/directional/east, /obj/structure/window/reinforced/spawner/directional/north, @@ -1947,6 +1964,23 @@ }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/moonoutpost19/arrivals) +<<<<<<< HEAD +======= +"mI" = ( +/obj/effect/landmark/awaystart/moonoutpost, +/turf/open/floor/mineral/titanium/yellow, +/area/awaymission/moonoutpost19/arrivals) +"mJ" = ( +/obj/structure/sign/warning/vacuum{ + desc = "A beacon used by a teleporter."; + icon = 'icons/obj/devices/tracker.dmi'; + icon_state = "beacon"; + name = "tracking beacon" + }, +/obj/effect/landmark/awaystart/moonoutpost, +/turf/open/floor/mineral/titanium/yellow, +/area/awaymission/moonoutpost19/arrivals) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mK" = ( /obj/machinery/door/airlock/titanium{ name = "Shuttle Airlock" @@ -4584,6 +4618,7 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) +<<<<<<< HEAD "Ei" = ( /obj/structure/sign/warning/vacuum{ desc = "A beacon used by a teleporter."; @@ -4594,6 +4629,8 @@ /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/moonoutpost19/arrivals) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ep" = ( /turf/closed/mineral/random/labormineral, /area/awaymission/moonoutpost19/mines) @@ -5128,6 +5165,7 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/research) +<<<<<<< HEAD "HX" = ( /obj/structure/chair{ dir = 8 @@ -5135,6 +5173,8 @@ /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/blue, /area/awaymission/moonoutpost19/arrivals) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HY" = ( /obj/structure/sign/departments/science{ pixel_y = 32 @@ -7674,10 +7714,13 @@ /obj/effect/spawner/random/medical/surgery_tool, /turf/open/misc/asteroid/moon/dug, /area/awaymission/moonoutpost19/mines) +<<<<<<< HEAD "Zk" = ( /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/moonoutpost19/arrivals) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Zo" = ( /turf/open/floor/pod/light, /area/awaymission/moonoutpost19/tent) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index fb40f75070e..503741e367e 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -5231,6 +5231,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) +<<<<<<< HEAD +======= +"sU" = ( +/obj/effect/turf_decal/weather/snow, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/computer{ + desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; + dir = 4; + icon_screen = null; + name = "Shuttle Transit Console" + }, +/turf/open/floor/iron/dark/snowdin, +/area/awaymission/snowdin/outside) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sX" = ( /obj/item/disk/holodisk/snowdin/ripjacob, /obj/structure/cable, @@ -5692,11 +5708,14 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) +<<<<<<< HEAD "vv" = ( /obj/structure/table, /obj/item/trash/waffles, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vw" = ( /obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, @@ -5812,6 +5831,18 @@ }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) +<<<<<<< HEAD +======= +"wc" = ( +/obj/machinery/computer{ + desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; + dir = 1; + icon_screen = null; + name = "Shuttle Transit Console" + }, +/turf/open/floor/mineral/titanium/blue, +/area/awaymission/snowdin/post/broken_shuttle) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wd" = ( /obj/item/shard, /obj/structure/flora/grass/both/style_random, @@ -9689,6 +9720,7 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) +<<<<<<< HEAD "OY" = ( /obj/machinery/computer{ desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; @@ -9698,6 +9730,8 @@ }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -10098,6 +10132,7 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) +<<<<<<< HEAD "QW" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/stripes/white/line{ @@ -10111,6 +10146,8 @@ }, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "QY" = ( /obj/structure/girder, /obj/effect/turf_decal/weather/snow, @@ -25007,7 +25044,11 @@ Kd ex fJ gA +<<<<<<< HEAD vv +======= +hq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hW iH jz diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index e77200a0aca..33ebba37aa8 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -99,6 +99,41 @@ /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, /turf/open/floor/iron/dark, +<<<<<<< HEAD +======= +/area/awaymission/undergroundoutpost45/central) +"ax" = ( +/obj/effect/landmark/awaystart/underground, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/central) +"ay" = ( +/obj/structure/chair/comfy/beige{ + dir = 4 + }, +/obj/effect/landmark/awaystart/underground, +/turf/open/floor/iron/grimy, +/area/awaymission/undergroundoutpost45/central) +"az" = ( +/obj/structure/sign/warning/vacuum{ + desc = "A beacon used by a teleporter."; + icon = 'icons/obj/devices/tracker.dmi'; + icon_state = "beacon"; + name = "tracking beacon" + }, +/obj/effect/landmark/awaystart/underground, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/central) +"aB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/landmark/awaystart/underground, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/undergroundoutpost45/central) "aC" = ( /turf/closed/wall, @@ -184,6 +219,13 @@ /area/awaymission/undergroundoutpost45/central) "aS" = ( /turf/open/floor/iron, +<<<<<<< HEAD +======= +/area/awaymission/undergroundoutpost45/central) +"aT" = ( +/obj/effect/landmark/awaystart/underground, +/turf/open/floor/iron/grimy, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/undergroundoutpost45/central) "aU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -5436,10 +5478,13 @@ dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) +<<<<<<< HEAD "uB" = ( /obj/effect/landmark/awaystart/underground, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uC" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -5906,6 +5951,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) +<<<<<<< HEAD "wm" = ( /obj/structure/chair/comfy/beige{ dir = 4 @@ -5913,6 +5959,8 @@ /obj/effect/landmark/awaystart/underground, /turf/open/floor/iron/grimy, /area/awaymission/undergroundoutpost45/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wn" = ( /turf/closed/wall/rust, /area/awaymission/undergroundoutpost45/engineering) @@ -7092,10 +7140,13 @@ }, /turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) +<<<<<<< HEAD "LC" = ( /obj/effect/landmark/awaystart/underground, /turf/open/floor/iron/grimy, /area/awaymission/undergroundoutpost45/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LT" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -7306,6 +7357,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +<<<<<<< HEAD "PF" = ( /obj/structure/sign/warning/vacuum{ desc = "A beacon used by a teleporter."; @@ -7319,6 +7371,8 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Qb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7573,6 +7627,7 @@ }, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) +<<<<<<< HEAD "TV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/landmark/awaystart/underground, @@ -7581,6 +7636,8 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ud" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38309,9 +38366,15 @@ an aS aS aO +<<<<<<< HEAD uB PF TV +======= +ax +az +aB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Xd bw bB diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index 781ce2aace0..0848d3fd817 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -19,6 +19,7 @@ #include "map_files\KiloStation\KiloStation.dmm" // SKYRAT EDIT END #include "map_files\wawastation\wawastation.dmm" + #ifdef CIBUILDING #include "templates.dm" #endif diff --git a/_maps/deathmatch/lattice_battles.dmm b/_maps/deathmatch/lattice_battles.dmm new file mode 100644 index 00000000000..eab56ca3064 --- /dev/null +++ b/_maps/deathmatch/lattice_battles.dmm @@ -0,0 +1,994 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bm" = ( +/obj/structure/lattice/catwalk, +/obj/structure/closet/crate/large/hats, +/turf/open/chasm, +/area/deathmatch/fullbright) +"bz" = ( +/obj/structure/railing/unbreakable{ + dir = 1 + }, +/obj/item/clothing/head/cone, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"cN" = ( +/obj/structure/railing/unbreakable{ + dir = 8 + }, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"df" = ( +/obj/structure/lattice/catwalk, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/chasm, +/area/deathmatch/fullbright) +"dM" = ( +/turf/open/chasm, +/area/deathmatch/fullbright) +"eK" = ( +/obj/structure/lattice/catwalk, +/obj/effect/landmark/deathmatch_player_spawn, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/chasm, +/area/deathmatch/fullbright) +"gz" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"gN" = ( +/turf/closed/mineral/random, +/area/deathmatch/fullbright) +"gW" = ( +/obj/structure/railing/unbreakable{ + dir = 1 + }, +/obj/structure/flora/lunar_plant/style_1, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"ho" = ( +/obj/structure/flora/lunar_plant/style_1, +/obj/effect/playeronly_barrier, +/obj/structure/railing/unbreakable{ + dir = 6 + }, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"hH" = ( +/obj/structure/railing/unbreakable{ + dir = 5 + }, +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/lunar_plant/style_3, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"jb" = ( +/obj/structure/flora/rock/style_random, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"lO" = ( +/obj/structure/railing/unbreakable{ + dir = 9 + }, +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/lunar_plant/style_3, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"rE" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/closed/mineral/random, +/area/deathmatch/fullbright) +"sl" = ( +/mob/living/basic/spider/giant/hunter/away_caves, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/spider/stickyweb, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"sQ" = ( +/obj/structure/flora/lunar_plant/style_2, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"tw" = ( +/obj/structure/railing/unbreakable{ + dir = 4 + }, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"tL" = ( +/obj/structure/railing/unbreakable, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"uJ" = ( +/obj/structure/railing/unbreakable{ + dir = 4 + }, +/obj/item/clothing/head/cone, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"uO" = ( +/obj/structure/lattice/catwalk, +/obj/structure/closet/crate/critter, +/mob/living/basic/mothroach, +/mob/living/basic/mothroach, +/mob/living/basic/mothroach, +/turf/open/chasm, +/area/deathmatch/fullbright) +"vk" = ( +/obj/structure/lattice/catwalk, +/turf/open/chasm, +/area/deathmatch/fullbright) +"vr" = ( +/obj/structure/flora/lunar_plant/style_2, +/obj/structure/spider/stickyweb/very_sticky, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"wb" = ( +/obj/structure/lattice/catwalk, +/obj/effect/landmark/deathmatch_player_spawn, +/turf/open/chasm, +/area/deathmatch/fullbright) +"yB" = ( +/obj/structure/railing/unbreakable{ + dir = 8 + }, +/obj/structure/flora/lunar_plant/style_1, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"AS" = ( +/mob/living/basic/pet/cat/space, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"BL" = ( +/obj/structure/railing/unbreakable{ + dir = 1 + }, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Cf" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/lunar_plant/style_3, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"CI" = ( +/mob/living/basic/pet/dog/corgi/puppy/void, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"CP" = ( +/obj/structure/lattice/catwalk, +/obj/item/clothing/head/cone, +/turf/open/chasm, +/area/deathmatch/fullbright) +"Dk" = ( +/mob/living/basic/wumborian_fugu, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"He" = ( +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Ia" = ( +/obj/machinery/power/floodlight, +/obj/structure/lattice/catwalk, +/turf/open/chasm, +/area/deathmatch/fullbright) +"IT" = ( +/obj/structure/lattice/catwalk, +/obj/effect/landmark/deathmatch_player_spawn, +/obj/effect/decal/cleanable/rubble, +/turf/open/chasm, +/area/deathmatch/fullbright) +"JE" = ( +/obj/structure/railing/unbreakable{ + dir = 10 + }, +/obj/structure/flora/lunar_plant/style_1, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"KO" = ( +/obj/structure/closet/crate/cardboard, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"LN" = ( +/obj/structure/railing/corner, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"MF" = ( +/obj/structure/lattice, +/turf/open/chasm, +/area/deathmatch/fullbright) +"MZ" = ( +/obj/item/clothing/head/cone, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Nf" = ( +/obj/effect/landmark/deathmatch_player_spawn, +/obj/structure/lattice, +/turf/open/chasm, +/area/deathmatch/fullbright) +"NA" = ( +/obj/structure/flora/lunar_plant/style_2, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"NG" = ( +/obj/structure/lattice/catwalk, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/cardboard, +/obj/item/statuebust, +/turf/open/chasm, +/area/deathmatch/fullbright) +"NI" = ( +/obj/structure/lattice/catwalk, +/obj/effect/decal/cleanable/rubble, +/turf/open/chasm, +/area/deathmatch/fullbright) +"NY" = ( +/obj/effect/playeronly_barrier, +/obj/structure/railing/unbreakable, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"OF" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"St" = ( +/mob/living/basic/spider/giant/nurse/away_caves, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Sv" = ( +/obj/structure/lattice/catwalk, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/rubble, +/turf/open/chasm, +/area/deathmatch/fullbright) +"SL" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/lunar_plant/style_3, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Uy" = ( +/obj/item/clothing/head/cone, +/obj/effect/playeronly_barrier, +/obj/structure/railing/corner/unbreakable{ + dir = 1 + }, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"UU" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/flora/rock/style_random, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Xf" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/structure/spider/stickyweb, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Xk" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/power/floodlight, +/turf/open/chasm, +/area/deathmatch/fullbright) +"Xo" = ( +/obj/structure/flora/rock/style_random, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"Yu" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/structure/railing/unbreakable{ + dir = 6 + }, +/obj/structure/flora/lunar_plant/style_3, +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"YH" = ( +/obj/effect/playeronly_barrier, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"YV" = ( +/obj/structure/lattice/catwalk, +/obj/item/clothing/head/cone, +/obj/effect/decal/cleanable/rubble, +/turf/open/chasm, +/area/deathmatch/fullbright) +"Zp" = ( +/obj/effect/decal/cleanable/garbage, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) +"ZH" = ( +/obj/structure/flora/rock/pile/style_random, +/mob/living/basic/cow/moonicorn, +/turf/open/misc/asteroid/moon, +/area/deathmatch/fullbright) + +(1,1,1) = {" +rE +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +"} +(2,1,1) = {" +gN +gN +He +He +jb +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +"} +(3,1,1) = {" +gN +He +He +Dk +He +KO +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +"} +(4,1,1) = {" +gN +jb +Cf +He +LN +tw +uJ +tw +tw +Yu +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +"} +(5,1,1) = {" +gN +gN +OF +Zp +NY +dM +MF +MF +MF +MF +MF +gN +gN +gN +gN +gN +gN +gN +gN +MF +gN +gN +gN +gN +gN +"} +(6,1,1) = {" +gN +gN +gN +MZ +ho +vk +MF +vk +vk +MF +MF +MF +vk +df +vk +df +vk +MF +dM +dM +lO +gN +gN +gN +gN +"} +(7,1,1) = {" +gN +gN +gN +gN +gN +MF +MF +wb +vk +vk +MF +vk +wb +vk +vk +vk +vk +wb +MF +dM +bz +gN +gN +gN +gN +"} +(8,1,1) = {" +gN +gN +gN +gN +JE +MF +vk +vk +vk +vk +vk +NI +vk +vk +vk +vk +MF +vk +MF +MF +BL +sQ +gN +gN +gN +"} +(9,1,1) = {" +gN +gN +sQ +YH +tL +MF +vk +vk +vk +CP +vk +vk +vk +vk +vk +CP +MF +vk +vk +MF +BL +ZH +gN +gN +gN +"} +(10,1,1) = {" +gN +gN +gN +AS +tL +MF +vk +MF +MF +vk +df +Sv +vk +MF +vk +df +MF +vk +vk +MF +gW +jb +gN +gN +gN +"} +(11,1,1) = {" +gN +gN +gN +CI +tL +MF +vk +df +MF +MF +vk +vk +MF +MF +vk +df +vk +vk +df +vk +hH +gN +gN +gN +gN +"} +(12,1,1) = {" +gN +gN +gN +jb +tL +MF +vk +vk +vk +vk +vk +vk +vk +vk +vk +vk +vk +vk +df +NG +gN +gN +gN +gN +gN +"} +(13,1,1) = {" +gN +gN +gN +gN +Yu +MF +MF +eK +vk +vk +vk +vk +wb +CP +vk +vk +vk +wb +vk +Xk +gN +gN +gN +gN +gN +"} +(14,1,1) = {" +gN +gN +gN +gN +gN +Ia +MF +vk +vk +vk +vk +vk +vk +vk +vk +NI +vk +vk +vk +gN +gN +gN +gN +gN +gN +"} +(15,1,1) = {" +gN +gN +gN +gN +gN +gN +bm +df +vk +vk +vk +MF +MF +vk +vk +vk +MF +MF +vk +gN +gN +gN +gN +gN +gN +"} +(16,1,1) = {" +gN +gN +gN +gN +gN +gN +gN +MF +MF +vk +vk +MF +vk +vk +vk +df +MF +vk +vk +gN +gN +gN +gN +gN +gN +"} +(17,1,1) = {" +gN +gN +gN +gN +gN +gN +MF +MF +vk +vk +NI +vk +vk +vk +vk +CP +vk +vk +vk +gN +gN +gN +gN +gN +gN +"} +(18,1,1) = {" +gN +gN +gN +gN +gN +MF +MF +MF +vk +vk +YV +vk +MF +MF +vk +vk +vk +vk +df +gN +gN +gN +gN +gN +gN +"} +(19,1,1) = {" +gN +gN +gN +gN +SL +dM +MF +Nf +vk +vk +vk +MF +Nf +MF +MF +vk +vk +IT +vk +uO +gN +gN +gN +gN +gN +"} +(20,1,1) = {" +gN +gN +gN +gN +dM +dM +dM +MF +MF +vk +MF +MF +MF +MF +MF +MF +vk +vk +MF +MF +UU +gN +gN +gN +gN +"} +(21,1,1) = {" +gN +gN +gN +SL +dM +dM +dM +dM +uO +gN +gN +gN +gN +gN +gN +gN +vk +MF +dM +dM +BL +St +Xf +gN +gN +"} +(22,1,1) = {" +gN +gN +gN +jb +NA +dM +SL +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +lO +yB +cN +Uy +vr +gN +gN +gN +"} +(23,1,1) = {" +gN +gN +gN +gN +gz +Xo +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +sl +gz +gN +gN +gN +gN +gN +"} +(24,1,1) = {" +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +"} +(25,1,1) = {" +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +gN +"} diff --git a/_maps/deathmatch/meta_brig.dmm b/_maps/deathmatch/meta_brig.dmm index 55f888e3d51..60b8d8a471b 100644 --- a/_maps/deathmatch/meta_brig.dmm +++ b/_maps/deathmatch/meta_brig.dmm @@ -258,6 +258,16 @@ "du" = ( /turf/closed/indestructible/fakedoor, /area/deathmatch) +"dy" = ( +/obj/structure/chair/stool/directional/east, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 4 + }, +/obj/machinery/flasher/directional/north{ + id = "visitorflash" + }, +/turf/open/floor/iron, +/area/deathmatch) "dA" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -449,6 +459,15 @@ }, /turf/open/floor/iron/white, /area/deathmatch) +"hS" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/prison/directional/north, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/carpet, +/area/deathmatch) "hY" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -712,15 +731,6 @@ /obj/structure/cable, /turf/open/indestructible, /area/deathmatch) -"mq" = ( -/obj/structure/table/wood, -/obj/machinery/computer/security/telescreen/prison/directional/north, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/deathmatch) "mC" = ( /obj/effect/turf_decal/bot, /obj/structure/plasticflaps/opaque{ @@ -1237,16 +1247,6 @@ }, /turf/open/indestructible, /area/deathmatch) -"sF" = ( -/obj/structure/chair/stool/directional/east, -/obj/effect/turf_decal/trimline/red/warning{ - dir = 4 - }, -/obj/machinery/flasher/directional/north{ - id = "visitorflash" - }, -/turf/open/floor/iron, -/area/deathmatch) "sG" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1420,14 +1420,6 @@ /obj/structure/cable, /turf/open/indestructible, /area/deathmatch) -"uV" = ( -/obj/machinery/computer/security/telescreen/prison/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/indestructible, -/area/deathmatch) "vf" = ( /obj/effect/landmark/deathmatch_player_spawn, /turf/open/floor/iron/white, @@ -1642,6 +1634,14 @@ }, /turf/open/indestructible/dark, /area/deathmatch) +"yN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/east, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/deathmatch) "yO" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -2532,14 +2532,6 @@ /obj/structure/cable, /turf/open/indestructible, /area/deathmatch) -"Kj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/stool/directional/east, -/obj/effect/turf_decal/trimline/red/warning{ - dir = 4 - }, -/turf/open/floor/iron, -/area/deathmatch) "Km" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red{ @@ -2897,6 +2889,14 @@ /obj/structure/cable, /turf/open/indestructible, /area/deathmatch) +"PV" = ( +/obj/machinery/computer/security/telescreen/prison/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/indestructible, +/area/deathmatch) "Qd" = ( /obj/structure/table, /obj/item/clothing/glasses/sunglasses{ @@ -3633,9 +3633,9 @@ IJ Yh Yh Yh -sF +dy YW -Kj +yN IJ IJ IJ @@ -4396,7 +4396,7 @@ vt CS bA GU -uV +PV XK XK XI @@ -4515,7 +4515,7 @@ Ik Os mE Yh -mq +hS FY dp Pt diff --git a/_maps/deathmatch/ragin_mages.dmm b/_maps/deathmatch/ragin_mages.dmm index 3dcdb966d11..1a3d307181d 100644 --- a/_maps/deathmatch/ragin_mages.dmm +++ b/_maps/deathmatch/ragin_mages.dmm @@ -8,7 +8,7 @@ dir = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "aT" = ( /obj/item/cardboard_cutout/adaptive{ pixel_y = 14; @@ -17,7 +17,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "bb" = ( /obj/structure/chair/wood/wings{ dir = 8 @@ -28,15 +28,15 @@ set_luminosity = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "bg" = ( /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "bv" = ( /obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, -/area/deathmatch/teleport) +/area/deathmatch) "co" = ( /obj/structure/table/reinforced, /obj/item/paper_bin/carbon{ @@ -44,7 +44,7 @@ pixel_x = 7 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "ct" = ( /obj/structure/flora/bush/grassy/style_random, /mob/living/basic/pet/gondola{ @@ -52,24 +52,24 @@ faction = list("gondola", "Wizard") }, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "cU" = ( /obj/structure/chair/wood/wings{ dir = 1 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "dj" = ( /obj/machinery/door/airlock/wood, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "ds" = ( /turf/open/floor/carpet/purple, -/area/deathmatch/teleport) +/area/deathmatch) "ez" = ( /obj/structure/closet/crate, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "fH" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/griddle, @@ -82,19 +82,19 @@ pixel_x = 9 }, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "fI" = ( /turf/open/lava, -/area/deathmatch/teleport) +/area/deathmatch) "gn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "gr" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/chair/wood, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "hg" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -104,14 +104,14 @@ dir = 8 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "hk" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 21; pixel_x = -7 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "hK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/light_emitter{ @@ -120,20 +120,20 @@ set_luminosity = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "ig" = ( /obj/structure/table/wood, /obj/item/stack/medical/bruise_pack{ pixel_x = -12 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "iz" = ( /obj/structure/chair/comfy/brown{ dir = 1 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "iL" = ( /obj/effect/light_emitter{ set_cap = 2; @@ -141,7 +141,7 @@ set_luminosity = 4 }, /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "iQ" = ( /obj/structure/table, /obj/structure/bedsheetbin{ @@ -149,42 +149,42 @@ pixel_x = 3 }, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "iZ" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/sink/directional/west, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "jb" = ( /obj/machinery/door/airlock/wood, /obj/structure/railing/corner/end/flip, /obj/structure/railing/corner/end, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "jg" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/landmark/deathmatch_player_spawn, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "jm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/mystery_box/wands, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "js" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "jM" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "jV" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/door/airlock/wood, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "kl" = ( /obj/structure/flora/bush/grassy/style_random, /obj/machinery/light/floor, @@ -194,7 +194,7 @@ set_luminosity = 4 }, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "li" = ( /obj/structure/table, /obj/item/extinguisher{ @@ -206,7 +206,7 @@ pixel_x = -6 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "lM" = ( /obj/structure/bed{ dir = 1 @@ -220,19 +220,19 @@ set_luminosity = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "lO" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "mu" = ( /obj/effect/turf_decal/stripes, /obj/structure/railing{ dir = 4 }, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "mV" = ( /obj/structure/railing{ dir = 4 @@ -242,40 +242,40 @@ }, /obj/structure/mystery_box/tdome, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "nk" = ( /obj/item/gun/magic/wand/death, /obj/structure/window/reinforced/plasma/spawner/directional/east, /obj/structure/window/reinforced/plasma/spawner/directional/north, /obj/structure/window/reinforced/plasma/spawner/directional/west, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "nx" = ( /obj/effect/landmark/deathmatch_player_spawn, /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "nQ" = ( /obj/machinery/door/airlock/wood, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "on" = ( /obj/structure/table/wood, /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "oP" = ( /obj/structure/destructible/cult/item_dispenser/archives/library, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "pe" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 21; pixel_x = -7 }, /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "ph" = ( /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "pv" = ( /obj/effect/light_emitter{ set_cap = 2; @@ -283,18 +283,18 @@ set_luminosity = 4 }, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "pL" = ( /obj/effect/turf_decal/stripes{ dir = 1 }, /obj/structure/mystery_box/wands, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "pV" = ( /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "qx" = ( /obj/effect/light_emitter{ set_cap = 2; @@ -302,15 +302,15 @@ set_luminosity = 4 }, /turf/open/floor/carpet/purple, -/area/deathmatch/teleport) +/area/deathmatch) "qY" = ( /obj/structure/closet/crate/bin, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "rj" = ( /obj/machinery/door/window/right/directional/east, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "rD" = ( /obj/structure/railing{ dir = 4 @@ -319,11 +319,11 @@ dir = 8 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "sf" = ( /obj/structure/mirror/directional/east, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "tL" = ( /obj/structure/flora/bush/fullgrass/style_random, /mob/living/simple_animal/hostile/ooze/gelatinous{ @@ -331,7 +331,7 @@ faction = list("slime", "Wizard") }, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "ue" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/item/food/burger/yellow{ @@ -347,14 +347,14 @@ }, /obj/structure/table/reinforced, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "ui" = ( /obj/effect/turf_decal/stripes, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "uz" = ( /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "uR" = ( /obj/item/clothing/shoes/sandal/magic{ pixel_y = 16 @@ -365,82 +365,82 @@ set_luminosity = 4 }, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "vh" = ( /obj/structure/mystery_box/wands, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "vv" = ( /obj/vehicle/ridden/scooter/skateboard{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "vR" = ( /obj/structure/bookcase/random, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "wd" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/mystery_box/wands, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "wl" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 1; pixel_x = -6 }, /turf/open/floor/carpet/purple, -/area/deathmatch/teleport) +/area/deathmatch) "wL" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/gibber/autogibber, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "xk" = ( /obj/structure/sink/directional/south, /obj/structure/mirror/directional/north{ pixel_y = 36 }, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "xs" = ( /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "yA" = ( /obj/structure/chair/wood/wings, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "zN" = ( /obj/structure/mystery_box/wands, /obj/structure/sign/poster/contraband/the_big_gas_giant_truth/directional/north, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "zO" = ( /obj/structure/closet, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Au" = ( /obj/structure/railing{ dir = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "AD" = ( /obj/structure/sign/departments/restroom/directional/west, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Bm" = ( /obj/effect/landmark/deathmatch_player_spawn, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "Cb" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/table/wood, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "Cj" = ( /obj/structure/table, /obj/item/clothing/ears/earmuffs{ @@ -456,10 +456,10 @@ pixel_y = -10 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Cq" = ( /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "CM" = ( /obj/structure/railing/corner, /obj/structure/railing/corner{ @@ -477,7 +477,7 @@ set_luminosity = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "DK" = ( /obj/structure/railing{ dir = 8 @@ -489,11 +489,11 @@ dir = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "DW" = ( /obj/machinery/computer, /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "Eh" = ( /obj/effect/light_emitter{ set_cap = 2; @@ -501,64 +501,64 @@ set_luminosity = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Fb" = ( /obj/effect/turf_decal/stripes{ dir = 1 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Fm" = ( /obj/structure/chair/comfy/black{ dir = 1 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Fv" = ( /obj/structure/chair/wood/wings{ dir = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Fx" = ( /obj/item/target, /obj/structure/sign/flag/nanotrasen/directional/north, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "FL" = ( /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "Ge" = ( /obj/item/flashlight/flare{ pixel_x = -5; pixel_y = -12 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Gv" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 2; pixel_x = 5 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "GC" = ( /obj/effect/spawner/structure/window, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "GZ" = ( /obj/structure/curtain, /obj/machinery/shower/directional/north, /obj/item/soap/syndie, /turf/open/floor/noslip, -/area/deathmatch/teleport) +/area/deathmatch) "Hf" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 1; pixel_x = -6 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Hs" = ( /turf/template_noop, /area/template_noop) @@ -572,17 +572,17 @@ pixel_y = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "HP" = ( /obj/structure/chair/comfy/black{ dir = 1 }, /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "HS" = ( /obj/structure/table/wood/fancy, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "IE" = ( /obj/structure/table/wood, /obj/item/clothing/suit/wizrobe/black{ @@ -594,40 +594,40 @@ pixel_x = 6 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "IM" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 2; pixel_x = 5 }, /turf/open/floor/carpet/purple, -/area/deathmatch/teleport) +/area/deathmatch) "Jm" = ( /turf/closed/wall/mineral/wood, -/area/deathmatch/teleport) +/area/deathmatch) "Jo" = ( /obj/structure/toilet{ dir = 4 }, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "Kr" = ( /obj/effect/landmark/deathmatch_player_spawn, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "KW" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Le" = ( /obj/structure/filingcabinet, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Mg" = ( /obj/machinery/computer, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Nl" = ( /obj/machinery/power/shuttle_engine/heater{ resistance_flags = 3 @@ -636,21 +636,21 @@ resistance_flags = 3 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Nm" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 21; pixel_x = 6 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Nt" = ( /obj/item/target{ pixel_y = 11 }, /obj/effect/turf_decal/stripes, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "NW" = ( /obj/structure/railing{ dir = 4 @@ -659,30 +659,30 @@ dir = 1 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Ok" = ( /obj/machinery/vending/cigarette, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "OD" = ( /obj/structure/filingcabinet, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "OK" = ( /obj/item/kirbyplants/organic/plant10{ pixel_y = 21; pixel_x = 6 }, /turf/open/floor/carpet/red, -/area/deathmatch/teleport) +/area/deathmatch) "PD" = ( /obj/structure/table/wood, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Qj" = ( /obj/structure/dresser, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "QH" = ( /obj/structure/table, /obj/item/clothing/head/wizard{ @@ -690,19 +690,19 @@ pixel_x = 4 }, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "QT" = ( /obj/structure/mystery_box/wands, /turf/open/floor/plastic, -/area/deathmatch/teleport) +/area/deathmatch) "RB" = ( /obj/machinery/vending/snack, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "RI" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "RT" = ( /obj/machinery/power/shuttle_engine/heater{ resistance_flags = 3 @@ -711,14 +711,14 @@ resistance_flags = 3 }, /turf/open/lava, -/area/deathmatch/teleport) +/area/deathmatch) "Sa" = ( /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "SK" = ( /obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "Th" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/table/reinforced, @@ -736,15 +736,15 @@ set_luminosity = 4 }, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) "Vk" = ( /obj/machinery/door/window/left/directional/east, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "VM" = ( /obj/structure/table/wood/poker, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Wl" = ( /obj/structure/railing{ dir = 4 @@ -755,37 +755,37 @@ set_luminosity = 4 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "WX" = ( /obj/machinery/vending/magivend, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Xv" = ( /obj/structure/railing, /obj/structure/railing{ dir = 1 }, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "YP" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "YS" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/cult, -/area/deathmatch/teleport) +/area/deathmatch) "Zo" = ( /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, -/area/deathmatch/teleport) +/area/deathmatch) "ZS" = ( /obj/structure/railing/corner/end/flip, /turf/open/floor/iron, -/area/deathmatch/teleport) +/area/deathmatch) (1,1,1) = {" Hs diff --git a/_maps/deathmatch/species_warfare.dmm b/_maps/deathmatch/species_warfare.dmm new file mode 100644 index 00000000000..e80485c2b5e --- /dev/null +++ b/_maps/deathmatch/species_warfare.dmm @@ -0,0 +1,2461 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aA" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/medical_kiosk, +/obj/structure/sign/poster/official/moth_meth/directional/east, +/turf/open/indestructible/white, +/area/deathmatch) +"aD" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/vending/colavend, +/turf/open/indestructible, +/area/deathmatch) +"by" = ( +/mob/living/basic/mothroach, +/turf/open/indestructible/white, +/area/deathmatch) +"bL" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/surgery_tray/full, +/turf/open/indestructible/white, +/area/deathmatch) +"bX" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/structure/table/glass, +/obj/item/storage/fancy/donut_box, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"cd" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/machinery/light/built/directional/south, +/obj/machinery/computer{ + dir = 4 + }, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"cl" = ( +/obj/effect/landmark/deathmatch_player_spawn, +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/light/small/blacklight/directional/north, +/turf/open/floor/wood, +/area/deathmatch) +"cs" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/vehicle/sealed/mecha/ripley, +/obj/item/mecha_parts/mecha_equipment/air_tank/full, +/turf/open/floor/iron/dark, +/area/deathmatch) +"cy" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/cryo_cell, +/turf/open/indestructible/white, +/area/deathmatch) +"dv" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/indestructible, +/area/deathmatch) +"dA" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"dB" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/portable_atmospherics/canister, +/turf/open/indestructible, +/area/deathmatch) +"ee" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/indestructible, +/area/deathmatch) +"em" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"es" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/stasis{ + dir = 1 + }, +/obj/effect/landmark/deathmatch_player_spawn, +/obj/machinery/light/floor, +/turf/open/indestructible/white, +/area/deathmatch) +"eE" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/components/binary/crystallizer{ + dir = 4 + }, +/turf/open/indestructible, +/area/deathmatch) +"eO" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/indestructible, +/area/deathmatch) +"eW" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"fg" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, +/turf/open/indestructible/dark, +/area/deathmatch) +"fm" = ( +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/deathmatch) +"fA" = ( +/obj/machinery/power/tracker, +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/deathmatch) +"fP" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/machinery/door/airlock/command/glass, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"fV" = ( +/obj/effect/turf_decal/tile/purple/full, +/obj/machinery/door/airlock/science/glass, +/turf/open/indestructible/white/smooth_large, +/area/deathmatch) +"gH" = ( +/mob/living/basic/pet/cat/feral, +/obj/structure/bed, +/obj/item/bedsheet/runtime, +/obj/machinery/light/small/blacklight/directional/south, +/turf/open/floor/wood, +/area/deathmatch) +"gI" = ( +/turf/open/indestructible/dark, +/area/deathmatch) +"gM" = ( +/obj/effect/spawner/random/structure/closet_private, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/wood, +/area/deathmatch) +"hk" = ( +/obj/effect/turf_decal/tile/green/full, +/obj/machinery/door/airlock/glass, +/turf/open/indestructible/large, +/area/deathmatch) +"ho" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible, +/area/deathmatch) +"hA" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 9 + }, +/turf/open/indestructible, +/area/deathmatch) +"hC" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/table/optable, +/obj/effect/decal/cleanable/blood, +/turf/open/indestructible/white, +/area/deathmatch) +"hG" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/oil/slippery, +/obj/item/mecha_parts/mecha_equipment/ripleyupgrade, +/turf/open/floor/iron/dark, +/area/deathmatch) +"hR" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/indestructible/plating, +/area/deathmatch) +"is" = ( +/obj/item/grenade/spawnergrenade/cat, +/turf/open/floor/wood, +/area/deathmatch) +"iu" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/sleeper/self_control, +/turf/open/indestructible/white, +/area/deathmatch) +"ix" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"iK" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/indestructible, +/area/deathmatch) +"iM" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/table/glass, +/obj/item/surgery_tray/full, +/turf/open/indestructible/white, +/area/deathmatch) +"iV" = ( +/obj/item/card/id/advanced/engioutpost, +/obj/effect/decal/remains/human/smokey, +/turf/open/indestructible, +/area/deathmatch) +"jm" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/closet/firecloset/full, +/turf/open/indestructible/dark, +/area/deathmatch) +"jn" = ( +/obj/effect/landmark/deathmatch_player_spawn, +/obj/machinery/light/floor, +/turf/open/indestructible/dark, +/area/deathmatch) +"ju" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"jw" = ( +/turf/open/space/basic, +/area/deathmatch) +"jR" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/rnd/production/protolathe/offstation, +/obj/machinery/light/directional/east, +/turf/open/indestructible/white, +/area/deathmatch) +"ko" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/vending/cigarette/syndicate, +/obj/machinery/light/directional/east, +/turf/open/indestructible, +/area/deathmatch) +"kY" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin2"; + name = "Cabin 4" + }, +/turf/open/chasm{ + icon_state = "wood"; + icon = 'icons/turf/floors.dmi'; + base_icon_state = "wood"; + name = "Dorms 4" + }, +/area/deathmatch) +"lF" = ( +/obj/effect/spawner/random/structure/closet_private, +/turf/open/floor/wood, +/area/deathmatch) +"mn" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/machinery/computer/security/wooden_tv{ + pixel_x = 1; + pixel_y = 6 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"mo" = ( +/obj/effect/turf_decal/tile/yellow/full, +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/west, +/turf/open/indestructible/large, +/area/deathmatch) +"mK" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/closet/emcloset, +/turf/open/indestructible/white, +/area/deathmatch) +"mO" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"nb" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/turf/open/indestructible/dark/textured, +/area/deathmatch) +"nf" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/glass/bottle/champagne/cursed, +/obj/item/food/donut/trumpet, +/turf/open/indestructible/dark, +/area/deathmatch) +"nQ" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"nT" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/structure/closet/firecloset/full, +/turf/open/indestructible/white, +/area/deathmatch) +"oq" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/greenglow, +/turf/open/indestructible/white, +/area/deathmatch) +"oy" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/indestructible, +/area/deathmatch) +"oD" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/blacklight/directional/west, +/turf/open/indestructible/dark/textured, +/area/deathmatch) +"oN" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/indestructible, +/area/deathmatch) +"pD" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/turf/open/indestructible, +/area/deathmatch) +"pH" = ( +/obj/structure/cable, +/obj/structure/table/reinforced, +/obj/item/fireaxe/metal_h2_axe, +/turf/open/indestructible, +/area/deathmatch) +"pJ" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/light/directional/west, +/turf/open/indestructible, +/area/deathmatch) +"pL" = ( +/mob/living/basic/lizard/wags_his_tail, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible, +/area/deathmatch) +"qF" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/indestructible/white, +/area/deathmatch) +"qM" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"qV" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/machinery/computer{ + dir = 8 + }, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"rq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/item/toy/plush/slimeplushie{ + pixel_y = 10 + }, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun, +/turf/open/floor/iron/dark, +/area/deathmatch) +"ru" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/rnd/production/circuit_imprinter/offstation, +/obj/item/mecha_parts/mecha_equipment/wormhole_generator, +/turf/open/indestructible/white, +/area/deathmatch) +"rO" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/item/melee/supermatter_sword, +/obj/machinery/light/small/blacklight/directional/south, +/turf/open/floor/wood, +/area/deathmatch) +"rP" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/table, +/obj/item/restraints/legcuffs/beartrap{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/restraints/legcuffs/beartrap{ + pixel_x = 2 + }, +/obj/item/key/janitor{ + pixel_y = 10 + }, +/turf/open/indestructible, +/area/deathmatch) +"rV" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/deathmatch) +"sn" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/wood, +/area/deathmatch) +"st" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, +/turf/open/indestructible/white, +/area/deathmatch) +"su" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/storage/belt/utility/full{ + pixel_y = 4 + }, +/obj/item/storage/belt/utility/full, +/turf/open/indestructible, +/area/deathmatch) +"sx" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/obj/machinery/computer{ + dir = 4 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"sJ" = ( +/turf/open/floor/wood, +/area/deathmatch) +"sL" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/structure/table/glass, +/obj/item/storage/medkit/regular, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"sW" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/indestructible, +/area/deathmatch) +"tR" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/machinery/computer{ + dir = 4 + }, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"uq" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/dice, +/turf/open/indestructible, +/area/deathmatch) +"uQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"uX" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/effect/landmark/deathmatch_player_spawn, +/turf/open/indestructible, +/area/deathmatch) +"vb" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/indestructible, +/area/deathmatch) +"vm" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/turf/open/indestructible, +/area/deathmatch) +"vq" = ( +/obj/structure/cable, +/turf/open/floor/iron/solarpanel/airless, +/area/deathmatch) +"vB" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible, +/area/deathmatch) +"vI" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/indestructible, +/area/deathmatch) +"vT" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/light/built/directional/south, +/turf/open/indestructible, +/area/deathmatch) +"wb" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/stasis{ + dir = 1 + }, +/obj/effect/landmark/deathmatch_player_spawn, +/obj/machinery/light/floor, +/turf/open/indestructible/white, +/area/deathmatch) +"wd" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/indestructible, +/area/deathmatch) +"wj" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/indestructible, +/area/deathmatch) +"wA" = ( +/obj/structure/table/glass, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_y = 17; + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/bottle/traitor{ + pixel_y = 17; + pixel_x = 8 + }, +/obj/item/toy/plush/moth{ + name = "Mender Moff" + }, +/turf/open/indestructible/white, +/area/deathmatch) +"wG" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/structure/closet/firecloset/full, +/turf/open/indestructible/white, +/area/deathmatch) +"wM" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/jani_wardrobe, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/blacklight/directional/north, +/turf/open/indestructible, +/area/deathmatch) +"xe" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/indestructible, +/area/deathmatch) +"xj" = ( +/obj/effect/decal/cleanable/blood/footprints, +/turf/open/indestructible/white, +/area/deathmatch) +"xL" = ( +/obj/effect/spawner/structure/window/reinforced/indestructible, +/turf/open/indestructible/large, +/area/deathmatch) +"xT" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/item/storage/medkit/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/cable, +/obj/structure/table/glass, +/turf/open/indestructible/white, +/area/deathmatch) +"yq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/indestructible/white, +/area/deathmatch) +"yy" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/glass/bottle/champagne/cursed, +/obj/item/food/donut/trumpet, +/turf/open/indestructible/dark, +/area/deathmatch) +"yD" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/obj/machinery/light/cold/dim/directional/east, +/turf/open/indestructible/white, +/area/deathmatch) +"yU" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible, +/area/deathmatch) +"zg" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/item/kirbyplants/random, +/turf/open/indestructible, +/area/deathmatch) +"zs" = ( +/obj/effect/turf_decal/tile/blue/full, +/turf/open/indestructible/white/smooth_large, +/area/deathmatch) +"zt" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/machinery/light/built/directional/south, +/obj/machinery/computer{ + dir = 8 + }, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"zw" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/indestructible, +/area/deathmatch) +"zx" = ( +/obj/item/stack/tile/iron/four{ + pixel_y = 7; + pixel_x = 10 + }, +/obj/structure/cable, +/turf/open/indestructible/plating, +/area/deathmatch) +"zJ" = ( +/turf/closed/indestructible/reinforced, +/area/deathmatch) +"zK" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/turf/open/indestructible/dark, +/area/deathmatch) +"zZ" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/spawner/random/vending/colavend, +/turf/open/indestructible, +/area/deathmatch) +"Ac" = ( +/obj/effect/landmark/deathmatch_player_spawn, +/obj/machinery/light/floor, +/turf/open/indestructible, +/area/deathmatch) +"Ag" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/decal/cleanable/oil, +/turf/open/indestructible/white, +/area/deathmatch) +"AE" = ( +/obj/effect/turf_decal/tile/yellow/full, +/obj/machinery/door/airlock/engineering/glass, +/turf/open/indestructible/large, +/area/deathmatch) +"AQ" = ( +/mob/living/basic/migo/hatsune, +/obj/structure/bed, +/obj/item/bedsheet/cult, +/obj/machinery/light/small/blacklight/directional/south, +/turf/open/floor/wood, +/area/deathmatch) +"AZ" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/item/storage/medkit/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/table/glass, +/turf/open/indestructible/white, +/area/deathmatch) +"Bc" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/item/clothing/suit/armor/elder_atmosian, +/obj/item/clothing/head/helmet/elder_atmosian, +/turf/open/indestructible, +/area/deathmatch) +"Bh" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/table/glass, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 6 + }, +/obj/machinery/light/cold/dim/directional/east, +/turf/open/indestructible/white, +/area/deathmatch) +"Bu" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, +/turf/open/indestructible, +/area/deathmatch) +"BA" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill, +/turf/open/indestructible/white, +/area/deathmatch) +"BH" = ( +/turf/open/chasm{ + icon_state = "wood"; + icon = 'icons/turf/floors.dmi'; + base_icon_state = "wood"; + name = "Dorms 4" + }, +/area/deathmatch) +"BL" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"BV" = ( +/obj/effect/decal/cleanable/garbage, +/turf/open/indestructible, +/area/deathmatch) +"Dm" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/turf/open/indestructible/dark/textured, +/area/deathmatch) +"DN" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/vending/engivend, +/turf/open/indestructible, +/area/deathmatch) +"DV" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"DZ" = ( +/obj/effect/landmark/deathmatch_player_spawn, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/deathmatch) +"El" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/machinery/light/directional/east, +/turf/open/indestructible, +/area/deathmatch) +"Es" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/table/glass, +/obj/item/gun/ballistic/rifle/rebarxbow/forced, +/obj/item/ammo_casing/rebar, +/obj/item/ammo_casing/rebar, +/obj/item/ammo_casing/rebar, +/obj/machinery/light/built/directional/north, +/turf/open/indestructible, +/area/deathmatch) +"EC" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/decal/cleanable/ash/large, +/turf/open/indestructible, +/area/deathmatch) +"EN" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"FY" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/sleeper/self_control{ + dir = 1 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"Gl" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/mecha_part_fabricator/maint, +/turf/open/floor/iron/dark, +/area/deathmatch) +"Gm" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/machinery/recharger, +/turf/open/indestructible/dark, +/area/deathmatch) +"Gp" = ( +/obj/effect/landmark/deathmatch_player_spawn, +/obj/machinery/light/floor, +/turf/open/indestructible/white, +/area/deathmatch) +"Gy" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"GA" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/indestructible, +/area/deathmatch) +"GF" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/east, +/turf/open/indestructible, +/area/deathmatch) +"GY" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/reagent_dispensers/fueltank/large, +/turf/open/indestructible, +/area/deathmatch) +"Hj" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/obj/structure/closet/firecloset/full, +/turf/open/indestructible, +/area/deathmatch) +"Hy" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/cryo_cell{ + dir = 1 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"Ia" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/indestructible, +/area/deathmatch) +"Iq" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/structure/rack, +/obj/item/gun/energy/e_gun/mini/practice_phaser, +/obj/machinery/light/built/directional/north, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"Iu" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma, +/turf/open/indestructible/white, +/area/deathmatch) +"Iz" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/vending/tool, +/turf/open/indestructible, +/area/deathmatch) +"IA" = ( +/obj/effect/spawner/random/structure/closet_private, +/obj/item/toy/plush/awakenedplushie, +/turf/open/floor/wood, +/area/deathmatch) +"IJ" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/indestructible, +/area/deathmatch) +"IR" = ( +/obj/vehicle/ridden/janicart/upgraded, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/tile/iron/four{ + pixel_y = 7; + pixel_x = 10 + }, +/turf/open/indestructible/plating, +/area/deathmatch) +"JL" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, +/obj/structure/table/glass, +/obj/machinery/recharger, +/turf/open/indestructible/dark, +/area/deathmatch) +"JS" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/indestructible, +/area/deathmatch) +"JX" = ( +/obj/item/melee/chainofcommand/tailwhip/kitty, +/turf/open/floor/wood, +/area/deathmatch) +"Ka" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin7"; + name = "Cabin 1" + }, +/turf/open/floor/wood, +/area/deathmatch) +"Kv" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/mecha_wreckage/durand, +/obj/item/mecha_parts/mecha_equipment/repair_droid, +/turf/open/indestructible/white, +/area/deathmatch) +"Lk" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/indestructible, +/area/deathmatch) +"Lq" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/machinery/computer, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"Lr" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/mop_bucket/janitorialcart, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible, +/area/deathmatch) +"Lt" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/indestructible, +/area/deathmatch) +"LY" = ( +/obj/item/clothing/suit/pillow_suit, +/obj/item/clothing/head/pillow_hood, +/turf/open/floor/wood, +/area/deathmatch) +"Mi" = ( +/obj/structure/cable, +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible, +/area/deathmatch) +"Mn" = ( +/turf/open/indestructible/white, +/area/deathmatch) +"ME" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/clothing/head/collectable/welding, +/obj/item/sticker/syndicate/flash{ + pixel_x = 3 + }, +/obj/item/sticker/syndicate/flash{ + pixel_x = -4 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"MG" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 6 + }, +/turf/open/indestructible/white, +/area/deathmatch) +"Nb" = ( +/obj/machinery/light/floor, +/turf/open/indestructible/white, +/area/deathmatch) +"Ne" = ( +/obj/effect/turf_decal/tile/purple/full, +/obj/effect/turf_decal/tile/purple/full, +/obj/effect/turf_decal/tile/purple/full, +/obj/effect/turf_decal/tile/purple/full, +/obj/structure/table/reinforced/plasmarglass, +/obj/machinery/door/window/right/directional/north, +/turf/open/indestructible/white/smooth_large, +/area/deathmatch) +"Nr" = ( +/obj/machinery/vending/medical, +/turf/open/indestructible/white, +/area/deathmatch) +"Ns" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/turf/open/indestructible, +/area/deathmatch) +"Nv" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/blacklight/directional/east, +/turf/open/indestructible/dark/textured, +/area/deathmatch) +"ND" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/obj/machinery/computer{ + dir = 8 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"Oa" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/indestructible, +/area/deathmatch) +"Oo" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"Os" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/indestructible, +/area/deathmatch) +"Ot" = ( +/obj/effect/turf_decal/tile/dark_blue, +/turf/open/indestructible/dark, +/area/deathmatch) +"OF" = ( +/obj/effect/turf_decal/tile/dark_blue/full, +/obj/structure/rack, +/obj/item/cane, +/obj/structure/fireaxecabinet/directional/south, +/obj/machinery/light/built/directional/south, +/turf/open/indestructible/dark/smooth_large, +/area/deathmatch) +"ON" = ( +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/door/airlock/multi_tile/public/glass{ + dir = 8 + }, +/turf/open/indestructible/white/smooth_large, +/area/deathmatch) +"Ps" = ( +/obj/structure/table/reinforced, +/turf/open/indestructible, +/area/deathmatch) +"Qo" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/mob/living/basic/bot/medbot, +/obj/item/mecha_parts/mecha_equipment/gravcatapult, +/turf/open/indestructible/white, +/area/deathmatch) +"QM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible, +/area/deathmatch) +"RX" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -1; + pixel_y = 3 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/toy/plush/lizard_plushie, +/turf/open/indestructible/plating, +/area/deathmatch) +"RY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/item/mecha_parts/mecha_equipment/extinguisher, +/turf/open/indestructible/white, +/area/deathmatch) +"Sh" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space/basic, +/area/deathmatch) +"Sm" = ( +/obj/structure/table/reinforced, +/obj/item/grenade/gas_crystal/crystal_foam, +/turf/open/indestructible, +/area/deathmatch) +"Sn" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/table/optable, +/obj/item/reagent_containers/syringe/contraband/methamphetamine, +/obj/effect/decal/cleanable/blood, +/turf/open/indestructible/white, +/area/deathmatch) +"Sy" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer, +/turf/open/indestructible/white, +/area/deathmatch) +"To" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"TZ" = ( +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/deathmatch) +"Uj" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/indestructible, +/area/deathmatch) +"Ur" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/deathmatch) +"UD" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/indestructible, +/area/deathmatch) +"UH" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/indestructible, +/area/deathmatch) +"Vl" = ( +/turf/open/indestructible, +/area/deathmatch) +"Vp" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/item/kirbyplants/photosynthetic, +/turf/open/indestructible/dark, +/area/deathmatch) +"VE" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/item/kirbyplants/random/dead, +/obj/effect/decal/cleanable/vomit, +/turf/open/indestructible, +/area/deathmatch) +"Wf" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/storage/medkit/fire, +/obj/item/toy/plush/plasmamanplushie, +/turf/open/indestructible, +/area/deathmatch) +"Wy" = ( +/obj/machinery/vending/drugs, +/turf/open/indestructible/white, +/area/deathmatch) +"WE" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible, +/area/deathmatch) +"XZ" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/indestructible, +/area/deathmatch) +"Yb" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/structure/closet/firecloset/full, +/turf/open/indestructible, +/area/deathmatch) +"Yo" = ( +/mob/living/basic/cat_butcherer, +/obj/structure/bed, +/obj/item/bedsheet/runtime, +/obj/machinery/light/small/blacklight/directional/north, +/turf/open/floor/wood, +/area/deathmatch) +"Yr" = ( +/mob/living/basic/alien/maid, +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/effect/decal/cleanable/vomit, +/obj/machinery/light/small/blacklight/directional/north, +/turf/open/floor/wood, +/area/deathmatch) +"YJ" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/rnd/destructive_analyzer, +/turf/open/indestructible/white, +/area/deathmatch) +"YQ" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/indestructible/dark, +/area/deathmatch) +"Za" = ( +/obj/effect/spawner/structure/window/reinforced/indestructible, +/turf/open/indestructible/plating, +/area/deathmatch) +"Zb" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/indestructible, +/area/deathmatch) +"ZO" = ( +/obj/effect/turf_decal/tile/green, +/turf/open/indestructible, +/area/deathmatch) + +(1,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +jw +TZ +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(2,1,1) = {" +jw +jw +jw +jw +jw +vq +vq +vq +vq +Sh +vq +vq +vq +vq +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(3,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +rV +Sh +rV +rV +Za +Za +Za +Za +Za +Za +Za +Za +rV +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(4,1,1) = {" +jw +jw +jw +jw +jw +vq +vq +vq +vq +Sh +vq +zJ +zJ +mK +cy +st +dA +Hy +wG +zJ +zJ +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(5,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +rV +Sh +rV +Za +hC +Mn +yq +yq +yq +yq +Mn +Sn +Za +rV +rV +rV +rV +jw +jw +jw +jw +jw +jw +jw +"} +(6,1,1) = {" +jw +jw +jw +jw +jw +jw +vq +vq +vq +Sh +vq +Za +bL +Mn +Mn +Mn +wA +xj +xj +iM +zJ +zJ +zJ +Za +zJ +zJ +jw +jw +jw +jw +jw +jw +"} +(7,1,1) = {" +jw +jw +rV +rV +rV +jw +jw +jw +jw +Sh +jw +Za +wb +Mn +Mn +by +Nr +by +Mn +es +zJ +Lr +rP +uX +IR +zJ +rV +jw +jw +jw +jw +jw +"} +(8,1,1) = {" +jw +rV +zJ +Za +Za +Za +zJ +rV +jw +Sh +jw +Za +AZ +Mn +Mn +Mn +Wy +Mn +Mn +xT +zJ +wM +BV +pL +dv +Za +rV +jw +jw +jw +jw +jw +"} +(9,1,1) = {" +rV +zJ +zJ +tR +sx +cd +zJ +zJ +rV +Sh +jw +Za +iu +Mn +Mn +Mn +Nb +Mn +Mn +FY +zJ +Ns +ZO +VE +hR +zJ +rV +rV +jw +jw +jw +jw +"} +(10,1,1) = {" +rV +zJ +Lq +Gy +YQ +eW +sL +zJ +rV +Sh +rV +Za +MG +yD +qM +qM +aA +qM +qM +Bh +zJ +RX +yU +zJ +xL +zJ +zJ +Za +zJ +jw +jw +jw +"} +(11,1,1) = {" +rV +Za +nf +gI +jn +gI +Gm +zJ +zJ +zJ +zJ +zJ +zJ +zJ +zs +ON +zJ +zs +ON +zJ +zJ +zJ +hk +Za +Iu +Kv +Gl +cs +zJ +jw +jw +jw +"} +(12,1,1) = {" +jw +Za +jm +ix +gI +gI +zK +fP +nb +fP +eO +wd +pD +pD +sW +Zb +Zb +Zb +Zb +ee +pJ +ho +vm +Za +ME +Ag +rq +hG +zJ +jw +jw +jw +"} +(13,1,1) = {" +rV +zJ +Iq +Oo +gI +Ot +fg +fP +Nv +fP +iK +QM +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +vI +Ne +BA +uQ +em +RY +Za +rV +jw +jw +"} +(14,1,1) = {" +rV +Za +Lq +BL +gI +Vp +OF +zJ +zJ +zJ +Hj +Vl +Ac +Vl +Vl +Vl +Vl +Vl +Vl +Ac +Vl +Vl +zg +Za +Sy +Mn +Gp +qF +Za +rV +jw +jw +"} +(15,1,1) = {" +rV +zJ +Iq +Oo +gI +DV +ju +fP +oD +fP +iK +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +JS +fV +oq +Mn +Mn +Qo +Za +rV +jw +jw +"} +(16,1,1) = {" +jw +Za +mn +EN +gI +gI +zK +fP +Dm +fP +UD +wj +GF +WE +Uj +aD +ko +zZ +xe +GA +GA +vB +Yb +Za +ru +jR +YJ +nT +zJ +rV +rV +jw +"} +(17,1,1) = {" +rV +Za +yy +gI +jn +gI +JL +zJ +zJ +zJ +zJ +hk +zJ +hk +zJ +zJ +zJ +zJ +Za +mo +Za +AE +Za +zJ +zJ +Za +Za +Za +zJ +zJ +rV +jw +"} +(18,1,1) = {" +rV +zJ +Lq +mO +To +nQ +bX +zJ +cl +sJ +zJ +Lk +vb +vm +zJ +sJ +rO +zJ +Oa +XZ +XZ +XZ +XZ +XZ +Os +dB +dB +dB +dB +zJ +rV +jw +"} +(19,1,1) = {" +rV +zJ +zJ +qV +ND +zt +zJ +zJ +lF +sJ +Ka +Ia +Ac +dv +kY +BH +IA +zJ +Wf +Vl +Vl +Vl +Vl +Vl +EC +dB +dB +dB +dB +zJ +jw +jw +"} +(20,1,1) = {" +jw +rV +zJ +Za +Za +Za +zJ +zJ +zJ +zJ +zJ +Ia +Vl +dv +zJ +zJ +zJ +zJ +Es +Vl +Sm +DZ +Ps +Vl +vT +zJ +zJ +zJ +zJ +zJ +jw +jw +"} +(21,1,1) = {" +jw +jw +jw +jw +rV +rV +rV +zJ +Yo +JX +zJ +Ia +uq +dv +zJ +sn +AQ +zJ +su +Vl +pH +zx +Mi +Vl +eE +zJ +rV +rV +rV +jw +jw +jw +"} +(22,1,1) = {" +jw +jw +vq +jw +jw +vq +rV +zJ +gM +sJ +Ka +Ia +UH +dv +Ka +sJ +lF +zJ +IJ +iV +Vl +Vl +Vl +oy +Bu +zJ +rV +rV +jw +jw +jw +jw +"} +(23,1,1) = {" +jw +jw +vq +rV +rV +vq +jw +zJ +zJ +zJ +zJ +Ia +Vl +dv +zJ +zJ +zJ +zJ +Bc +Iz +DN +El +GY +oN +hA +zJ +rV +jw +jw +jw +jw +jw +"} +(24,1,1) = {" +jw +fA +Sh +Sh +Sh +Sh +Sh +zJ +Yr +LY +zJ +Ia +Ac +dv +zJ +is +gH +zJ +zJ +Za +Za +zJ +Za +Za +zJ +zJ +jw +jw +jw +jw +jw +jw +"} +(25,1,1) = {" +jw +rV +vq +rV +rV +vq +jw +zJ +lF +fm +Ka +zw +Ur +Lt +Ka +sJ +lF +zJ +rV +rV +jw +Sh +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(26,1,1) = {" +jw +jw +vq +jw +jw +vq +rV +zJ +Za +zJ +zJ +zJ +Za +zJ +zJ +zJ +Za +zJ +rV +vq +vq +Sh +vq +vq +jw +jw +jw +jw +jw +jw +jw +jw +"} +(27,1,1) = {" +jw +jw +jw +jw +jw +jw +rV +rV +rV +rV +rV +jw +jw +jw +jw +rV +rV +rV +rV +jw +rV +Sh +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(28,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +rV +Sh +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(29,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +vq +vq +Sh +vq +vq +jw +jw +jw +jw +jw +jw +jw +jw +"} +(30,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +rV +TZ +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(31,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +rV +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} +(32,1,1) = {" +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +jw +"} diff --git a/_maps/deathmatch/sunrise.dmm b/_maps/deathmatch/sunrise.dmm index 31594d8e277..b4de46385cd 100644 --- a/_maps/deathmatch/sunrise.dmm +++ b/_maps/deathmatch/sunrise.dmm @@ -225,7 +225,7 @@ /area/deathmatch) "oR" = ( /obj/structure/table/bronze, -/obj/item/nullrod/bostaff, +/obj/item/nullrod/claymore/bostaff, /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/west, /obj/machinery/light{ diff --git a/_maps/icebox.json b/_maps/icebox.json index 3e10e516bf3..6e9f4000611 100644 --- a/_maps/icebox.json +++ b/_maps/icebox.json @@ -48,6 +48,9 @@ "job_changes": { "Captain": { "special_charter": "moon" + }, + "Cook": { + "additional_cqc_areas": ["/area/station/service/bar/atrium"] } } } diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 00961dbd7f5..2087d98e0ee 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -41227,9 +41227,9 @@ /turf/open/floor/iron/dark/small, /area/station/security/checkpoint/customs) "ohN" = ( -/obj/item/kirbyplants/random, /obj/item/radio/intercom/directional/north, /obj/machinery/firealarm/directional/west, +/obj/machinery/vending/cytopro, /turf/open/floor/iron/white, /area/station/science/cytology) "oig" = ( @@ -52468,6 +52468,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/science/cytology) "rYx" = ( @@ -53177,6 +53178,7 @@ name = "Detective Requests Console" }, /obj/machinery/light/small/directional/west, +/obj/structure/detectiveboard/directional/west, /turf/open/floor/wood, /area/station/security/detectives_office) "smf" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ffb2192c4d0..9d3333db69a 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -4050,6 +4050,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +<<<<<<< HEAD +======= +"aYN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Brig" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + 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/neutral/fourcorners, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aYO" = ( /obj/structure/chair/pew/right, /turf/open/floor/iron/chapel{ @@ -18854,6 +18880,23 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/department/science) +<<<<<<< HEAD +======= +"eIh" = ( +/obj/machinery/computer/robotics{ + dir = 8 + }, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eIi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22241,6 +22284,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/kitchen) +<<<<<<< HEAD +======= +"fyH" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/south{ + pixel_x = 6 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fyP" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/siding/yellow{ @@ -24860,6 +24915,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +<<<<<<< HEAD +======= +/obj/machinery/vending/cytopro, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/science/xenobiology) "gfR" = ( @@ -25002,6 +25061,7 @@ }, /obj/effect/turf_decal/stripes/line{ dir = 6 +<<<<<<< HEAD }, /turf/open/floor/plating, /area/station/maintenance/department/electrical) @@ -25972,6 +26032,999 @@ "gsZ" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/bot, +======= + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"gic" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"gii" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/service/theater) +"gij" = ( +/obj/structure/table, +/obj/item/hand_tele, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/station/command/teleporter) +"giu" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/science/auxlab/firing_range) +"giw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay) +"giz" = ( +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) +"giA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/greenglow, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/medical/abandoned) +"giC" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Hallway - Port"; + name = "hallway camera" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"giY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"gjc" = ( +/obj/structure/cable, +/obj/machinery/button/flasher{ + id = "Cell 4"; + name = "Prisoner Flash"; + pixel_x = 25; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/east{ + id = "permashut4"; + name = "Cell Lockdown Button"; + pixel_y = -6; + req_access = list("brig") + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"gjg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) +"gjh" = ( +/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/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"gjk" = ( +/obj/structure/chair, +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/directional/north{ + c_tag = "Security Post - Departures Holding Cell"; + dir = 9 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/sign/poster/official/report_crimes/directional/north, +/turf/open/floor/iron, +/area/station/security/checkpoint/escape) +"gjl" = ( +/obj/machinery/computer/upload/borg{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"gjB" = ( +/obj/structure/cable, +/obj/structure/closet/emcloset, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/processing) +"gjE" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) +"gjI" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/components/binary/pump/off/yellow/visible{ + dir = 4; + name = "CO2 to Pure" + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"gkp" = ( +/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/grimy, +/area/station/tcommsat/computer) +"gkt" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "secmechbay"; + name = "Security Mech Bay Shutters" + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"gku" = ( +/obj/machinery/meter, +/obj/machinery/door/window/right/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/turf_decal/siding/dark_red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"gkx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/grille_or_waste, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/chapel) +"gkB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"gkG" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit) +"gkI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/medbay/lobby) +"gkP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/pdapainter/supply, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"gkU" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/xenobiology) +"gkW" = ( +/obj/structure/table/wood, +/obj/item/storage/briefcase, +/obj/structure/sign/poster/official/help_others/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"glb" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"gld" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/service/kitchen) +"glv" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"glW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"gmc" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"gme" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/stack/cable_coil, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/main) +"gmh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/table/wood, +/obj/item/pai_card, +/turf/open/floor/carpet/red, +/area/station/hallway/secondary/service) +"gml" = ( +/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/iron, +/area/station/security/prison) +"gmo" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"gmx" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"gmD" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engineering Auxiliary Power" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/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/engineering/general, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"gmE" = ( +/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 = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/auxlab/firing_range) +"gmI" = ( +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Cytology Pen"; + req_access = list("research") + }, +/obj/effect/turf_decal/stripes/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, +/area/station/science/xenobiology) +"gmK" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/mining_weather_monitor/directional/south, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"gmP" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"gmQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/service/theater) +"gmT" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, +/obj/item/clothing/gloves/color/fyellow, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"gmY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"gmZ" = ( +/obj/item/stack/cable_coil, +/obj/item/assembly/igniter, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/structure/table, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"gnb" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/medical_kiosk, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Lobby"; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"gng" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"gnh" = ( +/obj/structure/bookcase/random/nonfiction, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/service/library) +"gnj" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/detectives_office/private_investigators_office) +"gnw" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"gnz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"gnA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"gnG" = ( +/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 = 6 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gnH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) +"gnO" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"gnS" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"gnW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) +"goa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"goc" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/south{ + pixel_y = -38 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "teleportershutters"; + name = "Teleporter Shutters"; + pixel_x = -6; + req_access = list("command") + }, +/obj/machinery/button/door/directional/south{ + id = "evastorage"; + name = "E.V.A. Shutters"; + pixel_x = 6; + req_access = list("command") + }, +/turf/open/floor/carpet, +/area/station/command/bridge) +"goj" = ( +/obj/structure/sign/painting/library{ + pixel_y = 33 + }, +/turf/open/floor/carpet/green, +/area/station/commons/dorms) +"gor" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +"gox" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"goy" = ( +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"goD" = ( +/obj/structure/rack, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port) +"goV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"gpd" = ( +/obj/machinery/door/window/right/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/abandoned_gambling_den) +"gpg" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "External Solar Access" + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron, +/area/station/maintenance/solars/starboard/aft) +"gpi" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/service/electronic_marketing_den) +"gpq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "paramed_dispatch"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/paramedic) +"gps" = ( +/obj/structure/closet/secure_closet/bar, +/obj/item/storage/photo_album/bar, +/obj/item/radio/intercom/directional/east, +/obj/item/storage/dice, +/turf/open/floor/iron/checker, +/area/station/service/bar/backroom) +"gpw" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/medical/chemistry) +"gpy" = ( +/obj/structure/reflector/single, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"gpD" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/brown/half{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/iron/half{ + dir = 1 + }, +/area/station/cargo/miningoffice) +"gpI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"gpY" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/chapel/storage) +"gqd" = ( +/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/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gqe" = ( +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser{ + pixel_x = 2; + pixel_y = -4 + }, +/obj/item/pipe_dispenser, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"gqf" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot_red, +/obj/item/clothing/suit/apron/chef{ + desc = "A white smock used by barbers to remain hair free."; + name = "barber smock" + }, +/obj/item/razor{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/razor{ + pixel_x = -2 + }, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/barber) +"gqm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/medical/virology) +"gqq" = ( +/obj/structure/dresser, +/turf/open/floor/iron/grimy, +/area/station/command/heads_quarters/hop) +"gqA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/iron, +/area/station/commons/vacant_room/office) +"gqF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gqH" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix to Ports" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gqR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/maintenance/disposal/incinerator) +"gqZ" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance" + }, +/obj/machinery/door/airlock/security/glass{ + name = "Brig" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"gri" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/random/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/dorms) +"grl" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/turf/open/floor/iron, +/area/station/engineering/main) +"grm" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"grp" = ( +/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, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"grq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/maintenance/department/medical/morgue) +"grz" = ( +/obj/machinery/door/window/left/directional/east, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/abandoned_gambling_den) +"grA" = ( +/obj/effect/spawner/random/structure/furniture_parts, +/obj/structure/closet/crate/decorations, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) +"grE" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Virology - Work Room"; + name = "virology camera"; + network = list("ss13","medbay","virology") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"grK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/plasma_tank{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"grM" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/reagent_dispensers/plumbed{ + name = "bar water reservoir" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/crew_quarters/bar) +"grN" = ( +/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/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/toilet/locker) +"grO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) +"grV" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"gsf" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/matches{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/lighter, +/obj/item/lighter{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/fax{ + fax_name = "Engineering Lobby"; + name = "Engineering Lobby Fax Machine" + }, +/turf/open/floor/wood, +/area/station/engineering/break_room) +"gsh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/auxlab/firing_range) +"gsy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"gsz" = ( +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"gsG" = ( +/obj/structure/table/reinforced, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/servo, +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/button/door/directional/east{ + id = "rdrnd"; + name = "Window Shutters"; + pixel_x = 38; + req_access = list("science") + }, +/turf/open/floor/iron, +/area/station/science/lab) +"gsH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/medbay/lobby) +"gsO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/library/abandoned) +"gsP" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/photocopier, +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"gsV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"gsY" = ( +/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/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"gsZ" = ( +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/bot, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -26984,6 +28037,7 @@ }, /turf/open/floor/iron, /area/station/medical/medbay) +<<<<<<< HEAD "gFz" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/button/door/directional/east{ @@ -27011,6 +28065,8 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gFB" = ( /obj/effect/turf_decal/siding/white{ dir = 9 @@ -27234,6 +28290,36 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"gIw" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/button/door/directional/east{ + id = "hosprivacy"; + name = "Privacy Control"; + pixel_y = 6; + req_access = list("hos") + }, +/obj/machinery/button/door/directional/east{ + id = "hosspace"; + name = "Space Shutters Control"; + pixel_y = -6; + req_access = list("hos") + }, +/obj/machinery/keycard_auth/wall_mounted/directional/east{ + pixel_x = 38; + pixel_y = 6 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 37; + pixel_y = -6 + }, +/obj/structure/tank_holder/extinguisher, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gIx" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/effect/decal/cleanable/dirt, @@ -30793,6 +31879,7 @@ /area/station/medical/virology) "hGW" = ( /obj/machinery/mass_driver/ordnance{ +<<<<<<< HEAD dir = 8 }, /turf/open/floor/plating, @@ -31735,10 +32822,103 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Starboard Primary Hallway" +======= + dir = 8 + }, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"hGZ" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"hHi" = ( +/obj/structure/window/spawner/directional/south, +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/water_source/puddle, +/turf/open/misc/sandy_dirt, +/area/station/security/prison/garden) +"hHo" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/chem_heater/withbuffer, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/medical/pharmacy) +"hHt" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/effect/landmark/start/head_of_security, +/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, +/turf/open/floor/iron/grimy, +/area/station/command/heads_quarters/hos) +"hHv" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) +"hHx" = ( +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/station/service/theater/abandoned) +"hHF" = ( +/turf/open/floor/plating{ + icon_state = "foam_plating" + }, +/area/station/maintenance/department/science/xenobiology) +"hHJ" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/engineering/break_room) +"hHQ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"hHS" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hHW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"hHX" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/service/abandoned_gambling_den) +"hIf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +<<<<<<< HEAD /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -32099,6 +33279,1215 @@ pixel_x = 3; pixel_y = 3 }, +======= +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"hIh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"hIo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"hIs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/maintenance/disposal) +"hIy" = ( +/obj/machinery/door/airlock/medical{ + name = "Psychology" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/medical/psychology) +"hIB" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rdordnance"; + name = "Ordnance Lab Shutters" + }, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/science/ordnance/storage) +"hIH" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"hIP" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/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/hallway/secondary/command) +"hIQ" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"hIU" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"hJc" = ( +/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/neutral/fourcorners, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/courtroom) +"hJj" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"hJn" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/suture, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Treatment Center"; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron, +/area/station/medical/treatment_center) +"hJo" = ( +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/folder/red, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office/private_investigators_office) +"hJs" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"hJv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"hJz" = ( +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) +"hJG" = ( +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/commons/fitness/recreation) +"hJM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/recharge_floor, +/area/station/science/robotics/mechbay) +"hJP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 + }, +/obj/machinery/duct, +/obj/effect/landmark/start/bartender, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"hKE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/service/hydroponics) +"hKF" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/machinery/atmospherics/components/binary/pump/off/yellow/visible{ + dir = 4; + name = "O2 To Pure" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hKG" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/service/library) +"hKH" = ( +/obj/effect/turf_decal/delivery, +/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/command/teleporter) +"hKO" = ( +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hKZ" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/bot, +/obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/effect/turf_decal/delivery, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"hLa" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/office) +"hLe" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "brigprison"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/station/security/prison) +"hLf" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"hLq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/fore) +"hLt" = ( +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: EXTERNAL AIRLOCK" + }, +/turf/closed/wall, +/area/station/hallway/secondary/exit/departure_lounge) +"hLA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/orange, +/area/station/commons/dorms) +"hLM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/service/abandoned_gambling_den) +"hMa" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/glasses/welding, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/science/lab) +"hMd" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"hMg" = ( +/obj/machinery/pdapainter/security, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) +"hMp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port) +"hMx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/prison/directional/east, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison) +"hMI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "viro_private_shutters"; + name = "Virology Privacy Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/medical/virology) +"hMO" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"hMP" = ( +/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) +"hNb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/medical/morgue) +"hNg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) +"hNp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/station/engineering/atmos/project) +"hNr" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/office) +"hNu" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xeniobiology - Xenobiology Computers"; + name = "xenobiology camera"; + network = list("ss13","xeno","rd") + }, +/obj/structure/chair/office/light, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hNx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/toilet/locker) +"hNP" = ( +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/maintenance/fore) +"hNS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"hNT" = ( +/obj/structure/chair/pew/right, +/turf/open/floor/iron/chapel{ + dir = 9 + }, +/area/station/service/chapel) +"hNW" = ( +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"hOa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/poddoor{ + id = "engstorage"; + name = "Engineering Secure Storage Lockdown" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"hOk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/lockers) +"hOw" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/command/heads_quarters/hos) +"hOx" = ( +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/desk_bell{ + pixel_y = 5 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "commissaryshutters"; + name = "Vacant Commissary Shutters" + }, +/turf/open/floor/iron/dark, +/area/station/commons/vacant_room/commissary) +"hOz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "brigwindows"; + name = "Brig Front Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig) +"hOY" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/main) +"hPc" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/valve/digital, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/maintenance/department/electrical) +"hPd" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "maint_contraption"; + pixel_x = -8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/obj/effect/turf_decal/tile/neutral/anticorner{ + dir = 1 + }, +/turf/open/floor/iron/smooth_corner, +/area/station/maintenance/port/aft) +"hPg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/ai_monitored/command/storage/eva) +"hPh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hPk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"hPs" = ( +/obj/machinery/door/poddoor/shutters{ + id = "evashutters"; + name = "E.V.A. Storage Shutters" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"hPu" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/chapel) +"hPw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/office) +"hPx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/security) +"hPJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hPN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison/safe) +"hPO" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/sign/warning/vacuum/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway) +"hQj" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hQq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/office) +"hQr" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/sign/warning/deathsposal/directional/east, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/button/door/directional/north{ + id = "viro_private_shutters"; + name = "Privacy Shutters"; + pixel_y = 36 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hQs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hQu" = ( +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/yellow/warning, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) +"hQx" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/library/abandoned) +"hQA" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/machinery/camera/directional/east{ + c_tag = "Science - Starboard Hallway"; + name = "science camera"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"hQF" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/secondary/exit/departure_lounge) +"hQK" = ( +/obj/structure/reflector/box, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"hQV" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L13" + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/edge, +/area/station/hallway/primary/central/aft) +"hRj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/engineering/atmospherics_portable, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"hRq" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/camera/directional/east{ + c_tag = "AI Satellite - Port"; + name = "ai camera"; + network = list("minisat"); + start_active = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hRs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate_loot, +/turf/open/floor/plating, +/area/station/maintenance/port) +"hRy" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/engine/atmos) +"hRH" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hRI" = ( +/obj/structure/closet/wardrobe/grey, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"hRV" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"hRX" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"hSa" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, +/turf/open/space/basic, +/area/space/nearstation) +"hSd" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Solar Access" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron, +/area/station/maintenance/solars/starboard/fore) +"hSf" = ( +/obj/structure/table, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/item/relic, +/obj/item/assembly/signaler{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/machinery/door/poddoor/preopen{ + id = "sci_experimentor"; + name = "Experimentor Blast Door" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"hSi" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Xenobiology - Killroom Chamber"; + name = "xenobiology camera"; + network = list("ss13","xeno","rd") + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/science/xenobiology) +"hSl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/station/service/kitchen/abandoned) +"hSu" = ( +/obj/effect/spawner/random/trash/box, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/effect/spawner/random/trash/botanical_waste, +/obj/item/reagent_containers/cup/glass/waterbottle/empty, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"hSx" = ( +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hSE" = ( +/obj/structure/chair/stool/bar/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/grimy, +/area/station/service/abandoned_gambling_den) +"hST" = ( +/obj/structure/destructible/cult/item_dispenser/archives/library, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/station/service/library/abandoned) +"hTg" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"hTi" = ( +/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, +/area/station/hallway/primary/fore) +"hTk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hTl" = ( +/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/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hTm" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Starboard Primary Hallway" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + 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/hallway/primary/starboard) +"hTq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "corporatelounge"; + name = "Corporate Lounge Shutters" + }, +/turf/open/floor/plating, +/area/station/command/corporate_showroom) +"hTr" = ( +/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/stripes/corner{ + dir = 4 + }, +/mob/living/simple_animal/bot/secbot/beepsky/armsky, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"hTv" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hTR" = ( +/obj/structure/closet/crate/coffin, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/station/service/chapel/storage) +"hUb" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Port Mix to Engine" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hUh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/obj/structure/sign/poster/random/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) +"hUm" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/vending/coffee, +/turf/open/space/basic, +/area/space/nearstation) +"hUt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/closet/radiation, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"hUx" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/bot, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/small/directional/east, +/obj/machinery/status_display/ai/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"hUB" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/engineering/atmos/mix) +"hUD" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/service/abandoned_gambling_den) +"hUE" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/obj/effect/turf_decal/siding/yellow, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hUK" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - co2 Cell"; + name = "atmospherics camera" + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"hUO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"hUU" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/chair/sofa/bench{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"hUV" = ( +/obj/structure/sign/warning/no_smoking, +/turf/closed/wall, +/area/station/engineering/atmos/storage) +"hVi" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"hVt" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hVx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay) +"hVy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/genetics) +"hVA" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hVB" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "External Airlock" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/iron, +/area/station/maintenance/department/science/xenobiology) +"hVE" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/space, +/area/space/nearstation) +"hVI" = ( +/obj/structure/table, +/obj/item/plant_analyzer, +/obj/item/hatchet, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"hVV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) +"hWh" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"hWq" = ( +/obj/structure/chair/comfy/brown{ + buildstackamount = 0; + dir = 1 + }, +/turf/open/floor/carpet, +/area/station/command/meeting_room/council) +"hWz" = ( +/obj/structure/closet/secure_closet/atmospherics, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) +"hWA" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "hopblast"; + name = "HoP Blast Door" + }, +/obj/machinery/door/window/brigdoor/left/directional/east{ + name = "Access Desk"; + req_access = list("hop") + }, +/obj/machinery/door/window/right/directional/west{ + name = "Access Queue" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"hWF" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hWJ" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/aft) +"hWW" = ( +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) +"hWY" = ( +/obj/structure/reflector/double, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"hXf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/maintenance/department/science) +"hXg" = ( +/turf/closed/wall, +/area/station/cargo/bitrunning/den) +"hXi" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) +"hXm" = ( +/obj/structure/closet/emcloset, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) +"hXo" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Cooling to Filters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"hXu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hXw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/west, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"hXx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"hXB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"hXO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/science/research/abandoned) +"hXQ" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Monkey Pen"; + req_access = list("genetics") + }, +/obj/structure/flora/bush/lavendergrass, +/obj/structure/flora/bush/flowers_yw, +/turf/open/floor/grass, +/area/station/science/genetics) +"hXZ" = ( +/obj/item/storage/box/teargas{ + pixel_x = 3; + pixel_y = 3 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/handcuffs, /obj/item/storage/box/flashbangs{ pixel_x = -3; @@ -39075,6 +41464,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "jIN" = ( /obj/machinery/keycard_auth/wall_mounted/directional/south{ pixel_y = -38 @@ -39096,6 +41486,8 @@ }, /turf/open/floor/carpet, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jIQ" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/structure/chair/wood{ @@ -42701,6 +45093,27 @@ /obj/item/storage/crayons, /turf/open/floor/wood, /area/station/service/library/abandoned) +<<<<<<< HEAD +======= +"kEp" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance" + }, +/obj/machinery/door/airlock/security/glass{ + name = "Brig" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kEw" = ( /obj/structure/cable, /obj/structure/reagent_dispensers/plumbed{ @@ -50601,6 +53014,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +<<<<<<< HEAD "mEB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -50624,6 +53038,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mEH" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -55495,6 +57911,7 @@ }, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) +<<<<<<< HEAD "nTg" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -55526,6 +57943,8 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nTn" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -55979,6 +58398,7 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +<<<<<<< HEAD "nZG" = ( /obj/machinery/keycard_auth/wall_mounted/directional/south{ pixel_x = 6 @@ -55988,6 +58408,8 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nZK" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -70834,6 +73256,7 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/command/heads_quarters/qm) +<<<<<<< HEAD "rLs" = ( /obj/structure/table/wood, /obj/machinery/keycard_auth/wall_mounted/directional/west, @@ -70841,6 +73264,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rLt" = ( /obj/machinery/camera/directional/north{ c_tag = "Holodeck Control"; @@ -72042,6 +74467,7 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "rYA" = ( +<<<<<<< HEAD /turf/closed/wall, /area/station/maintenance/department/security) "rYE" = ( @@ -74588,6 +77014,2581 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +======= +/turf/closed/wall, +/area/station/maintenance/department/security) +"rYE" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/button/door{ + id = "xeno4"; + name = "Containment Control"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"rYR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"rZe" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/anesthetic{ + pixel_x = 3 + }, +/obj/item/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = 3 + }, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/door/window/left/directional/north{ + name = "Surgical Supplies"; + req_access = list("surgery") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) +"rZf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"rZl" = ( +/obj/structure/closet/secure_closet/medical1, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/green, +/obj/structure/cable, +/obj/machinery/requests_console/directional/north{ + department = "Virology"; + name = "Virology Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/medical/virology) +"rZt" = ( +/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/green/filled/warning, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"rZw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/maintenance/port) +"rZy" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"rZE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Prison Wing" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"rZF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/abandoned_gambling_den/gaming) +"rZI" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/clothing/costume, +/obj/item/clothing/neck/tie/black, +/obj/effect/turf_decal/bot/right, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/theater/abandoned) +"rZL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/grille, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"rZU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/maintenance/department/engine/atmos) +"sao" = ( +/obj/machinery/hydroponics/constructable, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"sau" = ( +/obj/machinery/blackbox_recorder, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) +"sav" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/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, +/turf/open/floor/iron, +/area/station/science/research) +"saz" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/purple/filled/warning, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"saA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"saB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/loading_area, +/turf/open/floor/plating, +/area/station/maintenance/department/crew_quarters/bar) +"saC" = ( +/obj/machinery/photocopier, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"saD" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"saE" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Port to Filter" + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"saK" = ( +/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, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/kitchen/abandoned) +"saR" = ( +/obj/machinery/disposal/bin, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"saS" = ( +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/dirt, +/obj/item/crowbar/red, +/obj/item/stack/sheet/mineral/plasma{ + amount = 20 + }, +/obj/item/gps/engineering, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/main) +"saT" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/security/lockers) +"sbf" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"sbh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"sbl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/sign/warning/biohazard/directional/south, +/turf/open/floor/iron, +/area/station/maintenance/department/science) +"sbP" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/crew_quarters/bar) +"sbT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/large, +/area/station/medical/surgery/theatre) +"sbV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/main) +"sbW" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) +"sbX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"sca" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/large, +/area/station/medical/medbay) +"sch" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos/mix) +"scn" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"scp" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot/left, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/obj/machinery/modular_computer/preset/cargochat/science{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/research) +"scs" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"scy" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"scR" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) +"scU" = ( +/obj/structure/easel, +/obj/effect/decal/cleanable/dirt, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, +/turf/open/floor/plating, +/area/station/service/library/abandoned) +"scX" = ( +/obj/machinery/door/window/brigdoor/right/directional/east{ + name = "Primary AI Core Access"; + req_access = list("ai_upload") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"sdi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible, +/obj/machinery/meter/monitored/distro_loop, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) +"sdq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"sdw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/medical/virology) +"sdB" = ( +/obj/item/kirbyplants/random, +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"sdC" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/maintenance/solars/port/fore) +"sdJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"sdK" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"sdO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"sdV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/wood/large, +/area/station/command/corporate_showroom) +"sef" = ( +/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/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/hallway/primary/port) +"seg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/iron, +/area/station/medical/storage) +"sez" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay) +"seD" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "viro_private_shutters"; + name = "Virology Privacy Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/medical/virology) +"seE" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"seX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"sfc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "genetics_shutters"; + name = "Genetics Shutters" + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"sfe" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"sfs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"sfw" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"sfy" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: EXTERNAL AIRLOCK"; + pixel_y = 32 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/hallway/secondary/entry) +"sfA" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"sfB" = ( +/obj/effect/spawner/random/structure/girder, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"sfC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=hall2"; + location = "hall1" + }, +/obj/effect/turf_decal/plaque{ + icon_state = "L5" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"sfD" = ( +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"sfE" = ( +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"sfH" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"sfN" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) +"sfW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/server) +"sgd" = ( +/obj/structure/cable, +/obj/machinery/biogenerator, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/checker, +/area/station/service/hydroponics/garden/abandoned) +"sgh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"sgj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/valve, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/maintenance/department/electrical) +"sgp" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/medical/pharmacy) +"sgA" = ( +/obj/structure/table/reinforced, +/obj/machinery/gulag_item_reclaimer{ + pixel_y = 28 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/processing) +"sgD" = ( +/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 = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"sgI" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"sgZ" = ( +/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/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"shc" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/smartfridge/drying, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"shm" = ( +/obj/effect/spawner/random/structure/table_or_rack, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"shJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ + dir = 4 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"shM" = ( +/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, +/obj/machinery/light/floor, +/turf/open/floor/iron/grimy, +/area/station/command/heads_quarters/hos) +"shO" = ( +/obj/structure/cable, +/turf/open/floor/circuit/green, +/area/station/science/xenobiology) +"shP" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"shU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"shZ" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/service/barber) +"sid" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/janitor, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/checker, +/area/station/service/janitor) +"sie" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"sii" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/dice, +/obj/effect/spawner/random/entertainment/money_large, +/turf/open/floor/iron/grimy, +/area/station/service/abandoned_gambling_den) +"sik" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"sim" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/bed, +/obj/item/bedsheet/captain, +/obj/effect/landmark/start/captain, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"siu" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/warden) +"siF" = ( +/obj/machinery/mineral/ore_redemption, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/box, +/obj/machinery/door/window/left/directional/south{ + name = "Ore Redemption Access"; + req_access = list("mineral_storeroom") + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"siI" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/box/white/corners, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) +"siT" = ( +/obj/machinery/holopad, +/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/bot, +/obj/structure/cable/layer3, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"siV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/maintenance/fore) +"siX" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/theater) +"sja" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/stool/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/locker) +"sjh" = ( +/obj/structure/statue/sandstone/venus{ + name = "Justice" + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"sji" = ( +/obj/structure/closet/crate/preopen, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/bot, +/obj/item/electronics/apc, +/turf/open/floor/iron, +/area/station/cargo/storage) +"sjm" = ( +/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/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay) +"sjt" = ( +/turf/closed/wall, +/area/station/hallway/secondary/entry) +"sjz" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"sjD" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/bot, +/obj/item/analyzer, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) +"sjH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/maintenance/port) +"ske" = ( +/obj/effect/spawner/random/entertainment/arcade, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/abandoned_gambling_den/gaming) +"skf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/eva/abandoned) +"skg" = ( +/obj/machinery/iv_drip, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Virology - Cell 2"; + name = "virology camera"; + network = list("ss13","medbay","virology") + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"skr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/plating, +/area/station/service/abandoned_gambling_den) +"skx" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/command/teleporter) +"sky" = ( +/obj/machinery/light_switch/directional/north{ + pixel_x = -8 + }, +/obj/machinery/button/door{ + id = "rdordnance"; + name = "Ordnance Containment Control"; + pixel_x = 8; + pixel_y = 26; + req_access = list("science") + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Science - Ordnance Lab Access"; + name = "science camera"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"skC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"skD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"skI" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"skQ" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/box/red, +/obj/structure/sign/poster/official/help_others/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"skX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"skZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"sle" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/brigdoor/right/directional/east{ + name = "Warden's Desk"; + req_access = list("armory") + }, +/obj/machinery/door/window/left/directional/west{ + name = "Warden's Desk" + }, +/obj/item/folder/red, +/obj/item/pen, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/warden) +"slp" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/checkpoint/engineering) +"slr" = ( +/obj/effect/landmark/start/chaplain, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/grimy, +/area/station/service/chapel) +"slx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/departments/engineering/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"slC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/engine, +/area/station/science/explab) +"slE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) +"slG" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"slW" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/maintenance/port) +"slZ" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/chapel) +"sma" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/blobstart, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/abandoned_gambling_den/gaming) +"smj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/science/xenobiology) +"smF" = ( +/obj/structure/chair{ + dir = 8; + name = "Judge" + }, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/courtroom) +"smG" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"smJ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/escape) +"smN" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/lesser) +"smO" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/starboard/fore) +"smR" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"smU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock{ + name = "Auxiliary Storage Closet" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"smV" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space, +/area/space/nearstation) +"snc" = ( +/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/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"snj" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"snE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "genetics_shutters"; + name = "Genetics Shutters" + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"snK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"snW" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"sob" = ( +/obj/structure/disposalpipe/segment, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/circuits) +"sog" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump/on/supply/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/maintenance/disposal/incinerator) +"sox" = ( +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/command/heads_quarters/hop) +"soK" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"soO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Supermatter Foyer"; + name = "engineering camera"; + network = list("ss13","engine") + }, +/obj/structure/rack, +/obj/item/analyzer, +/obj/item/geiger_counter, +/obj/item/geiger_counter{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) +"soU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/large, +/area/station/medical/paramedic) +"spa" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 1 + }, +/obj/structure/table/wood/poker, +/obj/structure/sign/poster/contraband/random/directional/south, +/turf/open/floor/plating, +/area/station/service/abandoned_gambling_den) +"spd" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 2; + name = "Genetics Junction" + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/mail_sorting/science/genetics, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/science/research) +"spe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/sign/warning/fire/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +"spq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"spB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"spG" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/commons/vacant_room/office) +"spI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/hallway) +"spJ" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"spV" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/space/basic, +/area/space/nearstation) +"sqd" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"sqj" = ( +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Coldroom"; + dir = 9; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/bot_white{ + color = "#435a88" + }, +/turf/open/floor/iron/freezer, +/area/station/medical/coldroom) +"sqm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"sqp" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/commons/toilet/locker) +"squ" = ( +/obj/item/kirbyplants/random, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/medical/medbay/lobby) +"sqD" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/structure/sign/poster/official/work_for_a_future/directional/south, +/turf/open/floor/carpet, +/area/station/commons/vacant_room/office) +"sqI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/half, +/area/station/service/hydroponics) +"sqM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/closet/secure_closet/freezer/meat, +/obj/effect/turf_decal/bot, +/obj/item/food/meat/slab/monkey, +/obj/item/food/meat/slab/monkey, +/turf/open/floor/iron/dark, +/area/station/service/kitchen/coldroom) +"sqT" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"sqX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/command/heads_quarters/cmo) +"srb" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/lobby) +"srd" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/disposal/bin, +/obj/structure/sign/warning/deathsposal/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/station/maintenance/disposal/incinerator) +"srg" = ( +/obj/structure/table/glass, +/obj/item/food/pizzaslice/vegetable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/bless_this_spess/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/space_hut/observatory) +"srh" = ( +/obj/machinery/door/window/brigdoor/security/cell/right/directional/west{ + id = "brig1"; + name = "Cell 1" + }, +/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/siding/dark_red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"srn" = ( +/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/science/research) +"srI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/abandoned_gambling_den) +"ssb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"ssj" = ( +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/maintenance/department/security) +"ssp" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"ssr" = ( +/obj/machinery/button/door{ + id = "brigwindows"; + name = "Cell Window Control"; + pixel_x = -32; + pixel_y = -26; + req_access = list("security") + }, +/obj/machinery/button/door{ + id = "brigfront"; + name = "Brig Access Control"; + pixel_x = -26; + pixel_y = -36; + req_access = list("security") + }, +/obj/machinery/button/door{ + id = "brigprison"; + name = "Prison Lockdown"; + pixel_x = -38; + pixel_y = -36; + req_access = list("brig") + }, +/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 = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/warden) +"sst" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"ssy" = ( +/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/newscaster/directional/north, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"ssM" = ( +/obj/structure/sign/departments/medbay/alt/directional/west, +/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/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Departures Hallway" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) +"ssR" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"ssY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/plumbed{ + name = "dormitory water reservoir" + }, +/obj/effect/turf_decal/delivery/white{ + color = "#52B4E9" + }, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/maintenance/department/security) +"stc" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/medical/pharmacy) +"stx" = ( +/obj/structure/chair/pew/left, +/turf/open/floor/iron/chapel{ + dir = 10 + }, +/area/station/service/chapel) +"stA" = ( +/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{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/security/brig) +"stC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/large, +/area/station/command/corporate_showroom) +"stD" = ( +/obj/machinery/suit_storage_unit/engine, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/storage) +"stK" = ( +/obj/structure/closet/crate/coffin, +/turf/open/floor/plating, +/area/station/service/chapel/storage) +"stN" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/theater) +"suj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/yjunction, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"sup" = ( +/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/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"suw" = ( +/obj/item/kirbyplants/random, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/carpet, +/area/station/commons/vacant_room/office) +"suA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/structure/sign/warning/no_smoking/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/department/engine/atmos) +"suB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/random, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/west{ + pixel_x = -24 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/toilet/locker) +"suE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"suH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/modular_computer/preset/civilian, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) +"suQ" = ( +/obj/structure/cable, +/obj/structure/table/wood/fancy/blue, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/door/window/right/directional/west{ + name = "Core Modules"; + req_access = list("captain") + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +"suZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/atmospherics, +/obj/item/book/manual/wiki/atmospherics{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/pipe_dispenser, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/engineering/atmos) +"sva" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/engine_safety/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"svc" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "xeno7"; + name = "Containment Control"; + req_access = list("xenobiology") + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"svd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/plating, +/area/station/maintenance/department/security) +"svf" = ( +/obj/structure/closet/crate/hydroponics, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/effect/spawner/random/maintenance, +/obj/machinery/light_switch/directional/east{ + pixel_y = 6 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/checker, +/area/station/service/hydroponics/garden/abandoned) +"svj" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) +"svm" = ( +/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{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"svt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/service/abandoned_gambling_den) +"svz" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"svO" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/structure/chair, +/obj/effect/landmark/start/assistant, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"svW" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"svX" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/event_spawn, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"swf" = ( +/obj/machinery/door/window/brigdoor/left/directional/south{ + id = "medsci-cell"; + name = "Med-Sci Cell"; + req_access = list("security") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark/side, +/area/station/security/checkpoint/medical/medsci) +"swj" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Captain's Office"; + name = "Captain's Fax Machine" + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"swn" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"swD" = ( +/obj/machinery/power/emitter, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/main) +"swP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/commons/fitness/recreation) +"swR" = ( +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"swY" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chem_lab_maint_windows"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"sxk" = ( +/obj/structure/barricade/wooden, +/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/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/iron, +/area/station/service/abandoned_gambling_den) +"sxp" = ( +/obj/structure/table/reinforced, +/obj/item/analyzer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/analyzer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/turf/open/floor/iron, +/area/station/engineering/storage/tech) +"sxr" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/requests_console/directional/south{ + department = "Bridge"; + name = "Bridge Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/item/papercutter, +/turf/open/floor/iron/grimy, +/area/station/command/bridge) +"sxD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"sxE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/ordnance/office) +"sxG" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/medical{ + name = "Medbay Desk" + }, +/turf/open/floor/iron, +/area/station/medical/paramedic) +"sxK" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood/large, +/area/station/service/barber) +"sxP" = ( +/obj/machinery/computer/records/security, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/processing) +"sxR" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/main) +"sye" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"sys" = ( +/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/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/engineering/lobby) +"syE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research/glass{ + name = "Robotics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"syO" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"syW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/conveyor{ + id = "cargodisposals" + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"sze" = ( +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"szf" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +"szg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"szh" = ( +/obj/effect/spawner/random/trash/soap, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/turf/open/floor/iron/textured_half{ + dir = 8 + }, +/area/station/commons/toilet/locker) +"szi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/security/range) +"szj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Science - Ordnance Storage"; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/ordnance/storage) +"szn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/command/storage/eva) +"szs" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow, +/obj/effect/landmark/start/atmospheric_technician, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"szy" = ( +/turf/closed/wall, +/area/station/service/bar/backroom) +"szG" = ( +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/atmos/hfr_room) +"szJ" = ( +/obj/machinery/research/anomaly_refinery, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"szL" = ( +/obj/structure/cable, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/processing) +"szN" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"szZ" = ( +/obj/structure/table/reinforced, +/obj/item/folder/yellow, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/structure/extinguisher_cabinet/directional/north{ + pixel_x = 32 + }, +/obj/item/radio/intercom/directional/east{ + pixel_x = 38; + pixel_y = 3 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/east{ + pixel_x = 40; + pixel_y = -8 + }, +/obj/machinery/button/door/directional/east{ + id = "qmspace"; + name = "Space Shutters Control"; + pixel_y = -8 + }, +/obj/machinery/button/door/directional/east{ + id = "qmprivacy"; + name = "Privacy Control"; + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"sAh" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/barber) +"sAi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/xenoblood, +/obj/structure/sign/warning/xeno_mining/directional/north, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/science/xenobiology) +"sAm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"sAv" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) +"sAD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"sAI" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/maintenance/department/medical/morgue) +"sAL" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"sAU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"sAY" = ( +/obj/effect/landmark/start/hangover/closet, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/delivery, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"sBb" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/command/teleporter) +"sBc" = ( +/turf/open/floor/iron, +/area/station/engineering/lobby) +"sBg" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "perma-entrance" + }, +/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/airlock/security/glass{ + name = "Prison Wing" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"sBk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos/mix) +"sBt" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/preopen{ + id = "xeno8"; + name = "Creature Cell #8" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"sBy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"sBE" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_half{ + dir = 1 + }, +/area/station/science/ordnance/storage) +"sBG" = ( +/obj/structure/cable, +/turf/open/floor/iron/checker, +/area/station/service/janitor) +"sBK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"sBM" = ( +/obj/structure/table, +/obj/machinery/airalarm/directional/east, +/obj/item/storage/medkit/emergency, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"sBX" = ( +/turf/closed/wall, +/area/station/service/bar) +"sCd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/shieldgen, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/main) +"sCh" = ( +/obj/structure/cable, +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +"sCl" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/chair/sofa/bench{ + dir = 4 + }, +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +"sCo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"sCx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) +"sCB" = ( +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) +"sCE" = ( +/obj/structure/table/wood, +/obj/item/poster/random_contraband{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/poster/random_contraband{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/poster/random_contraband, +/turf/open/floor/wood, +/area/station/service/electronic_marketing_den) +"sCF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/half, +/area/station/service/hydroponics) +"sCY" = ( +/obj/structure/cable, +/obj/machinery/power/tracker, +/turf/open/floor/iron/solarpanel/airless, +/area/station/solars/port/fore) +"sDd" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Medbay Airlock"; + name = "science camera"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"sDe" = ( +/obj/machinery/duct, +/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{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"sDk" = ( +/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/effect/spawner/random/trash/caution_sign, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: PRESSURIZED DOORS"; + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"sDJ" = ( +/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_white, +/turf/open/floor/iron/grimy, +/area/station/service/chapel) +"sDL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"sDO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-toxins-passthrough" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/science) +"sEc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"sEm" = ( +/obj/structure/cable, +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/command/meeting_room/council) +"sEn" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/iron, +/area/station/maintenance/department/crew_quarters/bar) +"sEs" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/captain/private) +"sEv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"sEF" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/science/research) +"sFf" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"sFq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner, +/turf/open/floor/iron/white, +/area/station/science/research) +"sFu" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/corporate_showroom) +"sFR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/virology) +"sFS" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/external{ + name = "External Solar Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron, +/area/station/maintenance/solars/port/fore) +"sFW" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) +"sGa" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "AI Satellite - Fore Starboard"; + name = "ai camera"; + network = list("minisat"); + start_active = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"sGi" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"sGj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "aiuploadwindow"; + name = "AI Upload Lockdown Door" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/ai_upload) +"sGx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"sGz" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall, +/area/station/command/heads_quarters/hop) +"sGB" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/service/library/printer) +"sGI" = ( +/obj/effect/spawner/random/structure/girder, +/obj/effect/spawner/random/structure/grille, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/maintenance/port/aft) "sGJ" = ( @@ -76952,6 +81953,16 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD +======= +"tns" = ( +/obj/structure/table/wood, +/obj/machinery/keycard_auth/wall_mounted/directional/west, +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tnu" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -80332,6 +85343,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +<<<<<<< HEAD "ucz" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" @@ -80350,6 +85362,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ucA" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -82432,6 +87446,7 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +<<<<<<< HEAD "uDg" = ( /obj/machinery/modular_computer/preset/id{ dir = 1 @@ -82451,6 +87466,8 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uDj" = ( /obj/structure/cable, /obj/structure/sign/nanotrasen{ @@ -90608,6 +95625,28 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/medical/medsci) +<<<<<<< HEAD +======= +"wDO" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 1 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/south{ + pixel_x = -5 + }, +/obj/machinery/button/door/directional/south{ + id = "cmoshutter"; + name = "CMO Office Shutters"; + pixel_x = 8; + pixel_y = -26; + req_access = list("cmo") + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wDX" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -94090,11 +99129,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/department/chapel) +<<<<<<< HEAD "xyX" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/smartfridge/drying, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xyZ" = ( /obj/machinery/light/directional/north, /obj/item/kirbyplants/random, @@ -127672,7 +132714,11 @@ spq nyp vmh rEJ +<<<<<<< HEAD xyX +======= +shc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xtp hBF jUU @@ -127739,7 +132785,11 @@ tYP hBT ipr xwC +<<<<<<< HEAD hOU +======= +eIh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 urt mjW lPM @@ -132589,7 +137639,11 @@ jpe sCh cvE vcU +<<<<<<< HEAD rLs +======= +tns +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lZx lZx dQf @@ -132869,7 +137923,11 @@ rcW oJy oFr pXk +<<<<<<< HEAD sbn +======= +hXQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lfz fvi nlK @@ -133662,7 +138720,11 @@ dQT akg hdH jgt +<<<<<<< HEAD uDg +======= +wDO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 loe iId nuI @@ -136173,7 +141235,11 @@ cQv sHn qBY wIe +<<<<<<< HEAD jIN +======= +goc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eVl dol uIY @@ -138493,7 +143559,11 @@ wkt aby dFo xnw +<<<<<<< HEAD nZG +======= +fyH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ivA hTg pgE @@ -143600,7 +148670,11 @@ aaa aaa aad ljS +<<<<<<< HEAD nTg +======= +szZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bdF wob eZV @@ -146974,9 +152048,15 @@ hOz hOz hOz dzw +<<<<<<< HEAD mEB hOz ucz +======= +aYN +hOz +kEp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mTA mTA tNZ @@ -153121,7 +158201,11 @@ qIH aad kOA kOA +<<<<<<< HEAD gFz +======= +gIw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 huI fbW okz diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b88647d4934..661e6ee6202 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1,4 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +<<<<<<< HEAD "aac" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -16,6 +17,17 @@ dir = 8 }, /area/station/security/brig/entrance) +======= +"aab" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"aao" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aap" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, @@ -31,10 +43,13 @@ /obj/item/taperecorder, /turf/open/floor/iron/dark, /area/station/security/interrogation) +<<<<<<< HEAD "aaD" = ( /obj/structure/sign/warning, /turf/closed/wall/r_wall, /area/mine/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aaI" = ( /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, @@ -53,11 +68,14 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD "aaX" = ( /obj/structure/chair/sofa/bench/right, /obj/effect/mapping_helpers/no_atoms_ontop, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "abb" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -67,6 +85,7 @@ "abe" = ( /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD "abm" = ( /obj/structure/table, /obj/item/trash/can/food/beans, @@ -74,6 +93,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "abv" = ( /obj/effect/turf_decal/loading_area{ dir = 1 @@ -91,6 +112,25 @@ /obj/item/clothing/head/helmet/skull, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD +======= +"abJ" = ( +/obj/machinery/camera{ + c_tag = "Service - Botany"; + dir = 9 + }, +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/warm/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "abL" = ( /obj/machinery/light/directional/north, /obj/structure/sign/warning/secure_area/directional/north, @@ -107,6 +147,27 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +<<<<<<< HEAD +======= +"abQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"abT" = ( +/obj/structure/table, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "abU" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ @@ -119,10 +180,20 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"abZ" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ace" = ( /obj/structure/table/wood, /turf/open/floor/wood, /area/station/maintenance/port/aft) +<<<<<<< HEAD "acg" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -132,10 +203,18 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +======= +"acl" = ( +/mob/living/carbon/human/species/monkey, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/grass, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "acE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +<<<<<<< HEAD "acG" = ( /obj/effect/spawner/random/trash/moisture_trap, /obj/item/reagent_containers/cup/bucket, @@ -166,6 +245,15 @@ /obj/machinery/bouldertech/refinery, /turf/open/floor/iron, /area/mine/production) +======= +"acN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/fitness) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "adq" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -174,12 +262,48 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"adv" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"adA" = ( +/turf/closed/wall/r_wall, +/area/icemoon/surface/outdoors/labor_camp) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "adD" = ( /obj/structure/railing/corner{ dir = 8 }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +<<<<<<< HEAD +======= +"adP" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"adS" = ( +/obj/structure/statue/snow/snowman{ + name = "Steve" + }, +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "adY" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -220,6 +344,7 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +<<<<<<< HEAD "aes" = ( /obj/machinery/computer/cargo, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -228,6 +353,8 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aey" = ( /obj/machinery/camera/directional/east{ c_tag = "Xenobiology Pens - Starboard Fore"; @@ -240,6 +367,7 @@ /obj/item/clothing/mask/gas, /turf/open/floor/iron/smooth, /area/mine/living_quarters) +<<<<<<< HEAD "aeF" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue{ @@ -249,6 +377,8 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aeQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -259,14 +389,28 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD "aeV" = ( /obj/structure/sign/warning, /turf/closed/wall, /area/station/maintenance/port/fore) +======= +"aeS" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"afb" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afp" = ( /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +<<<<<<< HEAD "afs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -295,16 +439,21 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afz" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/port/greater) +<<<<<<< HEAD "afK" = ( /obj/structure/cable, /turf/open/floor/iron/stairs/left{ dir = 4 }, /area/station/engineering/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afR" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ @@ -320,6 +469,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/upper) +<<<<<<< HEAD +======= +"agd" = ( +/obj/structure/table, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/cell_charger{ + pixel_y = 5 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "agk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -356,10 +518,13 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) +<<<<<<< HEAD "agG" = ( /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "agI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -390,12 +555,15 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +<<<<<<< HEAD "ahh" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron, /area/station/service/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ahm" = ( /obj/machinery/newscaster/directional/west, /obj/machinery/firealarm/directional/south, @@ -414,6 +582,15 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/smooth, /area/station/security/holding_cell) +<<<<<<< HEAD +======= +"ahG" = ( +/obj/structure/fence/post{ + dir = 2 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ahK" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -435,6 +612,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/service/chapel) +<<<<<<< HEAD +======= +"aiu" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aiA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -455,10 +639,21 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +<<<<<<< HEAD "aiT" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, /area/station/maintenance/port/fore) +======= +"aiQ" = ( +/obj/machinery/modular_computer/preset/id, +/obj/machinery/computer/security/telescreen/vault/directional/north, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aiX" = ( /turf/open/floor/iron, /area/station/security/courtroom) @@ -520,6 +715,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) +<<<<<<< HEAD "akb" = ( /obj/structure/closet/crate, /obj/item/food/canned/beans, @@ -541,6 +737,14 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +======= +"akd" = ( +/obj/structure/rack, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "akk" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ dir = 4 @@ -551,6 +755,13 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) +<<<<<<< HEAD +======= +"akn" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ako" = ( /turf/closed/wall/r_wall, /area/station/medical/morgue) @@ -601,6 +812,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) +<<<<<<< HEAD +======= +"akN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "akQ" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/glass/reinforced/icemoon, @@ -621,6 +843,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +<<<<<<< HEAD /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/transit_tube) @@ -1337,9 +1560,745 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/line{ +======= +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/transit_tube) +"ale" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/camera/directional/north{ + network = list("ss13","medbay"); + c_tag = "Morgue North" + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/trimline/neutral/filled/end{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"alq" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) +"alv" = ( +/obj/machinery/holopad, +/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/tcommsat/computer) +"alx" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"alz" = ( +/obj/item/clothing/suit/hooded/wintercoat/science, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"alA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"alD" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/siding/thinplating_new/corner, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"alK" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/service) +"alM" = ( +/turf/closed/wall, +/area/station/maintenance/aft/lesser) +"alO" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"alT" = ( +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) +"alW" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/mine/storage) +"amg" = ( +/obj/machinery/door/poddoor/shutters/window/preopen{ + dir = 4; + id = "Atmospherics HFR Shutters"; + name = "Atmospherics HFR Shutters" + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"ami" = ( +/obj/structure/cable, +/turf/open/floor/iron/corner{ + dir = 8 + }, +/area/station/engineering/lobby) +"amn" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_x = -6 + }, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"amv" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"amx" = ( +/obj/structure/curtain, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"amz" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"amE" = ( +/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/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"amN" = ( +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"amW" = ( +/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/plating, +/area/station/maintenance/starboard/fore) +"anb" = ( +/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/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ank" = ( +/obj/structure/chair/office, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/command/heads_quarters/rd) +"anl" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"anu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"anv" = ( +/obj/machinery/door/airlock/engineering{ + name = "Starboard Quarter Solar Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"anz" = ( +/obj/machinery/telecomms/server/presets/engineering, +/obj/structure/sign/warning/no_smoking/circle/directional/north, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"anK" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"anO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"anP" = ( +/obj/structure/table, +/obj/machinery/light_switch/directional/north, +/obj/machinery/fax{ + fax_name = "Research Director's Office"; + name = "Research Director's Fax Machine" + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/command/heads_quarters/rd) +"anQ" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/latex, +/obj/structure/window/reinforced/tinted/spawner/directional/north, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"anZ" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"aoc" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/item/radio/intercom/directional/west, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"aog" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/command/bridge) +"aom" = ( +/obj/machinery/pdapainter/engineering, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/ce) +"aon" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"aoo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/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, +/area/station/science/ordnance/office) +"aos" = ( +/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, +/area/station/commons/dorms) +"aov" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/structure/closet/secure_closet/medical1, +/obj/machinery/light/small/directional/east, +/obj/machinery/light_switch/directional/north, +/obj/machinery/door_buttons/access_button{ + pixel_y = 37; + idDoor = "virology_airlock_interior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Button"; + req_access = list("virology") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"aow" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing/corner/end{ + dir = 2 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"aoM" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"aoO" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/spawner/random/trash/crushed_can{ + pixel_y = 10 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"aoP" = ( +/obj/machinery/door/airlock/external{ + name = "Lower Medical External Access"; + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "chem-morgue-airlock" + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/medical/morgue) +"aoW" = ( +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door"; + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/command/bridge) +"apb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"apd" = ( +/obj/item/cigbutt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"api" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/landmark/start/psychologist, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"apj" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"apn" = ( +/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/ai_monitored/turret_protected/aisat/service) +"apo" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron, +/area/station/command/bridge) +"apq" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/commons/locker) +"apB" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"apD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"apI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"apS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"apT" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "Containment Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"apX" = ( +/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/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"aqa" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Labor Camp External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/mine/laborcamp) +"aqp" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"aqr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/hydroponics) +"aqB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"aqQ" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"aqV" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Bar Maintenance" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/service/bar/backroom) +"arb" = ( +/obj/structure/table, +/obj/item/folder/red, +/obj/item/pen, +/obj/item/inspector, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/office) +"aro" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/fence/door, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"art" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window{ + dir = 4; + id = "chemistry_access_shutters"; + name = "Chemistry Access Shutters" + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/treatment_center) +"aru" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen/red{ + pixel_x = -6 + }, +/obj/item/hand_labeler{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"arA" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/office) +"arG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"arT" = ( +/obj/machinery/computer/security/labor{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"arZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"asa" = ( +/obj/structure/table/wood, +/obj/item/storage/crayons, +/turf/open/floor/iron, +/area/station/commons/dorms) +"asg" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"asm" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"asv" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"asy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"asC" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"asM" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"asN" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/structure/sink/kitchen/directional/west, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/service/bar) +"asU" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Escape"; + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/exit/departure_lounge) +"asZ" = ( +/obj/machinery/door/airlock/research{ + name = "Robotics Lab" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"atb" = ( +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/storage/medkit/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) +"ate" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/security/prison) +"atj" = ( +/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/siding/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, +/area/mine/eva/lower) +"atl" = ( +/obj/machinery/duct, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"atv" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"aty" = ( +/obj/structure/urinal/directional/north, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"atB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"atI" = ( +/obj/structure/table/glass, +/obj/item/shovel/spade, +/obj/item/cultivator{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"atN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +<<<<<<< HEAD /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "ave" = ( @@ -1360,10 +2319,135 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"atS" = ( +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"atW" = ( +/obj/structure/flora/grass/green/style_random, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"auc" = ( +/obj/machinery/door/firedoor, +/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/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/port) +"aud" = ( +/obj/structure/closet/secure_closet/miner, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"aui" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"aus" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"auw" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to Distro" + }, +/obj/structure/sink/directional/south, +/obj/item/mop, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) +"auz" = ( +/obj/machinery/door/airlock/engineering{ + name = "Utilities Closet" + }, +/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/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/plating, +/area/mine/eva) +"auJ" = ( +/obj/effect/decal/cleanable/dirt, +/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/grimy, +/area/station/security/prison/work) +"auK" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"avb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"avc" = ( +/obj/machinery/firealarm/directional/west, +/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{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Departure Lounge West" + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"ave" = ( +/obj/structure/stairs/west, +/turf/open/openspace, +/area/station/maintenance/starboard/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "avh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/mine/eva) +<<<<<<< HEAD +======= +"avi" = ( +/obj/effect/turf_decal/bot, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth, +/area/mine/eva) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "avk" = ( /obj/machinery/duct, /obj/effect/turf_decal/tile/yellow{ @@ -1373,6 +2457,7 @@ dir = 1 }, /area/station/engineering/atmos) +<<<<<<< HEAD "avo" = ( /obj/structure/stairs/east, /obj/structure/railing{ @@ -1380,6 +2465,17 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +======= +"avs" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "avP" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -1389,18 +2485,56 @@ /area/mine/laborcamp) "awa" = ( /turf/open/openspace, +<<<<<<< HEAD /area/station/science/ordnance) +======= +/area/station/science/ordnance/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "awd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/security/armory/upper) +<<<<<<< HEAD +======= +"awe" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "awn" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/closed/wall, /area/station/maintenance/fore/lesser) +<<<<<<< HEAD +======= +"awt" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/condiment/sugar, +/obj/structure/light_construct/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"awu" = ( +/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, +/turf/open/floor/wood/parquet, +/area/station/service/bar/backroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "awx" = ( /turf/open/floor/iron, /area/station/commons/locker) @@ -1425,11 +2559,25 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD "awF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +"awE" = ( +/obj/structure/closet/crate/freezer/food{ + name = "cooler" + }, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/cup/glass/ice, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "awK" = ( /obj/structure/table, /obj/item/hemostat, @@ -1458,6 +2606,15 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/security/courtroom) +<<<<<<< HEAD +======= +"awO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/trash/raisins, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "awR" = ( /obj/machinery/conveyor{ dir = 1; @@ -1470,6 +2627,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/disposal) +<<<<<<< HEAD "axb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -1488,6 +2646,8 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/science/research) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "axd" = ( /obj/structure/table, /obj/item/mod/module/plasma_stabilizer, @@ -1503,6 +2663,25 @@ /obj/machinery/modular_computer/preset/id, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD +======= +"axj" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "axm" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -1520,11 +2699,20 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "axy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/cold_temp, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +======= +"axw" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/stone, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "axz" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -1537,12 +2725,15 @@ }, /turf/open/floor/iron/freezer, /area/station/command/heads_quarters/captain) +<<<<<<< HEAD "axC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, /obj/structure/bookcase/random, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "axD" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -1587,6 +2778,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/lobby) +<<<<<<< HEAD +======= +"axZ" = ( +/obj/structure/table/optable{ + name = "Robotics Operating Table" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"ayd" = ( +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ayq" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "atmos-entrance" @@ -1617,6 +2822,7 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +<<<<<<< HEAD "ayJ" = ( /obj/effect/spawner/random/lavaland_mob/raptor, /turf/open/misc/asteroid/snow/icemoon, @@ -1637,6 +2843,33 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +"ayL" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"ayS" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Permabrig Lower Hallway Stairwell"; + network = list("ss13","prison") + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"aze" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/security/prison) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "azf" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -1651,12 +2884,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "azt" = ( /obj/machinery/door/airlock{ name = "Unit B" }, /turf/open/floor/iron/textured, /area/station/commons/toilet) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "azw" = ( /turf/closed/wall, /area/station/medical/pharmacy) @@ -1670,6 +2906,7 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +<<<<<<< HEAD "azC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -1688,6 +2925,8 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/wood/parquet, /area/station/service/theater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "azN" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen{ @@ -1705,6 +2944,7 @@ /obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "azU" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -1722,6 +2962,14 @@ }, /turf/open/floor/plating, /area/station/science/robotics/lab) +======= +"aAe" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aAi" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/table/wood/fancy/red, @@ -1738,10 +2986,13 @@ }, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai_upload) +<<<<<<< HEAD "aAk" = ( /obj/structure/table/wood, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aAl" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 1 @@ -1756,6 +3007,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD "aAy" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/dice{ @@ -1778,6 +3030,8 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aBf" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/engine{ @@ -1796,6 +3050,7 @@ name = "Chief Medical Officer's Fax Machine" }, /obj/machinery/light/cold/directional/south, +<<<<<<< HEAD /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "aBj" = ( @@ -1804,6 +3059,23 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) +======= +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"aBK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"aBP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "pharmacy_shutters3"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aBR" = ( /turf/open/genturf/blue, /area/icemoon/surface/outdoors/noruins) @@ -1833,6 +3105,12 @@ pixel_x = -2; pixel_y = -1 }, +<<<<<<< HEAD +======= +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/cargo/miningdock) "aCj" = ( @@ -1846,6 +3124,7 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/wood, /area/station/command/meeting_room) +<<<<<<< HEAD "aCl" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -1853,12 +3132,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/morgue) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aCo" = ( /obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD +======= +"aCw" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet{ + desc = "An outlet for the pneumatic disposal system. This one seems designed for rapid corpse disposal."; + dir = 1; + name = "rapid corpse mover 9000" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/trimline/neutral/filled/end, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aCA" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -1871,6 +3170,22 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD +======= +"aCJ" = ( +/obj/machinery/newscaster/directional/west, +/obj/effect/spawner/random/structure/twelve_percent_spirit_board, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"aCP" = ( +/obj/machinery/modular_computer/preset/engineering, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/incident_display/bridge/directional/north, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aCU" = ( /obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment{ @@ -1888,10 +3203,30 @@ /obj/item/stock_parts/subspace/filter, /turf/open/floor/plating, /area/station/engineering/storage/tech) +<<<<<<< HEAD "aDe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +======= +"aDc" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Public Mining Storage"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"aDl" = ( +/obj/structure/rack, +/obj/item/bouquet, +/obj/item/binoculars, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aDo" = ( /obj/structure/chair/office{ dir = 4 @@ -1900,6 +3235,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "aDy" = ( /obj/machinery/light/directional/south, /obj/effect/spawner/random/vending/colavend, @@ -1907,6 +3243,20 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +======= +"aDr" = ( +/obj/machinery/vending/cigarette, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"aDG" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aDJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1914,6 +3264,7 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark/side, /area/station/security/prison) +<<<<<<< HEAD "aDZ" = ( /obj/structure/sign/warning/secure_area/directional/east, /obj/machinery/door/firedoor, @@ -1933,6 +3284,20 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/commons/fitness) +======= +"aDM" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"aEj" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/starboard/fore) +"aEz" = ( +/obj/machinery/newscaster/directional/west, +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aEA" = ( /obj/structure/rack, /obj/item/clothing/mask/gas, @@ -1952,6 +3317,7 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +<<<<<<< HEAD "aEK" = ( /obj/machinery/atmospherics/components/binary/pump/off, /obj/machinery/airlock_sensor/incinerator_ordmix{ @@ -1966,6 +3332,12 @@ /obj/structure/sign/departments/cargo, /turf/closed/wall/r_wall, /area/station/cargo/warehouse) +======= +"aEM" = ( +/obj/structure/sign/departments/cargo/directional/west, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aES" = ( /obj/structure/table/wood/fancy/blue, /obj/effect/spawner/random/aimodule/neutral, @@ -1983,6 +3355,13 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +<<<<<<< HEAD +======= +"aEY" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aFg" = ( /obj/machinery/button/door/directional/east{ id = "lawyer_blast"; @@ -1993,6 +3372,19 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/lawoffice) +<<<<<<< HEAD +======= +"aFh" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/ai/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/chem_master/condimaster, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aFi" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/portable_atmospherics/scrubber, @@ -2006,6 +3398,7 @@ /obj/machinery/dna_scannernew, /turf/open/floor/iron/dark, /area/station/science/genetics) +<<<<<<< HEAD "aFx" = ( /obj/structure/rack, /obj/item/clothing/suit/hooded/wintercoat/eva{ @@ -2023,6 +3416,8 @@ }, /turf/open/floor/iron/textured, /area/station/ai_monitored/command/storage/eva) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aFz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2052,6 +3447,7 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD "aGf" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -2072,6 +3468,12 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) +======= +"aGb" = ( +/obj/item/flashlight/lantern/on, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aGr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/east{ @@ -2097,6 +3499,18 @@ /obj/item/papercutter, /turf/open/floor/iron, /area/station/cargo/office) +<<<<<<< HEAD +======= +"aGR" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 10 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aGW" = ( /obj/machinery/door/airlock/highsecurity{ name = "Labor Camp Monitoring" @@ -2107,6 +3521,7 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron, /area/mine/laborcamp) +<<<<<<< HEAD "aHh" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/weather/snow/corner{ @@ -2114,6 +3529,37 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +"aHt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/structure/table/reinforced, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_y = 9 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +"aHw" = ( +/obj/structure/rack, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aHz" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -2140,6 +3586,26 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/station/command/meeting_room) +<<<<<<< HEAD +======= +"aHX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aHZ" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/effect/landmark/start/cook, @@ -2152,10 +3618,21 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/textured, /area/station/service/chapel) +<<<<<<< HEAD "aIg" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/engineering/main) +======= +"aIn" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aIr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2167,6 +3644,7 @@ dir = 9 }, /area/station/science/explab) +<<<<<<< HEAD "aIA" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 @@ -2182,6 +3660,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aIB" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -2220,6 +3700,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/morgue) +<<<<<<< HEAD +======= +"aJa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"aJi" = ( +/obj/machinery/shower/directional/east, +/obj/structure/fluff/shower_drain, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"aJj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall, +/area/station/service/library) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJm" = ( /obj/structure/cable, /obj/machinery/door/window/left/directional/east{ @@ -2252,6 +3754,7 @@ /obj/item/lighter/greyscale, /turf/open/floor/iron/showroomfloor, /area/station/maintenance/department/medical/morgue) +<<<<<<< HEAD "aJz" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor/border_only, @@ -2260,6 +3763,8 @@ dir = 8 }, /area/station/science/ordnance/office) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2299,6 +3804,15 @@ }, /turf/open/floor/plating, /area/station/engineering/transit_tube) +<<<<<<< HEAD +======= +"aKb" = ( +/obj/structure/fence{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aKf" = ( /obj/machinery/light_switch/directional/south, /obj/structure/chair/comfy/brown{ @@ -2338,6 +3852,7 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD "aLh" = ( /obj/structure/fireplace, /obj/effect/mapping_helpers/burnt_floor, @@ -2348,6 +3863,8 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aLy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2386,6 +3903,7 @@ /obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) +<<<<<<< HEAD "aLO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood/corner{ @@ -2394,6 +3912,8 @@ /obj/structure/sign/clock/directional/east, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aLV" = ( /obj/machinery/bluespace_vendor/directional/south, /turf/open/floor/iron, @@ -2436,6 +3956,16 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) +<<<<<<< HEAD +======= +"aMh" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aMr" = ( /obj/structure/chair/office{ dir = 4 @@ -2456,18 +3986,28 @@ }, /turf/open/floor/iron, /area/station/tcommsat/computer) +<<<<<<< HEAD +======= +"aMA" = ( +/obj/structure/stairs/north, +/turf/open/floor/iron, +/area/station/service/chapel) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aME" = ( /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/maintenance/starboard/fore) +<<<<<<< HEAD "aMI" = ( /obj/machinery/oven/range, /obj/effect/turf_decal/siding/white, /obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aML" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -2478,6 +4018,7 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +<<<<<<< HEAD "aNc" = ( /obj/structure/fence{ dir = 4 @@ -2493,6 +4034,23 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) +======= +"aMU" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light/small/directional/north, +/obj/effect/decal/remains/human, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"aMZ" = ( +/obj/structure/flora/grass/both/style_random, +/obj/item/stack/rods, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aNq" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/siding/dark_blue, @@ -2522,22 +4080,63 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/mine/eva/lower) +<<<<<<< HEAD "aOa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +"aNE" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"aOb" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "botany_apiary"; + name = "Apiary Shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aOd" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/cargo/miningdock) +<<<<<<< HEAD +======= +"aOe" = ( +/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/trimline/neutral/line, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aOf" = ( /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, /area/mine/eva) +<<<<<<< HEAD +======= +"aOx" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/vending/clothing, +/obj/structure/noticeboard/staff{ + pixel_y = 36 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aOz" = ( /obj/structure/chair{ dir = 4 @@ -2562,11 +4161,38 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) +<<<<<<< HEAD +======= +"aOG" = ( +/obj/structure/fence/post{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aOS" = ( /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/security/medical) +<<<<<<< HEAD +======= +"aOU" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/trunk/multiz/down, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/aft) +"aOW" = ( +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aOX" = ( /turf/open/floor/engine/co2, /area/station/engineering/atmos) @@ -2599,6 +4225,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"aPl" = ( +/obj/effect/turf_decal/tile/purple, +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway Center East" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aPD" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage_shared) @@ -2618,6 +4254,7 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark/textured, /area/station/security/warden) +<<<<<<< HEAD "aPP" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/access/any/engineering/external, @@ -2627,6 +4264,12 @@ /obj/effect/spawner/random/trash/mess, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, +======= +"aPV" = ( +/obj/effect/spawner/random/trash/mess, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/port/aft) "aPW" = ( /obj/structure/table, @@ -2644,6 +4287,7 @@ }, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory/upper) +<<<<<<< HEAD "aQe" = ( /obj/item/clothing/shoes/jackboots, /turf/open/floor/plating, @@ -19453,12 +21097,273 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +======= +"aPZ" = ( +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"aQe" = ( +/obj/item/clothing/shoes/jackboots, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"aQj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"aQJ" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"aQQ" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"aQR" = ( +/obj/structure/cable, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"aQW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"aQZ" = ( +/obj/machinery/vending/drugs, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"aRe" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"aRj" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"aRm" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Security Airlock" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"aRn" = ( +/obj/effect/decal/cleanable/dirt, +/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/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"aRr" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/structure/bed/medical/anchored{ + dir = 8 + }, +/obj/item/bedsheet/medical{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"aRt" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"aRx" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/cargo/storage) +"aRz" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"aRD" = ( +/obj/structure/sign/warning/secure_area/directional/west, +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"aRR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/iron/large, +/area/station/engineering/atmos/storage/gas) +"aRX" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Vacant Commissary" + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"aSe" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix Outlet Pump" + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"aSh" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"aSo" = ( +/turf/closed/wall, +/area/station/medical/medbay/aft) +"aSu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"aSB" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"aSC" = ( +/obj/structure/window/spawner/directional/south, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/railing/corner, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"aSH" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"aSI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"aSM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) +"aSS" = ( +/obj/effect/turf_decal/trimline/dark_red/end, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"aTc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"aTj" = ( +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/wrench, +/obj/item/weldingtool, +/obj/item/clothing/head/utility/welding{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"aTp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/meter/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"aTw" = ( +/obj/structure/displaycase/captain, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"aTE" = ( +/obj/structure/table/reinforced, +/obj/machinery/light_switch/directional/east, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"aTH" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark/side{ dir = 1 }, +<<<<<<< HEAD /area/station/hallway/primary/port) "fNN" = ( /obj/structure/cable, @@ -19795,10 +21700,35 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ +======= +/area/station/hallway/primary/central) +"aTI" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=QM"; + location = "CHW" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"aTT" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"aTZ" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 4 }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD "fUM" = ( /obj/structure/chair/office{ dir = 1 @@ -19833,6 +21763,330 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "fVC" = ( +======= +"aUi" = ( +/obj/structure/table, +/obj/item/storage/briefcase{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/wallet, +/obj/item/storage/wallet, +/turf/open/floor/iron, +/area/station/commons/locker) +"aUj" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/storage) +"aUl" = ( +/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/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"aUm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"aUo" = ( +/obj/structure/table/wood, +/obj/item/trapdoor_remote/preloaded{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/gavelblock{ + pixel_x = 5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"aUt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"aUu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"aUA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) +"aUC" = ( +/obj/structure/fence/door, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"aUK" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Equipment Storage" + }, +/obj/machinery/airalarm/directional/west, +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"aUM" = ( +/obj/structure/filingcabinet, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"aUO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/chapel) +"aUS" = ( +/obj/machinery/meter{ + name = "Mixed Air Tank In" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"aUT" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"aVb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"aVe" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"aVi" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"aVn" = ( +/obj/structure/table, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"aVq" = ( +/obj/structure/ore_box, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"aVr" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"aVw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"aVH" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"aVI" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"aVM" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/landmark/start/hangover, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"aWb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"aWc" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 1 + }, +/obj/structure/tank_holder/extinguisher, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"aWg" = ( +/obj/structure/chair/office/light, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"aWj" = ( +/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/maintenance/starboard/lesser) +"aWk" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "armory"; + name = "Armory Shutter" + }, +/obj/machinery/button/door/directional/east{ + id = "armory"; + name = "Armory Shutters"; + req_access = list("armory") + }, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory/upper) +"aWo" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/decal/cleanable/dirt, +/obj/item/seeds/redbeet, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"aWu" = ( +/obj/structure/barricade/wooden/snowed, +/obj/machinery/light/small/red/directional/north, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "minecraft_shutter"; + name = "Cart Shutters" + }, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"aWD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"aWG" = ( +/obj/machinery/announcement_system, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"aWN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"aWV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Labor Camp Mud Room"; + network = list("labor") + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"aXc" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"aXg" = ( +/obj/structure/ladder{ + name = "chemistry lab access" + }, +/obj/machinery/door/window/left/directional/south{ + name = "Morgue Access Hatch"; + req_access = list("medical") + }, +/obj/effect/turf_decal/stripes/end, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/white/textured_large, +/area/station/medical/medbay/central) +"aXp" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/west{ + id = "maint2"; + name = "Blast Door Control B"; + pixel_y = 4 + }, +/obj/machinery/button/door/directional/west{ + id = "maint1"; + name = "Blast Door Control A"; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"aXq" = ( +/obj/item/bedsheet/red, +/mob/living/simple_animal/bot/secbot/beepsky, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"aXP" = ( +/obj/structure/barricade/wooden, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"aXY" = ( +/obj/structure/rack, +/obj/item/circuitboard/machine/monkey_recycler, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"aYi" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/power_store/cell/high, @@ -19842,6 +22096,7 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +<<<<<<< HEAD "fVD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering{ @@ -26218,11 +28473,39 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "hQO" = ( +======= +"aYk" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/item/seeds/berry, +/obj/machinery/light/small/dim/directional/south, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/station/maintenance/starboard/fore) +"aYm" = ( +/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, +/turf/open/floor/iron, +/area/station/cargo/office) +"aYq" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Public Mining Storage"; + start_active = 1 + }, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"aYu" = ( +/obj/effect/decal/cleanable/dirt/dust, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +<<<<<<< HEAD /obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -38421,11 +40704,208 @@ /area/mine/laborcamp) "lxu" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ +======= +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"aYJ" = ( +/turf/open/floor/iron/white, +/area/station/science/research) +"aYM" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate, +/obj/item/coin/gold, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/mine/production) +"aYQ" = ( +/obj/machinery/shower/directional/south, +/obj/item/soap/nanotrasen, +/obj/item/bikehorn/rubberducky/plasticducky, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"aZd" = ( +/turf/open/floor/plating, +/area/station/medical/virology) +"aZj" = ( +/obj/item/flashlight/flare/candle{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/item/book{ + name = "Tales from the First"; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/table/wood, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"aZk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"aZo" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"aZq" = ( +/obj/item/kirbyplants/potty, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"aZx" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Telecomms Monitoring"; + network = list("tcomms") + }, +/obj/structure/tank_holder/oxygen, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"aZD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"aZH" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/room) +"aZJ" = ( +/obj/item/toy/snowball{ + pixel_x = 11; + pixel_y = -7 + }, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"aZK" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/lighter/greyscale{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/effect/spawner/random/entertainment/cigarette_pack{ + pixel_x = 7 + }, +/obj/item/reagent_containers/cup/soda_cans/sol_dry{ + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"aZL" = ( +/obj/item/kirbyplants/random, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"aZU" = ( +/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, +/turf/open/floor/stone, +/area/station/commons/lounge) +"aZV" = ( +/obj/effect/landmark/start/atmospheric_technician, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/yellow, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/engineering/atmos/storage/gas) +"baf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) +"bai" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"bam" = ( +/turf/open/floor/carpet/red, +/area/station/commons/vacant_room/office) +"ban" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"bap" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"bar" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"baA" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Tech Storage - Secure" + }, +/turf/open/floor/iron, +/area/station/engineering/storage/tech) +"baF" = ( +/obj/structure/closet/l3closet/scientist, +/obj/item/extinguisher, +/obj/machinery/requests_console/directional/north{ + department = "Science"; + name = "Science Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) +"baN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/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/science/ordnance) +"baQ" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 4 }, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "lxT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/decal/cleanable/dirt, @@ -38633,10 +41113,500 @@ /turf/open/floor/iron/white, /area/station/science/research) "lAA" = ( +======= +"baR" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"baV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"baX" = ( +/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) +"bbo" = ( +/turf/open/floor/iron, +/area/station/construction) +"bbr" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"bbs" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 8 + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"bbv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"bbM" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"bbO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/end{ + dir = 1 + }, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"bbQ" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"bbU" = ( +/obj/structure/closet/toolcloset, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/warning/no_smoking/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"bbY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"bcm" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Security - Lower Brig Cells"; + network = list("ss13","prison") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"bcs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"bcx" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Quartermaster Office Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"bcC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"bcE" = ( +/obj/structure/rack, +/obj/item/wirecutters, +/obj/item/screwdriver, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"bcN" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/central) +"bcT" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"bde" = ( +/turf/open/floor/plating, +/area/station/cargo/storage) +"bdo" = ( +/obj/structure/table/wood, +/obj/item/food/grown/poppy{ + pixel_y = 2 + }, +/obj/item/storage/photo_album/prison, +/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/dark, +/area/station/security/prison/rec) +"bdp" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/disposalpipe/segment, +/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/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/fitness) +"bdr" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"bdu" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/smooth, +/area/mine/living_quarters) +"bdx" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"bdJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"bdK" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"bdQ" = ( +/obj/structure/table, +/obj/item/assembly/signaler{ + pixel_y = 8 + }, +/obj/item/assembly/signaler{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/assembly/signaler{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/assembly/signaler{ + pixel_x = 6; + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"bdR" = ( +/obj/machinery/telecomms/server/presets/command, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"bdS" = ( +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/wood, +/area/station/service/library) +"bdT" = ( +/obj/structure/table/glass, +/obj/effect/spawner/random/entertainment/deck{ + pixel_x = -6 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Break Room"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"bea" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating/icemoon, +/area/station/engineering/atmos) +"ben" = ( +/obj/machinery/bluespace_beacon, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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/ai_monitored/turret_protected/aisat_interior) +"bep" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"beu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"beO" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"beQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/sign/painting/large, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"beZ" = ( +/turf/closed/indestructible/riveted{ + desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; + name = "hyper-reinforced wall" + }, +/area/station/science/ordnance/bomb) +"bff" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) +"bfg" = ( +/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/mess) +"bfo" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end, +/turf/open/floor/plating, +/area/mine/eva/lower) +"bfL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"bfN" = ( +/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/structure/railing, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"bfP" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 5; + height = 7; + name = "Cargo Bay"; + shuttle_id = "cargo_home"; + width = 12 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bfU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"bfV" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"bge" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"bgs" = ( +/obj/structure/sign/poster/random/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"bgt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva) +"bgx" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/aft) +"bgE" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom/directional/north{ + freerange = 1; + listening = 0; + name = "Custom Channel" + }, +/obj/item/radio/intercom/directional/west{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"bgF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/command/gateway) +"bgK" = ( +/obj/structure/table, +/obj/item/toner, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/effect/spawner/random/bureaucracy/birthday_wrap, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"bgN" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/brig/entrance) +"bgU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"bgZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Cooling Loop to Gas" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"bhm" = ( +/obj/machinery/vending/coffee, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"bht" = ( +/obj/structure/closet/lasertag/red, +/obj/effect/spawner/random/contraband/permabrig_gear, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"bhw" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"bhI" = ( +/obj/effect/spawner/random/trash/moisture_trap, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"bhQ" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"bhV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"bie" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, /turf/open/floor/plating, +<<<<<<< HEAD /area/station/maintenance/department/medical/morgue) "lAC" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -38647,12 +41617,238 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "lAL" = ( +======= +/area/mine/production) +"bij" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) +"bin" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/flashlight, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/mine/living_quarters) +"bit" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/clothing/head/beanie/orange, +/turf/open/floor/iron, +/area/station/cargo/storage) +"biu" = ( +/obj/machinery/door/window/right/directional/south{ + req_access = list("kitchen"); + name = "The Ice Box" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"biE" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/port_gen/pacman, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/lesser) +"biR" = ( +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"biU" = ( +/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/structure/cable, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"biY" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/port/fore) +"bja" = ( +/turf/open/floor/plating, +/area/station/medical/morgue) +"bji" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"bjl" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"bjn" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 11"; + req_access = list("xenobiology") + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio11"; + name = "Xenobio Pen 11 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"bjp" = ( +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison) +"bjv" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/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/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"bjI" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/west, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"bjK" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/keycard_auth/wall_mounted/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"bjL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"bjN" = ( +/obj/structure/cable, +/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/west, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"bjQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/commons/locker) +"bjU" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"bkg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"bkq" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Graveyard Access"; + req_access = list("chapel_office") + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/service/chapel) +"bkr" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) +"bkC" = ( +/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 = 5 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"bkQ" = ( +/obj/structure/tank_holder/extinguisher, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"bkR" = ( +/obj/machinery/modular_computer/preset/civilian, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"bkS" = ( +/obj/machinery/bci_implanter, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/explab) +"bkV" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /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 }, +<<<<<<< HEAD /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "lBo" = ( @@ -38868,12 +42064,176 @@ /turf/open/floor/carpet/blue, /area/station/security/prison/work) "lEb" = ( +======= +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"bkX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/workout) +"bla" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Art Gallery" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"blc" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/service/chapel) +"blf" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"blk" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Prisoner Airlock" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/mine/laborcamp) +"bll" = ( +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"bln" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"blA" = ( +/obj/machinery/hydroponics/soil, +/obj/machinery/light/directional/west, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"blM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/wood/large, +/area/station/service/bar) +"blO" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"blT" = ( +/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/showroomfloor, +/area/station/security/processing) +"blU" = ( +/obj/structure/table/glass, +/obj/item/storage/box/syringes, +/obj/item/clothing/glasses/science{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science, +/obj/machinery/requests_console/directional/south{ + department = "Chemistry"; + name = "Chemistry Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"blV" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/service/library) +"blY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"bmc" = ( +/obj/structure/fence/post, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"bml" = ( +/obj/structure/table, +/obj/item/storage/medkit/regular, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/mine/laborcamp) +"bmv" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"bmM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"bng" = ( +/obj/machinery/light/small/dim/directional/west, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/commons/lounge) +"bnh" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 7"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"bnl" = ( +/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, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"bnm" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Service Hall" }, /obj/effect/turf_decal/siding/dark/corner, +<<<<<<< HEAD /obj/machinery/door/firedoor, +======= +/obj/machinery/door/firedoor{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -38886,6 +42246,7 @@ dir = 1 }, /area/station/hallway/secondary/service) +<<<<<<< HEAD "lEg" = ( /obj/machinery/door/window/left/directional/north{ name = "AI Core Door"; @@ -39142,11 +42503,150 @@ /obj/machinery/camera{ c_tag = "Chapel North"; dir = 6 +======= +"bnp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/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/engineering/storage_shared) +"bnr" = ( +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/science/xenobiology) +"bnt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"bny" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"bnz" = ( +/obj/machinery/nuclearbomb/selfdestruct, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"bnL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"bnM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Interrogation"; + network = list("interrogation") + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"bnZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"boc" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Exfiltrate to Waste" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"bol" = ( +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"bos" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"boO" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/cable, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"boQ" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/central) +"boS" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"boU" = ( +/obj/structure/rack, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth, +/area/mine/living_quarters) +"boX" = ( +/obj/machinery/duct, +/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/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow/corner, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"bpd" = ( +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/engine_smes) +"bpm" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/closet/secure_closet/security, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"bpn" = ( +/obj/effect/turf_decal/trimline/neutral/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 4 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, /turf/open/floor/iron/dark, +<<<<<<< HEAD /area/station/service/chapel) "lHC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39678,10 +43178,165 @@ /area/station/cargo/bitrunning/den) "lPQ" = ( /obj/structure/disposalpipe/segment{ +======= +/area/station/ai_monitored/command/storage/eva) +"bpq" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"bpw" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/landmark/event_spawn, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"bpK" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"bpQ" = ( +/obj/machinery/mech_bay_recharge_port, +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"bpR" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"bpT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Chapel Crematorium" + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"bpX" = ( +/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/textured_edge, +/area/station/security/prison) +"bpY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/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/heavy{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"bqe" = ( +/obj/structure/grille, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"bqf" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"bqq" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"bqr" = ( +/obj/item/target, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"bqt" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"bqx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/security/processing) +"bqz" = ( +/obj/machinery/hydroponics/constructable, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/item/cultivator, +/obj/item/seeds/potato, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"bqF" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"bqG" = ( +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/security/hos_office, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"bqS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"bqY" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"brj" = ( +/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, +/area/station/hallway/primary/starboard) +"brm" = ( +/obj/machinery/computer/holodeck{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 4 }, /turf/open/floor/iron, /area/station/commons/fitness) +<<<<<<< HEAD "lQc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -39713,11 +43368,284 @@ /turf/open/floor/carpet, /area/station/commons/dorms) "lQw" = ( +======= +"bro" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) +"brp" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"brt" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"brx" = ( +/turf/closed/wall, +/area/station/security/warden) +"bry" = ( +/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/checkpoint/engineering) +"brJ" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"brL" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/service/chapel) +"brM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"brX" = ( +/obj/structure/plasticflaps, +/obj/machinery/conveyor{ + dir = 8; + id = "mining_internal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/mine/production) +"brY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"bsb" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, +/turf/open/floor/plating, +/area/mine/eva/lower) +"bsd" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/light/small/dim/directional/west, +/obj/structure/sign/poster/official/obey/directional/west, +/turf/open/floor/iron, +/area/mine/laborcamp) +"bse" = ( +/obj/effect/spawner/random/trash/mess, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"bsi" = ( +/obj/effect/decal/cleanable/dirt, +/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/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"bso" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/light_switch/directional/west{ + pixel_x = -39 + }, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"bst" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"bsG" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research/glass{ + name = "Robotics Lab" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"bsN" = ( +/obj/structure/table, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = 11; + pixel_y = 7 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 2 + }, +/obj/item/radio/headset/headset_medsci{ + pixel_x = -7; + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"bsO" = ( +/obj/effect/turf_decal/box, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/item/wrench, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/dark, +/area/station/maintenance/port/greater) +"bsW" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/service/hydroponics) +"bta" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"btg" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Atmospherics Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"btm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/sign/warning/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"btq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"bts" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/construction) +"btB" = ( +/obj/structure/table, +/obj/item/flashlight/lantern, +/turf/open/floor/plating, +/area/mine/eva/lower) +"btC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/engineering/main) +"btG" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"btK" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"btU" = ( +/turf/closed/wall, +/area/station/medical/morgue) +"btW" = ( +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"bub" = ( +/obj/machinery/vending/cola/red, +/obj/machinery/light/warm/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"bum" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/engineering/storage_shared) +"buo" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"buv" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ color = "#ff0000"; dir = 4; name = "Scrubbers multi deck pipe adapter" }, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ color = "#0000ff"; dir = 4; @@ -43207,6 +47135,132 @@ }, /area/station/command/heads_quarters/rd) "nbt" = ( +======= +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"buF" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/chair/sofa/bench/left{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"buR" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/potato{ + name = "\improper Beepsky's emergency battery" + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"buU" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/obj/item/clothing/shoes/wheelys/skishoes{ + pixel_y = -8 + }, +/obj/item/clothing/suit/hooded/wintercoat{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"buY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"bvb" = ( +/obj/structure/fence/post{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bvd" = ( +/obj/machinery/power/terminal, +/obj/machinery/light/small/directional/east, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"bvg" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"bvj" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"bvq" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"bvr" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/autolathe, +/turf/open/floor/iron, +/area/station/cargo/office) +"bvw" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -5; + pixel_y = -8 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_y = -6; + pixel_x = 9 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"bvE" = ( +/obj/machinery/computer/monitor{ + name = "bridge power monitoring console" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"bvI" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=HOP2"; + location = "Stbd" + }, +/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/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"bvS" = ( +/obj/structure/ladder, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/maintenance/department/medical/morgue) +"bvX" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/security/hos, /obj/machinery/requests_console/directional/north{ department = "Head of Security's Desk"; @@ -43215,6 +47269,7 @@ /obj/effect/mapping_helpers/requests_console/announcement, /obj/effect/mapping_helpers/requests_console/information, /obj/effect/mapping_helpers/requests_console/assistance, +<<<<<<< HEAD /obj/machinery/button/door/directional/north{ id = "hosspace"; name = "Icemoon Shutters Control"; @@ -47954,12 +52009,78 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/door/firedoor, +======= +/obj/item/radio/intercom/directional/west, +/obj/machinery/button/door/directional/north{ + id = "hosspace"; + name = "Icemoon Shutters Control" + }, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) +"bvY" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"bwh" = ( +/turf/closed/wall/mineral/iron, +/area/icemoon/underground/explored) +"bwi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"bwl" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"bwn" = ( +/obj/effect/turf_decal/tile/blue, +/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 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"bwp" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"bwt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"bwD" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/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/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, +<<<<<<< HEAD /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/starboard) @@ -48686,6 +52807,438 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +======= +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"bwK" = ( +/obj/structure/bookcase/random/religion, +/turf/open/floor/wood, +/area/station/service/library) +"bwM" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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/maintenance/starboard/upper) +"bwT" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/mine/living_quarters) +"bxa" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bxe" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/starboard/fore) +"bxJ" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"bxP" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/science/lab) +"bxQ" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"bxS" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"bxU" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window{ + dir = 4; + id = "chemistry_access_shutters"; + name = "Chemistry Access Shutters" + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/treatment_center) +"bxV" = ( +/obj/structure/chair/wood/wings, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/maintenance/port/aft) +"byd" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light_switch/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Customs Security Checkpoint" + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"byl" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo Bay Delivery Office" + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"byn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/start/bitrunner, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) +"byq" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"byv" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/trash/semki, +/obj/item/trash/semki, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"byx" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"byB" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"byH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"byJ" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/bar) +"byK" = ( +/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/structure/disposalpipe/sorting/mail{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/science/robotics, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"byP" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"bza" = ( +/obj/structure/fence/end{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bzc" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"bzg" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"bzA" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/service/library) +"bzC" = ( +/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/green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"bzD" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "mining-aux-mechbay-external" + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining Mech Bay External Airlock"; + opacity = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/large, +/area/mine/mechbay) +"bzE" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"bzI" = ( +/obj/machinery/bluespace_vendor/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"bzQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"bzW" = ( +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"bAa" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) +"bAj" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"bAk" = ( +/obj/machinery/firealarm/directional/west, +/turf/open/floor/carpet, +/area/station/security/prison/rec) +"bAo" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"bAB" = ( +/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/hallway/primary/port) +"bAF" = ( +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"bAM" = ( +/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/mine/laborcamp/security) +"bAR" = ( +/obj/machinery/duct, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos) +"bAT" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax{ + fax_name = "Chief Engineer's Office"; + name = "Chief Engineer's Fax Machine" + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"bAX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"bAY" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"bBd" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/obj/effect/landmark/start/station_engineer, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"bBw" = ( +/obj/item/trash/sosjerky, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"bBx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/door/window/brigdoor/right/directional/east{ + req_access = list("armory") + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"bBE" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"bBJ" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"bBM" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/cable, +/obj/structure/closet/secure_closet/atmospherics, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +"bBO" = ( +/obj/effect/spawner/random/decoration/flower, +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"bBW" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"bCd" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Lab Maintenance" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/genetics, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"bCf" = ( +/obj/machinery/door/poddoor/preopen{ + id = "cmoprivacy"; + name = "CMO Office" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/heads_quarters/cmo) +"bCp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"bCs" = ( +/obj/machinery/door/airlock/engineering{ + name = "Construction Area" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/turf/open/floor/plating, +/area/station/construction) +"bCt" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"bCx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/medical/virology) +"bCN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) +"bCQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"bCT" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -48695,6 +53248,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "oAz" = ( /obj/structure/sign/nanotrasen{ pixel_x = 32; @@ -50379,10 +54933,239 @@ }, /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/end{ +======= +"bDj" = ( +/obj/machinery/light/warm/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"bDl" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bDu" = ( +/turf/closed/wall/r_wall, +/area/station/security/lockers) +"bDz" = ( +/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/corner{ + dir = 4 + }, +/area/station/engineering/lobby) +"bDB" = ( +/obj/structure/plaque/static_plaque/golden/commission/icebox{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"bDC" = ( +/obj/machinery/door/airlock{ + id_tag = "miningdorm_B"; + name = "Room 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/mine/production) +"bDF" = ( +/obj/structure/table/wood, +/obj/item/food/grown/harebell, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/prison/rec) +"bDH" = ( +/obj/effect/landmark/start/chaplain, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"bDI" = ( +/obj/structure/rack, +/obj/item/storage/bag/ore, +/obj/item/flashlight, +/obj/item/pickaxe, +/obj/item/clothing/glasses/meson, +/obj/item/mining_scanner, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/hooded/wintercoat, +/turf/open/floor/iron, +/area/mine/laborcamp) +"bDO" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"bDR" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"bDX" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"bEa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"bEd" = ( +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "garbage"; + name = "disposal conveyor"; + pixel_x = -5; + pixel_y = 5 + }, +/obj/structure/railing/corner, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"bEf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"bEi" = ( +/obj/structure/sign/poster/official/work_for_a_future/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"bEk" = ( +/obj/structure/railing/wooden_fence{ + dir = 4 + }, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"bEn" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"bEz" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Secure EVA Storage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/command/storage/eva) +"bEJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"bEL" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/treatment_center) +"bEN" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"bEX" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"bFm" = ( +/obj/effect/decal/cleanable/plasma, +/obj/effect/landmark/blobstart, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"bFq" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"bFs" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"bFx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/dark, +/area/mine/storage) +"bFA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"bFP" = ( +/obj/structure/fence/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bFW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"bFY" = ( +/obj/item/trash/syndi_cakes, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"bGa" = ( +/obj/effect/turf_decal/siding/yellow{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +<<<<<<< HEAD "pbs" = ( /turf/closed/wall, /area/station/ai_monitored/turret_protected/aisat/maint) @@ -50734,6 +55517,175 @@ /area/station/service/bar) "pgw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +======= +"bGc" = ( +/obj/machinery/computer/cargo/request, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"bGm" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"bGn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/border_only, +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/mine/eva) +"bGq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"bGA" = ( +/obj/effect/spawner/structure/window, +/obj/structure/sign/departments/xenobio/directional/south, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"bGP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva) +"bGS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/fore/lesser) +"bGT" = ( +/obj/machinery/light/directional/south, +/obj/structure/closet/firecloset, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"bHa" = ( +/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/white/side{ + dir = 4 + }, +/area/station/command/heads_quarters/rd) +"bHc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/railing{ + dir = 4 + }, +/obj/item/kirbyplants/random/dead, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"bHu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/light_switch/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"bHF" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"bHI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "Courtroom"; + name = "Security Shutters" + }, +/turf/open/floor/plating, +/area/station/hallway/primary/fore) +"bHJ" = ( +/obj/machinery/smartfridge, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"bHO" = ( +/obj/machinery/light_switch/directional/south{ + pixel_x = 6; + pixel_y = -25 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"bIa" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to Distro" + }, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"bIc" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/ai_monitored/command/storage/eva) +"bIl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"bIo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"bIt" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"bID" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/lobby) +"bIL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/requests_console/directional/south{ department = "Bridge"; name = "Bridge Requests Console" @@ -50741,6 +55693,7 @@ /obj/effect/mapping_helpers/requests_console/announcement, /obj/effect/mapping_helpers/requests_console/information, /obj/effect/mapping_helpers/requests_console/assistance, +<<<<<<< HEAD /turf/open/floor/wood, /area/station/command/meeting_room) "pgE" = ( @@ -54549,6 +59502,131 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "qmT" = ( +======= +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"bIQ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"bIU" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"bIV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "Atmospherics HFR Shutters"; + name = "Atmospherics HFR Shutters"; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 4 + }, +/obj/machinery/light/small/red/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"bJa" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"bJc" = ( +/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/stripes/line, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"bJi" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"bJj" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"bJp" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Security - Permabrig Workout"; + network = list("ss13","prison"); + view_range = 5 + }, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"bJx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/mine/laborcamp) +"bJD" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"bJE" = ( +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/processing) +"bJQ" = ( +/obj/structure/table/wood, +/obj/item/stack/package_wrap, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/turf/open/floor/wood, +/area/station/service/library) +"bJX" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/robot_debris/down, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"bKp" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"bKA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/airlock/grunge{ + name = "Vacant Office A" + }, +/turf/open/floor/iron/dark, +/area/station/commons/vacant_room/office) +"bKE" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/bed{ dir = 4 }, @@ -54559,7 +59637,10 @@ id = "miningdorm_B"; name = "Door Bolt Control"; normaldoorcontrol = 1; +<<<<<<< HEAD pixel_y = 23; +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 specialfunctions = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -54568,6 +59649,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/stellar, /area/mine/production) +<<<<<<< HEAD "qmU" = ( /obj/machinery/duct, /obj/structure/cable, @@ -55602,6 +60684,3133 @@ /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) "qAS" = ( +======= +"bKI" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"bKN" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/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/machinery/door/firedoor, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"bKZ" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/maintenance/port/aft) +"bLc" = ( +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"bLd" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"bLn" = ( +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/west, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"bLq" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/fore) +"bLs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/hallway/secondary/entry) +"bLz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"bLA" = ( +/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"; + name = "old sink" + }, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"bLQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"bLW" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) +"bLY" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"bMb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"bMk" = ( +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/station/commons/lounge) +"bMz" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 5; + name = "fore bay 1"; + roundstart_template = /datum/map_template/shuttle/labour/box; + shuttle_id = "laborcamp_home"; + width = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bMF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"bMY" = ( +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"bMZ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Bridge West" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"bNy" = ( +/obj/item/toy/snowball{ + pixel_x = 9; + pixel_y = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bNC" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"bNE" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "atmos-entrance" + }, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"bNH" = ( +/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, +/area/station/medical/cryo) +"bOg" = ( +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"bOh" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"bOj" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"bOk" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/construction) +"bOo" = ( +/obj/effect/turf_decal/arrows/white{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"bOp" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay North"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"bOz" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"bOO" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"bOX" = ( +/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 = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/fore) +"bOZ" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"bPc" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"bPl" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/security/courtroom) +"bPn" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"bPp" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access"; + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"bPr" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/screwdriver{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"bPs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"bPt" = ( +/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/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"bPw" = ( +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"bPx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/construction) +"bPz" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"bPE" = ( +/obj/structure/table, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"bPV" = ( +/obj/item/kirbyplants/random/dead, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"bPY" = ( +/obj/machinery/atmospherics/pipe/multiz/pink/visible{ + dir = 8; + name = "Exfiltrate" + }, +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/storage) +"bQh" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/primary/starboard) +"bQx" = ( +/obj/structure/ladder{ + name = "upper dispenser access" + }, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/iron/dark/textured_large, +/area/station/medical/chemistry) +"bQA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) +"bQN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/mine/eva/lower) +"bQS" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"bRb" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/station/security/prison/safe) +"bRd" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Mech Bay" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"bRj" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/closet/emcloset/anchored, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/engineering/main) +"bRl" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"bRn" = ( +/obj/machinery/computer/warrant, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"bRo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"bRz" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"bRC" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/plating, +/area/mine/eva/lower) +"bRE" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"bRG" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"bRH" = ( +/obj/structure/grille/broken, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"bSi" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"bSk" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Prison Gate"; + name = "Prison Blast Door" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"bSo" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/eighties/red, +/area/station/security/prison/safe) +"bSp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"bSz" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"bSG" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/textured, +/area/station/engineering/atmos) +"bSH" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"bSW" = ( +/obj/structure/bed, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/button/door/directional/east{ + id = "Dorm1"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"bTl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/mine/living_quarters) +"bTq" = ( +/obj/machinery/computer/atmos_alert, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"bTx" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"bTE" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Service External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"bTF" = ( +/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/engineering/main) +"bTJ" = ( +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/radio/intercom/directional/north, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"bTM" = ( +/obj/structure/closet/crate, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"bUa" = ( +/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/dark, +/area/station/science/breakroom) +"bUx" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/fore) +"bUy" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"bUH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"bUK" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 5"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"bUS" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"bUW" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"bVe" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"bVn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"bVp" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/closet/secure_closet/medical3, +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"bVs" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Permabrig Observation Prep"; + network = list("ss13","prison") + }, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"bVv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/central/lesser) +"bVx" = ( +/obj/item/trash/popcorn, +/obj/structure/reagent_dispensers/plumbed{ + name = "dormitory reservoir" + }, +/obj/machinery/light/small/dim/directional/north, +/obj/effect/turf_decal/delivery/white{ + color = "#307db9" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/textured, +/area/station/maintenance/fore) +"bVI" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"bVJ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"bVL" = ( +/obj/machinery/space_heater, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"bVS" = ( +/obj/structure/table, +/obj/item/analyzer, +/obj/item/t_scanner, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"bVT" = ( +/obj/structure/closet/crate/trashcart/laundry, +/obj/effect/spawner/random/contraband/prison, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"bWe" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/evidence) +"bWh" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 8 + }, +/area/station/security/prison) +"bWl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"bWn" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/command/storage/eva) +"bWp" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"bWv" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"bWy" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"bWH" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/science/ordnance) +"bWK" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"bWM" = ( +/obj/structure/stairs/south, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/medical/virology) +"bWQ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"bWU" = ( +/obj/machinery/button/door/directional/west{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"bWV" = ( +/obj/structure/closet/crate, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"bWZ" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"bXf" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"bXi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/transport/linear{ + radial_travel = 0 + }, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/floor/plating/elevatorshaft, +/area/mine/storage) +"bXl" = ( +/obj/machinery/air_sensor/nitrous_tank, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"bXm" = ( +/turf/closed/wall, +/area/station/commons/storage/tools) +"bXo" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/closet/crate/solarpanel_small, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"bXx" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"bXy" = ( +/turf/open/openspace, +/area/station/ai_monitored/security/armory/upper) +"bXD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"bXF" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/ai_all, +/turf/open/floor/iron, +/area/station/engineering/storage/tech) +"bXI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"bYd" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"bYg" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"bYm" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"bYu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/science/explab) +"bYw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"bYz" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"bYB" = ( +/obj/structure/table, +/obj/item/storage/box/hug{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/razor{ + pixel_x = -8; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"bYC" = ( +/obj/machinery/vending/wardrobe/bar_wardrobe, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Backroom" + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/wood/parquet, +/area/station/service/bar/backroom) +"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{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/medical/treatment_center) +"bYR" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"bYS" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/north{ + c_tag = "Research Division Server Room - Monitoring"; + network = list("ss13","rd"); + pixel_x = 22 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/server) +"bYT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/maintenance{ + name = "Morgue Maintenance" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"bYY" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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/plating, +/area/station/maintenance/department/medical/morgue) +"bZb" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"bZc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half, +/area/station/command/heads_quarters/rd) +"bZg" = ( +/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/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"bZk" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"bZm" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Service - Hall" + }, +/obj/machinery/disposal/bin/tagger, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"bZx" = ( +/turf/open/openspace, +/area/station/hallway/primary/fore) +"bZC" = ( +/obj/structure/lattice, +/obj/structure/sign/poster/official/report_crimes/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"bZI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) +"bZK" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"bZQ" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/starboard) +"bZV" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"bZW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"cah" = ( +/obj/machinery/status_display/supply{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"cax" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Atrium" + }, +/obj/effect/turf_decal/bot_white, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = 32 + }, +/turf/open/floor/wood/large, +/area/station/service/bar/atrium) +"caA" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/table/glass, +/obj/item/book/manual/hydroponics_pod_people, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/sign/poster/contraband/kudzu/directional/north, +/obj/machinery/light/small/directional/west, +/obj/item/plant_analyzer, +/obj/item/watertank{ + pixel_y = -3; + pixel_x = -5 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"caC" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Monkey Pen"; + req_access = list("genetics") + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/engine, +/area/station/science/genetics) +"caH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/large, +/area/station/hallway/primary/port) +"caY" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/service/library) +"caZ" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"cbd" = ( +/obj/machinery/door/airlock/research{ + name = "Crater Observation Room" + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/mine/living_quarters) +"cbk" = ( +/turf/open/floor/iron, +/area/mine/mechbay) +"cbs" = ( +/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, +/area/station/hallway/primary/starboard) +"cby" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"cbz" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"cbC" = ( +/obj/machinery/meter, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/warning/no_smoking/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) +"ccg" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"ccp" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/south{ + id = "Dorm5"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) +"ccr" = ( +/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, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"ccs" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cct" = ( +/obj/structure/noticeboard/captain{ + pixel_y = 36 + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"ccv" = ( +/obj/structure/table, +/obj/machinery/cell_charger{ + pixel_y = 3 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_y = 3 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"ccw" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"ccx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"ccz" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering Secondary Storage" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/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/engineering/storage_shared) +"ccB" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/supply/disposals, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"ccF" = ( +/obj/structure/cable, +/mob/living/basic/bear/snow/misha, +/obj/structure/bed/dogbed/misha, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) +"ccL" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"ccQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ccR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"ccS" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"ccT" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/service/chapel) +"ccV" = ( +/obj/effect/spawner/random/structure/furniture_parts, +/obj/structure/closet/crate, +/obj/effect/spawner/random/structure/furniture_parts, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"ccW" = ( +/obj/structure/table, +/obj/item/pen, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) +"ccZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"cdd" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"cdg" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"cdl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"cdp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"cef" = ( +/obj/machinery/biogenerator, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"cek" = ( +/obj/structure/grille, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"ceo" = ( +/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/cargo/storage) +"cew" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"cex" = ( +/obj/machinery/computer/piratepad_control/civilian{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"cey" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"ceE" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation B" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"ceF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/conveyor{ + id = "mining_internal" + }, +/obj/machinery/bouldertech/refinery, +/obj/machinery/camera/directional/east{ + c_tag = "Mining Ore Smeltery"; + network = list("ss13", "mine") + }, +/turf/open/floor/iron, +/area/mine/production) +"ceO" = ( +/obj/machinery/button/crematorium{ + id = "crematoriumChapel"; + pixel_x = 25 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"ceQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/minecart_rail/railbreak, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"ceS" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"ceY" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Disposal Exit"; + name = "Disposal Exit Vent" + }, +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/obj/effect/turf_decal/stripes/red/box, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"cfe" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"cfh" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/workout) +"cfi" = ( +/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/burnt_floor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/fore/lesser) +"cfl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"cfr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cft" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"cfC" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cfR" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"cfS" = ( +/obj/item/clothing/suit/costume/snowman{ + name = "Man of Snow" + }, +/obj/item/clothing/head/costume/snowman{ + name = "Head of Snow"; + pixel_y = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"cga" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"cgb" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"cgs" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"cgw" = ( +/obj/structure/table/glass, +/obj/item/hatchet, +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/plant_analyzer, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"cgB" = ( +/obj/structure/aquarium/lawyer, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"cgC" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"cgR" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"cgZ" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/item/crowbar/large, +/obj/machinery/camera/directional/south{ + c_tag = "Robotics Lab Mech Bay"; + network = list("ss13","rd") + }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"chb" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"chc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"chg" = ( +/obj/structure/fence/door, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"chn" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cht" = ( +/obj/machinery/vending/engivend, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) +"chC" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"chK" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"chO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/table, +/obj/item/flashlight/lamp, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"chP" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"chQ" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"cie" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"cih" = ( +/obj/machinery/button/door/directional/west{ + id = "chemistry_lower_shutters"; + name = "Chemistry Exterior Shutter Control"; + req_access = list("plumbing") + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"cin" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"cip" = ( +/obj/machinery/atmospherics/components/tank/air{ + initialize_directions = 3; + dir = 3 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"ciG" = ( +/obj/machinery/door/airlock/external{ + name = "Security Yard"; + space_dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"ciI" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"ciN" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Security Airlock" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"ciS" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/trash/cigbutt, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"ciU" = ( +/obj/structure/barricade/wooden, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"cjI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/reagent_containers/cup/rag, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"cjJ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"cjL" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"cjO" = ( +/obj/structure/table, +/obj/item/clothing/shoes/jackboots, +/obj/item/storage/backpack/satchel/leather, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"cke" = ( +/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 = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"cks" = ( +/obj/item/wrench, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ckL" = ( +/obj/structure/fence/corner{ + dir = 2; + pixel_y = 0 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"ckN" = ( +/obj/structure/cable, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"ckQ" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"ckX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/stairs/right{ + dir = 4 + }, +/area/station/engineering/lobby) +"cll" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/meter, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"clm" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/seven, +/turf/open/floor/plating, +/area/station/construction) +"clq" = ( +/turf/open/floor/iron/dark, +/area/station/security/processing) +"clz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"clE" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/commons/storage/mining) +"clI" = ( +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"clP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"clR" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"clT" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"clV" = ( +/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/power/apc/auto_name/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Ordnance Test Lab"; + network = list("ss13","rd") + }, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"clY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"cma" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"cmq" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"cmw" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4; + name = "Exfiltrate Control" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) +"cmx" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/science/explab) +"cmy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"cmD" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"cmJ" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cmL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"cmQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/blobstart, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"cmT" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/closet/crate/trashcart, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"cmV" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"cmX" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"cmY" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/machinery/atmospherics/pipe/multiz/pink/visible{ + dir = 4; + name = "Exfiltrate" + }, +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/structure/sign/warning/fire/directional/north, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/mix) +"cmZ" = ( +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"cnb" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/freezer, +/area/station/medical/break_room) +"cnd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"cnj" = ( +/obj/structure/fence/door{ + name = "graveyard" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"cno" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth, +/area/station/security/lockers) +"cnq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"cnx" = ( +/obj/machinery/power/tracker, +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cnz" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cnB" = ( +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Cargo Office"; + name = "Cargo Office Fax Machine" + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"cod" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"coe" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/closet/crate, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"coT" = ( +/obj/structure/table, +/obj/item/storage/wallet, +/obj/item/storage/wallet{ + pixel_x = 4; + pixel_y = 3 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"coY" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/rubble, +/turf/open/floor/iron, +/area/mine/production) +"cpe" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"cpg" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"cpl" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics Storage Room - East" + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"cpm" = ( +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/hop) +"cpp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"cpq" = ( +/obj/machinery/light/small/directional/east, +/turf/open/openspace, +/area/station/service/chapel) +"cps" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/wallet/random, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"cpt" = ( +/obj/structure/fence/corner{ + dir = 9 + }, +/obj/structure/lattice/catwalk, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"cpw" = ( +/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/textured, +/area/station/security/execution/transfer) +"cpA" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"cpG" = ( +/obj/structure/table, +/obj/item/toy/cards/deck, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/mine/laborcamp) +"cpH" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Secure Storage" + }, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"cpT" = ( +/obj/item/kirbyplants/random, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"cpY" = ( +/turf/closed/wall, +/area/station/service/kitchen) +"cqb" = ( +/obj/machinery/food_cart, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/sign/poster/official/cleanliness/directional/north, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"cqh" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Library Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"cqo" = ( +/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, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"cqw" = ( +/obj/structure/table/wood, +/obj/item/c_tube, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"cqx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"cqz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"cqL" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Solar Maintenance - South West Access" + }, +/obj/structure/sign/warning/electric_shock/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"cqN" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/starboard/fore) +"cqO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cqW" = ( +/obj/vehicle/ridden/secway, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"crf" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/sign/departments/security/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"crn" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"crv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"crS" = ( +/obj/machinery/vending/wardrobe/law_wardrobe, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"crT" = ( +/obj/effect/spawner/random/structure/chair_flipped, +/obj/effect/spawner/random/trash/bacteria, +/obj/structure/sign/poster/ripped/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"crW" = ( +/obj/structure/railing, +/obj/structure/stairs/west, +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/science/cytology) +"cse" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Cargo Bay Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"csf" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/effect/spawner/random/clothing/bowler_or_that, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"csm" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"csu" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"csB" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"csE" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"csJ" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/service/chapel) +"csT" = ( +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"ctk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"ctl" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"ctm" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"ctr" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"ctC" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"ctE" = ( +/obj/structure/cable, +/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/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/office) +"ctI" = ( +/obj/machinery/telecomms/processor/preset_three, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"ctM" = ( +/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/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"ctS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"ctY" = ( +/obj/structure/tank_holder/anesthetic, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"cuc" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"cum" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"cun" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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/maintenance/port/aft) +"cuq" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/glass/reinforced/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cur" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"cut" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"cuJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"cuP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"cvg" = ( +/obj/effect/mapping_helpers/trapdoor_placer, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cvh" = ( +/obj/effect/landmark/start/ai, +/obj/item/radio/intercom/directional/west{ + freerange = 1; + listening = 0; + name = "Common Channel"; + pixel_y = -8 + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_y = -8 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"cvj" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/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/science/ordnance) +"cvn" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/sink/kitchen/directional/south, +/obj/structure/mirror/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Coldroom Access" + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/service/kitchen, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"cvq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"cvr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"cvB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"cvC" = ( +/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, +/area/station/hallway/primary/fore) +"cvF" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"cvH" = ( +/obj/structure/table, +/obj/item/trash/can/food/beans, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"cvJ" = ( +/obj/structure/fence/cut/medium{ + dir = 2 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cvN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cvS" = ( +/turf/closed/wall, +/area/station/maintenance/department/medical/central) +"cwe" = ( +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"cwj" = ( +/obj/machinery/requests_console/directional/south{ + department = "Atmospherics"; + name = "Atmospherics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"cwn" = ( +/obj/structure/cable, +/obj/structure/transit_tube/crossing/horizontal, +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cwr" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/courtroom) +"cwu" = ( +/obj/structure/table/glass, +/obj/item/storage/medkit/toxin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/window/right/directional/north{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access = list("medical") + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) +"cwH" = ( +/obj/machinery/space_heater, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"cwO" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"cwT" = ( +/obj/structure/closet/emcloset, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"cxd" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/starboard) +"cxg" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"cxl" = ( +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"cxp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/item/clothing/under/pants/track, +/obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"cxt" = ( +/obj/structure/table, +/obj/item/food/chococoin, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"cxz" = ( +/obj/structure/cable, +/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/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"cxA" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/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/medical/medbay/central) +"cxI" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Drone Bay" + }, +/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{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"cxO" = ( +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"cxP" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/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/mail_sorting/service/law_office, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"cxQ" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"cyh" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"cyo" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"cyA" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/spawner/random/structure/barricade, +/turf/open/floor/plating, +/area/station/commons/vacant_room/office) +"cyH" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cyI" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/mirror/directional/east, +/obj/structure/sign/poster/official/random/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cyK" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "miner-passthrough" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/plating, +/area/station/cargo/miningdock) +"cyL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/science/explab) +"cyU" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"cyX" = ( +/obj/machinery/recharge_station, +/obj/item/radio/intercom/directional/west, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"czi" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"czj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/medical/morgue) +"czl" = ( +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/machinery/modular_computer/preset/cargochat/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"czq" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"czv" = ( +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "QMLoad" + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"czD" = ( +/turf/closed/wall, +/area/mine/laborcamp/security) +"czR" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/camera/directional/south{ + c_tag = "Solar Maintenance - South West" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"czW" = ( +/obj/structure/weightmachine, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"cAe" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"cAi" = ( +/obj/effect/turf_decal/tile/purple/anticorner, +/turf/open/floor/iron/corner{ + dir = 1 + }, +/area/station/hallway/primary/starboard) +"cAo" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"cAr" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"cAu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"cAB" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/science/ordnance) +"cAC" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"cAG" = ( +/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/structure/cable, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"cAI" = ( +/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/depsec/medical, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"cAJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cAK" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"cAL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"cAM" = ( +/obj/structure/table, +/obj/item/folder/white{ + pixel_y = 4 + }, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"cAR" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/engineering/atmos/storage/gas) +"cAT" = ( +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) +"cBk" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"cBv" = ( +/obj/machinery/button/door/directional/east{ + id = "misclab"; + name = "Test Chamber Blast Doors"; + pixel_y = 6; + req_access = list("xenobiology") + }, +/obj/machinery/button/door/directional/east{ + id = "xenobiomain"; + name = "Xenobiology Containment Blast Door"; + pixel_y = -6; + req_access = list("xenobiology") + }, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"cBG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/prisoner, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"cBP" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp{ + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"cBT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"cBU" = ( +/obj/structure/table, +/obj/machinery/camera/motion/directional/east{ + c_tag = "AI Upload East"; + network = list("aiupload") + }, +/obj/item/folder/blue, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"cCb" = ( +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"cCt" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/rnd_all, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"cCu" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/genetics) +"cCG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/flasher{ + pixel_y = -30; + id = "GulagCell 2" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"cCW" = ( +/obj/machinery/conveyor/inverted{ + dir = 6; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"cDb" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"cDh" = ( +/obj/structure/grille/broken, +/obj/structure/disposalpipe/segment, +/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/plating, +/area/station/maintenance/department/medical/morgue) +"cDk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"cDv" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/rods/fifty, /obj/structure/rack, /obj/item/stack/cable_coil{ @@ -55615,6 +63824,7 @@ amount = 10 }, /obj/effect/decal/cleanable/dirt, +<<<<<<< HEAD /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/iron, /area/station/maintenance/department/electrical) @@ -56111,10 +64321,13457 @@ /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) "qII" = ( +======= +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"cDw" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/airlock/glass{ + name = "Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"cDz" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cDH" = ( +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole, +/turf/open/floor/wood, +/area/station/service/library) +"cDK" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"cDQ" = ( +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"cDT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/effect/landmark/start/depsec/medical, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"cEe" = ( +/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/wood/large, +/area/station/service/bar) +"cEi" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/medical_all, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"cEl" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + pixel_x = -9 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"cEo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/holopad, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"cEs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"cEv" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/open/floor/iron, +/area/station/command/bridge) +"cEw" = ( +/turf/closed/wall, +/area/station/engineering/atmos) +"cEx" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"cEz" = ( +/obj/structure/sign/departments/holy/directional/north, +/turf/open/openspace, +/area/station/service/chapel) +"cEG" = ( +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/spawner/random/trash/cigbutt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"cEL" = ( +/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/brig/upper) +"cEM" = ( +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"cEP" = ( +/obj/structure/closet{ + name = "evidence closet 3" + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Lower Brig Evidence" + }, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/evidence) +"cFb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/smooth_edge, +/area/station/security/lockers) +"cFr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"cFJ" = ( +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"cFM" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"cFZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"cGe" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/official/wtf_is_co2/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cGf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"cGl" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"cGt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/command/storage/eva) +"cGu" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"cGA" = ( +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"cGB" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"cGQ" = ( +/obj/structure/sign/poster/official/random/directional/west, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"cGS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"cGZ" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/service/hydroponics) +"cHb" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/office) +"cHf" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/transit_tube, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/transit_tube) +"cHh" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/library) +"cHl" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"cHm" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cHs" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"cHA" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate, +/turf/open/floor/iron/smooth, +/area/mine/living_quarters) +"cHB" = ( +/obj/machinery/vending/autodrobe, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cHO" = ( +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"cHQ" = ( +/obj/machinery/vending/wardrobe/robo_wardrobe, +/obj/machinery/button/door/directional/east{ + id = "robotics2"; + name = "Shutters Control Button"; + req_access = list("robotics") + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"cHY" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/holding_cell) +"cHZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/cargo/storage) +"cIa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"cIb" = ( +/obj/machinery/dna_scannernew, +/obj/structure/sign/warning/test_chamber/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"cIc" = ( +/turf/closed/wall, +/area/station/security/prison/work) +"cIf" = ( +/obj/structure/fence/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cIq" = ( +/obj/machinery/computer/slot_machine{ + balance = 15; + money = 500 + }, +/obj/item/coin/iron, +/obj/item/coin/diamond, +/obj/item/coin/diamond, +/obj/item/coin/diamond, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cIK" = ( +/obj/structure/table/wood, +/obj/item/pai_card, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/fore) +"cIP" = ( +/obj/machinery/bookbinder, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/wood, +/area/station/service/library) +"cIU" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"cIY" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security EVA" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"cJb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp) +"cJd" = ( +/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 = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "riot"; + name = "Anti-Riot Shutters"; + req_access = list("security") + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"cJi" = ( +/obj/structure/sign/warning, +/turf/closed/wall/r_wall, +/area/station/security/warden) +"cJk" = ( +/obj/machinery/chem_mass_spec, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"cJs" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"cJt" = ( +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"cJw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"cJB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"cJC" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/four, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"cJH" = ( +/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 = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cJX" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"cKe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cKk" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/science/research) +"cKq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cKv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/processing) +"cKy" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"cKA" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"cKB" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/checker{ + dir = 8 + }, +/area/station/maintenance/port/fore) +"cKD" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/obj/item/stock_parts/water_recycler, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cKF" = ( +/obj/structure/bookcase/random/reference, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) +"cKL" = ( +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/machinery/light/small/directional/north, +/turf/open/floor/grass, +/area/station/medical/virology) +"cLo" = ( +/obj/machinery/recharge_station, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"cLp" = ( +/obj/structure/table, +/obj/item/razor, +/obj/item/storage/backpack/duffelbag/sec/surgery, +/turf/open/floor/plating/icemoon, +/area/station/security/execution/education) +"cLq" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"cLw" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Door" + }, +/obj/structure/desk_bell{ + pixel_x = 6 + }, +/obj/machinery/door/window/left/directional/east{ + name = "Engineering Desk"; + req_access = list("engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"cLB" = ( +/obj/machinery/computer/prisoner/gulag_teleporter_computer{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"cLD" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Equipment Room" + }, +/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, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark/textured, +/area/station/security/lockers) +"cLJ" = ( +/obj/structure/table/wood, +/obj/item/paper{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 9; + pixel_y = 7 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/service/library) +"cLK" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"cLN" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"cLR" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/closet/crate/wooden/toy, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"cMd" = ( +/obj/machinery/recharge_station, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"cMe" = ( +/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 = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"cMk" = ( +/turf/closed/wall/r_wall, +/area/mine/production) +"cMr" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/starboard/fore) +"cMA" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/security/warden) +"cMG" = ( +/obj/structure/closet/crate/coffin, +/obj/machinery/light/small/red/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Chapel Coffin Storage" + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/chapel) +"cMI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + name = "Delivery Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"cMJ" = ( +/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/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"cMN" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Medbay Security Post" + }, +/obj/machinery/door/firedoor, +/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/security/general, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"cMS" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/service_all, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"cMT" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"cNe" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"cNm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/janitor) +"cNq" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/pen/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"cNI" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"cNL" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"cNS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Public Garden" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/textured, +/area/station/service/hydroponics/garden) +"cOa" = ( +/obj/structure/sign/warning/secure_area{ + desc = "A warning sign which reads 'SERVER ROOM'."; + name = "SERVER ROOM" + }, +/turf/closed/wall, +/area/station/tcommsat/computer) +"cOi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ + dir = 8 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"cOp" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"cOy" = ( +/obj/machinery/smartfridge, +/obj/machinery/door/window/right/directional/south{ + name = "Produce Access"; + req_access = list("hydroponics") + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"cOC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/mecha_part_fabricator, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"cOP" = ( +/obj/structure/chair{ + dir = 1; + name = "Crew Station" + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"cPd" = ( +/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/weather/snow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"cPp" = ( +/obj/item/stack/cable_coil{ + amount = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cPq" = ( +/obj/structure/closet/crate/coffin, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/chapel) +"cPt" = ( +/obj/structure/railing/corner, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"cPE" = ( +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/station/security/prison/garden) +"cPK" = ( +/obj/structure/table, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"cPQ" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"cQc" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/rag, +/obj/item/clothing/head/collectable/tophat{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/effect/spawner/random/entertainment/gambling{ + pixel_x = -13 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/fore) +"cQf" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/work) +"cQh" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/supply, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"cQi" = ( +/obj/machinery/disposal/delivery_chute{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/door/window/left/directional/east{ + name = "Loop Chute Access" + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"cQs" = ( +/obj/structure/table, +/obj/item/computer_disk{ + pixel_x = -2 + }, +/obj/item/computer_disk{ + pixel_x = 2; + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"cQw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/mine/eva) +"cQx" = ( +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Maintenance" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"cQA" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/ai_monitored/command/storage/eva) +"cQL" = ( +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"cQV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/siding/dark_blue, +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) +"cRg" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/security/warden) +"cRq" = ( +/obj/structure/table, +/obj/item/holosign_creator/atmos{ + pixel_x = -5 + }, +/obj/item/holosign_creator/atmos{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"cRu" = ( +/obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cRy" = ( +/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/plating, +/area/station/maintenance/starboard/upper) +"cRC" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"cRE" = ( +/obj/structure/rack, +/obj/item/wirecutters, +/obj/structure/cable, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"cRF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cRK" = ( +/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/white/corner{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"cRN" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"cRO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/closed/wall, +/area/station/engineering/atmos) +"cSe" = ( +/obj/structure/table, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/wirecutters, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"cSj" = ( +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"cSw" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/explab) +"cSx" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cSE" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"cSH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"cTh" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"cTs" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/turf/open/floor/iron, +/area/station/engineering/storage) +"cTv" = ( +/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/textured, +/area/station/security/prison/rec) +"cTz" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/barricade/wooden, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"cTD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood/large, +/area/station/commons/vacant_room/office) +"cTR" = ( +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/research) +"cTV" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"cUd" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Locker Room Maintenance" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"cUB" = ( +/obj/structure/window/spawner/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"cUF" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Aft Primary Hallway North" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"cUS" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/machinery/hydroponics/constructable, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"cVk" = ( +/obj/item/storage/box/evidence{ + pixel_x = -10; + pixel_y = 12 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"cVz" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/port) +"cVD" = ( +/obj/machinery/door/poddoor/preopen{ + id = "labor"; + name = "Labor Camp Blast Door" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"cVV" = ( +/obj/machinery/newscaster/directional/north, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/security/brig) +"cWq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"cWE" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/service/chapel/office) +"cWG" = ( +/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/processing) +"cWH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/organic/plant5, +/obj/machinery/camera/directional/west{ + c_tag = "Labor Camp Cellblock"; + network = list("labor") + }, +/obj/machinery/button/flasher{ + pixel_y = -30; + id = "GulagCell 1" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"cWX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"cXc" = ( +/obj/effect/turf_decal/arrows, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"cXl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"cXp" = ( +/obj/structure/bed/pod, +/obj/effect/spawner/random/bedsheet/any, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/fore) +"cXy" = ( +/obj/structure/cable, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/station/security/prison/garden) +"cXG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"cXI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/station/commons/lounge) +"cXR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"cXV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"cXX" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 11"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"cXZ" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"cYi" = ( +/obj/effect/turf_decal/trimline/dark_red/line, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"cYj" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"cYo" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"cYq" = ( +/obj/structure/reflector/double/anchored{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"cYv" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"cYC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cYE" = ( +/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/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"cYK" = ( +/obj/machinery/netpod, +/obj/machinery/light/small/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) +"cYL" = ( +/obj/effect/turf_decal/bot, +/obj/structure/ore_box, +/turf/open/floor/iron/dark, +/area/mine/eva) +"cYT" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"cYY" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/service/chapel) +"cZa" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"cZc" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"cZd" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/button/door/directional/south{ + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_x = 5; + pixel_y = -26 + }, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/light_switch/directional/south{ + pixel_x = -6 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"cZe" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"cZf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"cZk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"cZm" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"cZt" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"cZv" = ( +/obj/machinery/holopad/secure, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) +"cZD" = ( +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"cZN" = ( +/obj/structure/table/wood, +/obj/item/soap/nanotrasen, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"cZO" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"cZT" = ( +/obj/machinery/door/poddoor/preopen{ + id = "misclab"; + name = "Test Chamber Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"cZU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/science/robotics/mechbay) +"dad" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/official/the_owl/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"daf" = ( +/obj/structure/table, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"dak" = ( +/obj/item/clothing/suit/apron/surgical, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dal" = ( +/obj/structure/table/wood, +/obj/machinery/libraryscanner{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/service/library) +"daq" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"dat" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"daE" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"daH" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"daM" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/airalarm/directional/north, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) +"daO" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/button/door/directional/east{ + id = "drone_bay"; + name = "Shutter Control" + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"daR" = ( +/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/white, +/area/station/maintenance/aft/greater) +"daS" = ( +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"daT" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/structure/rack, +/obj/item/hatchet, +/obj/item/cultivator, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"dbm" = ( +/obj/machinery/door/airlock{ + name = "Private Restroom" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, +/turf/open/floor/iron/freezer, +/area/station/command/heads_quarters/captain) +"dbn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"dbr" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"dbs" = ( +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"dbw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"dbx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"dbB" = ( +/turf/closed/wall/ice, +/area/icemoon/underground/explored/graveyard) +"dbH" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/mess) +"dbL" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"dbO" = ( +/obj/machinery/door/airlock/wood{ + name = "Backstage" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/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/service/theatre, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/theater) +"dcd" = ( +/obj/structure/ladder, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"dck" = ( +/obj/structure/cable, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"dcq" = ( +/obj/structure/bed, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/button/door/directional/east{ + id = "Dorm3"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) +"dcs" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) +"dct" = ( +/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 = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dcw" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/prison/workout) +"dcx" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"dcC" = ( +/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 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"dcE" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/end{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"dcG" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"dcI" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dcO" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Engineering Emitter Room Starboard"; + network = list("ss13","engine") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"dcW" = ( +/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/maintenance/port/lesser) +"dcX" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_x = -8 + }, +/obj/item/clothing/shoes/winterboots/ice_boots{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/clothing/shoes/winterboots/ice_boots{ + pixel_x = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"ddd" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"ddh" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"ddi" = ( +/obj/structure/frame/computer{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) +"ddk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit, +/area/station/science/robotics/mechbay) +"ddm" = ( +/mob/living/basic/pet/penguin/emperor{ + name = "Club" + }, +/obj/item/toy/snowball{ + pixel_x = -9; + pixel_y = 17 + }, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"ddp" = ( +/obj/effect/spawner/structure/window/reinforced, +/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/execution/transfer) +"ddr" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/wood, +/area/station/commons/dorms) +"ddu" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"ddw" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/wood/large, +/area/station/service/bar/atrium) +"ddz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"ddA" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"ddK" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/decal/cleanable/dirt, +/obj/item/seeds/onion, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"ddQ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants/random, +/obj/structure/sign/calendar/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) +"ddZ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/large, +/area/station/service/hydroponics/garden) +"deg" = ( +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"dei" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/vending/cigarette, +/obj/structure/sign/poster/official/nanotrasen_logo/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) +"det" = ( +/obj/structure/disposalpipe/segment, +/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/maintenance/port/fore) +"deD" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Chief Engineer's Office" + }, +/obj/machinery/requests_console/directional/west{ + department = "Chief Engineer's Desk"; + name = "Chief Engineer's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"deN" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"deO" = ( +/obj/structure/closet/crate, +/obj/effect/landmark/blobstart, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/construction) +"deP" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Chapel Office" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"deY" = ( +/turf/open/floor/plating, +/area/station/maintenance/fore) +"dfa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light_switch/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"dfe" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) +"dfq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"dfw" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/secure_closet/security/science, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"dfz" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/structure/cable, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/security/lockers) +"dfB" = ( +/turf/open/floor/iron/white/corner, +/area/station/hallway/primary/starboard) +"dfQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage/gas) +"dfR" = ( +/obj/item/toy/snowball{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/toy/snowball, +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) +"dga" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"dgl" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"dgp" = ( +/obj/machinery/modular_computer/preset/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/north, +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"dgt" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + frequency = 1449; + id_tag = "virology_airlock_exterior"; + name = "Virology Exterior Airlock" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/virology) +"dgx" = ( +/obj/structure/rack, +/obj/effect/spawner/random/contraband/permabrig_gear, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"dgA" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"dgR" = ( +/obj/machinery/smartfridge, +/turf/open/floor/iron/dark, +/area/station/service/kitchen) +"dgZ" = ( +/obj/machinery/airalarm/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"dha" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "permaouter"; + name = "Permabrig Transfer" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "perma-entrance" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"dhi" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/railing, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/security/brig) +"dhj" = ( +/obj/machinery/light_switch/directional/north, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"dhq" = ( +/turf/closed/mineral/random/labormineral/ice, +/area/icemoon/surface/outdoors/labor_camp) +"dhv" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"dhH" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"dhL" = ( +/obj/machinery/computer/upload/ai{ + dir = 1 + }, +/obj/machinery/flasher/directional/south{ + id = "AI" + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai_upload) +"dhR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bookcase/random, +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) +"dhS" = ( +/obj/machinery/door/airlock{ + name = "Permabrig Showers" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"dhU" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/processing) +"dhV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/sign/departments/exodrone/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) +"dhY" = ( +/obj/machinery/computer/security/mining{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"dia" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"dik" = ( +/obj/machinery/cell_charger{ + pixel_y = 5 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_y = 6 + }, +/obj/structure/table/glass, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/lab) +"dip" = ( +/obj/machinery/holopad, +/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/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"diq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hos) +"dit" = ( +/obj/machinery/requests_console/directional/north{ + department = "Chapel"; + name = "Chapel Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"diu" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"dix" = ( +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"diC" = ( +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"diI" = ( +/obj/machinery/mech_bay_recharge_port, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"diL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"diN" = ( +/obj/structure/closet, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"diV" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/mine/living_quarters) +"djr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"djC" = ( +/obj/effect/decal/remains/human, +/obj/item/reagent_containers/cup/glass/bottle/wine{ + desc = "A fine bottle of amontillado wine. Yes, for the love of god!"; + name = "bottle of amontillado wine"; + pixel_x = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"djD" = ( +/obj/machinery/door/airlock{ + name = "Crematorium" + }, +/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/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"djG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"djH" = ( +/obj/item/stack/sheet/animalhide/lizard{ + desc = "Landssslidessss, the landssslidesss..."; + name = "Tanks-The-Floor" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"djO" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer" + }, +/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/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"djU" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dka" = ( +/obj/machinery/firealarm/directional/west{ + pixel_y = -4 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 5 + }, +/obj/machinery/photocopier, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"dkb" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"dkg" = ( +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/requests_console/directional/north{ + department = "Chief Medical Officer's Desk"; + name = "Chief Medical Officer's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/announcement, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/cmo) +"dkn" = ( +/obj/machinery/space_heater, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"dkr" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"dku" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/chair_flipped{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dkK" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"dkT" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"dkY" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/security_officer, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +"dkZ" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) +"dlt" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dlH" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/smartfridge/drying, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"dlK" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"dlR" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/construction) +"dlS" = ( +/obj/item/crowbar/red, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/maintenance, +/obj/structure/rack, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"dmk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"dms" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dmt" = ( +/obj/structure/ladder, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dmw" = ( +/obj/structure/fence/end{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"dmG" = ( +/obj/structure/table/wood, +/obj/item/camera, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"dmI" = ( +/obj/machinery/chem_master, +/obj/effect/turf_decal/tile/yellow/full, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"dmL" = ( +/obj/machinery/light_switch/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"dmU" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"dmV" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio10"; + name = "Xenobio Pen 10 Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"dng" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Research Director's Office - Observation Deck"; + network = list("ss13","rd") + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"dnk" = ( +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"dnn" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/obj/structure/curtain/cloth/fancy/mechanical/start_closed{ + id = "cantena_curtains" + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"dnq" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dnz" = ( +/obj/effect/turf_decal/siding/wideplating_new/light{ + dir = 6 + }, +/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/prisoner, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/work) +"dnE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"dnI" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"dnL" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dnM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"dnT" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"dnX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/lockers) +"dom" = ( +/turf/closed/wall/ice, +/area/station/service/kitchen/coldroom) +"don" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"dop" = ( +/obj/structure/fence/door/opened{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"doq" = ( +/obj/machinery/flasher/directional/north{ + id = "transferflash" + }, +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/obj/item/radio/intercom/prison/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"dos" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, +/turf/closed/wall, +/area/station/maintenance/starboard/upper) +"dow" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/any/security/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"doG" = ( +/obj/structure/rack, +/obj/machinery/light/small/directional/north, +/obj/machinery/light_switch/directional/north, +/obj/item/radio/off{ + pixel_y = 4 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"doM" = ( +/obj/structure/table, +/obj/item/paper{ + pixel_y = 7 + }, +/obj/item/paper{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"doW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"dpb" = ( +/obj/structure/table/wood, +/obj/item/food/pie/cream, +/obj/item/bikehorn, +/obj/machinery/status_display/evac/directional/west, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"dpc" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "EVA Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark_blue, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/command/storage/eva) +"dpl" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"dpq" = ( +/obj/structure/tank_holder/extinguisher, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"dpw" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/dark, +/area/mine/storage) +"dpx" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dpB" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"dpC" = ( +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/contraband/prison, +/obj/item/trash/sosjerky, +/obj/item/trash/boritos, +/obj/item/trash/can, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"dpH" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"dpU" = ( +/obj/effect/turf_decal/tile/blue, +/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/hallway/secondary/entry) +"dqw" = ( +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"dqx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"dqI" = ( +/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/dark/half/contrasted{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rnd2"; + name = "Research Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/science/ordnance/office) +"dqL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"dqO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) +"dqR" = ( +/obj/machinery/computer/rdconsole, +/obj/structure/cable, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"dqW" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"drb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"drd" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/table, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/obj/structure/cable, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/mod/module/signlang_radio, +/obj/item/mod/module/thermal_regulator, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"drh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"drr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"drs" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"drt" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/dorms) +"dry" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit, +/area/station/science/robotics/mechbay) +"drD" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/mine/living_quarters) +"drE" = ( +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/flashlight, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/gps/mining, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"drH" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"drJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"drK" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 8 + }, +/obj/machinery/airlock_sensor/incinerator_atmos{ + pixel_y = 32 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"drP" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"drR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"drZ" = ( +/obj/structure/flora/grass/both, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dsf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/status_display/supply{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"dsj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"dsl" = ( +/obj/machinery/computer/rdservercontrol{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/server) +"dsn" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Airlock" + }, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"dso" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"dsR" = ( +/obj/machinery/conveyor/inverted{ + dir = 10; + id = "garbage" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"dsU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) +"dsZ" = ( +/obj/structure/noticeboard/directional/west, +/turf/open/floor/engine/cult, +/area/station/service/library) +"dtb" = ( +/obj/structure/bookcase/random/reference, +/turf/open/floor/wood, +/area/station/service/library) +"dtc" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"dth" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Power Storage" + }, +/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/engineering/engine_equipment, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"dtr" = ( +/obj/machinery/computer/records/medical, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"dty" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/sign/poster/contraband/random/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dtz" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/security/processing) +"dtC" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"dtR" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva/lower) +"dtU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"duh" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/transit_tube) +"duE" = ( +/obj/machinery/atmospherics/components/binary/tank_compressor{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"duS" = ( +/obj/machinery/door/airlock{ + name = "Labor Camp Library" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"duT" = ( +/obj/item/chair/stool/bar{ + pixel_y = -2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"duY" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"duZ" = ( +/obj/machinery/door/airlock/engineering{ + name = "Utilities Closet" + }, +/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/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/mine/eva) +"dvf" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/camera/directional/south{ + c_tag = "Arrivals Lobby South" + }, +/obj/machinery/newscaster/directional/south, +/obj/effect/landmark/start/hangover, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/sofa/bench{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"dvi" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/railing, +/obj/effect/turf_decal/siding/thinplating, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"dvl" = ( +/obj/machinery/camera/motion/directional/north{ + c_tag = "Armory - External" + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dvq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"dvw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"dvK" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/machinery/camera/directional/east{ + c_tag = "Virology Module South"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"dvO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"dvY" = ( +/obj/structure/flora/tree/dead/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dvZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dwb" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"dwj" = ( +/obj/machinery/atmospherics/components/binary/pump/off, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/obj/machinery/airlock_sensor/incinerator_ordmix{ + pixel_y = 32 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"dwo" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/lattice/catwalk, +/obj/effect/decal/cleanable/cobweb, +/turf/open/openspace/icemoon/keep_below, +/area/station/maintenance/port/lesser) +"dws" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"dww" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dwy" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"dwI" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/wallet_storage, +/obj/effect/spawner/random/clothing/kittyears_or_rabbitears, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"dwY" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/closet/secure_closet/quartermaster, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"dwZ" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) +"dxg" = ( +/obj/structure/table, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/stack/cable_coil, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"dxh" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/wood, +/area/station/commons/dorms) +"dxm" = ( +/obj/structure/rack, +/obj/item/clothing/suit/toggle/labcoat, +/obj/effect/spawner/random/clothing/gloves, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"dxn" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering East" + }, +/obj/structure/closet/toolcloset, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"dxq" = ( +/obj/structure/closet/secure_closet/chief_medical, +/obj/item/screwdriver, +/obj/machinery/camera/directional/north{ + c_tag = "Chief Medical Officer Bedroom"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"dxs" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/item/clothing/gloves/boxing/green, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dxu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"dxA" = ( +/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/engineering/lobby) +"dxE" = ( +/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/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"dxI" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/poster/official/safety_internals/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"dxK" = ( +/turf/closed/wall/r_wall, +/area/station/command/meeting_room) +"dxO" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"dxU" = ( +/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/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"dyf" = ( +/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, +/area/station/security/courtroom) +"dyg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/turf_decal/weather/snow, +/turf/open/floor/plating/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dyA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4, +/obj/effect/turf_decal/stripes/line, +/obj/structure/chair/stool/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"dyE" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"dyN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dzi" = ( +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"dzl" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"dzt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/status_display/door_timer{ + id = "Isolation_Cell"; + name = "Isolation Cell"; + pixel_x = -32 + }, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"dzy" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"dzJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"dzL" = ( +/obj/machinery/newscaster/directional/north, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark, +/area/mine/eva/lower) +"dzZ" = ( +/obj/structure/fence/cut/medium{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dAc" = ( +/obj/item/radio/intercom/directional/north, +/obj/item/storage/belt/utility{ + pixel_y = -4 + }, +/obj/item/clothing/gloves/color/fyellow{ + pixel_y = 2 + }, +/obj/item/clothing/gloves/color/fyellow{ + pixel_y = 4 + }, +/obj/structure/rack, +/obj/machinery/camera/directional/north{ + c_tag = "Primary Tool Storage" + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"dAh" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/preopen{ + id = "Biohazard"; + name = "Biohazard Containment Door" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"dAl" = ( +/obj/machinery/smartfridge/extract/preloaded, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"dAm" = ( +/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/engineering/lobby) +"dAx" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/cultivator/rake, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"dAB" = ( +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Research Director Observation"; + req_access = list("rd") + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/command/heads_quarters/rd) +"dAP" = ( +/obj/structure/cable, +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"dAQ" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/modular_computer/preset/civilian, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light_switch/directional/north{ + pixel_x = -6 + }, +/obj/machinery/button/door/directional/north{ + id = "stationawaygate"; + name = "Gateway Access Shutter Control"; + req_access = list("gateway"); + pixel_x = 6 + }, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"dAZ" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/visit) +"dBb" = ( +/obj/structure/chair/sofa/right/brown, +/obj/item/toy/plush/moth{ + name = "Dr. Moff" + }, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) +"dBh" = ( +/obj/machinery/telecomms/server/presets/medical, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"dBp" = ( +/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/catwalk_floor/iron_smooth, +/area/station/maintenance/fore/lesser) +"dBB" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot_white, +/obj/machinery/firealarm/directional/south, +/obj/structure/sign/poster/official/help_others/directional/west, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"dBJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"dBK" = ( +/obj/machinery/disposal/bin, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"dBN" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/duct, +/obj/machinery/light/small/directional/north, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron, +/area/station/service/bar) +"dBQ" = ( +/obj/machinery/camera/directional/north{ + c_tag = "MiniSat AI Chamber South"; + network = list("aicore") + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"dBX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"dBY" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"dBZ" = ( +/turf/open/floor/iron, +/area/station/cargo/sorting) +"dCq" = ( +/obj/machinery/light/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"dCy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"dCF" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"dDm" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/explab) +"dDp" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"dDt" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"dDw" = ( +/turf/closed/wall, +/area/station/medical/surgery/fore) +"dDy" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/corner, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"dDz" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/item/sign, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dDC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + name = "Supply multi deck pipe adapter" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"dDR" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"dDV" = ( +/obj/effect/spawner/random/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dEf" = ( +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"dEg" = ( +/obj/effect/turf_decal/trimline/blue/end, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/end, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"dEv" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/station/security/courtroom) +"dEz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/security/prison/rec) +"dEI" = ( +/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/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"dEL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump/off/supply/visible/layer4{ + dir = 8; + name = "Air Out" + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"dEQ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Public Mining Ladder" + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/mining) +"dER" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"dEV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"dFi" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"dFj" = ( +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/research) +"dFo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/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/engineering/transit_tube) +"dFp" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Air to Mix" + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"dFt" = ( +/turf/closed/wall, +/area/station/hallway/secondary/exit/departure_lounge) +"dFA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) +"dFC" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dFF" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"dFG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dFO" = ( +/obj/machinery/light/directional/north, +/obj/structure/sign/departments/evac/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"dFR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/mine/laborcamp) +"dFW" = ( +/turf/open/floor/iron/white/side, +/area/station/science/research) +"dFX" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/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/safe) +"dFZ" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dGe" = ( +/obj/effect/decal/cleanable/food/egg_smudge, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dGq" = ( +/obj/machinery/computer/records/medical, +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_access = list("security") + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"dGK" = ( +/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/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dGO" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/commons/fitness) +"dGS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/obj/structure/rack, +/obj/machinery/camera/directional/south{ + c_tag = "Chapel Electrical Maintenace Lower" + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/chapel) +"dGU" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Captain's Office Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/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/command/captain, +/turf/open/floor/plating, +/area/station/maintenance/central/lesser) +"dHa" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/button/elevator/directional/north{ + id = "publicElevator" + }, +/obj/machinery/door/window/elevator/left/directional/west{ + elevator_mode = 1; + transport_linked_id = "publicElevator" + }, +/obj/machinery/lift_indicator/directional/north{ + linked_elevator_id = "publicElevator" + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/mining) +"dHb" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/throwing_star/toy, +/turf/open/misc/ashplanet/wateryrock{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/station/security/prison/rec) +"dHf" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Service - Botany Upper Entrance" + }, +/obj/structure/table/glass, +/obj/machinery/fax/auto_name, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"dHg" = ( +/obj/machinery/door/airlock{ + name = "Unit B" + }, +/turf/open/floor/iron/textured, +/area/station/commons/toilet) +"dHi" = ( +/obj/structure/chair/stool/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/stone, +/area/station/commons/lounge) +"dHk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"dHl" = ( +/obj/structure/rack, +/obj/item/crowbar/red, +/obj/item/restraints/handcuffs, +/obj/item/wrench, +/turf/open/floor/plating, +/area/station/medical/virology) +"dHw" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/prison) +"dHF" = ( +/obj/structure/railing, +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dHJ" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"dIl" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"dIx" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dIy" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/mining) +"dIG" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster/directional/south, +/obj/item/book/bible{ + pixel_y = 8 + }, +/obj/item/storage/fancy/candle_box{ + pixel_x = 4 + }, +/obj/item/storage/fancy/candle_box, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"dIL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"dJx" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"dJy" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 8 + }, +/obj/machinery/air_sensor/ordnance_freezer_chamber, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"dJY" = ( +/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/hallway/secondary/entry) +"dJZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"dKe" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"dKh" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"dKk" = ( +/obj/machinery/light/directional/west, +/obj/structure/displaycase, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/mine/living_quarters) +"dKy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Secure Gate"; + name = "Brig Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig) +"dKA" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=1"; + location = "Security" + }, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"dKC" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/service/lawoffice) +"dKK" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/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) +"dKW" = ( +/obj/structure/sign/directions/security{ + dir = 1; + pixel_x = 32; + pixel_y = 36 + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_x = 32; + pixel_y = 28 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dLe" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"dLf" = ( +/turf/closed/wall/r_wall, +/area/station/cargo/storage) +"dLo" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"dLr" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"dLA" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/toy/figure/chef, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/service/kitchen/coldroom) +"dLL" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"dLN" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/mine/laborcamp) +"dLQ" = ( +/obj/machinery/door/firedoor, +/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/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"dLR" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/iron, +/area/mine/laborcamp) +"dMi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/fore) +"dMl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"dMn" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"dMo" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dMp" = ( +/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/medical/medbay/aft) +"dMv" = ( +/obj/item/clothing/gloves/color/rainbow, +/obj/item/clothing/head/soft/rainbow, +/obj/item/clothing/shoes/sneakers/rainbow, +/obj/item/clothing/under/color/rainbow, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"dMH" = ( +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"dMK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"dMX" = ( +/obj/structure/chair{ + dir = 1; + name = "Engineering Station" + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"dNt" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"dNw" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"dNA" = ( +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"dNC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix to Space" + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"dNG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"dNH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/west{ + c_tag = "Security - Permabrig Cold Room"; + network = list("ss13","prison") + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"dNN" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"dOp" = ( +/obj/structure/table/wood, +/obj/item/instrument/saxophone, +/obj/item/instrument/piano_synth, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Theater" + }, +/turf/open/floor/iron/grimy, +/area/station/commons/lounge) +"dOq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/mine/storage) +"dOw" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"dOC" = ( +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"dOF" = ( +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door"; + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/command/bridge) +"dOH" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dOK" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dOY" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"dPj" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/effect/turf_decal/tile/dark_blue/diagonal_edge, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/storage) +"dPy" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Kill Chamber"; + network = list("ss13","rd","xeno") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"dPH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/camera/directional/north{ + c_tag = "Mining Mech Bay"; + network = list("ss13", "mine") + }, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"dPT" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dQd" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/maintenance/department/cargo) +"dQl" = ( +/obj/structure/closet/emcloset, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"dQo" = ( +/obj/machinery/button/door/directional/east{ + id = "pharmacy_shutters2"; + name = "Pharmacy Shutter Control"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"dQy" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/closet/secure_closet/hydroponics, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"dQI" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"dQN" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"dQZ" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 9"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"dRc" = ( +/obj/structure/table, +/obj/machinery/firealarm/directional/west, +/obj/item/storage/medkit/regular, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"dRk" = ( +/obj/effect/turf_decal/bot, +/obj/structure/ore_box, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"dRz" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"dRB" = ( +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/hydroponics) +"dRD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/command/gateway) +"dRX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"dSj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/mine/production) +"dSm" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"dSJ" = ( +/obj/machinery/flasher/directional/north{ + id = "visitorflash" + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Visitation North"; + network = list("ss13","prison") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"dSO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"dSX" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"dTa" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/bar) +"dTm" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/mob_spawn/corpse/human/skeleton, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"dTq" = ( +/obj/structure/fireplace, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"dTr" = ( +/obj/structure/chair{ + dir = 8; + name = "Judge" + }, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, +/area/station/security/courtroom) +"dTs" = ( +/turf/open/floor/iron/smooth, +/area/mine/eva) +"dTC" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"dTD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"dTF" = ( +/obj/machinery/conveyor{ + dir = 10; + id = "mining_internal" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/mine/production) +"dTI" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/fake_stairs/wood/directional/north, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dTW" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"dUe" = ( +/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/structure/cable, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"dUh" = ( +/obj/machinery/light/small/directional/north, +/obj/item/kirbyplants/random, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"dUm" = ( +/obj/structure/fence/door{ + dir = 4 + }, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"dUn" = ( +/obj/machinery/shieldgen, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"dUr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/holopad, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"dUv" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/item/clothing/glasses/meson/engine/tray, +/obj/item/clothing/glasses/meson/engine/tray, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"dUG" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Showers" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"dUL" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint1" + }, +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dUO" = ( +/turf/closed/wall, +/area/station/security/brig) +"dUR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/medical/virology) +"dUW" = ( +/obj/machinery/light_switch/directional/south, +/turf/open/floor/wood, +/area/station/security/courtroom) +"dVb" = ( +/obj/structure/table, +/obj/item/toy/cards/deck, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"dVc" = ( +/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/blue/filled/warning{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"dVj" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"dVt" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/iron/checker, +/area/station/science/lab) +"dVF" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dVJ" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/engineering/lobby) +"dVN" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"dVS" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"dWf" = ( +/obj/item/trash/pistachios, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dWl" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/siding/white, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"dWn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Upper Permabrig Cafeteria"; + network = list("ss13","prison") + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"dWI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/item/kirbyplants/organic/plant2, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"dWK" = ( +/obj/machinery/hydroponics/soil, +/obj/item/shovel/spade, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"dWL" = ( +/obj/structure/railing, +/obj/machinery/vending/cytopro, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"dWP" = ( +/obj/structure/table/wood, +/obj/item/pen/red{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/item/pen/blue{ + pixel_y = -2 + }, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"dWZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dXh" = ( +/obj/item/stamp{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/structure/table, +/obj/machinery/status_display/supply{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"dXi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"dXk" = ( +/obj/structure/railing/wooden_fence{ + dir = 10 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"dXn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"dXp" = ( +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/hydroponics) +"dXr" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"dXv" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"dXx" = ( +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dXF" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/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/maintenance/department/medical/morgue) +"dXI" = ( +/obj/machinery/chem_master, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"dXP" = ( +/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"dXU" = ( +/obj/effect/decal/cleanable/generic, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"dYj" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dYr" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"dYt" = ( +/turf/open/floor/engine/cult, +/area/station/service/library) +"dYx" = ( +/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/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/production) +"dYA" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/east, +/obj/structure/sign/departments/security/directional/east, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +"dYC" = ( +/obj/structure/closet/firecloset, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dYH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"dYI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"dYP" = ( +/obj/item/toy/snowball{ + pixel_x = -11; + pixel_y = -2 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"dYS" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dYU" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"dZc" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"dZq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"dZJ" = ( +/obj/machinery/seed_extractor, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"dZN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"dZQ" = ( +/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, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dZS" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"dZW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) +"dZX" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"eaa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/side{ + dir = 4 + }, +/area/station/science/research) +"ead" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering Supermatter Starboard"; + network = list("ss13","engine") + }, +/obj/structure/cable, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"eag" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/landmark/start/scientist, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) +"eaq" = ( +/obj/structure/table, +/obj/item/paper_bin/carbon, +/obj/item/pen, +/obj/structure/cable, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"eat" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/poster/official/no_erp/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"eay" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/structure/cable, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) +"eaE" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/cargo/lobby) +"eaG" = ( +/obj/structure/sign/departments/vault/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/surface/outdoors/nospawn) +"eaQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eaT" = ( +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ebb" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ebd" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"ebr" = ( +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"ebv" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"ebB" = ( +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"ebH" = ( +/obj/structure/sign/departments/medbay/alt/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ebL" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/structure/closet/crate/goldcrate, +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"ebO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"ebW" = ( +/obj/structure/fence/cut/medium{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ecs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"ecw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/turf/open/floor/iron, +/area/station/science/genetics) +"ecJ" = ( +/obj/effect/landmark/blobstart, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"ecU" = ( +/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, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"ecW" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"edc" = ( +/obj/item/flashlight/lantern/on, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"edd" = ( +/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/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-med-passthrough" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"ede" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access"; + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"edn" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/machinery/ore_silo, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"edq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"edw" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"edN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"edR" = ( +/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/effect/spawner/random/structure/steam_vent, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"eea" = ( +/obj/structure/sign/warning/docking/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"eei" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"ees" = ( +/obj/structure/kitchenspike, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"eeD" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"eeF" = ( +/obj/item/cigbutt/cigarbutt, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"eeT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"eff" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"efk" = ( +/obj/structure/cable, +/turf/open/floor/iron/white/side, +/area/station/science/explab) +"efv" = ( +/obj/item/toy/snowball{ + pixel_x = -6; + pixel_y = -4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"efx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"efy" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/service/chapel) +"efE" = ( +/obj/structure/reflector/box/anchored{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"efH" = ( +/obj/structure/table/glass, +/obj/item/food/grown/harebell{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/food/grown/harebell{ + pixel_y = 3 + }, +/obj/item/food/grown/harebell, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"efI" = ( +/obj/structure/lattice, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"efK" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"efM" = ( +/obj/structure/closet/crate/grave, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"efR" = ( +/obj/structure/ladder, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"efV" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ega" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"egj" = ( +/obj/structure/rack, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"egm" = ( +/obj/structure/table, +/obj/item/restraints/handcuffs, +/obj/item/assembly/timer, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/office) +"egp" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"egz" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/prison, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"egF" = ( +/obj/structure/filingcabinet, +/obj/item/folder/documents, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"egL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/command/storage/eva) +"egS" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"egT" = ( +/obj/item/circuitboard/machine/stasis, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/item/wrench/medical, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/blood/gibs/old, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"egV" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"egY" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hop"; + name = "Privacy Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hop) +"eha" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ehd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ehh" = ( +/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/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"ehp" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"ehq" = ( +/obj/structure/noticeboard/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ehD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/transport/linear{ + radial_travel = 0 + }, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/plating/elevatorshaft, +/area/mine/storage) +"ehJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"ehL" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/deepfryer, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"ehO" = ( +/obj/machinery/door/window/brigdoor/right/directional/west{ + name = "Observation Deck"; + req_access = list("xenobiology") + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ehP" = ( +/obj/structure/sign/warning/cold_temp, +/turf/closed/wall/r_wall, +/area/station/engineering/storage_shared) +"ehR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"ehU" = ( +/obj/machinery/door/firedoor/border_only, +/obj/structure/railing, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"ehZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/toy_figure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"eic" = ( +/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/dark/textured, +/area/station/security/execution/transfer) +"eig" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/item/restraints/handcuffs{ + pixel_y = 5 + }, +/obj/item/restraints/handcuffs{ + pixel_y = 1 + }, +/obj/item/restraints/handcuffs{ + pixel_x = 1; + pixel_y = -4 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Holding Cells" + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"eik" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ein" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Chamber" + }, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/warning/fire/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"eiH" = ( +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"eiI" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"eiJ" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/status_display/evac/directional/north, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) +"ejb" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/security/glass{ + name = "Permabrig Visitation" + }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"ejn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"ejo" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"ejL" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"ejN" = ( +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{ + name = "Burn Chamber Exterior Airlock" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"ejQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"ejX" = ( +/turf/open/floor/plating, +/area/station/security/prison/safe) +"ekh" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - Central" + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Infiltrate" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ekj" = ( +/obj/structure/closet, +/obj/effect/spawner/random/clothing/costume, +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/effect/spawner/random/clothing/gloves, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ekm" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "chemistry_lower_shutters"; + name = "Chemistry Exterior Shutters" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"ekn" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"ekq" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"ekE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"ekW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/processing) +"elj" = ( +/obj/effect/landmark/start/depsec/engineering, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/engineering) +"elk" = ( +/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, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/science/explab) +"elw" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/upper) +"elE" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"elT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 8 + }, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"emp" = ( +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/starboard) +"emx" = ( +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"emK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/command/heads_quarters/rd) +"emM" = ( +/obj/machinery/door/window/brigdoor/security/cell/left/directional/west{ + id = "Cell 1"; + name = "Cell 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/station/security/brig) +"emT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"ena" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"eni" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"enq" = ( +/obj/machinery/doppler_array{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"ens" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"enH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"enI" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Tool Storage Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/commons/storage/primary) +"enR" = ( +/obj/structure/closet/emcloset, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"enX" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"enY" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eos" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"eoy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"eoD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"eoE" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"eoJ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/mining) +"eoL" = ( +/obj/structure/table, +/obj/item/taperecorder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"eoO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"eoP" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"eoS" = ( +/obj/machinery/door/morgue{ + name = "Confession Booth"; + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/service/chapel) +"eoY" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"epw" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"epB" = ( +/obj/structure/chair/pew/left{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"epC" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"epH" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/science/explab) +"epN" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"epY" = ( +/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/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow/corner, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/engineering/storage) +"eqj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"eqq" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"equ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/primary/starboard) +"eqE" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"eqH" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"eqI" = ( +/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, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"eqN" = ( +/obj/structure/fence/door, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"eqP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eqS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"eqU" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"eqV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"erd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/commons/fitness) +"eri" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/chief_engineer, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"erk" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"erl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/greenglow, +/obj/structure/sign/poster/official/safety_eye_protection/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ero" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/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/science/genetics) +"erw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"erA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/construction) +"erI" = ( +/obj/structure/rack, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen, +/obj/structure/sign/warning/cold_temp/directional/west, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/exit/departure_lounge) +"erK" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters{ + id = "vacantofficemaintshutter"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/commons/vacant_room/office) +"erM" = ( +/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/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"erN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/cargo/storage) +"erV" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"erY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"erZ" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/command/teleporter) +"esc" = ( +/obj/machinery/computer/order_console/mining, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"eso" = ( +/obj/machinery/telecomms/receiver/preset_left, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"esv" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"esC" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"esE" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"esF" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"esI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/gateway) +"esK" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/glass/reinforced, +/area/station/security/brig/entrance) +"esS" = ( +/obj/machinery/computer/shuttle/labor{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"eta" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Hallway East" + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 2 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ete" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/commons/lounge) +"etv" = ( +/obj/machinery/chem_heater/withbuffer, +/obj/effect/turf_decal/tile/yellow/full, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"etw" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"etz" = ( +/obj/structure/sign/warning/directional/north, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"etB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"etH" = ( +/obj/structure/closet/crate/coffin, +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/chapel) +"etO" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering{ + name = "Engine Room" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"etW" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/railing, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"etY" = ( +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) +"euc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"eud" = ( +/obj/item/food/chococoin, +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"euf" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/captain{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"euq" = ( +/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/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"euw" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"euI" = ( +/obj/structure/statue/snow/snowman, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"euM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"euZ" = ( +/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/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"evb" = ( +/turf/open/floor/iron, +/area/station/service/janitor) +"evh" = ( +/obj/structure/flora/tree/pine/style_random{ + pixel_x = -15 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"evk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/lab) +"evp" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"evw" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/obj/structure/closet/emcloset, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/processing) +"evP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"evT" = ( +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"ewi" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Janitor" + }, +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/maintenance/department/medical/central) +"ewo" = ( +/obj/structure/fence/post{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"ewC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"ewI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"ewM" = ( +/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/light/floor, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"ewT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"exe" = ( +/obj/effect/turf_decal/siding/yellow/end{ + dir = 8 + }, +/obj/machinery/plumbing/receiver, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plating, +/area/station/medical/treatment_center) +"exm" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "robotics"; + name = "Robotics Lab Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/window/left/directional/south{ + name = "Robotics Desk"; + req_access = list("robotics") + }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"exn" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"exu" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +"exv" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"exw" = ( +/turf/closed/wall, +/area/station/service/hydroponics) +"exL" = ( +/obj/item/trash/cheesie, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/fore) +"exN" = ( +/obj/effect/spawner/random/trash, +/obj/machinery/light/directional/south, +/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/work) +"exQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"eyb" = ( +/turf/closed/wall, +/area/station/security/processing) +"eyc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"eyf" = ( +/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/public/glass{ + name = "Arrivals" + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"eyj" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"eyk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"eym" = ( +/obj/structure/girder, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"eyP" = ( +/turf/open/misc/ice/coldroom, +/area/station/service/kitchen/coldroom) +"eyR" = ( +/obj/machinery/processor/slime, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"ezf" = ( +/obj/machinery/door/airlock{ + name = "Private Restroom" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/iron/freezer, +/area/station/medical/break_room) +"ezl" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"ezq" = ( +/obj/structure/table, +/obj/item/stamp, +/obj/item/poster/random_official, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ezs" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/red/anticorner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 4 + }, +/area/station/security/office) +"ezu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "viroview" + }, +/turf/open/floor/plating, +/area/station/medical/virology) +"ezJ" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/glass/reinforced, +/area/station/science/ordnance/office) +"ezK" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ezN" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"eAb" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/item/toy/sword, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"eAg" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/closed/wall, +/area/station/security/prison/toilet) +"eAh" = ( +/obj/machinery/power/smes, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"eAj" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"eAk" = ( +/obj/structure/bookcase{ + name = "Holy Bookcase" + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/button/door/directional/west{ + id = "lower_chapel_shutters"; + name = "Graveyard Shutters"; + pixel_y = -8 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"eAu" = ( +/obj/structure/flora/grass/green/style_2, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eAw" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eAx" = ( +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"eAQ" = ( +/obj/structure/rack, +/obj/item/storage/box/lights/mixed{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/storage/box/lights/tubes, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"eAW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/sign/warning/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"eBd" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"eBe" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"eBg" = ( +/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 = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"eBz" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eBB" = ( +/obj/machinery/biogenerator, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"eBI" = ( +/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/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"eBV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/security/checkpoint/engineering) +"eCg" = ( +/obj/structure/tank_holder/oxygen, +/obj/effect/decal/cleanable/wrapping, +/obj/structure/sign/poster/official/safety_internals/directional/north, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"eCn" = ( +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"eCp" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"eCq" = ( +/obj/structure/chair/plastic{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/splatter, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"eCt" = ( +/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/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"eCD" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Prison Common Room" + }, +/obj/machinery/door/firedoor, +/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/dark, +/area/station/security/prison/work) +"eCE" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"eCR" = ( +/obj/structure/no_effect_signpost{ + desc = "Now, where to go from here? That's a timeless question." + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"eCT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"eDc" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/suit_storage_unit/medical, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"eDg" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/item/radio/intercom/prison/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) +"eDh" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "teledoor"; + name = "MiniSat Teleport Access" + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"eDj" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"eDq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/visit) +"eDs" = ( +/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/wood, +/area/station/hallway/secondary/service) +"eDC" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"eDH" = ( +/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/blue/filled/warning{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"eDJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Mix to Space" + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eDM" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Head of Security" + }, +/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/hos, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/smooth_large, +/area/station/command/heads_quarters/hos) +"eEO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"eEY" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"eFd" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage/gas) +"eFh" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/cigarette_pack, +/obj/item/lighter/greyscale{ + pixel_x = 4; + pixel_y = 2 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"eFn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"eFt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"eFu" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/sign/warning/gas_mask/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"eFG" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/flag/nanotrasen/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness) +"eFH" = ( +/obj/structure/flora/rock/icy/style_random, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"eFO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eFS" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Mech Bay Maintenance" + }, +/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/robotics, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"eFW" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/wood, +/area/station/commons/dorms) +"eGg" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/item/seeds/watermelon, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/station/maintenance/starboard/fore) +"eGr" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"eGs" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"eGw" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"eGy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"eGA" = ( +/obj/machinery/computer/prisoner/management{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"eGB" = ( +/obj/effect/spawner/random/entertainment/arcade, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/eighties, +/area/station/commons/lounge) +"eGK" = ( +/obj/structure/closet, +/obj/effect/spawner/random/entertainment/drugs, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"eGM" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"eGN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"eGV" = ( +/obj/effect/spawner/random/lavaland_mob/raptor, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"eGW" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"eHb" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 2 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/mail_sorting/service/dormitories, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/fitness) +"eHe" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/medical/central) +"eHg" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"eHj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/item/clothing/under/costume/jabroni, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"eHo" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/shower/directional/north, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"eHC" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eHT" = ( +/obj/structure/cable, +/obj/effect/spawner/random/structure/steam_vent, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"eHV" = ( +/obj/structure/plasticflaps/opaque{ + dir = 4 + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Research Division" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"eHX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/public/glass{ + dir = 4; + name = "Arrivals Dock" + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"eHZ" = ( +/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/medical/treatment_center) +"eId" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"eIg" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/sign/poster/official/here_for_your_safety/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"eIk" = ( +/obj/structure/filingcabinet, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/service/library) +"eIv" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"eIC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"eII" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/dropper, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"eIR" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"eIU" = ( +/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/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"eJe" = ( +/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/hallway/primary/central) +"eJf" = ( +/obj/structure/lattice, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"eJx" = ( +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"eJz" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L12" + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"eJI" = ( +/obj/structure/closet/emcloset, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"eJK" = ( +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eJU" = ( +/obj/machinery/door/airlock/security{ + name = "Permanent Cell 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/safe) +"eJV" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/mine/eva) +"eJX" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/cigarette_pack, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"eKb" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/aft) +"eKl" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/destructive_scanner, +/turf/open/floor/iron/textured_large, +/area/station/hallway/primary/starboard) +"eKI" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/sign/departments/medbay/alt/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"eKJ" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/iron, +/area/station/commons/dorms) +"eKN" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon/keep_below, +/area/station/maintenance/port/lesser) +"eKW" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"eLl" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/chapel) +"eLm" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"eLn" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/cmo) +"eLr" = ( +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/science/research) +"eLs" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"eLB" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Service - Gambling Lounge" + }, +/obj/machinery/computer/slot_machine{ + name = "two-armed bandit" + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"eLM" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"eLN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4, +/obj/machinery/meter/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"eLS" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/statue/snow/snowman{ + name = "Cecil"; + pixel_x = -2; + pixel_y = -3 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/mine/mechbay) +"eMa" = ( +/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, +/area/station/cargo/storage) +"eMn" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/secure_area/directional/north{ + desc = "A warning sign which reads 'SERVER ROOM'."; + name = "SERVER ROOM" + }, +/turf/open/floor/iron/white, +/area/station/maintenance/aft/greater) +"eMr" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"eME" = ( +/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/box/red/corners{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"eMG" = ( +/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 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"eMH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/assistant, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"eMK" = ( +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/stripes/line, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/service) +"eMT" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"eNh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"eNl" = ( +/obj/structure/chair/comfy/black, +/obj/effect/landmark/start/head_of_security, +/obj/structure/cable, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) +"eNm" = ( +/obj/structure/fermenting_barrel{ + desc = "A dried up barrel of what appeared to once have been full of wine."; + name = "cask" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"eNC" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/item/kirbyplants/random, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"eND" = ( +/obj/effect/spawner/structure/window/reinforced, +/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/visit) +"eNE" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"eNH" = ( +/obj/machinery/door/airlock/command{ + name = "Chief Medical Officer" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"eNK" = ( +/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/white, +/area/station/science/research) +"eOl" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/commons/fitness) +"eOm" = ( +/obj/structure/sign/poster/official/no_erp/directional/west, +/turf/closed/wall, +/area/station/maintenance/starboard/fore) +"eOw" = ( +/obj/machinery/computer/shuttle/labor, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"eOx" = ( +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Research Division"; + name = "Research Division Fax Machine"; + pixel_x = 1 + }, +/obj/structure/sign/departments/science/directional/south, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"eOB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"eOJ" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/stairs/medium, +/area/station/cargo/storage) +"ePi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"ePj" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/coin{ + pixel_x = -7 + }, +/obj/effect/spawner/random/clothing/bowler_or_that, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"ePm" = ( +/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/hallway/secondary/exit/departure_lounge) +"ePn" = ( +/obj/structure/closet, +/obj/item/clothing/under/suit/black/skirt, +/obj/item/clothing/under/suit/black, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"ePr" = ( +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) +"ePu" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/science/explab) +"ePB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"ePP" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway Center West" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ePR" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ePT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/sign/warning/chem_diamond/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"ePV" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/structure/sign/warning/pods/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"eQz" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"eQA" = ( +/obj/item/kitchen/rollingpin, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"eQF" = ( +/obj/structure/railing/corner, +/obj/structure/sign/departments/holy/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/service/chapel) +"eQH" = ( +/obj/structure/sign/departments/medbay/alt/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"eQT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"eQX" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"eRf" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eRh" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"eRp" = ( +/obj/structure/bed{ + dir = 1; + pixel_x = -2 + }, +/obj/machinery/flasher/directional/north{ + id = "Cell 1" + }, +/turf/open/floor/iron/smooth, +/area/station/security/brig) +"eRw" = ( +/obj/effect/landmark/event_spawn, +/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/hallway/primary/port) +"eRx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/maintenance/glass, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"eRE" = ( +/obj/structure/fence/post{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eRH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) +"eRO" = ( +/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/showroomfloor, +/area/station/security/warden) +"eRZ" = ( +/obj/structure/table, +/obj/item/papercutter{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"eSj" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/quantum_server, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/cargo/bitrunning/den) +"eSn" = ( +/obj/structure/chair/office, +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/service/library) +"eSq" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"eSr" = ( +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"eSA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/dark, +/area/mine/eva) +"eSC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/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/service/hydroponics) +"eSJ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"eSY" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"eTa" = ( +/obj/effect/spawner/random/structure/tank_holder, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"eTb" = ( +/obj/structure/fireplace, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/station/security/prison/safe) +"eTe" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/hallway/secondary/entry) +"eTi" = ( +/obj/machinery/telecomms/broadcaster/preset_left, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"eTv" = ( +/obj/machinery/door/airlock/security{ + name = "Permanent Cell 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/safe) +"eTx" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/engineering/main) +"eTC" = ( +/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/commons/locker) +"eTM" = ( +/obj/effect/turf_decal/trimline/blue/corner, +/obj/effect/turf_decal/trimline/blue/corner, +/obj/machinery/holopad, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/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/medical/medbay/lobby) +"eTP" = ( +/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, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/fore) +"eTY" = ( +/obj/machinery/recharge_station, +/obj/effect/turf_decal/stripes/box, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/sign/warning/no_smoking/circle/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"eUf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"eUi" = ( +/obj/item/seeds/apple, +/obj/item/seeds/banana, +/obj/item/seeds/cocoapod, +/obj/item/seeds/grape, +/obj/item/seeds/orange, +/obj/item/seeds/sugarcane, +/obj/item/seeds/wheat, +/obj/item/seeds/watermelon, +/obj/structure/table/glass, +/obj/item/seeds/tower, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"eUm" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/service/hydroponics) +"eUx" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/table, +/obj/item/paper_bin/construction, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/commons/storage/art) +"eUz" = ( +/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{ + pixel_x = 32 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/service/chapel) +"eUA" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/green/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"eUB" = ( +/obj/structure/table, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/clothing/suit/hooded/wintercoat{ + pixel_x = -5 + }, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_x = 5 + }, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_x = 5 + }, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_x = 5 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"eUI" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"eUK" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/plasteel/twenty{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"eUL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"eUN" = ( +/obj/structure/closet/secure_closet/medical2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/button/door/directional/south{ + id = "surgery"; + name = "Surgery Shutter Control" + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"eUO" = ( +/mob/living/simple_animal/hostile/asteroid/polarbear{ + move_force = 999; + name = "Dewey" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eUU" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eUW" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/landmark/start/janitor, +/turf/open/floor/iron, +/area/station/service/janitor) +"eUY" = ( +/obj/effect/gibspawner/human, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"eVa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva/lower) +"eVl" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + id_tag = "cargooffice"; + name = "Cargo Office" + }, +/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/mapping_helpers/airlock/access/all/supply/shipping, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"eVp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"eVw" = ( +/obj/effect/spawner/random/trash, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eVC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"eVI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"eVO" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"eVV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/iron, +/area/station/engineering/storage) +"eVY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/science/explab) +"eVZ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"eWb" = ( +/obj/structure/table, +/obj/item/aicard, +/obj/item/ai_module/reset, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"eWc" = ( +/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 = 10 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"eWh" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 2"; + req_access = list("xenobiology") + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"eWj" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"eWB" = ( +/obj/structure/rack, +/obj/item/electropack, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"eWF" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals Escape Pod 2" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"eWQ" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"eWT" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"eWV" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"eXa" = ( +/obj/machinery/atmospherics/components/trinary/filter{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/station/maintenance/port/fore) +"eXc" = ( +/obj/effect/spawner/random/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"eXf" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Fitness Room North" + }, +/obj/structure/closet/masks, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/flag/ssc/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness) +"eXD" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/holosign/barrier/atmos/sturdy, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "minecraft_shutter"; + name = "Cart Shutters" + }, +/turf/open/floor/iron/textured, +/area/station/service/hydroponics) +"eXH" = ( +/turf/closed/wall/r_wall, +/area/station/medical/chemistry) +"eYe" = ( +/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/hallway/primary/central/fore) +"eYm" = ( +/obj/structure/table, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) +"eYn" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"eYx" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eYz" = ( +/obj/machinery/mineral/processing_unit/gulag{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/mine/laborcamp) +"eYC" = ( +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) +"eYF" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/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/freezer, +/area/station/commons/toilet) +"eYH" = ( +/obj/machinery/power/smes/super/full, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"eYK" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals External Access" + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/textured, +/area/station/hallway/secondary/entry) +"eYR" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/structure/table, +/obj/item/folder/white{ + pixel_y = 4 + }, +/obj/item/pen/red, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"eYS" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"eYT" = ( +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 11; + pixel_y = 2 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"eYX" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 1 + }, +/obj/effect/landmark/start/botanist, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"eYY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eZc" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"eZi" = ( +/obj/machinery/drone_dispenser, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"eZp" = ( +/obj/machinery/space_heater, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"eZu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"eZz" = ( +/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"eZA" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 4 + }, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"eZK" = ( +/obj/machinery/recycler{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/obj/structure/sign/warning/secure_area/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"eZL" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"eZO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office, +/turf/open/floor/iron, +/area/station/engineering/main) +"eZP" = ( +/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/engineering/main) +"eZW" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"fab" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fad" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - HoS Office" + }, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 16; + start_on = 0 + }, +/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) +"faf" = ( +/obj/structure/tank_holder/extinguisher, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"faq" = ( +/obj/machinery/newscaster/directional/west, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"faG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"faJ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"faL" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"faV" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/mine/laborcamp/security) +"faW" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"fbl" = ( +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"fbw" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Bridge Conference Room" + }, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"fbA" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/science/cytology) +"fbF" = ( +/obj/effect/landmark/navigate_destination/dockarrival, +/obj/effect/turf_decal/bot_white, +/obj/structure/plaque/static_plaque/golden/commission/icebox, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"fbM" = ( +/obj/structure/chair/stool/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"fbY" = ( +/obj/effect/spawner/random/trash/hobo_squat, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"fca" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"fcg" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/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/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"fcu" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/chair, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"fcA" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/hydroponics/constructable, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"fcI" = ( +/obj/effect/decal/cleanable/oil, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fcN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fcP" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fcQ" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ + dir = 8 + }, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"fcY" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"fdb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/structure/fence{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fde" = ( +/obj/structure/table, +/obj/item/paper{ + pixel_x = 4; + pixel_y = 2 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"fdj" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Escape"; + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/exit/departure_lounge) +"fdm" = ( +/obj/structure/falsewall, +/turf/open/floor/iron, +/area/station/security/prison/safe) +"fdp" = ( +/turf/open/floor/iron, +/area/mine/eva/lower) +"fdy" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"fdF" = ( +/obj/structure/closet/secure_closet/chemical, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"fdG" = ( +/obj/structure/cable, +/turf/open/floor/plating/icemoon, +/area/station/security/execution/education) +"fdH" = ( +/obj/machinery/meter, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fdN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"fdV" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/item/bikehorn/rubberducky, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"fdX" = ( +/obj/item/toy/cards/deck{ + pixel_x = -9; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"fdY" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/turf/closed/wall, +/area/station/medical/cryo) +"fed" = ( +/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/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"fep" = ( +/obj/structure/no_effect_signpost, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"fez" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/obj/item/seeds/tomato, +/obj/item/seeds/onion, +/obj/item/seeds/garlic, +/obj/item/seeds/carrot, +/obj/item/seeds/ambrosia, +/obj/item/seeds/apple, +/turf/open/floor/iron, +/area/mine/laborcamp) +"feD" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"feJ" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/security/armory/upper) +"feQ" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"feU" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/stack/sheet/mineral/plasma, +/obj/machinery/light/directional/north, +/obj/machinery/button/door/directional/north{ + id = "pharmacy_shutters3"; + name = "Pharmacy Shutter Controls"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"ffe" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/aft/lesser) +"ffp" = ( +/obj/structure/bookcase{ + name = "Holy Bookcase" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"ffQ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/machinery/smartfridge/chemistry/virology/preloaded, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"ffZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"fgc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"fgo" = ( +/obj/effect/spawner/random/trash/mess, +/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/maintenance/port/greater) +"fgs" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"fgx" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"fgJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"fgN" = ( +/obj/structure/bonfire/prelit, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"fgQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination/eva, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) +"fgU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"fgV" = ( +/obj/structure/railing/wooden_fence{ + dir = 8 + }, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"fhb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/genetics) +"fhg" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Dormitory South" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/commons/dorms) +"fhu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) +"fhw" = ( +/obj/machinery/piratepad/civilian, +/obj/effect/turf_decal/loading_area, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"fhz" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"fhL" = ( +/obj/structure/sign/warning/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"fhU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"fhW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/maintenance/port/aft) +"fhX" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fij" = ( +/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/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"fil" = ( +/obj/structure/table/glass, +/obj/machinery/microwave/engineering/cell_included, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"fio" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"fiq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/closet/secure_closet/medical2, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"fiu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"fiv" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fiA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"fiD" = ( +/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/dark/textured_edge, +/area/station/security/prison) +"fiE" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L9" + }, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fiL" = ( +/turf/closed/wall/r_wall, +/area/station/security/evidence) +"fiN" = ( +/obj/structure/table/wood, +/obj/structure/secure_safe/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"fiO" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/service/janitor) +"fiS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"fiT" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/item/kirbyplants/random, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"fiU" = ( +/obj/machinery/door/poddoor/massdriver_ordnance, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"fiY" = ( +/obj/machinery/ntnet_relay, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"fja" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"fjg" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/trimline/blue, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"fjt" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 9"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio9"; + name = "Xenobio Pen 9 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"fjz" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"fjD" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/commons/storage/primary) +"fjF" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fjG" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"fjH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"fjN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) +"fjQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white, +/area/mine/living_quarters) +"fki" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/east, +/obj/machinery/newscaster/directional/north, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"fkj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fkk" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) +"fkt" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/icemoon, +/area/station/maintenance/port/lesser) +"fkw" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fkD" = ( +/obj/structure/chair/sofa/right/brown{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"fkF" = ( +/obj/item/weldingtool, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fkN" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"fkO" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Atmospherics Delivery"; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/loading_area, +/obj/effect/turf_decal/siding/yellow/corner, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"fkV" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Permabrig Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/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/safe) +"fkX" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/openspace, +/area/station/science/ordnance/office) +"fld" = ( +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"fle" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"flx" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=HOP"; + location = "CHE" + }, +/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, +/area/station/hallway/primary/central) +"flD" = ( +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"flH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"flI" = ( +/obj/machinery/vending/wardrobe/jani_wardrobe, +/turf/open/floor/iron, +/area/station/service/janitor) +"flK" = ( +/obj/effect/spawner/random/entertainment/arcade, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/eighties, +/area/station/commons/lounge) +"flW" = ( +/obj/machinery/atmospherics/components/tank/air, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"flZ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"fma" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"fmc" = ( +/turf/closed/wall, +/area/station/hallway/primary/aft) +"fmf" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"fmg" = ( +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"fmm" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/firealarm/directional/west, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"fmq" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 12; + height = 18; + name = "BoxStation emergency evac bay"; + shuttle_id = "emergency_home"; + width = 32 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fmr" = ( +/obj/effect/turf_decal/siding/yellow/end{ + dir = 4 + }, +/obj/machinery/plumbing/sender, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"fmA" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"fmU" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"fng" = ( +/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/hallway/primary/fore) +"fnj" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/deck, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"fnt" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"fnA" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fnC" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/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/hallway/secondary/entry) +"fnF" = ( +/obj/structure/chair/sofa/middle/brown, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"fnS" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"fnW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"fog" = ( +/obj/machinery/rnd/production/techfab/department/medical, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"foI" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/item/storage/box/matches, +/obj/effect/spawner/random/entertainment/cigar, +/turf/open/floor/iron, +/area/station/service/bar) +"foO" = ( +/turf/open/floor/carpet, +/area/station/security/prison/rec) +"foT" = ( +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"foW" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"fpa" = ( +/obj/structure/closet/wardrobe/pjs, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/commons/dorms) +"fps" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison/safe) +"fpA" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/turf/open/floor/grass, +/area/station/maintenance/starboard/fore) +"fpD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fpJ" = ( +/obj/structure/fireaxecabinet/directional/west, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"fqv" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fqA" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"fqG" = ( +/obj/structure/fluff/fokoff_sign, +/obj/effect/mapping_helpers/no_atoms_ontop, +/obj/structure/sign/departments/security/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"fqH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"fqJ" = ( +/obj/effect/turf_decal/trimline/white/filled/warning, +/turf/open/genturf, +/area/icemoon/underground/unexplored/rivers/deep) +"fqM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/east, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"fqQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"fqR" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Starboard Primary Hallway West" + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fqW" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = 1 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"frd" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/commons/locker) +"fro" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"frq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Antechamber" + }, +/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/cyclelink_helper_multi{ + cycle_id = "ai-passthrough" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"frt" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"frz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/item/chair, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"frD" = ( +/obj/machinery/air_sensor/oxygen_tank, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"frE" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"frF" = ( +/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 = 5 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/lesser) +"frN" = ( +/obj/machinery/power/shieldwallgen, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/command/teleporter) +"frS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/evidence) +"fsj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"fsm" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fsp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"fsv" = ( +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"fsx" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lantern/on, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"fsz" = ( +/obj/structure/table/glass, +/obj/machinery/vending/wallmed/directional/north, +/obj/item/book/manual/wiki/surgery{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/surgery_tray/full, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Surgery A"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"fsF" = ( +/obj/effect/spawner/structure/window, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"fsJ" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fsK" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/execution/education) +"fsQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/engineering/atmos) +"fsS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"fsZ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ftk" = ( +/obj/item/chair/wood, +/obj/item/toy/plush/moth{ + name = "Ariadne" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/flag/nanotrasen/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ftA" = ( +/obj/structure/table, +/obj/item/storage/box/prisoner, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"ftJ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "gene_desk_shutters"; + name = "Genetics Shutters" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east{ + name = "Genetics Desk"; + req_access = list("genetics") + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"ftN" = ( +/obj/machinery/rnd/destructive_analyzer, +/turf/open/floor/iron/checker, +/area/station/science/lab) +"ftS" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"ftY" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fuc" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/landmark/navigate_destination/hydro, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fue" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 14 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/book/manual/wiki/security_space_law{ + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"fuf" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fum" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"fuD" = ( +/obj/structure/tank_holder/extinguisher, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"fuH" = ( +/turf/closed/mineral/snowmountain/coldroom, +/area/icemoon/underground/explored) +"fuM" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CHE"; + location = "AIE" + }, +/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/hallway/primary/central) +"fuX" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"fuY" = ( +/obj/structure/disposalpipe/segment, +/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/hallway/primary/starboard) +"fuZ" = ( +/obj/structure/railing, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fvj" = ( +/obj/structure/rack, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = 3 + }, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = -3 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay Drone Bay" + }, +/turf/open/floor/iron/dark, +/area/station/cargo/drone_bay) +"fvk" = ( +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) +"fvx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"fvA" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Engineering Lobby"; + name = "Engineering Lobby Fax Machine" + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"fvK" = ( +/obj/structure/rack, +/obj/item/storage/box/petridish, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/grimy, +/area/station/security/prison/work) +"fvO" = ( +/obj/structure/closet/secure_closet/brig, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"fvR" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/dark/textured, +/area/station/maintenance/disposal/incinerator) +"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" + }, +/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/hallway/primary/central) +"fwq" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Port to Filter" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fwx" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fwB" = ( +/turf/closed/mineral/snowmountain/coldroom, +/area/station/service/kitchen/coldroom) +"fwC" = ( +/obj/structure/railing/wooden_fence{ + dir = 6 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"fwD" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"fwI" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"fwL" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"fwM" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/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/hallway/secondary/entry) +"fwO" = ( +/obj/machinery/space_heater, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"fwQ" = ( +/obj/structure/secure_safe/caps_spare, +/obj/structure/table/reinforced, +/turf/open/floor/iron, +/area/station/command/bridge) +"fwS" = ( +/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 = 2 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"fxd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"fxl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"fxn" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/machinery/newscaster/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security Post - Cargo" + }, +/obj/machinery/computer/security/mining{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"fxR" = ( +/obj/machinery/telecomms/hub/preset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"fxT" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fxV" = ( +/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 = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fxY" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/mine/production) +"fyc" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"fyr" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "AI Core" + }, +/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/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"fyw" = ( +/obj/machinery/telecomms/server/presets/service, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"fyI" = ( +/turf/closed/wall/mineral/wood/nonmetal, +/area/icemoon/underground/explored) +"fyQ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fyR" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"fyZ" = ( +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fza" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fzo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"fzv" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"fzy" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fzD" = ( +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom/directional/east, +/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, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"fzG" = ( +/obj/structure/closet{ + name = "evidence closet 5" + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/evidence) +"fzJ" = ( +/obj/structure/barricade/wooden{ + name = "wooden barricade (CLOSED)" + }, +/obj/structure/girder, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"fzK" = ( +/turf/closed/wall, +/area/station/service/bar) +"fzO" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/airlock/maintenance{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"fzQ" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"fzU" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/storage/tech) +"fAF" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/boxing/green, +/obj/item/reagent_containers/cup/glass/waterbottle, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fAH" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"fAV" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/security/prison/work) +"fAW" = ( +/obj/structure/fence/door/opened, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fBc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/yellow/line, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/window{ + dir = 8; + id = "drone_bay"; + name = "Drone Bay Shutters" + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"fBs" = ( +/obj/structure/table, +/obj/item/paper, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/west{ + c_tag = "Labor Camp Cell 3"; + network = list("labor") + }, +/obj/machinery/flasher/directional/west{ + id = "GulagCell 3" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"fBw" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"fBy" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/closet/l3closet/virology, +/obj/machinery/camera/directional/north{ + network = list("ss13","medbay"); + c_tag = "Virology Airlock" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"fBF" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"fBJ" = ( +/obj/machinery/modular_computer/preset/civilian, +/obj/machinery/requests_console/directional/north{ + department = "Ordnance"; + name = "Ordnance Lab Requests Console" + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"fBM" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"fBQ" = ( +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"fBR" = ( +/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/medical/medbay/central) +"fCm" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/closed/mineral/random/snow, +/area/icemoon/underground/explored) +"fCA" = ( +/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/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"fCM" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/medbay/lobby) +"fCR" = ( +/obj/structure/fence/end{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fCW" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/security/processing) +"fDc" = ( +/obj/structure/chair/office, +/obj/effect/landmark/start/warden, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"fDe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/end{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"fDf" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/box/red/corners{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"fDl" = ( +/obj/machinery/light/small/built/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"fDn" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"fDI" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"fDJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/janitor) +"fDP" = ( +/obj/structure/cable, +/obj/item/radio/intercom/prison/directional/north, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"fEd" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/decal/cleanable/dirt, +/obj/item/stock_parts/capacitor, +/obj/structure/sign/poster/random/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"fEe" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/effect/landmark/navigate_destination, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/commons/dorms) +"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) +"fEL" = ( +/obj/machinery/holopad, +/obj/machinery/duct, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/engineering/lobby) +"fER" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"fEV" = ( +/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/siding/wood{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance/glass{ + name = "Expedition Planning Room" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/stone, +/area/mine/eva/lower) +"fEX" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"fEZ" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/dorms) +"fFb" = ( +/obj/effect/spawner/random/trash/mess, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fFe" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"fFi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/engineering/transit_tube) +"fFn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"fFx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"fFy" = ( +/obj/machinery/space_heater, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fFC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"fFD" = ( +/obj/structure/railing, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/cable, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"fFQ" = ( +/obj/structure/tank_dispenser, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"fGn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"fGq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"fGI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"fGM" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +"fGQ" = ( +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/hangover, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fGY" = ( +/obj/machinery/smartfridge/organ, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "surgery"; + name = "Surgery Shutter" + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"fHg" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/iron/dark/side, +/area/station/security/prison) +"fHo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"fHK" = ( +/obj/machinery/holopad, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"fHO" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"fHQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/dark_green/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"fHS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"fHV" = ( +/obj/machinery/mineral/stacking_unit_console{ + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Disposals" + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"fHZ" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"fIs" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"fIt" = ( +/turf/closed/wall/r_wall, +/area/icemoon/underground/explored) +"fIx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"fIK" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"fJe" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"fJl" = ( +/obj/machinery/computer/accounting{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"fJm" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/science/ordnance/office) +"fJA" = ( +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/medical/morgue) +"fJF" = ( +/obj/structure/table, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/mmi, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"fJL" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ + dir = 1 + }, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"fJS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"fJZ" = ( +/obj/effect/turf_decal/tile/red, +/obj/structure/railing/corner, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"fKe" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering West" + }, +/obj/structure/disposalpipe/segment, +/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/tile/yellow{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/main) +"fKf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"fKi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/bed/medical/emergency, +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"fKr" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"fKv" = ( +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"fKw" = ( +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"fKF" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L7" + }, +/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/hallway/primary/central) +"fKI" = ( +/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, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fKO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fKR" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"fKV" = ( +/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/wood, +/area/station/hallway/secondary/service) +"fKW" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Security - Upper Permabrig Hallway North"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/prison) +"fKZ" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/kitchen) +"fLb" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) +"fLe" = ( +/turf/open/floor/plating, +/area/station/engineering/lobby) +"fLh" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"fLl" = ( +/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/side{ + dir = 9 + }, +/area/station/science/research) +"fLq" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"fLs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/ai_monitored/security/armory/upper) +"fLu" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"fLx" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/service/chapel) +"fLC" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"fLK" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"fLP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fLQ" = ( +/obj/machinery/computer/operating{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/button/door/directional/north{ + id = "surgery"; + name = "Surgery Shutter Control" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"fLS" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"fLT" = ( +/obj/machinery/door/airlock{ + name = "Restroom" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"fLY" = ( +/obj/structure/table, +/obj/item/stock_parts/micro_laser{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 2 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/drone_bay) +"fMc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fMt" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/engine, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/engine_smes) +"fMC" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/dice{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/effect/spawner/random/entertainment/money_small, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"fME" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fMZ" = ( +/obj/structure/cable, +/obj/item/wrench, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"fNa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fNp" = ( +/obj/structure/girder, +/turf/open/floor/plating/snowed/icemoon, +/area/mine/eva/lower) +"fNr" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/sign/warning/no_smoking/directional/north, +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering SMES" + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/engine_smes) +"fNv" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fNB" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"fNK" = ( +/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/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/port) +"fNN" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"fNZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchencounter"; + name = "Kitchen Counter Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"fOl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/science/explab) +"fOq" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fOs" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Quartermaster's Office" + }, +/obj/structure/table, +/obj/item/coin/silver, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/clipboard, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"fOH" = ( +/obj/structure/fence/post{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"fOR" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/airalarm/directional/east, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/lab) +"fOS" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"fOU" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fPb" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/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/medical/medbay/central) +"fPc" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fPv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"fPA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"fPB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"fPI" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/kirbyplants/organic/plant10, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fPP" = ( +/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, +/area/station/hallway/primary/central) +"fPX" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock" + }, +/obj/effect/landmark/navigate_destination/dockesc, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"fPY" = ( +/obj/structure/table/reinforced, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/gun/energy/laser/carbine/practice{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/gun/energy/laser/practice, +/obj/item/clothing/ears/earmuffs, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"fPZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"fQc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fQe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Service - Electrical Maintenace Lower" + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/lesser) +"fQk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"fQu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) +"fQz" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/service/library) +"fQG" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/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/dark/side{ + dir = 1 + }, +/area/station/security/prison) +"fRb" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fRq" = ( +/obj/structure/closet/boxinggloves, +/obj/machinery/light/directional/north, +/obj/item/clothing/shoes/jackboots, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/clock/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness) +"fRv" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"fRz" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"fSi" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/sign/nanotrasen{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"fSj" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fSm" = ( +/obj/structure/fence/door/opened{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"fSs" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"fSv" = ( +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"fSB" = ( +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"fSP" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/table, +/obj/item/clothing/head/utility/welding{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/clothing/head/utility/welding{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/clothing/head/utility/welding, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"fTb" = ( +/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/mess) +"fTi" = ( +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"fTo" = ( +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/item/knife/plastic, +/obj/structure/table/reinforced, +/obj/item/radio/intercom/prison/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"fTq" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"fTx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fTB" = ( +/obj/machinery/power/turbine/core_rotor{ + dir = 8; + mapping_id = "main_turbine" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"fTC" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"fTF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"fTG" = ( +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"fTH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"fTR" = ( +/obj/machinery/light/directional/north, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/station/hallway/primary/central) +"fTT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) +"fTW" = ( +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"fTX" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"fUc" = ( +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"fUh" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fUj" = ( +/obj/structure/bed/medical/emergency, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) +"fUr" = ( +/obj/machinery/airalarm/directional/south, +/obj/structure/closet/emcloset, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"fUL" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"fUM" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/research_director, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"fUR" = ( +/turf/closed/wall, +/area/station/hallway/secondary/entry) +"fUW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"fVf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"fVm" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chemical Storage" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fVo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"fVy" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"fVD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/engineering{ + name = "Utilities Room" + }, +/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/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fVE" = ( +/obj/machinery/power/turbine/turbine_outlet{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"fVJ" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/item/book/manual/wiki/cooking_to_serve_man, +/obj/structure/table/reinforced, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"fVK" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/east{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters2"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/iron, +/area/station/medical/pharmacy) +"fVS" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron, +/area/station/service/janitor) +"fVU" = ( +/obj/structure/chair/stool/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"fWa" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"fWe" = ( +/obj/machinery/hydroponics/soil, +/obj/item/plant_analyzer, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"fWo" = ( +/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/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp) +"fWw" = ( +/obj/structure/railing/corner, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"fWL" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -11; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"fWN" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"fWO" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"fWQ" = ( +/obj/machinery/flasher/directional/north{ + id = "Cell 2" + }, +/obj/structure/bed{ + dir = 1; + pixel_x = -2 + }, +/turf/open/floor/iron/smooth, +/area/station/security/brig) +"fWS" = ( +/obj/structure/mineral_door/wood, +/obj/structure/barricade/wooden/crude/snow, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"fWX" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"fXb" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Captain's Quarters" + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"fXr" = ( +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/science/research) +"fXu" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"fXw" = ( +/obj/machinery/chem_master/condimaster{ + desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; + name = "HoochMaster Deluxe" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) +"fXy" = ( +/obj/structure/cable, +/obj/machinery/computer/prisoner/management, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"fXL" = ( +/obj/structure/sign/poster/official/here_for_your_safety/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"fXO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"fXQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fXX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fYi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"fYz" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"fYE" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/modular_computer/preset/id{ + dir = 1 + }, +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"fYH" = ( +/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/mine/eva/lower) +"fYJ" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) +"fYO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"fYQ" = ( +/obj/machinery/light/small/directional/west, +/mob/living/basic/mouse/brown/tom, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"fYS" = ( +/turf/closed/wall, +/area/station/commons/storage/primary) +"fYT" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"fYW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"fYY" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"fZb" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "miner-passthrough" + }, +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Dock" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/plating, +/area/station/cargo/miningdock) +"fZg" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/command/teleporter) +"fZq" = ( +/obj/structure/curtain/cloth, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"fZy" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/science/ordnance/office) +"fZA" = ( +/obj/machinery/button/door/directional/west{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"fZH" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck{ + pixel_y = 13; + pixel_x = 6 + }, +/obj/effect/spawner/random/entertainment/cigarette, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"fZK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/structure/sign/clock/directional/north, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"fZV" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"gad" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/table/reinforced, +/obj/item/crowbar, +/obj/item/pickaxe/emergency{ + pixel_y = 3 + }, +/obj/item/clothing/suit/hooded/wintercoat/cargo{ + pixel_y = 3 + }, +/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic{ + pixel_x = 3; + pixel_y = -1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"gak" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"gam" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + id_tag = "cargooffice"; + name = "Cargo Office" + }, +/obj/effect/landmark/navigate_destination, +/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/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/turf/open/floor/iron, +/area/station/cargo/office) +"gaq" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/coffee, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/cargo/storage) +"gas" = ( +/obj/structure/table, +/obj/machinery/camera/directional/east{ + c_tag = "Ordnance Office"; + network = list("ss13","rd") + }, +/obj/structure/disposalpipe/segment, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"gav" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) +"gax" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"gaA" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored/graveyard) +"gaC" = ( +/obj/structure/closet/lasertag/red, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness) +"gaF" = ( +/obj/item/toy/snowball{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/machinery/light/small/directional/west, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"gaS" = ( +/obj/item/hot_potato/harmless/toy, +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/eighties/red, +/area/station/security/prison/safe) +"gaT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/modular_computer/preset/id{ + dir = 8 + }, +/turf/open/floor/iron/smooth_corner{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"gbd" = ( +/obj/item/radio/off{ + pixel_y = 6 + }, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/radio/off{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/radio/off, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"gbh" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"gbu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"gbv" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"gbJ" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Armory" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"gbK" = ( +/obj/structure/rack, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/head/utility/beekeeper_head, +/obj/item/melee/flyswatter, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Botany Lower Entrance" + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"gbL" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/sign/warning/directional/north, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"gbP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"gck" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + name = "Vestibule Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/security/processing) +"gcu" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"gcP" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chair/stool/bar/directional/east, +/obj/structure/disposalpipe/segment, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"gcT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gcU" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"gcV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"gcZ" = ( +/obj/structure/table, +/obj/item/storage/bag/tray, +/obj/item/food/piedough, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"gdc" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gdv" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gdz" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/window/right/directional/south{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access = list("medical") + }, +/obj/structure/table/glass, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, +/obj/effect/turf_decal/tile/blue/full, +/obj/item/mod/module/signlang_radio, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) +"gdC" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/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/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"gdN" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"gdP" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"gdY" = ( +/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/green/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"gea" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gec" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/table_or_rack, +/obj/effect/spawner/random/engineering/toolbox, +/obj/effect/spawner/random/engineering/toolbox, +/obj/effect/turf_decal/siding/wood, +/obj/effect/spawner/random/trash/janitor_supplies, +/obj/structure/sign/poster/contraband/the_griffin/directional/north, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"gee" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"geg" = ( +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/science/explab) +"gel" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster/directional/south, +/obj/item/radio/intercom/directional/west, +/obj/item/flashlight/lamp/green{ + pixel_y = 5 + }, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"gem" = ( +/obj/structure/railing, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"geq" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron, +/area/station/commons/locker) +"get" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/supply{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"geJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/maintenance/starboard/aft) +"geV" = ( +/obj/structure/ladder, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/lobby) +"geW" = ( +/obj/structure/cable, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"geZ" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"gfb" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/central/greater) +"gff" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/camera/directional/north{ + c_tag = "Virology Module North"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gfo" = ( +/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/siding/yellow, +/turf/open/floor/iron, +/area/station/engineering/storage) +"gfw" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/table, +/turf/open/floor/plating, +/area/mine/eva/lower) +"gfC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/light_construct/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gfF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/stool/directional/south, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/commons/storage/art) +"gga" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/spawner/random/trash/hobo_squat, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"gge" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"ggn" = ( +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Maintenance" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"ggz" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south{ + frequency = 1453; + name = "Kitchen Intercom" + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ggG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"ggR" = ( +/obj/machinery/computer/teleporter{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"ggV" = ( +/obj/machinery/conveyor{ + id = "gulag" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/mine/laborcamp) +"ghb" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ghl" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ghx" = ( +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"ghz" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"ghD" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/vending/wardrobe/hydro_wardrobe, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ghE" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/directional/west{ + c_tag = "Security - Lower Hallway South" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"ghJ" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/obj/effect/landmark/start/captain, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"ghN" = ( +/obj/structure/sink/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"ghY" = ( +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"gib" = ( +/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/trimline/blue/filled/line{ + dir = 6 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay South"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"gif" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/plastic, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"giv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"giN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/line, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/workout) +"giO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"giP" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"giQ" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"giV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/mine/eva/lower) +"gjc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"gjg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/medkit/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/medkit/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/medkit/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"gjq" = ( +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"gjI" = ( +/obj/effect/spawner/random/structure/tank_holder, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"gjM" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"gjP" = ( +/obj/structure/table, +/obj/item/clothing/gloves/cargo_gauntlet, +/obj/item/clothing/gloves/cargo_gauntlet, +/obj/item/clothing/gloves/cargo_gauntlet, +/turf/open/floor/iron, +/area/station/cargo/storage) +"gjS" = ( +/obj/structure/chair{ + dir = 8; + name = "Judge" + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/wood, +/area/station/security/courtroom) +"gjW" = ( +/obj/structure/chair, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"gjZ" = ( +/obj/machinery/door/airlock/security{ + name = "Security Checkpoint" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"gka" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/room) +"gko" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "mining_internal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/bouldertech/refinery/smelter, +/turf/open/floor/iron, +/area/mine/production) +"gks" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"gky" = ( +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"gkK" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + dir = 4; + name = "Supply multi deck pipe adapter" + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + color = "#ff0000"; + dir = 4; + name = "Scrubbers multi deck pipe adapter" + }, +/obj/effect/turf_decal/stripes/box, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"gkN" = ( +/obj/machinery/vending/autodrobe/all_access, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"gkP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/maintenance/starboard/fore) +"gkT" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"gkX" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"gkY" = ( +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "N2 To Pure" + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gkZ" = ( +/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/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"glc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"glh" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/port/aft) +"glk" = ( +/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/catwalk_floor/iron_smooth, +/area/station/maintenance/department/chapel) +"gls" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/turf_decal/tile/dark{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"glz" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/starboard) +"glC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/evidence) +"glI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"glP" = ( +/obj/structure/railing/corner, +/obj/item/storage/belt/utility, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light/directional/north, +/obj/item/clothing/glasses/welding, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"glS" = ( +/obj/machinery/camera/directional/south{ + c_tag = "MiniSat Pod Access"; + network = list("minisat"); + start_active = 1 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"glX" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gmb" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1 + }, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"gmf" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gmJ" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Infiltrate/Filter" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gmL" = ( +/obj/structure/table, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"gmO" = ( +/obj/structure/frame/machine, +/obj/item/circuitboard/machine/chem_master, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"gmR" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/structure/reagent_dispensers/fueltank/large, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"gmW" = ( +/turf/closed/wall, +/area/station/commons/fitness) +"gnb" = ( +/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/blue/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"gnh" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/cargo) +"gnj" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "atmos-entrance" + }, +/obj/effect/turf_decal/siding/yellow/corner, +/obj/machinery/duct, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics" + }, +/obj/machinery/door/firedoor/heavy, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, +/obj/effect/mapping_helpers/airlock/access/any/security/general, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"gnq" = ( +/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/science/ordnance) +"gnw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gnJ" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"gnL" = ( +/obj/structure/closet/bombcloset/security, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"gnM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"gnT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/sign/departments/medbay/alt/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gnX" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"goa" = ( +/obj/machinery/chem_heater/withbuffer, +/obj/effect/turf_decal/tile/yellow/full, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"gob" = ( +/obj/structure/closet/wardrobe/black, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"god" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/door/window/left/directional/west{ + name = "Secure Art Exhibition"; + req_access = list("library") + }, +/obj/effect/spawner/random/structure/table_fancy, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"goe" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"gov" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Janitorial Delivery"; + req_access = list("janitor") + }, +/obj/effect/turf_decal/delivery, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/iron, +/area/station/service/janitor) +"goy" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/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/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"goB" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"goE" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Pure to Port" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"goF" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/virology{ + name = "Break Room" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"goI" = ( +/obj/structure/curtain/bounty/start_closed, +/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/commons/vacant_room/office) +"goY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"gpj" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 8 + }, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"gpo" = ( +/obj/structure/sign/warning/directional/south, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"gpp" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"gpr" = ( +/obj/machinery/restaurant_portal/bar, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/barsign/directional/south, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"gps" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/microwave, +/obj/machinery/camera/directional/north{ + c_tag = "Mining B-1 Crater Observatory"; + network = list("ss13", "mine") + }, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"gpt" = ( +/obj/machinery/button/door/directional/east{ + id = "kanyewest"; + name = "Privacy Shutters" + }, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"gpB" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"gpM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"gpR" = ( +/obj/structure/cable, +/obj/machinery/light/dim/directional/south, +/obj/machinery/requests_console/directional/south{ + department = "Medbay"; + name = "Medbay Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/structure/tank_holder/extinguisher, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"gpS" = ( +/obj/effect/turf_decal/loading_area/white{ + dir = 8 + }, +/obj/structure/noticeboard/directional/south, +/turf/open/floor/wood/large, +/area/station/service/bar/atrium) +"gpU" = ( +/obj/structure/frame/computer, +/obj/item/stack/cable_coil/five, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"gpZ" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/rods/fifty, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"gqh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink/kitchen/directional/north{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"gqj" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"gqm" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "robo1" + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"gqv" = ( +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"gqB" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"gqK" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"gqT" = ( +/obj/effect/landmark/event_spawn, +/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/white/corner{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"gra" = ( +/obj/effect/mapping_helpers/airlock/access/all/medical/coroner, +/obj/machinery/door/airlock/medical/glass, +/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/dark, +/area/station/medical/morgue) +"grk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"grp" = ( +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) +"grr" = ( +/obj/structure/table, +/obj/item/storage/box/shipping, +/obj/item/clothing/head/soft, +/obj/item/clothing/head/soft, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron, +/area/station/cargo/storage) +"grA" = ( +/obj/structure/table/reinforced, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/wrench{ + pixel_y = 17 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"grD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + name = "Psychology" + }, +/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, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/psychology) +"grI" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"grL" = ( +/obj/machinery/light/small/directional/east, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored/graveyard) +"grN" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"grT" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"gsd" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"gsk" = ( +/obj/structure/reflector/single/anchored{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"gst" = ( +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) +"gsI" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"gsK" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gsN" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"gsT" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"gta" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table, +/obj/item/folder, +/obj/item/pen, +/turf/open/floor/iron, +/area/station/commons/locker) +"gtg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gti" = ( +/turf/open/openspace, +/area/station/maintenance/starboard/aft) +"gtw" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) +"gtB" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/fore) +"gtF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"gtG" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron, +/area/station/commons/locker) +"guA" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"guO" = ( +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/generic, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"guS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"guU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/closed/wall, +/area/station/engineering/atmos) +"gvc" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining Mech Bay External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "mining-mechbay-external" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"gvd" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"gvf" = ( +/obj/machinery/button/door/directional/east{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast DOors"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"gvj" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"gvp" = ( +/obj/item/chair/stool{ + pixel_x = -1; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"gvr" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"gvK" = ( +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"gwl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/obj/machinery/button/door/directional/north{ + id = "Secure Gate"; + name = "Cell Shutters"; + req_access = list("brig") + }, +/obj/machinery/button/door/directional/north{ + id = "Prison Gate"; + name = "Prison Wing Lockdown"; + req_access = list("brig"); + pixel_y = 35 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"gwp" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/station/commons/locker) +"gwq" = ( +/obj/machinery/computer/records/security, +/obj/machinery/requests_console/directional/north{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"gwy" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/machinery/light/warm/directional/north, +/turf/open/misc/ashplanet/wateryrock{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/station/security/prison/rec) +"gwz" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"gwJ" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 5 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/tile/dark/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/mine/living_quarters) +"gwK" = ( +/turf/closed/wall/r_wall, +/area/station/security/checkpoint/engineering) +"gwM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/dim/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/station/maintenance/port/fore) +"gwW" = ( +/obj/structure/ladder, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"gxg" = ( +/obj/structure/cable, +/turf/open/floor/stone, +/area/station/commons/lounge) +"gxh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gxq" = ( +/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/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gxx" = ( +/obj/item/radio/intercom/prison/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison/rec) +"gxO" = ( +/obj/structure/table/reinforced, +/obj/item/hand_labeler{ + pixel_y = 8 + }, +/obj/item/hand_labeler{ + pixel_y = 8 + }, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"gxP" = ( +/obj/structure/reagent_dispensers/plumbed, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/large, +/area/station/engineering/atmos) +"gxR" = ( +/obj/structure/table, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/stack/rods/fifty, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"gxS" = ( +/obj/effect/turf_decal/bot, +/obj/structure/ore_box, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/mine/eva) +"gxU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/command/bridge) +"gya" = ( +/obj/structure/table/wood, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron, +/area/station/commons/dorms) +"gyd" = ( +/obj/machinery/space_heater, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gyg" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"gyH" = ( +/obj/machinery/light/directional/north, +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"gyO" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/cytology{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/storage/box/swab{ + pixel_y = 7; + pixel_x = 7 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"gyR" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/main) +"gyY" = ( +/obj/machinery/vending/wardrobe/viro_wardrobe, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"gzz" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/machinery/computer/monitor{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"gzH" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"gzI" = ( +/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/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"gzJ" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/box, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"gzV" = ( +/obj/structure/mineral_door/paperframe{ + name = "Meditation Room" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"gzY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"gAk" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/directional/east, +/obj/item/extinguisher, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) +"gAn" = ( +/obj/machinery/door/firedoor/border_only, +/turf/open/openspace, +/area/station/security/prison) +"gAt" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gAu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"gAz" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"gAB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/locker) +"gAD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"gAM" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/obj/structure/sign/warning/cold_temp/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"gAR" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/security/prison) +"gAV" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/stairs/south, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/security/prison) +"gAZ" = ( +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gBb" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 3"; + req_access = list("xenobiology") + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"gBc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"gBe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gBv" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Engineering Delivery"; + req_access = list("engineering") + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/textured_large, +/area/station/engineering/storage) +"gBx" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gBJ" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /obj/machinery/duct, +<<<<<<< HEAD /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -56146,6 +77803,35083 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/bar) +======= +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/bar) +"gBX" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/prison/work) +"gCd" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/storage/tech) +"gCh" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"gCn" = ( +/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, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"gCo" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"gCq" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/east, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"gCs" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/sign/poster/contraband/missing_gloves/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"gCu" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gCK" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"gCV" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"gCY" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Engineering External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "Engineering-External" + }, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"gDe" = ( +/obj/structure/chair{ + dir = 1; + name = "Prosecution" + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/security/courtroom) +"gDh" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"gDp" = ( +/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/maintenance/department/medical/central) +"gDq" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gDv" = ( +/obj/structure/table, +/obj/item/clothing/suit/apron/chef, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/processor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gDz" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/glass/bottle/amaretto{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/glass/bottle/fernet{ + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/reagent_containers/cup/soda_cans/sol_dry, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = 10 + }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"gDE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Xenobiology Maintenance" + }, +/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/sign/warning/biohazard/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gDN" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva) +"gDS" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"gDV" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"gDZ" = ( +/turf/open/floor/wood, +/area/station/maintenance/port/fore) +"gEd" = ( +/obj/machinery/camera/directional/east{ + c_tag = "MiniSat External SouthWest"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gEn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/science/server) +"gEq" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/service/library) +"gEr" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/storage_shared) +"gEy" = ( +/obj/structure/table, +/obj/item/computer_disk/ordnance, +/obj/item/computer_disk/ordnance{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/item/computer_disk{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/aicard, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/command/heads_quarters/rd) +"gEE" = ( +/turf/open/openspace, +/area/station/service/chapel) +"gER" = ( +/turf/open/floor/iron, +/area/station/command/bridge) +"gET" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gEV" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"gFj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"gFH" = ( +/obj/structure/tank_holder/extinguisher, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gFI" = ( +/obj/machinery/telecomms/server/presets/security, +/obj/structure/sign/warning/no_smoking/circle/directional/north, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"gFL" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/hallway/secondary/entry) +"gFX" = ( +/turf/closed/wall, +/area/icemoon/underground/explored) +"gGf" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"gGj" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 9 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"gGs" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"gGt" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/main) +"gGx" = ( +/obj/machinery/dna_scannernew, +/obj/machinery/camera/directional/west{ + c_tag = "Research Division Genetics Lab"; + network = list("ss13","rd") + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"gGE" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/obj/machinery/firealarm/directional/south, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/exit/departure_lounge) +"gGF" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gGH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/light_construct/directional/west, +/turf/open/floor/plating, +/area/station/construction) +"gGI" = ( +/obj/structure/closet/l3closet, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Storage"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"gGZ" = ( +/obj/machinery/computer/bank_machine, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"gHe" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gHg" = ( +/obj/machinery/mineral/processing_unit_console, +/turf/closed/wall, +/area/mine/laborcamp) +"gHl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gHq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"gHA" = ( +/mob/living/simple_animal/hostile/asteroid/polarbear{ + move_force = 999; + name = "Louie" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gHD" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"gHF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"gHN" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gHP" = ( +/obj/machinery/space_heater/improvised_chem_heater, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"gHS" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"gHY" = ( +/obj/effect/landmark/start/scientist, +/obj/structure/chair/stool/directional/west, +/turf/open/floor/iron/checker, +/area/station/science/lab) +"gIh" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gIs" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/light/warm/directional/east, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"gIt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"gIu" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/mine/mechbay) +"gIF" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"gII" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"gIJ" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/medical/morgue) +"gIL" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Secure Walkway" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"gIN" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness) +"gIY" = ( +/turf/closed/wall, +/area/station/medical/medbay/central) +"gJs" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"gJz" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/storage/art) +"gJC" = ( +/obj/structure/chair/stool/directional/east, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/station/commons/dorms) +"gJD" = ( +/obj/item/reagent_containers/cup/soda_cans/beer{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gJK" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"gJN" = ( +/obj/machinery/rnd/production/circuit_imprinter, +/obj/machinery/requests_console/directional/east{ + department = "Engineering"; + name = "Engineering Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"gJT" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/command/heads_quarters/rd) +"gJX" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gKd" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Cargo Warehouse External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "cargo-warehouse-external" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"gKl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Secondary Storage" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"gKn" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"gKE" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"gKG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"gKQ" = ( +/turf/closed/wall, +/area/station/security/courtroom) +"gKU" = ( +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door"; + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/command/bridge) +"gLj" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"gLk" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gLn" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/railing/corner/end{ + dir = 1 + }, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"gLu" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"gLF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"gLN" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"gLU" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Public Mining Storage"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/iron/dark, +/area/mine/storage) +"gLX" = ( +/obj/structure/railing/wooden_fence{ + dir = 9 + }, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"gLY" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/service/theater, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"gLZ" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/turf/open/floor/wood, +/area/station/maintenance/port/fore) +"gMd" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/medical/morgue) +"gMl" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"gMq" = ( +/obj/machinery/computer/cargo{ + dir = 4 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/west, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"gMt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"gMK" = ( +/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/hallway/primary/fore) +"gMM" = ( +/obj/machinery/holopad, +/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/hallway/primary/central) +"gMZ" = ( +/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 = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gNg" = ( +/obj/machinery/camera/directional/north{ + c_tag = "MiniSat External South"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gNi" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper, +/turf/open/floor/iron/cafeteria, +/area/station/science/lab) +"gNC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/command/gateway) +"gNH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"gNL" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"gNP" = ( +/obj/machinery/oven/range, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"gNT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gOa" = ( +/obj/structure/cable, +/obj/effect/turf_decal/box/red/corners{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"gOb" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "cmoprivacy"; + name = "CMO Office" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/heads_quarters/cmo) +"gOg" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "MiniSat Atmospherics"; + network = list("minisat"); + start_active = 1 + }, +/obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"gOi" = ( +/obj/structure/rack, +/obj/item/clothing/glasses/sunglasses/big{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/clothing/glasses/sunglasses/big{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/taperecorder, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"gOx" = ( +/obj/effect/turf_decal/loading_area, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"gOy" = ( +/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/hallway/primary/central) +"gOA" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/white, +/area/station/science/ordnance) +"gOI" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/cargo/storage) +"gOS" = ( +/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, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"gOU" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/mine/production) +"gOY" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"gPn" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Armory" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory/upper) +"gPp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"gPC" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/openspace, +/area/station/science/ordnance/office) +"gPR" = ( +/obj/effect/turf_decal/trimline/green/filled/warning, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gPY" = ( +/obj/structure/disposalpipe/segment, +/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/science/breakroom) +"gQe" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"gQp" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"gQq" = ( +/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 = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"gQw" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"gQD" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"gQE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 10 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"gQI" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm4"; + name = "Dorm 4" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/dorms) +"gQO" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Chapel Office" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination{ + location = "Chapel Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"gRg" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/sign/warning/gas_mask/directional/north{ + desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals." + }, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"gRm" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/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/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"gRp" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/locker) +"gRs" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"gRt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"gRA" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/test_chamber/directional/east{ + name = "Xenobio Monitor" + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"gRI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"gRZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"gSd" = ( +/obj/structure/fence/door{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gSl" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/closet/secure_closet/medical1, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gSq" = ( +/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/machinery/button/door/directional/north{ + id = "rnd"; + name = "Shutters Control Button"; + req_access = list("research"); + dir = 2 + }, +/obj/machinery/light_switch/directional/north{ + pixel_y = 35 + }, +/turf/open/floor/iron/checker, +/area/station/science/lab) +"gSr" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/head/utility/radiation, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/geiger_counter, +/obj/item/clothing/glasses/meson, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"gSy" = ( +/turf/open/floor/iron, +/area/station/security/prison/workout) +"gSE" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gSN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table, +/obj/item/circuitboard/aicore, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/smooth, +/area/station/command/heads_quarters/rd) +"gSO" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva/lower) +"gSV" = ( +/obj/machinery/light/directional/south, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/chapel/office) +"gTa" = ( +/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/siding/wood, +/obj/structure/chair/stool/bar/directional/north, +/obj/structure/cable, +/turf/open/floor/eighties, +/area/station/commons/lounge) +"gTi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gTq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"gTr" = ( +/obj/structure/cable, +/obj/structure/holosign/barrier/atmos/sturdy, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "minecraft_shutter"; + name = "Cart Shutters" + }, +/obj/structure/minecart_rail{ + dir = 1 + }, +/turf/open/floor/iron/textured, +/area/station/service/kitchen/coldroom) +"gTw" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/openspace, +/area/station/security/prison) +"gTK" = ( +/turf/closed/wall, +/area/station/engineering/engine_smes) +"gTW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"gUa" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gUg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"gUp" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"gUr" = ( +/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) +"gUv" = ( +/obj/machinery/holopad, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"gUx" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"gUQ" = ( +/obj/structure/fence/door{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"gUY" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gVe" = ( +/obj/structure/table, +/obj/effect/spawner/random/trash/food_packaging, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"gVm" = ( +/obj/item/coin/silver{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/toy/plush/moth{ + name = "Marcellus"; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"gVt" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"gVx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"gVB" = ( +/obj/structure/chair/stool/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/stone, +/area/station/commons/lounge) +"gVD" = ( +/obj/structure/closet/firecloset, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"gVN" = ( +/obj/structure/flora/grass/green/style_random, +/obj/structure/sign/warning/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"gVO" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"gVP" = ( +/obj/item/wrench, +/obj/item/screwdriver, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/commons/vacant_room/commissary) +"gVS" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"gVV" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/curtain/cloth/fancy/mechanical/start_closed{ + id = "cantena_curtains" + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"gWf" = ( +/obj/item/storage/box/lights/mixed, +/obj/structure/table, +/obj/item/crowbar, +/obj/item/wrench, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/medical/morgue) +"gWh" = ( +/obj/structure/rack, +/obj/machinery/light/small/dim/directional/north, +/obj/structure/sign/departments/maint/alt/directional/north, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gWi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/freezer{ + desc = "The freezer where the chef keeps all the stuff that needs to be kept cold. Ice cold."; + name = "The Ice Box" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/turf/open/floor/plating, +/area/station/service/kitchen/coldroom) +"gWn" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped{ + dir = 4; + name = "Exfiltrate Filter" + }, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"gWV" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"gWX" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"gXh" = ( +/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/textured_large, +/area/station/security/evidence) +"gXk" = ( +/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/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"gXm" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth_edge{ + dir = 8 + }, +/area/station/maintenance/department/medical/central) +"gXp" = ( +/obj/structure/table/wood, +/obj/item/folder/yellow, +/obj/item/pen, +/turf/open/floor/wood, +/area/station/service/library) +"gXr" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"gXy" = ( +/obj/machinery/door/airlock/public/glass{ + id_tag = "gulag2"; + name = "Cell 2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"gXJ" = ( +/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/science/lab) +"gXN" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"gYa" = ( +/obj/structure/railing{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"gYd" = ( +/obj/structure/stairs/north, +/turf/open/floor/iron/stairs/medium, +/area/station/cargo/storage) +"gYg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"gYi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced, +/turf/open/floor/plating, +/area/mine/living_quarters) +"gYm" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "riot"; + name = "Security Shutters" + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/fore) +"gYp" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gYq" = ( +/obj/item/toy/snowball{ + pixel_y = -7; + pixel_x = 5 + }, +/turf/open/misc/asteroid/snow/coldroom, +/area/station/service/kitchen/coldroom) +"gYt" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Research Division Delivery"; + req_access = list("research") + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"gYv" = ( +/obj/machinery/newscaster/directional/north, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/north, +/obj/item/toy/figure/mime{ + pixel_x = -6 + }, +/obj/item/toy/figure/clown{ + pixel_x = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"gYz" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 12 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"gYG" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"gYT" = ( +/obj/machinery/light/cold/directional/east, +/obj/machinery/status_display/ai/directional/east, +/obj/structure/railing, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/service/kitchen/coldroom) +"gZb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/station/medical/virology) +"gZc" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"gZq" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"gZt" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/obj/effect/gibspawner/human, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"gZP" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/door/airlock/security{ + name = "Recreation Block" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) +"gZT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - HFR North" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"hac" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 9 + }, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"haf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Gas to Cooling Loop" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"han" = ( +/obj/structure/table, +/obj/item/plate, +/obj/item/kitchen/fork, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/mine/laborcamp) +"hap" = ( +/turf/open/floor/vault, +/area/station/security/prison/rec) +"hay" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"haC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"haD" = ( +/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/effect/decal/cleanable/dirt/dust, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"haG" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/chair, +/obj/effect/landmark/start/bitrunner, +/turf/open/floor/iron, +/area/station/cargo/storage) +"haJ" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"hbt" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/clothing/mafia_outfit, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/bureaucracy/briefcase{ + pixel_y = 8 + }, +/obj/item/toy/gun, +/obj/effect/spawner/random/entertainment/money_small, +/obj/effect/turf_decal/siding/wood, +/obj/effect/spawner/random/trash/box, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"hby" = ( +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"hbI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"hbR" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"hbY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"hce" = ( +/obj/machinery/door/airlock{ + id_tag = "AuxToilet3"; + name = "Unit 3" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"hcg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"hcs" = ( +/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/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/fitness) +"hcw" = ( +/obj/docking_port/stationary/random/icemoon{ + dir = 8; + name = "lavaland"; + shuttle_id = "pod_2_lavaland" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hcG" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"hcL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"hcT" = ( +/obj/structure/closet/crate/internals, +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo Bay B-1" + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hcZ" = ( +/obj/structure/railing/wooden_fence, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"hdb" = ( +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"hdh" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hdj" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Secure Tech Storage" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"hdn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"hdp" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/mine/living_quarters) +"hdw" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hdH" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"hdV" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"heg" = ( +/obj/effect/spawner/random/engineering/canister, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hex" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining Mech Bay External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "mining-mechbay-external" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"heE" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 9 + }, +/obj/structure/fence{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"heX" = ( +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"hfc" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/science/xenobiology) +"hfd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"hff" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/service/library) +"hfg" = ( +/obj/structure/reagent_dispensers/plumbed{ + name = "service reservoir" + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/delivery/white{ + color = "#307db9" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/textured, +/area/station/maintenance/starboard/fore) +"hfs" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/item/instrument/harmonica, +/turf/open/floor/iron/grimy, +/area/station/commons/lounge) +"hfv" = ( +/obj/machinery/processor{ + pixel_y = 6 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"hfy" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/turretid{ + name = "AI Chamber turret control"; + pixel_x = 5; + pixel_y = -24 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"hfA" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"hfI" = ( +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"hfL" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hgc" = ( +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"hgh" = ( +/turf/closed/wall, +/area/station/medical/medbay/lobby) +"hgr" = ( +/turf/open/floor/glass/reinforced, +/area/station/hallway/secondary/entry) +"hgK" = ( +/obj/structure/ladder, +/obj/effect/landmark/blobstart, +/turf/open/floor/iron/dark/textured_large, +/area/station/maintenance/department/medical/central) +"hgM" = ( +/turf/closed/wall, +/area/station/security/execution/transfer) +"hgY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"hhr" = ( +/obj/structure/weightmachine/weightlifter, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"hht" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/engineering/atmos) +"hhu" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/camera/directional/south{ + c_tag = "Ordnance Lower Mix Lab"; + network = list("ss13","rd") + }, +/obj/structure/sign/warning/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"hhz" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/chapel/office) +"hhO" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchencounter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/displaycase/forsale/kitchen, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"hhP" = ( +/obj/machinery/newscaster/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/science/lab) +"hhT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/landmark/start/chemist, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"hil" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"hir" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/reagent_dispensers/plumbed{ + name = "dormitory reservoir" + }, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/delivery/white{ + color = "#307db9" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/textured, +/area/station/maintenance/fore) +"hjc" = ( +/obj/structure/closet/emcloset, +/obj/item/pickaxe, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"hjh" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hjl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/wood/large, +/area/station/service/bar) +"hjp" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/camera/directional/south{ + c_tag = "Research Division Testing Lab"; + network = list("ss13","rd") + }, +/turf/open/floor/iron, +/area/station/science/explab) +"hjt" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hjv" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/hydroponics/garden) +"hjz" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"hjA" = ( +/obj/effect/turf_decal/tile/blue, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hjE" = ( +/turf/closed/wall/r_wall, +/area/station/science/explab) +"hjH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hjI" = ( +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hjJ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/north, +/obj/machinery/vending/coffee, +/turf/open/floor/iron, +/area/station/commons/locker) +"hjM" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/morgue) +"hjQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"hjR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/project) +"hjV" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "viroview" + }, +/turf/open/floor/plating, +/area/station/medical/virology) +"hjX" = ( +/obj/machinery/requests_console/directional/north{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/red/anticorner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 1 + }, +/area/station/security/office) +"hkd" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"hkp" = ( +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"hkt" = ( +/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/plating, +/area/station/maintenance/aft/greater) +"hku" = ( +/obj/structure/railing, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 10 + }, +/obj/machinery/barsign/directional/north, +/turf/open/floor/wood/large, +/area/station/hallway/primary/starboard) +"hkI" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"hkQ" = ( +/obj/structure/table/optable, +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"hkS" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/structure/closet/secure_closet/cytology, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"hkU" = ( +/obj/effect/landmark/start/cargo_technician, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"hkY" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/machinery/light_switch/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/security/lockers) +"hll" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"hlp" = ( +/obj/structure/chair/stool/directional/south{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"hlv" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/delivery, +/obj/item/bikehorn/rubberducky, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"hlE" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/mine/laborcamp) +"hmb" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"hme" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/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/dark/side{ + dir = 6 + }, +/area/station/security/prison) +"hmt" = ( +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/north{ + name = "Security Checkpoint"; + req_access = list("security") + }, +/obj/effect/turf_decal/delivery, +/obj/item/paper, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs/auxiliary) +"hmx" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay Lobby"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"hmE" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/departments/medbay/alt/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"hmF" = ( +/obj/effect/spawner/random/entertainment/arcade, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/eighties, +/area/station/commons/lounge) +"hmX" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + dir = 8; + name = "Supply multi deck pipe adapter" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"hmZ" = ( +/obj/structure/sink/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"hnd" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"hnt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"hnC" = ( +/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/cargo/lobby) +"hnN" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Pens Observation - Port Aft"; + network = list("ss13","rd","xeno") + }, +/turf/open/openspace, +/area/station/science/xenobiology) +"hnP" = ( +/obj/machinery/photocopier, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"hnV" = ( +/obj/structure/table/glass, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/screwdriver{ + pixel_x = 2; + pixel_y = 11 + }, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"hoa" = ( +/obj/structure/sink/directional/east, +/obj/machinery/button/door/directional/west{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door"; + req_access = list("xenobiology") + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"hos" = ( +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hoz" = ( +/obj/structure/fence/corner{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"hoD" = ( +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"hoM" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/structure/closet/l3closet/virology, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hoT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"hoV" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"hoZ" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"hpd" = ( +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"hpe" = ( +/obj/structure/table/wood, +/obj/machinery/camera/directional/east{ + c_tag = "Captain's Office" + }, +/obj/item/storage/lockbox/medal{ + pixel_y = 8 + }, +/obj/item/pinpointer/nuke{ + pixel_y = -9 + }, +/obj/item/disk/nuclear{ + pixel_y = -8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"hph" = ( +/obj/structure/reagent_dispensers/plumbed{ + dir = 1; + name = "hydroponics reservoir" + }, +/obj/effect/turf_decal/delivery/white{ + color = "#307db9" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/maintenance/starboard/lesser) +"hpl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp) +"hpm" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Starboard Primary Hallway East" + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/station/hallway/primary/starboard) +"hpp" = ( +/obj/structure/sign/departments/chemistry/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"hpr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hpx" = ( +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"hpB" = ( +/obj/machinery/vending/coffee, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"hpC" = ( +/obj/machinery/requests_console/directional/north{ + department = "Robotics"; + name = "Robotics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"hpE" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"hpF" = ( +/obj/structure/table, +/obj/machinery/door/poddoor/shutters{ + id = "visitation"; + name = "Visitation Shutters" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/north, +/obj/machinery/door/window/right/directional/south, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"hpI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"hpM" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Drone Bay External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/iron/smooth, +/area/station/cargo/drone_bay) +"hpR" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"hpU" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"hpY" = ( +/obj/structure/closet/radiation, +/obj/machinery/light/directional/north, +/obj/machinery/requests_console/directional/north{ + department = "Genetics"; + name = "Genetics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"hqi" = ( +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Security Delivery"; + req_access = list("brig") + }, +/turf/open/floor/plating, +/area/station/security/processing) +"hqm" = ( +/obj/structure/table, +/obj/item/storage/crayons, +/obj/item/storage/crayons, +/obj/item/chisel{ + pixel_y = 7 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/commons/storage/art) +"hqv" = ( +/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/table, +/obj/item/cigarette{ + pixel_x = 6; + pixel_y = 12 + }, +/turf/open/floor/iron, +/area/mine/eva) +"hqx" = ( +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"hqA" = ( +/obj/structure/table, +/obj/item/crowbar/large, +/obj/item/storage/box/lights/mixed, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"hqE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"hqH" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/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/science/ordnance, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/smooth_large, +/area/station/science/ordnance) +"hrh" = ( +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"hro" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/cable, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"hrJ" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/storage) +"hrO" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Security Checkpoint" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brigoutpost" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +"hrS" = ( +/obj/item/trash/raisins, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hrY" = ( +/obj/structure/stairs/west, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"hrZ" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hsh" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/service) +"hsn" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"hso" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/turf_decal/weather/snow, +/turf/open/floor/plating/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hsr" = ( +/obj/structure/table/wood, +/obj/item/newspaper, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"hsx" = ( +/obj/machinery/vending/cigarette, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"hsy" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"hsB" = ( +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"hsN" = ( +/obj/structure/table, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/item/key/security, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"hsQ" = ( +/obj/structure/tank_holder/oxygen, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"htd" = ( +/obj/structure/sign/warning/docking/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hte" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"htg" = ( +/obj/structure/fireplace, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hth" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"htp" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"htq" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/east, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"hts" = ( +/obj/structure/table/wood, +/obj/item/wallframe/camera{ + pixel_y = -2; + pixel_x = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hty" = ( +/obj/item/stack/rods, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"htB" = ( +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"htH" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Psychology Office"; + name = "Psychology Office Fax Machine" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay Psychology"; + network = list("ss13","medbay") + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"htJ" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"htO" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/depsec/science, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"hue" = ( +/obj/structure/chair/comfy/black, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"hui" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"huj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"hul" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/vending/autodrobe/all_access, +/turf/open/floor/iron, +/area/station/commons/locker) +"huq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"huB" = ( +/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/wood, +/area/station/service/library) +"huH" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"huI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"huJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table, +/obj/item/bodybag/environmental, +/obj/item/bodybag/environmental, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/station/service/chapel) +"huN" = ( +/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/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"huS" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"huT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"hvm" = ( +/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/white, +/area/station/science/xenobiology) +"hvt" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/surgery_tray/full/morgue, +/obj/structure/table/reinforced, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/turf_decal/bot_white, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"hvQ" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"hvS" = ( +/obj/effect/landmark/start/depsec/engineering, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/engineering) +"hvU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"hwn" = ( +/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/plating, +/area/station/maintenance/port/aft) +"hwu" = ( +/obj/machinery/door/poddoor/preopen{ + id = "lawyer_blast"; + name = "Privacy Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/service/lawoffice) +"hwx" = ( +/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/construction) +"hwC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"hwE" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hwF" = ( +/obj/machinery/computer/cargo{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"hwR" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Equipment Room" + }, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/turf/open/floor/glass/reinforced, +/area/station/security/lockers) +"hwW" = ( +/obj/machinery/light_switch/directional/south{ + pixel_x = -9 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"hwZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"hxa" = ( +/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/engineering{ + name = "Utilities Room" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hxe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos) +"hxs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/records/medical{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"hxE" = ( +/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/cargo/miningdock) +"hxJ" = ( +/obj/structure/fence/corner{ + dir = 10 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"hyc" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/aft) +"hyd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"hye" = ( +/obj/structure/table/wood, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box/white/corners, +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/bar) +"hyj" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/station/maintenance/disposal) +"hyC" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"hyV" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/testlab) +"hyY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hzb" = ( +/obj/structure/sign/xenobio_guide/directional/north, +/turf/open/openspace, +/area/station/science/xenobiology) +"hzz" = ( +/obj/structure/table/glass, +/obj/item/clothing/gloves/latex, +/obj/item/healthanalyzer, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/science, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hzB" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"hzG" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/machinery/button/door/directional/north{ + id = "Secure Gate"; + name = "Cell Shutters"; + req_access = list("brig"); + pixel_x = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "Prison Gate"; + name = "Prison Wing Lockdown"; + req_access = list("brig"); + pixel_y = 35; + pixel_x = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "briggate"; + name = "Front Gate Shutters"; + req_access = list("brig"); + pixel_y = 12; + pixel_x = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "BrigLock"; + name = "Brig Lockdown"; + req_access = list("brig"); + pixel_y = 0; + pixel_x = 6 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"hzH" = ( +/obj/machinery/camera/motion/directional/west{ + c_tag = "MiniSat Core Hallway"; + network = list("aicore") + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"hzJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/grimy, +/area/station/security/detectives_office) +"hzL" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/closet/wardrobe/white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"hzN" = ( +/obj/machinery/camera/motion/directional/south{ + c_tag = "Armory - Internal - Upper" + }, +/turf/open/openspace, +/area/station/ai_monitored/security/armory/upper) +"hzU" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hzV" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"hzY" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "briggate"; + name = "Security Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig/entrance) +"hAl" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/starboard) +"hAm" = ( +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/research) +"hAE" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"hAG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"hAM" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hAO" = ( +/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{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"hAQ" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"hAT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/science/genetics) +"hAU" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/closet{ + name = "janitorial supplies" + }, +/obj/item/pushbroom, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"hBd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"hBf" = ( +/obj/structure/fence/door{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hBg" = ( +/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/smooth, +/area/station/security/execution/transfer) +"hBr" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/brig/entrance) +"hBv" = ( +/obj/structure/kitchenspike, +/obj/item/stack/sheet/leather, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"hBB" = ( +/obj/effect/spawner/random/structure/girder, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"hBE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics Incinerator" + }, +/obj/machinery/atmospherics/components/tank/plasma, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"hBF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"hBG" = ( +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"hBZ" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/command, +/obj/item/paper/fluff/jobs/engineering/frequencies, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"hCa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"hCn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/eva) +"hCv" = ( +/obj/structure/table, +/obj/item/storage/bag/tray, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"hCC" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hCV" = ( +/obj/structure/table/wood, +/obj/item/hand_tele{ + pixel_y = 11 + }, +/obj/item/melee/chainofcommand, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"hCY" = ( +/obj/structure/table/wood, +/obj/item/folder/yellow{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/folder/white{ + pixel_x = -3; + pixel_y = 12 + }, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/item/folder/blue{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/folder/red{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/folder, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"hDb" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hDc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/fore) +"hDe" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/button/door/directional/north{ + id = "Lakeview_Bathroom"; + req_access = list("robotics") + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/freezer, +/area/mine/eva/lower) +"hDf" = ( +/obj/structure/cable, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"hDh" = ( +/obj/machinery/computer/atmos_alert{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"hDp" = ( +/turf/open/floor/engine, +/area/station/science/genetics) +"hDq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"hDv" = ( +/obj/machinery/shower/directional/north, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"hDA" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"hDG" = ( +/obj/docking_port/stationary/random/icemoon{ + dir = 4; + name = "lavaland"; + shuttle_id = "pod_4_lavaland" + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hDK" = ( +/turf/open/floor/iron, +/area/mine/laborcamp) +"hDL" = ( +/obj/item/kirbyplants/random/dead, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hDU" = ( +/turf/closed/wall/r_wall, +/area/station/command/gateway) +"hDV" = ( +/obj/structure/plasticflaps, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"hEm" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/iron/dark, +/area/mine/eva) +"hED" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/broken/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"hEG" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/security/warden) +"hEI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hEP" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -4 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hEW" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hEZ" = ( +/obj/structure/ladder, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"hFb" = ( +/turf/open/floor/iron, +/area/station/science/ordnance) +"hFg" = ( +/obj/structure/closet, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hFi" = ( +/obj/structure/frame/machine, +/turf/open/floor/plating, +/area/station/construction) +"hFm" = ( +/obj/effect/spawner/random/structure/chair_flipped{ + dir = 8 + }, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hFr" = ( +/obj/structure/flora/grass/both/style_2, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hFw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"hFC" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/obj/structure/rack, +/obj/item/storage/crayons, +/turf/open/floor/iron, +/area/station/security/processing) +"hFD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"hFJ" = ( +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/security/telescreen/engine/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"hFL" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"hFR" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"hFW" = ( +/obj/machinery/vending/wardrobe/det_wardrobe, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"hGh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/teleporter) +"hGs" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"hGH" = ( +/turf/closed/wall, +/area/station/security/lockers) +"hGZ" = ( +/obj/structure/table, +/obj/item/analyzer, +/obj/item/healthanalyzer, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"hHb" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"hHg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hHl" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/status_display/shuttle{ + pixel_x = -32; + shuttle_id = "arrival" + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"hHp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"hHq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"hHu" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hHz" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"hHD" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Construction Area" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/construction) +"hHG" = ( +/turf/open/cliff/snowrock, +/area/icemoon/surface/outdoors/nospawn) +"hHI" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"hHN" = ( +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hHV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ + dir = 1 + }, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"hIj" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Port Hallway East" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"hIv" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hIA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"hIH" = ( +/obj/machinery/door/airlock/maintenance, +/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/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hIN" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"hIO" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "hosspace"; + name = "Privacy Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hos) +"hIU" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"hIW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/calendar/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"hJe" = ( +/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/maintenance/fore) +"hJi" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 6"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"hJo" = ( +/obj/structure/table, +/obj/item/plate, +/obj/item/food/piedough, +/obj/effect/spawner/random/food_or_drink/cake_ingredients, +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/obj/item/kitchen/rollingpin, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"hJp" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"hJx" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hJD" = ( +/obj/structure/ladder, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"hJE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hJG" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"hJH" = ( +/turf/open/openspace, +/area/station/science/research) +"hJY" = ( +/obj/structure/closet/l3closet/janitor, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/service/janitor) +"hKr" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/infections{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/surgery{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/medicine{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/book/manual/wiki/chemistry{ + pixel_x = 5 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/cmo) +"hKu" = ( +/obj/structure/sign/poster/official/cleanliness/directional/east, +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"hKI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"hKJ" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"hKV" = ( +/obj/structure/chair, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hKY" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=1"; + location = "Medbay" + }, +/obj/effect/turf_decal/bot, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/medical/central) +"hLf" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"hLk" = ( +/obj/structure/table, +/obj/item/paper, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/west{ + c_tag = "Labor Camp Cell 2"; + network = list("labor") + }, +/obj/machinery/flasher/directional/west{ + id = "GulagCell 2" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"hLw" = ( +/obj/structure/flora/grass/both/style_3, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hLS" = ( +/obj/machinery/computer/atmos_control/nitrous_tank{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/engineering/atmos) +"hLW" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/fitness) +"hLX" = ( +/obj/structure/girder, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"hLY" = ( +/obj/structure/cable, +/obj/structure/chair, +/obj/effect/landmark/start/shaft_miner, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hLZ" = ( +/obj/machinery/telecomms/bus/preset_three, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"hMc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"hMg" = ( +/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/hallway/primary/port) +"hMr" = ( +/obj/effect/landmark/start/chaplain, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/chapel) +"hMv" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"hMw" = ( +/obj/structure/bookcase/random/fiction, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hMz" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"hMA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/dim/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"hMB" = ( +/obj/structure/table, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/servo, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/science/lab) +"hMH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/end{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"hMJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) +"hMM" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hMQ" = ( +/obj/structure/sign/warning/xeno_mining/directional/east, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hMS" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"hMZ" = ( +/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, +/turf/open/floor/stone, +/area/station/commons/lounge) +"hNg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"hNh" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/lawyer, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"hNn" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"hNp" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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) +"hNq" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/railing, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hNx" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Holodeck - South"; + name = "holodeck camera" + }, +/turf/open/floor/engine{ + name = "Holodeck Projector Floor" + }, +/area/station/holodeck/rec_center) +"hNz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/large, +/area/station/hallway/primary/port) +"hNI" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"hNJ" = ( +/obj/machinery/power/solar_control{ + id = "auxsolareast"; + name = "Port Bow Solar Control" + }, +/obj/structure/cable, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"hNM" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron, +/area/station/engineering/storage) +"hNU" = ( +/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/neutral{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hOc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Door" + }, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"hOk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/vending/wardrobe/chem_wardrobe, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/chemistry) +"hOo" = ( +/obj/machinery/mechpad, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"hOt" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hOu" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hOG" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"hOU" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Pens - Port Fore"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"hOX" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - North West" + }, +/obj/machinery/light/directional/west, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hOY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/circuit, +/area/station/science/robotics/mechbay) +"hPe" = ( +/obj/structure/cable/multilayer/connected, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"hPf" = ( +/obj/structure/safe/vault, +/obj/item/clothing/head/costume/bearpelt, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"hPk" = ( +/obj/machinery/door/airlock/security{ + name = "Permabrig Chapel" + }, +/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/wood, +/area/station/security/prison/rec) +"hPs" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/work) +"hPv" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hPz" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"hPD" = ( +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/medical/morgue) +"hPK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"hPO" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"hPT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"hPX" = ( +/obj/structure/frame/computer, +/obj/structure/sign/poster/official/help_others/directional/north, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"hQc" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/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, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"hQt" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/brig) +"hQu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hQv" = ( +/obj/item/kirbyplants/random/dead, +/obj/machinery/light/small/broken/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hQK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table, +/obj/item/trash/candle{ + pixel_y = 12 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"hQP" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"hQQ" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hQW" = ( +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hRt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"hRw" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"hRA" = ( +/turf/closed/wall, +/area/station/medical/psychology) +"hRC" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Test Chamber"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hRD" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/computer/mechpad{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"hRE" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"hRG" = ( +/obj/machinery/shower/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/window/left/directional/north{ + name = "Shower Cubicle" + }, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) +"hRH" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"hRQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Xenobiology Pens Hall - Fore"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"hRX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"hSe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/mine/eva) +"hSl" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 9 + }, +/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/neutral, +/turf/open/floor/iron/dark/smooth_corner, +/area/station/ai_monitored/command/storage/eva) +"hSq" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + 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/cable, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/bar/atrium) +"hSt" = ( +/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/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"hSF" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/medical/virology) +"hSJ" = ( +/obj/structure/chair/comfy{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/security/processing) +"hSZ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"hTk" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external/glass{ + name = "Supply Door Airlock"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/storage) +"hTm" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"hTq" = ( +/obj/structure/cable, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"hTu" = ( +/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/cyclelink_helper_multi{ + cycle_id = "sci-med-passthrough" + }, +/obj/machinery/door/airlock/research{ + name = "Research Access" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/turf_decal/tile/purple/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/maintenance/aft/greater) +"hTw" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"hTx" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay Stasis Center South"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"hTB" = ( +/obj/structure/table, +/obj/item/clothing/suit/jacket/leather{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"hTI" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/icemoon, +/area/station/maintenance/port/lesser) +"hTJ" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Solar Maintenance - North West Access" + }, +/obj/machinery/light/small/dim/directional/north, +/obj/effect/spawner/random/engineering/tank, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hTY" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/clock/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"hUe" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"hUi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"hUx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hUy" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"hUz" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison) +"hUD" = ( +/turf/closed/wall, +/area/station/service/library) +"hUI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hUK" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"hUV" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/closet/crate, +/obj/item/crowbar, +/turf/open/floor/iron, +/area/station/command/teleporter) +"hVc" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hopqueue"; + name = "HoP Queue Shutters" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hVf" = ( +/obj/structure/chair{ + pixel_y = -2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/food_packaging, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"hVo" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hVq" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/dark{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/mine/living_quarters) +"hVu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"hVz" = ( +/obj/effect/spawner/random/maintenance/two, +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hVB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"hVI" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/mine/eva) +"hVR" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hVX" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/medical/morgue) +"hVY" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/prison/garden) +"hWd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"hWi" = ( +/obj/machinery/teleport/hub, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"hWl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"hWt" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hWz" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Ordnance Lower Mix Lab"; + network = list("ss13","rd") + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"hWD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"hWI" = ( +/obj/effect/turf_decal/box, +/obj/effect/spawner/random/structure/closet_empty/crate/with_loot, +/obj/effect/spawner/random/maintenance/six, +/obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard/aft) +"hWR" = ( +/obj/structure/table/wood, +/obj/item/paper/crumpled, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hWV" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/space_heater, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/plating, +/area/station/medical/virology) +"hXC" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hXU" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"hYb" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Disposal Access" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination/disposals, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"hYy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"hYD" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hYE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"hYG" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/structure/plasticflaps{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"hYL" = ( +/obj/structure/closet/lasertag/blue, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness) +"hYM" = ( +/obj/structure/lattice, +/obj/structure/sign/poster/official/help_others/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"hYP" = ( +/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/weather/snow/corner{ + dir = 6 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"hZb" = ( +/obj/structure/curtain/cloth/fancy/mechanical/start_closed{ + id = "cantena_curtains" + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"hZc" = ( +/obj/effect/landmark/start/clown, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"hZe" = ( +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"hZf" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Bridge East Access" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hZo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/storage/box, +/obj/effect/spawner/random/bureaucracy/birthday_wrap, +/obj/effect/spawner/random/bureaucracy/birthday_wrap, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/departments/maint/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"hZu" = ( +/obj/structure/sign/warning/secure_area{ + pixel_y = 32 + }, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hZJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + color = "#ff0000"; + dir = 4; + name = "Scrubbers multi deck pipe adapter" + }, +/obj/structure/sign/poster/official/safety_eye_protection/directional/north, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"hZN" = ( +/obj/structure/sign/warning/secure_area/directional/west, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"hZQ" = ( +/obj/item/stack/sheet/iron/five, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hZT" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hZW" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"iag" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"iam" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"iar" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio10"; + name = "Xenobio Pen 10 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"iav" = ( +/obj/structure/closet/secure_closet/labor_camp_security, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"iay" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"iaB" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/structure/sign/departments/botany/directional/west, +/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/starboard/lesser) +"iaF" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/cargo/storage) +"iaT" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iaU" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Emergency EVA Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, +/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/textured, +/area/station/hallway/secondary/entry) +"iaV" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"iaY" = ( +/obj/machinery/door/airlock/command{ + name = "MiniSat Access" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/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/engineering/transit_tube) +"iba" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/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 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"ibj" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ibk" = ( +/obj/structure/railing, +/obj/structure/table, +/obj/item/radio/off{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/radio/off{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/item/radio/off{ + pixel_y = 5 + }, +/obj/item/radio/off{ + pixel_y = 5 + }, +/obj/machinery/cell_charger, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) +"ibm" = ( +/obj/structure/cable, +/obj/machinery/newscaster/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"ibw" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ibz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/gambling, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"ibJ" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/computer/slot_machine{ + name = "two-armed bandit" + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"ibM" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "lower_chapel_shutters"; + name = "Graveyard Shutters" + }, +/turf/open/floor/plating, +/area/station/service/chapel) +"ich" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/station/hallway/secondary/entry) +"ici" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ick" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"icu" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/mine/living_quarters) +"icA" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/left/directional/east{ + req_access = list("brig_entrance") + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) +"icB" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 5 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"icE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"icF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Incinerator Output Pump"; + target_pressure = 4500 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"icI" = ( +/obj/structure/table, +/obj/item/retractor, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"icK" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/railing, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/xenobiology) +"icQ" = ( +/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/visit) +"icS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"icU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"icV" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"icY" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Garden Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/service/hydroponics/garden) +"idi" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "Skynet_launch"; + name = "Mech Bay" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"idj" = ( +/obj/structure/cable, +/obj/effect/landmark/start/depsec/science, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"idm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"idt" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"idv" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"idI" = ( +/turf/open/floor/stone, +/area/station/commons/lounge) +"idN" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/window/brigdoor/left/directional/south{ + req_access = list("brig") + }, +/obj/effect/mapping_helpers/trapdoor_placer, +/turf/open/floor/glass/reinforced, +/area/station/security/courtroom) +"idO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/hallway/primary/port) +"idP" = ( +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"idU" = ( +/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 = 4 + }, +/obj/machinery/door/airlock/hatch{ + name = "Morgue"; + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"iem" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/north, +/turf/open/floor/iron/stairs/medium, +/area/station/cargo/storage) +"ieG" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ieJ" = ( +/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/hallway/primary/starboard) +"ifa" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"ife" = ( +/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/ai_monitored/turret_protected/aisat/atmos) +"ifX" = ( +/obj/machinery/vending/wardrobe/cargo_wardrobe, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ifY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white/corner, +/area/station/engineering/atmos) +"ifZ" = ( +/obj/machinery/shower/directional/south, +/obj/item/soap/nanotrasen, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"igd" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"igm" = ( +/turf/closed/wall/ice, +/area/mine/living_quarters) +"ign" = ( +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"igt" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/plaques/kiddie/library{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"igw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/sign/warning/radiation/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"igx" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"igB" = ( +/obj/machinery/firealarm/directional/west, +/turf/open/floor/glass, +/area/station/security/lockers) +"igG" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"igL" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/mine/storage) +"igM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/white, +/area/station/science/ordnance) +"igQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/central) +"igX" = ( +/obj/effect/spawner/random/maintenance/two, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ihb" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"ihc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/wood/large, +/area/station/commons/vacant_room/office) +"ihk" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/station/commons/locker) +"ihu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/science/explab) +"ihx" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Armory" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"ihB" = ( +/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/textured, +/area/station/security/execution/transfer) +"iih" = ( +/obj/effect/spawner/xmastree, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"iin" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"iio" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"iis" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"iiy" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo Bay Office - Access" + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"iiB" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"iiE" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"iiH" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig Walkway" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brigoutpost" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/brig/entrance) +"iiR" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/medical/virology) +"iiT" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"ijb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"ijd" = ( +/obj/structure/table/wood/poker, +/obj/item/trash/candle{ + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ijj" = ( +/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/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"ijn" = ( +/obj/structure/cable, +/obj/item/reagent_containers/cup/glass/bottle/hooch, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_5k, +/turf/open/floor/plating, +/area/mine/storage) +"ijp" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"ijv" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/medical/morgue) +"ijC" = ( +/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/green/half/contrasted, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"ijK" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "O2 to Airmix" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ijT" = ( +/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) +"ijV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/eva/lower) +"ijY" = ( +/obj/structure/flora/rock/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"ijZ" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"ikb" = ( +/obj/item/door_seal, +/obj/item/door_seal, +/obj/item/door_seal, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"ikd" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ikk" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/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/mail_sorting/security/detectives_office, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"ikm" = ( +/obj/structure/chair/office, +/obj/machinery/camera/directional/north{ + c_tag = "Library North" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/wood, +/area/station/service/library) +"ikz" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"ikB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/central) +"ikC" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ikI" = ( +/obj/item/gun/energy/laser/carbine/practice{ + pixel_y = 5 + }, +/obj/item/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice{ + pixel_y = -5 + }, +/obj/structure/rack, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"ikL" = ( +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"ikO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "qmprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/qm) +"ikW" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/service/chapel) +"iln" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"ilq" = ( +/obj/machinery/vending/games, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"ilv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ily" = ( +/turf/open/openspace, +/area/station/science/xenobiology) +"ilz" = ( +/obj/machinery/computer/exoscanner_control{ + dir = 1 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/dark, +/area/station/cargo/drone_bay) +"ilD" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon/keep_below, +/area/station/maintenance/port/lesser) +"ilJ" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"ilN" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"ilZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"imd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"imi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"imH" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/gloves, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"imJ" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"imO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/poster/official/fruit_bowl/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/commons/storage/art) +"ini" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"inn" = ( +/obj/structure/cable, +/turf/open/floor/iron/stairs/left{ + dir = 4 + }, +/area/station/engineering/lobby) +"inE" = ( +/turf/open/floor/iron/corner, +/area/station/engineering/lobby) +"inJ" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"inQ" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/carbon{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/newspaper{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"iog" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/medkit/emergency{ + pixel_y = 5 + }, +/obj/item/radio/off, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"iol" = ( +/obj/machinery/camera/directional/south{ + c_tag = "MiniSat Teleporter"; + network = list("minisat"); + start_active = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"ior" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"iov" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm6"; + name = "Cabin 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/dorms) +"iox" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/closet/crate/bin, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"ioz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"ioE" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/lobby) +"ioK" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/medical/morgue) +"ioO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "Atmospherics HFR Shutters" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"ioQ" = ( +/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 = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ipd" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Labor Camp Showers"; + network = list("labor") + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"ipf" = ( +/turf/open/genturf, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"ipg" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/service/chapel) +"ipw" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"ipA" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"ipE" = ( +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"ipM" = ( +/obj/structure/transit_tube/curved{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"iqn" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/machinery/light/small/directional/south, +/obj/item/toy/foamblade, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"iqu" = ( +/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/ai_monitored/turret_protected/aisat_interior) +"iqC" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"iqW" = ( +/obj/machinery/door/poddoor/massdriver_chapel{ + dir = 4 + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/station/service/chapel) +"irn" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"irp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/security{ + name = "Detective's Office" + }, +/obj/machinery/door/firedoor, +/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/detective, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"iry" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"irA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"irD" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/cargo/storage) +"irG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"irQ" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"isb" = ( +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "Infiltrate to Exfiltrate" + }, +/obj/effect/turf_decal/loading_area{ + color = "#439C1E"; + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_red/warning{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"isc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/mineral/labor_points_checker{ + pixel_y = 25 + }, +/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/mine/laborcamp) +"ise" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"isl" = ( +/obj/structure/fence/door{ + name = "graveyard" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"isq" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"ist" = ( +/obj/structure/chair/sofa/left/brown, +/obj/effect/landmark/start/psychologist, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) +"isu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/air_sensor/incinerator_tank, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"isz" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"isC" = ( +/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/radio/intercom/directional/south, +/turf/open/floor/wood/parquet, +/area/station/service/bar/backroom) +"isP" = ( +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"isU" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"isX" = ( +/obj/structure/closet/radiation, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"itf" = ( +/obj/effect/turf_decal/stripes/box, +/obj/structure/ladder, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/mine/eva) +"itj" = ( +/turf/open/floor/iron/white, +/area/station/science/genetics) +"itl" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"itt" = ( +/obj/machinery/door/window/brigdoor/right/directional/south{ + name = "Research Director Observation"; + req_access = list("rd") + }, +/obj/structure/railing/corner, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"itE" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/glass/reinforced/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"itN" = ( +/obj/item/toy/snowball{ + pixel_x = 6; + pixel_y = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"itY" = ( +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"iub" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/engineering/lobby) +"ium" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/eva) +"iuq" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/dropper, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"iuu" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iuv" = ( +/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, +/area/station/hallway/primary/central) +"iuD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"iuH" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"iuL" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"iuS" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/security/armory/upper) +"ivi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"ivm" = ( +/obj/structure/sign/poster/official/random/directional/north, +/turf/closed/wall, +/area/station/maintenance/port/aft) +"ivo" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ivq" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"ivw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"ivB" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ivF" = ( +/turf/closed/wall, +/area/station/maintenance/disposal) +"ivG" = ( +/obj/structure/table, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/crowbar, +/obj/item/radio/headset/headset_sci{ + pixel_x = -3 + }, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"ivH" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/library) +"iwf" = ( +/turf/closed/wall/r_wall, +/area/mine/mechbay) +"iwz" = ( +/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/hallway/primary/central) +"iwA" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/service/janitor) +"iwC" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/central/fore) +"iwO" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"iwQ" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"iwS" = ( +/turf/closed/wall, +/area/station/commons/dorms/laundry) +"iwV" = ( +/obj/structure/railing, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"ixa" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"ixb" = ( +/obj/machinery/button/door/directional/south{ + id = "vacantofficemaintshutter"; + name = "Privacy Shutters"; + pixel_x = 4; + pixel_y = -28 + }, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"ixl" = ( +/obj/structure/sign/plaques/kiddie/devils_tooth{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"ixu" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Teleporter" + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/command/teleporter) +"ixv" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"ixw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"ixG" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"ixZ" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Chief Engineer" + }, +/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, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"iyd" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/mine/storage) +"iye" = ( +/obj/structure/bookcase/random, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"iyg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"iyE" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"iyJ" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/textured, +/area/station/commons/toilet) +"iyK" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/photocopier, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"iyQ" = ( +/obj/structure/disposalpipe/segment, +/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/plating, +/area/station/maintenance/department/medical/morgue) +"iyY" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"izn" = ( +/obj/effect/spawner/random/decoration/generic, +/turf/open/floor/plating, +/area/station/security/prison) +"izp" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"izw" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"izA" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 8"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"izC" = ( +/turf/closed/wall, +/area/station/service/bar/atrium) +"izD" = ( +/obj/machinery/light/directional/west, +/obj/machinery/vending/assist, +/obj/structure/sign/poster/official/science/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"izI" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/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/maintenance/port/greater) +"izJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"izY" = ( +/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/visit) +"iAc" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/departments/telecomms/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"iAf" = ( +/turf/closed/wall/mineral/wood, +/area/station/maintenance/space_hut/cabin) +"iAk" = ( +/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/ai_monitored/turret_protected/aisat_interior) +"iAK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/south{ + pixel_x = 5 + }, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"iAO" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"iAQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/service/chapel) +"iBa" = ( +/obj/structure/table, +/obj/item/circular_saw, +/obj/item/scalpel{ + pixel_y = 12 + }, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"iBe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/command/bridge) +"iBg" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"iBi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/item/food/grown/carrot, +/obj/item/food/grown/carrot{ + pixel_y = 4; + pixel_x = -2 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"iBl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) +"iBo" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) +"iBF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"iBO" = ( +/obj/machinery/modular_computer/preset/civilian{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/explab) +"iCg" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"iCj" = ( +/obj/machinery/computer/operating{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"iCo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"iCp" = ( +/obj/machinery/vatgrower, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/work) +"iCq" = ( +/obj/structure/rack, +/obj/item/stack/rods/ten, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"iCz" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "robotics2"; + name = "Robotics Lab Shutters" + }, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/west{ + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"iCE" = ( +/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 = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"iCX" = ( +/obj/machinery/power/solar_control{ + dir = 4; + id = "portsolar"; + name = "Port Quarter Solar Control" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"iDe" = ( +/obj/item/wrench, +/obj/machinery/atmospherics/components/binary/pump/off/supply/visible/layer4{ + dir = 1; + name = "Air In" + }, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"iDp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall, +/area/station/ai_monitored/turret_protected/aisat_interior) +"iDq" = ( +/turf/closed/wall/r_wall, +/area/station/security/warden) +"iDt" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"iDu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"iDG" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 3"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"iDQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"iEA" = ( +/obj/structure/table/glass, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/masks, +/obj/item/storage/box/syringes{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/neck/stethoscope, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"iEN" = ( +/obj/structure/table, +/obj/item/electropack, +/obj/item/screwdriver, +/obj/item/wrench, +/obj/item/clothing/head/helmet, +/obj/item/assembly/signaler, +/obj/structure/cable, +/turf/open/floor/plating/icemoon, +/area/station/security/execution/education) +"iER" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/camera/directional/south{ + c_tag = "Xenobiology Pens Hall - Aft"; + network = list("ss13","rd","xeno_pens") + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"iFe" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/prison/work) +"iFg" = ( +/obj/structure/bed/dogbed/mcgriff, +/obj/item/food/beef_wellington_slice, +/obj/structure/cable, +/mob/living/basic/pet/dog/pug/mcgriff, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"iFj" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"iFs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"iFw" = ( +/obj/structure/closet/bombcloset, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"iFL" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"iFX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"iGa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"iGd" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"iGj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Ultilities" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"iGH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"iGQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "botany_apiary"; + name = "Apiary Shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"iHc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"iHp" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/ai) +"iHP" = ( +/obj/machinery/holopad, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/hydroponics) +"iHV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"iHZ" = ( +/obj/structure/table/glass, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/door/window/left/directional/east{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access = list("medical") + }, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) +"iIe" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"iIm" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/machinery/door/airlock{ + name = "Bar"; + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/bar) +"iIs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"iIA" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iIF" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iIJ" = ( +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"iIY" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"iJh" = ( +/obj/structure/sign/warning/gas_mask/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iJl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"iJr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/light/warm/directional/east, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"iJC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"iJE" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/rubbershot, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"iJI" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"iJK" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"iJL" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"iJN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/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/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"iJO" = ( +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"iJV" = ( +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/carpet/lone, +/area/station/service/chapel) +"iJX" = ( +/obj/item/target, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"iKd" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/closet/chefcloset, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/turf/open/floor/plating, +/area/station/service/kitchen/coldroom) +"iKh" = ( +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"iKj" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/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/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access"; + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"iKl" = ( +/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/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"iKw" = ( +/obj/item/kitchen/fork/plastic, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"iKG" = ( +/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/maintenance/aft/lesser) +"iKQ" = ( +/obj/machinery/status_display/evac/directional/east, +/turf/open/openspace, +/area/station/service/chapel) +"iKX" = ( +/obj/machinery/door/airlock{ + id_tag = "AuxToilet1"; + name = "Unit 1" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"iLa" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"iLf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"iLh" = ( +/turf/closed/wall, +/area/station/maintenance/port/lesser) +"iLi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/command/gateway) +"iLn" = ( +/obj/effect/spawner/random/trash/mess, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"iLt" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lantern, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"iLu" = ( +/obj/machinery/suit_storage_unit/captain, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"iLv" = ( +/obj/item/book/manual/wiki/tcomms{ + pixel_x = 10; + pixel_y = -1 + }, +/obj/item/book/manual/wiki/ordnance{ + pixel_x = 10; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/experimentor{ + pixel_x = 10; + pixel_y = 8 + }, +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -7; + pixel_y = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/processing) +"iLy" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/light/warm/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) +"iLA" = ( +/obj/effect/turf_decal/loading_area, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"iLE" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"iLK" = ( +/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/port/fore) +"iLY" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"iMb" = ( +/obj/structure/railing/corner, +/turf/open/floor/stone, +/area/station/commons/lounge) +"iMf" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"iMg" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/button/flasher{ + id = "cell4"; + pixel_y = -26 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"iMp" = ( +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"iMu" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals Escape Pod 1" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"iMw" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/cable, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"iMA" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"iMD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"iME" = ( +/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/textured, +/area/station/security/interrogation) +"iMT" = ( +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"iNa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"iNl" = ( +/obj/structure/fence/cut/large{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"iNn" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/start/geneticist, +/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/science/genetics) +"iNo" = ( +/turf/closed/mineral/random/snow, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"iNy" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"iNE" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"iNH" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"iNQ" = ( +/turf/open/floor/carpet, +/area/station/maintenance/space_hut/cabin) +"iNY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/white/corner, +/area/station/command/heads_quarters/rd) +"iOc" = ( +/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 = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"iOs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"iOv" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"iOw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva) +"iOF" = ( +/obj/machinery/door/poddoor/preopen{ + id = "heads_meeting"; + name = "Privacy Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/meeting_room) +"iOM" = ( +/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/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iOS" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/table, +/obj/item/book/manual/wiki/security_space_law, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"iOZ" = ( +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"iPm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"iPx" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/mining) +"iPz" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"iPR" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"iPT" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/brig/entrance) +"iQa" = ( +/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/structure/cable, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/starboard) +"iQd" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/status_display/shuttle{ + pixel_x = -32; + shuttle_id = "arrival" + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"iQj" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) +"iQx" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"iQF" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"iQK" = ( +/obj/structure/table, +/obj/item/dice/d4{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/flashlight, +/obj/item/radio/intercom/directional/west, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron, +/area/station/cargo/storage) +"iQM" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"iQQ" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/library) +"iQT" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"iQX" = ( +/obj/structure/chair/sofa/bench{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"iQY" = ( +/obj/structure/railing, +/obj/effect/turf_decal/siding/white, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/curtain/cloth/fancy/mechanical/start_closed{ + id = "cantena_curtains" + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"iRc" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + amount = 5 + }, +/obj/item/flashlight, +/turf/open/floor/plating, +/area/station/construction) +"iRo" = ( +/turf/closed/wall, +/area/station/security/checkpoint/customs/auxiliary) +"iRp" = ( +/obj/machinery/conveyor{ + dir = 10; + id = "gulag" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/mine/laborcamp) +"iRr" = ( +/obj/effect/landmark/start/depsec/engineering, +/obj/structure/chair/office, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/engineering) +"iRw" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics - West" + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iRx" = ( +/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 = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"iRz" = ( +/obj/structure/chair, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"iRA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iRJ" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix to Port" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iRM" = ( +/obj/structure/rack, +/obj/item/stack/sheet/iron/twenty, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"iRN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/science/research) +"iRV" = ( +/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/dark/textured, +/area/station/security/prison) +"iSf" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"iSl" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to Port" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iSn" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/wood, +/area/station/maintenance/port/fore) +"iSo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/fore/lesser) +"iSA" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"iSE" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"iSL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/station/engineering/lobby) +"iSQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock{ + name = "Unisex Showers" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"iST" = ( +/obj/structure/chair/office, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"iSX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/fore) +"iTr" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/duct, +/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, +/area/station/service/hydroponics) +"iTy" = ( +/obj/machinery/space_heater, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"iTB" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"iTC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/docking/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"iTJ" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/folder/white{ + pixel_x = 2 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"iTP" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"iTY" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"iUm" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"iUo" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/iron, +/area/station/security/warden) +"iUr" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +"iUs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/dorms) +"iUw" = ( +/obj/structure/closet/lasertag/blue, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"iUz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/transport/linear{ + radial_travel = 0 + }, +/obj/effect/landmark/transport/transport_id{ + specific_transport_id = "publicElevator" + }, +/obj/machinery/light/floor, +/obj/effect/abstract/elevator_music_zone{ + linked_elevator_id = "publicElevator" + }, +/turf/open/floor/plating/elevatorshaft, +/area/mine/storage) +"iUG" = ( +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"iUJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"iUM" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin/tagger, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/iron, +/area/station/cargo/office) +"iUO" = ( +/obj/machinery/camera/motion/directional/north{ + c_tag = "EVA Storage North" + }, +/obj/structure/tank_dispenser/oxygen, +/obj/effect/turf_decal/bot_white, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) +"iUT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/command/bridge) +"iUW" = ( +/obj/structure/sign/poster/contraband/random/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"iVb" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"iVg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 1 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics - South East" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iVv" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"iVA" = ( +/obj/effect/landmark/start/shaft_miner, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"iVD" = ( +/obj/structure/chair/stool/directional/east, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"iVN" = ( +/obj/machinery/vending/sustenance, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"iVT" = ( +/obj/machinery/computer/camera_advanced/xenobio, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"iVU" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"iWj" = ( +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"iWq" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"iWA" = ( +/obj/structure/closet, +/obj/effect/spawner/random/clothing/gloves, +/obj/effect/spawner/random/trash/janitor_supplies, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"iWM" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"iWP" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"iWS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/window/brigdoor/left/directional/north{ + req_access = list("brig") + }, +/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/border_only{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"iWZ" = ( +/obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iXc" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/genturf/orange, +/area/icemoon/underground/unexplored/no_rivers) +"iXg" = ( +/obj/structure/transit_tube, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"iXh" = ( +/obj/machinery/vending/cigarette, +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/east{ + pixel_y = -5 + }, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"iXk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/construction) +"iXq" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "N2O to Pure" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/engineering/atmos) +"iXu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"iXC" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"iXK" = ( +/obj/structure/reagent_dispensers/plumbed{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"iXM" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/five, +/obj/item/stack/cable_coil/five, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"iXO" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/biogenerator, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"iXP" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"iYb" = ( +/turf/closed/wall, +/area/station/maintenance/central/greater) +"iYd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/duct, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"iYe" = ( +/obj/item/kirbyplants/random, +/obj/machinery/vending/wallmed/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"iYq" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"iYs" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"iYt" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"iYy" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"iYA" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/mine/mechbay) +"iYD" = ( +/obj/structure/fence{ + dir = 2 + }, +/turf/open/genturf/blue, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"iYG" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"iYU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"iZl" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "rnd2"; + name = "Research Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/science/research) +"iZn" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"iZo" = ( +/obj/effect/turf_decal/trimline/yellow/line, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/workout) +"iZq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"iZr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/electrolyzer, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"iZs" = ( +/obj/structure/table, +/obj/item/kitchen/spoon/plastic, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"iZx" = ( +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"iZz" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"iZC" = ( +/obj/machinery/status_display/ai/directional/south, +/obj/structure/chair/sofa/right/brown{ + dir = 4 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"iZO" = ( +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"iZQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/science/xenobiology) +"iZR" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"iZW" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/button/door/directional/south{ + id = "AuxToilet2"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/trash/graffiti{ + pixel_x = -32; + spawn_loot_chance = 50 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"jag" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"jai" = ( +/obj/structure/fence/post{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"jak" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"jaq" = ( +/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) +"jaE" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"jaO" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Turbine Access" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"jaW" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"jaX" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/oil/slippery, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"jaY" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"jba" = ( +/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 = 6 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jbb" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"jbe" = ( +/obj/structure/sign/warning/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/surface/outdoors/nospawn) +"jbf" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/obj/effect/decal/cleanable/dirt, +/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/medical/cmo, +/obj/effect/turf_decal/tile/purple/full, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"jbq" = ( +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"jbx" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" + }, +/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/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/storage) +"jbz" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Library Art Gallery" + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/spawner/random/structure/table_fancy, +/obj/machinery/light/blacklight/directional/north, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"jbC" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Chemistry Stair Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) +"jbG" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/chapel) +"jbI" = ( +/obj/machinery/holopad, +/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/courtroom) +"jbJ" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"jbT" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/command/glass{ + name = "Emergency EVA Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, +/turf/open/floor/iron/textured, +/area/station/hallway/secondary/exit/departure_lounge) +"jbU" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/rd) +"jco" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"jcr" = ( +/obj/structure/bodycontainer/morgue, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"jcs" = ( +/obj/machinery/door/morgue{ + req_access = list("bar"); + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"jct" = ( +/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 + }, +/obj/structure/noticeboard/hos{ + pixel_y = 36 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"jcA" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/departments/cargo/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"jcF" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"jcJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/supply{ + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"jcP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"jdf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"jdm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"jdA" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/chair/sofa/corp/left{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay East"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"jdJ" = ( +/obj/structure/chair/wood, +/turf/open/floor/carpet, +/area/station/maintenance/space_hut/cabin) +"jdK" = ( +/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 = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"jdQ" = ( +/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/machinery/firealarm/directional/south, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/research) +"jdV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"jdW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jdY" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"jeh" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ + dir = 1 + }, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"jek" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"jer" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"jez" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jeF" = ( +/obj/effect/landmark/start/security_officer, +/turf/open/floor/glass/reinforced, +/area/station/security/office) +"jeI" = ( +/obj/item/food/grown/banana, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/grass, +/area/station/medical/virology) +"jeJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"jeK" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jeR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = 26 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"jfc" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/hop) +"jfF" = ( +/obj/structure/rack, +/obj/item/shovel, +/obj/item/clothing/mask/gas/plaguedoctor, +/obj/item/tank/internals/emergency_oxygen, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"jfR" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/command/gateway) +"jgl" = ( +/obj/effect/turf_decal/trimline/dark_blue/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"jgn" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"jgs" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/glass, +/area/station/security/lockers) +"jgx" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"jgC" = ( +/obj/structure/minecart_rail{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"jgD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wardrobe/pjs{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"jgG" = ( +/obj/structure/closet/secure_closet/security/sec, +/turf/open/floor/iron/smooth_edge, +/area/station/security/lockers) +"jgL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"jgV" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"jgW" = ( +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"jhf" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"jhi" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/hallway/primary/central/fore) +"jhj" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/chair/sofa/right/brown, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"jhy" = ( +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/storage) +"jhC" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + dir = 4; + name = "Supply multi deck pipe adapter" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"jhD" = ( +/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/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"jhH" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/book/manual/wiki/cytology{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/biopsy_tool{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/structure/table, +/turf/open/floor/iron/grimy, +/area/station/security/prison/work) +"jhQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"jhS" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jiw" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/camera/directional/south{ + c_tag = "Service - Botany Garden Access" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"jiB" = ( +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/structure/table, +/obj/machinery/door_buttons/access_button, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/north, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"jjk" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/cargo/storage) +"jjq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/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) +"jju" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"jjx" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"jjI" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/machinery/light/warm/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"jjM" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"jjO" = ( +/obj/structure/sink/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"jkn" = ( +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"jkH" = ( +/obj/structure/training_machine, +/obj/effect/landmark/blobstart, +/turf/open/floor/engine, +/area/station/science/explab) +"jkS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jkW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jkX" = ( +/obj/structure/fence{ + dir = 2 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"jla" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"jle" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"jli" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"jlj" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/tank, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"jlk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jls" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jlu" = ( +/obj/structure/railing/corner, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"jly" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"jlF" = ( +/obj/machinery/computer/arcade/amputation{ + dir = 4 + }, +/obj/item/radio/intercom/prison/directional/west, +/turf/open/floor/iron, +/area/station/security/prison/work) +"jlG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/mine/laborcamp) +"jlJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/icemoon, +/area/station/maintenance/solars/port/aft) +"jlK" = ( +/obj/structure/ore_box, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"jlP" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"jlV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jlX" = ( +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"jmc" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/mine/laborcamp) +"jms" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/plating, +/area/station/medical/virology) +"jmy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) +"jmC" = ( +/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/pen/red, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"jmD" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"jmI" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/workout) +"jmR" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"jmY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"jnp" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Cargo Bay North" + }, +/obj/machinery/light/directional/north, +/obj/structure/noticeboard/qm{ + pixel_y = 36 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"jnR" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"jnS" = ( +/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/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"jnV" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"jnW" = ( +/obj/structure/railing/wooden_fence{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"jnX" = ( +/obj/machinery/shower/directional/south, +/obj/item/bikehorn/rubberducky/plasticducky, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"joa" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/right/directional/east{ + req_access = list("brig_entrance") + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) +"joh" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/effect/turf_decal/delivery/red, +/obj/item/clothing/gloves/color/grey/protects_cold, +/obj/item/clothing/mask/gas, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/textured, +/area/station/ai_monitored/command/storage/eva) +"jol" = ( +/obj/effect/decal/cleanable/dirt, +/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/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"jpd" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"jpe" = ( +/obj/structure/rack, +/obj/machinery/light_switch/directional/north, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"jpg" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/landmark/start/bartender, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/bar) +"jpo" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint2" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jpx" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jpy" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"jpC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"jpE" = ( +/obj/structure/closet/l3closet/security, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"jpN" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"jpS" = ( +/turf/closed/wall/r_wall, +/area/station/cargo/warehouse) +"jpT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/grille_or_waste, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"jqc" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"jqj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"jqr" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/dorms) +"jqw" = ( +/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/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"jqx" = ( +/obj/structure/transit_tube/crossing/horizontal, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jqE" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/grenades, +/obj/item/book/manual/wiki/plumbing{ + pixel_x = 5 + }, +/obj/item/book/manual/wiki/chemistry{ + pixel_x = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"jqT" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/storage/tech) +"jre" = ( +/turf/closed/wall, +/area/station/maintenance/starboard/lesser) +"jrv" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"jrI" = ( +/obj/structure/transit_tube/curved/flipped, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jrQ" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/firealarm/directional/north, +/obj/structure/cable, +/obj/structure/railing/corner/end/flip, +/turf/open/floor/iron, +/area/mine/production) +"jrX" = ( +/obj/item/cigbutt, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"jrZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"jsp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/station/security/prison/work) +"jsq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/button/door/directional/north{ + id = "teledoor"; + name = "MiniSat Teleporter Shutters Control"; + req_one_access = list("teleporter","minisat") + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"jss" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jsB" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/commons/locker) +"jsC" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"jsF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/port) +"jsO" = ( +/obj/effect/spawner/random/maintenance/three, +/obj/structure/closet/crate/wooden, +/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jtm" = ( +/obj/machinery/porta_turret/ai{ + dir = 4; + installation = /obj/item/gun/energy/e_gun + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"jtn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"jtt" = ( +/obj/structure/table, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/machinery/requests_console/directional/south{ + department = "Janitorial"; + name = "Janitorial Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron, +/area/station/service/janitor) +"jtx" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"jty" = ( +/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 - Permabrig Library"; + network = list("ss13","prison") + }, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"jtA" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"jtD" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/easel, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_nineteen, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"jtE" = ( +/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/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jtG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/item/stack/sheet/iron/twenty, +/obj/structure/table, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"jtH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"jtM" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"jtN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"jug" = ( +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"jul" = ( +/obj/machinery/conveyor{ + id = "garbage" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"jum" = ( +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron/dark/corner, +/area/mine/eva) +"juq" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"jur" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"juu" = ( +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"juw" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"juH" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/mob/living/basic/parrot/poly, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"juQ" = ( +/obj/structure/rack, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"juS" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"jvj" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/chair, +/obj/item/reagent_containers/blood/random, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"jvs" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"jvw" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/medical/morgue) +"jvD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/mine/production) +"jvL" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/detectives_office) +"jvM" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"jvR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"jvS" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jvU" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"jwj" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnancefreezer" + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"jwl" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jwn" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/conveyor{ + dir = 4; + id = "robo2" + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"jwt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jwv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/trash/hobo_squat, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jww" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +"jwx" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"jwz" = ( +/obj/structure/flora/rock/icy/style_random, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"jwB" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"jwF" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"jwH" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"jwN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"jxb" = ( +/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, +/area/station/science/breakroom) +"jxc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/genetics) +"jxq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/command/nuke_storage) +"jxv" = ( +/obj/effect/landmark/start/paramedic, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"jyl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"jyo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jyp" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"jyy" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"jyz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"jyJ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"jyL" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/closet/crate/preopen, +/obj/item/stack/sheet/mineral/plasma/thirty, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) +"jyR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/checkpoint/engineering) +"jzk" = ( +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"jzn" = ( +/obj/structure/closet/secure_closet/captains, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"jzy" = ( +/obj/machinery/computer/exodrone_control_console{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/drone_bay) +"jzC" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Walkway" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brigentrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"jzH" = ( +/obj/machinery/modular_computer/preset/research{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/smooth_corner, +/area/station/command/heads_quarters/rd) +"jzY" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"jAk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/warden) +"jAq" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"jAu" = ( +/obj/structure/rack, +/obj/structure/cable, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/plating, +/area/mine/eva/lower) +"jAv" = ( +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"jAF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 5"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"jAG" = ( +/obj/structure/bed, +/obj/item/bedsheet/cmo, +/obj/machinery/light_switch/directional/south, +/obj/effect/landmark/start/chief_medical_officer, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"jAI" = ( +/obj/machinery/module_duplicator, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/science/explab) +"jAO" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jAQ" = ( +/obj/structure/window/reinforced/fulltile/ice{ + name = "frozen window" + }, +/turf/open/floor/plating, +/area/station/maintenance/space_hut/cabin) +"jBc" = ( +/obj/machinery/dna_infuser, +/obj/item/infuser_book, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"jBf" = ( +/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/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"jBh" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"jBn" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 5; + name = "labor camp"; + shuttle_id = "laborcamp_away"; + width = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"jBr" = ( +/obj/machinery/computer/security{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/security/telescreen/prison/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"jBB" = ( +/obj/structure/kitchenspike, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"jBR" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jCl" = ( +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"jCr" = ( +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"jCw" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"jCD" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/fax{ + fax_name = "Detective's Office"; + name = "Detective's Fax Machine" + }, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"jCE" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/smartfridge/petri/preloaded, +/turf/open/openspace, +/area/station/science/xenobiology) +"jCK" = ( +/obj/machinery/modular_computer/preset/cargochat/service, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) +"jCL" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"jCT" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Bridge West Access" + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jCV" = ( +/obj/machinery/computer/order_console/mining, +/obj/machinery/light/small/directional/south, +/obj/machinery/light_switch/directional/south, +/obj/machinery/newscaster/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Mining Bunks"; + network = list("ss13", "mine") + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/production) +"jDc" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/sign/departments/restroom/directional/south, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"jDl" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/cargo/miningdock) +"jDm" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "robotics2"; + name = "Robotics Lab Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"jDn" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) +"jDt" = ( +/obj/machinery/pdapainter/security, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hos) +"jDz" = ( +/obj/machinery/light/small/directional/east, +/obj/item/pickaxe, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/medical/morgue) +"jDB" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jDG" = ( +/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/prisoner, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"jDM" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/flora/bush/sunny/style_random, +/turf/open/floor/grass, +/area/station/security/warden) +"jDP" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"jDV" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jDW" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/structure/closet/crate/silvercrate, +/obj/machinery/light_switch/directional/east{ + pixel_y = 6 + }, +/obj/item/radio/intercom/directional/east{ + pixel_y = -8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"jDX" = ( +/obj/structure/training_machine, +/obj/item/target, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/commons/fitness) +"jEo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"jEs" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "gulag"; + name = "labor camp conveyor" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"jED" = ( +/obj/machinery/modular_computer/preset/civilian{ + dir = 4 + }, +/obj/effect/turf_decal/bot/left, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"jEE" = ( +/obj/structure/tank_holder/extinguisher, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jEJ" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/sign/poster/official/obey/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"jEK" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jFf" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/item/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/structure/rack, +/turf/open/floor/iron, +/area/station/command/gateway) +"jFJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) +"jFR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/mecha_part_fabricator, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"jFV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"jFZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/sign/departments/chemistry/pharmacy/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"jGg" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"jGh" = ( +/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/dark, +/area/station/tcommsat/computer) +"jGo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"jGB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/engineering/lobby) +"jGJ" = ( +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"jHb" = ( +/obj/structure/sign/warning/secure_area{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jHe" = ( +/obj/structure/table/wood, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"jHh" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"jHF" = ( +/obj/item/trash/boritos/red, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/work) +"jHG" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"jHQ" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jHX" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/landmark/navigate_destination/dockescpod1, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"jIg" = ( +/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/cargo/sorting) +"jIk" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"jIm" = ( +/obj/machinery/rnd/production/techfab/department/security, +/obj/structure/cable, +/obj/structure/noticeboard/directional/east, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/office) +"jIn" = ( +/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, +/area/station/security/checkpoint/customs/auxiliary) +"jIp" = ( +/obj/item/beacon, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"jIr" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"jIv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"jIB" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jII" = ( +/turf/closed/wall, +/area/station/hallway/primary/central) +"jIO" = ( +/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/hallway/primary/central) +"jIP" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/station/science/server) +"jIX" = ( +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/brown/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"jIZ" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"jJd" = ( +/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/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"jJe" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"jJl" = ( +/obj/effect/landmark/start/botanist, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/sign/calendar/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Botany Equipment" + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"jJA" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"jJM" = ( +/turf/open/floor/glass, +/area/station/security/lockers) +"jJQ" = ( +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato{ + pixel_y = 2; + pixel_x = 2 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"jJV" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/maintenance/department/medical/morgue) +"jJX" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jJZ" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin{ + pixel_y = 6 + }, +/obj/item/taperecorder{ + pixel_x = 9 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"jKe" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/engineering/main) +"jKh" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"jKl" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/engine, +/area/station/science/genetics) +"jKr" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/icemoon, +/area/station/security/execution/education) +"jKs" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/bar, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Atrium" + }, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/bar/atrium) +"jKy" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"jKA" = ( +/obj/machinery/light/floor, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"jKG" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"jKI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"jKJ" = ( +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"jKK" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/effect/turf_decal/tile/green, +/obj/structure/sign/plaques/kiddie, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"jKN" = ( +/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 = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"jKP" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jKQ" = ( +/obj/structure/sign/warning/fire{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jKY" = ( +/turf/closed/mineral/random/snow/high_chance, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"jLa" = ( +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/openspace, +/area/station/commons/storage/mining) +"jLc" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/machinery/chem_master/condimaster{ + desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; + name = "SapMaster XP" + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"jLf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jLl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/computer/atmos_control/nocontrol/master{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"jLo" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"jLt" = ( +/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/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"jLK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"jLM" = ( +/obj/effect/turf_decal/tile/blue, +/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/corner{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"jLO" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"jLQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/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, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"jLW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, +/obj/effect/mapping_helpers/mail_sorting/science/ordnance, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"jLX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jLZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "briggate"; + name = "Security Shutters" + }, +/obj/item/restraints/handcuffs, +/obj/item/radio/off, +/obj/structure/cable, +/obj/machinery/door/window/brigdoor/left/directional/west{ + name = "Brig Reception"; + req_access = list("security") + }, +/obj/machinery/door/window/right/directional/east{ + name = "Brig Reception" + }, +/turf/open/floor/iron/dark, +/area/station/security/brig/entrance) +"jMc" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"jMn" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Engineering Maintenance" + }, +/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/engineering/engine_equipment, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"jMr" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/spawner/random/trash/botanical_waste, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jMu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jMw" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1"; + space_dir = 2 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"jMx" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Dormitory North" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/calendar/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms) +"jME" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external/glass{ + name = "Supply Door Airlock"; + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/storage) +"jMO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jMY" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"jNf" = ( +/turf/closed/wall, +/area/station/security/prison/garden) +"jNg" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Control Room" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"jNo" = ( +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"jNp" = ( +/turf/closed/wall/r_wall, +/area/station/security/holding_cell) +"jNB" = ( +/obj/structure/chair/comfy/beige{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/station/hallway/secondary/entry) +"jNZ" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jOj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"jOp" = ( +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"jOt" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/hallway/primary/port) +"jOy" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Central Hallway West" + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/bluespace_vendor/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jOz" = ( +/obj/effect/turf_decal/trimline/blue/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line, +/obj/effect/turf_decal/trimline/blue/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line, +/obj/effect/landmark/start/paramedic, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"jOC" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/siding/wood, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Bar" + }, +/turf/open/floor/iron, +/area/station/service/bar) +"jOD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"jOJ" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"jOK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jOQ" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jOS" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Security Office"; + name = "Security Office Fax Machine" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"jPc" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "QMLoad2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"jPh" = ( +/obj/structure/grille/broken, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"jPi" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"jPl" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/requests_console/directional/east{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"jPo" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"jPq" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ + dir = 2 + }, +/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/starboard/fore) +"jPs" = ( +/obj/effect/spawner/random/engineering/canister, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"jPu" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"jPv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jPx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) +"jPL" = ( +/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/effect/spawner/random/trash/botanical_waste, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jPV" = ( +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"jPY" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"jQd" = ( +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"jQe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Filter" + }, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"jQh" = ( +/obj/structure/ladder, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"jQi" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"jQz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"jQB" = ( +/obj/machinery/door/airlock/security{ + name = "Security Office" + }, +/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, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"jQC" = ( +/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/maintenance/port/aft) +"jQD" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"jQE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"jQI" = ( +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/flashlight, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/gps/mining, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"jQS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/research) +"jQU" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "briggate"; + name = "Security Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig/entrance) +"jRd" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/mine/eva) +"jRg" = ( +/obj/structure/table, +/obj/machinery/camera/motion/directional/west{ + c_tag = "AI Upload West"; + network = list("aiupload") + }, +/obj/item/ai_module/supplied/freeform, +/obj/effect/turf_decal/tile/dark_green, +/obj/machinery/light/directional/west, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"jRi" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"jRt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"jRu" = ( +/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/siding/wideplating/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"jRA" = ( +/turf/open/openspace, +/area/station/service/bar/atrium) +"jRC" = ( +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"jRI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"jRM" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"jRP" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"jRS" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/glass/reinforced/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jRV" = ( +/obj/structure/chair/stool/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"jRX" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"jSa" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/dice, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"jSe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"jSf" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jSl" = ( +/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/engineering/storage/tech) +"jSt" = ( +/obj/machinery/door/airlock/external{ + name = "Security Yard"; + space_dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"jSC" = ( +/obj/structure/bookcase/random/reference, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/service/library) +"jSN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"jST" = ( +/obj/machinery/door/window/right/directional/north{ + name = "Bridge Delivery"; + req_access = list("command") + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/maintenance/central/greater) +"jTf" = ( +/obj/structure/fence{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"jTg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"jTm" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) +"jTr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/explab) +"jTw" = ( +/obj/machinery/power/port_gen/pacman, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jTG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "gene_shutters"; + name = "Genetics Shutters" + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"jTT" = ( +/obj/structure/chair/stool/directional/east, +/obj/machinery/light/floor, +/turf/open/floor/iron/half{ + dir = 1 + }, +/area/station/engineering/atmos) +"jTZ" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/turf/open/floor/iron/dark, +/area/station/science/server) +"jUb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/item/stack/sheet/mineral/coal{ + pixel_x = 6; + pixel_y = 3 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"jUi" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"jUn" = ( +/obj/structure/table, +/obj/item/folder/red{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/folder/red{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/storage/box/evidence{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"jUs" = ( +/obj/machinery/door/airlock/external{ + name = "Graveyard Access"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/coroner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/medical/morgue) +"jUB" = ( +/turf/closed/wall, +/area/station/medical/virology) +"jUD" = ( +/obj/structure/chair/stool/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/teleporter) +"jUW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"jUY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/item/clothing/gloves/boxing, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"jUZ" = ( +/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/airalarm/directional/east, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"jVa" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"jVb" = ( +/obj/machinery/space_heater, +/obj/machinery/light/small/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/fore) +"jVp" = ( +/obj/item/kirbyplants/fern, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jVs" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -4 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"jVE" = ( +/obj/effect/turf_decal/box/white, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"jWb" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jWl" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"jWm" = ( +/obj/effect/turf_decal/box/red/corners{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"jWq" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"jWt" = ( +/obj/structure/cable, +/obj/structure/closet/radiation, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +"jWO" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/machinery/newscaster/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/camera/directional/north{ + c_tag = "Security Post - Medbay"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"jWP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"jXe" = ( +/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/effect/decal/cleanable/dirt/dust, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"jXl" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"jXm" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"jXr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"jXH" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "mining_internal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/mine/production) +"jXL" = ( +/obj/machinery/newscaster/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit/departure_lounge) +"jXN" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"jXY" = ( +/obj/machinery/door/airlock/public/glass{ + id_tag = "gulag1"; + name = "Cell 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"jYc" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"jYj" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"jYy" = ( +/obj/structure/sink/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/structure/mirror/directional/south, +/turf/open/floor/iron/freezer, +/area/station/medical/break_room) +"jYF" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/preopen{ + id = "Biohazard"; + name = "Biohazard Containment Door" + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/noticeboard/rd{ + pixel_y = 36 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"jYG" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"jYH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"jYS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"jYV" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"jZe" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/fore/lesser) +"jZi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/public/glass{ + id_tag = "cellblock1"; + name = "Labor Camp Operations" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"jZj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Service - Atrium Entrance" + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"jZo" = ( +/obj/structure/fence{ + dir = 2 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"jZr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva) +"jZt" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"jZy" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jZD" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/station/commons/vacant_room/office) +"jZI" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/security/prison) +"jZM" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"jZU" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/construction) +"jZY" = ( +/obj/structure/tank_holder/extinguisher, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"kaw" = ( +/obj/machinery/photocopier, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/cargo/office) +"kaK" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/iron, +/area/station/construction) +"kaO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kbd" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/obj/item/clothing/shoes/workboots, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kbm" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/mechbay) +"kbn" = ( +/obj/effect/decal/cleanable/food/pie_smudge, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"kbq" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"kbs" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kbx" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/microwave{ + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kby" = ( +/obj/machinery/hydroponics/soil, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"kbJ" = ( +/obj/machinery/field/generator, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"kbL" = ( +/obj/structure/table, +/obj/machinery/light/small/dim/directional/west, +/obj/item/camera{ + pixel_y = 9; + pixel_x = -2 + }, +/obj/item/reagent_containers/cup/glass/waterbottle/empty{ + pixel_y = 5; + pixel_x = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"kbN" = ( +/obj/structure/table/wood, +/obj/item/storage/box/matches, +/obj/item/toy/cards/deck{ + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = 14; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -18; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -10; + pixel_y = 2 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/fore) +"kbS" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"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"; + dir = 4; + name = "Scrubbers multi deck pipe adapter" + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"kcf" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kcm" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/command_all, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/storage/tech) +"kcC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/item/radio/intercom/prison/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"kcD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"kcE" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kcG" = ( +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"kcM" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/prison/visit) +"kcT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"kcZ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/fore) +"kdc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"kdg" = ( +/obj/structure/railing, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/science/ordnance) +"kdy" = ( +/obj/machinery/door/poddoor/shutters{ + id = "secmechbay"; + name = "Security Mech Bay Shutters" + }, +/obj/structure/cable, +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"kdA" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/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/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"kdC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"kdF" = ( +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kdS" = ( +/obj/structure/fence{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"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) +"kdU" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"kdY" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics Waste Tank" + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"kei" = ( +/obj/docking_port/stationary/escape_pod, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kex" = ( +/obj/effect/decal/cleanable/dirt, +/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/science/explab) +"keA" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"keD" = ( +/obj/structure/easel, +/obj/item/canvas/nineteen_nineteen, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"keP" = ( +/turf/closed/wall, +/area/station/engineering/atmos/storage/gas) +"keS" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/central) +"keZ" = ( +/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/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"kfa" = ( +/obj/machinery/air_sensor/air_tank, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"kfc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"kfe" = ( +/obj/item/trash/energybar, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kfl" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/directional/south, +/obj/item/food/grown/poppy, +/obj/item/food/grown/poppy{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/food/grown/poppy{ + pixel_x = 5; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"kfr" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kfs" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"kfy" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"kfz" = ( +/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/mine/laborcamp) +"kfP" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/camera/motion/directional/south{ + c_tag = "MiniSat AI Chamber North"; + network = list("aicore") + }, +/obj/structure/cable, +/obj/machinery/flasher/directional/south{ + id = "AI"; + pixel_x = -10 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"kfQ" = ( +/obj/machinery/atmospherics/components/binary/pressure_valve/on{ + name = "Waste Release" + }, +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kfS" = ( +/obj/machinery/atmospherics/components/tank/air/layer4{ + initialize_directions = 2 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"kgc" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kgg" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ + dir = 8 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"kgl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/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/maintenance/department/medical/morgue) +"kgm" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/service/library) +"kgo" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"kgw" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"kgy" = ( +/obj/structure/cable, +/obj/effect/spawner/random/structure/steam_vent, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kgz" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/detectives_office) +"kgD" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/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/hallway/primary/central) +"kgN" = ( +/obj/structure/girder, +/obj/structure/lattice/catwalk, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"kgX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/west{ + name = "Delivery Desk"; + req_access = list("shipping") + }, +/obj/effect/turf_decal/bot, +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"kgY" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"khb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"khe" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"khs" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"khu" = ( +/obj/structure/closet/toolcloset, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/construction) +"khy" = ( +/obj/structure/rack, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"khR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/circuit, +/area/station/ai_monitored/command/nuke_storage) +"khV" = ( +/obj/structure/table, +/obj/item/ai_module/reset, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"khW" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/fore) +"kig" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"kii" = ( +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kin" = ( +/obj/machinery/pdapainter/supply, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) +"kir" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "lower-airlock-bend" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"kix" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Base" + }, +/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/supply/mining_station, +/turf/open/floor/iron/dark/textured_half, +/area/station/cargo/storage) +"kiE" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark/textured, +/area/station/maintenance/disposal/incinerator) +"kiL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"kiO" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"kiQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/command/heads_quarters/rd) +"kiR" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/item/paper_bin, +/obj/item/pen/blue{ + pixel_y = 5 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"kiX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + dir = 8; + name = "Supply multi deck pipe adapter" + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + color = "#ff0000"; + dir = 8; + name = "Scrubbers multi deck pipe adapter" + }, +/obj/structure/cable/multilayer/multiz, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kiY" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"kjd" = ( +/obj/structure/plasticflaps{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"kjh" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"kjo" = ( +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/machinery/door/airlock/engineering{ + name = "Utilities Room" + }, +/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/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kjt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"kjw" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/camera/directional/south{ + c_tag = "Solar Maintenance - North West" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"kjx" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth_half, +/area/station/medical/chemistry) +"kjy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"kjK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kjN" = ( +/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/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/starboard) +"kjP" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner/end/flip{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"kka" = ( +/obj/machinery/requests_console/auto_name/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "EVA Storage South" + }, +/obj/machinery/recharge_station, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"kke" = ( +/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/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kkl" = ( +/turf/closed/wall, +/area/station/security/interrogation) +"kkA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"kkB" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 2"; + name = "Cell 2 locker" + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/brig) +"kkD" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kkF" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/end, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"kkK" = ( +/obj/structure/table, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/crowbar, +/obj/item/weldingtool, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"kkN" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/security/courtroom) +"kkO" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark_blue, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/command{ + name = "Gateway Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/gateway, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) +"kkX" = ( +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/science/research) +"klc" = ( +/turf/closed/wall, +/area/station/medical/cryo) +"klk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"klo" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table/reinforced, +/obj/item/radio/intercom/directional/east, +/obj/item/stack/cable_coil{ + pixel_y = 3 + }, +/obj/item/stack/cable_coil, +/obj/item/multitool, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/chemistry) +"klv" = ( +/obj/structure/chair/sofa/corp/corner{ + dir = 8 + }, +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"klW" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"klX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/public/glass{ + id_tag = "cellblock1"; + name = "Labor Camp Cellblock" + }, +/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/mine/laborcamp) +"kmi" = ( +/obj/effect/landmark/blobstart, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"kmo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"kmq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"kmA" = ( +/obj/structure/bed/medical/anchored{ + dir = 4 + }, +/obj/item/bedsheet/medical, +/obj/machinery/camera/directional/east{ + c_tag = "Labor Camp Infirmary"; + network = list("labor") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/mine/laborcamp) +"kmG" = ( +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/light/cold/directional/north, +/obj/machinery/stasis{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"kmH" = ( +/obj/effect/spawner/random/entertainment/cigar, +/obj/structure/table, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"kmM" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"kmO" = ( +/obj/machinery/computer/mechpad, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"knd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"knf" = ( +/obj/effect/spawner/random/trash/mess, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"knl" = ( +/turf/open/floor/engine{ + name = "Holodeck Projector Floor" + }, +/area/station/holodeck/rec_center) +"knq" = ( +/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/workout) +"knU" = ( +/obj/machinery/vending/coffee, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"knX" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"kod" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"koH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/commons/locker) +"koO" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"kpg" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Chapel External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/service/chapel) +"kpj" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/mask/muzzle, +/obj/machinery/flasher/directional/east{ + id = "cell4"; + pixel_y = -7 + }, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"kpn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink/kitchen/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kps" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kpA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron, +/area/station/command/teleporter) +"kpC" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/mix) +"kpG" = ( +/obj/structure/table/reinforced, +/obj/item/hfr_box/body/waste_output{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/hfr_box/body/moderator_input{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"kpH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kpX" = ( +/obj/structure/bed/medical{ + dir = 4 + }, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) +"kqc" = ( +/turf/closed/wall, +/area/station/security/medical) +"kqg" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kqh" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"kql" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"kqm" = ( +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/plant_analyzer, +/obj/effect/decal/cleanable/dirt, +/obj/item/seeds/cabbage, +/obj/item/seeds/berry, +/obj/item/seeds/apple, +/obj/item/seeds/aloe, +/obj/item/seeds/garlic, +/obj/item/seeds/poppy, +/obj/item/seeds/tomato, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"kqn" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/prison) +"kqq" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Air Outlet Pump" + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white/corner, +/area/station/engineering/atmos) +"kqs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/sustenance/labor_camp, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kqw" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit/departure_lounge) +"kqG" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/small/directional/east, +/obj/effect/spawner/random/engineering/tool{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/security/mechbay) +"kqK" = ( +/obj/effect/spawner/random/trash/mess, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"kqP" = ( +/obj/machinery/door/airlock{ + name = "Unisex Showers" + }, +/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/textured, +/area/station/commons/toilet) +"kqR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"kqS" = ( +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "O2 To Pure" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kqV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/south, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "cargo-warehouse-external" + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Cargo Warehouse External Airlock"; + opacity = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"kra" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/xenobiology) +"krn" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/mine/eva/lower) +"krv" = ( +/obj/structure/sign/directions/engineering{ + pixel_x = -32; + pixel_y = -40 + }, +/obj/structure/sign/directions/medical{ + dir = 4; + pixel_x = -32; + pixel_y = -24 + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kry" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"krC" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 8 + }, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"krN" = ( +/obj/structure/sign/poster/official/random/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"krQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"krS" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"krU" = ( +/obj/machinery/telecomms/bus/preset_four, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"krY" = ( +/turf/closed/wall/r_wall, +/area/station/science/breakroom) +"krZ" = ( +/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/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"ksb" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/disposal/bin, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/fire/directional/north, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +"ksc" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kse" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"ksi" = ( +/obj/structure/displaycase, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"ksl" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Fitness" + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/commons/fitness) +"ksn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva) +"ksu" = ( +/mob/living/basic/mining/gutlunch/warrior, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"ksC" = ( +/turf/open/floor/iron, +/area/station/security/brig/upper) +"kta" = ( +/turf/closed/wall, +/area/station/commons/storage/mining) +"ktf" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"ktl" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/command/bridge) +"ktp" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"ktt" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/security/prison/work) +"ktw" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering Supermatter Fore"; + network = list("ss13","engine"); + pixel_x = 23 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"ktz" = ( +/obj/machinery/newscaster/directional/north, +/turf/open/floor/wood, +/area/station/service/library) +"ktB" = ( +/obj/effect/spawner/random/trash/hobo_squat, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"ktU" = ( +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"ktW" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"ktX" = ( +/obj/structure/fence/post{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kub" = ( +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"kuq" = ( +/obj/structure/railing, +/obj/effect/turf_decal/siding/white, +/obj/structure/curtain/cloth/fancy/mechanical/start_closed{ + id = "cantena_curtains" + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"kux" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"kuC" = ( +/obj/structure/closet/cardboard, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"kuJ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kuR" = ( +/obj/structure/barricade/wooden, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kuT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"kuV" = ( +/obj/effect/turf_decal/arrows/red, +/obj/effect/turf_decal/tile/purple/half{ + dir = 4 + }, +/turf/open/floor/iron/half{ + dir = 1 + }, +/area/station/hallway/primary/starboard) +"kuZ" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"kvf" = ( +/obj/effect/turf_decal/caution{ + dir = 4 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth, +/area/station/cargo/drone_bay) +"kvj" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"kvu" = ( +/obj/machinery/door/airlock/security{ + id_tag = "IsolationCell"; + name = "Isolation Cell" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/smooth, +/area/station/security/prison/safe) +"kvE" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/fore) +"kvR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"kvX" = ( +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/service/chapel) +"kwe" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"kwm" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 4 + }, +/obj/item/wrench, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kwn" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"kww" = ( +/obj/machinery/gibber, +/turf/open/misc/asteroid/snow/coldroom, +/area/station/service/kitchen/coldroom) +"kwz" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/stamp/head/captain, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"kwK" = ( +/obj/effect/turf_decal/tile/purple/half, +/turf/open/floor/iron/half, +/area/station/hallway/primary/starboard) +"kwM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/tank/oxygen, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"kwU" = ( +/obj/machinery/computer/records/security, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"kwX" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"kxe" = ( +/obj/structure/rack, +/obj/item/poster/random_official, +/obj/effect/spawner/random/maintenance, +/obj/item/relic, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"kxp" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security Desk" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "briggate"; + name = "Security Shutters" + }, +/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/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/brig/entrance) +"kxs" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"kxv" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"kxA" = ( +/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/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"kxY" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"kya" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kyf" = ( +/obj/structure/bookcase{ + name = "Holy Bookcase" + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"kyg" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination/dockescpod2, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/hallway/secondary/entry) +"kyi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/command/gateway) +"kyp" = ( +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"kyu" = ( +/obj/structure/closet/secure_closet/brig, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"kyy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/warden) +"kyL" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kyM" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/stairs/medium, +/area/mine/eva/lower) +"kyU" = ( +/obj/machinery/modular_computer/preset/id, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"kyV" = ( +/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/effect/spawner/random/trash/food_packaging, +/obj/effect/spawner/random/trash/cigbutt, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kzv" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet/any, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"kzw" = ( +/turf/closed/wall/r_wall, +/area/station/security/medical) +"kzx" = ( +/obj/structure/closet/crate, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/onion, +/obj/item/food/grown/onion, +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"kzA" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/engineering/engine_smes) +"kzD" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/item/multitool{ + pixel_x = 9; + pixel_y = 4 + }, +/obj/machinery/button/door{ + pixel_y = -3; + pixel_x = -3; + id = "bridge blast"; + name = "Blast Door Control" + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"kzG" = ( +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"kzO" = ( +/obj/structure/table, +/obj/machinery/cell_charger{ + pixel_y = 5 + }, +/obj/item/multitool, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"kzZ" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kAk" = ( +/obj/structure/railing/wooden_fence{ + dir = 6 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"kAn" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"kAC" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"kAG" = ( +/obj/structure/table, +/obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"kAH" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/ordnance) +"kAK" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kAQ" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"kAT" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"kAW" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/prison) +"kBc" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Holodeck Door" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "holodeck" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/station/commons/fitness) +"kBi" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Maintenance" + }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"kBl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/circuit, +/area/station/science/robotics/mechbay) +"kBr" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular{ + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"kBL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"kBU" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 5 + }, +/turf/open/floor/carpet/blue, +/area/station/hallway/secondary/entry) +"kBV" = ( +/obj/structure/table, +/obj/item/circuitboard/machine/chem_dispenser/drinks, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"kBX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"kCg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"kCn" = ( +/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/maintenance/port/aft) +"kCo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"kCs" = ( +/obj/machinery/airalarm/directional/south, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"kCu" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/commons/dorms) +"kCx" = ( +/obj/structure/table/wood, +/obj/item/book/granter/action/spell/smoke/lesser{ + name = "mysterious old book of cloud-chasing" + }, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/nullrod{ + pixel_x = 4 + }, +/turf/open/floor/cult, +/area/station/service/chapel/office) +"kCz" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/structure/chair/sofa/corp/left{ + dir = 4; + pixel_x = -4 + }, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"kCC" = ( +/obj/structure/table, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kCG" = ( +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/machinery/photocopier, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"kCH" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"kCV" = ( +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) +"kDc" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ + dir = 8 + }, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"kDj" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"kDs" = ( +/turf/closed/mineral/snowmountain/cavern/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kDu" = ( +/obj/machinery/reagentgrinder, +/obj/structure/table, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"kDv" = ( +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kDz" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/west{ + id = "Toilet1"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"kDI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/eva) +"kDO" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kEj" = ( +/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"kEn" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Security - Visitation South"; + network = list("ss13","prison") + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"kEq" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kEC" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kEM" = ( +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"kET" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"kEY" = ( +/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/maintenance/port/fore) +"kFc" = ( +/obj/structure/table/wood, +/obj/item/circuitboard/machine/fax, +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/five, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kFu" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/storage/box/lights/mixed, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"kFx" = ( +/obj/machinery/door/window/brigdoor/left/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"kFH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"kFN" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"kFO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/mine/eva) +"kFW" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"kGc" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/fax{ + fax_name = "Head of Security's Office"; + name = "Head of Security's Fax Machine" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hos) +"kGe" = ( +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door"; + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/command/bridge) +"kGm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"kGx" = ( +/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/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"kGD" = ( +/obj/structure/secure_safe/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kGF" = ( +/obj/structure/table, +/obj/item/camera_film, +/obj/item/camera, +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/directional/east{ + c_tag = "Art Storage" + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/commons/storage/art) +"kGP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"kGQ" = ( +/obj/structure/table, +/obj/item/stamp/head/qm, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) +"kHb" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/item/clothing/head/costume/pirate/bandana, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"kHj" = ( +/obj/effect/turf_decal/siding/wood, +/obj/item/kirbyplants/random/fullysynthetic{ + pixel_x = -8; + pixel_y = 21 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/stone, +/area/mine/eva/lower) +"kHl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"kHn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"kHr" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/project) +"kHI" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kHL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"kHN" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/openspace, +/area/station/science/xenobiology) +"kHP" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/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/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"kHU" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/clothing/head/utility/welding, +/obj/item/stack/sheet/mineral/plasma{ + amount = 35 + }, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/service) +"kIh" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"kIi" = ( +/obj/machinery/door/airlock{ + name = "Perma Overlook Entrance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "perma-overlook" + }, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"kIl" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/service/library, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kIo" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"kIr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"kIt" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/iron, +/area/station/engineering/storage) +"kIy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kII" = ( +/obj/machinery/space_heater, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"kIL" = ( +/obj/structure/flora/grass/green/style_random, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kIU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva) +"kJc" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"kJe" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"kJm" = ( +/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/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"kJr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chair/stool/bar/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"kJw" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) +"kJF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor/heavy{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"kJK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"kJO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kJU" = ( +/obj/structure/girder, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"kJV" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"kKv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/mail_sorting/science/genetics, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"kKy" = ( +/obj/structure/tank_holder/oxygen, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"kKH" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"kKL" = ( +/turf/closed/wall, +/area/station/maintenance/starboard/fore) +"kKT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"kKU" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kKX" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kLa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/turf/open/floor/plating, +/area/mine/eva/lower) +"kLb" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kLc" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/storage) +"kLd" = ( +/obj/structure/fence/post{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"kLo" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"kLr" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"kLy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"kLZ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kMh" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kMv" = ( +/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"kMN" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"kMY" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/engineering/storage) +"kNf" = ( +/obj/structure/table, +/obj/item/flashlight/flare/candle{ + pixel_y = 1; + pixel_x = -16 + }, +/obj/item/paper/crumpled{ + pixel_y = 3; + pixel_x = 1; + name = "used napkin" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kNi" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kNk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/turf/open/floor/iron/large, +/area/station/engineering/atmos/storage/gas) +"kNp" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"kNA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/girder, +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"kNC" = ( +/obj/structure/railing, +/obj/effect/turf_decal/siding/thinplating, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"kNQ" = ( +/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, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"kNW" = ( +/turf/closed/wall, +/area/station/cargo/warehouse) +"kNZ" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kOc" = ( +/obj/structure/chair, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"kOi" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"kOk" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"kOq" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=EVA2"; + location = "Dorm" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kOt" = ( +/obj/structure/fence/corner{ + dir = 2; + pixel_y = 0 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"kOx" = ( +/obj/structure/table/wood, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box/white/corners{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/bar) +"kOM" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"kON" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/item/restraints/handcuffs{ + pixel_y = 5 + }, +/obj/item/restraints/handcuffs{ + pixel_y = 1 + }, +/obj/item/restraints/handcuffs{ + pixel_x = 1; + pixel_y = -4 + }, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"kOR" = ( +/obj/structure/railing/wooden_fence, +/obj/item/flashlight/lantern/on, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"kOV" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/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/hallway/primary/fore) +"kOX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"kPg" = ( +/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 = 5 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"kPo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/transport/linear{ + radial_travel = 0 + }, +/turf/open/floor/plating/elevatorshaft, +/area/mine/storage) +"kPq" = ( +/obj/effect/spawner/random/structure/steam_vent, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kPu" = ( +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/structure/sign/poster/random/directional/west, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"kPv" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"kPw" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"kPy" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"kPL" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/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/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"kQc" = ( +/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/hallway/primary/fore) +"kQf" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"kQg" = ( +/obj/machinery/atmospherics/components/tank/air, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kQi" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"kQt" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Mix" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"kQz" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "ai-passthrough" + }, +/obj/structure/cable, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Atmospherics" + }, +/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) +"kQJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/cold/directional/south, +/obj/structure/sign/warning/bodysposal/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"kQM" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"kQQ" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/analyzer, +/obj/item/pipe_dispenser, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"kQY" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"kRc" = ( +/obj/machinery/light/directional/west, +/obj/structure/closet/wardrobe/grey, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron, +/area/station/commons/locker) +"kRd" = ( +/obj/structure/bookcase, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kRw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +"kRy" = ( +/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/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"kRE" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"kRH" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Chemistry Lab Exit" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "chem-airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"kRJ" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics Distribution Loop" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Distro to Waste" + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"kRP" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/central) +"kRU" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/cargo_technician, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/office) +"kRV" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kSc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kSn" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"kSv" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"kSw" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/icemoon/underground/explored) +"kSA" = ( +/obj/machinery/mining_weather_monitor/directional/east, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"kSD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kSG" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"kSM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"kSU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kTk" = ( +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/chapel/office) +"kTz" = ( +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"kTC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/primary/port) +"kTD" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"kTF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/mine/eva/lower) +"kUb" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/maintenance/fore/lesser) +"kUn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kUo" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/light/cold/directional/west, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"kUt" = ( +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"kUu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/closed/wall, +/area/station/engineering/transit_tube) +"kUx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"kUz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"kUD" = ( +/turf/open/openspace, +/area/mine/eva) +"kUF" = ( +/obj/machinery/light/directional/north, +/obj/machinery/status_display/supply{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kUJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/built/directional/south, +/obj/structure/mirror/directional/west, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"kUU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/spawner/random/structure/steam_vent, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"kVa" = ( +/obj/machinery/light/directional/south, +/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/commons/fitness) +"kVe" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"kVl" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kVv" = ( +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/five, +/obj/structure/sign/poster/contraband/little_fruits/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kVx" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kVA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/mining_weather_monitor/directional/north, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"kVF" = ( +/obj/structure/closet/secure_closet/courtroom, +/obj/item/gavelhammer, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/courtroom) +"kVI" = ( +/obj/structure/closet/firecloset, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"kVM" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"kVN" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Mining B-1 Hallway South"; + network = list("ss13", "mine") + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"kVS" = ( +/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/white, +/area/station/medical/medbay/aft) +"kWh" = ( +/obj/machinery/holopad/secure, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/hos) +"kWi" = ( +/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/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"kWk" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"kWr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"kWw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"kWL" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 1 + }, +/obj/structure/sign/warning/no_smoking/circle/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"kWN" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kWO" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/wood, +/obj/item/flashlight/lantern, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"kWV" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/maintenance/starboard/fore) +"kWW" = ( +/obj/machinery/door/airlock/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/atmos/hfr_room) +"kXf" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"kXq" = ( +/obj/machinery/air_sensor/plasma_tank, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"kXr" = ( +/turf/closed/wall, +/area/station/cargo/storage) +"kXs" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kXx" = ( +/obj/structure/table, +/obj/item/food/spaghetti/meatballspaghetti{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = -11; + pixel_y = 11 + }, +/obj/item/trash/candle{ + pixel_x = 9; + pixel_y = -1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"kXA" = ( +/turf/open/floor/iron, +/area/station/cargo/office) +"kXB" = ( +/obj/structure/table, +/obj/item/pai_card, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"kXD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"kXI" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"kXM" = ( +/obj/structure/closet/secure_closet/security/med, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"kXO" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"kXQ" = ( +/obj/machinery/power/solar_control{ + id = "auxsolareast"; + name = "Starboard Bow Solar Control" + }, +/obj/structure/cable, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"kXW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/fore) +"kXY" = ( +/turf/open/floor/iron/dark, +/area/station/security/prison/rec) +"kYc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/meter/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"kYi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kYq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/tcommsat/computer) +"kYw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"kYF" = ( +/obj/structure/light_construct/directional/west, +/mob/living/simple_animal/hostile/retaliate/goose/vomit, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"kYI" = ( +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"kYL" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/large, +/area/station/engineering/engine_smes) +"kZa" = ( +/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/stripes/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"kZb" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"kZe" = ( +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external/glass{ + name = "Cytology External Airlock" + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"kZh" = ( +/obj/structure/cable, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"kZi" = ( +/obj/machinery/space_heater, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"kZn" = ( +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/security/prison/rec) +"kZt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"kZu" = ( +/turf/closed/wall, +/area/mine/production) +"kZC" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/command/storage/eva) +"kZI" = ( +/obj/structure/rack, +/obj/effect/spawner/random/contraband/permabrig_weapon, +/obj/machinery/light/small/directional/east, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"laa" = ( +/obj/machinery/newscaster/directional/west, +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/railing/corner, +/turf/open/floor/iron/dark, +/area/station/commons/lounge) +"lab" = ( +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Secure Weapons Storage"; + req_access = list("armory") + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"laf" = ( +/obj/structure/cable, +/obj/structure/chair{ + dir = 1 + }, +/obj/item/storage/fancy/cigarettes, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lah" = ( +/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/structure/cable, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Escape"; + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/exit/departure_lounge) +"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) +"laB" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"laD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"laM" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/service/janitor) +"laV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"laY" = ( +/obj/effect/spawner/random/maintenance/three, +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lbc" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lbf" = ( +/obj/structure/flora/bush/leavy/style_random, +/obj/effect/landmark/blobstart, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"lbg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"lbk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig/upper) +"lbm" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"lbs" = ( +/obj/structure/sign/warning/fire/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"lby" = ( +/obj/effect/decal/cleanable/greenglow, +/obj/effect/decal/cleanable/plastic, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lch" = ( +/obj/machinery/computer/monitor{ + dir = 1; + name = "backup power monitoring console" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"lck" = ( +/obj/machinery/gateway/centerstation, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/gateway) +"lcs" = ( +/obj/structure/reagent_dispensers/plumbed{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lct" = ( +/obj/structure/railing, +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/science/cytology) +"lcu" = ( +/turf/open/floor/iron/white, +/area/station/science/explab) +"lcB" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"lcY" = ( +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"ldi" = ( +/obj/structure/table, +/obj/item/wallframe/camera, +/obj/item/wallframe/camera, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"ldn" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint3" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ldr" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"ldw" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"ldz" = ( +/obj/structure/rack, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/beakers{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel, +/obj/item/reagent_containers/cup/bottle/welding_fuel, +/obj/machinery/camera/directional/west{ + c_tag = "Security - Permabrig Cytology"; + network = list("ss13","prison") + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/grimy, +/area/station/security/prison/work) +"ldH" = ( +/turf/closed/wall, +/area/station/security/prison/mess) +"ldJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ldQ" = ( +/obj/structure/barricade/wooden, +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ldR" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"ldV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"lec" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"lei" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/bed/medical/emergency, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lej" = ( +/obj/structure/fence{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lek" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "packageSort2" + }, +/obj/machinery/requests_console/directional/west{ + department = "Cargo Bay"; + name = "Cargo Bay Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"leo" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"leM" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"leU" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"leW" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/storage) +"lfo" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/command/general, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron, +/area/station/command/bridge) +"lfp" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_10k, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"lfs" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"lfA" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/light/directional/north, +/obj/machinery/door_buttons/airlock_controller{ + pixel_y = 32; + idExterior = "virology_airlock_exterior"; + idInterior = "virology_airlock_interior"; + interior_airlock = "virology_airlock_control"; + name = "Virology Access Controller"; + req_access = list("virology") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"lfG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/machinery/door/airlock/command{ + name = "Quartermaster's Office" + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"lfL" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"lfU" = ( +/obj/effect/spawner/random/structure/grille, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lgg" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"lgk" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"lgw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lgx" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/station/service/bar/backroom) +"lgz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/brig/entrance) +"lgD" = ( +/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 = 8 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"lgK" = ( +/turf/closed/wall, +/area/station/security/prison/visit) +"lgO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/fore) +"lgW" = ( +/obj/machinery/meter/monitored/distro_loop, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"lha" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/storage) +"lhf" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"lhu" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Xenobiology Lab Access"; + network = list("ss13","rd","xeno") + }, +/obj/machinery/light/small/directional/north, +/turf/open/openspace, +/area/station/science/xenobiology) +"lhv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/command/bridge) +"lhC" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"lhO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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/smooth_edge{ + dir = 4 + }, +/area/station/engineering/transit_tube) +"lhQ" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"lia" = ( +/turf/open/openspace, +/area/station/service/kitchen/coldroom) +"lik" = ( +/obj/effect/landmark/start/bartender, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"lil" = ( +/obj/structure/cable, +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lis" = ( +/obj/structure/closet/secure_closet/miner, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"lit" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"lix" = ( +/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/meter/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"liz" = ( +/obj/structure/cable, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"liI" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4; + name = "Output to Waste" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"liM" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"liS" = ( +/obj/structure/closet/crate/coffin, +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/figure/chaplain, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"liV" = ( +/obj/structure/chair/sofa/bench/left, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ljl" = ( +/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/cargo/office) +"ljo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"ljp" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ljq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"ljx" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L1" + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ljz" = ( +/obj/structure/closet/crate, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"ljB" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/aft) +"ljD" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"ljE" = ( +/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, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/commons/locker) +"ljF" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) +"ljK" = ( +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/greater) +"ljL" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"ljP" = ( +/obj/machinery/space_heater, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/mine/eva/lower) +"ljT" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Primary Tool Storage" + }, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/textured, +/area/station/commons/storage/primary) +"lkb" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/inspector, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/office) +"lke" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/janitor) +"lkj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"lko" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/parquet, +/area/station/service/bar/backroom) +"lkr" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"lkz" = ( +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"lkH" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/rxglasses, +/obj/item/hand_labeler, +/obj/item/gun/syringe, +/obj/item/gun/syringe, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"lkI" = ( +/obj/machinery/computer/communications, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"lkS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/food/pie_smudge, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"lli" = ( +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lln" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/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/medical/morgue) +"llw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"llD" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/carbon, +/obj/item/pen, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"llR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/pen/red, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/yellow, +/obj/machinery/button/door/directional/west{ + id = "qmprivacy"; + name = "Privacy Shutters Control"; + req_access = list("qm") + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"llT" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lme" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/fire/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lmf" = ( +/obj/effect/turf_decal/trimline/red/warning{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"lms" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"lmv" = ( +/obj/machinery/mineral/ore_redemption{ + input_dir = 8; + output_dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/east{ + name = "Ore Redemtion Window"; + req_access = list("mineral_storeroom") + }, +/turf/open/floor/iron/dark, +/area/station/cargo/office) +"lmx" = ( +/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, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"lmy" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 5 + }, +/obj/machinery/igniter/incinerator_atmos, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"lmA" = ( +/obj/effect/turf_decal/trimline/dark_green/corner, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 6 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) +"lmK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"lmM" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/mechbay) +"lmQ" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"lmT" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Chapel North" + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"lnc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/commons/storage/tools) +"lne" = ( +/obj/structure/table/glass, +/obj/item/seeds/glowshroom, +/obj/item/seeds/bamboo{ + pixel_y = 3; + pixel_x = 4 + }, +/obj/machinery/newscaster/directional/east, +/obj/structure/sign/poster/contraband/kudzu/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lnk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"lnp" = ( +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"lnr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/confetti, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"lns" = ( +/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/plating, +/area/station/maintenance/department/chapel) +"lnx" = ( +/obj/structure/closet/crate/preopen, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"lnC" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lnL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"lnY" = ( +/obj/structure/table/glass, +/obj/structure/bedsheetbin, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"loc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "External Gas to Loop" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"log" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/central/lesser) +"lok" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"lom" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/stone, +/area/station/commons/lounge) +"loq" = ( +/obj/structure/light_construct/directional/east, +/turf/open/floor/iron, +/area/station/construction) +"loy" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/button/door/directional/east{ + id = "secmechbay"; + name = "Security Mech Garage Door Controls"; + req_access = list("security") + }, +/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/upper) +"loF" = ( +/obj/structure/table/wood, +/obj/item/toy/mecha/honk{ + pixel_y = 12 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"loO" = ( +/obj/structure/statue/snow/snowman, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"loV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lpj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "commissaryshutter"; + name = "Vacant Commissary Shutter" + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"lpy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"lpC" = ( +/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/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-med-passthrough" + }, +/obj/machinery/door/airlock/medical{ + name = "Medbay" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/large, +/area/station/maintenance/aft/greater) +"lpH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"lpL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"lpM" = ( +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/captain) +"lpS" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"lpW" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lpY" = ( +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"lqi" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/rcl/pre_loaded, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"lqj" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"lqz" = ( +/obj/structure/cable, +/turf/closed/wall, +/area/station/ai_monitored/turret_protected/ai) +"lqA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"lqE" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lqG" = ( +/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/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lqL" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lqM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lqN" = ( +/obj/structure/rack, +/obj/item/controller{ + pixel_x = -7 + }, +/obj/item/compact_remote{ + pixel_x = -7 + }, +/obj/item/compact_remote{ + pixel_x = -7 + }, +/obj/item/integrated_circuit/loaded/speech_relay{ + pixel_x = 7 + }, +/obj/item/integrated_circuit/loaded/hello_world{ + pixel_x = 7 + }, +/obj/machinery/airalarm/directional/west, +/obj/structure/sign/warning/firing_range/directional/north, +/turf/open/floor/iron/white/corner, +/area/station/science/explab) +"lqU" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"lqZ" = ( +/obj/machinery/vending/wardrobe/coroner_wardrobe, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"lrc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lrl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/binary/valve/digital/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"lrz" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"lrD" = ( +/obj/machinery/shower/directional/north, +/obj/item/soap/deluxe, +/obj/item/bikehorn/rubberducky, +/obj/structure/curtain, +/turf/open/floor/iron/freezer, +/area/station/command/heads_quarters/captain) +"lrM" = ( +/obj/effect/turf_decal/siding/wideplating_new/light{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/work) +"lsa" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "robotics2"; + name = "Robotics Lab Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"lsi" = ( +/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/hallway/primary/port) +"lsn" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/south, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/security/prison) +"lso" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"lsA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"lsF" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"lsN" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/security/prison) +"lsU" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) +"ltk" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ltE" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"ltH" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"ltP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ltV" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/fitness) +"ltW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"ltY" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Central Hallway North-East" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/sign/poster/official/random/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"lub" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"luk" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Captain's Office"; + name = "Captain's Fax Machine" + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"lup" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"lux" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"luD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = -3; + pixel_y = 9 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"luG" = ( +/obj/item/toy/snowball{ + pixel_x = 5; + pixel_y = -1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"luI" = ( +/obj/effect/spawner/random/lavaland_mob/raptor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"luP" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"luR" = ( +/obj/structure/chair/office/tactical{ + dir = 1 + }, +/obj/effect/landmark/start/coroner, +/obj/effect/turf_decal/siding/dark_blue/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"lva" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"lvb" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 8; + pixel_x = 6 + }, +/obj/item/storage/box/syringes{ + pixel_y = 8; + pixel_x = -5 + }, +/obj/item/storage/box/beakers{ + pixel_y = 5; + pixel_x = -9 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"lvk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness) +"lvl" = ( +/obj/structure/chair{ + dir = 1; + name = "Command Station" + }, +/obj/machinery/keycard_auth{ + pixel_x = 29; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"lvt" = ( +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"lvA" = ( +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door"; + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/command/bridge) +"lvB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/south, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"lvF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"lvG" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"lvQ" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"lvR" = ( +/obj/machinery/vatgrower{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"lvS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/flasher/directional/east{ + id = "brigentry" + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +"lvT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva) +"lvU" = ( +/obj/structure/closet/crate, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/prison/work) +"lvW" = ( +/obj/structure/table, +/obj/effect/spawner/random/trash/food_packaging, +/obj/effect/spawner/random/trash/food_packaging, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/radio/intercom/directional/north, +/obj/item/radio/intercom/directional/north, +/obj/item/newspaper, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals Lobby North" + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"lvY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/dorms) +"lwd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"lwi" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Mix to Filter" + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"lwF" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"lwI" = ( +/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/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lwO" = ( +/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 = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"lwQ" = ( +/turf/closed/wall, +/area/station/medical/treatment_center) +"lwR" = ( +/turf/closed/wall/r_wall, +/area/mine/living_quarters) +"lwT" = ( +/obj/machinery/mechpad, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"lxb" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"lxc" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Auxiliary Tool Storage" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"lxi" = ( +/obj/structure/closet/toolcloset, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron, +/area/station/construction) +"lxu" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lxR" = ( +/obj/effect/spawner/random/structure/crate_abandoned, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"lxT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva) +"lxU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lxY" = ( +/obj/structure/closet/crate, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"lye" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"lyg" = ( +/turf/closed/wall/r_wall, +/area/station/security/brig) +"lyq" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/storage/gas) +"lyu" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lantern, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/stone, +/area/mine/eva/lower) +"lyy" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/computer/gateway_control, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"lyG" = ( +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/security/armory/upper) +"lyH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"lyX" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"lzb" = ( +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters" + }, +/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/command/captain, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"lzq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/eva) +"lzt" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"lzx" = ( +/obj/machinery/flasher/directional/east{ + id = "executionflash" + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"lzy" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/storage_shared) +"lzD" = ( +/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, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"lzJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/sign/warning/radiation/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"lzM" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"lzO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"lzU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/sign/warning/pods/directional/north, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"lzX" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"lAc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/medical/chemistry) +"lAu" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"lAw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"lAA" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"lAC" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1"; + space_dir = 1 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"lAL" = ( +/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/showroomfloor, +/area/station/security/warden) +"lAW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Fitness" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/commons/fitness) +"lBo" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/carpet, +/area/station/service/library) +"lBt" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"lBB" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"lBD" = ( +/obj/structure/flora/grass/green/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lBN" = ( +/obj/machinery/door/morgue{ + name = "Coffin Storage"; + req_access = list("chapel_office"); + dir = 2 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"lBR" = ( +/turf/closed/wall, +/area/station/security/prison/toilet) +"lBS" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"lBZ" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 7"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"lCb" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/cable, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"lCc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lCg" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/bridge) +"lCi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"lCn" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"lCz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/roboticist, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"lCC" = ( +/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/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lCD" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/lobby) +"lCV" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/barricade/wooden{ + name = "wooden barricade (CLOSED)" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lCY" = ( +/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, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"lDh" = ( +/obj/structure/table, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/trash/tray, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"lDo" = ( +/obj/structure/sign/directions/medical{ + dir = 4; + pixel_x = 32; + pixel_y = -24 + }, +/obj/structure/sign/directions/science{ + dir = 4; + pixel_x = 32; + pixel_y = -32 + }, +/obj/structure/sign/directions/engineering{ + pixel_x = 32; + pixel_y = -40 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"lDq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"lDr" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"lDD" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/north{ + id = "labor"; + name = "Labor Camp Lockdown"; + req_access = list("brig") + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"lDF" = ( +/obj/structure/table, +/obj/item/wrench, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"lDH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"lDM" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/cryo) +"lDX" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"lEa" = ( +/obj/structure/chair/sofa/corner/brown, +/obj/structure/cable, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"lEg" = ( +/obj/machinery/door/window/left/directional/north{ + name = "AI Core Door"; + req_access = list("ai_upload") + }, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"lEj" = ( +/turf/open/floor/iron/dark/textured, +/area/station/security/processing) +"lEo" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lEv" = ( +/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/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Ordnance Launch Room" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"lEz" = ( +/obj/structure/flora/bush/flowers_pp/style_random, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"lEA" = ( +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/engine_smes) +"lEE" = ( +/obj/machinery/door/firedoor, +/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/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/port) +"lEJ" = ( +/obj/structure/table, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"lEM" = ( +/obj/structure/rack, +/obj/item/hand_labeler, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/obj/machinery/button/door/directional/east{ + id = "Trial Transfer"; + name = "Trial Transfer Lockdown"; + req_access = list("brig") + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"lEO" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/bar/atrium) +"lEP" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lET" = ( +/obj/structure/table/reinforced, +/obj/item/storage/briefcase/secure{ + pixel_y = 5 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/command/bridge) +"lFb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/starboard) +"lFe" = ( +/obj/structure/bookcase/random/adult, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/safe) +"lFg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"lFp" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"lFq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lFA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"lFG" = ( +/obj/machinery/door/airlock/engineering{ + name = "Starboard Bow Solar Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"lFL" = ( +/obj/effect/turf_decal/trimline/red/warning, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"lFW" = ( +/obj/effect/spawner/xmastree/rdrod, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"lGb" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/flashlight{ + pixel_y = 2 + }, +/obj/structure/lattice/catwalk, +/obj/machinery/camera/directional/south{ + c_tag = "Ordnance Lower Mix Lab"; + network = list("ss13","rd") + }, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"lGd" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"lGf" = ( +/obj/structure/sign/warning/directional/north, +/turf/open/genturf/blue, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"lGh" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"lGp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering Supermatter Aft"; + network = list("ss13","engine"); + pixel_x = 23 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"lGs" = ( +/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 = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"lGz" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"lGH" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lGK" = ( +/obj/machinery/vending/cigarette, +/obj/machinery/button/door{ + id = "Interrogation"; + name = "Interrogation Shutters"; + pixel_x = -22 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"lGL" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Arrivals Hallway South" + }, +/obj/machinery/newscaster/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"lGN" = ( +/obj/effect/landmark/start/botanist, +/obj/structure/chair/office/light, +/turf/open/floor/glass, +/area/station/service/hydroponics) +"lHu" = ( +/obj/structure/closet/secure_closet/brig, +/obj/structure/cable, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"lHA" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) +"lHC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"lHE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/stool/directional/east, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"lHL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "secmechbay"; + name = "Security Mech Garage Door Controls"; + req_access = list("security") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"lHV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/smartfridge/organ, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"lIk" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/breakroom) +"lIp" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/north, +/obj/item/razor{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/iron/freezer, +/area/station/command/heads_quarters/captain) +"lIt" = ( +/obj/machinery/modular_computer/preset/cargochat/security{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"lIy" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"lIC" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lII" = ( +/obj/machinery/door/airlock/engineering{ + name = "Telecommunications" + }, +/obj/effect/landmark/navigate_destination, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"lIP" = ( +/obj/effect/mapping_helpers/trapdoor_placer, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/medbay/central) +"lIQ" = ( +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, +/turf/open/floor/iron, +/area/station/service/janitor) +"lIR" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva/lower) +"lIW" = ( +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"lJg" = ( +/obj/structure/closet/crate/trashcart/laundry, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/clock/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"lJn" = ( +/obj/effect/decal/cleanable/confetti, +/obj/structure/closet/crate/cardboard, +/obj/item/storage/cans/sixbeer, +/obj/effect/spawner/random/food_or_drink/cups, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lJO" = ( +/turf/closed/wall, +/area/station/maintenance/port/fore) +"lKc" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"lKk" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"lKq" = ( +/turf/closed/wall, +/area/station/science/xenobiology) +"lKs" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"lKt" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"lKN" = ( +/obj/machinery/door/window/left/directional/west{ + req_access = list("hydroponics"); + name = "Hydroponics Equipment" + }, +/turf/open/floor/iron/half, +/area/station/service/hydroponics) +"lLf" = ( +/obj/structure/table/wood, +/obj/item/storage/dice, +/turf/open/floor/iron, +/area/station/commons/dorms) +"lLl" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"lLm" = ( +/turf/open/floor/iron/cafeteria, +/area/station/maintenance/port/aft) +"lLA" = ( +/obj/structure/sign/warning/fire{ + pixel_y = 32 + }, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"lLD" = ( +/obj/structure/closet/firecloset, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"lLE" = ( +/obj/machinery/netpod, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) +"lLN" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"lLY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/recharge_floor, +/area/mine/mechbay) +"lMa" = ( +/obj/item/trash/pistachios, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/railing/corner/end{ + dir = 8 + }, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lMd" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/item/storage/box/bandages{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/food/cheesiehonkers, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/cargo/office) +"lMg" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"lMh" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"lMC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"lNa" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/mechbay) +"lNc" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"lNi" = ( +/obj/effect/spawner/random/trash/moisture_trap, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lNj" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lNy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/status_display/evac/directional/west, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"lNC" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"lNG" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security Office" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"lNH" = ( +/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/cargo/storage) +"lNI" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/fore) +"lNP" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"lNV" = ( +/obj/structure/closet/wardrobe/grey, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"lOa" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"lOr" = ( +/obj/structure/railing, +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/security/brig) +"lOt" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/medical/morgue) +"lOA" = ( +/obj/structure/minecart_rail{ + dir = 1 + }, +/obj/item/radio/intercom/directional/west{ + frequency = 1453; + name = "Kitchen Intercom" + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"lOI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lOJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"lOP" = ( +/obj/structure/table, +/obj/item/paper, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/west{ + c_tag = "Labor Camp Cell 1"; + network = list("labor") + }, +/obj/machinery/flasher/directional/west{ + id = "GulagCell 1" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"lOU" = ( +/obj/machinery/recharge_station, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"lOV" = ( +/obj/machinery/disposal/bin{ + desc = "A pneumatic waste disposal unit. This one leads to the morgue."; + name = "corpse disposal" + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lPb" = ( +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/icemoon, +/area/station/security/execution/education) +"lPc" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) +"lPh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"lPl" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"lPq" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lPr" = ( +/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, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"lPs" = ( +/obj/structure/girder, +/obj/structure/grille, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"lPC" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/machinery/holopad, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"lPE" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"lPJ" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) +"lPK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) +"lQc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/office) +"lQe" = ( +/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) +"lQf" = ( +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/multitool, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"lQh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"lQq" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/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/courtroom) +"lQr" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"lQv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external/glass{ + name = "Garden Access" + }, +/turf/open/floor/iron/textured, +/area/station/service/hydroponics) +"lQw" = ( +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + color = "#ff0000"; + dir = 4; + name = "Scrubbers multi deck pipe adapter" + }, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + dir = 4; + name = "Supply multi deck pipe adapter" + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"lQz" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet, +/area/station/service/library) +"lQE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lQG" = ( +/obj/structure/table/glass, +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/cmo) +"lQN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"lQO" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"lRc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/mechbay) +"lRd" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"lRf" = ( +/obj/machinery/teleport/station, +/turf/open/floor/plating, +/area/station/command/teleporter) +"lRg" = ( +/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, +/area/station/hallway/secondary/entry) +"lRj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/airalarm/directional/west, +/obj/item/kirbyplants/organic/plant10, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"lRn" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"lRs" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lRx" = ( +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"lRy" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"lRD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"lRE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"lRF" = ( +/obj/structure/rack, +/obj/machinery/syndicatebomb/training, +/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/smooth_half, +/area/station/security/office) +"lRI" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Xenobiology External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"lRK" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/spawner/random/structure/crate_abandoned, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lRO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"lRR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lRW" = ( +/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/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-med-passthrough" + }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lRZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lSg" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/clothing/suit/hazardvest, +/obj/item/multitool, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"lSu" = ( +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lSP" = ( +/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/commons/storage/mining) +"lSX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"lTa" = ( +/obj/effect/turf_decal/trimline/red/warning{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"lTl" = ( +/obj/structure/closet/crate/grave, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +"lTs" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/mine/storage) +"lTC" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"lUb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/medbay/lobby) +"lUf" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"lUw" = ( +/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/upper) +"lUC" = ( +/turf/closed/wall, +/area/station/maintenance/department/electrical) +"lUN" = ( +/obj/structure/grille/broken, +/obj/effect/spawner/random/maintenance, +/obj/effect/decal/cleanable/generic, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"lUU" = ( +/obj/machinery/door/airlock/external{ + name = "Internal Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"lVc" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/table/wood/fancy/green, +/obj/effect/spawner/random/aimodule/harmless, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai_upload) +"lVk" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, +/turf/open/floor/plating, +/area/mine/eva) +"lVm" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/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 = 4 + }, +/area/station/engineering/storage_shared) +"lVr" = ( +/obj/structure/fence/cut/medium{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"lVt" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"lVu" = ( +/obj/machinery/power/emitter/welded{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"lVw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_green/line, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"lVF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/library) +"lVS" = ( +/obj/structure/sign/departments/xenobio/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lVU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"lVY" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"lWb" = ( +/turf/open/floor/iron, +/area/station/security/prison/visit) +"lWc" = ( +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/roboticist, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"lWd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door"; + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/command/bridge) +"lWf" = ( +/obj/structure/mop_bucket/janitorialcart, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lWg" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"lWG" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/fore) +"lWI" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"lXi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lXn" = ( +/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/smooth, +/area/station/maintenance/port/fore) +"lXA" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white, +/obj/machinery/mining_weather_monitor/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"lXJ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/storage/medkit/brute, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison/workout) +"lYd" = ( +/obj/machinery/computer/order_console/mining, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/production) +"lYg" = ( +/obj/structure/cable, +/obj/item/radio/intercom/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"lYR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/grass, +/area/station/medical/virology) +"lYT" = ( +/obj/structure/table, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"lZe" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"lZi" = ( +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"lZQ" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/computer/cargo{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/office) +"lZU" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"lZX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"mae" = ( +/obj/structure/statue/snow/snowman, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mao" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "pharmacy_shutters3"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) +"maB" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"maM" = ( +/obj/machinery/hydroponics/constructable, +/obj/item/seeds/soya, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"maO" = ( +/obj/machinery/disposal/bin, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"maQ" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"maT" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/storage) +"maY" = ( +/obj/item/wrench, +/obj/item/weldingtool, +/obj/item/clothing/head/utility/welding{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/structure/rack, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"mbe" = ( +/obj/structure/toilet/greyscale{ + cistern_open = 1; + dir = 1 + }, +/obj/effect/spawner/random/entertainment/cigar, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"mbk" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"mbm" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/item/radio/intercom/directional/north, +/obj/machinery/holopad, +/obj/machinery/light/warm/directional/north, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/service/bar) +"mbn" = ( +/obj/machinery/light/directional/north, +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"mbp" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"mbq" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"mbt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"mbw" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Atrium" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/kitchen, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/bar/atrium) +"mbB" = ( +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/bed/medical/emergency, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mbG" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chapel Maintenance" + }, +/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/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"mbJ" = ( +/obj/structure/sign/warning/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"mbK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/science/research) +"mbM" = ( +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"mbZ" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/door/airlock/security{ + name = "Recreation Block" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/side, +/area/station/security/prison) +"mcc" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Pod Four" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/storage_shared) +"mch" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Fitness Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"mco" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"mcp" = ( +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"mcr" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Monitoring" + }, +/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/mine/laborcamp/security) +"mct" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"mcF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/carpet/black, +/area/station/security/prison/safe) +"mcH" = ( +/obj/structure/chair{ + dir = 1 + }, +/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/smooth_large, +/area/station/command/heads_quarters/hos) +"mcW" = ( +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"mde" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/item/kirbyplants/random/dead/research_director, +/obj/machinery/computer/security/telescreen/rd/directional/west, +/turf/open/floor/iron/smooth_half, +/area/station/command/heads_quarters/rd) +"mdl" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/closet/crate/mod, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"mdo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/iron, +/area/station/security/prison/work) +"mdy" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Morgue Hallway" + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"mdE" = ( +/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, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/science/explab) +"mdI" = ( +/obj/machinery/door/airlock/atmos{ + name = "Turbine"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"mdM" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/effect/turf_decal/delivery/red, +/obj/item/clothing/gloves/color/grey/protects_cold, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron/textured, +/area/station/ai_monitored/command/storage/eva) +"mdS" = ( +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"mdX" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"mdZ" = ( +/turf/closed/wall, +/area/station/hallway/secondary/service) +"mep" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"met" = ( +/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/trimline/red/filled/warning{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"meG" = ( +/obj/item/kirbyplants/random, +/obj/structure/cable, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"meH" = ( +/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/heavy, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Ordnance Lab Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/plating, +/area/station/science/ordnance) +"meL" = ( +/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 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"meT" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "CO2 to Pure" + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"meX" = ( +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"meZ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/sign/poster/official/random/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"mfc" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark, +/area/mine/eva/lower) +"mfD" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"mfH" = ( +/turf/closed/wall/r_wall, +/area/station/security/brig/upper) +"mfP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/dim/directional/north, +/obj/effect/decal/cleanable/vomit/old, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"mfV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"mfW" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"mfX" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mga" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Pens - Port Mid"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"mgc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/right, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"mgj" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"mgo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mgs" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "riot"; + name = "Security Shutters" + }, +/obj/structure/sign/departments/court/directional/west, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/fore) +"mgv" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mgD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"mgS" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"mgU" = ( +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/hos) +"mgZ" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/closet/secure_closet/contraband/armory, +/obj/machinery/firealarm/directional/north, +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/contraband/armory, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"mhb" = ( +/obj/effect/turf_decal/trimline/dark/warning{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"mhx" = ( +/obj/effect/turf_decal/bot, +/obj/effect/landmark/secequipment, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_half, +/area/station/security/office) +"mhQ" = ( +/turf/closed/wall/r_wall, +/area/station/command/teleporter) +"mhT" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/hallway/secondary/exit/departure_lounge) +"miw" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"miK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/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/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"miS" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/stack/cable_coil, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"miY" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mjf" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +"mjg" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"mjH" = ( +/obj/structure/table/optable, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"mjI" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"mjO" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/science{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 4; + pixel_y = -4 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"mjQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/item/flashlight, +/turf/open/floor/iron, +/area/station/service/chapel) +"mjY" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mka" = ( +/obj/machinery/computer/turbine_computer{ + dir = 1; + mapping_id = "main_turbine" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +"mkb" = ( +/obj/structure/rack, +/obj/item/clothing/head/costume/fancy, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"mku" = ( +/obj/effect/spawner/random/structure/grille, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"mkA" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"mkG" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mld" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"mlo" = ( +/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/plating, +/area/station/maintenance/aft/greater) +"mlp" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"mly" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/recharge_floor, +/area/station/maintenance/department/electrical) +"mlO" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"mlR" = ( +/obj/machinery/newscaster/directional/west, +/obj/item/radio/intercom/directional/west{ + pixel_y = -31 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"mlS" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mlT" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"mmh" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"mmi" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/cargo/storage) +"mmk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"mml" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"mmn" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"mmw" = ( +/obj/machinery/oven/range, +/obj/effect/turf_decal/siding/white, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"mmA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"mmB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/medical{ + name = "Surgery South" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/aft) +"mmG" = ( +/obj/machinery/button/door/directional/east{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast DOors"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"mmR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mnm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"mns" = ( +/obj/structure/lattice/catwalk, +/obj/structure/reagent_dispensers/watertank, +/turf/open/openspace, +/area/station/science/xenobiology) +"mnu" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"mny" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"mnA" = ( +/obj/item/clothing/accessory/pocketprotector, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/camera{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/effect/spawner/random/clothing/mafia_outfit, +/obj/effect/spawner/random/clothing/mafia_outfit, +/obj/effect/spawner/random/clothing/backpack, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"mnC" = ( +/obj/structure/grille, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"mnF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"mnW" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"moy" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"moB" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"moF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"moG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"moJ" = ( +/turf/open/floor/iron/white, +/area/station/science/lab) +"moL" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/station/science/server) +"moX" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"mpe" = ( +/obj/structure/cable, +/obj/machinery/computer/quantum_console, +/turf/open/floor/iron/dark/smooth_corner, +/area/station/cargo/bitrunning/den) +"mpf" = ( +/obj/structure/cable, +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"mpg" = ( +/obj/machinery/door/airlock/grunge{ + name = "Mining Aux Mechbay" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/plating, +/area/mine/mechbay) +"mpl" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"mpn" = ( +/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/mess) +"mps" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"mpH" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"mpU" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"mqa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/greater) +"mqd" = ( +/turf/open/floor/iron/half, +/area/station/service/hydroponics) +"mqe" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"mqq" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"mqD" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"mqG" = ( +/obj/machinery/computer/warrant{ + dir = 4 + }, +/obj/machinery/camera/motion/directional/west{ + c_tag = "Security - Checkpoint" + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/brig/entrance) +"mqI" = ( +/obj/machinery/vending/boozeomat/all_access, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mqL" = ( +/obj/machinery/button/door/directional/east{ + id = "xenobio9"; + name = "Xenobio Pen 9 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"mqR" = ( +/obj/structure/chair{ + dir = 8; + name = "Judge" + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/station/security/courtroom) +"mrh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side, +/area/station/science/research) +"mrk" = ( +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"mro" = ( +/obj/structure/curtain/cloth, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"mry" = ( +/obj/structure/table, +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"mrA" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/computer/operating{ + dir = 4; + name = "Robotics Operating Computer" + }, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"mrB" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mrD" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/surgery{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/surgery_tray/full, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"mrI" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"mrU" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/structure/sink/directional/east, +/obj/machinery/requests_console/auto_name/directional/west, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"msb" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"msf" = ( +/obj/item/kirbyplants/random, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"msi" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/mine/laborcamp) +"msn" = ( +/obj/machinery/power/turbine/inlet_compressor{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"msp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table/reinforced, +/obj/item/plunger{ + pixel_x = 3 + }, +/obj/item/plunger{ + pixel_x = -3 + }, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) +"msu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/spawner/random/trash/caution_sign, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"msE" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"msG" = ( +/obj/machinery/door/airlock{ + id_tag = "Toilet2"; + name = "Unit 2" + }, +/turf/open/floor/iron/textured, +/area/station/commons/toilet) +"msN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"msT" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4; + name = "Infiltrate Control" + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) +"msU" = ( +/obj/machinery/requests_console/auto_name/directional/south, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"mta" = ( +/obj/structure/rack, +/obj/item/lighter, +/obj/item/clothing/glasses/meson{ + pixel_y = 4 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/computer_disk/engineering{ + pixel_y = 3; + pixel_x = 4 + }, +/obj/item/computer_disk/engineering{ + pixel_y = 3; + pixel_x = 4 + }, +/obj/item/computer_disk/engineering{ + pixel_y = 3; + pixel_x = 4 + }, +/obj/item/reagent_containers/pill/patch/aiuri, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"mtn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"mtq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/security/courtroom) +"mts" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"mty" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/seeds/tower, +/obj/item/seeds/chanter{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/seeds/watermelon{ + pixel_y = -6; + pixel_x = 3 + }, +/obj/item/seeds/apple{ + pixel_y = 4; + pixel_x = 2 + }, +/obj/item/seeds/banana, +/obj/item/seeds/rose{ + pixel_y = -3; + pixel_x = -4 + }, +/obj/structure/noticeboard/directional/west, +/obj/item/paper/guides/jobs/hydroponics{ + pixel_y = 3; + pixel_x = -27 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"mtI" = ( +/turf/closed/wall, +/area/station/science/robotics/lab) +"mtS" = ( +/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 = 8 + }, +/obj/machinery/status_display/door_timer{ + pixel_x = -32; + id = "Cell 2"; + name = "Cell 2" + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"mtV" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"mua" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"mue" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"mut" = ( +/obj/machinery/hydroponics/soil, +/obj/machinery/light/directional/east, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"muv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"muy" = ( +/turf/open/openspace, +/area/station/commons/locker) +"muK" = ( +/obj/item/stack/cable_coil, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"muP" = ( +/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/structure/sign/departments/rndserver/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) +"muX" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"mvc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"mvl" = ( +/turf/closed/wall/r_wall, +/area/station/security/interrogation) +"mvv" = ( +/turf/open/floor/wood, +/area/station/security/courtroom) +"mvE" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"mvG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"mwh" = ( +/obj/structure/table, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/office) +"mwm" = ( +/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/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"mwo" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/station/ai_monitored/turret_protected/aisat_interior) +"mwp" = ( +/obj/structure/disposalpipe/trunk/multiz{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"mwu" = ( +/obj/structure/closet/firecloset, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"mwF" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) +"mwQ" = ( +/obj/structure/tank_holder/extinguisher, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"mxg" = ( +/obj/structure/cable, +/obj/machinery/light/small/dim/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mxj" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port Mix to East Ports" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"mxu" = ( +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) +"mxD" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"mxF" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/fore) +"mxK" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"mxM" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Central Hallway North" + }, +/obj/structure/sign/directions/supply{ + dir = 8; + pixel_y = 32 + }, +/obj/structure/sign/directions/vault{ + dir = 8; + pixel_y = 24 + }, +/obj/structure/sign/directions/command{ + pixel_y = 40 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"mxQ" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"mxR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/commons/lounge) +"mxX" = ( +/obj/machinery/door/firedoor, +/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, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/aft) +"mxZ" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"mye" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"myn" = ( +/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/dark, +/area/station/command/heads_quarters/cmo) +"myE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"myJ" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"myO" = ( +/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/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"myP" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"myQ" = ( +/obj/structure/falsewall, +/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/safe) +"myR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"myW" = ( +/obj/structure/ore_box, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"myX" = ( +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/requests_console/directional/north{ + department = "Engineering"; + name = "Engineering Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"myZ" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"mzb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/science/ordnance) +"mzf" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light_switch/directional/north{ + pixel_y = 37 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/wood/large, +/area/station/service/bar) +"mzg" = ( +/obj/machinery/light/directional/west, +/obj/structure/closet/firecloset, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"mzl" = ( +/obj/structure/railing, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"mzr" = ( +/obj/structure/table, +/obj/item/exodrone{ + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/drone_bay) +"mzu" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"mzz" = ( +/turf/open/floor/plating, +/area/station/engineering/storage_shared) +"mzE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/engineering/atmos/storage/gas) +"mzM" = ( +/obj/structure/punching_bag, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/sign/poster/contraband/punch_shit/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"mzP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/brig/entrance) +"mzX" = ( +/obj/structure/disposalpipe/sorting/mail, +/obj/effect/mapping_helpers/mail_sorting/service/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"mzZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat/hallway"; + name = "Chamber Hallway Turret Control"; + pixel_x = 32; + pixel_y = -24; + req_access = list("minisat") + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"mAc" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Mining Maintenance" + }, +/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/supply/mining, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mAe" = ( +/turf/open/floor/glass/reinforced, +/area/station/security/lockers) +"mAn" = ( +/obj/effect/spawner/random/trash, +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"mAM" = ( +/obj/structure/ladder, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"mAN" = ( +/obj/machinery/requests_console/directional/west{ + department = "Cargo Bay"; + name = "Cargo Bay Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/machinery/camera/directional/west{ + c_tag = "Cargo Bay Office" + }, +/obj/machinery/rnd/production/techfab/department/cargo, +/turf/open/floor/iron, +/area/station/cargo/office) +"mAO" = ( +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/security/prison/rec) +"mBa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"mBh" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mBk" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/science/explab) +"mBm" = ( +/obj/machinery/door/airlock{ + id_tag = "Toilet1"; + name = "Unit 1" + }, +/turf/open/floor/iron/textured, +/area/station/commons/toilet) +"mBr" = ( +/obj/item/toy/plush/lizard_plushie{ + name = "Wines-And-Dines"; + pixel_x = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle{ + pixel_x = -9 + }, +/obj/structure/sign/flag/tizira/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"mBs" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"mBB" = ( +/obj/machinery/door/poddoor/preopen{ + id = "ceprivacy"; + name = "Privacy Shutter" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/heads_quarters/ce) +"mBL" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/requests_console/auto_name/directional/east, +/obj/structure/table, +/obj/machinery/microwave{ + pixel_y = 5 + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"mBO" = ( +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/machinery/light/small/dim/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mBP" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"mBQ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rnd"; + name = "Research Lab Shutters" + }, +/obj/machinery/door/window/right/directional/south{ + name = "Research and Development Desk"; + req_access = list("science") + }, +/obj/item/paper_bin{ + pixel_x = -9; + pixel_y = 7 + }, +/obj/item/folder{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -6 + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/plating, +/area/station/hallway/primary/starboard) +"mBV" = ( +/turf/open/misc/asteroid/snow/ice/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"mBX" = ( +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/east, +/obj/item/storage/photo_album{ + pixel_y = -1 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"mBY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"mCd" = ( +/obj/machinery/computer/operating{ + dir = 2 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"mCw" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Chamber Observation" + }, +/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/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"mCx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/dead_body_placer, +/obj/effect/turf_decal/trimline/neutral/end{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"mCz" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/obj/machinery/light/small/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"mCK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/construction) +"mCP" = ( +/obj/machinery/light/small/red/directional/south, +/obj/structure/chair{ + dir = 1 + }, +/obj/item/radio/intercom/chapel/directional/east, +/turf/open/floor/wood/large, +/area/station/service/chapel) +"mCT" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"mDf" = ( +/obj/machinery/telecomms/server/presets/common, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"mDo" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/black/double, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/carpet/black, +/area/station/security/prison/safe) +"mDq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/eva) +"mDw" = ( +/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) +"mDy" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"mDX" = ( +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"mEb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/flasher{ + pixel_y = -30; + id = "GulagCell 3" + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"mEg" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"mEv" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/east, +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"mEw" = ( +/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/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"mEx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"mEz" = ( +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"mEB" = ( +/obj/machinery/light/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"mEI" = ( +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"mEJ" = ( +/turf/closed/wall/r_wall, +/area/station/science/genetics) +"mEL" = ( +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"mEO" = ( +/obj/effect/turf_decal/box/white{ + color = "#EFB341" + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"mEU" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"mEW" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/west{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door"; + req_access = list("xenobiology") + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"mFb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/folder/white{ + pixel_x = 2 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"mFj" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"mFl" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"mFt" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Waste In" + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"mFv" = ( +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"mFy" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/obj/item/weldingtool, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"mFE" = ( +/turf/closed/wall, +/area/station/medical/surgery/aft) +"mFQ" = ( +/obj/machinery/flasher/portable, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Flash Storage"; + req_access = list("brig") + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"mFU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"mFY" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Laundry Room" + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"mGf" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mGm" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/rnd_secure_all, +/turf/open/floor/iron, +/area/station/engineering/storage/tech) +"mGs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/research{ + name = "Chemical Storage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"mGu" = ( +/obj/machinery/rnd/server, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/station/science/server) +"mGH" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/stairs/north, +/turf/open/floor/iron/stairs/medium, +/area/station/cargo/storage) +"mGJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/mine/eva) +"mGO" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mHd" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"mHe" = ( +/obj/machinery/conveyor{ + dir = 6; + id = "mining_internal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/brm, +/turf/open/floor/iron, +/area/mine/production) +"mHq" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"mHu" = ( +/obj/machinery/atmospherics/components/tank, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"mHw" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"mHB" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/fore) +"mHJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"mHR" = ( +/obj/structure/transit_tube/curved{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mIe" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"mIk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"mIs" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood, +/obj/structure/chair/stool/bar/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/eighties, +/area/station/commons/lounge) +"mIt" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "pharmacy_shutters3"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) +"mIE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"mII" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Research Delivery Access" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"mJa" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"mJj" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mJq" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"mJu" = ( +/obj/structure/table/glass, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) +"mJM" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"mJO" = ( +/obj/structure/bed, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/button/door/directional/east{ + id = "Dorm2"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"mJX" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/prison/rec) +"mKa" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"mKh" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"mKq" = ( +/obj/structure/closet/secure_closet/evidence, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/evidence) +"mKA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/structure/tank_holder/oxygen, +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mKC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/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, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/aft) +"mKJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"mKO" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"mLa" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mLd" = ( +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/kudzu/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"mLm" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"mLt" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"mLu" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/warden, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"mLJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"mLO" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Pens - Port Aft"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"mLT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"mLV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"mLX" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"mMb" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"mMk" = ( +/obj/machinery/telecomms/message_server/preset, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"mMy" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Security - Permabrig Upper Hallway South"; + network = list("ss13","prison") + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"mMD" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/carpet, +/area/station/service/library) +"mMM" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison) +"mMS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"mMU" = ( +/obj/machinery/camera/preset/ordnance{ + dir = 4 + }, +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"mNi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"mNt" = ( +/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, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"mNy" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"mNB" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"mNF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"mNJ" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"mNP" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"mNY" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/port/aft) +"mOc" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"mOf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/meter/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"mOo" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"mOx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"mOA" = ( +/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/cargo/office) +"mOL" = ( +/obj/machinery/airalarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"mOM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mPh" = ( +/obj/structure/rack, +/obj/item/crowbar, +/obj/item/wirecutters, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"mPl" = ( +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/duct, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/hydroponics) +"mPp" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/official/report_crimes/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp) +"mPq" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"mPr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"mPv" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/storage) +"mPH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"mPJ" = ( +/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/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"mQb" = ( +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mQg" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/science/rd_office, +/turf/open/floor/iron/white, +/area/station/maintenance/aft/greater) +"mQh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/command/gateway) +"mQk" = ( +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"mQq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) +"mQG" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/medical/central) +"mQW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"mRr" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"mRy" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"mRG" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/atmospherics, +/obj/item/analyzer, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"mRI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Chamber Hallway" + }, +/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/cyclelink_helper_multi{ + cycle_id = "ai-passthrough" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"mRU" = ( +/obj/effect/decal/cleanable/insectguts, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mRY" = ( +/obj/machinery/power/smes/engineering, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"mSL" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/project) +"mSM" = ( +/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/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"mSP" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plating, +/area/station/cargo/storage) +"mSQ" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/ice, +/area/icemoon/surface/outdoors/nospawn) +"mSX" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"mSY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/command/gateway) +"mTc" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"mTh" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"mTm" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ + dir = 1 + }, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"mTI" = ( +/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/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"mTS" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"mUs" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"mUt" = ( +/obj/structure/fence{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored/graveyard) +"mUE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"mVp" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"mVD" = ( +/obj/machinery/door/airlock/maintenance, +/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/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"mVE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"mVN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/broken/directional/north, +/obj/machinery/vending/dinnerware, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mVS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/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/starboard/fore) +"mWf" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"mWj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"mWo" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/engineering/lobby) +"mWs" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"mWw" = ( +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +/obj/structure/sign/warning/secure_area/directional/east, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"mWz" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"mWB" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"mWD" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"mWK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/customs/auxiliary) +"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) +"mWN" = ( +/obj/structure/disposalpipe/trunk/multiz{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"mWU" = ( +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"mWY" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"mXa" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mXe" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/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/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"mXi" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/mob/living/simple_animal/bot/secbot/pingsky, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"mXl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/east{ + c_tag = "Labor Camp Library"; + network = list("labor") + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"mXA" = ( +/obj/effect/landmark/blobstart, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"mXK" = ( +/obj/structure/table, +/obj/structure/reagent_dispensers/servingdish, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"mXN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"mXT" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/chair{ + pixel_y = -2 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"mYh" = ( +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"mYi" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Infirmary" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/mine/laborcamp) +"mYp" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/preopen{ + id = "Biohazard"; + name = "Biohazard Containment Door" + }, +/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/delivery, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"mYq" = ( +/obj/machinery/requests_console/directional/north{ + department = "Research Director's Desk"; + name = "Research Director's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/pdapainter/research, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +"mYs" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/machinery/requests_console/directional/east{ + department = "Security"; + name = "Security Requests Console" + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"mYA" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants/random, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"mYG" = ( +/obj/effect/turf_decal/bot, +/obj/structure/noticeboard/hop{ + pixel_y = 36 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"mYJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"mYR" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/item/hand_labeler{ + pixel_y = -3 + }, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"mZf" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mZk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"mZm" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"mZn" = ( +/obj/structure/sign/poster/official/soft_cap_pop_art/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/light/built/directional/east, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"mZu" = ( +/obj/structure/table/glass, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/crowbar, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/watering_can, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"mZG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/research) +"mZH" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Med-Sci Access"; + network = list("ss13","medbay","rd"); + pixel_y = -22 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/maintenance/aft/greater) +"mZI" = ( +/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/sign/warning/biohazard/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"mZJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp) +"mZK" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness) +"mZT" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/storage/box/matches, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"mZV" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/clothing/gloves/color/yellow, +/obj/item/t_scanner, +/obj/item/multitool, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"nae" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint1" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"naq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"nav" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/engineering/storage) +"naF" = ( +/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/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"naP" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/library) +"naU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"naX" = ( +/turf/closed/wall/mineral/iron, +/area/station/engineering/atmos/mix) +"nbi" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"nbj" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"nbm" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/security/prison/safe) +"nbp" = ( +/turf/closed/wall/r_wall, +/area/station/security/office) +"nbq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/command/heads_quarters/rd) +"nbs" = ( +/obj/structure/fireplace{ + pixel_x = -32 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/light_switch/directional/north{ + pixel_x = 9 + }, +/turf/open/floor/stone, +/area/mine/eva/lower) +"nbw" = ( +/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/half/contrasted{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"nbz" = ( +/obj/structure/chair/wood, +/obj/effect/mapping_helpers/no_atoms_ontop, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"nbB" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"nbC" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/medical/treatment_center) +"nbG" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/station/service/chapel) +"nbJ" = ( +/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/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"nbK" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Departure Lounge Holding Area" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"nbM" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 5 + }, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"nbT" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/commons/storage/primary) +"nbW" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"nbZ" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"nce" = ( +/obj/structure/sign/warning/fire/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nch" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/poster/official/safety_internals/directional/north, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/ai_monitored/command/storage/eva) +"nci" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"ncl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"nct" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/commons/locker) +"ncB" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Walkway" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brigentrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"ncR" = ( +/turf/closed/wall/r_wall, +/area/station/security/courtroom) +"ncT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/evidence) +"ndb" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/computer/atmos_control/ordnancemix{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"ndl" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"ndz" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ndA" = ( +/obj/structure/fence/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"ndC" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Door" + }, +/obj/effect/turf_decal/delivery, +/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, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"ndH" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"ndJ" = ( +/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/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"ndO" = ( +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/wood, +/area/station/service/library) +"nea" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "hosspace"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hos) +"nef" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/security/prison) +"nej" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"neq" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/siding/thinplating, +/turf/open/floor/iron, +/area/station/commons/locker) +"ner" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"neu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"neE" = ( +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"neF" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/clothing/shoes/magboots{ + pixel_x = -11; + pixel_y = 1 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -9; + pixel_y = -4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"neR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"nfd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"nfj" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"nfk" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"nfn" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"nfr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/mine/eva/lower) +"nfB" = ( +/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/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"nfD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"nfE" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/station/maintenance/starboard/fore) +"nfF" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"nfS" = ( +/obj/machinery/door/morgue{ + name = "Confession Booth (Chaplain)"; + req_access = list("chapel_office"); + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/service/chapel) +"nfU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"ngb" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/atmospherics, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"ngj" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 9 + }, +/obj/structure/rack, +/obj/effect/turf_decal/tile/dark/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/corner, +/area/mine/living_quarters) +"ngl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/mine/production) +"ngo" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8; + name = "Exfiltrate Port" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"ngM" = ( +/obj/structure/lattice/catwalk, +/obj/structure/fence/door{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"ngZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"nhf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"nhg" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"nhw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 4 + }, +/obj/structure/tank_holder/extinguisher, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"nhI" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Research Division Genetics Monkey Pen"; + network = list("ss13","rd") + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/engine, +/area/station/science/genetics) +"nhO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) +"nhT" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Labor Camp External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/mine/laborcamp) +"nia" = ( +/obj/machinery/door/poddoor/shutters/window{ + dir = 8; + id = "drone_bay"; + name = "Drone Bay Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"nid" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/machinery/vending/medical, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"nit" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"niu" = ( +/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/medical/medbay/central) +"niy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"niE" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"niG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva) +"niN" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/mine/eva/lower) +"niO" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/obj/machinery/reagentgrinder{ + pixel_y = 9; + pixel_x = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"niU" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/aft) +"niY" = ( +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"niZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"njb" = ( +/obj/structure/reagent_dispensers/fueltank/large, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"nji" = ( +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"njj" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/kitchen) +"njm" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/transit_tube) +"njA" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"njD" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Gateway" + }, +/obj/structure/table, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/item/emergency_bed{ + pixel_x = -1 + }, +/obj/item/emergency_bed{ + pixel_x = 4 + }, +/obj/item/storage/medkit/regular{ + pixel_y = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"njJ" = ( +/turf/closed/wall, +/area/mine/laborcamp) +"njO" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"njT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"nka" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/west, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"nkb" = ( +/obj/machinery/computer/communications{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"nkh" = ( +/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/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"nks" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"nkE" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"nkH" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"nkO" = ( +/obj/structure/table, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/cigarettes, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nkP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"nlp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"nlr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/construction) +"nlJ" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"nlO" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"nlP" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"nlR" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"nlS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/smooth_half, +/area/station/medical/chemistry) +"nlT" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=AftH"; + location = "AIW" + }, +/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, +/area/station/hallway/primary/central) +"nmj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"nmm" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/hallway/secondary/exit/departure_lounge) +"nmo" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"nmq" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/tool{ + pixel_x = -11 + }, +/obj/effect/spawner/random/engineering/tool{ + pixel_x = 5; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/security/mechbay) +"nmr" = ( +/obj/machinery/hydroponics/soil, +/obj/item/cultivator, +/obj/effect/spawner/random/contraband/cannabis, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"nmx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"nmz" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/science/ordnance/office) +"nmC" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"nmD" = ( +/obj/structure/sign/departments/holy/directional/west, +/turf/open/openspace, +/area/station/service/chapel) +"nmH" = ( +/obj/structure/disposalpipe/segment, +/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/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/fitness) +"nmI" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"nmL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"nmN" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/effect/landmark/navigate_destination/library, +/turf/open/floor/wood, +/area/station/service/library) +"nnj" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"nnl" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"nnn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"nnp" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + dir = 8; + name = "Supply multi deck pipe adapter" + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + color = "#ff0000"; + dir = 8; + name = "Scrubbers multi deck pipe adapter" + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"nnw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"nnx" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"nnB" = ( +/obj/machinery/vending/assist, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"nnR" = ( +/obj/machinery/holopad, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"nof" = ( +/obj/machinery/newscaster/directional/east, +/turf/open/floor/stone, +/area/station/commons/lounge) +"noi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva) +"nom" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nor" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/service/hydroponics/garden) +"nou" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"noJ" = ( +/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/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/official/help_others/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms) +"noM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"noR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"noW" = ( +/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/blue/filled/warning, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"noX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/engineering/lobby) +"noY" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"npa" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"npb" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"npn" = ( +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"npo" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"npq" = ( +/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 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"npr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"npu" = ( +/obj/structure/rack, +/obj/effect/turf_decal/delivery/red, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/clothing/gloves/color/black{ + pixel_x = 1; + pixel_y = 2 + }, +/obj/item/clothing/mask/breath, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/command/storage/eva) +"npx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"npy" = ( +/obj/structure/chair/comfy/beige{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/blue, +/area/station/hallway/secondary/entry) +"npB" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"npD" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/aft/greater) +"npH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"npJ" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"npL" = ( +/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/textured, +/area/station/security/prison) +"npP" = ( +/obj/machinery/door/airlock{ + id_tag = "commissarydoor"; + name = "Commissary" + }, +/obj/machinery/door/firedoor{ + 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/junction/flip{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/vacant_room/commissary) +"npT" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/explab) +"nqb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nqd" = ( +/obj/structure/table/optable, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"nqn" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"nqw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"nqD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"nqP" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Research Division West"; + network = list("ss13","rd") + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"nrm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"nrA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nrC" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "viroview"; + name = "Viewport Control"; + pixel_x = 5; + pixel_y = -21 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"nrF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"nrG" = ( +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -7; + pixel_y = 5 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"nrH" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Emitter Room Port"; + network = list("ss13","engine") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"nrJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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/service/hydroponics) +"nsj" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"nsp" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nsr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"nst" = ( +/obj/item/trash/sosjerky, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"nsu" = ( +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"nsv" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/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, +/area/station/security/interrogation) +"nsQ" = ( +/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/plating, +/area/station/maintenance/starboard/lesser) +"nsZ" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/office) +"nta" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"ntl" = ( +/turf/closed/wall/r_wall, +/area/station/service/lawoffice) +"ntm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"ntq" = ( +/obj/machinery/door/window/brigdoor/left/directional/north{ + req_access = list("brig") + }, +/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/border_only{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/processing) +"ntE" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/item/aquarium_kit, +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) +"ntK" = ( +/obj/structure/flora/rock/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ntO" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/sign/warning/deathsposal/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ntT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/wood, +/area/station/security/courtroom) +"nub" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"nud" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"nuj" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"nul" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Public Mining Storage"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"nup" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"nuD" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"nuN" = ( +/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/structure/cable, +/obj/machinery/firealarm/directional/west{ + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"nuX" = ( +/obj/structure/flora/grass/both, +/obj/structure/flora/bush/snow/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nvh" = ( +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage) +"nvr" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"nvs" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"nvx" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/structure/table, +/obj/item/folder/yellow, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"nvy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/cargo/warehouse) +"nvB" = ( +/obj/structure/fence/door{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"nvE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/mop_bucket/janitorialcart{ + dir = 4 + }, +/obj/item/mop, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"nvI" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"nvU" = ( +/obj/effect/mapping_helpers/airlock/access/all/command/eva, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/turf/open/floor/iron/textured, +/area/station/hallway/secondary/entry) +"nvW" = ( +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nvX" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"nvY" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"nwn" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"nwr" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/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, +/area/station/security/checkpoint/customs/auxiliary) +"nwA" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/light/warm/directional/north, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"nwD" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nwF" = ( +/obj/structure/chair/sofa/bench{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"nwT" = ( +/turf/closed/wall, +/area/station/commons/vacant_room/office) +"nxa" = ( +/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/side{ + dir = 9 + }, +/area/station/science/research) +"nxe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"nxm" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"nxD" = ( +/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/filingcabinet, +/obj/item/toy/figure/qm, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"nxM" = ( +/turf/closed/wall, +/area/station/maintenance/department/medical/morgue) +"nxP" = ( +/obj/structure/gulag_vent/ice, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"nxU" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"nxW" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L2" + }, +/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/hallway/primary/central) +"nxY" = ( +/obj/machinery/button/door/directional/west{ + id = "Disposal Exit"; + name = "Disposal Vent Control"; + req_access = list("maint_tunnels") + }, +/obj/structure/chair/stool/directional/south{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/computer/pod/old/mass_driver_controller/trash{ + pixel_x = -36 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"nyg" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/plating, +/area/station/construction) +"nyh" = ( +/obj/structure/sign/departments/maint/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"nyl" = ( +/obj/machinery/door/morgue{ + name = "Private Study"; + req_access = list("library") + }, +/turf/open/floor/engine/cult, +/area/station/service/library) +"nyn" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=AIE"; + location = "AftH" + }, +/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/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"nyA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/transit_tube) +"nyC" = ( +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/chapel) +"nyH" = ( +/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/command/heads_quarters/rd) +"nyJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nyP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"nyQ" = ( +/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/decal/cleanable/dirt, +/obj/structure/sink/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"nyR" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"nyT" = ( +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"nyX" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/status_display/evac/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"nyZ" = ( +/obj/structure/fence/corner{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nza" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"nzj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"nzl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/item/radio/intercom/directional/east{ + pixel_y = -6 + }, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"nzn" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"nzp" = ( +/obj/effect/landmark/blobstart, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"nzq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"nzs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"nzy" = ( +/obj/machinery/computer/atmos_control/mix_tank{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"nzA" = ( +/obj/machinery/portable_atmospherics/pipe_scrubber, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"nzB" = ( +/obj/effect/turf_decal/trimline/blue/warning{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"nzG" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"nzI" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/engine_smes) +"nzK" = ( +/obj/structure/table/reinforced, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/head/utility/welding, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/chemistry) +"nzN" = ( +/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 = 5 + }, +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"nzU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"nzV" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"nAg" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon/keep_below, +/area/station/maintenance/port/lesser) +"nAr" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"nAv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/iron/dark/side, +/area/station/security/prison) +"nAw" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/structure/noticeboard/ce{ + pixel_y = 36 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"nAx" = ( +/obj/structure/flora/grass/both/style_random, +/obj/item/stack/cable_coil/five, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nAD" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"nAH" = ( +/turf/open/openspace/icemoon/keep_below, +/area/station/hallway/secondary/entry) +"nAN" = ( +/obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"nAX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Arrivals Dock South" + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"nBe" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/crowbar, +/obj/structure/sign/warning/cold_temp/directional/west, +/turf/open/floor/iron, +/area/station/service/chapel) +"nBj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"nBk" = ( +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"nBo" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom/directional/north{ + freerange = 1; + listening = 0; + name = "Custom Channel" + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"nBt" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/item/stack/package_wrap{ + pixel_y = 2 + }, +/obj/item/book/manual/chef_recipes, +/obj/item/holosign_creator/robot_seat/restaurant, +/obj/structure/rack, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"nBE" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nBG" = ( +/obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nBN" = ( +/obj/machinery/atmospherics/components/tank/air, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard/aft) +"nBS" = ( +/obj/structure/table/wood, +/obj/item/storage/crayons, +/obj/item/storage/fancy/candle_box{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"nCb" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 1 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"nCd" = ( +/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/structure/cable, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"nCh" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"nCs" = ( +/obj/structure/chair/stool/directional/north, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"nCu" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"nCD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"nCP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/dorms) +"nCQ" = ( +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"nCV" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"nDd" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"nDp" = ( +/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 = 8 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"nDq" = ( +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"nDw" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"nDy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/fruit_bowl/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/maintenance/port/aft) +"nDA" = ( +/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, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"nDE" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/garden) +"nDJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"nDV" = ( +/obj/machinery/shower/directional/south, +/obj/effect/spawner/random/contraband/permabrig_weapon, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"nDY" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/commons/storage/art) +"nEa" = ( +/obj/item/stack/cable_coil/five, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nEc" = ( +/obj/structure/table/glass, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"nEo" = ( +/obj/machinery/light/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, +/turf/open/floor/iron, +/area/station/cargo/office) +"nEq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/caution_sign, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"nEs" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/processing) +"nEA" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/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/dark, +/area/station/hallway/secondary/entry) +"nEC" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/security/brig) +"nEV" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"nFc" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/engineering{ + name = "Engine Room" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"nFk" = ( +/obj/effect/landmark/start/cyborg, +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/structure/cable/layer3, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) +"nFn" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"nFt" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Bar and Kitchen" + }, +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/delivery, +/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/textured, +/area/station/maintenance/starboard/fore) +"nFz" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/obj/structure/sign/warning/docking/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"nFF" = ( +/obj/structure/table, +/obj/item/assembly/signaler{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/assembly/signaler{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/assembly/signaler, +/obj/item/assembly/prox_sensor{ + pixel_x = -13; + pixel_y = -1 + }, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"nFG" = ( +/obj/structure/table, +/obj/item/relic, +/obj/effect/spawner/random/maintenance, +/obj/item/screwdriver, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"nFL" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"nFN" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"nFO" = ( +/obj/structure/transit_tube/horizontal, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nFU" = ( +/obj/structure/chair/stool/directional/west, +/obj/item/trash/energybar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/official/work_for_a_future/directional/south, +/turf/open/floor/iron, +/area/station/security/prison/work) +"nGd" = ( +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"nGo" = ( +/obj/machinery/vending/games, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"nGv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/table, +/obj/item/paper_bin/construction, +/obj/item/storage/crayons{ + pixel_y = -2; + pixel_x = -3 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"nGA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"nGC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/confetti, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"nGG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 6 + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"nGK" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/barrier_grenades, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"nGU" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/security/lockers) +"nGY" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Mining B-2 Hallway"; + network = list("ss13", "mine") + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"nHe" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"nHj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/eva) +"nHs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"nHQ" = ( +/obj/structure/closet/firecloset, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"nIb" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nId" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/barricade/wooden, +/turf/open/floor/eighties/red, +/area/station/security/prison/safe) +"nIl" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"nIx" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/starboard/aft) +"nJd" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"nJo" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock" + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"nJp" = ( +/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/engineering/glass{ + name = "Engineering Storage" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/turf/open/floor/iron, +/area/station/engineering/storage) +"nJy" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"nJH" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm2"; + name = "Dorm 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/dorms) +"nJI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"nJK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"nJL" = ( +/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/border_only, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/eva) +"nJT" = ( +/obj/effect/landmark/event_spawn, +/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, +/turf/open/floor/iron/white, +/area/station/science/research) +"nJX" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/checkpoint/science) +"nKa" = ( +/turf/closed/wall, +/area/station/security/checkpoint/medical) +"nKb" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Secure Art Exhibition"; + req_access = list("library") + }, +/obj/effect/spawner/random/structure/table_fancy, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"nKk" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"nKl" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"nKr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"nKw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/lobby) +"nKK" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/structure/table, +/obj/item/folder/white{ + pixel_y = 4 + }, +/obj/item/pen/red, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"nKL" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"nKR" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"nKV" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/north{ + id = "Dozer_Launch"; + name = "Mech Bay Door Control"; + pixel_x = 4; + pixel_y = 3; + req_access = list("robotics") + }, +/obj/item/folder/red{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/paper{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/pen{ + pixel_x = -4; + pixel_y = 1 + }, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"nKW" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/item/circuitboard/computer/operating, +/obj/structure/mirror/broken/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"nKY" = ( +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"nLb" = ( +/obj/machinery/blackbox_recorder, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"nLe" = ( +/obj/effect/turf_decal/tile/dark/half/contrasted, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"nLB" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"nLE" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/sign/warning/no_smoking/circle/directional/north, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/maintenance/port/fore) +"nLH" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/command/teleporter) +"nLW" = ( +/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/trimline/yellow/line, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/workout) +"nLY" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"nMb" = ( +/obj/structure/toilet{ + pixel_y = 12 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/landmark/start/psychologist, +/turf/open/floor/iron/freezer, +/area/station/medical/break_room) +"nMc" = ( +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/station/medical/virology) +"nMj" = ( +/obj/structure/sign/warning/docking/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nMu" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/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/medical/treatment_center) +"nMv" = ( +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{ + name = "Burn Chamber Interior Airlock" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"nMw" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"nMx" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"nMA" = ( +/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/science/research) +"nME" = ( +/obj/item/clothing/head/utility/hardhat, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nMH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"nMN" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chemistry Access Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"nMP" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"nMR" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nMT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"nNe" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"nNg" = ( +/mob/living/basic/goat/pete{ + desc = "Not known for their pleasant disposition. This one seems a bit more hardy to the cold."; + habitable_atmos = list("min_oxy"=1,"max_oxy"=0,"min_plas"=0,"max_plas"=1,"min_co2"=0,"max_co2"=5,"min_n2"=0,"max_n2"=0); + minimum_survivable_temperature = 150; + name = "Snowy Pete" + }, +/turf/open/misc/ice/coldroom, +/area/station/service/kitchen/coldroom) +"nNi" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"nNn" = ( +/turf/closed/wall, +/area/station/security/prison/rec) +"nNr" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nNs" = ( +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_y = 5 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"nNu" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/cargo/storage) +"nNB" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"nNM" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"nNZ" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/obj/machinery/door/poddoor{ + id = "QMLoaddoor2"; + name = "Supply Dock Loading Door"; + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"nOa" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"nOb" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/processing) +"nOh" = ( +/obj/machinery/door/firedoor, +/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/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"nOj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/noticeboard/staff{ + pixel_y = 36 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"nOl" = ( +/obj/structure/bed, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/east{ + id = "Dorm4"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"nOx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"nOG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Supermatter Port"; + network = list("ss13","engine") + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"nOH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/bridge) +"nOQ" = ( +/obj/machinery/suit_storage_unit/security, +/obj/machinery/camera/directional/north{ + c_tag = "Security - EVA" + }, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"nOS" = ( +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"nPc" = ( +/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/service/kitchen/coldroom) +"nPo" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/science{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/shoes/winterboots{ + pixel_x = -7; + pixel_y = -1 + }, +/obj/item/biopsy_tool{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/gps/mining{ + pixel_x = -7; + pixel_y = -3 + }, +/obj/item/knife/combat/survival{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"nPs" = ( +/obj/structure/bodycontainer/morgue, +/obj/machinery/camera/directional/south{ + c_tag = "Morgue South"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"nPt" = ( +/obj/structure/chair/stool/directional/east, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"nPI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nPS" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"nQd" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"nQf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/office) +"nQh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"nQj" = ( +/obj/machinery/portable_atmospherics/pipe_scrubber, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"nQr" = ( +/obj/structure/sign/warning/docking/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nQu" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/commons/storage/primary) +"nQv" = ( +/obj/item/rcl/pre_loaded, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/machinery/newscaster/directional/west, +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/commons/storage/art) +"nQH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"nQL" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"nQO" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=AIW"; + location = "QM" + }, +/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/hallway/primary/central) +"nQU" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/stack/sheet/plasteel{ + amount = 25; + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"nQW" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"nRc" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"nRd" = ( +/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/trimline/blue/filled/line, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"nRm" = ( +/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/light/floor, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"nRn" = ( +/obj/machinery/door/window/left/directional/south{ + req_access = list("kitchen"); + name = "The Ice Box" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"nRq" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/bureaucracy/birthday_wrap, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"nRt" = ( +/obj/machinery/door/airlock/mining/glass{ + id_tag = "innercargo"; + name = "Bitrunning Den" + }, +/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/any/supply/bit_den, +/turf/open/floor/iron, +/area/station/cargo/bitrunning/den) +"nRv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"nRE" = ( +/obj/machinery/door/airlock/freezer{ + desc = "The freezer where the chef keeps all the stuff that needs to be kept cold. Ice cold."; + name = "The Ice Box" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/service/kitchen/coldroom) +"nRV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"nRW" = ( +/obj/effect/turf_decal/siding/white/end{ + dir = 4 + }, +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_y = 6 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"nRX" = ( +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"nSc" = ( +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nSk" = ( +/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, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"nSl" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nSo" = ( +/obj/structure/flora/grass/green/style_random, +/obj/structure/flora/bush/snow/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nSr" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"nSw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/layer_manifold/brown/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"nSC" = ( +/obj/structure/table, +/obj/machinery/light/small/directional/north, +/obj/machinery/microwave, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"nSD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"nSF" = ( +/obj/structure/rack, +/obj/machinery/status_display/evac/directional/south, +/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, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nST" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nSU" = ( +/obj/structure/sign/poster/random/directional/north, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"nTp" = ( +/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/full, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/brig/entrance) +"nTK" = ( +/obj/structure/table/glass, +/obj/machinery/barsign{ + chosen_sign = "thecavern"; + icon_state = "thecavern"; + pixel_y = 32 + }, +/obj/item/reagent_containers/cup/glass/bottle/vermouth{ + pixel_x = 10; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice{ + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ + pixel_x = 15 + }, +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -11; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/soda_cans/tonic, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"nTL" = ( +/obj/structure/transit_tube, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/transit_tube) +"nTO" = ( +/turf/closed/wall/r_wall, +/area/mine/laborcamp/security) +"nTV" = ( +/obj/structure/table/reinforced, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/item/radio/off, +/obj/item/radio/intercom/directional/north, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"nTX" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"nUg" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/processing) +"nUh" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"nUi" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/mine/mechbay) +"nUj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"nUr" = ( +/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/dark/smooth_half, +/area/station/ai_monitored/command/storage/eva) +"nUJ" = ( +/obj/machinery/flasher/directional/east{ + id = "brigentry" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"nUL" = ( +/obj/structure/sign/poster/official/random/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/prison) +"nVc" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"nVe" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"nVr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/service/library) +"nVx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/textured, +/area/station/service/hydroponics) +"nVB" = ( +/obj/effect/turf_decal/trimline/dark/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"nVC" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"nVJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"nVR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/maintenance/port/aft) +"nWe" = ( +/obj/machinery/light/small/directional/north, +/turf/open/openspace, +/area/station/science/research) +"nWf" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/noticeboard/directional/east, +/obj/item/plate, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"nWn" = ( +/obj/structure/tank_holder/extinguisher, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/trash/graffiti{ + pixel_y = -32; + spawn_loot_chance = 50 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"nWG" = ( +/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/plating, +/area/station/maintenance/starboard/fore) +"nWH" = ( +/turf/closed/wall, +/area/station/maintenance/department/cargo) +"nWK" = ( +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"nWM" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/mining_weather_monitor/directional/north, +/turf/open/floor/iron/dark/smooth_large, +/area/station/hallway/secondary/entry) +"nXb" = ( +/turf/closed/wall, +/area/icemoon/surface/outdoors/nospawn) +"nXg" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"nXj" = ( +/obj/machinery/vending/sovietsoda, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/safe) +"nXl" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"nXH" = ( +/obj/structure/bodycontainer/crematorium{ + id = "crematoriumChapel" + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/service/chapel/office) +"nXO" = ( +/obj/effect/spawner/random/structure/steam_vent, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nXQ" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plating, +/area/station/commons/vacant_room/commissary) +"nXV" = ( +/obj/machinery/door/airlock/security{ + name = "Permabrig Visitation" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/security/prison/visit) +"nYm" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"nYn" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"nYv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"nYz" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) +"nYZ" = ( +/obj/item/storage/bag/trash, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"nZb" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"nZd" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Trial Transfer"; + name = "Transfer Blast Door" + }, +/obj/machinery/door/airlock/public/glass{ + name = "Trial Transfer" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"nZf" = ( +/obj/structure/table, +/obj/item/folder/white, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/station/science/server) +"nZh" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/checkpoint/supply) +"nZA" = ( +/obj/structure/table, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"nZC" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/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/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp) +"nZH" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"nZN" = ( +/obj/structure/rack, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"nZU" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"nZY" = ( +/obj/machinery/door/airlock{ + id_tag = "AuxToilet2"; + name = "Unit 2" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"oad" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/security/prison) +"oaG" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = 5; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/dark/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/corner, +/area/mine/living_quarters) +"oaP" = ( +/obj/machinery/door/airlock/research{ + name = "Crater Observation Room" + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"oaQ" = ( +/obj/structure/transit_tube, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oaR" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"oaX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"obb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"obe" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"obj" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"obl" = ( +/obj/effect/spawner/random/structure/crate_abandoned, +/obj/machinery/light/small/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Chapel Electrical Maintenace Upper" + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) +"obo" = ( +/obj/machinery/light_switch/directional/north{ + pixel_x = -7 + }, +/obj/structure/table, +/obj/item/stock_parts/power_store/cell/high/empty, +/obj/machinery/cell_charger, +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"obt" = ( +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"obu" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"obv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/security/prison/work) +"obF" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"obG" = ( +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"obK" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"obQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/modular_computer/preset/civilian{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"obU" = ( +/obj/machinery/light_switch/directional/north{ + pixel_x = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "botany_chasm_and_wolf_shutters"; + name = "Exterior Shutters"; + pixel_x = -4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/hydroponics) +"obZ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Test Chamber Access"; + network = list("ss13","test","rd","xeno") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ocu" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"ocD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ocJ" = ( +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/item/storage/box/syringes{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"ocS" = ( +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"ocY" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"odd" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 6"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"odw" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ody" = ( +/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/smooth, +/area/mine/laborcamp/security) +"odz" = ( +/obj/machinery/computer/arcade/orion_trail, +/turf/open/floor/iron, +/area/station/security/prison/work) +"odC" = ( +/obj/structure/cable, +/obj/item/radio/intercom/prison/directional/east, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"odF" = ( +/obj/structure/railing, +/turf/open/openspace, +/area/station/service/kitchen/coldroom) +"odN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"odR" = ( +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/science/research) +"odW" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"oed" = ( +/obj/machinery/door/window/right/directional/east{ + name = "Robotics Surgery"; + req_access = list("robotics") + }, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"oeh" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Security Escape Airlock"; + space_dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"oex" = ( +/turf/open/openspace/icemoon/keep_below, +/area/station/maintenance/department/medical/morgue) +"oeM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"oeT" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/machinery/computer/pandemic, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"oeW" = ( +/obj/structure/table/glass, +/obj/item/stack/medical/gauze{ + pixel_x = 2 + }, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/suture, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"ofc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ofi" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ofl" = ( +/obj/structure/chair{ + desc = "Aw geez, I wonder what the chef's cooking up in there!"; + dir = 1; + name = "The Peanut's Gallery" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ofz" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/mine/eva/lower) +"ofE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, +/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/any/security/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"ofJ" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/item/paper/fluff/jobs/prisoner/letter{ + pixel_x = -8; + pixel_y = 9 + }, +/obj/item/restraints/handcuffs{ + pixel_x = 4; + pixel_y = -3 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"ofR" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/service/hydroponics) +"ogd" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"ogl" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"ogu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"ogy" = ( +/obj/machinery/door/airlock/maintenance{ + name = "EVA Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/ai_monitored/command/storage/eva) +"ogF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"ogL" = ( +/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/trimline/red/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison) +"oha" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"ohb" = ( +/obj/machinery/medical_kiosk, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/sign/departments/medbay/alt/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"ohp" = ( +/turf/open/floor/glass, +/area/station/maintenance/department/medical/central) +"oht" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/corner{ + dir = 1 + }, +/area/station/engineering/lobby) +"ohx" = ( +/obj/effect/turf_decal/caution{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ohI" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"ohO" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/lattice/catwalk, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"ohS" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Upper Permabrig Hallway Central"; + network = list("ss13","prison") + }, +/turf/open/openspace, +/area/station/security/prison) +"ohU" = ( +/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/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"oic" = ( +/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/smooth, +/area/station/medical/chemistry) +"oie" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"oif" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall, +/area/icemoon/underground/explored) +"oih" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"oik" = ( +/obj/structure/closet/emcloset, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"oio" = ( +/obj/machinery/newscaster/directional/east, +/obj/structure/bed/medical/anchored{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"oiy" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/aisat/service) +"oiz" = ( +/obj/structure/urinal/directional/north, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"oiC" = ( +/obj/effect/spawner/random/engineering/canister, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oiD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals Dock North" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"oiI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/item/radio/intercom/directional/south, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"oiM" = ( +/obj/structure/dresser, +/obj/structure/mirror/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Backstage" + }, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"oiO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"oiT" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"oiU" = ( +/obj/structure/closet/crate, +/obj/item/food/canned/beans, +/obj/item/food/canned/beans, +/obj/item/food/canned/beans, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_x = 7; + pixel_y = 6 + }, +/mob/living/basic/mouse/white, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"oiX" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/pdapainter/medbay, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"oiZ" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/vending/wardrobe/science_wardrobe, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"oje" = ( +/turf/open/misc/asteroid/snow/coldroom, +/area/station/service/kitchen/coldroom) +"ojf" = ( +/obj/structure/lattice/catwalk, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"oji" = ( +/obj/structure/table, +/obj/item/radio{ + pixel_x = -3 + }, +/obj/item/pickaxe, +/obj/item/flashlight, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/medical/morgue) +"ojk" = ( +/obj/item/stack/ore/iron, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"ojv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"ojy" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"ojF" = ( +/obj/machinery/rnd/production/protolathe/department/science, +/turf/open/floor/iron/checker, +/area/station/science/lab) +"ojW" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"okb" = ( +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"okc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "mining-aux-mechbay-external" + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining Mech Bay External Airlock"; + opacity = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/large, +/area/mine/mechbay) +"okl" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"okx" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Warden Desk"; + req_access = list("armory") + }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/window/left/directional/north{ + name = "Warden Desk" + }, +/turf/open/floor/iron, +/area/station/security/warden) +"okz" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/hallway/primary/central/fore) +"okG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/primary/starboard) +"okH" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"okU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"olf" = ( +/turf/open/floor/carpet, +/area/station/commons/dorms) +"olI" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/medicine{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/book/manual/wiki/surgery{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"olM" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/flashlight/lamp{ + start_on = 0 + }, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"olQ" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/circuit, +/area/station/ai_monitored/command/nuke_storage) +"olR" = ( +/obj/structure/rack, +/obj/item/wrench, +/obj/item/crowbar, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/lesser) +"olV" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/black, +/area/station/security/prison/safe) +"olY" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security EVA" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/smooth, +/area/station/security/processing) +"omg" = ( +/obj/effect/spawner/random/clothing/wardrobe_closet_colored, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"omh" = ( +/turf/closed/wall, +/area/station/maintenance/starboard/upper) +"omi" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"omk" = ( +/turf/open/floor/glass/reinforced, +/area/station/security/office) +"omo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"omG" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/item/paper/fluff/jobs/engineering/frequencies, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"omH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"omJ" = ( +/obj/machinery/door/airlock{ + name = "Perma Overlook Closet" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"omP" = ( +/obj/machinery/door/airlock{ + name = "Cleaning Closet" + }, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"omT" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high/empty, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"ond" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"one" = ( +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/atmos/project) +"ong" = ( +/obj/structure/rack, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/turf/open/floor/vault, +/area/station/security/prison/rec) +"oni" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/research) +"ons" = ( +/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, +/area/station/hallway/primary/port) +"onx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"onJ" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/security/courtroom) +"onP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"onQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"onT" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ooa" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"ooe" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"ool" = ( +/obj/effect/mapping_helpers/iannewyear, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"ooo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/processor/slime, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"oot" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ooy" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/tank_holder/extinguisher, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"ooG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"ooL" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ooR" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/radio/intercom/directional/north, +/obj/item/storage/fancy/donut_box{ + pixel_x = 4; + pixel_y = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ooU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"ooV" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"ooW" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/prison/rec) +"opc" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"opm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "heads_meeting"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/command/meeting_room) +"opn" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"opt" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness) +"opu" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"opy" = ( +/obj/effect/turf_decal/siding/wood, +/obj/item/kirbyplants/random/fullysynthetic{ + pixel_x = 10; + pixel_y = 19 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Mining Break Room"; + network = list("ss13", "mine") + }, +/turf/open/floor/stone, +/area/mine/eva/lower) +"opB" = ( +/obj/structure/table, +/obj/item/raw_anomaly_core/random{ + pixel_x = -7 + }, +/obj/item/raw_anomaly_core/random{ + pixel_y = 5 + }, +/obj/item/raw_anomaly_core/random{ + pixel_x = 8; + pixel_y = 9 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"opE" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"opI" = ( +/obj/machinery/microwave{ + pixel_y = 7 + }, +/obj/structure/table, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"opN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"opP" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"opS" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"opU" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing/corner/end/flip, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oqb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"oqc" = ( +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) +"oqg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/dorms) +"oqz" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"oqC" = ( +/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 = 9 + }, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/iron, +/area/station/engineering/main) +"oqE" = ( +/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/service/kitchen, +/obj/machinery/door/airlock/maintenance{ + name = "Kitchen Maintenance" + }, +/turf/open/floor/plating, +/area/station/service/kitchen/coldroom) +"oqJ" = ( +/obj/structure/sign/warning/docking/directional/north, +/obj/structure/flora/grass/green/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oqL" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/prison/work) +"oqM" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Pens Observation - Starboard Fore"; + network = list("ss13","rd","xeno") + }, +/turf/open/openspace, +/area/station/science/xenobiology) +"oqN" = ( +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"oqT" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/sofa/right/brown{ + dir = 1 + }, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"oqY" = ( +/obj/effect/spawner/random/structure/closet_private, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"orq" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/button/door/directional/south{ + id = "AuxToilet4"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/trash/graffiti{ + pixel_x = -32; + spawn_loot_chance = 50 + }, +/obj/machinery/recharge_station, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"ort" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"orv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"orE" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_y = 5 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -4 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"orK" = ( +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) +"orS" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 10 + }, +/obj/structure/rack, +/obj/effect/turf_decal/tile/dark/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/mine/living_quarters) +"orV" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/line, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"osd" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"ose" = ( +/obj/machinery/vending/tool, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/build/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"osm" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"osn" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"osr" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"osI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"osO" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"otd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ote" = ( +/obj/structure/closet/emcloset{ + anchored = 1 + }, +/obj/structure/sign/warning/cold_temp/directional/south, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"otf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/stairs/medium, +/area/station/commons/dorms/laundry) +"ots" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/station/security/prison/mess) +"otw" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Courtroom Audience" + }, +/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/courtroom) +"oty" = ( +/obj/structure/rack, +/obj/machinery/light/cold/directional/north, +/obj/item/storage/box/bandages{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/healthanalyzer, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) +"otG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"otK" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"otM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/cc64k_ad/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/fore) +"otW" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sink/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"oua" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"ouc" = ( +/obj/structure/table, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"ouk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"oul" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/treatment_center) +"ouq" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Mining B-1 Crater Observatory Access"; + network = list("ss13", "mine") + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/mine/living_quarters) +"ous" = ( +/obj/machinery/door/airlock/security/glass{ + name = "N2O Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"ouK" = ( +/obj/machinery/space_heater, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"ouP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ouU" = ( +/obj/machinery/door/airlock/external{ + name = "External Access"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"ouW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/musician/piano/random_piano, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"ouX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/closet/secure_closet/personal/patient{ + name = "test subject's closet" + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"ovm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"ovt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ovx" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/requests_console/directional/west{ + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"ovy" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ovz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/random/dead, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"ovB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/hobo_squat, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ovP" = ( +/turf/open/genturf/orange, +/area/icemoon/underground/unexplored/no_rivers) +"ovQ" = ( +/obj/structure/closet/secure_closet/detective, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"ovV" = ( +/obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/lockers) +"owf" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"owk" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"owr" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"owv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/mob/living/basic/lizard/wags_his_tail, +/turf/open/floor/iron, +/area/station/service/janitor) +"owC" = ( +/turf/closed/wall/r_wall, +/area/station/science/server) +"owG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"owK" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/starboard/lesser) +"oxh" = ( +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"oxi" = ( +/obj/machinery/camera/directional/west{ + c_tag = "MiniSat External NorthEast"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oxB" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oxO" = ( +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"oxR" = ( +/obj/structure/transit_tube/crossing/horizontal, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oxU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"oxV" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/service/chapel) +"oyb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"oyd" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +"oyj" = ( +/obj/structure/table, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/clothing/head/utility/welding{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/clothing/head/utility/welding{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/multitool, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"oyp" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/table, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"oyv" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/commons/dorms) +"oyy" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"oyz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 8; + filter_type = list(/datum/gas/nitrogen) + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"oyB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"oyC" = ( +/obj/structure/girder, +/obj/structure/grille, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/aft/lesser) +"oyH" = ( +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"oyL" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"oyM" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"oyW" = ( +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"oyX" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oyY" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"ozb" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"ozk" = ( +/obj/machinery/door/airlock{ + name = "Unisex Showers" + }, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/textured, +/area/station/commons/toilet) +"ozo" = ( +/obj/effect/landmark/carpspawn, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ozw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"ozA" = ( +/obj/structure/closet/secure_closet/research_director, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/smooth_half, +/area/station/command/heads_quarters/rd) +"ozD" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"ozE" = ( +/obj/structure/closet/emcloset, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"ozH" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"ozN" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/structure/bed/medical/emergency, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"ozU" = ( +/obj/structure/table/glass, +/obj/machinery/door/window/right/directional/north{ + name = "Hydroponics Desk"; + req_access = list("hydroponics") + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/desk_bell{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"ozV" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"ozX" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"ozZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) +"oAe" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"oAh" = ( +/turf/open/floor/glass/reinforced, +/area/station/security/brig/entrance) +"oAl" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oAm" = ( +/obj/structure/railing/wooden_fence{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"oAs" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/analyzer, +/obj/item/pipe_dispenser, +/obj/item/flashlight, +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"oAA" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/box/red, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"oAD" = ( +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"oAM" = ( +/obj/structure/fluff/tram_rail/end{ + dir = 4 + }, +/obj/structure/fluff/tram_rail/end{ + dir = 4; + pixel_y = -17 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"oAP" = ( +/obj/machinery/portable_atmospherics/canister/bz, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"oAY" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Armory - Internal - Lower" + }, +/obj/structure/rack, +/obj/item/storage/toolbox/drone, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"oBg" = ( +/obj/structure/table/wood, +/obj/item/book/bible, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"oBm" = ( +/obj/structure/chair/comfy/beige{ + dir = 1; + name = "Bench" + }, +/turf/open/floor/iron/dark, +/area/mine/eva/lower) +"oBq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 9 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"oBs" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Security"; + location = "EVA2" + }, +/obj/effect/turf_decal/plaque{ + icon_state = "L10" + }, +/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 = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"oBz" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"oBD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket{ + pixel_y = 10; + pixel_x = -4 + }, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oBI" = ( +/obj/machinery/light/floor, +/turf/open/floor/carpet, +/area/station/service/library) +"oBQ" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"oBV" = ( +/obj/item/paper/fluff/jobs/security/beepsky_mom, +/obj/machinery/light/small/dim/directional/east, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"oBZ" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oCo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/mine/laborcamp) +"oCs" = ( +/obj/structure/table, +/obj/item/radio/headset/headset_med{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/book/manual/wiki/infections{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"oCv" = ( +/obj/item/chair/plastic{ + pixel_y = 10 + }, +/obj/item/chair/plastic{ + pixel_y = 5 + }, +/obj/item/chair/plastic, +/obj/structure/rack, +/obj/item/stack/sheet/glass{ + amount = 12 + }, +/obj/item/stack/cable_coil/five, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oCA" = ( +/obj/structure/closet/secure_closet/cytology, +/obj/machinery/button/door/directional/north{ + id = "xenobiomain"; + name = "Containment Blast Doors"; + pixel_y = 32; + req_access = list("xenobiology") + }, +/obj/machinery/button/door/directional/north{ + id = "misclab"; + name = "Test Chamber Blast Doors"; + pixel_y = 23; + req_access = list("xenobiology") + }, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) +"oCE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"oCF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"oCO" = ( +/turf/closed/wall, +/area/station/service/hydroponics/garden) +"oCT" = ( +/obj/item/instrument/harmonica, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/machinery/light/small/directional/west, +/turf/open/floor/grass, +/area/station/security/prison/safe) +"oCU" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"oDb" = ( +/obj/item/popsicle_stick{ + pixel_y = 1; + pixel_x = -9 + }, +/obj/item/popsicle_stick{ + pixel_y = 3; + pixel_x = -2 + }, +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) +"oDd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"oDg" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"oDh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line, +/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/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"oDn" = ( +/obj/machinery/door/airlock/atmos/glass, +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron/dark/smooth_half, +/area/station/engineering/atmos/project) +"oDt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"oDw" = ( +/obj/structure/table, +/obj/item/petri_dish{ + pixel_y = 15; + pixel_x = -5 + }, +/obj/item/petri_dish{ + pixel_y = 10; + pixel_x = 6 + }, +/obj/item/petri_dish{ + pixel_y = -6; + pixel_x = -1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"oDB" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/mine/laborcamp) +"oDD" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 8 + }, +/obj/effect/landmark/start/botanist, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"oDH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/maintenance/port/fore) +"oDQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) +"oDV" = ( +/obj/structure/closet, +/obj/item/radio/intercom/directional/east, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"oEj" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"oEl" = ( +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable/layer3, +/obj/machinery/requests_console/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"oEt" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) +"oEy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = 3; + pixel_y = -8 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = -8 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = -6 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -7 + }, +/obj/structure/sign/warning/no_smoking/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Chemistry Lab - East"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/chemistry) +"oEB" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oED" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Test Chamber"; + network = list("ss13","test","rd","xeno") + }, +/obj/machinery/light/directional/west, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"oEE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"oEF" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/end, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/aft) +"oEX" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"oFc" = ( +/obj/structure/sign/warning/directional/north, +/turf/open/openspace/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oFd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"oFl" = ( +/obj/machinery/light/small/dim/directional/west, +/obj/structure/sign/warning/cold_temp/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"oFx" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/holopad/secure, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"oFI" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/glass/reinforced/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oFW" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"oFY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/iron, +/area/station/engineering/storage) +"oFZ" = ( +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/window/left/directional/east{ + name = "Drone Bay Access"; + req_access = list("cargo") + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"oGj" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/smartfridge/petri/preloaded, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"oGm" = ( +/obj/machinery/power/solar_control{ + dir = 1; + id = "starboardsolar"; + name = "Starboard Quarter Solar Control" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"oGr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/off/supply/visible/layer4{ + dir = 1; + name = "Can In" + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"oGs" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/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/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"oGy" = ( +/obj/structure/rack, +/obj/item/clothing/mask/gas{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"oGB" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) +"oGC" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"oGF" = ( +/obj/structure/closet/crate/bin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/mine/eva) +"oGG" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"oGJ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Labor Camp External West"; + network = list("labor") + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"oGN" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"oGO" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/structure/bed/medical/anchored{ + dir = 8 + }, +/obj/item/bedsheet/medical{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"oGQ" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"oHf" = ( +/obj/machinery/vending/autodrobe, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"oHg" = ( +/obj/structure/fence/cut/large{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oHh" = ( +/obj/machinery/shower/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/door/window/left/directional/north{ + name = "Shower Cubicle" + }, +/obj/item/soap/nanotrasen, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) +"oHo" = ( +/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"oHp" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Escape Pod" + }, +/turf/open/floor/plating, +/area/station/engineering/storage_shared) +"oHH" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/service/chapel) +"oHK" = ( +/turf/closed/wall/r_wall, +/area/station/science/lab) +"oHR" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"oHV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"oIj" = ( +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/mob/living/carbon/human/species/monkey/punpun, +/obj/item/kirbyplants/organic/plant11, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"oIt" = ( +/obj/structure/sign/departments/cargo/directional/west, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"oIv" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Labor Camp External North"; + network = list("labor") + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +"oIB" = ( +/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/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) +"oIH" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining{ + name = "Mining Dock" + }, +/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/supply/general, +/turf/open/floor/iron, +/area/station/cargo/storage) +"oIJ" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"oIN" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"oIR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance/four, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"oJk" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/storage) +"oJn" = ( +/obj/structure/flora/grass/brown/style_3, +/obj/structure/flora/bush/snow/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oJo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/mime, +/turf/open/floor/wood, +/area/station/commons/lounge) +"oJv" = ( +/obj/item/clothing/under/costume/skeleton, +/obj/item/clothing/head/helmet/skull, +/turf/open/floor/plating, +/area/station/medical/morgue) +"oJP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/dark_green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"oJT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/command/gateway) +"oKv" = ( +/obj/item/trash/popcorn, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oKy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) +"oKJ" = ( +/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/hallway/primary/central/fore) +"oKL" = ( +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"oKX" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/effect/landmark/start/cook, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) +"oKY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/plating, +/area/station/construction) +"oLa" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/storage/bag/ore, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"oLg" = ( +/turf/open/floor/iron/white/corner, +/area/station/science/research) +"oLi" = ( +/obj/effect/landmark/start/botanist, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"oLj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp) +"oLm" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Garden" + }, +/obj/machinery/status_display/ai/directional/east, +/obj/structure/water_source/puddle, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"oLn" = ( +/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/plating, +/area/station/maintenance/aft/greater) +"oLo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/spawner/random/structure/closet_private, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"oLs" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 5 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"oLt" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"oLz" = ( +/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/hallway/secondary/exit/departure_lounge) +"oLC" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/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/maintenance/port/greater) +"oLG" = ( +/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, +/area/station/service/chapel) +"oLJ" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Foyer" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"oLK" = ( +/obj/machinery/air_sensor/mix_tank, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"oMa" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oMj" = ( +/obj/structure/flora/bush/sunny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"oMk" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay South" + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"oMq" = ( +/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/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"oMs" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) +"oMO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"oMP" = ( +/obj/machinery/computer/slot_machine, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"oMR" = ( +/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/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"oMS" = ( +/obj/structure/cable, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/command/storage/eva) +"oMT" = ( +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"oNA" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"oNC" = ( +/obj/machinery/light/small/directional/west, +/turf/open/openspace, +/area/station/service/chapel) +"oNE" = ( +/obj/structure/closet/crate, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/item/target/clown, +/obj/item/target/clown, +/obj/item/target/syndicate, +/obj/item/target/syndicate, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron, +/area/station/science/explab) +"oNO" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"oNP" = ( +/obj/structure/barricade/wooden, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/aft/lesser) +"oNX" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oOb" = ( +/obj/structure/sign/warning/fire/directional/north, +/turf/open/floor/glass/reinforced, +/area/station/science/ordnance/office) +"oOc" = ( +/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/structure/sign/departments/genetics/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"oOg" = ( +/obj/effect/spawner/random/medical/patient_stretcher, +/obj/effect/decal/cleanable/blood/gibs/torso, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/window/reinforced/tinted/spawner/directional/north, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"oOh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"oOo" = ( +/obj/structure/closet/firecloset, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) +"oOw" = ( +/obj/effect/spawner/random/trash/moisture_trap, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oOB" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oOD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"oOP" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"oOQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"oPl" = ( +/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/courtroom) +"oPm" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"oPn" = ( +/obj/structure/closet/secure_closet/injection, +/obj/machinery/airalarm/directional/north, +/obj/item/soap/nanotrasen, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"oPt" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/science/ordnance) +"oPu" = ( +/obj/machinery/igniter/incinerator_ordmix, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"oPC" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oPI" = ( +/turf/open/floor/circuit, +/area/station/ai_monitored/command/nuke_storage) +"oPO" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oPP" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"oPU" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"oQc" = ( +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored/graveyard) +"oQn" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"oQo" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"oQp" = ( +/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, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"oQt" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icemoon, +/area/station/maintenance/port/lesser) +"oQx" = ( +/turf/open/floor/iron/smooth_half, +/area/station/command/heads_quarters/rd) +"oQD" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/chemist, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"oQY" = ( +/turf/open/floor/iron/white, +/area/station/medical/virology) +"oRk" = ( +/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, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"oRu" = ( +/obj/item/stack/medical/mesh, +/obj/item/wrench/medical, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/table/glass, +/obj/machinery/light/cold/directional/east, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"oRy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"oRE" = ( +/obj/machinery/conveyor{ + dir = 10; + id = "garbage" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"oRH" = ( +/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, +/area/station/science/ordnance) +"oRM" = ( +/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/hallway/primary/port) +"oRZ" = ( +/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/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/port) +"oSa" = ( +/obj/machinery/door/airlock/public/glass{ + id_tag = "gulag3"; + name = "Cell 3" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"oSm" = ( +/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, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"oSy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"oSC" = ( +/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/smooth, +/area/station/security/lockers) +"oSK" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external/glass{ + name = "Supply Door Airlock"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/storage) +"oSR" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"oSS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/storage) +"oSU" = ( +/turf/open/genturf, +/area/icemoon/underground/unexplored/rivers/deep) +"oSX" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oSY" = ( +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"oTa" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/flora/grass/green/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/hallway/secondary/exit/departure_lounge) +"oTc" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"oTd" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Research Division Testing Lab - Chamber"; + network = list("test","rd") + }, +/turf/open/floor/engine, +/area/station/science/explab) +"oTi" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/warning/cold_temp/directional/east, +/turf/open/floor/plating, +/area/mine/mechbay) +"oTu" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"oTx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/lesser) +"oTA" = ( +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"oTM" = ( +/obj/item/flashlight/lantern, +/obj/structure/table/wood, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"oTS" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"oUb" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"oUh" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"oUp" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/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/kitchen/diagonal, +/area/station/service/kitchen) +"oUw" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering Lobby" + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"oUL" = ( +/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/command/teleporter) +"oUM" = ( +/obj/machinery/door/airlock/security{ + name = "Cafeteria" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/mess) +"oUO" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/effect/landmark/blobstart, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/west{ + id = "Toilet2"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"oVt" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/construction) +"oVy" = ( +/obj/machinery/door/airlock/security{ + name = "Permabrig Lab" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/grimy, +/area/station/security/prison/work) +"oVz" = ( +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"oVD" = ( +/obj/structure/rack, +/obj/item/storage/box/evidence, +/obj/item/storage/box/evidence, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"oVG" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Art Storage" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/textured, +/area/station/commons/storage/art) +"oVR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/bridge) +"oVX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"oVY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/security/prison) +"oWe" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"oWk" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"oWl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/storage/gas) +"oWo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"oWN" = ( +/obj/machinery/requests_console/auto_name/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/chair/stool/directional/west, +/turf/open/floor/iron, +/area/station/commons/locker) +"oWQ" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oXb" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/lobby) +"oXd" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"oXf" = ( +/obj/structure/closet/secure_closet/medical1, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"oXg" = ( +/obj/effect/turf_decal/tile/dark_green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"oXm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oXo" = ( +/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"oXq" = ( +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"oXr" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Kill Chamber"; + normalspeed = 0 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"oXx" = ( +/obj/machinery/mass_driver/trash{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/warning/cold_temp/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"oXB" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/medkit/regular, +/obj/item/razor{ + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"oXE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oXF" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/turf/open/floor/plating, +/area/mine/mechbay) +"oXJ" = ( +/obj/machinery/newscaster/directional/north, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"oXL" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/hallway/primary/starboard) +"oXX" = ( +/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/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oYa" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/commons/locker) +"oYi" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/iron, +/area/station/security/courtroom) +"oYn" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/table/glass, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"oYu" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"oYD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/button/door/directional/east{ + id = "xenobio11"; + name = "Xenobio Pen 11 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"oYI" = ( +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"oYN" = ( +/obj/structure/table, +/obj/item/hand_tele{ + pixel_x = 3; + pixel_y = 13 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron, +/area/station/command/teleporter) +"oZd" = ( +/obj/structure/fence/corner{ + dir = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"oZn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/explab) +"oZz" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/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/dark/side{ + dir = 4 + }, +/area/station/security/prison) +"oZG" = ( +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"oZL" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Mix to Engine" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oZR" = ( +/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/textured_edge, +/area/station/security/prison) +"pac" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison) +"pao" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"par" = ( +/obj/structure/toilet/greyscale, +/obj/machinery/airalarm/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/station/security/prison/safe) +"pau" = ( +/obj/structure/table/wood, +/obj/item/pai_card, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"paw" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"paF" = ( +/obj/structure/table, +/obj/item/clothing/suit/hooded/wintercoat/science, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"paK" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/command/bridge) +"paL" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/cable, +/turf/open/floor/plating/icemoon, +/area/station/security/execution/education) +"paM" = ( +/turf/closed/wall, +/area/station/engineering/storage/tech) +"paT" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint3" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"paZ" = ( +/obj/structure/closet/wardrobe/black, +/obj/item/clothing/shoes/jackboots, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"pbk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"pbs" = ( +/turf/closed/wall, +/area/station/ai_monitored/turret_protected/aisat/maint) +"pby" = ( +/obj/effect/gibspawner/human, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pbB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"pbE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/construction) +"pbF" = ( +/obj/structure/chair/sofa/right/brown, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"pbI" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"pbQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "rd_office_shutters"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/rd) +"pbS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pbW" = ( +/obj/structure/disposalpipe/segment, +/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/white, +/area/station/medical/medbay/central) +"pcb" = ( +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pcc" = ( +/obj/item/stack/spacecash/c10{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/toy/plush/beeplushie{ + name = "Coolidge"; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"pcg" = ( +/obj/machinery/computer/apc_control{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"pcr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ + dir = 8 + }, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"pcs" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/storage/gas) +"pcx" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/commons/dorms) +"pcB" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"pcI" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/directional/south, +/obj/structure/table, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_construction, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"pcJ" = ( +/obj/structure/table/wood, +/obj/item/coin/silver, +/turf/open/floor/iron, +/area/station/commons/dorms) +"pcM" = ( +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + name = "Kitchen Maintenance" + }, +/turf/open/floor/plating, +/area/station/service/kitchen) +"pcT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"pdc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"pdd" = ( +/obj/structure/disposalpipe/segment, +/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/maintenance/port/greater) +"pdf" = ( +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"pdg" = ( +/obj/structure/table, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"pdm" = ( +/obj/machinery/chem_dispenser, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/yellow/full, +/obj/item/radio/intercom/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"pdx" = ( +/obj/item/kirbyplants/organic/plant10, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"pdy" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "robo2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"pdz" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"pdB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink/directional/south, +/obj/structure/mirror/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pdD" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"pdK" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"pdO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/engine, +/area/station/science/explab) +"pdT" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Permabrig Library Reading Room"; + network = list("ss13","prison") + }, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"pdV" = ( +/obj/machinery/vending/coffee, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"pdW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/command/gateway) +"peb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/commons/dorms) +"pec" = ( +/obj/machinery/vending/cart, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"pee" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/research/glass{ + name = "Test Chamber" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"peq" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/obj/structure/sign/departments/security/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"pez" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"peG" = ( +/obj/effect/spawner/random/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"peM" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"peP" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"peV" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"peX" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"pfe" = ( +/turf/closed/wall, +/area/station/hallway/primary/fore) +"pfg" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"pfw" = ( +/obj/structure/flora/grass/green/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"pfz" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/medical/virology) +"pfD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"pfE" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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/maintenance/starboard/lesser) +"pfO" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/mine/laborcamp) +"pfP" = ( +/obj/machinery/computer/mech_bay_power_console, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/maintenance/department/electrical) +"pgc" = ( +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"pgg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/iv_drip, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"pgo" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"pgq" = ( +/obj/machinery/light_switch/directional/west, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/cargo/bitrunning/den) +"pgt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"pgw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/requests_console/directional/south{ + department = "Bridge"; + name = "Bridge Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"pgE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"pgG" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/orange, +/obj/item/restraints/handcuffs, +/obj/item/reagent_containers/spray/pepper, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"pgL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"pgN" = ( +/obj/item/organ/external/tail/monkey, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"pgY" = ( +/obj/machinery/cryo_cell, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"phf" = ( +/obj/item/assembly/timer{ + pixel_x = -3; + pixel_y = 15 + }, +/obj/structure/table, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"phj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"phr" = ( +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/hydroponics) +"phu" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/hallway/secondary/entry) +"phw" = ( +/obj/machinery/modular_computer/preset/civilian{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"phz" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"phA" = ( +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"phK" = ( +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"phL" = ( +/obj/structure/reflector/single/anchored{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"phS" = ( +/obj/structure/table/reinforced, +/obj/item/hfr_box/body/fuel_input, +/obj/item/hfr_box/body/interface{ + pixel_x = 6; + pixel_y = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"pib" = ( +/obj/machinery/camera/motion/directional/south{ + c_tag = "Vault"; + network = list("vault") + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"pig" = ( +/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/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"pii" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"piv" = ( +/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, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"piB" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/primary/central) +"piC" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/button/door/directional/south{ + id = "Dorm6"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"piD" = ( +/obj/machinery/computer/security/labor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"piL" = ( +/obj/machinery/door/window/brigdoor/security/cell/left/directional/west{ + id = "Cell 2"; + name = "Cell 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/station/security/brig) +"piP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"piT" = ( +/obj/machinery/status_display/ai/directional/east, +/obj/structure/chair/sofa/left/brown, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"piV" = ( +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"pja" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"pjc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/research/glass{ + name = "Ordnance Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/freezerchamber) +"pji" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Locker Room East" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron, +/area/station/commons/locker) +"pjj" = ( +/obj/structure/chair, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"pjl" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/engineering_all, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"pjr" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"pjw" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_x = 2 + }, +/obj/item/clothing/mask/balaclava{ + pixel_x = -8; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"pjF" = ( +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + color = "#ff0000"; + dir = 4; + name = "Scrubbers multi deck pipe adapter" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"pkf" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/bed/medical/emergency, +/obj/machinery/iv_drip, +/obj/machinery/light/small/directional/west, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"pkg" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/sign/departments/science/directional/west, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pkq" = ( +/obj/structure/railing/wooden_fence{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"pkz" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/sink/directional/south, +/obj/machinery/camera/directional/north{ + c_tag = "Virology Break Room"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"pkN" = ( +/obj/structure/railing, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"pkP" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"pkQ" = ( +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"pkW" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L4" + }, +/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/hallway/primary/central) +"pkY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"plg" = ( +/obj/machinery/atmospherics/components/tank/air, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/maintenance/port/greater) +"plI" = ( +/obj/structure/chair/stool, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"plN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"plQ" = ( +/obj/structure/railing, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/service/chapel) +"plS" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"pme" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"pmi" = ( +/obj/structure/cable, +/obj/structure/sign/warning/engine_safety/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"pmn" = ( +/obj/effect/spawner/random/trash/caution_sign, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"pmr" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 2 + }, +/obj/structure/chair, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"pmA" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/machinery/light/small/red/directional/north, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"pna" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Door" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"pnf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"pnj" = ( +/obj/structure/closet/firecloset, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/stripes/corner, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"pnn" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/tcommsat/computer) +"pns" = ( +/obj/machinery/duct, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"pnw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"pnz" = ( +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"pnA" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/science{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/suit/hooded/wintercoat/science{ + pixel_x = -1 + }, +/obj/item/clothing/shoes/winterboots{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/clothing/shoes/winterboots, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) +"pnG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster/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, +/area/mine/laborcamp) +"pnK" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron, +/area/station/science/explab) +"pnR" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/aisat_interior) +"pnU" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"poc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"poe" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "permainner"; + name = "Permabrig Transfer" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "perma-entrance" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"pou" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/landmark/start/atmospheric_technician, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"poy" = ( +/turf/open/floor/carpet/green, +/area/station/service/library) +"poC" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/structure/railing/wooden_fence{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"poK" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/commons/locker) +"poL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"poO" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ppc" = ( +/obj/item/trash/syndi_cakes, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/fore/lesser) +"ppl" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/brig/entrance) +"ppo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ppp" = ( +/obj/structure/railing, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ppq" = ( +/obj/structure/closet/wardrobe/grey{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"ppr" = ( +/obj/effect/turf_decal/siding/brown, +/obj/structure/chair/office, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"ppz" = ( +/obj/machinery/computer/rdconsole{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"ppD" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"ppH" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/status_display/evac/directional/east, +/obj/structure/chair/sofa/right/brown{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"ppK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"ppQ" = ( +/obj/structure/table, +/obj/item/clothing/gloves/latex, +/obj/item/surgical_drapes, +/obj/item/razor, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"ppS" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"ppY" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"pqc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"pql" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/production) +"pqo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "gene_desk_shutters"; + name = "Genetics Shutters" + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"pqv" = ( +/obj/item/storage/medkit/toxin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"pra" = ( +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"prg" = ( +/turf/open/floor/wood, +/area/station/service/library) +"prs" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 15; + name = "arrivals"; + roundstart_template = /datum/map_template/shuttle/arrival/box; + shuttle_id = "arrival_stationary"; + width = 7 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"prE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"prH" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio11"; + name = "Xenobio Pen 11 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"prX" = ( +/obj/machinery/light/cold/directional/east, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"psb" = ( +/turf/closed/wall/ice, +/area/icemoon/underground/explored) +"psm" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"psp" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/commons/locker) +"pst" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"psu" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering Access" + }, +/obj/structure/closet/radiation, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"psv" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/iron/smooth_edge, +/area/station/medical/chemistry) +"psN" = ( +/turf/closed/wall/r_wall, +/area/station/security/brig/entrance) +"psP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"psR" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"psW" = ( +/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/cargo/office) +"psY" = ( +/obj/machinery/door/poddoor/shutters{ + id = "secmechbay"; + name = "Security Mech Bay Shutters" + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/box, +/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/mechbay) +"ptd" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ptf" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ptp" = ( +/obj/structure/bookcase/random, +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) +"ptr" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ + pixel_x = 7; + pixel_y = 20 + }, +/obj/item/taperecorder{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 6 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/secure_safe/hos{ + pixel_x = 28; + pixel_y = 6 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/hos) +"ptB" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"ptQ" = ( +/obj/structure/disposalpipe/trunk/multiz/down, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ptR" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"ptS" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"ptY" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/aisat/maint) +"pua" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"puc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light/warm/directional/west, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"pue" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"puf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"puh" = ( +/obj/effect/spawner/random/clothing/bowler_or_that, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"pup" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"pus" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"puw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"puz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"puF" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/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, +/area/station/service/chapel) +"puL" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"puN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"puX" = ( +/obj/structure/table, +/obj/item/stock_parts/scanning_module{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = -5 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = 5 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/cargo/drone_bay) +"puY" = ( +/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"puZ" = ( +/obj/structure/railing/wooden_fence{ + dir = 1 + }, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"pve" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/mine/eva) +"pvh" = ( +/obj/item/clothing/glasses/meson, +/obj/item/flashlight, +/obj/item/clothing/suit/hooded/wintercoat/science, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"pvi" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 9 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"pvm" = ( +/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/hallway/primary/fore) +"pvo" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"pvu" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"pvz" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Courtroom" + }, +/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, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"pvB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"pvE" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"pvJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/eighties/red, +/area/station/security/prison/safe) +"pvP" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/hydroponics) +"pvY" = ( +/obj/machinery/computer/order_console/mining, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"pwd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"pwf" = ( +/obj/machinery/light_switch/directional/east, +/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/command/teleporter) +"pwg" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"pwn" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/virology) +"pwo" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/processing) +"pwr" = ( +/obj/structure/sign/warning{ + pixel_y = 48 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"pwv" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + name = "Supply multi deck pipe adapter" + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"pwF" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"pwG" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/construction) +"pwH" = ( +/obj/structure/chair/stool/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"pwK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/science/explab) +"pwM" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pwV" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"pxi" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Mass Driver"; + req_access = list("chapel_office") + }, +/obj/machinery/mass_driver/chapelgun{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/service/chapel) +"pxn" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pxp" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pxL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pxQ" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"pxV" = ( +/obj/machinery/chem_master, +/obj/machinery/button/door/directional/north{ + id = "pharmacy_shutters"; + name = "Pharmacy Shutter Controls"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"pxX" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"pya" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/security_all, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"pyc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/supply, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"pyl" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/structure/sign/flag/terragov/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness) +"pyn" = ( +/obj/item/storage/photo_album/chapel, +/obj/structure/noticeboard/directional/west, +/obj/machinery/light/small/directional/west, +/obj/structure/rack/skeletal, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"pyr" = ( +/obj/machinery/griddle, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"pyu" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"pyA" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + 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/service/hydroponics) +"pyD" = ( +/obj/machinery/shower/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/window/left/directional/north{ + name = "Shower Cubicle" + }, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) +"pyE" = ( +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/west, +/obj/machinery/fax/auto_name, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"pyG" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"pyI" = ( +/obj/machinery/door/airlock/engineering{ + name = "Port Quarter Solar Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"pyJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"pyM" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"pyY" = ( +/obj/machinery/status_display/evac/directional/south, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"pza" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"pzb" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pzi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"pzn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"pzs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"pzu" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/table/wood, +/obj/item/book/manual/wiki/detective, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) +"pzx" = ( +/obj/machinery/hydroponics/constructable, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/item/seeds/carrot, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"pzC" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"pzV" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen/fountain, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pzX" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"pAc" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Ordnance Lab Maintenance" + }, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/science/ordnance) +"pAN" = ( +/obj/structure/ladder, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/iron/dark/textured_large, +/area/station/maintenance/department/medical/central) +"pAT" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/production) +"pAX" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"pAZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/primary/central) +"pBb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"pBk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"pBs" = ( +/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/freezer, +/area/station/commons/toilet) +"pBv" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/service/hydroponics, +/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/maintenance/starboard/lesser) +"pBA" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/treatment_center) +"pBE" = ( +/turf/closed/wall, +/area/station/cargo/bitrunning/den) +"pBI" = ( +/obj/machinery/power/smes{ + capacity = 1.8e+008; + charge = 2e+005 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/iron/dark/textured_large, +/area/station/maintenance/disposal/incinerator) +"pBN" = ( +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/station/security/warden) +"pBR" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 9 + }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"pBV" = ( +/obj/structure/chair/office/light, +/turf/open/floor/iron/dark, +/area/station/science/server) +"pBW" = ( +/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/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"pCi" = ( +/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 = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pCp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/button/flasher{ + pixel_y = -26; + id = "visitorflash" + }, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"pCE" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/filingcabinet, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) +"pCG" = ( +/obj/structure/fence/corner{ + dir = 2 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"pCI" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"pCM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/mine/eva) +"pDe" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/item/clothing/under/pants/jeans, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"pDi" = ( +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pDk" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/lab) +"pDt" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pDy" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/item/clothing/head/beanie/red, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"pDA" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"pDB" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"pDC" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Three"; + space_dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/processing) +"pDI" = ( +/obj/structure/table, +/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"pDL" = ( +/obj/structure/sign/departments/psychology/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"pDQ" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/fore) +"pDR" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"pDS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/service/library) +"pDW" = ( +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"pEc" = ( +/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/plating, +/area/station/maintenance/starboard/fore) +"pEg" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/table, +/obj/structure/bedsheetbin/empty, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"pEq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + name = "Break Room" + }, +/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/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/brown/half{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/medical/break_room) +"pEs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/service/hydroponics/garden) +"pEE" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/table, +/obj/item/pai_card, +/obj/item/taperecorder{ + pixel_x = -3; + pixel_y = 2 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"pER" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = 9; + pixel_y = 7 + }, +/obj/item/hand_labeler{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/lighter{ + pixel_x = 8; + pixel_y = -9 + }, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"pEX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"pFg" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pFv" = ( +/obj/structure/lattice, +/obj/structure/sign/warning/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"pFV" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/smooth, +/area/station/maintenance/fore/lesser) +"pFW" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"pFZ" = ( +/obj/item/target/syndicate, +/obj/effect/decal/cleanable/dirt, +/obj/structure/training_machine, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"pGd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"pGf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"pGo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + 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/engineering/atmos) +"pGt" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"pGy" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"pGG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/random/directional/south, +/obj/structure/closet/toolcloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"pGJ" = ( +/obj/structure/sign/poster/contraband/random/directional/north, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pGQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/closed/wall, +/area/station/engineering/atmos) +"pGS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/medical/virology) +"pGT" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/station/service/library) +"pGW" = ( +/obj/machinery/camera/directional/west{ + c_tag = "MiniSat External SouthEast"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pGZ" = ( +/obj/structure/mop_bucket/janitorialcart, +/turf/open/floor/iron, +/area/station/service/janitor) +"pHa" = ( +/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/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"pHy" = ( +/obj/structure/rack, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/radio/intercom/directional/south, +/obj/item/crowbar, +/obj/item/crowbar, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/machinery/camera/directional/east{ + c_tag = "Port Emergency Storage" + }, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"pHD" = ( +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"pHQ" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/glass{ + name = "Mining Station Bridge" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/living_quarters) +"pHR" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"pHW" = ( +/obj/machinery/atmospherics/components/tank, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"pHX" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pIh" = ( +/obj/structure/bookcase, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"pIj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"pIk" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"pIm" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Atmos to Loop" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"pIu" = ( +/obj/structure/table, +/obj/item/binoculars, +/obj/machinery/computer/security/telescreen/ordnance/directional/north, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"pIw" = ( +/obj/machinery/vending/wardrobe/curator_wardrobe, +/obj/structure/sign/painting/library_private{ + pixel_x = -32 + }, +/turf/open/floor/engine/cult, +/area/station/service/library) +"pIy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"pJc" = ( +/obj/machinery/component_printer, +/obj/machinery/camera/directional/west{ + c_tag = "Research Division Circuits Lab"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/explab) +"pJi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/flashlight{ + pixel_y = 3; + pixel_x = -4 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"pJm" = ( +/obj/structure/fence{ + dir = 2 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"pJu" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"pJy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Cooling Loop Bypass" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"pJC" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pJQ" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage/gas) +"pJU" = ( +/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, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"pJV" = ( +/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/science/research) +"pJX" = ( +/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 = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"pJY" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"pKb" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"pKl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/plating, +/area/station/medical/morgue) +"pKu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"pKw" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/effect/landmark/start/chief_medical_officer, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"pKB" = ( +/obj/structure/filingcabinet, +/obj/structure/sign/poster/official/space_cops/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"pKJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"pKR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"pKS" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"pKX" = ( +/obj/structure/railing, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/four, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pKY" = ( +/obj/machinery/door/poddoor/incinerator_atmos_aux, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"pLg" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/surface/outdoors/nospawn) +"pLh" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"pLn" = ( +/obj/effect/turf_decal/tile/blue, +/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 = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"pLr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) +"pLt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"pLv" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"pLw" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/button/door/directional/south{ + id = "AuxToilet3"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/trash/graffiti{ + pixel_x = -32; + spawn_loot_chance = 50 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"pLS" = ( +/obj/machinery/mineral/stacking_machine{ + output_dir = 2; + stack_amt = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"pLZ" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/structure/closet, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/effect/spawner/random/trash/botanical_waste, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"pMg" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + req_access = list("brig") + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/processing) +"pMq" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics Storage Room - South" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"pMu" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"pMv" = ( +/turf/closed/wall, +/area/station/commons/storage/emergency/port) +"pMy" = ( +/obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"pMC" = ( +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"pMF" = ( +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"pMM" = ( +/obj/structure/fence/door, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pMN" = ( +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"pMY" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"pNm" = ( +/turf/closed/wall/r_wall, +/area/station/security/execution/education) +"pNq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"pNs" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"pNz" = ( +/obj/structure/closet/secure_closet/warden, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"pNB" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"pNK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/commons/storage/tools) +"pNO" = ( +/obj/machinery/duct, +/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, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/lobby) +"pNZ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"pOk" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/station/security/prison/safe) +"pOo" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"pOq" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/firecloset, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"pOy" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"pOH" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Teleport Access" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/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/command/teleporter, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"pOL" = ( +/turf/open/floor/iron/white, +/area/station/science/ordnance) +"pOV" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/wrench, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"pPg" = ( +/obj/structure/stairs/west, +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/service/hydroponics) +"pPl" = ( +/obj/item/stack/ore/silver, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"pPy" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pPB" = ( +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) +"pPK" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"pPN" = ( +/obj/machinery/porta_turret/ai{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +"pPO" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"pPR" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"pPT" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"pPY" = ( +/obj/machinery/light/small/dim/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash/grime, +/obj/effect/decal/cleanable/generic, +/obj/structure/sign/departments/maint/directional/west, +/obj/structure/sign/departments/maint/directional/west, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"pQa" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pQl" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Cytology Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"pQo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "External Gas to Loop" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"pQp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"pQv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/engineering/storage_shared) +"pQw" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"pQD" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"pQK" = ( +/obj/structure/closet/secure_closet/evidence, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/evidence) +"pQL" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"pRa" = ( +/turf/closed/wall, +/area/station/science/ordnance/bomb) +"pRj" = ( +/turf/closed/wall, +/area/station/maintenance/port/aft) +"pRs" = ( +/obj/structure/bodycontainer/morgue, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) +"pRL" = ( +/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/cafeteria, +/area/station/commons/storage/art) +"pRX" = ( +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/commons/vacant_room/commissary) +"pRZ" = ( +/obj/machinery/shower/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"pSk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics Storage Room - North" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"pSq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"pSu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) +"pSy" = ( +/obj/machinery/modular_computer/preset/curator{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"pSz" = ( +/turf/open/openspace, +/area/station/maintenance/starboard/upper) +"pSA" = ( +/obj/machinery/seed_extractor, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Permabrig Forestry"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"pSF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/stool/directional/east, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"pSK" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/obj/effect/turf_decal/weather/snow/corner, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pTd" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "briggate"; + name = "Security Shutters" + }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/machinery/door/window/brigdoor/right/directional/west{ + name = "Brig Reception"; + req_access = list("security") + }, +/obj/machinery/door/window/left/directional/east{ + name = "Brig Reception" + }, +/turf/open/floor/iron/dark, +/area/station/security/brig/entrance) +"pTi" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/north{ + id = "botany_apiary"; + name = "Bee Protection Shutters" + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"pTy" = ( +/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 = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"pTB" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pTJ" = ( +/obj/effect/turf_decal/trimline/green/filled/warning, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"pTN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/security/warden) +"pTT" = ( +/obj/machinery/smartfridge/extract/preloaded, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"pTU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/command/heads_quarters/rd) +"pTW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/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/starboard/aft) +"pTY" = ( +/turf/open/floor/iron/white/side, +/area/station/science/explab) +"pUa" = ( +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) +"pUi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"pUn" = ( +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/science/research) +"pUy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"pUX" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"pVg" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/north, +/turf/open/floor/iron, +/area/mine/eva/lower) +"pVj" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"pVl" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"pVq" = ( +/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/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"pVv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"pVD" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/generic/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"pVH" = ( +/turf/closed/wall/mineral/wood, +/area/station/maintenance/aft/lesser) +"pVK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/main) +"pVL" = ( +/turf/closed/wall/r_wall, +/area/station/security/mechbay) +"pVN" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"pVQ" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pVV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "robo2" + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"pWb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/rack_parts, +/obj/effect/spawner/random/clothing/beret_or_rabbitears, +/obj/effect/spawner/random/clothing/kittyears_or_rabbitears, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"pWf" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/food_or_drink/cups, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"pWp" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/fence{ + dir = 2 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"pWu" = ( +/obj/docking_port/stationary/syndicate/northeast{ + dir = 8 + }, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) +"pWE" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"pWJ" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/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/service/hydroponics) +"pWY" = ( +/obj/structure/table/glass, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/reagent_containers/spray/cleaner, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"pXe" = ( +/obj/item/stack/sheet/animalhide/monkey, +/obj/effect/decal/cleanable/blood, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"pXh" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"pXj" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"pXk" = ( +/obj/machinery/door/window/brigdoor/right/directional/north{ + name = "Flash Storage"; + req_access = list("armory") + }, +/obj/machinery/recharge_station, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"pXn" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pXq" = ( +/obj/machinery/button/door/directional/east{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast DOors"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"pXt" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/camera/directional/north{ + c_tag = "Research Division Server Room"; + network = list("ss13","rd") + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/openspace/icemoon, +/area/station/science/server) +"pXv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"pXB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"pXE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"pXR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"pXU" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals Lounge" + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"pXY" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pXZ" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"pYa" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"pYg" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"pYn" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/prison/directional/north, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/fax{ + fax_name = "Law Office"; + name = "Law Office Fax Machine" + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"pYz" = ( +/obj/structure/railing/corner, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/station/service/chapel) +"pYB" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"pYF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/service/janitor) +"pYT" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) +"pZh" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"pZm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"pZn" = ( +/obj/effect/turf_decal/siding/yellow/corner, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"pZB" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Chemistry Access" + }, +/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/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"pZD" = ( +/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/mine/eva) +"pZG" = ( +/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/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron, +/area/station/engineering/storage) +"pZY" = ( +/mob/living/simple_animal/hostile/asteroid/polarbear{ + move_force = 999; + name = "Huey" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"pZZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"qab" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ + dir = 8 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"qad" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/departments/science/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"qai" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/station/maintenance/port/aft) +"qam" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/station/commons/storage/mining) +"qau" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"qaz" = ( +/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/heavy{ + dir = 4 + }, +/obj/machinery/door/airlock/research{ + name = "Ordnance Launch Room" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"qaE" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half, +/turf/open/floor/iron/half, +/area/station/hallway/primary/starboard) +"qaF" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/stripes/red/end{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"qaI" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/east{ + pixel_y = -6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"qaL" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"qaR" = ( +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qaS" = ( +/obj/machinery/door/airlock/wood{ + name = "Backstage" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/commons/lounge) +"qaU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"qbb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/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/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"qbh" = ( +/obj/structure/chair/stool/directional/south, +/obj/machinery/camera/directional/west{ + c_tag = "Solar Maintenance - South East" + }, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"qbk" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Security Checkpoint" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brigoutpost" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/brig/entrance) +"qbp" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"qbq" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio11"; + name = "Xenobio Pen 11 Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"qbA" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"qbF" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/commons/dorms) +"qbG" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"qbO" = ( +/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/hallway/primary/aft) +"qbW" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/three, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"qca" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"qch" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/obj/structure/railing/corner/end/flip, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qck" = ( +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"qcu" = ( +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qcE" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"qcI" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/table/reinforced, +/obj/item/stack/wrapping_paper{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/stack/package_wrap{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/dest_tagger, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"qcL" = ( +/obj/effect/turf_decal/siding/yellow/end{ + dir = 8 + }, +/obj/machinery/plumbing/sender, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"qdl" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"qdq" = ( +/obj/structure/railing, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qdC" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/requests_console/directional/west{ + department = "Mining"; + name = "Mining Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"qdE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "EVA Secure Storage" + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/command/storage/eva) +"qdF" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/smooth_edge, +/area/station/security/lockers) +"qdH" = ( +/obj/structure/bookcase/random, +/obj/structure/sign/poster/official/nanomichi_ad/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"qdI" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Central Hallway South-West" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"qdK" = ( +/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/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"qdY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"qea" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"qeh" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/security/checkpoint/engineering) +"qen" = ( +/obj/structure/table/wood, +/obj/machinery/microwave, +/turf/open/floor/stone, +/area/mine/eva/lower) +"qes" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/textured, +/area/station/service/hydroponics) +"qeF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals Aux Dock" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"qeL" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"qeP" = ( +/obj/structure/table, +/obj/item/flashlight/lantern, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"qeQ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Pens Observation - Port Fore"; + network = list("ss13","rd","xeno") + }, +/turf/open/openspace, +/area/station/science/xenobiology) +"qeR" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"qfh" = ( +/turf/open/floor/iron/recharge_floor, +/area/station/science/robotics/mechbay) +"qfi" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/tile/blue/full, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"qfs" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"qfy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, +/obj/machinery/door/window/right/directional/west{ + name = "Corpse Arrivals" + }, +/obj/structure/window/spawner/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/trimline/neutral/filled/end{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"qfz" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/landmark/start/bartender, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/bar) +"qfA" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Research Division Access"; + network = list("ss13","rd") + }, +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/white, +/area/station/science/research) +"qfE" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"qfG" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"qgm" = ( +/obj/machinery/meter/monitored/waste_loop, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/corner, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"qgu" = ( +/obj/structure/cable, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"qgv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/service/chapel) +"qgH" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qgO" = ( +/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, +/area/station/security/processing) +"qhb" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/trash/crushed_can, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"qhd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/mob/living/basic/bot/cleanbot, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) +"qhi" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/spawner/random/trash/mopbucket, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"qhI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - South West" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qhL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"qhN" = ( +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"qhO" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qhP" = ( +/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/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/side, +/area/station/security/processing) +"qhR" = ( +/obj/structure/fence/corner{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"qhS" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/security/prison) +"qig" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/meter/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"qiv" = ( +/obj/structure/railing, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 6 + }, +/turf/open/floor/wood/large, +/area/station/hallway/primary/starboard) +"qiF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva/lower) +"qiJ" = ( +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"qiK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"qiL" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/shovel, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/radio/off, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Departure Lounge Emergency EVA" + }, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/exit/departure_lounge) +"qiN" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"qiP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"qjb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"qjg" = ( +/obj/effect/landmark/observer_start, +/obj/effect/turf_decal/plaque{ + icon_state = "L8" + }, +/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/light/floor, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qji" = ( +/obj/structure/sign/poster/official/no_erp/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) +"qjp" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, +/area/station/commons/locker) +"qjq" = ( +/obj/machinery/telecomms/processor/preset_four, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"qjr" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qjx" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"qjF" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"qjJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"qjO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"qjQ" = ( +/turf/closed/wall, +/area/station/cargo/miningdock) +"qjV" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/mine/eva) +"qjW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"qkg" = ( +/mob/living/basic/pet/penguin/baby/permanent, +/obj/item/toy/snowball{ + pixel_x = -6; + pixel_y = -3 + }, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"qku" = ( +/obj/structure/chair/comfy/beige{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet/blue, +/area/station/hallway/secondary/entry) +"qky" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"qkB" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"qkH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/science/explab) +"qkI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/production) +"qkL" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/lockers) +"qkR" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/chem_master, +/obj/machinery/light/small/directional/west, +/turf/open/floor/glass/reinforced, +/area/station/medical/treatment_center) +"qkT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"qlf" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/structure/sign/warning/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"qlk" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining Mech Bay External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "mining-aux-mechbay-external" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/large, +/area/mine/mechbay) +"qll" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance/two, +/obj/item/wirecutters, +/turf/open/floor/plating, +/area/station/construction) +"qlw" = ( +/obj/machinery/disposal/bin, +/obj/item/radio/intercom/prison/directional/north, +/obj/structure/disposalpipe/trunk, +/obj/machinery/camera/directional/north{ + c_tag = "Warden's Office" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"qlD" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/item/storage/medkit/regular, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"qlE" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"qlG" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/mineral/plasma, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/science/explab) +"qlO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table, +/obj/structure/secure_safe/directional/south, +/obj/item/storage/briefcase/secure, +/turf/open/floor/iron/smooth, +/area/station/command/heads_quarters/rd) +"qlP" = ( +/obj/machinery/door/airlock/external/glass, +/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/engineering/external, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/hallway/secondary/entry) +"qlU" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"qmh" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"qmi" = ( +/turf/open/floor/iron, +/area/station/cargo/lobby) +"qml" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/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/entrance) +"qmq" = ( +/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/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qmt" = ( +/turf/closed/wall, +/area/mine/eva/lower) +"qmK" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/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/maintenance/department/medical/morgue) +"qmU" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/plating, +/area/station/medical/virology) +"qna" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Security - Permabrig Chapel"; + network = list("ss13","prison") + }, +/turf/open/floor/carpet, +/area/station/security/prison/rec) +"qnj" = ( +/turf/closed/wall, +/area/station/commons/locker) +"qnm" = ( +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole/bookmanagement{ + dir = 8 + }, +/obj/machinery/light_switch/directional/north, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"qnr" = ( +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/flashlight, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/gps/mining, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"qnt" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"qnC" = ( +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/ce) +"qnO" = ( +/obj/machinery/atmospherics/components/trinary/mixer/airmix{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qnV" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/emergency{ + pixel_y = 9 + }, +/obj/item/assembly/timer, +/obj/item/assembly/signaler{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/item/assembly/signaler{ + pixel_x = -8; + pixel_y = -12 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron, +/area/station/command/bridge) +"qob" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"qoi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"qok" = ( +/obj/structure/displaycase/trophy, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/wood/parquet, +/area/station/service/library) +"qoK" = ( +/obj/structure/flora/rock/style_random, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/misc/asteroid/snow/icemoon, +/area/station/maintenance/port/aft) +"qoM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"qoY" = ( +/obj/effect/spawner/random/structure/crate_abandoned, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"qpb" = ( +/obj/machinery/disposal/bin{ + desc = "A pneumatic waste disposal unit. This one leads to the morgue."; + name = "corpse disposal" + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"qpd" = ( +/obj/effect/landmark/blobstart, +/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/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/fore) +"qpm" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/desk_bell{ + pixel_x = -3 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"qpo" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/medical/chemistry) +"qpr" = ( +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"qpt" = ( +/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/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"qpu" = ( +/obj/machinery/button/door/directional/west{ + id = "gene_shutters"; + name = "Genetics Privacy Shutters"; + pixel_y = -4; + req_access = list("genetics") + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -34; + pixel_y = 6 + }, +/obj/machinery/button/door/directional/west{ + id = "gene_desk_shutters"; + name = "Genetics Desk Shutters"; + pixel_y = 6; + req_access = list("genetics") + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"qpv" = ( +/obj/structure/railing, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/service/chapel) +"qpB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"qpD" = ( +/obj/effect/spawner/random/trash/hobo_squat, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"qpH" = ( +/obj/structure/fence/door, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"qpP" = ( +/obj/structure/chair/comfy/black, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/service/library) +"qpR" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"qpS" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/recharge_station, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"qpZ" = ( +/obj/structure/table, +/obj/item/folder/blue{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/paper_bin/carbon{ + pixel_x = 5; + pixel_y = 18 + }, +/obj/item/stamp/head/hop{ + pixel_x = 8; + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"qqv" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"qqB" = ( +/obj/machinery/button/door/directional/north{ + id = "maint3"; + name = "Blast Door Control C" + }, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qqJ" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #4" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/cargo/storage) +"qqM" = ( +/obj/effect/landmark/start/head_of_security, +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/office) +"qrg" = ( +/obj/item/bodypart/head, +/obj/effect/decal/cleanable/blood, +/obj/item/bodypart/arm/left{ + pixel_x = -9; + pixel_y = -9 + }, +/obj/item/bodypart/leg/left, +/obj/item/bodypart/arm/right, +/obj/item/bodypart/leg/right{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/bodypart/chest, +/obj/item/organ/internal/heart, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"qrj" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/fluff/tram_rail, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"qrr" = ( +/obj/structure/light_construct/directional/south, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"qrB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/start/mime, +/turf/open/floor/wood/parquet, +/area/station/service/theater) +"qrJ" = ( +/obj/machinery/ticket_machine/directional/east, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qrP" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"qrQ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/service/chapel) +"qrT" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/structure/bookcase{ + name = "Holy Bookcase" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"qsa" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) +"qsy" = ( +/obj/effect/landmark/event_spawn, +/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/hallway/primary/central) +"qsQ" = ( +/obj/machinery/stasis, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"qtd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"qtj" = ( +/turf/closed/wall, +/area/station/engineering/storage) +"qts" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"qtv" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) +"qtw" = ( +/obj/machinery/door/airlock/security{ + name = "Prison Forestry" + }, +/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, +/turf/open/floor/iron/dark, +/area/station/security/prison/garden) +"qtD" = ( +/obj/structure/sign/warning/directional/south, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"qtH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"qtM" = ( +/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/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qud" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "mining_internal"; + name = "mining conveyor"; + pixel_x = 1; + pixel_y = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/production) +"que" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Chapel South" + }, +/obj/structure/closet/crate/bin, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"quy" = ( +/obj/structure/flora/grass/both/style_random, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"quB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"quK" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Cargo Escape Airlock" + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"quS" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/spawner/random/trash/cigbutt, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"quW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/docking/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"quY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"qvh" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"qvk" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qvx" = ( +/obj/item/food/grown/carrot, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"qvE" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/science/genetics) +"qvF" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood/corner, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/service/library) +"qvM" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"qvQ" = ( +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"qvW" = ( +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/t_scanner, +/obj/item/t_scanner, +/obj/item/t_scanner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -8 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -8 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"qwa" = ( +/obj/machinery/door/window/brigdoor/right/directional/west{ + name = "Shooting Range" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"qwd" = ( +/obj/machinery/light_switch/directional/south, +/obj/structure/closet/secure_closet/security/cargo, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"qwe" = ( +/obj/structure/table, +/obj/item/phone{ + pixel_x = -3 + }, +/obj/item/cigbutt, +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"qwi" = ( +/obj/effect/turf_decal/trimline/neutral/corner, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"qwo" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"qwB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/wood, +/area/station/service/library) +"qwF" = ( +/obj/structure/grille, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"qwN" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Research Division North"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/research) +"qwX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/maintenance/port/aft) +"qxb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"qxl" = ( +/obj/structure/table, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/machinery/requests_console/directional/north{ + department = "Circuits Lab"; + name = "Circuits Lab Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron, +/area/station/science/explab) +"qxm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"qxo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"qxp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/commons/dorms) +"qxu" = ( +/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, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"qxG" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk/multiz/down, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"qxI" = ( +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"qxN" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"qxQ" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"qxY" = ( +/obj/item/chair/plastic, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qya" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/table, +/obj/item/storage/box/lights/mixed, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/power_store/cell/emproof, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"qyn" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/server) +"qyH" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/requests_console/auto_name/directional/south, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"qyI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"qyL" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/poster/official/random/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/commons/locker) +"qyO" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"qyR" = ( +/turf/open/openspace, +/area/station/medical/treatment_center) +"qyT" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"qzn" = ( +/obj/structure/chair/sofa/bench/right, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"qzs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qzu" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"qzy" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"qzF" = ( +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"qzM" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/cas{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/toy/cards/deck/cas/black{ + pixel_x = -7 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"qzT" = ( +/obj/structure/closet/firecloset, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"qzV" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/hallway/primary/central/fore) +"qAf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"qAh" = ( +/obj/structure/railing/wooden_fence{ + dir = 5 + }, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"qAB" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"qAI" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qAP" = ( +/obj/machinery/shower/directional/east, +/turf/open/floor/iron/smooth, +/area/mine/living_quarters) +"qAQ" = ( +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"qAT" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qAV" = ( +/obj/machinery/telecomms/server/presets/supply, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"qBi" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qBj" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/lab) +"qBt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"qCl" = ( +/obj/effect/spawner/random/trash/mess, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qCn" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"qCu" = ( +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"qCA" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/service/library) +"qCB" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"qCF" = ( +/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 = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"qCI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"qCP" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 + }, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) +"qCU" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"qDm" = ( +/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/meter/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"qDA" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/brown{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/donk, +/area/mine/production) +"qDD" = ( +/obj/machinery/washing_machine, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/mine/laborcamp) +"qDF" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/chapel) +"qDG" = ( +/obj/structure/punching_bag, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"qDI" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qDS" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"qEa" = ( +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"qEj" = ( +/obj/structure/table/glass, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"qEm" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"qEn" = ( +/obj/machinery/vending/dinnerware, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"qEu" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/structure/tank_holder/oxygen/yellow, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"qEz" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"qEJ" = ( +/turf/closed/wall, +/area/station/service/chapel/office) +"qEK" = ( +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/pen, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"qEM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"qEV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"qEZ" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/research{ + name = "Research Division Access" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/iron/white, +/area/station/science/research) +"qFn" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Cabins" + }, +/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/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/dark/textured_half, +/area/mine/production) +"qFp" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/rack, +/obj/item/storage/box/lights/tubes, +/obj/item/crowbar/red, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) +"qFs" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"qFt" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/explab) +"qFu" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"qFA" = ( +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"qFC" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/structure/sign/warning/no_smoking/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qFE" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Fitness Ring" + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"qFJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/customs/auxiliary) +"qFO" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +"qFW" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qFX" = ( +/obj/machinery/door/airlock{ + name = "Custodial Closet" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/event_spawn, +/obj/effect/landmark/navigate_destination, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/turf/open/floor/iron, +/area/station/service/janitor) +"qGg" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/item/gps/mining, +/obj/item/gps/mining, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"qGJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/trash/grime, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"qGQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/ce) +"qGU" = ( +/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/catwalk_floor/iron_smooth, +/area/station/maintenance/port/fore) +"qGV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"qGW" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"qHg" = ( +/obj/structure/transit_tube/curved/flipped{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"qHj" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"qHl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"qHn" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Research Division Break Room"; + network = list("ss13","rd") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/entertainment/arcade{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"qHt" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"qHz" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/disposal/bin{ + desc = "A pneumatic waste disposal unit. This one leads to the morgue."; + name = "corpse disposal" + }, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"qHA" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/medical/virology) +"qHO" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/chair/sofa/bench/right{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"qIf" = ( +/obj/machinery/power/smes, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"qIo" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/seeds/onion, +/obj/item/seeds/garlic, +/obj/item/seeds/potato, +/obj/item/seeds/tomato, +/obj/item/seeds/carrot, +/obj/item/seeds/grass, +/obj/item/seeds/ambrosia, +/obj/item/seeds/wheat, +/obj/item/seeds/pumpkin, +/obj/effect/spawner/random/contraband/prison, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/food_or_drink/seed{ + spawn_all_loot = 1; + spawn_random_offset = 1 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"qIx" = ( +/obj/machinery/door/airlock/command{ + name = "Head of Personnel" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/hop, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"qIB" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/shutters/window{ + id = "eva_shutters"; + name = "EVA Shutters" + }, +/obj/effect/turf_decal/siding/dark_blue, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 1 + }, +/turf/open/floor/iron/textured_half, +/area/station/ai_monitored/command/storage/eva) +"qIC" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"qIP" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"qIU" = ( +/turf/open/floor/iron, +/area/station/commons/dorms) +"qJh" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/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/plating, +/area/station/maintenance/department/medical/morgue) +"qJi" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/structure/sign/warning/radiation/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"qJv" = ( +/obj/effect/turf_decal/siding/wood, +/obj/item/cigbutt, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"qJB" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/closet/crate/hydroponics, +/obj/item/wrench, +/obj/item/wrench, +/obj/item/grenade/chem_grenade/antiweed{ + pixel_x = 3; + pixel_y = 1 + }, +/obj/item/grenade/chem_grenade/antiweed, +/obj/item/shovel/spade, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 3 + }, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/reagent_containers/cup/watering_can, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"qJC" = ( +/obj/machinery/seed_extractor, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/siding/green{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qJT" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating/snowed/icemoon, @@ -56175,6 +112909,7 @@ "qJY" = ( /obj/machinery/door/airlock/maintenance{ name = "Permabrig Maintenance" +<<<<<<< HEAD }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56194,6 +112929,33 @@ dir = 1 }, /area/mine/eva/lower) +======= + }, +/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/plating, +/area/station/security/prison/safe) +"qKn" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/command/general, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qKq" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -56211,6 +112973,7 @@ /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD "qKw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56226,6 +112989,8 @@ }, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qKx" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, @@ -56237,6 +113002,7 @@ /area/station/command/teleporter) "qKB" = ( /obj/structure/chair, +<<<<<<< HEAD /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -56755,11 +113521,136 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "qRF" = ( +======= +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"qKQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "ceprivacy"; + name = "Privacy Shutter" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/ce) +"qKS" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 1"; + name = "Cell 1 locker" + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/brig) +"qLg" = ( +/obj/effect/spawner/random/contraband/narcotics, +/obj/structure/sign/poster/contraband/syndiemoth/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"qLi" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"qLm" = ( +/obj/machinery/suit_storage_unit/mining, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/mine/eva) +"qLt" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qLy" = ( +/obj/structure/closet/secure_closet/medical2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"qLB" = ( +/obj/structure/filingcabinet/employment, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"qLD" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"qLF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"qLG" = ( +/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/west{ + name = "Test Chamber"; + req_access = list("xenobiology") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"qLQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/eva/lower) +"qLX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/basketball, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"qLY" = ( +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) +"qMk" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/stairs/west, +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/science/cytology) +"qMm" = ( +/obj/structure/bookcase/random/adult, +/turf/open/floor/wood, +/area/station/service/library) +"qMo" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"qMz" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"qMF" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/bar) +<<<<<<< HEAD "qRO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59251,10 +116142,22 @@ dir = 8 }, /obj/structure/cable, +======= +"qMH" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"qMN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; name = "Radiation Chamber Shutters" }, +<<<<<<< HEAD /turf/open/floor/plating, /area/station/engineering/supermatter) "rCC" = ( @@ -61959,6 +118862,5583 @@ /area/station/maintenance/starboard/fore) "srW" = ( /obj/structure/table, +======= +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"qMT" = ( +/turf/closed/wall, +/area/station/commons/lounge) +"qMU" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Pod Four"; + space_dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/storage_shared) +"qNl" = ( +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/delivery, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + location = "Atmospherics" + }, +/turf/open/floor/iron, +/area/station/maintenance/department/medical/central) +"qNn" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/clothing/glasses/welding{ + pixel_y = 4 + }, +/obj/item/disk/tech_disk{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/disk/tech_disk{ + pixel_x = -4; + pixel_y = -7 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/lab) +"qNt" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"qNu" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) +"qNv" = ( +/obj/machinery/telecomms/receiver/preset_right, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"qNx" = ( +/obj/structure/ladder, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/effect/turf_decal/tile/dark_blue/diagonal_edge, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/mix) +"qNE" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qNF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 9 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qNK" = ( +/obj/item/radio/intercom/prison/directional/west, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"qNV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"qNZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"qOj" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/aft) +"qOl" = ( +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"qOu" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"qOx" = ( +/obj/structure/lattice, +/obj/structure/sign/departments/maint/alt/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"qOy" = ( +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) +"qOD" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/siding/dark_blue, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/window{ + id = "eva_shutters"; + name = "EVA Shutters" + }, +/turf/open/floor/iron/textured_half, +/area/station/ai_monitored/command/storage/eva) +"qOG" = ( +/obj/structure/table/wood, +/obj/item/plate, +/obj/effect/spawner/random/trash/bacteria, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"qOH" = ( +/obj/effect/landmark/blobstart, +/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) +"qPb" = ( +/obj/structure/cable, +/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/north, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/thinplating{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light_switch/directional/north{ + pixel_y = 38 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"qPc" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/service/hydroponics) +"qPm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"qPp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"qPq" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/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/checkpoint/customs/auxiliary) +"qPs" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"qPt" = ( +/obj/structure/closet/secure_closet/chemical, +/obj/item/radio/headset/headset_med, +/obj/item/radio/headset/headset_med, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"qPw" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"qPE" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/misc/asteroid/snow/coldroom, +/area/station/service/kitchen/coldroom) +"qPI" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"qPJ" = ( +/obj/structure/cable, +/mob/living/basic/sloth/paperwork, +/turf/open/floor/iron, +/area/station/cargo/storage) +"qPL" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/secondary/exit/departure_lounge) +"qPV" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/service/hydroponics) +"qPX" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/freezer, +/area/mine/eva/lower) +"qPY" = ( +/obj/structure/bookcase/random/fiction, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"qQa" = ( +/obj/machinery/mass_driver/ordnance{ + dir = 4 + }, +/obj/machinery/door/window/left/directional/north, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"qQb" = ( +/obj/machinery/photobooth, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qQf" = ( +/turf/closed/wall, +/area/station/maintenance/fore/lesser) +"qQk" = ( +/obj/structure/fence/cut/large{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"qQo" = ( +/turf/closed/wall, +/area/station/cargo/office) +"qQp" = ( +/turf/closed/wall, +/area/station/medical/storage) +"qQq" = ( +/obj/machinery/meter{ + name = "Mixed Air Tank Out" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"qQt" = ( +/obj/machinery/light/small/directional/west, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"qQx" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"qQC" = ( +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"qQG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qQN" = ( +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"qRk" = ( +/obj/item/chair/wood, +/turf/open/floor/carpet, +/area/station/maintenance/space_hut/cabin) +"qRo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qRq" = ( +/obj/structure/rack, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"qRr" = ( +/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/hallway/secondary/exit/departure_lounge) +"qRs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"qRv" = ( +/obj/structure/railing, +/obj/structure/marker_beacon/cerulean, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"qRE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/starboard) +"qRO" = ( +/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/science/ordnance) +"qSb" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) +"qSh" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"qSj" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/stamp/law, +/obj/machinery/camera/directional/south{ + c_tag = "Service Law Office" + }, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 17 + }, +/obj/machinery/requests_console/directional/south{ + department = "Law Office"; + name = "Law Office Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"qSk" = ( +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"qSo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"qSq" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"qSu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"qSE" = ( +/obj/machinery/door/poddoor/preopen{ + id = "misclab"; + name = "Test Chamber Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"qSN" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"qST" = ( +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/obj/item/multitool, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"qSY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qTa" = ( +/obj/machinery/portable_atmospherics/pipe_scrubber, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"qTf" = ( +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"qTm" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"qTs" = ( +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"qTI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"qTS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"qTZ" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"qUa" = ( +/obj/structure/closet/crate/secure/freezer/pizza, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"qUf" = ( +/obj/machinery/firealarm/directional/east, +/obj/item/storage/box/bodybags{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/structure/rack, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"qUr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"qUu" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"qUw" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"qUI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"qUL" = ( +/obj/structure/closet/emcloset, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"qUQ" = ( +/obj/machinery/power/smes, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"qUS" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"qUY" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"qVg" = ( +/obj/structure/cable, +/obj/structure/chair/stool/directional/south, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"qVk" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"qVo" = ( +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"qVp" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/command/bridge) +"qVz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/rack, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"qVB" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Armory Desk"; + req_access = list("armory") + }, +/obj/machinery/door/window/left/directional/north{ + name = "Armory Desk" + }, +/obj/item/hand_labeler, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory/upper) +"qVD" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/spawner/random/trash/graffiti{ + pixel_y = -32; + spawn_loot_chance = 50 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"qVJ" = ( +/obj/machinery/disposal/bin, +/obj/machinery/light_switch/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/hos) +"qVK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/stairs/medium, +/area/station/commons/dorms/laundry) +"qVN" = ( +/obj/structure/table/glass, +/obj/item/stock_parts/matter_bin, +/obj/effect/spawner/random/food_or_drink/booze, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qVZ" = ( +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"qWe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"qWn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rnd"; + name = "Research Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/hallway/primary/starboard) +"qWu" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/science/breakroom) +"qWy" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/red/end{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"qWD" = ( +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"qWI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/aft) +"qWJ" = ( +/obj/item/crowbar/large, +/obj/structure/rack, +/obj/item/flashlight, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"qWK" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"qWM" = ( +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"qWO" = ( +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"qWS" = ( +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"qWZ" = ( +/turf/closed/wall/r_wall, +/area/station/command/bridge) +"qXf" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"qXg" = ( +/obj/machinery/light/small/directional/south, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"qXt" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/siding/yellow{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"qXF" = ( +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"qXO" = ( +/obj/structure/flora/bush/jungle/c/style_random, +/turf/open/floor/grass, +/area/station/medical/virology) +"qYb" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"qYh" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"qYw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "robo1" + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"qYx" = ( +/obj/item/trapdoor_remote/preloaded{ + pixel_y = 17; + name = "corpse trapdoor remote" + }, +/obj/structure/rack{ + pixel_y = 12; + pixel_x = -1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/turf_decal/caution/red{ + pixel_y = -14 + }, +/obj/structure/noticeboard/cmo{ + pixel_y = 36 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/central) +"qYz" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"qYA" = ( +/obj/machinery/computer/security, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"qYF" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/structure/sign/departments/chemistry/directional/north, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"qYP" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"qYQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"qYR" = ( +/obj/effect/spawner/random/trash/mess, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qYV" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"qYW" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"qYZ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"qZg" = ( +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"qZh" = ( +/obj/structure/table, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/pen, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"qZv" = ( +/obj/machinery/chem_heater/withbuffer, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) +"qZG" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"qZN" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/freezerchamber) +"qZQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"qZT" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/textured, +/area/mine/mechbay) +"qZZ" = ( +/obj/structure/marker_beacon/yellow, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +"rab" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"raf" = ( +/obj/machinery/power/shieldwallgen, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/command/teleporter) +"rai" = ( +/obj/structure/table, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/hand_labeler{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"ras" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/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/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"rat" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"rax" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"raA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/atmospheric_technician, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"raH" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"raN" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/command/teleporter) +"raQ" = ( +/mob/living/basic/pet/penguin/baby/permanent, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"raT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"raY" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Security - Permabrig Observation South"; + network = list("ss13","prison") + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"rbb" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"rbf" = ( +/obj/structure/closet, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"rbm" = ( +/obj/machinery/camera/directional/east{ + c_tag = "MiniSat External NorthWest"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rbs" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"rbC" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/qm) +"rbE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"rbT" = ( +/obj/structure/ore_box, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"rbY" = ( +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"rbZ" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"rcj" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Lockers"; + location = "EVA" + }, +/obj/effect/turf_decal/plaque{ + icon_state = "L6" + }, +/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/hallway/primary/central) +"rck" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/science/explab) +"rcE" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/hallway/primary/central) +"rcP" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"rcS" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/obj/structure/marker_beacon/burgundy, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rcY" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"rdn" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"rds" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "minecraft_shutter"; + name = "Cart Access" + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"rdw" = ( +/obj/structure/bookcase, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet, +/area/station/security/processing) +"rdG" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"rdJ" = ( +/obj/structure/fence/corner{ + dir = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rea" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) +"reb" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"ree" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"rej" = ( +/obj/machinery/oven/range, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"rek" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rep" = ( +/obj/structure/table, +/obj/machinery/button/door{ + pixel_x = -6; + pixel_y = -1; + req_access = list("rd"); + id = "misclab"; + name = "Specimen Chamber Control" + }, +/obj/machinery/button/door{ + pixel_x = -6; + pixel_y = 9; + req_access = list("rd"); + id = "xenobiomain"; + name = "Xenobiology Control" + }, +/obj/machinery/button/door{ + pixel_x = 6; + pixel_y = -1; + req_access = list("rd"); + id = "rd_office_shutters"; + name = "Privacy Control" + }, +/obj/machinery/button/door{ + pixel_x = 6; + pixel_y = 9; + id = "rnd2"; + name = "Ordnance Control"; + req_access = list("rd") + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/command/heads_quarters/rd) +"res" = ( +/obj/structure/ladder, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"rex" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/oil, +/obj/item/wrench, +/obj/effect/turf_decal/tile/dark{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/mine/living_quarters) +"reJ" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Tool Storage" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"reT" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 8"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"rfh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"rfo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"rfu" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/rec) +"rfF" = ( +/obj/effect/spawner/random/trash/mess, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"rfQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"rfR" = ( +/obj/machinery/telecomms/bus/preset_two, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"rfS" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"rgl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"rgm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/table, +/obj/item/folder/yellow{ + pixel_x = -9; + pixel_y = 8 + }, +/obj/item/folder/yellow{ + pixel_x = -16; + pixel_y = 14 + }, +/obj/item/folder{ + pixel_x = -12; + pixel_y = 17 + }, +/obj/item/paper{ + pixel_x = -13; + pixel_y = 10 + }, +/obj/item/pen/blue{ + pixel_x = -13; + pixel_y = 10 + }, +/obj/item/stack/package_wrap, +/turf/open/floor/wood/large, +/area/mine/eva/lower) +"rgq" = ( +/obj/structure/minecart_rail{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"rgs" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"rgB" = ( +/obj/structure/cable, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"rgC" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"rgE" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/hfr_room) +"rhf" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "hosspace"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hos) +"rhv" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"rhF" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Security - Permabrig Observation North"; + network = list("ss13","prison") + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"rhG" = ( +/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/wood, +/area/station/hallway/secondary/service) +"rhJ" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rhY" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/box/red, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"rig" = ( +/obj/structure/bed, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"ril" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/medical/central) +"rin" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/hallway/secondary/entry) +"riv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/security/general, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"riB" = ( +/obj/machinery/computer/records/security, +/obj/machinery/computer/security/telescreen/normal/directional/north, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +"riL" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/mine/living_quarters) +"riW" = ( +/obj/item/toy/snowball{ + pixel_x = 9; + pixel_y = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"rja" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/paper/carbon, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"rjb" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"rjd" = ( +/obj/structure/table, +/obj/machinery/computer/security/telescreen/isolation/directional/south, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket{ + pixel_x = 6 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Permabrig Prep"; + network = list("ss13","prison"); + view_range = 5 + }, +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"rjr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/plating, +/area/station/medical/virology) +"rjt" = ( +/obj/structure/table/glass, +/obj/item/computer_disk/medical, +/obj/item/computer_disk/medical, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"rjE" = ( +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"rjK" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/bot/right, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"rjP" = ( +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rkc" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/storage) +"rkh" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rkk" = ( +/obj/structure/rack, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_y = 2 + }, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals Emergency EVA" + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"rkl" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "Containment Blast Door" + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"rkp" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"rkt" = ( +/obj/structure/cable, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"rkz" = ( +/obj/structure/railing, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"rkH" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"rkI" = ( +/obj/machinery/door/airlock/command{ + name = "Captain's Office" + }, +/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/effect/mapping_helpers/airlock/access/all/command/captain, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"rkK" = ( +/obj/machinery/suit_storage_unit/cmo, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"rkL" = ( +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) +"rkN" = ( +/turf/closed/wall, +/area/station/engineering/atmos/hfr_room) +"rkP" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"rkV" = ( +/obj/structure/railing, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3 + }, +/obj/item/multitool{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/assembly/signaler{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"rlf" = ( +/obj/effect/spawner/random/structure/steam_vent, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"rlj" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"rlq" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +"rlt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"rlu" = ( +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"rlB" = ( +/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/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"rlE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"rlS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"rlV" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/commons/dorms) +"rmn" = ( +/obj/structure/chair/stool/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"rmv" = ( +/obj/structure/rack, +/obj/item/wrench, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"rmA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/checker, +/area/station/commons/storage/emergency/port) +"rmB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/grunge{ + name = "Mining Mechbay Control" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/dark/textured_half, +/area/mine/mechbay) +"rmP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rmZ" = ( +/obj/machinery/iv_drip, +/obj/structure/mirror/broken/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"rnh" = ( +/obj/machinery/door/airlock{ + name = "Observatory Access" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"rnl" = ( +/obj/structure/railing, +/turf/open/floor/iron, +/area/mine/production) +"rnp" = ( +/obj/machinery/door/poddoor/incinerator_atmos_main{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"rns" = ( +/obj/structure/table/reinforced, +/obj/item/aicard{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"rnt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"rnx" = ( +/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/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva/lower) +"rnQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"roj" = ( +/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/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"rop" = ( +/obj/machinery/telecomms/processor/preset_one, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"ros" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/hallway/secondary/service) +"rou" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Research Break Room" + }, +/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/effect/mapping_helpers/airlock/access/all/science/general, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"rox" = ( +/obj/structure/table, +/obj/effect/spawner/round_default_module, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"roA" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 4"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"roH" = ( +/obj/structure/chair/pew/right, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"roQ" = ( +/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/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"roT" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/item/gun/energy/laser/carbine/practice, +/obj/item/gun/energy/laser/practice, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/science/explab) +"roX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/checkpoint/customs/auxiliary) +"rpa" = ( +/obj/structure/closet/athletic_mixed, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"rpC" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) +"rpD" = ( +/obj/effect/spawner/random/trash/mess, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rpF" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/engine, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/engine_smes) +"rpK" = ( +/obj/structure/chair/pew/left{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"rpM" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"rpT" = ( +/obj/structure/closet/emcloset, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Access" + }, +/obj/effect/turf_decal/tile/red/half, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"rpU" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"rpV" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"rqa" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/science/explab) +"rqd" = ( +/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/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"rqi" = ( +/obj/item/crowbar{ + pixel_y = 3 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -19; + pixel_y = 3 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/item/radio/off{ + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"rqk" = ( +/obj/effect/spawner/random/trash/graffiti, +/obj/structure/sign/poster/contraband/free_drone/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"rqD" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"rqF" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage"; + name = "Secure Storage" + }, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"rqH" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/leather, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"rqI" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/station/medical/virology) +"rqJ" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"rqN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"rqR" = ( +/obj/machinery/biogenerator, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/green{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"rqY" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"rrg" = ( +/obj/structure/table/glass, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/plant_analyzer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rrh" = ( +/obj/structure/fence/post{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rrn" = ( +/obj/structure/closet/emcloset, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"rrp" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"rrB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"rrR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"rrV" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end, +/turf/open/floor/plating, +/area/mine/eva) +"rsf" = ( +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rsh" = ( +/obj/structure/sign/poster/contraband/the_big_gas_giant_truth/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rsw" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"rsy" = ( +/obj/item/training_toolbox{ + pixel_y = 5 + }, +/obj/structure/table, +/obj/item/training_toolbox{ + pixel_y = -2 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Holodeck Control" + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/commons/fitness) +"rsG" = ( +/obj/item/toy/snowball{ + pixel_x = -11; + pixel_y = -2 + }, +/obj/structure/sign/warning/secure_area{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"rsL" = ( +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"rsM" = ( +/obj/structure/bed/maint, +/obj/item/toy/plush/rouny{ + desc = "What is this? Is this a dog?"; + name = "Therapy Dog" + }, +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Isolation Cell"; + network = list("ss13","prison","Isolation"); + view_range = 5 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/station/security/prison/safe) +"rsR" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) +"rsV" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm1"; + name = "Dorm 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/dorms) +"rsW" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"rsY" = ( +/turf/closed/wall/r_wall, +/area/mine/eva) +"rtf" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rth" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"rtn" = ( +/obj/structure/chair/comfy/black, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"rtp" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Crematorium Maintenance" + }, +/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/effect/mapping_helpers/airlock/access/all/service/crematorium, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"rtq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"rtt" = ( +/obj/effect/turf_decal/trimline/dark_green/line, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"rtw" = ( +/obj/structure/reagent_dispensers/cooking_oil, +/turf/open/misc/asteroid/snow/coldroom, +/area/station/service/kitchen/coldroom) +"rty" = ( +/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/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/cargo/storage) +"rtR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/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, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/storage/gas) +"ruw" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 1; + name = "plasma mixer" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ruC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"ruD" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"ruI" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Air to Port" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ruO" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/closet/firecloset, +/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/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"ruZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"rvj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/eighties/red, +/area/station/security/prison/safe) +"rvy" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"rvA" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"rvS" = ( +/obj/structure/rack, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"rvZ" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rwe" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"rwn" = ( +/obj/machinery/door/airlock/command{ + name = "Head of Personnel" + }, +/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/command/hop, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"rwt" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rwB" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rwC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"rwD" = ( +/obj/structure/rack, +/obj/item/clothing/head/soft/mime, +/obj/item/clothing/suit/apron/chef, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"rwR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/mine/laborcamp) +"rwZ" = ( +/obj/structure/sign/departments/botany/directional/east, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"rxa" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/central) +"rxf" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics - East" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Plasma to Pure" + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"rxx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics - HFR Decontamination Chamber" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"rxz" = ( +/obj/structure/girder, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"rxG" = ( +/obj/structure/ore_vent/starter_resources{ + icon_state = "ore_vent_ice_active"; + icon_state_tapped = "ore_vent_ice_active" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"rxJ" = ( +/turf/open/floor/glass, +/area/station/service/hydroponics) +"rxW" = ( +/turf/closed/mineral/random/snow, +/area/icemoon/underground/unexplored/rivers) +"rxY" = ( +/turf/closed/wall, +/area/station/service/bar/backroom) +"ryf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"ryl" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "Cargo_Store_In"; + name = "Cargo Warehouse Shutters" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"ryn" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/rnd/production/techfab/department/service, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) +"ryu" = ( +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"ryC" = ( +/obj/structure/cable, +/obj/structure/fence/door/opened, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"ryG" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/holding_cell) +"ryJ" = ( +/obj/machinery/light/small/directional/east, +/turf/open/openspace, +/area/station/service/hydroponics) +"ryM" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/shovel, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/radio/off, +/obj/item/radio/intercom/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/textured, +/area/station/hallway/secondary/entry) +"rzj" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/sheet/iron/fifty, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"rzz" = ( +/obj/machinery/door/airlock/command{ + name = "Server Room" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/turf/open/floor/iron/dark, +/area/station/science/server) +"rzD" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{ + dir = 1 + }, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"rzG" = ( +/obj/structure/railing, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rzL" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"rzO" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rzS" = ( +/obj/structure/sign/departments/chemistry/pharmacy/directional/west, +/obj/machinery/digital_clock/directional/south, +/turf/open/openspace, +/area/station/medical/medbay/lobby) +"rzV" = ( +/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/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"rAr" = ( +/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 = 1 + }, +/mob/living/simple_animal/bot/secbot/beepsky{ + desc = "Powered by the tears and sweat of laborers."; + name = "Prison Ofitser" + }, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"rAA" = ( +/obj/machinery/pdapainter, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"rAC" = ( +/obj/structure/chair, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"rAF" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to External" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"rAO" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"rAR" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) +"rAW" = ( +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"rAY" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"rAZ" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/command/storage/eva) +"rBo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"rBv" = ( +/obj/structure/chair/stool/directional/north, +/obj/item/storage/toolbox/artistic{ + pixel_y = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"rBz" = ( +/obj/machinery/computer/order_console/cook{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"rBJ" = ( +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/structure/rack, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"rBL" = ( +/obj/machinery/light/directional/west, +/turf/open/openspace, +/area/station/commons/storage/mining) +"rBM" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"rBQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"rBV" = ( +/turf/closed/wall, +/area/station/tcommsat/computer) +"rCe" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"rCf" = ( +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"rCj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"rCs" = ( +/obj/structure/table, +/obj/item/food/deadmouse{ + pixel_y = 18; + pixel_x = 13 + }, +/obj/structure/microscope, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"rCu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rCx" = ( +/obj/item/clothing/glasses/sunglasses, +/obj/item/stack/spacecash/c10, +/obj/item/stack/spacecash/c10, +/obj/item/grenade/smokebomb, +/obj/item/poster/random_contraband{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/head/soft/yellow, +/obj/effect/spawner/random/maintenance/four, +/obj/item/crowbar/red, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/cardboard, +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/wrapping, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"rCB" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"rCC" = ( +/turf/closed/wall, +/area/station/cargo/sorting) +"rCD" = ( +/obj/machinery/light_switch/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"rCE" = ( +/obj/structure/table, +/obj/item/plate/large, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"rCO" = ( +/obj/structure/closet/crate, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"rCT" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"rCU" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/mining_weather_monitor/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"rCW" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics Internal Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"rCX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/item/clothing/head/utility/welding{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/clothing/glasses/welding, +/obj/item/multitool{ + pixel_x = 3 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"rDa" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/bed/medical/emergency, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"rDd" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva) +"rDj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"rDn" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/mine/eva) +"rDJ" = ( +/obj/structure/ladder{ + name = "upper dispenser access" + }, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/iron/dark/textured_large, +/area/station/medical/treatment_center) +"rDN" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rDO" = ( +/obj/structure/table, +/obj/item/storage/box/lights/mixed, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = -1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"rDZ" = ( +/turf/open/floor/engine, +/area/station/science/explab) +"rEe" = ( +/obj/structure/closet{ + name = "evidence closet 4" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/evidence) +"rEf" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/sign/warning/chem_diamond/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"rEh" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"rEo" = ( +/obj/structure/dresser, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"rEp" = ( +/obj/structure/table, +/obj/item/hand_labeler, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"rEq" = ( +/obj/structure/beebox, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"rEr" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/machinery/door/poddoor{ + id = "QMLoaddoor"; + name = "Supply Dock Loading Door"; + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"rEx" = ( +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"rEG" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"rEM" = ( +/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/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rEP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/processing) +"rES" = ( +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"rEU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"rFb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"rFf" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/mining) +"rFh" = ( +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/eva/lower) +"rFD" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"rFI" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "Atmospherics Project Shutters"; + name = "Atmospherics Project Shutters"; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"rFP" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"rFU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"rGd" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen/invisible, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/engine/cult, +/area/station/service/library) +"rGf" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"rGh" = ( +/obj/machinery/recharge_station, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"rGl" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"rGq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/fore/lesser) +"rGu" = ( +/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, +/turf/open/floor/iron, +/area/station/engineering/main) +"rGw" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters2"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"rGY" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"rHc" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"rHi" = ( +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) +"rHk" = ( +/obj/machinery/exodrone_launcher, +/obj/item/exodrone{ + pixel_y = 8 + }, +/obj/effect/turf_decal/trimline/yellow/end, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/drone_bay) +"rHx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"rHz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"rHD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/transport/linear{ + radial_travel = 0 + }, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/plating/elevatorshaft, +/area/mine/storage) +"rHH" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/snack/lizard, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"rHQ" = ( +/obj/machinery/computer/message_monitor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"rHZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"rIc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"rIz" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth, +/area/station/maintenance/fore/lesser) +"rIF" = ( +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Mixing Room South" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"rIH" = ( +/obj/structure/chair/stool/directional/south, +/obj/structure/sign/poster/official/work_for_a_future/directional/west, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"rIU" = ( +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"rIX" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/main) +"rJc" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/machinery/light/small/red/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"rJe" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 1"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"rJr" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white, +/obj/structure/closet/firecloset, +/obj/machinery/mining_weather_monitor/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"rJv" = ( +/obj/machinery/bluespace_beacon, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/teleporter) +"rJz" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth, +/area/station/maintenance/fore/lesser) +"rKs" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/light/small/dim/directional/west, +/obj/structure/sign/poster/official/work_for_a_future/directional/west, +/turf/open/floor/iron, +/area/mine/laborcamp) +"rKv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"rKZ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"rLl" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"rLo" = ( +/turf/open/floor/plating, +/area/station/cargo/miningdock) +"rLs" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"rLu" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/cargo/office) +"rLL" = ( +/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/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/obj/machinery/holopad, +/obj/effect/landmark/start/depsec/medical, +/obj/machinery/computer/security/telescreen/med_sec/directional/east, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"rLX" = ( +/obj/item/target, +/obj/item/target/syndicate, +/obj/item/target/alien, +/obj/item/target/clown, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/closet/crate{ + name = "Firing Range Supplies Set" + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"rMr" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"rMu" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"rME" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/openspace, +/area/station/security/prison) +"rMG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"rMN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"rMS" = ( +/obj/structure/table/glass, +/obj/item/toy/figure/cmo{ + pixel_x = -17; + pixel_y = -1 + }, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/light/small/directional/north, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/cmo) +"rMY" = ( +/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/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"rNc" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/structure/closet/crate/preopen, +/obj/item/stack/sheet/mineral/plasma/five, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/mine/living_quarters) +"rNn" = ( +/obj/structure/flora/grass/brown/style_random, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rNz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/department/medical/morgue) +"rNE" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 2; + height = 13; + name = "port bay 2"; + shuttle_id = "ferry_home"; + width = 5 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rNK" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/science/ordnance) +"rNQ" = ( +/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/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rNZ" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"rOb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"rOe" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"rOv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/obj/structure/railing/corner/end, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rOw" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Kitchen Maintenance" + }, +/obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/service/kitchen/coldroom) +"rOx" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/coldroom, +/area/station/service/kitchen/coldroom) +"rOA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"rOB" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 10 + }, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/mine/living_quarters) +"rOC" = ( +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"rOF" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/mine/eva) +"rOL" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"rOU" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"rPe" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/closet/toolcloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"rPL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"rPP" = ( +/obj/machinery/computer/records/security, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) +"rQf" = ( +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"rQh" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Chapel Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"rQl" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"rQn" = ( +/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/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"rQw" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"rQx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/mine/laborcamp) +"rQG" = ( +/obj/structure/disposalpipe/segment, +/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/maintenance/department/medical/morgue) +"rQI" = ( +/obj/item/kirbyplants/random, +/obj/item/radio/intercom/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) +"rQN" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ + dir = 8 + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"rQW" = ( +/obj/machinery/requests_console/directional/west{ + department = "Science"; + name = "Science Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/machinery/computer/rdconsole{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/science/lab) +"rQZ" = ( +/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, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"rRc" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"rRd" = ( +/obj/item/storage/toolbox/electrical{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "eva_shutters"; + req_access = list("command") + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/light_switch/directional/east{ + pixel_y = -6 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/toolbox/emergency, +/obj/structure/rack, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"rRk" = ( +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"rRl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"rRn" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"rRt" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"rRA" = ( +/obj/structure/ladder{ + name = "chemistry lab access" + }, +/obj/effect/turf_decal/stripes/end, +/obj/structure/sign/departments/chemistry/directional/north, +/obj/effect/turf_decal/tile/yellow/full, +/obj/machinery/door/window/left/directional/south{ + name = "Chemistry Lab Access Hatch"; + req_access = list("plumbing") + }, +/turf/open/floor/iron/white/textured_large, +/area/station/medical/treatment_center) +"rRM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"rRN" = ( +/obj/structure/railing, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"rRT" = ( +/obj/structure/cable, +/obj/structure/minecart_rail{ + dir = 1 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"rSe" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"rSl" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/fore) +"rSq" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rSx" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/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/maintenance/department/medical/central) +"rSz" = ( +/obj/machinery/light/directional/west, +/turf/open/openspace, +/area/station/science/xenobiology) +"rSC" = ( +/turf/open/floor/glass/reinforced, +/area/station/engineering/lobby) +"rSN" = ( +/obj/machinery/computer/upload/borg{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south{ + broadcasting = 1; + frequency = 1447; + listening = 0; + name = "station intercom (AI Private)" + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 + }, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai_upload) +"rSP" = ( +/obj/structure/closet/secure_closet/engineering_chief, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"rSW" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"rTt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"rTO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"rTV" = ( +/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) +"rTZ" = ( +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing/corner/end/flip{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"rUb" = ( +/obj/structure/railing, +/obj/machinery/flasher/portable, +/obj/structure/cable, +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"rUo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"rUy" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #2" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/east, +/mob/living/simple_animal/bot/mulebot, +/obj/machinery/status_display/supply{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"rUz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"rUJ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"rUQ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers{ + pixel_y = 7 + }, +/obj/item/assembly/igniter{ + pixel_y = -3 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"rUR" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"rUS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"rUT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"rUY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"rVd" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"rVe" = ( +/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/cyclelink_helper_multi{ + cycle_id = "miner-passthrough" + }, +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"rVi" = ( +/obj/effect/spawner/random/structure/steam_vent, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"rVq" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"rVA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"rVB" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"rVC" = ( +/obj/structure/table, +/obj/item/storage/backpack{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/backpack, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"rVE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"rVV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"rVX" = ( +/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/iron, +/area/mine/laborcamp) +"rWg" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/extinguisher_cabinet/directional/north, +/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, +/obj/machinery/camera/directional/north{ + c_tag = "Chief Medical Office South"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"rWm" = ( +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"rWn" = ( +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"rWp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ + dir = 8 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"rWH" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chemistry Lab Utilities" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/medical/central) +"rWI" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, +/obj/structure/table/glass, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, +/obj/item/food/grown/poppy{ + pixel_y = -1; + pixel_x = 3 + }, +/obj/item/food/grown/poppy/geranium{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/item/food/grown/poppy/lily{ + pixel_x = -2 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"rWO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "Atmospherics HFR Shutters" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"rWR" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"rWU" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Prison Wing" + }, +/obj/machinery/door/firedoor, +/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/brig, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"rWW" = ( +/obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"rWZ" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/port) +"rXe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"rXg" = ( +/obj/structure/closet/crate/internals, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"rXi" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"rXj" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/medical{ + dir = 4 + }, +/obj/structure/secure_safe/directional/south, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"rXr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/commons/storage/primary) +"rXw" = ( +/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/any/service/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Bar Maintenance" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/commons/lounge) +"rXP" = ( +/obj/item/pickaxe/improvised{ + pixel_x = 7 + }, +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) +"rXX" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/processing) +"rYq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"rYt" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"rYw" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 5 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/dark/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/mine/living_quarters) +"rYA" = ( +/obj/structure/flora/grass/green/style_random, +/obj/structure/sign/warning/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"rYB" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"rYE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"rYG" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva) +"rYT" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"rZa" = ( +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"rZm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"rZE" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"rZR" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/landmark/start/chief_medical_officer, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"rZY" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"rZZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"sab" = ( +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) +"sav" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/service/bar) +"saC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/fore) +"saF" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"saO" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/storage) +"saR" = ( +/obj/structure/closet, +/obj/item/bodybag, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"saX" = ( +/obj/machinery/button/door/directional/west{ + id = "executionfireblast"; + name = "Transfer Area Lockdown"; + pixel_y = -6; + req_access = list("brig") + }, +/obj/structure/railing, +/obj/machinery/door/window/left/directional/south, +/obj/machinery/button/flasher{ + pixel_x = -24; + pixel_y = 5; + id = "executionflash" + }, +/turf/open/floor/plating/icemoon, +/area/station/security/execution/education) +"sbc" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/item/folder/white{ + pixel_x = -5 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/iron, +/area/station/medical/pharmacy) +"sbd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"sbi" = ( +/obj/machinery/newscaster/directional/north, +/obj/machinery/photocopier, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"sby" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) +"sbD" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"sbJ" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"sbK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/engineering/storage_shared) +"sbN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"sbP" = ( +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"sbU" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/iron/dark, +/area/mine/eva) +"sbY" = ( +/obj/structure/table, +/obj/item/newspaper, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/structure/secure_safe/directional/east, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"sca" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "gene_shutters"; + name = "Genetics Shutters" + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"scb" = ( +/obj/structure/toilet/greyscale{ + cistern_open = 1; + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"scl" = ( +/obj/structure/bookcase/random, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"scm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva/lower) +"sco" = ( +/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, +/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) +"scx" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/tcomms, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"scV" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Security - Detective's Office" + }, +/obj/machinery/computer/records/security, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"sdf" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) +"sdl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 + }, +/obj/machinery/meter, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/science/ordnance) +"sdr" = ( +/obj/structure/transit_tube/horizontal, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"sds" = ( +/obj/structure/fence/corner{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"sdE" = ( +/obj/structure/chair/pew/left, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"sdF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/item/grown/log/tree, +/obj/item/grown/log/tree{ + pixel_y = 5; + pixel_x = 7 + }, +/obj/item/grown/log/tree{ + pixel_x = 7 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"sdW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"sdX" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/item/assembly/timer{ + pixel_y = 3 + }, +/obj/item/assembly/voice{ + pixel_y = 6 + }, +/obj/item/assembly/signaler{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -5; + pixel_y = -1 + }, +/obj/item/assembly/flash, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"sen" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/courtroom) +"seA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/courtroom) +"seH" = ( +/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/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"seL" = ( +/obj/structure/table, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/assembly/infra{ + pixel_x = 3 + }, +/obj/item/assembly/igniter{ + pixel_y = -2 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/item/assembly/signaler, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/ai_monitored/command/storage/eva) +"seR" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"seX" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"seY" = ( +/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/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"sfd" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_x = 1 + }, +/obj/structure/sign/warning/chem_diamond/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"sfr" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"sfv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"sfy" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"sfF" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Security - Lower Hallway North"; + network = list("ss13","prison") + }, +/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/machinery/light/directional/east, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"sfY" = ( +/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/white/side{ + dir = 5 + }, +/area/station/science/research) +"sgA" = ( +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"sgB" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/item/restraints/handcuffs, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"sgL" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/computer/security/telescreen/test_chamber/directional/north, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/command/heads_quarters/rd) +"sgT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/railing/corner/end, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"sgV" = ( +/obj/effect/turf_decal/siding/brown/corner, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"sgW" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"shc" = ( +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"she" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"shh" = ( +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"shj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"sht" = ( +/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/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/production) +"shy" = ( +/obj/machinery/modular_computer/preset/cargochat/medical{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/filled/end{ + dir = 1 + }, +/obj/structure/sign/warning/no_smoking/circle/directional/south, +/turf/open/floor/iron, +/area/station/medical/medbay/aft) +"shB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"shF" = ( +/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/service/hydroponics) +"shG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"shH" = ( +/obj/structure/cable, +/obj/structure/transit_tube/curved{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"shR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"sil" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Art Gallery" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"siu" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"six" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/pen/red{ + pixel_x = -6 + }, +/obj/item/pen/blue{ + pixel_x = -1; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/service/library) +"siI" = ( +/obj/machinery/space_heater, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/mine/eva) +"sjb" = ( +/turf/closed/wall/r_wall, +/area/station/cargo/drone_bay) +"sjd" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Service External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"sjh" = ( +/obj/structure/fence/door/opened, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"sjk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 6 + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"sjl" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing/corner, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"sjp" = ( +/obj/effect/spawner/random/structure/chair_flipped, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/plaques/kiddie/perfect_drone{ + pixel_x = 32 + }, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) +"sjz" = ( +/obj/structure/chair/sofa/bench/left, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"skc" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1"; + space_dir = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"skj" = ( +/obj/structure/table, +/obj/machinery/light/directional/east, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"skl" = ( +/turf/closed/wall, +/area/station/maintenance/fore) +"skn" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"skr" = ( +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"skx" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"skI" = ( +/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, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"skJ" = ( +/obj/structure/grille/broken, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"skW" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"skX" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/stripes/line, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/atmos) +"skZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"slc" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/bed/medical/emergency, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"slh" = ( +/obj/structure/table, +/obj/item/flashlight, +/obj/item/flashlight{ + pixel_y = 13 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"sll" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Arrivals" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"sln" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"slp" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio9"; + name = "Xenobio Pen 9 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"slD" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"slP" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"slX" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/red/box, +/obj/machinery/door/poddoor/massdriver_trash, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"smg" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/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/construction) +"smj" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"smn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/commons/locker) +"smp" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/clock/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"smr" = ( +/obj/machinery/door/airlock/engineering{ + name = "Port Bow Solar Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"smw" = ( +/obj/structure/closet/emcloset, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"smx" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #3" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) +"smC" = ( +/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/service/chapel) +"sna" = ( +/obj/item/kirbyplants/fern, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"snd" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"sng" = ( +/obj/structure/table, +/obj/item/wrench, +/obj/item/crowbar, +/obj/item/radio, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"sni" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"snj" = ( +/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/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"snt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"snw" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"snG" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"snI" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/vending/modularpc, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"snL" = ( +/obj/item/pickaxe{ + pixel_x = 12; + desc = "Someone left their pickaxe out here, must not have known about the boulder processing machines inside." + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"snO" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"snW" = ( +/obj/machinery/computer/atmos_control/oxygen_tank{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"sok" = ( +/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/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"sop" = ( +/obj/structure/table, +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/five, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"soq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron/dark/side, +/area/mine/eva/lower) +"sou" = ( +/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 = 6 + }, +/turf/open/floor/iron/white, +/area/station/maintenance/aft/greater) +"soz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Research Division Lobby"; + network = list("ss13","rd") + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"soA" = ( +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/syringes, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"soE" = ( +/obj/structure/reagent_dispensers/plumbed{ + name = "service reservoir" + }, +/obj/machinery/light/small/dim/directional/north, +/obj/effect/turf_decal/delivery/white{ + color = "#307db9" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/textured, +/area/station/maintenance/starboard/fore) +"soF" = ( +/obj/effect/turf_decal/trimline/dark_red/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/dark_blue/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"soI" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Fitness Ring" + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"soK" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"soM" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"soR" = ( +/obj/machinery/icecream_vat, +/obj/structure/sign/clock/directional/north, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"spg" = ( +/obj/structure/table, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5 + }, +/obj/item/storage/box/bodybags{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/storage/box/disks{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"spv" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"spy" = ( +/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/commons/fitness) +"spz" = ( +/obj/structure/chair/wood, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"sqb" = ( +/obj/item/coin/iron{ + pixel_y = -5 + }, +/obj/item/coin/plasma{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/toy/plush/lizard_plushie{ + name = "Cassius"; + pixel_x = 11; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"sqn" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/machinery/requests_console/directional/south{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"sqt" = ( +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"sqA" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/service/chapel) +"sqN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"sqW" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"sra" = ( +/obj/structure/table, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"srb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/cold/directional/north, +/obj/structure/sign/warning/bodysposal/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"sre" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"srk" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Library Desk Door"; + req_access = list("library") + }, +/turf/open/floor/wood, +/area/station/service/library) +"srn" = ( +/turf/open/floor/glass/reinforced, +/area/station/medical/treatment_center) +"sro" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/station/maintenance/port/aft) +"srw" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"sry" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/medical/morgue) +"srB" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/landmark/start/bitrunner, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) +"srP" = ( +/turf/closed/wall, +/area/station/science/breakroom) +"srW" = ( +/obj/structure/table, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/assembly/prox_sensor{ pixel_x = 5; pixel_y = 7 @@ -61989,6 +124469,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/office) +<<<<<<< HEAD "ssg" = ( /obj/machinery/camera/directional/north{ c_tag = "Cargo Bay North" @@ -61996,6 +124477,8 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ssh" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 @@ -62006,6 +124489,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "ssm" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/closet/firecloset, @@ -62013,12 +124497,19 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/plating, /area/station/service/kitchen/coldroom) +======= +"ssj" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ssq" = ( /obj/structure/table/wood, /obj/item/camera_film, /obj/item/camera_film, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "ssr" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -62027,6 +124518,15 @@ /obj/structure/gulag_vent/ice, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +======= +"sst" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ssv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/thinplating_new/corner, @@ -62040,6 +124540,16 @@ dir = 1 }, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD +======= +"ssH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ssM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62054,12 +124564,15 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) +<<<<<<< HEAD "stb" = ( /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, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sth" = ( /obj/item/radio/intercom/directional/east, /obj/structure/disposalpipe/trunk{ @@ -62102,6 +124615,7 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +<<<<<<< HEAD "stB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -62112,6 +124626,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stD" = ( /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -62125,6 +124641,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +<<<<<<< HEAD "stI" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -62132,6 +124649,8 @@ /obj/structure/sign/warning/electric_shock/directional/north, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stJ" = ( /obj/structure/flora/grass/brown/style_random, /turf/open/misc/asteroid/snow/icemoon, @@ -62180,6 +124699,7 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD "sup" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/gas_mask, @@ -62191,6 +124711,28 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/fore) +======= +"sul" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"suo" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster/directional/west, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap{ + pixel_y = 3 + }, +/obj/item/storage/photo_album/bar, +/obj/item/toy/figure/bartender, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "suA" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/dirt, @@ -62198,6 +124740,18 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +<<<<<<< HEAD +======= +"suF" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/south, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "suL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62246,6 +124800,16 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/large, /area/station/medical/treatment_center) +<<<<<<< HEAD +======= +"svx" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "svy" = ( /obj/effect/decal/cleanable/oil, /obj/item/stack/ore/glass, @@ -62254,6 +124818,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) +<<<<<<< HEAD "svz" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/weather/snow/corner{ @@ -62261,6 +124826,8 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "svF" = ( /turf/open/floor/iron/smooth, /area/station/security/execution/transfer) @@ -62274,6 +124841,20 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/engineering/storage/tech) +<<<<<<< HEAD +======= +"svR" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/structure/fireaxecabinet/directional/north, +/turf/open/floor/iron, +/area/station/command/bridge) +"svV" = ( +/obj/machinery/space_heater, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "swa" = ( /obj/machinery/light/directional/east, /turf/open/floor/engine, @@ -62290,12 +124871,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/range) +<<<<<<< HEAD "swe" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "swf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62347,6 +124931,10 @@ /obj/machinery/power/terminal, /obj/machinery/light/small/directional/east, /obj/structure/cable, +<<<<<<< HEAD +======= +/obj/structure/sign/warning/electric_shock/directional/east, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "swu" = ( @@ -62364,6 +124952,7 @@ "swF" = ( /turf/closed/wall, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "swI" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -62371,6 +124960,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "swK" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62396,12 +124987,27 @@ }, /turf/open/floor/plating, /area/station/cargo/warehouse) +<<<<<<< HEAD "sxe" = ( /obj/structure/fence{ dir = 4 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +======= +"sxs" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/closet/crate/freezer/blood, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"sxt" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sxu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62418,6 +125024,10 @@ /area/station/medical/medbay/aft) "sxF" = ( /obj/structure/chair/stool/directional/north, +<<<<<<< HEAD +======= +/obj/structure/sign/warning/electric_shock/directional/west, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "sxO" = ( @@ -62427,6 +125037,7 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD "sxQ" = ( /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/misc/asteroid/snow/icemoon, @@ -62436,6 +125047,8 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/security/prison/rec) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sxY" = ( /obj/structure/cable/multilayer/multiz, /obj/structure/window/reinforced/spawner/directional/south, @@ -62449,6 +125062,7 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD "syd" = ( /obj/machinery/duct, /obj/machinery/firealarm/directional/south, @@ -62457,12 +125071,15 @@ }, /turf/open/floor/iron, /area/station/service/kitchen/coldroom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "syh" = ( /obj/structure/chair/pew/right{ dir = 1 }, /turf/open/floor/iron/dark, /area/station/service/chapel) +<<<<<<< HEAD "sym" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -62471,6 +125088,8 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "syn" = ( /obj/effect/turf_decal/tile/neutral/diagonal_centre, /obj/machinery/atmospherics/pipe/multiz/violet/visible{ @@ -62479,6 +125098,29 @@ /obj/effect/turf_decal/tile/dark_green/diagonal_edge, /turf/open/floor/iron/dark/diagonal, /area/station/engineering/atmos/mix) +<<<<<<< HEAD +======= +"sys" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"syv" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "syw" = ( /obj/structure/fence/corner{ dir = 4 @@ -62493,11 +125135,55 @@ dir = 8 }, /area/station/security/prison) +<<<<<<< HEAD +======= +"syC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/commons/fitness) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "syE" = ( /obj/effect/turf_decal/trimline/green/filled/corner, /obj/effect/turf_decal/trimline/blue/corner, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +<<<<<<< HEAD +======= +"syG" = ( +/obj/structure/fence{ + dir = 2; + pixel_y = 0 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"syI" = ( +/obj/effect/turf_decal/siding/white/end{ + dir = 8 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/bowl{ + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bowl{ + pixel_y = 8; + pixel_x = 3 + }, +/obj/item/food/grown/eggplant{ + pixel_y = 5; + pixel_x = 5 + }, +/obj/item/food/grown/mushroom/chanterelle{ + pixel_y = 3 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "syL" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -62523,6 +125209,7 @@ /obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/station/medical/morgue) +<<<<<<< HEAD "szj" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -62531,6 +125218,8 @@ dir = 8 }, /area/station/hallway/primary/starboard) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "szo" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -62540,6 +125229,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "szt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62547,11 +125237,14 @@ /obj/structure/sign/clock/directional/south, /turf/open/floor/iron, /area/station/commons/fitness) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "szu" = ( /obj/structure/sign/poster/official/obey/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +<<<<<<< HEAD "szz" = ( /obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/tile/red{ @@ -62559,6 +125252,8 @@ }, /turf/open/floor/iron/textured, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "szD" = ( /obj/effect/turf_decal/trimline/green/filled/end, /obj/effect/decal/cleanable/dirt, @@ -62571,6 +125266,7 @@ /obj/structure/sign/warning/cold_temp/directional/north, /turf/open/floor/iron/smooth, /area/station/cargo/warehouse) +<<<<<<< HEAD "szK" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -62579,6 +125275,8 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "szR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62596,6 +125294,7 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/commons/dorms/laundry) +<<<<<<< HEAD "sAa" = ( /obj/structure/stairs/north, /obj/structure/railing{ @@ -62603,6 +125302,15 @@ }, /turf/open/floor/iron, /area/mine/eva/lower) +======= +"sAd" = ( +/obj/structure/fence/post{ + dir = 8; + pixel_y = 0 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sAj" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -62611,6 +125319,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/security/office) +<<<<<<< HEAD +======= +"sAt" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/food_or_drink/snack, +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sAu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62623,6 +125340,7 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +<<<<<<< HEAD "sAI" = ( /obj/machinery/camera{ c_tag = "Morgue Hallway" @@ -62631,6 +125349,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/morgue) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sAR" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -62643,6 +125363,14 @@ "sAS" = ( /turf/closed/wall, /area/station/commons/storage/art) +<<<<<<< HEAD +======= +"sBd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sBi" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -62671,6 +125399,7 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/iron, /area/station/security/prison/workout) +<<<<<<< HEAD "sBx" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/lattice/catwalk, @@ -62679,6 +125408,20 @@ "sBy" = ( /turf/closed/wall, /area/station/service/theater) +======= +"sBy" = ( +/turf/closed/wall, +/area/station/service/theater) +"sBH" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Security - Lower Brig Hallway" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sBJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, @@ -62697,6 +125440,7 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "sBY" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -62705,6 +125449,8 @@ }, /turf/open/floor/iron, /area/station/service/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sCa" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -62712,6 +125458,19 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/dark/textured, /area/station/security/prison/rec) +<<<<<<< HEAD +======= +"sCb" = ( +/obj/structure/minecart_rail{ + dir = 6 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sCm" = ( /obj/machinery/power/terminal{ dir = 1 @@ -62738,6 +125497,24 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +<<<<<<< HEAD +======= +"sCz" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "chem-morgue-airlock" + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/machinery/door/airlock/external{ + name = "Lower Medical External Access"; + dir = 8 + }, +/turf/open/floor/plating, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sCA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -62754,6 +125531,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"sCK" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sCQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62763,6 +125547,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +<<<<<<< HEAD "sCX" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/newscaster/directional/west, @@ -62771,6 +125556,17 @@ "sCZ" = ( /turf/open/floor/iron/dark, /area/station/service/hydroponics) +======= +"sCZ" = ( +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"sDd" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sDg" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -62792,6 +125588,7 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "sDM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62800,6 +125597,12 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +======= +"sDB" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/cytology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sDQ" = ( /obj/item/radio/intercom/prison/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -62818,6 +125621,7 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "sEg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -62825,6 +125629,23 @@ /obj/structure/sign/poster/random/directional/west, /turf/open/floor/iron/large, /area/station/hallway/secondary/entry) +======= +"sDV" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; + name = "AI Upload Turret Control"; + pixel_y = -25 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Bridge Center" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sEi" = ( /turf/open/floor/carpet, /area/station/service/library) @@ -62845,10 +125666,13 @@ }, /turf/open/floor/plating, /area/mine/living_quarters) +<<<<<<< HEAD "sEv" = ( /obj/item/flashlight/lantern/on, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sEz" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -62890,11 +125714,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "sEI" = ( /obj/machinery/light/small/dim/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/medical/morgue) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sEK" = ( /obj/structure/table/glass, /obj/item/stack/medical/gauze{ @@ -62913,6 +125740,16 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/large, /area/station/medical/treatment_center) +<<<<<<< HEAD +======= +"sEN" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 8 + }, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sEO" = ( /obj/machinery/light/floor, /turf/open/floor/iron/smooth, @@ -62969,6 +125806,7 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD "sFN" = ( /obj/structure/sign/warning/electric_shock/directional/south, /obj/structure/cable, @@ -62977,6 +125815,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +"sFJ" = ( +/obj/structure/fence/post{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sFS" = ( /obj/structure/railing/corner{ dir = 8 @@ -62992,6 +125838,7 @@ dir = 1 }, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD "sGf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet/directional/north, @@ -63004,11 +125851,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sGk" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/sign/poster/random/directional/south, /turf/open/floor/iron/white, /area/station/medical/chemistry) +<<<<<<< HEAD "sGn" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -63023,6 +125873,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sGp" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -63048,6 +125900,13 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/mining) +<<<<<<< HEAD +======= +"sGw" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/genturf/blue, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sGE" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -63057,6 +125916,18 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"sGG" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Cart Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/structure/barricade/wooden/snowed, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sGH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63082,6 +125953,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "sGM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63090,11 +125962,30 @@ /obj/structure/sign/warning/directional/east, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/lesser) +======= +"sGL" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"sGT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sGZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD +======= +"sHa" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/bureaucracy/briefcase, +/obj/item/taperecorder/empty, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sHc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical/glass{ @@ -63108,22 +125999,41 @@ /obj/effect/turf_decal/tile/yellow/full, /turf/open/floor/iron/large, /area/station/medical/pharmacy) +<<<<<<< HEAD +======= +"sHe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering{ + name = "Utilities Room" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sHh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/chapel) +<<<<<<< HEAD "sHi" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 }, /turf/open/floor/iron/checker, /area/station/hallway/secondary/service) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sHl" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom/directional/south, /turf/open/floor/stone, /area/mine/eva/lower) "sHs" = ( +<<<<<<< HEAD /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63140,6 +126050,16 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) +======= +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"sHt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/trash/caution_sign, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sHC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63174,17 +126094,21 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron, /area/station/maintenance/port/fore) +<<<<<<< HEAD "sHV" = ( /obj/machinery/atmospherics/components/tank/air{ initialize_directions = 2 }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sHX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/mine/mechbay) +<<<<<<< HEAD "sIg" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/brown{ @@ -63200,6 +126124,19 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/engineering/main) +======= +"sIb" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light/warm/directional/north, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/station/service/bar) +"sIl" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sIt" = ( /turf/closed/wall, /area/station/maintenance/central/lesser) @@ -63241,6 +126178,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mine/storage) +<<<<<<< HEAD "sIX" = ( /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/machinery/door/airlock/hydroponics/glass{ @@ -63251,21 +126189,35 @@ }, /turf/open/floor/iron/textured, /area/station/service/hydroponics) +======= +"sIZ" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sJe" = ( /obj/machinery/deepfryer, /obj/machinery/light/warm/directional/north, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +<<<<<<< HEAD "sJg" = ( /obj/effect/turf_decal/siding/white{ dir = 4 }, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sJi" = ( /obj/machinery/vending/donksofttoyvendor, /turf/open/floor/iron/dark/textured, /area/station/security/prison/safe) +<<<<<<< HEAD "sJn" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/gas_mask/directional/west, @@ -63274,6 +126226,8 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/miningdock) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sJq" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/yellow{ @@ -63299,6 +126253,7 @@ }, /turf/open/floor/plating/icemoon, /area/station/security/execution/education) +<<<<<<< HEAD "sJu" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -63314,6 +126269,8 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sJA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63322,6 +126279,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +<<<<<<< HEAD "sJH" = ( /turf/closed/wall, /area/mine/living_quarters) @@ -63345,6 +126303,31 @@ }, /turf/open/floor/iron/white/corner, /area/station/science/explab) +======= +"sJC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sink/directional/south, +/obj/structure/mirror/directional/north, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"sJH" = ( +/turf/closed/wall, +/area/mine/living_quarters) +"sJI" = ( +/obj/structure/closet/crate/wooden, +/obj/item/camera_film{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/camera, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sJR" = ( /obj/machinery/door/airlock/security/glass{ name = "Labor Camp Airlock" @@ -63383,6 +126366,14 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/wood, /area/station/command/meeting_room) +<<<<<<< HEAD +======= +"sKT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/workout) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sKW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -63409,6 +126400,7 @@ }, /turf/open/floor/iron/dark/corner, /area/station/security/processing) +<<<<<<< HEAD "sLm" = ( /obj/structure/chair/sofa/left/brown{ dir = 4 @@ -63428,6 +126420,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sLD" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/iron/fifty, @@ -63476,6 +126470,14 @@ dir = 1 }, /area/station/security/prison) +<<<<<<< HEAD +======= +"sMy" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sML" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63491,6 +126493,15 @@ dir = 1 }, /area/station/security/office) +<<<<<<< HEAD +======= +"sNj" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sNr" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permainner"; @@ -63543,6 +126554,16 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) +<<<<<<< HEAD +======= +"sNF" = ( +/obj/item/toy/snowball{ + pixel_x = -6; + pixel_y = -4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sNI" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63550,6 +126571,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "sNQ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -63566,6 +126588,23 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron, /area/station/command/bridge) +======= +"sNL" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/security/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"sOd" = ( +/obj/structure/table, +/obj/item/stack/cable_coil, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sOm" = ( /obj/structure/railing{ dir = 4 @@ -63606,11 +126645,14 @@ }, /turf/open/floor/iron, /area/station/cargo/office) +<<<<<<< HEAD "sON" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sOO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -63621,12 +126663,15 @@ /obj/item/kitchen/fork/plastic, /turf/open/floor/iron, /area/station/security/prison/mess) +<<<<<<< HEAD "sOX" = ( /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/port_gen/pacman, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sOY" = ( /obj/structure/table/glass, /obj/item/hemostat, @@ -63634,6 +126679,18 @@ /obj/item/storage/bag/trash, /turf/open/floor/iron, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"sPq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rnd2"; + name = "Research Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/science/ordnance/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sPA" = ( /obj/structure/rack, /obj/item/storage/bag/ore, @@ -63645,6 +126702,21 @@ /obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/iron, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"sPE" = ( +/obj/machinery/conveyor{ + id = "mining_internal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/production) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sPG" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -63652,6 +126724,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +<<<<<<< HEAD "sPK" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -63672,6 +126745,20 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/stone, /area/station/service/bar/atrium) +======= +"sPJ" = ( +/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/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sPV" = ( /obj/machinery/door/airlock/atmos/glass, /obj/machinery/door/firedoor/heavy, @@ -63720,6 +126807,7 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD "sRc" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, @@ -63746,6 +126834,58 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +======= +"sQI" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"sQS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"sRu" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"sRw" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/bar) +"sRz" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Service - Coldroom" + }, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/service/kitchen/coldroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sRI" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -63785,6 +126925,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/prison/workout) +<<<<<<< HEAD "sSz" = ( /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/white, @@ -63799,6 +126940,8 @@ dir = 1 }, /area/station/science/research) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sSF" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -63807,6 +126950,22 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"sSN" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Engineering External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "Engineering-External" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth, +/area/station/engineering/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sSO" = ( /obj/machinery/light/small/directional/south, /obj/structure/closet/secure_closet/brig{ @@ -63827,10 +126986,32 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/chemistry) +<<<<<<< HEAD "sSS" = ( /obj/machinery/incident_display/delam/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/lobby) +======= +"sSX" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/paper{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/turf/open/floor/iron, +/area/station/service/kitchen/coldroom) +"sTb" = ( +/obj/structure/railing/wooden_fence, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sTe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ @@ -63859,6 +127040,22 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"sTl" = ( +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/structure/minecart_rail{ + dir = 1 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sTn" = ( /obj/structure/table, /obj/machinery/newscaster/directional/north, @@ -63882,6 +127079,33 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +<<<<<<< HEAD +======= +"sTA" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"sTH" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"sTL" = ( +/obj/structure/fireplace{ + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/stone, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sTO" = ( /obj/machinery/door/airlock{ name = "Unisex Restroom" @@ -63895,6 +127119,7 @@ /obj/structure/microscope, /turf/open/floor/iron/grimy, /area/station/security/prison/work) +<<<<<<< HEAD "sTV" = ( /obj/machinery/door/airlock/maintenance{ name = "Teleporter Maintenance" @@ -63909,6 +127134,8 @@ /obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sUb" = ( /obj/machinery/door/airlock/security/glass{ name = "Permabrig Visitation" @@ -63918,6 +127145,7 @@ /obj/effect/mapping_helpers/airlock/access/any/security/brig, /turf/open/floor/iron, /area/station/security/prison/visit) +<<<<<<< HEAD "sUi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63927,6 +127155,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sUv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -63943,6 +127173,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +<<<<<<< HEAD +======= +/obj/structure/sign/warning/cold_temp/directional/east, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/smooth, /area/mine/eva) "sUN" = ( @@ -63965,6 +127199,7 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +<<<<<<< HEAD "sVf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63983,6 +127218,18 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) +======= +"sVi" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Research Break Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sVm" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 @@ -63993,6 +127240,14 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) +<<<<<<< HEAD +======= +"sVA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sVL" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -64000,8 +127255,31 @@ /area/station/engineering/atmos) "sVN" = ( /obj/item/screwdriver, +<<<<<<< HEAD /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +======= +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"sVW" = ( +/obj/effect/decal/cleanable/garbage, +/obj/item/reagent_containers/spray/chemsprayer/party{ + pixel_x = 1 + }, +/obj/item/clothing/head/costume/festive{ + pixel_y = -3; + pixel_x = -5 + }, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sWl" = ( /obj/machinery/door/airlock/command{ name = "Chief Medical Officer" @@ -64041,6 +127319,7 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/iron/textured_half, /area/mine/production) +<<<<<<< HEAD "sWS" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/white, @@ -64050,10 +127329,45 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) +======= +"sWN" = ( +/obj/structure/chair{ + dir = 1; + name = "Prosecution" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"sWO" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sWU" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/iron, /area/mine/production) +<<<<<<< HEAD +======= +"sXa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sXb" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -64075,6 +127389,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +<<<<<<< HEAD "sXf" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/table/reinforced, @@ -64094,12 +127409,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sXk" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/maintenance/fore/lesser) +<<<<<<< HEAD "sXC" = ( /obj/structure/table, /obj/machinery/button/ignition{ @@ -64117,6 +127435,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sXK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64132,6 +127452,7 @@ dir = 9 }, /obj/effect/turf_decal/trimline/dark_green/corner{ +<<<<<<< HEAD dir = 1 }, /obj/effect/turf_decal/trimline/dark_green/line{ @@ -67278,6 +130599,3355 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/port/greater) "tXB" = ( +======= + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"sYe" = ( +/obj/structure/table/wood, +/obj/item/clothing/under/suit/red, +/obj/item/flashlight/flare/candle{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/flashlight/flare/candle{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/painting/large/library_private{ + dir = 1 + }, +/turf/open/floor/engine/cult, +/area/station/service/library) +"sYz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/camera/directional/south{ + c_tag = "Mining B-1 Hallway North"; + network = list("ss13", "mine") + }, +/turf/open/floor/iron/dark/side, +/area/mine/eva) +"sYA" = ( +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/lattice/catwalk, +/obj/structure/fluff/tram_rail, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"sYG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"sYU" = ( +/obj/structure/grille/broken, +/obj/effect/spawner/random/trash/moisture_trap, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"sZa" = ( +/obj/effect/turf_decal/box/white{ + color = "#9FED58" + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"sZB" = ( +/obj/structure/noticeboard/directional/north, +/turf/open/openspace, +/area/station/service/bar/atrium) +"sZD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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/white, +/area/station/medical/medbay/aft) +"sZF" = ( +/turf/closed/wall, +/area/station/maintenance/aft/greater) +"sZO" = ( +/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/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"taf" = ( +/obj/effect/landmark/start/quartermaster, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) +"tai" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chemistry Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"taj" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"tak" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"tau" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"tav" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"tay" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/bar/atrium) +"taC" = ( +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"taN" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"taV" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"tba" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"tbb" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"tbh" = ( +/turf/open/floor/iron/half{ + dir = 1 + }, +/area/station/engineering/atmos) +"tbl" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/sign/departments/lawyer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"tbH" = ( +/obj/structure/table/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"tbL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood/large, +/area/station/service/bar) +"tbN" = ( +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/machinery/door/airlock/engineering{ + name = "Utilities Room" + }, +/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/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"tbQ" = ( +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) +"tbX" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/mine/eva/lower) +"tcD" = ( +/obj/structure/chair, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/exit/departure_lounge) +"tcJ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/east, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"tcL" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/rack, +/obj/item/stack/ducts/fifty, +/obj/item/storage/box/swab, +/obj/effect/spawner/random/contraband/permabrig_gear, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/grimy, +/area/station/security/prison/work) +"tcQ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Permabrig Recreation"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +"tcR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"tcX" = ( +/obj/structure/railing, +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/science/ordnance) +"tdb" = ( +/obj/effect/landmark/event_spawn, +/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, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"tdc" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/food_or_drink/refreshing_beverage, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"tdp" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"tdE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "pharmacy_shutters2"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) +"tdI" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/obj/structure/sign/warning/directional/north, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"tdK" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/structure/sign/departments/engineering/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"tdR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"tdU" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/barsign/directional/north, +/turf/open/floor/iron, +/area/station/service/bar) +"tdY" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"tec" = ( +/obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"tei" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"teq" = ( +/obj/structure/railing, +/obj/structure/rack, +/obj/structure/cable, +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/spawner/random/armory/dragnet, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"teE" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "vacantofficemaintshutter"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/commons/vacant_room/office) +"teN" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"teP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/brig/entrance) +"teQ" = ( +/obj/machinery/chem_master{ + name = "CytoMaster 5000" + }, +/obj/item/swab{ + pixel_y = 10; + pixel_x = -2 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"teZ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"tfk" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tfl" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + desc = "Used to grind things up into raw materials and liquids."; + pixel_y = 5 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"tfx" = ( +/obj/machinery/portable_atmospherics/canister/water_vapor, +/turf/open/floor/iron, +/area/station/service/janitor) +"tfM" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"tfO" = ( +/obj/structure/table/wood, +/obj/item/pai_card, +/turf/open/floor/iron, +/area/station/commons/dorms) +"tfR" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Engine Coolant Bypass" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"tgd" = ( +/obj/machinery/door/airlock{ + name = "Garden" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"tge" = ( +/obj/machinery/button/door/directional/east{ + id = "commissaryshutter"; + name = "Commissary Shutter Control" + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/machinery/button/door/directional/east{ + id = "commissarydoor"; + name = "Commissary Door Lock"; + normaldoorcontrol = 1; + specialfunctions = 4; + pixel_x = 35 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"tgj" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"tgn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/command/storage/eva) +"tgq" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"tgv" = ( +/obj/machinery/skill_station, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/requests_console/auto_name/directional/north, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"tgx" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/science/xenobiology) +"tgB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/genetics) +"tgH" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"tgP" = ( +/mob/living/simple_animal/bot/secbot/beepsky/armsky, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"thA" = ( +/turf/open/genturf/blue, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"thC" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stack/sheet/mineral/plasma{ + amount = 30 + }, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"thD" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"thE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"thI" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Fore Primary Hallway - Courtroom Hallway" + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"thK" = ( +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/item/radio/off, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/start/depsec/supply, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"thM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"thP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/decal/cleanable/ash, +/obj/item/rack_parts, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"thW" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"thX" = ( +/obj/effect/turf_decal/tile/blue, +/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/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"thY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"tia" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/machinery/camera/directional/east{ + c_tag = "Research Division Office"; + network = list("ss13","rd") + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/lab) +"tii" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/kirbyplants/organic/plant2, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"tis" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/transit_tube/horizontal, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"tix" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"tiI" = ( +/obj/structure/disposalpipe/segment, +/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, +/area/station/commons/fitness) +"tiT" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"tiV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/chapel) +"tiX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) +"tiY" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"tiZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage) +"tjf" = ( +/obj/structure/fence/door, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"tjk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"tjo" = ( +/turf/open/genturf, +/area/icemoon/underground/unexplored/rivers) +"tjs" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"tjv" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"tjC" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"tjG" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/structure/rack, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"tjH" = ( +/obj/effect/turf_decal/loading_area, +/obj/effect/turf_decal/siding/yellow, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/iron/half{ + dir = 1 + }, +/area/station/engineering/storage) +"tjM" = ( +/obj/structure/table/wood, +/obj/item/soap/deluxe{ + pixel_y = 11 + }, +/obj/item/soap/deluxe{ + pixel_y = 6 + }, +/obj/item/soap/deluxe, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"tjN" = ( +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"tjY" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"tkc" = ( +/obj/machinery/airalarm/directional/north, +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +"tkf" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"tkp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"tkP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"tkT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/small/dim/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/sign/warning/no_smoking/circle/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"tkU" = ( +/turf/open/lava/plasma/ice_moon, +/area/icemoon/surface/outdoors/nospawn) +"tkX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"tla" = ( +/obj/structure/marker_beacon/jade, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"tlf" = ( +/obj/structure/railing, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"tlh" = ( +/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/engineering/storage_shared) +"tlm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"tln" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"tlo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/command/storage/eva) +"tlt" = ( +/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 = 8 + }, +/obj/machinery/status_display/door_timer{ + pixel_x = -32; + id = "Cell 3"; + name = "Cell 3" + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"tlA" = ( +/obj/machinery/light/small/directional/south, +/obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"tlE" = ( +/turf/open/floor/glass/reinforced/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tlH" = ( +/turf/open/openspace/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tlO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"tlP" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/button/door/directional/north{ + id = "Skynet_launch"; + name = "Mech Bay Door Control"; + req_access = list("robotics") + }, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"tlS" = ( +/obj/machinery/door/airlock/security{ + name = "Permanent Cell 3" + }, +/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/textured, +/area/station/security/prison/safe) +"tma" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"tml" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tmw" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"tmy" = ( +/obj/machinery/plate_press, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/prison/work) +"tmA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"tmB" = ( +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"tmE" = ( +/obj/structure/chair/comfy/beige{ + dir = 1; + name = "Bench" + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/mine/eva/lower) +"tmL" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"tmQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/bridge) +"tmR" = ( +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tnb" = ( +/obj/structure/rack, +/turf/open/floor/plating, +/area/mine/eva/lower) +"tnp" = ( +/obj/structure/table, +/obj/item/folder/blue{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/folder/yellow, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"tnu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/item/rack_parts, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tny" = ( +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Fore Primary Hallway" + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"tnD" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/structure/bed{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet{ + dir = 1 + }, +/obj/effect/spawner/random/contraband/permabrig_gear, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"tnI" = ( +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"tnO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"tnP" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/fore) +"toi" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/machinery/status_display/evac/directional/south, +/obj/structure/chair/sofa/left/brown{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"too" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"toq" = ( +/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 = 5 + }, +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/iron, +/area/station/engineering/storage) +"toG" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"toT" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"toV" = ( +/obj/structure/table, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"toW" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/gateway, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/station/command/gateway) +"tpc" = ( +/obj/effect/spawner/random/trash/graffiti{ + pixel_y = -30 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"tpd" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"tpk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/binary/pressure_valve/on{ + dir = 4; + name = "Output Release" + }, +/obj/machinery/light/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"tpG" = ( +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/commons/locker) +"tpH" = ( +/turf/closed/wall, +/area/station/security/execution/education) +"tpO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"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) +"tqk" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/key/janitor, +/turf/open/floor/iron, +/area/station/service/janitor) +"tqs" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"tqy" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/space_heater, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/medical/morgue) +"tqJ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor/heavy{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"tqQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tqR" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"trc" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"trm" = ( +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"tro" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Aft Primary Hallway South"; + pixel_y = -22 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/departments/engineering/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"tru" = ( +/obj/structure/chair/pew/left{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"trA" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/sign/poster/official/obey/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) +"trK" = ( +/obj/structure/disposalpipe/junction/flip, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"trT" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"tsa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) +"tsc" = ( +/obj/machinery/light/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"tsh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/wood, +/area/station/service/library) +"tsk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tsl" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"tsr" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/rnd/server/master, +/turf/open/openspace/icemoon, +/area/station/science/server) +"tsu" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/cigarette, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +"tsz" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/machinery/space_heater, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/poster/official/get_your_legs/directional/north, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/ai_monitored/command/storage/eva) +"tsH" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Interrogation" + }, +/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, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"tsP" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"tsQ" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Public Mining Storage" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/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, +/area/station/commons/storage/mining) +"tsR" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"ttb" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/landmark/start/chemist, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"ttk" = ( +/obj/machinery/door/airlock/freezer, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"ttw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/lab) +"ttD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/sign/painting/large, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"ttI" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm5"; + name = "Cabin 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/dorms) +"ttT" = ( +/obj/machinery/door/airlock/mining/glass{ + id_tag = "innercargo"; + name = "Cargo Bay" + }, +/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/supply/general, +/turf/open/floor/iron, +/area/station/cargo/storage) +"tuc" = ( +/turf/closed/wall, +/area/station/ai_monitored/security/armory) +"tue" = ( +/turf/closed/wall, +/area/station/security/checkpoint/supply) +"tug" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/atmos/glass{ + name = "Distribution Loop" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"tuk" = ( +/obj/structure/closet/crate/grave, +/turf/open/misc/dirt/dark{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"tur" = ( +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"tut" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"tuy" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/ignition{ + id = "testigniter"; + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"tuz" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/item/trapdoor_remote/preloaded{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/machinery/recharger{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/storage/wallet/random{ + pixel_x = 6; + pixel_y = -24 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"tuD" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/public/glass{ + dir = 4; + name = "Auxiliary Dock" + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"tuH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"tuQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/service/chapel) +"tva" = ( +/obj/machinery/light/small/directional/south, +/turf/open/openspace, +/area/station/service/chapel) +"tvd" = ( +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos) +"tvk" = ( +/obj/structure/sign/warning/docking/directional/north, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"tvm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"tvt" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/chair/stool/bar/directional/north, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"tvv" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Research Director" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"tvF" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/engine_smes) +"tvJ" = ( +/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/maintenance/department/medical/central) +"tvK" = ( +/obj/structure/closet{ + name = "evidence closet 2" + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/evidence) +"tvW" = ( +/obj/machinery/computer/telecomms/monitor{ + dir = 4; + network = "tcommsat" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/tcommsat/computer) +"tvZ" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"twn" = ( +/obj/machinery/vending/wardrobe/chef_wardrobe, +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"twt" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"tww" = ( +/obj/effect/landmark/start/prisoner, +/obj/effect/landmark/event_spawn, +/obj/machinery/holopad, +/turf/open/floor/carpet/red, +/area/station/security/prison/work) +"twK" = ( +/obj/machinery/porta_turret/ai{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +"twU" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"twV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"twZ" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"txc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Construction Area Maintenance" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/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/engineering/construction, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"txf" = ( +/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{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"txj" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"txm" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"txo" = ( +/obj/effect/turf_decal/siding/yellow/end{ + dir = 4 + }, +/obj/machinery/plumbing/receiver, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plating, +/area/station/medical/treatment_center) +"txE" = ( +/obj/item/cigbutt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"txH" = ( +/obj/machinery/vending/wallmed/directional/south, +/obj/structure/cable, +/obj/structure/table/glass, +/obj/item/stack/sticky_tape/surgical, +/obj/item/stack/medical/bone_gel, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/camera/directional/south{ + c_tag = "Surgery B"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"txI" = ( +/obj/structure/closet/wardrobe/black, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"txU" = ( +/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{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"txX" = ( +/obj/structure/water_source/puddle, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"tyb" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"tyi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, +/turf/open/floor/carpet, +/area/station/service/chapel) +"tyl" = ( +/obj/structure/ladder, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"tym" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/fore/lesser) +"tyv" = ( +/obj/effect/landmark/start/librarian, +/obj/structure/chair/office, +/turf/open/floor/wood, +/area/station/service/library) +"tyK" = ( +/obj/item/mop, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron, +/area/station/service/janitor) +"tyS" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix to Distro" + }, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"tzf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"tzE" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/mine/eva) +"tzH" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/structure/sign/warning/no_smoking/directional/north, +/obj/item/clothing/suit/hazardvest, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/glasses/meson/engine, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"tzM" = ( +/obj/structure/filingcabinet, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/newscaster/directional/west, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"tzP" = ( +/obj/structure/table, +/obj/item/hand_labeler, +/obj/item/storage/box/shipping, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/art) +"tzR" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/neutral/filled/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"tAg" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"tAi" = ( +/obj/machinery/door/airlock/maintenance, +/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/engineering/maintenance, +/turf/open/floor/plating, +/area/station/commons/storage/mining) +"tAx" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"tAA" = ( +/obj/structure/table/glass, +/obj/item/storage/fancy/candle_box, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) +"tAL" = ( +/obj/structure/table, +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/mine/laborcamp) +"tAN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tAO" = ( +/obj/machinery/space_heater, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/lesser) +"tAS" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "miner-passthrough" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"tAT" = ( +/obj/structure/stairs/east, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/service/kitchen/coldroom) +"tBq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/sign/warning/radiation/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"tBs" = ( +/turf/closed/wall, +/area/station/maintenance/department/chapel) +"tBw" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"tBL" = ( +/obj/machinery/computer/atmos_control/nitrogen_tank{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"tBR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/start/depsec/supply, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"tCe" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"tCj" = ( +/obj/structure/sign/warning, +/turf/closed/wall/r_wall, +/area/icemoon/surface/outdoors/nospawn) +"tCk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"tCu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"tCx" = ( +/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/white, +/area/station/science/xenobiology) +"tCB" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"tCF" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics - Mixing Room East" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"tCL" = ( +/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/work) +"tCR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "Interrogation"; + name = "Interrogation Shutters" + }, +/turf/open/floor/plating, +/area/station/security/interrogation) +"tCW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/meter, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"tDa" = ( +/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/mine/production) +"tDg" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/glass/reinforced/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tDj" = ( +/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/weather/snow/corner{ + dir = 5 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/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) +"tDw" = ( +/obj/machinery/suit_storage_unit/hos, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/hos) +"tDy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tDL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) +"tDN" = ( +/obj/structure/chair{ + name = "Defense" + }, +/obj/effect/landmark/start/lawyer, +/turf/open/floor/wood, +/area/station/security/courtroom) +"tDS" = ( +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"tDU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) +"tDY" = ( +/obj/machinery/vending/cola/sodie, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"tEc" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"tEe" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"tEi" = ( +/obj/structure/sink/directional/south, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"tEj" = ( +/obj/machinery/conveyor{ + dir = 9; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"tEs" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"tEw" = ( +/turf/open/genturf/blue, +/area/icemoon/underground/unexplored/rivers) +"tEC" = ( +/obj/structure/ore_box, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"tEL" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"tEO" = ( +/obj/structure/closet, +/obj/machinery/light/small/directional/north, +/obj/machinery/button/door/directional/north{ + id = "miningdorm_A"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/carpet/donk, +/area/mine/production) +"tEZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) +"tFd" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"tFe" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/effect/landmark/start/cook, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) +"tFs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"tFw" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Central Hallway North-West" + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tFF" = ( +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/science/research, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/science/lab) +"tFI" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Fitness Maintenance" + }, +/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/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"tFV" = ( +/obj/structure/cable, +/obj/machinery/light/directional/south, +/obj/structure/closet/secure_closet/psychology, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"tFY" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + frequency = 1449; + id_tag = "virology_airlock_interior"; + name = "Virology Interior Airlock" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/virology) +"tGi" = ( +/obj/effect/turf_decal/stripes/end, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"tGr" = ( +/turf/closed/mineral/random/snow, +/area/icemoon/surface/outdoors/nospawn) +"tGs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/prison/work) +"tGx" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Departure Lounge East" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"tGz" = ( +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Apiary" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/hydroponics) +"tGA" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison) +"tGB" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"tGE" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/stairs/south, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/commons/lounge) +"tGF" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Bridge East" + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"tGH" = ( +/obj/structure/cable, +/turf/open/floor/iron/edge{ + dir = 1 + }, +/area/station/engineering/lobby) +"tGJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"tGP" = ( +/obj/machinery/conveyor{ + id = "gulag" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/mine/laborcamp) +"tHb" = ( +/obj/effect/spawner/random/structure/musician/piano/random_piano, +/obj/machinery/button/curtain{ + pixel_x = -32; + id = "cantena_curtains" + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"tHi" = ( +/obj/structure/filingcabinet, +/obj/machinery/requests_console/directional/west{ + department = "Captain's Desk"; + name = "Captain's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"tHj" = ( +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"tHr" = ( +/turf/closed/wall/r_wall, +/area/station/medical/treatment_center) +"tHv" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"tHw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"tHJ" = ( +/obj/structure/mannequin/skeleton, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"tHK" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/warning, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"tHQ" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 4 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/folder/white, +/obj/effect/turf_decal/tile/dark{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/mine/living_quarters) +"tHT" = ( +/obj/machinery/atmospherics/components/trinary/filter{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/camera/directional/south{ + c_tag = "Ordnance Upper Mix Lab"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"tHX" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/decal/cleanable/generic, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"tIf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"tIh" = ( +/obj/structure/light_construct/directional/south, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"tIq" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"tIu" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/obj/structure/sign/warning/biohazard/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"tIw" = ( +/obj/structure/table/wood, +/obj/item/food/grown/harebell{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/food/grown/harebell{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/food/grown/harebell, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"tIC" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tIM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/mine/eva/lower) +"tIS" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/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/prison/safe) +"tIW" = ( +/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/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"tJh" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/item/kirbyplants/random, +/obj/machinery/light/warm/directional/south, +/obj/machinery/digital_clock/directional/south, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"tJl" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/structure/fence/cut/large{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"tJu" = ( +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"tJD" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/misc/dirt/dark{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored) +"tJE" = ( +/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/effect/spawner/random/structure/steam_vent, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"tJG" = ( +/obj/machinery/firealarm/directional/south, +/obj/item/experi_scanner{ + pixel_x = 4 + }, +/obj/item/experi_scanner, +/obj/item/experi_scanner{ + pixel_x = -4 + }, +/obj/structure/table/glass, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/lab) +"tJI" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "robo1" + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"tJK" = ( +/obj/structure/transit_tube/horizontal, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tJN" = ( +/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/smooth_half, +/area/station/security/office) +"tJR" = ( +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/gas, +/turf/open/floor/plating, +/area/station/command/teleporter) +"tJY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"tKi" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/lobby) +"tKm" = ( +/obj/structure/ore_container/food_trough/raptor_trough, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +"tKq" = ( +/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/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"tKz" = ( +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"tKB" = ( +/obj/structure/chair/pew/left, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"tKD" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/preopen{ + id = "Biohazard"; + name = "Biohazard Containment Door" + }, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"tKH" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"tKI" = ( +/turf/closed/wall, +/area/station/maintenance/port/greater) +"tKJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/spawner/random/trash/graffiti{ + pixel_y = 32 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"tKN" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"tKO" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"tKV" = ( +/obj/structure/table_frame, +/obj/effect/decal/cleanable/glass, +/obj/item/food/canned/peaches/maint, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"tKW" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Unfiltered & Air to Mix" + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"tKY" = ( +/obj/structure/rack, +/obj/item/soap{ + pixel_y = -2 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Ordnance Lower Mix Lab"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"tKZ" = ( +/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 = 9 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"tLe" = ( +/obj/machinery/cryo_cell, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"tLi" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tLj" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"tLm" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/hallway/secondary/entry) +"tLp" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/cmo) +"tLB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"tLF" = ( +/turf/closed/wall, +/area/station/hallway/primary/starboard) +"tLI" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchencounter"; + name = "Kitchen Counter Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"tLL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"tLM" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Robotics Lab - South"; + network = list("ss13","rd") + }, +/obj/machinery/mechpad, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"tLQ" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"tLT" = ( +/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, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"tLW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"tMa" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tMc" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tMe" = ( +/obj/machinery/computer/mechpad{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"tMk" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + name = "Virology Service Room" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/turf/open/floor/plating, +/area/station/medical/virology) +"tMD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"tMI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/closet/secure_closet/exile, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) +"tMO" = ( +/turf/closed/wall, +/area/station/medical/break_room) +"tMS" = ( +/obj/structure/sign/warning/fire/directional/north, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"tMY" = ( +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tNd" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/siding/green{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"tNi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"tNk" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"tNw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"tNx" = ( +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"tNz" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"tND" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/mine/living_quarters) +"tNJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"tOb" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay Chemistry Lab - South"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"tOi" = ( +/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/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"tOk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"tOq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"tOw" = ( +/turf/closed/wall, +/area/station/commons/toilet/locker) +"tOy" = ( +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"tOE" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"tOF" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"tOX" = ( +/obj/machinery/light/small/broken/directional/south, +/obj/item/trash/energybar, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tPz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/science/research) +"tPC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"tPG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/science/ordnance) +"tPH" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tPL" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"tPT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"tPV" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"tPW" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Secure Walkway" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/security/brig/entrance) +"tPY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"tQb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tQc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/storage) +"tQM" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"tQS" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/stool/directional/west, +/obj/machinery/status_display/ai/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/commons/locker) +"tQW" = ( +/obj/item/kirbyplants/organic/plant5, +/turf/open/floor/iron/dark, +/area/mine/eva) +"tQX" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"tRd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"tRo" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/starboard) +"tRq" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/item/toy/plush/moth{ + name = "Theseus" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/flag/mothic/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tRP" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Hydroponics Maintenance" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/service/hydroponics, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"tRX" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"tRZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"tSb" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"tSi" = ( +/obj/machinery/suit_storage_unit/security, +/turf/open/floor/iron/smooth, +/area/station/security/brig/upper) +"tSj" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"tSs" = ( +/obj/item/flashlight/lantern{ + start_on = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"tSx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"tSF" = ( +/obj/machinery/door/window/left/directional/west{ + req_one_access = list("bar", "kitchen"); + name = "Deliveries" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/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/textured, +/area/station/service/kitchen/coldroom) +"tTc" = ( +/obj/item/storage/bag/plants/portaseeder, +/obj/structure/table/glass, +/obj/item/plant_analyzer, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"tTK" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tTL" = ( +/obj/structure/chair, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"tTO" = ( +/obj/structure/fence/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tTV" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"tTY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"tUh" = ( +/obj/item/chair/wood, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"tUn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"tUo" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/ordnance) +"tUx" = ( +/obj/effect/spawner/random/trash/moisture_trap, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"tUz" = ( +/obj/machinery/button/door/directional/north{ + id = "permainner"; + name = "Inner Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -6; + req_access = list("brig"); + specialfunctions = 4 + }, +/obj/machinery/button/door/directional/north{ + id = "permaouter"; + name = "Outer Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 6; + req_access = list("brig"); + specialfunctions = 4 + }, +/obj/machinery/photobooth/security, +/obj/machinery/button/flasher{ + id = "transferflash"; + pixel_y = 34 + }, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"tUC" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/mine/living_quarters) +"tUG" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/four, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/construction) +"tUK" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"tUN" = ( +/obj/machinery/atmospherics/components/binary/pump, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"tUO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/painting/large/library{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/service/library) +"tUV" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"tUX" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"tVd" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tVf" = ( +/turf/closed/wall, +/area/station/security/prison) +"tVn" = ( +/obj/structure/cable, +/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/north, +/turf/open/floor/iron/dark, +/area/station/science/server) +"tVx" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"tVA" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/radiation, +/obj/item/analyzer, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"tVF" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"tWc" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/spawner/random/trash/soap, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"tWd" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"tWj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/service/bar/backroom) +"tWp" = ( +/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/cyclelink_helper_multi{ + cycle_id = "ai-passthrough" + }, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Atmospherics" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"tWy" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "MiniSat External Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"tWz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"tWJ" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/carpet/lone, +/area/station/service/chapel) +"tWK" = ( +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"tWO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Permabrig Workroom"; + network = list("ss13","prison") + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/security/prison/work) +"tXb" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"tXc" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/landmark/start/paramedic, +/obj/structure/cable, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"tXh" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"tXk" = ( +/obj/machinery/shower/directional/west, +/obj/structure/fluff/shower_drain, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"tXs" = ( +/obj/structure/ladder, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/greater) +"tXB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -67288,6 +133958,639 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"tXM" = ( +/obj/machinery/hydroponics/constructable, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/item/plant_analyzer, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) +"tXV" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Chapel Mass Driver" + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"tXY" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/item/clothing/glasses/meson, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"tYe" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/server) +"tYt" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) +"tYu" = ( +/obj/effect/spawner/random/trash/hobo_squat, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"tYz" = ( +/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/mine/eva/lower) +"tYA" = ( +/obj/structure/cable, +/obj/structure/table/glass, +/obj/item/stack/sticky_tape/surgical, +/obj/item/stack/medical/bone_gel, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"tYE" = ( +/obj/machinery/biogenerator, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"tYF" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"tYS" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tYW" = ( +/obj/machinery/light/directional/west, +/obj/structure/chair, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +"tYZ" = ( +/obj/machinery/door/airlock/external{ + name = "External Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"tZa" = ( +/obj/effect/turf_decal/weather/snow, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"tZd" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/shovel/spade, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"tZm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"tZp" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"tZv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"tZZ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uab" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/highsecurity{ + name = "AI Upload Access" + }, +/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/command/ai_upload, +/turf/open/floor/iron/dark/textured_large, +/area/station/ai_monitored/turret_protected/ai_upload) +"uag" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"uah" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"uan" = ( +/obj/structure/disposalpipe/trunk/multiz, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"uao" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/secure_closet/personal, +/obj/item/storage/briefcase/secure, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"uap" = ( +/obj/structure/fence/cut/large{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"uar" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"uau" = ( +/turf/open/openspace, +/area/station/medical/medbay/lobby) +"uaz" = ( +/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/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"uaG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/storage) +"uaT" = ( +/obj/machinery/rnd/experimentor, +/turf/open/floor/engine, +/area/station/science/explab) +"ubc" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"ubk" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"ubq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"ubx" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"ubE" = ( +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"ubF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ubG" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/stairs/medium, +/area/mine/eva/lower) +"ubH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/locker) +"ubY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/stool/directional/south, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) +"ucl" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen 4"; + req_access = list("xenobiology") + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"ucn" = ( +/obj/item/toy/snowball{ + pixel_x = 9; + pixel_y = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ucs" = ( +/obj/effect/spawner/random/structure/grille, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"ucu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ucN" = ( +/turf/closed/wall/r_wall, +/area/station/security/detectives_office) +"ucO" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"udj" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/structure/cable, +/obj/effect/turf_decal/tile/dark/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/mine/living_quarters) +"udw" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"udA" = ( +/obj/effect/turf_decal/tile/blue, +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +"udK" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"udL" = ( +/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/glass, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"uee" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"uei" = ( +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" + }, +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"uen" = ( +/obj/structure/fence/door{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"uep" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"uer" = ( +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"uet" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/hos) +"uey" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"ueD" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/sign/warning/directional/north, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"ueF" = ( +/obj/structure/sign/departments/holy/directional/east, +/turf/open/openspace, +/area/station/service/chapel) +"ueP" = ( +/obj/structure/table, +/obj/structure/reagent_dispensers/servingdish, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"ueS" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/ai_monitored/command/storage/eva) +"ueV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"ufb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/engine, +/area/station/science/explab) +"uff" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ufm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"ufF" = ( +/obj/structure/table, +/obj/item/storage/box/prisoner{ + pixel_y = 8 + }, +/obj/item/storage/box/prisoner, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"ufN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"ugd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Permabrig Meditation"; + network = list("ss13","prison") + }, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"ugi" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/order_console/bitrunning{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ugq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"ugs" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/requests_console/auto_name/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"ugA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"ugG" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) +"ugP" = ( +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"ugR" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +"ugX" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm3"; + name = "Dorm 3" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/dorms) +"ugZ" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/turf/open/floor/iron, +/area/station/commons/dorms) +"uhb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"uht" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Pure to Mix" + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"uhx" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"uhA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/landmark/navigate_destination/dockaux, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"uhE" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/mine/living_quarters) +"uhF" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"uhH" = ( +/obj/machinery/door/airlock/engineering{ + name = "Chemistry Lab Utilities" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"uif" = ( +/obj/structure/cable, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +<<<<<<< HEAD +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "tXV" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/camera/directional/north{ @@ -68022,6 +135325,45 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/parquet, /area/station/service/bar/backroom) +======= +/turf/open/floor/iron, +/area/station/engineering/main) +"uig" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"uii" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"uiF" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/item/kirbyplants/random, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"uiI" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uja" = ( /turf/closed/wall, /area/station/commons/toilet) @@ -68031,10 +135373,13 @@ }, /turf/open/floor/wood, /area/station/maintenance/port/aft) +<<<<<<< HEAD "ujp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/engine/xenobio, /area/station/science/xenobiology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ujs" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -68047,6 +135392,15 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/smooth, /area/station/engineering/lobby) +<<<<<<< HEAD +======= +"ujK" = ( +/obj/structure/fence{ + dir = 2 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ujP" = ( /obj/structure/table, /obj/machinery/computer/security/telescreen/research, @@ -68071,6 +135425,7 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/service/chapel) +<<<<<<< HEAD "uks" = ( /obj/machinery/door/airlock/command{ name = "Conference Room" @@ -68099,6 +135454,8 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ukz" = ( /obj/machinery/duct, /obj/structure/disposalpipe/segment{ @@ -68121,6 +135478,35 @@ }, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"ukJ" = ( +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/item/flashlight{ + pixel_y = 9 + }, +/obj/item/flashlight{ + pixel_y = 9 + }, +/obj/item/flashlight{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/structure/rack, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/ai_monitored/command/storage/eva) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ukN" = ( /obj/structure/table, /obj/machinery/door/poddoor/shutters{ @@ -68132,6 +135518,22 @@ /obj/machinery/door/window/left/directional/south, /turf/open/floor/iron, /area/station/security/prison/visit) +<<<<<<< HEAD +======= +"ukR" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Teleporter Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/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/command/teleporter, +/turf/open/floor/plating, +/area/station/maintenance/central/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ukV" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/random, @@ -68168,6 +135570,16 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"ulm" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ult" = ( /turf/closed/wall/r_wall, /area/station/science/robotics/lab) @@ -68177,12 +135589,38 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/security/prison/safe) +<<<<<<< HEAD "ulE" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ dir = 1 }, /turf/open/floor/iron, /area/station/science/ordnance) +======= +"ulL" = ( +/obj/machinery/modular_computer/preset/id, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/camera/directional/north{ + c_tag = "Chief Medical Office North"; + network = list("ss13","medbay") + }, +/obj/machinery/button/door/directional/east{ + id = "cmoprivacy"; + name = "CMO Shutter Control"; + req_access = list("cmo") + }, +/obj/machinery/keycard_auth/wall_mounted/directional/east{ + pixel_x = 37 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/cmo) +"ulR" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uma" = ( /obj/item/chisel, /obj/item/storage/toolbox/artistic, @@ -68190,6 +135628,7 @@ /obj/item/storage/crayons, /turf/open/floor/sepia, /area/station/security/prison/rec) +<<<<<<< HEAD "umb" = ( /obj/structure/sign/warning/docking/directional/south, /turf/open/misc/asteroid/snow/icemoon, @@ -68201,6 +135640,18 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/stone, /area/station/service/bar/atrium) +======= +"umg" = ( +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"umh" = ( +/turf/closed/wall/ice, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uml" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68214,6 +135665,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +<<<<<<< HEAD +======= +"umv" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "umz" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 @@ -68234,6 +135699,7 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +<<<<<<< HEAD "umF" = ( /obj/structure/stairs/north, /obj/structure/railing{ @@ -68241,6 +135707,17 @@ }, /turf/open/floor/iron, /area/station/service/chapel) +======= +"umD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"umM" = ( +/obj/effect/landmark/start/clown, +/turf/open/floor/wood, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "umR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -68288,6 +135765,7 @@ /obj/machinery/gulag_teleporter, /turf/open/floor/iron/showroomfloor, /area/station/security/processing) +<<<<<<< HEAD "unM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair{ @@ -68296,6 +135774,16 @@ /obj/structure/sign/departments/exodrone/directional/west, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"unG" = ( +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/security/telescreen/ce/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "unO" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -68306,6 +135794,7 @@ /obj/structure/table, /turf/open/floor/iron, /area/station/cargo/office) +<<<<<<< HEAD "unT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random/directional/west, @@ -68316,6 +135805,8 @@ dir = 8 }, /area/mine/eva) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uog" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -68372,6 +135863,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "uoF" = ( /obj/machinery/pdapainter/engineering, /obj/machinery/button/door/directional/west{ @@ -68399,6 +135891,8 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark/textured, /area/station/security/prison) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uoT" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table, @@ -68412,6 +135906,25 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD +======= +"uoY" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchencounter"; + name = "Kitchen Counter Shutters" + }, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "upa" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -68439,12 +135952,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison) +<<<<<<< HEAD "upx" = ( /obj/machinery/light_switch/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +======= +"upB" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/security/prison/visit) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "upH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -68464,6 +135984,20 @@ /obj/structure/tank_holder/extinguisher, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD +======= +"upU" = ( +/obj/structure/table/wood, +/obj/item/raptor_dex{ + pixel_y = 13 + }, +/obj/item/raptor_dex{ + pixel_y = 7 + }, +/obj/item/raptor_dex, +/turf/open/misc/hay/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "upV" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, @@ -68507,6 +136041,7 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD "uqV" = ( /obj/structure/sign/warning/directional/east{ desc = "A sign warning of a sudden drop below."; @@ -68514,6 +136049,13 @@ }, /turf/open/openspace/icemoon/keep_below, /area/icemoon/surface/outdoors/nospawn) +======= +"uqX" = ( +/obj/effect/decal/remains/human, +/obj/item/pickaxe/improvised, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/labor_camp) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "urd" = ( /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, @@ -68528,6 +136070,25 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"urk" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/preopen{ + id = "Biohazard"; + name = "Biohazard Containment Door" + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark/textured, +/area/station/science/research) +"urm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/wood, +/area/station/security/prison/rec) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uro" = ( /obj/machinery/requests_console/directional/east{ department = "Telecomms Admin"; @@ -68538,6 +136099,16 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron, /area/station/tcommsat/computer) +<<<<<<< HEAD +======= +"urp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "urw" = ( /obj/structure/railing/corner{ dir = 4 @@ -68565,6 +136136,27 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD +======= +"urQ" = ( +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/machinery/light/small/directional/west, +/obj/item/stack/package_wrap{ + pixel_y = 3 + }, +/obj/item/hand_labeler, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"usm" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uso" = ( /obj/structure/closet/crate/trashcart, /obj/effect/spawner/random/contraband/prison, @@ -68577,6 +136169,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +<<<<<<< HEAD "usz" = ( /obj/structure/sign/nanotrasen{ pixel_x = -32; @@ -68593,6 +136186,8 @@ dir = 8 }, /area/station/science/research) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "usS" = ( /obj/structure/bed{ dir = 1 @@ -68607,6 +136202,7 @@ dir = 10 }, /area/station/security/prison/safe) +<<<<<<< HEAD "utn" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -68638,6 +136234,14 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +"usU" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "utr" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -68651,6 +136255,7 @@ /obj/item/clothing/glasses/welding, /obj/item/multitool{ pixel_x = 3 +<<<<<<< HEAD }, /turf/open/floor/iron, /area/station/science/robotics/lab) @@ -69038,6 +136643,465 @@ "uAJ" = ( /obj/machinery/space_heater, /turf/open/floor/plating, +======= + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"utA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"utR" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uub" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Fuel Pipe" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"uud" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/tcomms_all, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"uum" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/sepia, +/area/station/service/library) +"uuq" = ( +/obj/structure/disposalpipe/segment, +/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, +/area/station/hallway/primary/central) +"uuw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_red/end{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"uuC" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"uuI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"uuO" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"uuP" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/office) +"uvk" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"uvt" = ( +/turf/closed/wall, +/area/station/science/robotics/mechbay) +"uvu" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"uvv" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"uvA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"uvM" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/floor/plating, +/area/mine/production) +"uvU" = ( +/obj/structure/railing, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"uvX" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/hallway) +"uwd" = ( +/obj/item/chair/wood, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"uwj" = ( +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/lobby) +"uwB" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig Walkway" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brigoutpost" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +"uwE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/service/hydroponics, +/obj/effect/mapping_helpers/mail_sorting/service/theater, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"uwH" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"uwM" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"uwO" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Custodial Maintenance" + }, +/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/service/janitor, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"uwR" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Xenobiology External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"uwT" = ( +/turf/closed/wall/r_wall, +/area/station/science/cytology) +"uxd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"uxj" = ( +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"uxl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/cargo/office) +"uxm" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uxx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ + dir = 1 + }, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"uxA" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"uxG" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat/service"; + name = "Service Bay Turret Control"; + pixel_x = 27; + req_access = list("minisat") + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"uxK" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"uyo" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Courtroom" + }, +/obj/item/radio/intercom/directional/north, +/obj/structure/chair{ + name = "Defense" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/security/courtroom) +"uyq" = ( +/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/smooth, +/area/mine/eva/lower) +"uyx" = ( +/obj/effect/spawner/random/structure/chair_maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"uyH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"uyO" = ( +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 5 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) +"uyV" = ( +/obj/item/target/alien/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/icemoon, +/area/station/science/ordnance/bomb) +"uyW" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"uza" = ( +/obj/machinery/camera/directional/west{ + c_tag = "MiniSat Antechamber"; + network = list("minisat"); + start_active = 1 + }, +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat/atmos"; + name = "Atmospherics Turret Control"; + pixel_x = -27; + req_access = list("minisat") + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"uzd" = ( +/obj/structure/rack, +/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp{ + pixel_y = 4 + }, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"uze" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"uzf" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/contraband/atmosia_independence/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/storage/gas) +"uzi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"uzr" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Medical"; + name = "Medical Fax Machine" + }, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Mid-South"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"uzs" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"uzu" = ( +/obj/machinery/door/airlock/wood{ + name = "Bar Backroom" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/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, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/turf/open/floor/iron/dark/textured_half, +/area/station/service/bar/backroom) +"uzB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"uzM" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"uAi" = ( +/obj/structure/table/reinforced, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/core{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - HFR West"; + name = "atmospherics camera" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"uAl" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"uAE" = ( +/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/textured, +/area/station/security/range) +"uAJ" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/starboard/aft) "uAK" = ( /obj/structure/cable, @@ -69050,6 +137114,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"uAL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"uAP" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uBi" = ( /turf/closed/wall, /area/station/ai_monitored/turret_protected/ai) @@ -69064,11 +137143,18 @@ /obj/structure/railing{ dir = 9 }, +<<<<<<< HEAD +======= +/obj/effect/turf_decal/siding/thinplating{ + dir = 9 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "uBA" = ( /turf/closed/wall, /area/station/engineering/atmos/project) +<<<<<<< HEAD "uBD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69092,6 +137178,8 @@ dir = 5 }, /area/station/hallway/secondary/entry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uBP" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, @@ -69174,10 +137262,23 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/lobby) +<<<<<<< HEAD +======= +"uCM" = ( +/obj/structure/flora/rock/pile/jungle/style_random, +/mob/living/carbon/human/species/monkey, +/obj/machinery/camera/directional/north{ + c_tag = "Virology Pen"; + network = list("ss13","medbay") + }, +/turf/open/floor/grass, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uCN" = ( /obj/structure/grille/broken, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD "uCU" = ( /obj/machinery/button/flasher{ id = "executionflash"; @@ -69194,6 +137295,8 @@ /obj/machinery/door/window/left/directional/south, /turf/open/floor/plating/icemoon, /area/station/security/execution/education) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uDc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69240,6 +137343,7 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +<<<<<<< HEAD "uDr" = ( /obj/item/stamp{ pixel_x = -3; @@ -69252,6 +137356,16 @@ /obj/structure/table, /turf/open/floor/iron, /area/station/cargo/office) +======= +"uDv" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/sink/kitchen/directional/west, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uDy" = ( /obj/item/book/bible, /obj/structure/cable, @@ -69260,6 +137374,7 @@ /obj/structure/table/wood, /turf/open/floor/iron/dark, /area/station/security/prison/rec) +<<<<<<< HEAD "uDC" = ( /obj/structure/table/wood, /obj/machinery/airalarm/directional/north, @@ -69267,6 +137382,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/chapel) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uDE" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -69291,6 +137408,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"uEf" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uEk" = ( /obj/structure/closet/wardrobe/miner, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -69309,10 +137436,13 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/large, /area/station/medical/treatment_center) +<<<<<<< HEAD "uEA" = ( /obj/structure/closet/crate, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uEI" = ( /obj/structure/railing/corner{ dir = 4 @@ -69341,11 +137471,38 @@ /turf/open/floor/plating, /area/station/security/processing) "uFg" = ( +<<<<<<< HEAD /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "uFh" = ( /turf/open/floor/plating, /area/station/construction) +======= +/obj/machinery/door/poddoor/preopen{ + id = "Prison Gate"; + name = "Prison Blast Door" + }, +/obj/machinery/door/firedoor, +/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 = 8 + }, +/obj/machinery/status_display/door_timer{ + pixel_x = -32; + id = "Cell 1"; + name = "Cell 1" + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"uFh" = ( +/turf/open/floor/plating, +/area/station/construction) +"uFt" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uFz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/holopad, @@ -69354,6 +137511,25 @@ }, /turf/open/floor/iron/white, /area/station/medical/psychology) +<<<<<<< HEAD +======= +"uFE" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/iron, +/area/station/service/bar) +"uFF" = ( +/obj/machinery/disposal/bin{ + desc = "A pneumatic waste disposal unit. This one leads to the frozen exterior of the moon."; + name = "deathsposal unit" + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/sign/warning/deathsposal/directional/north, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uFH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69367,6 +137543,7 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) +<<<<<<< HEAD "uGe" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -69378,6 +137555,37 @@ }, /turf/open/floor/iron, /area/station/service/bar) +======= +"uFS" = ( +/obj/structure/cable, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"uFV" = ( +/obj/structure/tank_dispenser{ + pixel_x = -1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics Monitoring" + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"uGe" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uGl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69394,7 +137602,11 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +<<<<<<< HEAD /turf/open/floor/plating/snowed/icemoon, +======= +/turf/open/floor/plating/snowed/smoothed/icemoon, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/icemoon/surface/outdoors/nospawn) "uGq" = ( /obj/structure/cable, @@ -69422,10 +137634,13 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) +<<<<<<< HEAD "uGY" = ( /obj/structure/bookcase, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uHc" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 @@ -69444,6 +137659,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore) +<<<<<<< HEAD "uHS" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -69454,6 +137670,15 @@ /obj/structure/sign/warning/gas_mask/directional/north, /turf/open/floor/engine/xenobio, /area/station/science/xenobiology) +======= +"uHN" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uHV" = ( /obj/structure/disposalpipe/trunk/multiz{ dir = 1 @@ -69466,6 +137691,16 @@ "uIg" = ( /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"uIh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uIj" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -69478,6 +137713,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "uIz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -69485,6 +137721,8 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/engineering/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uIC" = ( /obj/machinery/door/airlock/security{ aiControlDisabled = 1; @@ -69516,20 +137754,76 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +<<<<<<< HEAD +======= +"uIJ" = ( +/obj/structure/ladder{ + name = "chemistry lab access" + }, +/obj/effect/turf_decal/stripes/end, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Chemistry Lab - North"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/medical/chemistry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uIM" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "uIS" = ( /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +======= +"uIQ" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/item/multitool, +/obj/item/flatpack{ + board = /obj/item/circuitboard/machine/flatpacker + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/lab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uIV" = ( /obj/machinery/meter, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"uJd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"uJi" = ( +/obj/structure/rack, +/obj/item/crowbar/large/old, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/mine/living_quarters) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uJn" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -69554,6 +137848,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +<<<<<<< HEAD "uJI" = ( /obj/structure/table/wood, /obj/structure/noticeboard/directional/north, @@ -69561,12 +137856,37 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/chapel) +======= +"uJN" = ( +/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, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"uJR" = ( +/turf/open/floor/plating, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uJX" = ( /obj/structure/closet/firecloset, /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/tile/red/half, /turf/open/floor/iron/smooth_half, /area/station/security/brig/upper) +<<<<<<< HEAD +======= +"uKc" = ( +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uKj" = ( /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -69575,6 +137895,7 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/cryo) +<<<<<<< HEAD "uKx" = ( /obj/structure/closet, /obj/item/clothing/suit/hooded/wintercoat{ @@ -69600,6 +137921,8 @@ }, /turf/open/floor/iron/cafeteria, /area/station/security/prison/work) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uKM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -69626,11 +137949,20 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD +======= +"uKR" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/commons/dorms) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uKW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/station/security/execution/education) +<<<<<<< HEAD "uLe" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -69706,11 +138038,51 @@ /obj/item/kirbyplants/random/dead, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +======= +"uKY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"uLe" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"uLC" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uLF" = ( +/turf/open/floor/carpet, +/area/station/security/processing) +"uLH" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"uLX" = ( +/obj/machinery/door/airlock{ + name = "Port Emergency Storage" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/commons/storage/emergency/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uMm" = ( /turf/open/floor/iron/white/corner{ dir = 4 }, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "uMq" = ( /obj/structure/sign/warning/cold_temp{ pixel_x = -29 @@ -69721,6 +138093,23 @@ }, /turf/open/floor/iron/dark, /area/mine/storage) +======= +"uMp" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/vending/hydronutrients, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"uMs" = ( +/obj/structure/sign/warning/fire/directional/north, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uMx" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -69766,6 +138155,7 @@ "uMN" = ( /turf/open/openspace, /area/station/commons/storage/mining) +<<<<<<< HEAD "uMU" = ( /obj/structure/fence/corner, /turf/open/misc/asteroid/snow/icemoon, @@ -69779,6 +138169,12 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +======= +"uMW" = ( +/obj/structure/sign/warning/directional/west, +/turf/open/openspace/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uNq" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -69788,6 +138184,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD "uNu" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 8 @@ -69802,11 +138199,14 @@ /obj/item/trash/raisins, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uNE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/hallway) +<<<<<<< HEAD "uNG" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/weather/snow/corner{ @@ -69819,6 +138219,13 @@ /obj/structure/closet/secure_closet/cytology, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) +======= +"uNN" = ( +/obj/effect/spawner/random/trash/bin, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uNV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -69840,6 +138247,7 @@ "uOb" = ( /turf/closed/wall/r_wall, /area/station/security/prison/toilet) +<<<<<<< HEAD "uOe" = ( /obj/machinery/door/window/left/directional/west{ name = "Fitness Ring" @@ -69850,6 +138258,8 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uOf" = ( /obj/machinery/door/airlock{ id_tag = "miningdorm_A"; @@ -69877,6 +138287,7 @@ "uOj" = ( /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD "uOk" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; @@ -69891,12 +138302,21 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +"uOm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uOn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/plating, /area/station/engineering/storage/tech) +<<<<<<< HEAD "uOq" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 @@ -69919,6 +138339,14 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored/graveyard) +======= +"uOs" = ( +/obj/structure/bed/dogbed, +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uOE" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -69936,6 +138364,7 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +<<<<<<< HEAD "uOW" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/landmark/start/paramedic, @@ -69958,6 +138387,17 @@ pixel_y = 23 }, /obj/machinery/light_switch/directional/north, +======= +"uPh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/north, +/obj/machinery/button/door/directional/north{ + pixel_y = 37; + id = "Mining_launch"; + name = "Mech Bay Door Control" + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/textured, /area/mine/mechbay) "uPk" = ( @@ -69977,11 +138417,14 @@ /obj/structure/closet/crate/bin, /turf/open/floor/iron/dark, /area/mine/eva/lower) +<<<<<<< HEAD "uPx" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/iron/smooth, /area/station/maintenance/fore/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uPB" = ( /obj/structure/table/wood, /obj/machinery/recharger, @@ -70006,6 +138449,7 @@ dir = 8 }, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD "uPQ" = ( /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -70016,14 +138460,45 @@ }, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uPS" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "uPY" = ( /obj/structure/noticeboard/directional/east, /turf/open/floor/wood, /area/station/command/meeting_room) +======= +"uPT" = ( +/obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uPY" = ( +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"uQc" = ( +/obj/structure/table, +/obj/machinery/fax/auto_name, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +"uQj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uQl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -70033,6 +138508,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD +======= +"uQv" = ( +/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/chair, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uQx" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -70046,6 +138535,16 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/textured, /area/station/security/brig) +<<<<<<< HEAD +======= +"uQR" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/xenobiology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uQV" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -70142,6 +138641,7 @@ dir = 4 }, /obj/machinery/meter, +<<<<<<< HEAD /turf/open/floor/iron/dark, /area/station/science/ordnance) "uSE" = ( @@ -70181,6 +138681,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/morgue) +======= +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uTk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70203,11 +138708,40 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark/textured_edge, /area/station/security/prison) +<<<<<<< HEAD +======= +"uTq" = ( +/obj/machinery/restaurant_portal/restaurant, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uTr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +<<<<<<< HEAD +======= +"uTu" = ( +/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/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"uTx" = ( +/obj/machinery/air_sensor/ordnance_burn_chamber, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uTI" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -70228,12 +138762,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +<<<<<<< HEAD "uTL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +======= +"uTV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/toolcloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uTX" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/item/kirbyplants/random, @@ -70241,6 +138783,7 @@ dir = 4 }, /area/station/service/chapel) +<<<<<<< HEAD "uUn" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/xenobio, @@ -70266,15 +138809,73 @@ /obj/machinery/fax/auto_name, /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) +======= +"uUp" = ( +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"uUs" = ( +/obj/machinery/computer/records/medical/laptop{ + pixel_y = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/camera/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uUH" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ dir = 10 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) +<<<<<<< HEAD "uUT" = ( /turf/closed/wall, /area/mine/mechbay) +======= +"uUM" = ( +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron, +/area/station/commons/dorms) +"uUT" = ( +/turf/closed/wall, +/area/mine/mechbay) +"uVb" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/turf/closed/wall, +/area/station/service/hydroponics) +"uVf" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/box/red, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnanceburn" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/machinery/airlock_controller/incinerator_ordmix{ + pixel_y = 27 + }, +/obj/machinery/button/ignition/incinerator/ordmix{ + pixel_y = 39; + pixel_x = -6 + }, +/obj/machinery/button/door/incinerator_vent_ordmix{ + pixel_y = 39; + pixel_x = 5 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uVj" = ( /obj/effect/turf_decal/arrows/white, /obj/effect/turf_decal/stripes/line{ @@ -70290,6 +138891,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) +<<<<<<< HEAD +======= +"uVr" = ( +/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/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uVu" = ( /obj/machinery/space_heater, /obj/structure/window/reinforced/spawner/directional/east, @@ -70310,6 +138923,7 @@ dir = 1 }, /area/station/security/lockers) +<<<<<<< HEAD "uWf" = ( /obj/structure/railing/corner/end{ dir = 4 @@ -70324,6 +138938,13 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall, /area/station/maintenance/aft/greater) +======= +"uWo" = ( +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/dorms) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uWw" = ( /obj/structure/railing/corner{ dir = 1 @@ -70333,15 +138954,44 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD +======= +"uWy" = ( +/obj/structure/table/wood, +/obj/machinery/reagentgrinder{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -6 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uWE" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD +======= +"uWS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/wood/large, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uWW" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "uXh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70349,6 +138999,14 @@ dir = 8 }, /area/station/science/ordnance/office) +======= +"uXd" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uXk" = ( /turf/open/misc/dirt/dark{ initial_gas_mix = "ICEMOON_ATMOS" @@ -70360,6 +139018,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/electrical) +<<<<<<< HEAD "uXy" = ( /obj/machinery/light_switch/directional/east, /obj/structure/table, @@ -70374,6 +139033,8 @@ dir = 1 }, /area/station/commons/storage/art) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uXC" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen/engi{ @@ -70401,6 +139062,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/mine/laborcamp) +<<<<<<< HEAD "uYm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70410,6 +139072,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uYq" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; @@ -70426,6 +139090,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +<<<<<<< HEAD "uYF" = ( /obj/structure/railing{ dir = 6 @@ -70436,6 +139101,28 @@ /obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ dir = 8 }, +======= +"uYE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"uYF" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/iron, +/area/mine/production) +"uYH" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -70459,6 +139146,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"uZu" = ( +/obj/structure/table/wood, +/obj/item/camera, +/obj/item/taperecorder, +/obj/item/radio/intercom/directional/east, +/obj/item/storage/photo_album/library, +/turf/open/floor/engine/cult, +/area/station/service/library) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uZB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/structure/extinguisher_cabinet/directional/east, @@ -70466,6 +139164,7 @@ dir = 9 }, /area/station/science/research) +<<<<<<< HEAD "uZD" = ( /obj/machinery/recharge_station, /obj/machinery/airalarm/directional/north, @@ -70537,6 +139236,83 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/textured, /area/station/security/brig) +======= +"uZC" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/three, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"uZD" = ( +/obj/machinery/recharge_station, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/service) +"uZT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/railing/corner/end{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"vaa" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/science/ordnance/office) +"vad" = ( +/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/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"vah" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/barricade/wooden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vap" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"var" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/obj/structure/sign/departments/holy/directional/east, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vav" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -70555,13 +139331,38 @@ dir = 1 }, /obj/machinery/light/small/directional/west, +<<<<<<< HEAD /turf/open/floor/wood, /area/station/service/library) +======= +/obj/item/radio/intercom/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"vaL" = ( +/obj/structure/table, +/obj/item/storage/bag/tray, +/obj/item/knife/kitchen{ + pixel_y = 2 + }, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vaM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, /area/mine/eva) +<<<<<<< HEAD +======= +"vaW" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plating, +/area/station/maintenance/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vaZ" = ( /obj/item/book/manual/wiki/plumbing{ pixel_x = 4; @@ -70634,6 +139435,7 @@ /obj/structure/railing, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +<<<<<<< HEAD "vbI" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -70641,6 +139443,8 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vbO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/item/kirbyplants/random, @@ -70655,6 +139459,8 @@ /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 +<<<<<<< HEAD +======= }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) @@ -70670,6 +139476,66 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"vcf" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Chapel Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"vch" = ( +/obj/machinery/door/morgue{ + name = "Relic Closet"; + req_access = list("chapel_office"); + dir = 4 + }, +/turf/open/floor/cult, +/area/station/service/chapel/office) +"vcj" = ( +/turf/closed/wall/r_wall, +/area/mine/storage) +"vcx" = ( +/obj/machinery/newscaster/directional/east, +/obj/structure/sink/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"vcD" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/obj/effect/turf_decal/siding/white, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +<<<<<<< HEAD +/area/station/maintenance/solars/starboard/aft) +"vbZ" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vcc" = ( +/obj/structure/table/optable{ + name = "Robotics Operating Table" + }, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) "vcj" = ( /turf/closed/wall/r_wall, /area/mine/storage) @@ -70688,6 +139554,9 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +/area/station/service/kitchen/coldroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vcO" = ( /obj/machinery/vending/wardrobe/chap_wardrobe, /turf/open/floor/iron/dark, @@ -70748,6 +139617,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/service) +<<<<<<< HEAD "vdM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70769,6 +139639,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vdW" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/decal/cleanable/dirt, @@ -70777,12 +139649,24 @@ }, /turf/open/floor/iron/grimy, /area/station/security/prison/work) +<<<<<<< HEAD "vek" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/machinery/light/small/directional/north, /obj/structure/sign/departments/maint/directional/north, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +======= +"vei" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ven" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -70793,11 +139677,14 @@ "vep" = ( /turf/closed/wall, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD "veq" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ver" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy{ @@ -70805,6 +139692,7 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +<<<<<<< HEAD "ves" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -70813,6 +139701,18 @@ "vey" = ( /turf/closed/wall, /area/station/command/heads_quarters/captain) +======= +"vey" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/captain) +"veH" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "veK" = ( /turf/open/floor/iron/white, /area/mine/living_quarters) @@ -70832,6 +139732,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD "veX" = ( /obj/machinery/camera{ c_tag = "Research Division Server Room"; @@ -70842,6 +139743,8 @@ /obj/structure/lattice/catwalk, /turf/open/openspace/icemoon, /area/station/science/server) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vfe" = ( /obj/machinery/atmospherics/components/unary/passive_vent, /obj/effect/turf_decal/stripes/line{ @@ -70850,10 +139753,22 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) +<<<<<<< HEAD "vfg" = ( /obj/structure/stairs/north, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"vfj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor/heavy{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vfm" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/smooth, @@ -70878,6 +139793,7 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) +<<<<<<< HEAD "vfw" = ( /obj/structure/railing/corner/end/flip, /obj/effect/turf_decal/siding/white{ @@ -70899,6 +139815,36 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/service/kitchen/coldroom) +======= +"vfH" = ( +/obj/structure/closet/crate{ + name = "Le Caisee D'abeille" + }, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/queen_bee/bought, +/obj/item/clothing/suit/hooded/bee_costume, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/warm/directional/north, +/obj/item/seeds/sunflower, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Botany Apiary" + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vfI" = ( /obj/machinery/door/window/right/directional/south{ name = "Ordnance Freezer Chamber Access"; @@ -70920,10 +139866,28 @@ "vfW" = ( /turf/open/floor/iron, /area/station/commons/fitness) +<<<<<<< HEAD +======= +"vfZ" = ( +/obj/structure/ladder{ + name = "chemistry lab access" + }, +/obj/machinery/door/window/right/directional/east{ + req_access = list("medical"); + name = "Morgue Access Hatch" + }, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vgf" = ( /obj/structure/grille, /turf/open/floor/plating, /area/station/science/xenobiology) +<<<<<<< HEAD "vgj" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/siding/wood{ @@ -70932,6 +139896,8 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vgu" = ( /obj/structure/table, /obj/item/toy/plush/beeplushie{ @@ -70957,6 +139923,13 @@ /obj/item/stack/cable_coil, /turf/open/floor/iron/smooth, /area/mine/eva) +<<<<<<< HEAD +======= +"vgK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vgM" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -70975,6 +139948,7 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/station/maintenance/port/greater) +<<<<<<< HEAD "vgU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70995,11 +139969,27 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +======= +"vgW" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vhB" = ( /obj/structure/chair/plastic, /obj/effect/turf_decal/bot_red, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +<<<<<<< HEAD +======= +"vhF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vhL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71026,6 +140016,7 @@ dir = 6 }, /area/station/science/research) +<<<<<<< HEAD "viE" = ( /obj/structure/cable, /obj/structure/sign/warning/gas_mask/directional/south, @@ -71033,6 +140024,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) +======= +"vij" = ( +/obj/machinery/computer/prisoner/management, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "viH" = ( /obj/machinery/power/emitter/welded{ dir = 4 @@ -71046,10 +140049,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +<<<<<<< HEAD "viR" = ( /obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, /turf/open/floor/engine/xenobio, /area/station/science/xenobiology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "viV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/window/reinforced/spawner/directional/south, @@ -71060,6 +140066,7 @@ "vja" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, +<<<<<<< HEAD /turf/open/floor/plating, /area/station/construction) "vjh" = ( @@ -72133,6 +141140,1210 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +/turf/open/floor/plating, +/area/station/construction) +"vjg" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"vjh" = ( +/turf/closed/wall/r_wall, +/area/mine/laborcamp) +"vjk" = ( +/obj/machinery/atmospherics/components/binary/crystallizer{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"vjq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vjA" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Service - Kitchen" + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/table, +/obj/machinery/processor{ + pixel_y = 6 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +"vjJ" = ( +/obj/structure/table, +/obj/machinery/light/directional/north, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"vjN" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Cryogenics"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"vjQ" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"vjS" = ( +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"vjZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"vkz" = ( +/obj/machinery/suit_storage_unit/ce, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/white/textured, +/area/station/command/heads_quarters/ce) +"vkC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/iron/smooth, +/area/station/maintenance/fore/lesser) +"vkD" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"vkF" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"vkG" = ( +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/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/white, +/area/station/medical/medbay/lobby) +"vkJ" = ( +/obj/structure/table, +/obj/item/plate, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"vkN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/construction) +"vkW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"vlf" = ( +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vlF" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/stairs/north, +/turf/open/floor/iron, +/area/mine/eva/lower) +"vlH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"vlL" = ( +/obj/machinery/computer/cargo/request, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"vlN" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/storage) +"vlS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining Mech Bay External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "mining-mechbay-external" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"vlZ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/mine/storage) +"vmj" = ( +/obj/structure/chair{ + dir = 1; + name = "Logistics Station" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/command/bridge) +"vmk" = ( +/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/yellow, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"vmn" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"vmr" = ( +/obj/structure/musician/piano, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"vms" = ( +/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 = 8 + }, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"vmu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"vmw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock{ + name = "Law Office" + }, +/obj/machinery/door/firedoor, +/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/service/lawyer, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"vmx" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"vmA" = ( +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"vmC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Arrivals Hallway North" + }, +/obj/structure/cable, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"vmK" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/test_chamber/directional/north, +/turf/open/floor/iron, +/area/station/science/explab) +"vmO" = ( +/obj/structure/table, +/obj/machinery/light/small/directional/west, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/engineering/material_cheap, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) +"vmP" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"vmR" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock"; + space_dir = 4 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"vmU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"vmW" = ( +/obj/structure/table/wood, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"vne" = ( +/obj/item/clothing/head/beanie/orange{ + pixel_y = 8 + }, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/wheelys/skishoes{ + pixel_y = -8 + }, +/obj/effect/decal/remains/human, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"vng" = ( +/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/maintenance/aft/greater) +"vnj" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"vnt" = ( +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "atmos" + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"vnw" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Fitness Room South" + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -7 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/commons/fitness) +"vnA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured_half, +/area/station/service/kitchen) +"vnN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"vnW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"vnY" = ( +/obj/structure/closet/crate/critter, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"voj" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/mail_sorting/medbay/general, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"vol" = ( +/obj/structure/table, +/obj/item/clothing/mask/gas, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"vos" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"vov" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"voH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"voK" = ( +/turf/closed/wall/r_wall, +/area/station/tcommsat/computer) +"voY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) +"vpc" = ( +/obj/structure/closet, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/stellar, +/area/mine/production) +"vpd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"vpg" = ( +/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/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"vpi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) +"vpn" = ( +/obj/vehicle/sealed/mecha/ripley/paddy/preset, +/obj/structure/cable, +/turf/open/floor/iron/recharge_floor, +/area/station/security/mechbay) +"vpx" = ( +/obj/structure/sign/departments/evac/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"vpJ" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"vpR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/medical/central) +"vpW" = ( +/obj/structure/displaycase/labcage, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/rd) +"vpX" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/machinery/requests_console/auto_name/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"vqf" = ( +/obj/item/radio/intercom/directional/east, +/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/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"vqi" = ( +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"vqv" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/science/ordnance) +"vqH" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"vqN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/lab) +"vqS" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"vqX" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"vra" = ( +/obj/machinery/modular_computer/preset/cargochat/cargo{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/office) +"vrc" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/security/courtroom) +"vrw" = ( +/obj/machinery/button/door/directional/west{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"vrC" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"vrD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms) +"vrG" = ( +/turf/open/floor/iron, +/area/station/security/prison/mess) +"vrI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"vrO" = ( +/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/maintenance/starboard/aft) +"vrX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vsk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"vsp" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"vsx" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"vsz" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"vsF" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/surface/outdoors/nospawn) +"vsI" = ( +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vsL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Security - Office - Port" + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"vsM" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) +"vsT" = ( +/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/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/greater) +"vsZ" = ( +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"vtg" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hopqueue"; + name = "HoP Queue Shutters" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vtj" = ( +/obj/machinery/air_sensor/carbon_tank, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"vtr" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) +"vtu" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/coroner, +/obj/machinery/door/airlock/external{ + name = "Graveyard Access"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/medical/morgue) +"vtv" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Port to Infiltrate/Filter" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"vtz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/mining_weather_monitor/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vtA" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"vtO" = ( +/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/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"vtR" = ( +/obj/item/storage/briefcase, +/obj/structure/rack, +/obj/item/camera/detective, +/obj/item/taperecorder{ + pixel_x = -5 + }, +/obj/structure/cable, +/obj/structure/detectiveboard/directional/west, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"vuf" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, +/turf/open/floor/iron/textured, +/area/station/engineering/atmos) +"vuh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/medical{ + name = "Surgery North" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/aft) +"vuk" = ( +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"vuq" = ( +/obj/machinery/modular_computer/preset/civilian, +/obj/structure/fireaxecabinet/mechremoval/directional/north, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"vuu" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/dark, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"vux" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"vuK" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"vuR" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"vvc" = ( +/obj/structure/cable, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"vvh" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"vvi" = ( +/obj/machinery/airalarm/directional/east, +/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, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"vvu" = ( +/obj/structure/railing, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) +"vvv" = ( +/obj/structure/filingcabinet, +/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +"vvE" = ( +/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/side{ + dir = 5 + }, +/area/station/science/lab) +"vvG" = ( +/obj/structure/closet{ + name = "evidence closet 6" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/evidence) +"vvJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/library) +"vvL" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/service/library) +"vvP" = ( +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/science/robotics/mechbay) +"vvT" = ( +/obj/structure/table, +/obj/machinery/button/ticket_machine{ + pixel_x = -6; + pixel_y = -1; + req_access = list("hop") + }, +/obj/machinery/button/photobooth{ + pixel_y = -1; + pixel_x = 6; + req_access = list("hop") + }, +/obj/machinery/button/door/directional/south{ + id = "hop"; + name = "Privacy Shutters"; + pixel_x = -6; + req_access = list("hop") + }, +/obj/machinery/button/door/directional/south{ + id = "hopqueue"; + name = "Queue Shutters"; + pixel_x = 6; + req_access = list("hop") + }, +/obj/machinery/button/flasher{ + pixel_y = 9; + id = "hopflash"; + req_access = list("hop") + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"vvU" = ( +/obj/item/beacon, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/mine/eva) +"vvX" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"vwi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood/large, +/area/station/commons/vacant_room/office) +"vwj" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port Mix to West Ports" + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"vwl" = ( +/obj/machinery/light_switch/directional/south, +/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/structure/cable, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"vws" = ( +/obj/structure/chair/sofa/bench{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +"vwt" = ( +/obj/effect/decal/cleanable/dirt, +/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/smooth, +/area/station/security/holding_cell) +"vwC" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vwD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"vwE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"vwG" = ( +/obj/machinery/vending/security{ + onstation_override = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"vwJ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vwN" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"vwO" = ( +/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, +/area/station/hallway/primary/starboard) +"vwQ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Gateway Chamber"; + req_one_access = list("gateway","mining","cargo","medical") + }, +/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, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/mine/living_quarters) +"vxf" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth, +/area/station/engineering/lobby) +"vxi" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance/three, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"vxx" = ( +/obj/structure/tank_dispenser/oxygen, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) +"vxO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"vxV" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/large, +/area/station/engineering/atmos) +"vxW" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron, +/area/station/commons/fitness) +"vyb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vyd" = ( +/obj/machinery/modular_computer/preset/id, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) +"vyg" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/mine/storage) +"vyh" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"vym" = ( +/turf/closed/wall, +/area/station/construction) +"vyp" = ( +/obj/structure/bonfire, +/obj/item/melee/roastingstick, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"vyq" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Virology Hallway"; + network = list("ss13","medbay") + }, +/obj/machinery/door_buttons/access_button{ + pixel_x = 35; + idDoor = "virology_airlock_exterior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Button"; + req_access = list("virology") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"vyt" = ( +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) +"vyw" = ( +/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/dark/textured, +/area/station/security/range) +"vyx" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/landmark/event_spawn, +/turf/open/floor/engine, +/area/station/science/explab) +"vyz" = ( +/obj/structure/sign/warning/test_chamber/directional/north, +/turf/open/floor/glass/reinforced, +/area/station/science/ordnance/office) +"vyI" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"vyO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood, +/area/station/security/prison/rec) +"vyU" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vyW" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/camera/directional/south{ + network = list("ss13","medbay"); + c_tag = "Medbay Stasis Center North" + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzb" = ( /obj/structure/rack, /obj/effect/spawner/random/clothing/costume, @@ -72156,10 +142367,22 @@ dir = 1 }, /area/station/science/research) +<<<<<<< HEAD +======= +"vzp" = ( +/obj/machinery/light/warm/directional/north, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/rec) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzs" = ( /obj/structure/filingcabinet, /obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted, +<<<<<<< HEAD +======= +/obj/item/radio/intercom/directional/south, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/white, /area/station/medical/psychology) "vzw" = ( @@ -72170,6 +142393,7 @@ "vzD" = ( /turf/closed/wall, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "vzI" = ( /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; @@ -72185,6 +142409,31 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/cryo) +======= +"vzG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"vzH" = ( +/obj/machinery/oven/range, +/obj/effect/turf_decal/siding/white/corner, +/obj/machinery/light/directional/north, +/obj/machinery/button/door/directional/north{ + id = "kitchencounter"; + name = "Counter Shutters Control"; + req_access = list("kitchen") + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzS" = ( /obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab, /obj/structure/disposalpipe/sorting/mail{ @@ -72207,6 +142456,7 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) +<<<<<<< HEAD "vAj" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -72219,6 +142469,8 @@ }, /turf/open/floor/iron/smooth, /area/mine/living_quarters) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAm" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -72232,6 +142484,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "vAo" = ( /obj/machinery/door/airlock{ id_tag = "Dorm5"; @@ -72241,10 +142494,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/dorms) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical/morgue) +<<<<<<< HEAD +======= +"vAr" = ( +/obj/machinery/light/floor, +/obj/structure/railing/corner/end{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAt" = ( /obj/structure/table, /obj/item/book/manual/wiki/security_space_law{ @@ -72269,17 +142534,30 @@ /obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "vAO" = ( /obj/structure/bodycontainer/morgue/beeper_off{ dir = 1 }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAP" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/science/genetics) +<<<<<<< HEAD +======= +"vAS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron/white, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAU" = ( /obj/machinery/light/small/directional/east, /obj/machinery/camera/directional/east{ @@ -72299,6 +142577,7 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/service) +<<<<<<< HEAD "vAW" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/effect/landmark/start/cook, @@ -72308,6 +142587,8 @@ /obj/structure/cable, /turf/open/floor/iron/kitchen/diagonal, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAY" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -72320,6 +142601,7 @@ dir = 1 }, /area/station/hallway/primary/port) +<<<<<<< HEAD "vBa" = ( /obj/structure/table, /obj/item/storage/crayons, @@ -72338,6 +142620,8 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, /area/mine/eva/lower) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vBh" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -72355,6 +142639,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "vBt" = ( /obj/machinery/door/airlock/freezer{ desc = "The freezer where the chef keeps all the stuff that needs to be kept cold. Ice cold."; @@ -72377,6 +142662,21 @@ /turf/open/floor/iron, /area/station/commons/storage/tools) "vBv" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wideplating/corner{ +======= +"vBu" = ( +/obj/machinery/space_heater, +/obj/machinery/camera/directional/south{ + c_tag = "Auxiliary Tool Storage" + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"vBv" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, @@ -72393,6 +142693,423 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"vBG" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/cmo) +"vCm" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vCn" = ( +/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/north{ + c_tag = "Security - Upper Permabrig Cafeteria"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"vCy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/lesser) +"vCz" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"vCD" = ( +/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, +/area/station/hallway/secondary/exit/departure_lounge) +"vCK" = ( +/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/edge, +/area/station/engineering/lobby) +"vDb" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig/entrance) +"vDh" = ( +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"vDu" = ( +/obj/structure/table/glass, +/obj/item/biopsy_tool{ + pixel_x = -10; + pixel_y = 3 + }, +/obj/structure/microscope{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"vDx" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"vDy" = ( +/obj/structure/sign/poster/official/safety_report/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/west{ + c_tag = "Labor Camp Central"; + network = list("labor") + }, +/turf/open/floor/iron, +/area/mine/laborcamp) +"vEc" = ( +/obj/machinery/door/poddoor/incinerator_ordmix, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"vEw" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics Access" + }, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"vEy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"vEG" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external/glass{ + name = "Supply Door Airlock"; + pixel_y = 0; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/storage) +"vEJ" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"vEN" = ( +/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/smooth_half, +/area/station/maintenance/department/medical/central) +"vEU" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Drone Bay External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/iron/smooth, +/area/station/cargo/drone_bay) +"vFg" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"vFq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/smooth, +/area/mine/living_quarters) +"vFs" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"vFO" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/security/brig) +"vFT" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vFW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/virology, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"vGw" = ( +/obj/structure/transit_tube/station/reverse, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"vGy" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Pens Observation - Starboard Aft"; + network = list("ss13","rd","xeno") + }, +/turf/open/openspace, +/area/station/science/xenobiology) +"vGI" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault{ + name = "Vault" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/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/supply/vault, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"vGJ" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"vGY" = ( +/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/commons/storage/mining) +"vHa" = ( +/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/tcommsat/computer) +"vHf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/effect/landmark/start/depsec/medical, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"vHm" = ( +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"vHo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"vHq" = ( +/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/science/xenobiology) +"vHA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"vHI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit/departure_lounge) +"vHJ" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"vHK" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"vHR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"vHU" = ( +/obj/item/radio/intercom/prison/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) +"vHZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"vIe" = ( +/obj/item/soap/deluxe, +/obj/item/bikehorn/rubberducky, +/obj/structure/curtain, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/freezer, +/area/station/medical/break_room) +"vIg" = ( +/obj/structure/table, +/obj/item/computer_disk{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/computer_disk{ + pixel_x = -2 + }, +/obj/item/computer_disk/ordnance{ + pixel_x = -5; + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"vIm" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Chapel External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/iron, +/area/station/service/chapel) +"vIu" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/medical/chemistry) +"vIH" = ( +/obj/structure/closet{ + name = "evidence closet 1" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/evidence) +"vIZ" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"vJk" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/upper) +"vJl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/mob/living/carbon/human/species/monkey, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/grass, +/area/station/medical/virology) +"vJv" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vJB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +<<<<<<< HEAD +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"vBC" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vBD" = ( /obj/structure/chair{ dir = 1 @@ -72815,6 +143532,29 @@ }, /turf/open/floor/plating, /area/station/engineering/storage/tech) +======= +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/mapping_helpers/mail_sorting/medbay/virology, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"vJI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"vJJ" = ( +/obj/structure/closet/secure_closet/bar, +/obj/machinery/light/small/directional/north, +/obj/item/vending_refill/cigarette, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/wood/parquet, +/area/station/service/bar/backroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vJS" = ( /obj/structure/chair/sofa/corp/right{ dir = 4; @@ -72825,9 +143565,12 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "vJY" = ( +<<<<<<< HEAD /obj/structure/railing/corner{ dir = 8 }, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/window/brigdoor/left/directional/west{ name = "Research Director Observation"; req_access = list("rd") @@ -72849,13 +143592,65 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD "vKT" = ( +======= +"vKy" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/head/utility/radiation, +/obj/item/geiger_counter, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/glasses/meson, +/obj/machinery/button/door/directional/north{ + id = "engsm"; + name = "Radiation Shutters Control"; + req_access = list("engineering") + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"vKD" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/entry) +"vKR" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +<<<<<<< HEAD /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) +======= +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/curtain/cloth/fancy/mechanical/start_closed{ + id = "cantena_curtains" + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"vKZ" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vLj" = ( /obj/machinery/suit_storage_unit/rd, /obj/effect/turf_decal/stripes/line{ @@ -72864,16 +143659,28 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/smooth_half, /area/station/command/heads_quarters/rd) +<<<<<<< HEAD "vLo" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +======= +"vLY" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet/l3closet/virology, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vMa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +<<<<<<< HEAD "vMc" = ( /obj/machinery/camera/directional/west{ c_tag = "Gateway" @@ -72906,6 +143713,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vMl" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -72924,6 +143733,7 @@ /obj/structure/cable/layer3, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "vMN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -72932,6 +143742,8 @@ }, /turf/open/floor/wood, /area/station/maintenance/aft/greater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vMY" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -72970,6 +143782,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, /area/station/engineering/atmos/mix) +<<<<<<< HEAD "vNK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -72993,6 +143806,13 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/fore) +======= +"vNU" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vOw" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red{ @@ -73000,6 +143820,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +<<<<<<< HEAD +======= +"vOy" = ( +/obj/structure/fake_stairs/wood/directional/north, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vOD" = ( /obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/tile/dark_green{ @@ -73017,6 +143845,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"vPc" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Security Post - Engineering" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/obj/machinery/computer/security/telescreen/engine/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vPh" = ( /obj/machinery/light/directional/north, /obj/machinery/digital_clock/directional/north, @@ -73085,12 +143925,28 @@ /turf/open/floor/iron, /area/mine/production) "vQz" = ( +<<<<<<< HEAD /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, /obj/machinery/light/small/directional/east, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +======= +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; + name = "Antechamber Turret Control"; + pixel_y = -24; + req_access = list("minisat") + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/camera/motion/directional/south{ + c_tag = "MiniSat Foyer"; + network = list("minisat") + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vQG" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 10 @@ -73115,6 +143971,12 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/cargo/lobby) +<<<<<<< HEAD +======= +"vRn" = ( +/turf/open/floor/iron/stairs/medium, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vRo" = ( /obj/machinery/shower/directional/north, /obj/effect/turf_decal/trimline/blue/line{ @@ -73190,6 +144052,7 @@ "vSi" = ( /turf/closed/wall, /area/mine/eva) +<<<<<<< HEAD "vSu" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -73220,6 +144083,8 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vSE" = ( /obj/machinery/door/window/right/directional/east{ name = "Bar Access" @@ -73287,6 +144152,29 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD +======= +"vTh" = ( +/obj/structure/fence/post{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vTm" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vTo" = ( /obj/structure/disposalpipe/sorting/mail{ dir = 1 @@ -73301,6 +144189,22 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD +======= +"vTq" = ( +/obj/effect/spawner/random/contraband/prison, +/obj/structure/closet/crate, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/prison/work) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vTJ" = ( /obj/structure/table, /obj/item/toy/plush/slimeplushie{ @@ -73324,14 +144228,439 @@ /area/station/security/checkpoint/science) "vTP" = ( /obj/effect/turf_decal/tile/green{ +<<<<<<< HEAD dir = 1 }, /turf/open/floor/iron, /area/station/hallway/primary/port) "vUn" = ( -/obj/effect/turf_decal/stripes/line{ +======= + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"vUr" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vUs" = ( +/obj/structure/easel, +/obj/item/canvas/nineteen_nineteen, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/sepia, +/area/station/security/prison/rec) +"vUI" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 5 + }, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"vUW" = ( +/obj/item/stack/cable_coil{ + amount = 7; + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"vUY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"vVj" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"vVl" = ( +/obj/structure/table/wood, +/obj/item/soap/nanotrasen, +/obj/item/clothing/head/costume/sombrero/green, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/iron/grimy, +/area/station/commons/lounge) +"vVw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"vVH" = ( +/turf/closed/wall, +/area/station/security/prison/safe) +"vVP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/science/xenobiology) +"vVY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"vWe" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/storage) +"vWh" = ( +/obj/machinery/door/airlock/maintenance, +/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/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"vWm" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"vWr" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"vWy" = ( +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/large, +/area/station/engineering/storage) +"vWz" = ( +/turf/closed/wall, +/area/mine/storage) +"vWL" = ( +/obj/structure/chair{ + dir = 1; + name = "Security Station" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/bridge) +"vWP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"vWU" = ( +/obj/structure/table/glass, +/obj/item/book/bible, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"vWW" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"vXb" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vXd" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"vXh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vXn" = ( +/obj/structure/table, +/obj/item/food/pie/cream, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) +"vXv" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"vXy" = ( +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"vXC" = ( +/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/mine/living_quarters) +"vXH" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/mine/living_quarters) +"vXU" = ( +/obj/item/toy/snowball, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vYa" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/commons/storage/primary) +"vYg" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Chapel West" + }, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"vYm" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Head of Personnel's Office"; + name = "Head of Personnel's Fax Machine" + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"vYq" = ( +/obj/structure/barricade/wooden/snowed, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"vYs" = ( +/obj/machinery/light/directional/east, +/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, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"vYv" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vYw" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"vYz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/stool/directional/south, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"vYA" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Hallway South-West - HoP's Office" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/structure/sign/departments/cargo/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vYH" = ( +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"vYJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/large, +/area/station/engineering/lobby) +"vZa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"vZg" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table, +/obj/effect/spawner/random/entertainment/dice, +/turf/open/floor/iron, +/area/station/commons/locker) +"vZo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"vZt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"vZz" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"vZD" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"vZM" = ( +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"wab" = ( +/obj/structure/cable, +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"wam" = ( +/turf/open/openspace, +/area/station/cargo/storage) +"waz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"waF" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"waH" = ( +/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/dark, +/area/station/medical/morgue) +"waL" = ( +/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/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"waM" = ( +/obj/structure/table/glass, +/obj/item/restraints/handcuffs/cable/zipties, +/obj/item/reagent_containers/blood/random, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"waU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"waZ" = ( +/obj/structure/table, +/obj/item/assembly/igniter{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/assembly/igniter, +/obj/item/screwdriver, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) +"wbe" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"wbf" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"wbk" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"wbw" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ color = "#0000ff"; dir = 8; @@ -74617,6 +145946,775 @@ name = "Research Lab Shutters" }, /turf/open/floor/plating, +======= +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"wbG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/security/interrogation) +"wbH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/mine/eva/lower) +"wbR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +"wbW" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"wbY" = ( +/obj/machinery/door/airlock{ + id_tag = "AuxToilet4"; + name = "Unit 4" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"wcn" = ( +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +"wcx" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/command/heads_quarters/ce) +"wcD" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/mine/living_quarters) +"wcL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"wcN" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, +/turf/open/floor/plating, +/area/mine/eva) +"wdg" = ( +/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/maintenance/central/lesser) +"wdo" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/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/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"wds" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"wdI" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) +"wdL" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"wdX" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/mine/laborcamp) +"wee" = ( +/obj/item/radio/intercom/chapel/directional/east, +/obj/structure/chair, +/obj/machinery/light/small/red/directional/north, +/turf/open/floor/wood/large, +/area/station/service/chapel) +"wes" = ( +/obj/effect/turf_decal/siding/wideplating_new/light, +/obj/item/trash/bee, +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/work) +"weF" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"weI" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) +"weL" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) +"weR" = ( +/turf/open/floor/wood, +/area/station/maintenance/space_hut/cabin) +"weT" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"weW" = ( +/obj/docking_port/stationary/random/icemoon{ + dir = 8; + name = "lavaland"; + shuttle_id = "pod_lavaland" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"wfc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"wfm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"wfn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/main) +"wfp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Security - Upper Hallway North" + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"wfE" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wfF" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) +"wfK" = ( +/obj/item/folder/blue, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/command/meeting_room) +"wfP" = ( +/obj/structure/table/wood, +/obj/item/paper, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"wfR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/smooth_edge, +/area/station/command/heads_quarters/rd) +"wgo" = ( +/obj/item/food/grown/potato{ + pixel_y = 4 + }, +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wgr" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio9"; + name = "Xenobio Pen 9 Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"wgG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"wgI" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"wgK" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"wgL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) +"wgO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "Research Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/science/lab) +"wgU" = ( +/obj/machinery/modular_computer/preset/cargochat/science{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/lab) +"whb" = ( +/obj/machinery/recharge_station, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"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) +"whe" = ( +/obj/item/stack/rods/two, +/obj/item/stack/sheet/iron, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"whf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/turf/open/floor/glass/reinforced, +/area/station/engineering/atmos/pumproom) +"whg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"whh" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/east{ + id = "chemistry_access_shutters"; + name = "Chemistry Access Shutter Control"; + req_access = list("medical") + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"whk" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/commons/dorms) +"whr" = ( +/obj/machinery/hydroponics/soil, +/obj/item/cultivator, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"whC" = ( +/obj/structure/destructible/cult/item_dispenser/archives/library, +/obj/item/book/codex_gigas, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/turf/open/floor/engine/cult, +/area/station/service/library) +"whP" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/iron/dark/smooth_half, +/area/station/science/breakroom) +"whQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/newscaster/directional/west, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"whU" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/turf/open/floor/plating, +/area/station/medical/treatment_center) +"whW" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/tank_dispenser, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"wib" = ( +/obj/structure/sign/departments/xenobio/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) +"wik" = ( +/obj/structure/table, +/obj/item/plant_analyzer, +/obj/item/stock_parts/power_store/cell/high, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"wiv" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) +"wiz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) +"wiD" = ( +/obj/effect/turf_decal/tile/dark{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"wiX" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +"wjj" = ( +/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/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"wjz" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"wjA" = ( +/obj/structure/sign/warning/directional/north, +/turf/closed/mineral/random/snow/high_chance, +/area/icemoon/underground/explored) +"wjD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/closet/secure_closet/medical3, +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"wjL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"wjP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/rack, +/obj/item/storage/backpack/satchel/leather/withwallet, +/obj/item/toy/figure/assistant, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"wjS" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/pew{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) +"wjZ" = ( +/obj/effect/turf_decal/caution{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"wkd" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"wkl" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Telecomms Server Room"; + network = list("tcomms") + }, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"wkr" = ( +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"wkw" = ( +/obj/machinery/power/emitter, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"wkB" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"wkH" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/obj/item/clothing/mask/breath/medical, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"wkN" = ( +/obj/machinery/door/firedoor{ + 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/structure/cable, +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/cargo/lobby) +"wkO" = ( +/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/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"wkW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/dark_red/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"wlr" = ( +/obj/structure/table, +/obj/item/stack/spacecash/c10, +/obj/item/stack/spacecash/c1{ + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"wls" = ( +/obj/item/trash/sosjerky, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wlt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"wlz" = ( +/obj/structure/filingcabinet, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"wlR" = ( +/obj/structure/closet/boxinggloves, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"wlW" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/computer/robotics{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/command/heads_quarters/rd) +"wlY" = ( +/obj/machinery/door/airlock/freezer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"wma" = ( +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"wme" = ( +/obj/effect/turf_decal/weather/snow, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/icemoon, +/area/icemoon/underground/explored) +"wml" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue, +/obj/structure/railing/corner/end/flip, +/obj/effect/turf_decal/siding/thinplating/corner, +/turf/open/floor/iron, +/area/station/commons/locker) +"wmG" = ( +/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/light/directional/west, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) +"wmK" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L5" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wmN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"wmP" = ( +/obj/machinery/plate_press, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/prison/work) +"wmR" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/glass{ + name = "Mining Station Bridge" + }, +/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, +/area/mine/production) +"wmT" = ( +/turf/open/floor/iron/dark, +/area/mine/eva) +"wna" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/bridge) +"wnm" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"wnv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"wnB" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Pens - Starboard Aft"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"wnK" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"wnR" = ( +/obj/machinery/computer/scan_consolenew, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"wnT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rnd2"; + name = "Research Lab Shutters" + }, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/science/lab) "wnX" = ( /obj/structure/sink/directional/south, @@ -74640,6 +146738,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/brig) +<<<<<<< HEAD "wol" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet/directional/east, @@ -74654,6 +146753,15 @@ dir = 10 }, /area/station/science/research) +======= +"woc" = ( +/obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/effect/turf_decal/stripes/end, +/obj/machinery/light/directional/north, +/obj/structure/sign/warning/no_smoking/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wor" = ( /turf/open/openspace, /area/station/medical/medbay/aft) @@ -74664,11 +146772,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +<<<<<<< HEAD "woC" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/sign/poster/official/safety_eye_protection/directional/south, /turf/open/floor/iron/white, /area/station/medical/chemistry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "woH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74696,6 +146807,7 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "woV" = ( /obj/structure/table, /obj/item/petri_dish{ @@ -75341,6 +147453,565 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, +======= +"wpc" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/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/freezer, +/area/station/commons/toilet/locker) +"wpn" = ( +/obj/machinery/light/small/dim/directional/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"wpp" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/pipedispenser/disposal, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"wpu" = ( +/obj/structure/table, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"wpx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/mine/eva) +"wpC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"wpO" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"wpQ" = ( +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"wpY" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wpZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/end, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"wqb" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Research Division South" + }, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/research) +"wqj" = ( +/obj/machinery/holopad, +/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/commons/storage/mining) +"wqo" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"wqx" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/fore) +"wqI" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/station/security/brig) +"wqN" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"wqT" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Public Mining Storage"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"wqU" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +"wrk" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + dir = 8 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron, +/area/station/command/bridge) +"wrw" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/sign/poster/official/safety_report/directional/east, +/obj/item/radio/intercom/prison/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"wrA" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Primary Tool Storage" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/textured, +/area/station/commons/storage/primary) +"wrE" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 2 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"wrP" = ( +/obj/machinery/computer/cargo, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/north, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"wrV" = ( +/obj/structure/cable, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"wrX" = ( +/turf/closed/wall, +/area/station/service/chapel) +"wsh" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"wsk" = ( +/obj/effect/spawner/random/trash/mess, +/obj/structure/disposalpipe/segment, +/obj/structure/railing/corner/end, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wsp" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +"wsr" = ( +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wsu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"wsD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"wsF" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/infections{ + pixel_y = 7 + }, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/structure/reagent_dispensers/wall/virusfood/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"wsN" = ( +/obj/structure/girder, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"wsO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wsV" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, +/area/station/commons/locker) +"wta" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"wtg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hos) +"wtj" = ( +/obj/structure/flora/grass/brown/style_2, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"wtr" = ( +/obj/structure/table/glass, +/obj/item/food/grown/wheat, +/obj/item/food/grown/watermelon, +/obj/item/food/grown/watermelon, +/obj/item/food/grown/watermelon, +/obj/item/food/grown/citrus/orange, +/obj/item/food/grown/grapes, +/obj/item/food/grown/cocoapod, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden) +"wtC" = ( +/obj/structure/chair/stool/directional/south, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wtM" = ( +/obj/machinery/door/airlock/external{ + name = "External Access"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"wtP" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"wtT" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/science/research) +"wug" = ( +/obj/machinery/gulag_item_reclaimer{ + pixel_y = 24 + }, +/turf/open/floor/carpet, +/area/station/security/processing) +"wuh" = ( +/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, +/area/station/science/ordnance) +"wuo" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"wuv" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) +"wuz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/machinery/holopad, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) +"wuA" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"wuC" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"wuH" = ( +/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/west{ + c_tag = "Security - Upper Permabrig Hallway West"; + network = list("ss13","prison") + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"wve" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"wvl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/service/chapel) +"wvv" = ( +/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/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Ordnance Launch Room" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"wvw" = ( +/obj/structure/fence/cut/medium{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"wvz" = ( +/obj/structure/table, +/obj/item/assembly/timer{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/assembly/timer{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/assembly/timer{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/assembly/timer, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) +"wvF" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 8 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"wvI" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"wvJ" = ( +/obj/machinery/photocopier, +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/sign/calendar/directional/north, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"wvK" = ( +/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/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"wvV" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) +"wvW" = ( +/obj/structure/bed/dogbed/runtime, +/obj/item/toy/cattoy, +/obj/machinery/newscaster/directional/north, +/mob/living/basic/pet/cat/runtime, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"wwi" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/public/glass{ + dir = 4; + name = "Arrivals Dock" + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/secondary/entry) +"wwn" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/west{ + name = "Reception Window" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hop"; + name = "Privacy Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/window/brigdoor/right/directional/east{ + name = "Head of Personnel's Desk"; + req_access = list("hop") + }, +/obj/machinery/flasher/directional/south{ + id = "hopflash"; + pixel_y = -23 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"wws" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"wwu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"wwI" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"wwK" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"wwO" = ( +/obj/machinery/recharger, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"wxg" = ( +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) +"wxl" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"wxw" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/department/chapel) "wxy" = ( /obj/structure/disposalpipe/segment, @@ -75366,6 +148037,7 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD "wyj" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -75397,6 +148069,44 @@ dir = 4 }, /turf/open/floor/plating, +======= +"wxY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/construction) +"wyj" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"wyo" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Holding Area" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"wyr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"wyB" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/cargo/storage) "wyF" = ( /obj/structure/rack, @@ -75408,6 +148118,17 @@ }, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) +<<<<<<< HEAD +======= +"wyL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wyO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -75419,6 +148140,16 @@ }, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +<<<<<<< HEAD +======= +"wyX" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/stairs/south, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wzc" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -75430,6 +148161,14 @@ /obj/effect/spawner/random/clothing/bowler_or_that, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +<<<<<<< HEAD +======= +"wzi" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wzk" = ( /turf/open/floor/wood, /area/station/command/meeting_room) @@ -75451,6 +148190,39 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"wzv" = ( +/obj/machinery/atmospherics/components/tank/air{ + initialize_directions = 3; + dir = 3 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"wzH" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) +"wzU" = ( +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wAf" = ( /obj/machinery/requests_console/directional/north{ department = "Cargo Bay"; @@ -75462,6 +148234,7 @@ /obj/item/folder/yellow, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD "wAk" = ( /obj/item/toy/snowball{ pixel_x = -6; @@ -75481,6 +148254,8 @@ }, /turf/open/floor/iron, /area/station/security/brig/upper) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wAv" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -75490,6 +148265,7 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +<<<<<<< HEAD "wAx" = ( /obj/structure/sign/warning/secure_area/directional/north{ desc = "A warning sign which reads 'SERVER ROOM'."; @@ -75498,6 +148274,8 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/server) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wAB" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -75505,6 +148283,16 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"wAJ" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/griddle, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wAQ" = ( /obj/machinery/computer/shuttle/labor/one_way{ dir = 4 @@ -75539,12 +148327,30 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "wBa" = ( +<<<<<<< HEAD /obj/structure/railing, /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 10 }, /turf/open/floor/wood/large, /area/station/hallway/primary/starboard) +======= +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/delivery/red, +/obj/item/clothing/gloves/color/grey/protects_cold, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron/textured, +/area/station/ai_monitored/command/storage/eva) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wBb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75582,6 +148388,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/workout) +<<<<<<< HEAD "wBr" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -75591,6 +148398,18 @@ /obj/item/kirbyplants/organic/plant2, /turf/open/floor/stone, /area/station/service/bar/atrium) +======= +"wBs" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/kirbyplants/random, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/service/chapel) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wBy" = ( /obj/machinery/netpod, /obj/item/radio/intercom/directional/south, @@ -75602,12 +148421,15 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +<<<<<<< HEAD "wBF" = ( /obj/machinery/status_display/supply{ pixel_y = 2 }, /turf/closed/wall, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wBT" = ( /obj/machinery/camera/directional/south{ c_tag = "Port Hallway Center" @@ -75617,6 +148439,12 @@ /area/station/hallway/primary/port) "wBV" = ( /obj/structure/closet/crate, +<<<<<<< HEAD +======= +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/cargo/miningdock) "wCo" = ( @@ -75625,6 +148453,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +<<<<<<< HEAD +======= +"wCI" = ( +/obj/structure/sign/warning/no_smoking/circle/directional/north, +/turf/open/openspace, +/area/station/medical/treatment_center) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wCK" = ( /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 @@ -75650,6 +148485,19 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) +<<<<<<< HEAD +======= +"wCN" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wCV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75657,6 +148505,15 @@ dir = 8 }, /area/station/science/explab) +<<<<<<< HEAD +======= +"wDb" = ( +/obj/machinery/requests_console/auto_name/directional/east, +/obj/machinery/duct, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wDc" = ( /obj/structure/cable, /obj/machinery/door/airlock/engineering{ @@ -75693,6 +148550,7 @@ "wDg" = ( /turf/open/floor/iron, /area/station/engineering/atmos/storage) +<<<<<<< HEAD "wDi" = ( /obj/structure/table, /obj/item/clothing/mask/breath{ @@ -75721,6 +148579,8 @@ }, /turf/open/floor/iron, /area/station/commons/storage/mining) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wDk" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 @@ -75735,6 +148595,7 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +<<<<<<< HEAD "wDs" = ( /obj/machinery/hydroponics/constructable, /obj/structure/window/reinforced/spawner/directional/west, @@ -75745,6 +148606,8 @@ }, /turf/open/floor/iron/dark, /area/mine/laborcamp) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wDG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75765,6 +148628,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +<<<<<<< HEAD +======= +"wDS" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/fake_stairs/wood/directional/north, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wDU" = ( /turf/closed/wall/r_wall, /area/mine/eva/lower) @@ -75775,10 +148649,19 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) +<<<<<<< HEAD +======= +"wEb" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wEh" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/cargo/sorting) +<<<<<<< HEAD "wEq" = ( /obj/structure/chair/office{ dir = 8 @@ -75789,12 +148672,29 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +"wEp" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/dark/textured_edge, +/area/station/security/prison) +"wEu" = ( +/obj/structure/sign/warning/directional/south, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wEG" = ( /obj/structure/extinguisher_cabinet/directional/south{ pixel_x = 4 }, /obj/machinery/light_switch/directional/south{ +<<<<<<< HEAD pixel_x = -6 +======= + pixel_x = -8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -75853,6 +148753,30 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD +======= +"wFt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ + color = "#0000ff"; + dir = 8; + name = "Supply multi deck pipe adapter" + }, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ + color = "#ff0000"; + dir = 8; + name = "Scrubbers multi deck pipe adapter" + }, +/obj/structure/cable/multilayer/multiz, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"wFJ" = ( +/turf/open/floor/wood, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wFN" = ( /mob/living/basic/slime, /turf/open/floor/engine, @@ -75884,6 +148808,7 @@ name = "Test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, +<<<<<<< HEAD /turf/open/floor/engine, /area/station/science/explab) "wGm" = ( @@ -75893,6 +148818,16 @@ /obj/structure/chair/stool/bar/directional/north, /turf/open/floor/stone, /area/station/service/bar/atrium) +======= +/turf/open/floor/plating, +/area/station/science/explab) +"wGt" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wGv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -75917,6 +148852,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "wGN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75930,6 +148866,8 @@ /obj/structure/sign/warning/electric_shock, /turf/open/floor/plating, /area/station/science/xenobiology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wGO" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/multiz/violet/visible{ @@ -75943,10 +148881,13 @@ }, /turf/open/floor/iron/dark/diagonal, /area/station/engineering/atmos/storage) +<<<<<<< HEAD "wGQ" = ( /obj/machinery/light/small/dim/directional/west, /turf/open/floor/stone, /area/station/commons/lounge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wGW" = ( /obj/structure/table, /obj/item/book/manual/wiki/security_space_law, @@ -75964,6 +148905,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD +======= +"wGZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/insectguts, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wHb" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 @@ -75997,12 +148949,15 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +<<<<<<< HEAD "wHr" = ( /obj/structure/fence/post{ dir = 8 }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wHH" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red{ @@ -76010,6 +148965,7 @@ }, /turf/open/floor/iron, /area/mine/laborcamp/security) +<<<<<<< HEAD "wHK" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line{ @@ -76021,6 +148977,8 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wIg" = ( /obj/machinery/mech_bay_recharge_port{ dir = 2 @@ -76033,6 +148991,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "wIx" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -76049,12 +149008,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wIz" = ( /obj/machinery/light/small/directional/west, /obj/structure/table/wood, /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"wIC" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/flashlight/lantern, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wIR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -76084,10 +149055,20 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "wJD" = ( /obj/structure/sign/departments/maint/alt, /turf/closed/wall, /area/station/maintenance/aft/lesser) +======= +"wJy" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wJG" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -76120,10 +149101,40 @@ /obj/effect/landmark/start/depsec/medical, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/medical) +<<<<<<< HEAD "wKh" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +======= +"wKi" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rnd2"; + name = "Research Lab Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/lab) +"wKu" = ( +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/port/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wKv" = ( /obj/structure/table, /obj/item/radio/off, @@ -76150,11 +149161,48 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD "wKY" = ( /obj/machinery/vending/games, /obj/machinery/newscaster/directional/north, /turf/open/floor/wood, /area/station/service/library) +======= +"wLc" = ( +/obj/structure/table, +/obj/machinery/button/flasher{ + pixel_x = -6; + pixel_y = -1; + id = "brigentry" + }, +/obj/machinery/button/door{ + pixel_y = 9; + pixel_x = 6; + req_access = list("secuirty"); + id = "innerbrig"; + name = "Brig Interior Doors Control"; + normaldoorcontrol = 1 + }, +/obj/machinery/button/door{ + pixel_y = -1; + pixel_x = 6; + req_access = list("secuirty"); + id = "outerbrig"; + name = "Brig Exterior Doors Control"; + normaldoorcontrol = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "briggate"; + name = "Front Gate Shutters"; + req_access = list("brig"); + pixel_y = 9; + pixel_x = -6 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/security/brig/entrance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wLk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -76170,10 +149218,19 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD "wLK" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +======= +"wLI" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wLO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76193,6 +149250,7 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "wLU" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -76201,6 +149259,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wLW" = ( /obj/effect/landmark/atmospheric_sanity/mark_all_station_areas_as_goal, /turf/open/misc/asteroid/snow/icemoon, @@ -76284,6 +149344,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/commons/storage/mining) +<<<<<<< HEAD "wME" = ( /obj/machinery/light_switch/directional/north{ pixel_x = 6; @@ -76314,6 +149375,48 @@ dir = 1 }, /area/station/security/office) +======= +"wMT" = ( +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"wMU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wMV" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/office) +"wMY" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/fore) +"wNj" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wNp" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" @@ -76362,6 +149465,26 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos/storage) +<<<<<<< HEAD +======= +"wOq" = ( +/obj/structure/fence/door/opened, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"wOt" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wOy" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -76372,12 +149495,15 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "wOC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wOF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random/directional/north, @@ -76414,6 +149540,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD "wPe" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -76434,6 +149561,8 @@ dir = 1 }, /area/station/service/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wPf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76464,6 +149593,21 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"wPx" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wPD" = ( /obj/machinery/door/airlock/security/glass{ name = "Evidence Storage" @@ -76479,6 +149623,22 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/openspace, /area/station/engineering/atmos/storage) +<<<<<<< HEAD +======= +"wPG" = ( +/obj/structure/fence{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"wPJ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/north, +/turf/open/floor/iron/stairs/medium, +/area/station/commons/dorms/laundry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wPN" = ( /obj/structure/railing{ dir = 4 @@ -76488,6 +149648,7 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) +<<<<<<< HEAD "wPR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76498,6 +149659,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wPX" = ( /obj/structure/table, /obj/item/storage/belt/medical{ @@ -76513,6 +149676,10 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/blood_filter, /obj/item/radio/intercom/directional/south, +<<<<<<< HEAD +======= +/obj/structure/window/reinforced/spawner/directional/west, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/white, /area/station/medical/storage) "wQh" = ( @@ -76544,6 +149711,7 @@ /turf/open/floor/plating/icemoon, /area/station/security/execution/education) "wQx" = ( +<<<<<<< HEAD /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76551,6 +149719,11 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wQC" = ( /obj/item/flashlight/lantern, /obj/structure/table/wood, @@ -76564,12 +149737,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "wQN" = ( /obj/structure/fence/cut/large{ dir = 1 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wQR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -76588,6 +149764,7 @@ "wRa" = ( /turf/open/openspace, /area/station/security/prison) +<<<<<<< HEAD "wRc" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -76597,6 +149774,18 @@ "wRd" = ( /turf/open/floor/iron, /area/station/engineering/main) +======= +"wRd" = ( +/turf/open/floor/iron, +/area/station/engineering/main) +"wRk" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wRr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76610,6 +149799,17 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/glass/reinforced, /area/station/security/lockers) +<<<<<<< HEAD +======= +"wRu" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wRx" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -76650,6 +149850,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer, /area/mine/eva/lower) +<<<<<<< HEAD "wRO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -76658,6 +149859,8 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wRR" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 1; @@ -76668,10 +149871,13 @@ /obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/station/medical/chemistry) +<<<<<<< HEAD "wSc" = ( /obj/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/station/maintenance/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wSd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -76701,6 +149907,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"wSp" = ( +/obj/structure/fence/corner{ + dir = 10 + }, +/obj/item/stack/cable_coil/five, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wSs" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) @@ -76718,6 +149934,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/work) +<<<<<<< HEAD "wSL" = ( /obj/effect/landmark/start/botanist, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -76738,18 +149955,30 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) +======= +"wSC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wSU" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "wSX" = ( /obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, /area/mine/eva) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wSZ" = ( /obj/machinery/camera/directional/east{ c_tag = "Security - Permabrig Upper Hallway East"; @@ -76760,11 +149989,14 @@ "wTg" = ( /turf/closed/wall, /area/station/engineering/main) +<<<<<<< HEAD "wTl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/landmark/start/mime, /turf/open/floor/wood, /area/station/commons/lounge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wTw" = ( /obj/effect/turf_decal/trimline/neutral/warning{ dir = 10 @@ -76785,6 +150017,17 @@ /obj/machinery/telecomms/bus/preset_one, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +<<<<<<< HEAD +======= +"wTB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/structure/closet/radiation, +/obj/structure/sign/warning/no_smoking/circle/directional/north, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wTC" = ( /obj/structure/closet/secure_closet/security/engine, /obj/machinery/requests_console/directional/north{ @@ -76798,6 +150041,28 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) +<<<<<<< HEAD +======= +"wTL" = ( +/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/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wTX" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -76805,11 +150070,24 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "wUb" = ( /obj/structure/rack, /obj/item/poster/random_contraband, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +======= +"wUf" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/hallway/secondary/entry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wUi" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Stbd"; @@ -76823,6 +150101,16 @@ "wUj" = ( /turf/closed/wall, /area/station/service/lawoffice) +<<<<<<< HEAD +======= +"wUm" = ( +/obj/machinery/vatgrower{ + dir = 4 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wUt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76854,11 +150142,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +<<<<<<< HEAD "wUD" = ( /obj/structure/fake_stairs/wood/directional/north, /obj/effect/mapping_helpers/no_atoms_ontop, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +"wUB" = ( +/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/effect/turf_decal/siding/wood, +/obj/structure/chair/stool/bar/directional/north, +/turf/open/floor/eighties, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wUJ" = ( /obj/machinery/computer/atmos_alert, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -76917,6 +150219,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/central/greater) +<<<<<<< HEAD +======= +"wVd" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/duct, +/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/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wVe" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -76926,6 +150247,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/service/library) +<<<<<<< HEAD "wVq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76935,6 +150257,15 @@ /obj/structure/sign/warning/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +======= +"wVr" = ( +/obj/structure/mineral_door/wood{ + name = "Maintenance Bar"; + dir = 4 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wVu" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -76968,6 +150299,7 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +<<<<<<< HEAD "wVI" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -76985,6 +150317,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wWa" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -76998,6 +150332,7 @@ /obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "wWB" = ( /obj/structure/chair/plastic{ dir = 8 @@ -77005,6 +150340,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +======= +"wWo" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/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/starboard/fore) +"wWw" = ( +/obj/structure/fence{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wWM" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -77034,6 +150384,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"wXb" = ( +/obj/machinery/firealarm/directional/west, +/turf/open/openspace, +/area/station/service/bar/atrium) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wXh" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ dir = 8 @@ -77041,10 +150398,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/cryo) +<<<<<<< HEAD "wXn" = ( /obj/structure/flora/grass/both/style_3, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wXR" = ( /obj/structure/table, /obj/item/storage/medkit/regular{ @@ -77082,10 +150442,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +<<<<<<< HEAD "wYp" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/ice, /area/icemoon/underground/explored) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wYq" = ( /obj/machinery/door/airlock{ name = "Perma Overlook Closet" @@ -77116,6 +150479,19 @@ /obj/machinery/requests_console/auto_name/directional/north, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) +<<<<<<< HEAD +======= +"wYH" = ( +/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/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wYJ" = ( /turf/closed/wall, /area/station/engineering/storage_shared) @@ -77125,6 +150501,15 @@ }, /turf/open/floor/plating, /area/station/security/courtroom) +<<<<<<< HEAD +======= +"wYS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wYZ" = ( /obj/structure/disposalpipe/junction/flip{ dir = 1 @@ -77136,6 +150521,7 @@ "wZj" = ( /turf/open/floor/iron/dark/textured, /area/station/security/warden) +<<<<<<< HEAD "wZp" = ( /obj/item/storage/toolbox/electrical{ pixel_x = 4; @@ -77162,6 +150548,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wZr" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -77172,6 +150560,7 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/chemistry) +<<<<<<< HEAD "wZv" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -77185,6 +150574,20 @@ /obj/structure/sign/xenobio_guide/directional/north, /turf/open/floor/iron/white, /area/station/science/xenobiology) +======= +"wZu" = ( +/obj/vehicle/ridden/wheelchair{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/end{ + dir = 1 + }, +/obj/item/radio/intercom/directional/west, +/obj/structure/disposalpipe/segment, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron, +/area/station/medical/medbay/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wZD" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -77198,11 +150601,43 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD +======= +"wZW" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/rack, +/obj/item/clothing/accessory/armband/hydro{ + pixel_y = 4; + pixel_x = 2 + }, +/obj/item/clothing/accessory/armband/hydro, +/obj/item/toy/figure/botanist, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xad" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/structure/cable, /turf/open/floor/plating, /area/station/security/range) +<<<<<<< HEAD +======= +"xaf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xal" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -77245,6 +150680,25 @@ /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"xax" = ( +/obj/machinery/photocopier, +/obj/machinery/button/door/directional/north{ + id = "heads_meeting"; + name = "Security Shutters" + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"xay" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/station/service/bar/backroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xaA" = ( /obj/structure/closet/secure_closet/hop, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -77302,6 +150756,14 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +<<<<<<< HEAD +======= +"xbq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xbr" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -77326,9 +150788,27 @@ /turf/open/floor/iron/freezer, /area/mine/eva/lower) "xbB" = ( +<<<<<<< HEAD /obj/machinery/gibber, /turf/open/misc/asteroid/snow/coldroom, /area/station/service/kitchen/coldroom) +======= +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/shower/directional/south, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/fluff/shower_drain, +/obj/effect/turf_decal/stripes/white/end, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Pharmacy"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xbC" = ( /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, /obj/machinery/meter, @@ -77348,6 +150828,15 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"xcf" = ( +/obj/structure/closet/crate/grave/filled, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xcp" = ( /obj/item/trash/pistachios, /turf/open/floor/plating, @@ -77378,6 +150867,7 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +<<<<<<< HEAD "xcO" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/status_display/ai/directional/north, @@ -77388,6 +150878,8 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/station/service/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xcW" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ dir = 1 @@ -77411,16 +150903,38 @@ /obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "xdk" = ( /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/smooth_large, /area/station/science/cytology) +======= +"xdh" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/stairs/north, +/turf/open/floor/iron/stairs/medium, +/area/station/commons/dorms/laundry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xdl" = ( /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/storage) +<<<<<<< HEAD +======= +"xds" = ( +/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/plating, +/area/station/maintenance/starboard/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xdH" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/chair{ @@ -77431,10 +150945,13 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "xdM" = ( /obj/structure/sign/warning/cold_temp, /turf/closed/wall, /area/station/hallway/secondary/exit/departure_lounge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xdU" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1 @@ -77448,21 +150965,27 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "xdY" = ( /obj/structure/sign/warning/directional/west, /turf/open/genturf/blue, /area/icemoon/underground/unexplored/rivers/deep/shoreline) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xdZ" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 }, /turf/open/floor/iron/dark/textured, /area/station/security/prison/rec) +<<<<<<< HEAD "xea" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xeg" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/asteroid/snow/icemoon, @@ -77481,10 +151004,47 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +<<<<<<< HEAD +======= +"xer" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rnd2"; + name = "Research Lab Shutters" + }, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/lab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xex" = ( /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/station/command/teleporter) +<<<<<<< HEAD +======= +"xeF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xeH" = ( /obj/machinery/airalarm/directional/west, /turf/open/floor/wood, @@ -77550,10 +151110,46 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"xfp" = ( +/obj/structure/table, +/obj/item/multitool/circuit{ + pixel_x = -8 + }, +/obj/item/multitool/circuit{ + pixel_x = -4 + }, +/obj/item/multitool/circuit, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xft" = ( /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"xfv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xfB" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, @@ -77562,6 +151158,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ name = "Testing Lab Maintenance" +<<<<<<< HEAD }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -77645,6 +151242,101 @@ "xgy" = ( /turf/open/openspace, /area/station/service/hydroponics) +======= + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"xfM" = ( +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "Exfiltrate to Waste" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) +"xfZ" = ( +/obj/structure/flora/bush/snow/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xgc" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/security/armory/upper) +"xgg" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_y = 9 + }, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/effect/turf_decal/delivery/red, +/obj/item/clothing/gloves/color/grey/protects_cold, +/obj/item/clothing/mask/gas, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/textured, +/area/station/ai_monitored/command/storage/eva) +"xgi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"xgm" = ( +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_x = -31; + pixel_y = -32 + }, +/obj/structure/sign/directions/engineering{ + pixel_x = -31; + pixel_y = -40 + }, +/obj/structure/sign/directions/security{ + dir = 4; + pixel_x = -31; + pixel_y = -24 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xgy" = ( +/turf/open/openspace, +/area/station/service/hydroponics) +"xgF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/railing{ + dir = 6 + }, +/obj/structure/table, +/obj/item/assembly/signaler{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stack/cable_coil, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/ordnance/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xgI" = ( /obj/structure/sign/warning/secure_area{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -77705,6 +151397,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/blue, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "xhg" = ( /obj/machinery/camera/directional/east{ c_tag = "Garden" @@ -77713,6 +151406,8 @@ /obj/structure/water_source/puddle, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xhk" = ( /turf/open/floor/iron/dark, /area/station/commons/storage/primary) @@ -77752,6 +151447,19 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD +======= +"xhA" = ( +/obj/structure/fence/door/opened, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xhD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77764,6 +151472,13 @@ "xhK" = ( /turf/closed/wall/r_wall, /area/station/security/prison/safe) +<<<<<<< HEAD +======= +"xhV" = ( +/obj/machinery/duct, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xie" = ( /obj/machinery/camera/directional/west{ c_tag = "Engineering MiniSat Access" @@ -77775,6 +151490,7 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +<<<<<<< HEAD "xij" = ( /obj/structure/railing{ dir = 1 @@ -77783,6 +151499,25 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) +======= +"xiq" = ( +/obj/machinery/computer/security/telescreen/interrogation/directional/north, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/security/processing) +"xir" = ( +/obj/item/radio/intercom/prison/directional/north, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/light_switch/directional/north{ + pixel_x = 16 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/brig/entrance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xit" = ( /obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, @@ -77804,6 +151539,17 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +<<<<<<< HEAD +======= +"xiL" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/sink/kitchen/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xiO" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -77829,10 +151575,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/large, /area/station/medical/medbay/lobby) +<<<<<<< HEAD "xjg" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, /area/station/medical/medbay/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xjm" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/camera/directional/north{ @@ -77841,17 +151590,21 @@ /obj/vehicle/ridden/janicart, /turf/open/floor/iron, /area/station/service/janitor) +<<<<<<< HEAD "xjs" = ( /obj/structure/railing/corner/end{ dir = 8 }, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xjC" = ( /turf/open/floor/plating, /area/station/maintenance/department/cargo) "xjF" = ( /obj/item/radio/intercom/directional/west, +<<<<<<< HEAD /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -77872,10 +151625,33 @@ dir = 8 }, /obj/structure/disposalpipe/trunk{ +======= +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"xjO" = ( +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) +"xjP" = ( +/obj/machinery/disposal/delivery_chute{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 1 }, /turf/open/floor/plating, /area/station/cargo/sorting) +<<<<<<< HEAD "xjU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -78021,6 +151797,156 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +======= +"xjT" = ( +/obj/structure/table, +/obj/item/storage/medkit/regular, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness) +"xjZ" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/iron/dark, +/area/mine/eva) +"xke" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"xkr" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"xkI" = ( +/obj/machinery/door/airlock/command{ + name = "Conference Room" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"xkW" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"xkZ" = ( +/obj/machinery/teleport/station, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) +"xlh" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Medbay Delivery"; + req_access = list("medical") + }, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/large, +/area/station/medical/storage) +"xlm" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xlq" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"xlx" = ( +/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 = 10 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/office) +"xlA" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"xlC" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/security/lockers) +"xlH" = ( +/obj/effect/mapping_helpers/broken_floor, +/mob/living/basic/mouse/white{ + desc = "This mouse smells faintly of alcohol."; + name = "Mik" + }, +/turf/open/floor/wood, +/area/station/maintenance/fore) +"xlN" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint2" + }, +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"xmf" = ( +/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/white/side{ + dir = 9 + }, +/area/station/science/research) +"xmk" = ( +/obj/structure/plasticflaps{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"xmo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/maintenance/port/fore) "xmx" = ( @@ -78028,6 +151954,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +<<<<<<< HEAD +======= +"xmD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xmK" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -78038,6 +151977,7 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage) +<<<<<<< HEAD "xmL" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, @@ -78049,6 +151989,16 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +======= +"xmM" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xmN" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom/directional/south, @@ -78082,6 +152032,7 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "xnc" = ( /obj/effect/turf_decal/siding/white/end{ dir = 4 @@ -78096,12 +152047,15 @@ /obj/item/kirbyplants/fern, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xni" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +<<<<<<< HEAD "xnt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -78116,6 +152070,8 @@ }, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xnE" = ( /obj/machinery/duct, /obj/effect/turf_decal/tile/yellow{ @@ -78123,6 +152079,19 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"xnK" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/sign/warning/gas_mask/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xnM" = ( /obj/structure/cable, /turf/open/floor/iron/white/side{ @@ -78150,18 +152119,37 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +<<<<<<< HEAD "xog" = ( /obj/structure/fence{ dir = 1 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xow" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) +<<<<<<< HEAD +======= +"xpc" = ( +/obj/effect/turf_decal/siding/yellow/corner, +/obj/machinery/status_display/evac/directional/south, +/obj/structure/table, +/obj/item/flatpack{ + board = /obj/item/circuitboard/machine/flatpacker; + pixel_x = -5 + }, +/obj/item/multitool{ + pixel_x = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xpw" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -78198,6 +152186,7 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) +<<<<<<< HEAD "xpO" = ( /obj/structure/grille, /obj/structure/window/reinforced/spawner/directional/west, @@ -78208,6 +152197,8 @@ }, /turf/open/floor/plating, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xpP" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -78216,6 +152207,7 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +<<<<<<< HEAD "xqa" = ( /obj/structure/railing{ dir = 4 @@ -78230,12 +152222,46 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/service/kitchen/coldroom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xqj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/greater) +<<<<<<< HEAD +======= +"xqk" = ( +/obj/machinery/door/airlock{ + name = "Bar"; + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/bar) +"xqt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/landmark/event_spawn, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/stone, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xqu" = ( /obj/machinery/door/window/left/directional/east{ name = "Containment Pen 10"; @@ -78248,12 +152274,25 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"xqw" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Exfiltrate to Port" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xqy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/office) +<<<<<<< HEAD "xqP" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/siding/white{ @@ -78261,6 +152300,22 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness) +======= +"xqU" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchencounter"; + name = "Kitchen Counter Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = -4; + pixel_y = 3 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xqX" = ( /obj/structure/sign/poster/contraband/random/directional/north, /obj/structure/cable, @@ -78278,6 +152333,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +<<<<<<< HEAD "xre" = ( /obj/structure/table/glass, /obj/machinery/door/window/left/directional/north{ @@ -78297,6 +152353,8 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xrf" = ( /obj/structure/railing, /obj/structure/cable, @@ -78340,6 +152398,7 @@ }, /turf/open/floor/iron/dark, /area/mine/storage) +<<<<<<< HEAD "xrL" = ( /obj/machinery/washing_machine, /obj/structure/sign/poster/official/no_erp/directional/west, @@ -78351,6 +152410,8 @@ }, /turf/open/floor/iron, /area/station/commons/dorms/laundry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xrS" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/box, @@ -78361,12 +152422,15 @@ /obj/machinery/light/blacklight/directional/east, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "xsm" = ( /obj/structure/cable, /obj/machinery/duct, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xss" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -78383,6 +152447,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plating, /area/station/engineering/storage/tech) +<<<<<<< HEAD "xsy" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -78405,6 +152470,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xtc" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -78412,6 +152479,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +<<<<<<< HEAD "xte" = ( /obj/structure/railing/corner/end/flip{ dir = 4 @@ -78421,6 +152489,14 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +======= +"xth" = ( +/obj/structure/closet/crate/miningcar, +/obj/effect/spawner/random/exotic/snow_gear, +/obj/effect/spawner/random/exotic/snow_gear, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xtn" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -78446,6 +152522,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/prison/workout) +<<<<<<< HEAD "xtH" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -78549,6 +152626,1767 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/cafeteria{ dir = 5 +======= +"xtQ" = ( +/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/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"xua" = ( +/obj/machinery/computer/security/qm, +/obj/machinery/requests_console/directional/west{ + department = "Quartermaster's Desk"; + name = "Quartermaster's Desk Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/sign/poster/official/work_for_a_future/directional/north, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +"xug" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/stairs/medium, +/area/station/cargo/storage) +"xul" = ( +/obj/structure/table/glass, +/obj/machinery/door/window/left/directional/north{ + name = "Hydroponics Desk"; + req_access = list("hydroponics") + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"xuo" = ( +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"xur" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/xenobiology) +"xuA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) +"xuB" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/effect/turf_decal/tile/dark/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/mine/living_quarters) +"xuJ" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"xuL" = ( +/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/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"xuR" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xuW" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/station/hallway/secondary/entry) +"xvd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/obj/structure/sign/warning/cold_temp/directional/north, +/turf/open/openspace/icemoon/keep_below, +/area/station/maintenance/port/lesser) +"xvj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xvk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/blobstart, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"xvl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"xvn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/start/chemist, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) +"xvp" = ( +/obj/structure/fence/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) +"xvy" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"xvE" = ( +/obj/item/toy/snowball{ + pixel_x = 6; + pixel_y = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"xvI" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"xvN" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/obj/structure/sign/departments/botany/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"xvU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"xvZ" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"xwc" = ( +/obj/effect/landmark/blobstart, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"xwf" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"xwi" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +"xwm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"xwp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xwq" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"xwr" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_y = 9 + }, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/effect/turf_decal/delivery/red, +/obj/item/clothing/gloves/color/grey/protects_cold, +/obj/item/clothing/mask/gas, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/textured, +/area/station/ai_monitored/command/storage/eva) +"xws" = ( +/obj/structure/table, +/obj/machinery/light/small/directional/north, +/obj/item/folder{ + pixel_x = 3 + }, +/obj/item/phone{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"xwu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/virology/glass{ + name = "Monkey Pen" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/turf/open/floor/iron/dark, +/area/station/medical/virology) +"xwx" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"xwz" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"xwC" = ( +/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, +/area/station/hallway/primary/central) +"xwE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"xwM" = ( +/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/maintenance/aft/greater) +"xxg" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"xxi" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/acidic_buffer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/basic_buffer{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/formaldehyde{ + pixel_x = 1 + }, +/obj/structure/sign/warning/no_smoking/circle/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"xxs" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/reagent_dispensers/plumbed, +/obj/effect/turf_decal/siding/yellow/corner, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/large, +/area/station/engineering/atmos) +"xxv" = ( +/obj/effect/turf_decal/arrows, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/maintenance/starboard/aft) +"xxx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +"xxB" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xxC" = ( +/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - HFR South" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"xxI" = ( +/obj/machinery/airalarm/directional/north, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/entry) +"xxQ" = ( +/obj/structure/table, +/obj/item/screwdriver{ + pixel_y = 16 + }, +/obj/item/wirecutters, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"xxV" = ( +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"xyc" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/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/medical/medbay/aft) +"xyd" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "rd_office_shutters"; + name = "Privacy Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/detectives_office) +"xyl" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/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, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"xyr" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) +"xyx" = ( +/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 = 6 + }, +/turf/open/floor/iron/smooth_large, +/area/station/command/heads_quarters/hos) +"xyy" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/treatment_center) +"xyz" = ( +/obj/machinery/light_switch/directional/north{ + pixel_x = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/depsec/science, +/obj/machinery/button/door/directional/north{ + id = "Biohazard"; + name = "Biohazard Shutter Control"; + pixel_x = -6; + req_access = list("research") + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"xyE" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/engine, +/area/station/science/genetics) +"xyI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/white, +/area/station/science/ordnance) +"xyN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/commons/storage/mining) +"xyO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/meter/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"xyS" = ( +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/security/processing) +"xyT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"xyU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"xza" = ( +/obj/vehicle/ridden/wheelchair{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/end, +/obj/structure/sign/warning/no_smoking/circle/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/west, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/medical/medbay/aft) +"xzd" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Library South" + }, +/obj/structure/displaycase/trophy, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/wood/parquet, +/area/station/service/library) +"xzh" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xzk" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/wallet{ + pixel_y = 5; + pixel_x = 3 + }, +/obj/item/newspaper, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"xzo" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"xzp" = ( +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/mine/laborcamp/security) +"xzH" = ( +/obj/structure/grille/broken, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"xzO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance/three, +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) +"xzT" = ( +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) +"xAk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/entry) +"xAn" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"xAs" = ( +/turf/closed/wall/r_wall, +/area/icemoon/surface/outdoors/nospawn) +"xAy" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/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) +"xAW" = ( +/obj/machinery/door/airlock/security{ + name = "Cafeteria" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/mess) +"xAY" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/sign/departments/court/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"xBa" = ( +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_y = 5 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/explab) +"xBf" = ( +/obj/item/book/manual/wiki/barman_recipes{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/rag, +/obj/structure/table/wood, +/obj/item/holosign_creator/robot_seat/bar{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/bar) +"xBj" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/machinery/door/airlock{ + name = "Bar" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/bar) +"xBn" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"xBp" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"xBt" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"xBv" = ( +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) +"xBL" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Solar Maintenance - North East Access" + }, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"xBN" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/storage/gas) +"xBU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"xCl" = ( +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"xCo" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"xCr" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms/laundry) +"xCs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/departments/aisat/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) +"xCv" = ( +/obj/machinery/computer/security, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/station/command/bridge) +"xCz" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"xCD" = ( +/turf/open/floor/iron/smooth, +/area/mine/living_quarters) +"xCF" = ( +/obj/machinery/nuclearbomb/beer, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"xCQ" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"xDa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"xDb" = ( +/turf/closed/wall/r_wall, +/area/station/medical/virology) +"xDe" = ( +/obj/structure/chair, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"xDh" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Locker Room West" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) +"xDj" = ( +/obj/effect/turf_decal/trimline/yellow/end{ + dir = 1 + }, +/obj/machinery/exodrone_launcher, +/obj/item/fuel_pellet, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/mid_joiner{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "drone_bay"; + name = "Shutter Control" + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/drone_bay) +"xDu" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Cargo Bay Receiving Dock" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/computer/cargo{ + dir = 4 + }, +/obj/machinery/button/door/directional/west{ + id = "QMLoaddoor"; + name = "Loading Doors"; + pixel_y = -8; + req_access = list("cargo") + }, +/obj/machinery/button/door/directional/west{ + id = "QMLoaddoor2"; + name = "Loading Doors"; + pixel_y = 8; + req_access = list("cargo") + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xDw" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"xDG" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"xDK" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/iron, +/area/station/security/prison/workout) +"xDU" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/drugs, +/obj/item/poster/random_contraband, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/department/medical/morgue) +"xDX" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/chem_dispenser, +/obj/structure/sign/warning/chem_diamond/directional/north, +/turf/open/floor/glass/reinforced, +/area/station/medical/treatment_center) +"xEb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"xEd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/evidence) +"xEh" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation A" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/effect/turf_decal/tile/green/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/virology) +"xEn" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xEE" = ( +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"xEF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"xEI" = ( +/obj/machinery/door/airlock/security{ + name = "Private Cell" + }, +/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/carpet/black, +/area/station/security/prison/safe) +"xEV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"xEW" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/mine/living_quarters) +"xEX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Apiary" + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/service/hydroponics) +"xFf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"xFm" = ( +/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, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"xFn" = ( +/obj/structure/fence/cut/large{ + dir = 2 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xFo" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"xFs" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"xFB" = ( +/obj/structure/table, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 5 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 2; + pixel_y = -1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) +"xGp" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/east{ + name = "Atmospherics Desk"; + req_access = list("atmospherics") + }, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/effect/turf_decal/delivery, +/obj/item/wrench, +/obj/item/crowbar, +/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, +/area/station/engineering/atmos/storage/gas) +"xGt" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"xGx" = ( +/obj/structure/disposalpipe/junction{ + dir = 2 + }, +/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/maintenance/starboard/upper) +"xGA" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/server) +"xGI" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xGJ" = ( +/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, +/area/station/commons/storage/mining) +"xGK" = ( +/obj/machinery/computer/mecha{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Research Director's Office"; + network = list("ss13","rd") + }, +/obj/machinery/light/directional/south, +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"xGL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"xGM" = ( +/obj/machinery/computer/atmos_control/carbon_tank{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xGX" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Trial Transfer" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/security/courtroom) +"xHe" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"xHf" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"xHq" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Entrance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brigentrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/turf/open/floor/iron, +/area/station/security/brig/upper) +"xHr" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"xHx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/recharge_station, +/turf/open/floor/plating, +/area/mine/eva/lower) +"xId" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/eva{ + pixel_y = 9 + }, +/obj/item/clothing/shoes/winterboots/ice_boots/eva{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/effect/turf_decal/delivery/red, +/obj/item/clothing/gloves/color/grey/protects_cold, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron/textured, +/area/station/ai_monitored/command/storage/eva) +"xIk" = ( +/obj/structure/chair/comfy{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/carpet, +/area/station/security/processing) +"xIp" = ( +/obj/structure/closet/secure_closet/brig, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Transport" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/security/processing) +"xIz" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/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/neutral/warning{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/station/ai_monitored/command/storage/eva) +"xIF" = ( +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/server) +"xIO" = ( +/obj/machinery/light/small/dim/directional/east, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/commons/lounge) +"xIS" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xIW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"xJj" = ( +/turf/open/floor/iron, +/area/station/science/xenobiology) +"xJn" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"xJv" = ( +/obj/structure/rack, +/obj/item/screwdriver, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"xJw" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics Project Room" + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"xJD" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"xJG" = ( +/obj/machinery/light/directional/east, +/turf/open/openspace, +/area/station/science/xenobiology) +"xJH" = ( +/obj/machinery/button/door/directional/east{ + id = "Atmospherics HFR Shutters"; + name = "Atmospherics HFR Shutters"; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) +"xJJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"xJT" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xKb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/command/gateway) +"xKd" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"xKe" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"xKj" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"xKk" = ( +/obj/structure/sign/plaques/kiddie/gameoflife{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"xKo" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) +"xKq" = ( +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xKx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner/end/flip, +/obj/structure/railing/corner/end{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"xKJ" = ( +/turf/closed/wall, +/area/station/command/meeting_room) +"xKX" = ( +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) +"xKY" = ( +/obj/effect/turf_decal/bot, +/obj/effect/landmark/secequipment, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Office" + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/textured_half, +/area/station/security/office) +"xLq" = ( +/turf/open/floor/glass/reinforced, +/area/station/science/ordnance/office) +"xLv" = ( +/obj/structure/stairs/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"xLF" = ( +/obj/machinery/door/window/right/directional/east{ + name = "Captain's Desk Door"; + req_access = list("captain") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +"xLJ" = ( +/obj/structure/rack, +/obj/item/mecha_parts/mecha_equipment/drill, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) +"xLK" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"xLS" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xLT" = ( +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xLV" = ( +/obj/machinery/washing_machine, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) +"xMh" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/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) +"xMQ" = ( +/obj/effect/mapping_helpers/ianbirthday, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"xMR" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"xMT" = ( +/turf/closed/wall, +/area/station/science/research) +"xMW" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/structure/table, +/obj/item/shovel, +/obj/item/storage/box/emptysandbags, +/turf/open/floor/iron, +/area/station/command/gateway) +"xMX" = ( +/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/smooth_half, +/area/station/ai_monitored/command/storage/eva) +"xNh" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "Cargo_Store_In"; + name = "Cargo Warehouse Shutters" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "Cargo_Store_In"; + name = "Warehouse Access" + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"xNs" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/fakemoustache, +/obj/item/cigarette/pipe, +/obj/item/clothing/glasses/monocle, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/grimy, +/area/station/service/theater) +"xNC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"xNF" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Dorm"; + location = "HOP2" + }, +/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, +/area/station/hallway/primary/central) +"xNR" = ( +/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/smooth_large, +/area/station/science/cytology) +"xOb" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/door/window/right/directional/east{ + name = "Airlock" + }, +/turf/open/floor/iron/dark, +/area/mine/mechbay) +"xOc" = ( +/obj/machinery/light/cold/directional/west, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"xOk" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xOQ" = ( +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external/glass{ + name = "Garden Access" + }, +/turf/open/floor/iron/textured, +/area/station/service/hydroponics) +"xPs" = ( +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external/glass{ + name = "Cytology External Airlock" + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) +"xPu" = ( +/obj/machinery/light/directional/east, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"xPv" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) +"xPF" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/sign/nanotrasen, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xPI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"xPN" = ( +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/janitor) +"xPT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xPV" = ( +/obj/machinery/computer/arcade/battle{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison/work) +"xPW" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Holodeck - North"; + name = "holodeck camera" + }, +/turf/open/floor/engine{ + name = "Holodeck Projector Floor" + }, +/area/station/holodeck/rec_center) +"xQf" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) +"xQg" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L13" + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xQh" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/machinery/light/small/directional/east, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"xQi" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/minecart_rail/railbreak{ + dir = 4 + }, +/obj/structure/closet/crate/miningcar{ + name = "delivery cart"; + desc = "Used for quick transit of fresh produce to the kitchen. Just give it a shove." + }, +/obj/item/storage/bag/plants, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xQj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"xQm" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/closet/secure_closet/freezer/fridge/all_access, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/mess) +"xQs" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/auxiliary) +"xQB" = ( +/obj/effect/spawner/random/clothing/costume, +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"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) +"xQK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/floor/iron, +/area/mine/production) +"xQT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/plating, +/area/station/medical/virology) +"xQU" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"xRv" = ( +/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/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"xRw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"xRI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) +"xRP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/eighties/red, +/area/station/security/prison/safe) +"xRZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xSg" = ( +/obj/structure/cable, +/obj/structure/sign/warning/test_chamber/directional/north, +/turf/open/floor/iron, +/area/station/science/explab) +"xSl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"xSn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/brig) +"xSv" = ( +/obj/structure/closet/firecloset, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) +"xSx" = ( +/obj/structure/closet/secure_closet/chemical, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /area/station/hallway/secondary/entry) "xvj" = ( @@ -78570,6 +154408,7 @@ /obj/structure/cable, /obj/effect/landmark/blobstart, /obj/effect/decal/cleanable/dirt, +<<<<<<< HEAD /turf/open/floor/plating, /area/station/maintenance/port/greater) "xvl" = ( @@ -80189,6 +156028,28 @@ /obj/machinery/camera/directional/south{ c_tag = "Solar Maintenance - North East" }, +======= +/turf/open/floor/iron/white, +/area/station/maintenance/port/fore) +"xSA" = ( +/turf/open/floor/wood, +/area/station/service/lawoffice) +"xSE" = ( +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xSL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/primary/port) +"xTp" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Solar Maintenance - North East" + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/power/smes, /obj/structure/cable, /turf/open/floor/plating, @@ -80206,6 +156067,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +<<<<<<< HEAD "xTI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -80216,6 +156078,29 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/commons/fitness) +======= +"xTN" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/warm/directional/south, +/obj/structure/sign/poster/contraband/lizard/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xTQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -80249,12 +156134,105 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"xUd" = ( +/obj/structure/marker_beacon/burgundy, +/obj/structure/fluff/fokoff_sign, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xUe" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "xUf" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ +<<<<<<< HEAD +======= + dir = 4 + }, +/turf/open/floor/plating, +/area/station/medical/morgue) +"xUg" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xUk" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/science/ordnance/office) +"xUF" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal) +"xUG" = ( +/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 = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"xUH" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/engine/cult, +/area/station/service/library) +"xUP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) +"xUS" = ( +/obj/structure/rack, +/obj/item/pickaxe{ + pixel_x = 5 + }, +/obj/item/shovel{ + pixel_x = -5 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"xUU" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"xUV" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xUW" = ( +/obj/effect/spawner/random/trash/mess, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 4 }, /turf/open/floor/plating, @@ -80372,6 +156350,73 @@ pixel_y = 4 }, /turf/open/floor/wood, +<<<<<<< HEAD +======= +/area/station/maintenance/aft/greater) +"xVc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/command/bridge) +"xVf" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) +"xVo" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/bowl{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"xVq" = ( +/obj/machinery/light/directional/north, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/wood, +/area/station/command/meeting_room) +"xVv" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway Center" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"xVB" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"xVG" = ( +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"xVK" = ( +/turf/closed/wall, +/area/station/service/janitor) +"xVN" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"xVO" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/mug/coco{ + desc = "Still hot!"; + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/wood, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/space_hut/cabin) "xVT" = ( /obj/structure/railing{ @@ -80379,6 +156424,7 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD "xVX" = ( /obj/structure/closet/crate, /obj/machinery/light/small/directional/south, @@ -80392,6 +156438,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +======= +"xVZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/white, /area/station/medical/virology) "xWb" = ( @@ -80399,11 +156451,27 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/security/warden) +<<<<<<< HEAD +======= +"xWk" = ( +/obj/machinery/biogenerator, +/obj/machinery/door/window/left/directional/south{ + name = "Biogenerator Access"; + req_access = list("hydroponics") + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xWo" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "xWA" = ( /obj/structure/table, /obj/item/plate, @@ -80419,6 +156487,11 @@ dir = 8; id = "kitchencounter"; name = "Kitchen Counter Shutters" +======= +"xWr" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Service - Electrical Maintenace Upper" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/machinery/door/firedoor, /turf/open/floor/iron/white/smooth_large, @@ -80427,6 +156500,24 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +<<<<<<< HEAD +======= +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/starboard/fore) +"xWA" = ( +/obj/structure/table, +/obj/item/plate, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"xWG" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"xWM" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "xWN" = ( @@ -80435,12 +156526,18 @@ /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) "xWT" = ( +<<<<<<< HEAD /obj/machinery/firealarm/directional/south, /obj/structure/closet/crate/freezer/surplus_limbs, +======= +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/machinery/light_switch/directional/south, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/white, /area/station/medical/cryo) "xWU" = ( /obj/structure/railing{ +<<<<<<< HEAD dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -80469,6 +156566,36 @@ /turf/open/floor/iron/white/corner{ dir = 1 }, +======= + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"xXd" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Laundry Room" + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"xXf" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/engineering/atmos/storage/gas) "xXk" = ( /obj/structure/railing, @@ -80496,6 +156623,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "xXE" = ( /obj/structure/chair/pew{ dir = 1 @@ -80503,6 +156631,8 @@ /obj/structure/cable, /turf/open/floor/iron/chapel, /area/station/service/chapel) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xXQ" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -80512,6 +156642,7 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +<<<<<<< HEAD "xXU" = ( /obj/machinery/camera/directional/east{ c_tag = "Library Art Gallery" @@ -80659,6 +156790,173 @@ /area/station/science/robotics/lab) "yas" = ( /obj/structure/disposalpipe/segment{ +======= +"xYg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"xYj" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) +"xYt" = ( +/obj/machinery/atmospherics/components/unary/passive_vent, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xYw" = ( +/obj/structure/flora/bush/leavy/style_random, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"xYA" = ( +/obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"xYI" = ( +/obj/machinery/telecomms/server/presets/science, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"xYO" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"xYQ" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"xYS" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south{ + pixel_x = -28 + }, +/obj/effect/turf_decal/tile/dark/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"xYT" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/iron/smooth, +/area/mine/eva) +"xZl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/main) +"xZq" = ( +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"xZv" = ( +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"xZy" = ( +/obj/structure/stairs/east, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) +"xZA" = ( +/turf/open/floor/iron/checker, +/area/station/science/lab) +"xZS" = ( +/obj/effect/spawner/random/trash/moisture_trap, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"xZW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/psychology) +"xZX" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"yab" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Dormitories Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"yah" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/transport/linear{ + radial_travel = 0 + }, +/obj/structure/railing{ + dir = 5 + }, +/obj/machinery/elevator_control_panel/directional/north{ + linked_elevator_id = "publicElevator"; + preset_destination_names = list("3"="Icemoon Level","4"="Station Level") + }, +/turf/open/floor/plating/elevatorshaft, +/area/mine/storage) +"yan" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +"yar" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "robotics"; + name = "Robotics Lab Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"yas" = ( +/obj/structure/disposalpipe/segment{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 4 }, /obj/machinery/camera/directional/south{ @@ -80690,12 +156988,28 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD +======= +"yaF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yaG" = ( /obj/effect/landmark/navigate_destination/chapel, /turf/open/floor/iron/dark/side{ dir = 1 }, /area/station/hallway/primary/starboard) +<<<<<<< HEAD "yaJ" = ( /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 4 @@ -80705,6 +157019,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yaL" = ( /turf/closed/wall/r_wall, /area/station/engineering/engine_smes) @@ -80719,6 +157035,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/mess) +<<<<<<< HEAD "ybe" = ( /obj/structure/rack, /obj/item/soap{ @@ -80734,6 +157051,21 @@ /area/station/science/cytology) "ybf" = ( /obj/machinery/portable_atmospherics/pump, +======= +"ybb" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ybf" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/box, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/dark, /area/station/science/ordnance/office) "ybq" = ( @@ -80746,6 +157078,7 @@ dir = 4 }, /area/station/engineering/transit_tube) +<<<<<<< HEAD "ybr" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -80755,6 +157088,8 @@ }, /turf/open/floor/engine/cult, /area/station/service/library) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ybu" = ( /obj/structure/chair/stool/directional/north, /turf/open/floor/wood, @@ -80770,6 +157105,20 @@ /obj/effect/decal/cleanable/insectguts, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"ybC" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/closet/emcloset, +/obj/structure/sign/warning/gas_mask/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ybE" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -80781,11 +157130,14 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +<<<<<<< HEAD "ybF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ybI" = ( /obj/structure/bed/dogbed/ian, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -80815,6 +157167,15 @@ "ybQ" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/nuke_storage) +<<<<<<< HEAD +======= +"ybY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/cigbutt, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yca" = ( /obj/machinery/door/airlock/maintenance{ name = "Mining Station Maintenance" @@ -80848,6 +157209,7 @@ /area/station/hallway/secondary/entry) "ycB" = ( /obj/effect/spawner/structure/window, +<<<<<<< HEAD /turf/open/floor/plating, /area/station/engineering/storage) "ycE" = ( @@ -81195,6 +157557,375 @@ /obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, +======= +/turf/open/floor/plating, +/area/station/engineering/storage) +"ycO" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ycQ" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"ycS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ycY" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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/maintenance/department/medical/morgue) +"ydc" = ( +/obj/structure/sign/warning/pods/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/tank_holder/oxygen/yellow, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"ydg" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) +"ydh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table_frame, +/obj/item/melee/baton/security/cattleprod, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ydk" = ( +/obj/machinery/computer/security/mining, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"ydt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison/mess) +"ydu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) +"ydA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/obj/effect/decal/cleanable/crayon{ + pixel_x = -5; + pixel_y = -5 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) +"ydI" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/secondary/entry) +"ydN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"yef" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/suit_storage_unit/industrial/loader, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) +"yeh" = ( +/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/mining{ + name = "Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/cargo/miningdock) +"yel" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"yep" = ( +/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/mine/production) +"yev" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/commons/storage/mining) +"yeB" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"yeC" = ( +/turf/open/floor/iron, +/area/station/science/explab) +"yeD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix Bypass" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"yeF" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/service/library) +"yfa" = ( +/obj/structure/sink/directional/west, +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "xenobio10"; + name = "Xenobio Pen 10 Blast DOors"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"yfg" = ( +/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/structure/railing, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"yfs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/structure/minecart_rail{ + dir = 1 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) +"yfz" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"yfF" = ( +/obj/structure/flora/grass/green/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"yfW" = ( +/obj/structure/fence/post{ + dir = 8 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ygd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"ygf" = ( +/obj/structure/bookcase{ + name = "Forbidden Knowledge" + }, +/obj/structure/sign/painting/library_private{ + pixel_x = -32 + }, +/turf/open/floor/engine/cult, +/area/station/service/library) +"ygk" = ( +/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/plating, +/area/station/maintenance/port/fore) +"ygl" = ( +/turf/open/floor/plating, +/area/station/engineering/atmos) +"ygm" = ( +/obj/structure/closet/emcloset, +/obj/structure/sign/warning/electric_shock/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ygv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/command/gateway) +"ygA" = ( +/obj/machinery/light/small/directional/south, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored/graveyard) +"ygB" = ( +/turf/closed/wall, +/area/station/commons/dorms) +"ygF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"ygL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/crate, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"ygM" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig/upper) +"ygS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/extinguisher, +/obj/item/clothing/suit/utility/fire/firefighter, +/obj/item/clothing/head/utility/hardhat/red, +/obj/item/clothing/mask/gas, +/obj/item/clothing/glasses/meson, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"yhe" = ( +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"yhn" = ( +/obj/structure/rack, +/obj/item/crowbar, +/obj/item/picket_sign, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"yhw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) +"yhU" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/work) +"yhY" = ( +/obj/structure/fence/end{ + dir = 2 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) +"yia" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"yib" = ( +/obj/structure/flora/rock/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/unexplored/rivers/deep/shoreline) +"yiv" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"yiz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) +"yiK" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"yiL" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/security/armory) +"yiR" = ( +/obj/structure/sign/warning/cold_temp/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"yjh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) +"yjn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"yju" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/port/aft) "yjA" = ( /obj/structure/cable, @@ -81205,11 +157936,14 @@ }, /turf/open/floor/plating, /area/station/science/xenobiology) +<<<<<<< HEAD "yjF" = ( /obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yjV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -81225,6 +157959,19 @@ dir = 4 }, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"ykd" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ykw" = ( /turf/closed/wall/r_wall, /area/station/security/processing) @@ -81233,10 +157980,13 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +<<<<<<< HEAD "ykE" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ykG" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -81255,12 +158005,22 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +<<<<<<< HEAD "ylt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /obj/structure/sign/poster/official/safety_internals/directional/east, /obj/structure/sign/poster/official/safety_internals/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +"yld" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/structure/sign/departments/cargo/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ylz" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/neutral/warning, @@ -81275,6 +158035,7 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) +<<<<<<< HEAD "ylF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -81285,6 +158046,18 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +======= +"ylL" = ( +/obj/machinery/flasher/directional/north{ + id = "Cell 3" + }, +/obj/structure/bed{ + dir = 1; + pixel_x = -2 + }, +/turf/open/floor/iron/smooth, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ylM" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -81299,6 +158072,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) +<<<<<<< HEAD "ylQ" = ( /obj/machinery/door/airlock/maintenance{ name = "Cytology Maintenance" @@ -81306,6 +158080,8 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ylU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -81322,6 +158098,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "ymb" = ( /obj/structure/railing/corner{ dir = 4 @@ -81339,6 +158116,25 @@ dir = 1 }, /area/mine/eva/lower) +======= +"ymf" = ( +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/obj/item/kirbyplants/organic/plant11, +/turf/open/floor/stone, +/area/station/service/bar/atrium) +"ymj" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/sign/departments/evac/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 (1,1,1) = {" oSU @@ -97685,6 +174481,7 @@ sYA ghx ghx ghx +<<<<<<< HEAD vXO hMz ghx @@ -97693,6 +174490,16 @@ psb scw scw jSy +======= +ohO +hMz +ghx +ghx +psb +dmw +scw +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq xMq @@ -97945,13 +174752,21 @@ ghx isU ghx ghx +<<<<<<< HEAD hMz +======= +ghx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hUy dZS xuo scw iDt +<<<<<<< HEAD qau +======= +bNC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -98208,8 +175023,13 @@ stA xuo xuo xuo +<<<<<<< HEAD nqv thA +======= +qau +dMn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -98963,7 +175783,11 @@ ghx ghx ghx ndA +<<<<<<< HEAD mSH +======= +pWp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ngM kgN wDU @@ -98971,7 +175795,11 @@ sKo sKo sKo wDU +<<<<<<< HEAD kUP +======= +tdI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 okH qSq ghx @@ -99218,13 +176046,22 @@ ghx ghx ghx cpt +<<<<<<< HEAD dLH kIX +======= +wPG +ckL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xuo xuo qlU wDU +<<<<<<< HEAD roa +======= +hDe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wRN qPX wDU @@ -99474,8 +176311,13 @@ ghx ghx ghx iDt +<<<<<<< HEAD aNc xuo +======= +ewo +eIv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xuo xuo xuo @@ -99731,16 +176573,26 @@ thA thA thA iDt +<<<<<<< HEAD sxe +======= +jRi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xuo xuo qJT wDU tbX qmt +<<<<<<< HEAD nAa qLQ vBg +======= +mct +qLQ +dtR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qmt tbX wDU @@ -99993,13 +176845,21 @@ xuo xuo xuo dBY +<<<<<<< HEAD moc +======= +mnm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tGi kBX fdp qiF dBY +<<<<<<< HEAD moc +======= +mnm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tGi xuo xuo @@ -100245,16 +177105,28 @@ thA thA thA iDt +<<<<<<< HEAD sxe xuo qJT +======= +jRi +xuo +coe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wDU qmt qmt qmt +<<<<<<< HEAD jpi tYz gle +======= +uJd +tYz +soq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qmt qmt qmt @@ -100263,7 +177135,11 @@ tbX tbX wDU wDU +<<<<<<< HEAD ghx +======= +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -100504,7 +177380,11 @@ thA iDt psb rxz +<<<<<<< HEAD qlU +======= +gFX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wDU aNw qmt @@ -100759,10 +177639,17 @@ thA thA thA iDt +<<<<<<< HEAD xuo wDU wDU qmt +======= +txm +wDU +wDU +ijV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nfr kLa giV @@ -100771,7 +177658,11 @@ eVa gSO tmE qmt +<<<<<<< HEAD iBd +======= +nbs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 chO doM ezl @@ -101016,6 +177907,7 @@ thA thA thA iDt +<<<<<<< HEAD xuo wDU krn @@ -101024,6 +177916,16 @@ nfr qmt qmt ymb +======= +txm +wDU +krn +rFh +qmt +qmt +qmt +nGY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eVa rnx fYH @@ -101273,6 +178175,7 @@ thA thA thA iDt +<<<<<<< HEAD xuo wDU uqz @@ -101280,12 +178183,25 @@ kTF nfr qmt iVm +======= +txm +wDU +uqz +kTF +qmt +pVg +ubG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xlA eVa gSO uPt qmt +<<<<<<< HEAD aQy +======= +opy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fLC dLe wzl @@ -101535,9 +178451,15 @@ qmt qmt kLa qmt +<<<<<<< HEAD qmt sAa qKk +======= +vlF +kyM +vzG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wbH lIR uUT @@ -101548,7 +178470,11 @@ uUT uUT uUT wDU +<<<<<<< HEAD scw +======= +mrk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx thA @@ -101791,10 +178717,17 @@ wDU btB gfw nfr +<<<<<<< HEAD igq qmt qmt gSK +======= +qmt +qmt +qmt +bcs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tYz vTb rmB @@ -102013,10 +178946,17 @@ ghx ghx ghx psb +<<<<<<< HEAD fSd hUK gqG thA +======= +iYq +hUK +psb +lGf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -102047,7 +178987,11 @@ iDt wDU uqz bRC +<<<<<<< HEAD nfr +======= +tIM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jAu qmt ofz @@ -102303,7 +179247,11 @@ thA iDt wDU ljP +<<<<<<< HEAD uqz +======= +xHx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bQN tnb qmt @@ -102824,6 +179772,7 @@ vfp niN eSY uyq +<<<<<<< HEAD gdS uUT bzJ @@ -102831,6 +179780,15 @@ srZ jla ebv mXD +======= +hDv +uUT +dPH +srZ +jla +ebv +xLJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nUi scw iDt @@ -103004,7 +179962,11 @@ thA thA thA rfu +<<<<<<< HEAD ghx +======= +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -103079,9 +180041,15 @@ dga scw dga niN +<<<<<<< HEAD qqn uyq xVX +======= +vxx +uyq +bTM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uUT uUT vlS @@ -103089,7 +180057,11 @@ hex uUT iwf iwf +<<<<<<< HEAD wkV +======= +xvp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt ghx @@ -103330,8 +180302,13 @@ thA ipf cCb iDt +<<<<<<< HEAD mJZ iDt +======= +jai +wkB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw scw @@ -103340,6 +180317,7 @@ bfo sZO wDU iwf +<<<<<<< HEAD cEh dNA weg @@ -103348,6 +180326,16 @@ lQw fWX nqv iDt +======= +oXF +dNA +dNA +iwf +lQw +fWX +kLd +wkB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt ghx thA @@ -103553,11 +180541,19 @@ thA thA thA xuo +<<<<<<< HEAD wYp odW uWw psb ghx +======= +psb +mIe +uWw +psb +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -103587,7 +180583,11 @@ thA thA thA iDt +<<<<<<< HEAD rcY +======= +aDG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt scw scw @@ -103603,7 +180603,11 @@ gvc iwf unv wrV +<<<<<<< HEAD qau +======= +bNC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt cCb ghx @@ -103844,7 +180848,11 @@ thA thA thA iDt +<<<<<<< HEAD rcY +======= +aDG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -103859,8 +180867,13 @@ cPd hYP aro agI +<<<<<<< HEAD scw qau +======= +iDt +bNC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt thA @@ -104101,7 +181114,11 @@ thA thA thA iDt +<<<<<<< HEAD rcY +======= +bNC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -104110,6 +181127,7 @@ scw scw scw scw +<<<<<<< HEAD mJZ iDt scw @@ -104117,6 +181135,15 @@ scw rcY iDt scw +======= +jai +wkB +scw +scw +jai +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qau iDt iDt @@ -104358,6 +181385,7 @@ thA thA thA iDt +<<<<<<< HEAD syw kNC kNC @@ -104375,6 +181403,25 @@ syw tej tej gIl +======= +gsd +jTf +aKb +aKb +aKb +aKb +aKb +nvB +jTf +kOt +scw +iDt +iDt +gsd +jTf +syG +pCG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt thA thA @@ -104806,7 +181853,11 @@ uOb rfu omJ rfu +<<<<<<< HEAD pjj +======= +kOc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 daf kmH oBz @@ -105055,10 +182106,17 @@ amx fXO lBR nhg +<<<<<<< HEAD gnR lBR nhg qrq +======= +scb +lBR +nhg +mbe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lBR kIo hap @@ -105136,7 +182194,11 @@ thA thA thA thA +<<<<<<< HEAD thA +======= +iYD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA iDt @@ -105580,7 +182642,11 @@ rfu ooW ooW rfu +<<<<<<< HEAD xuo +======= +jrv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xuo xlq ghx @@ -106082,7 +183148,11 @@ ifZ amx ddz lBR +<<<<<<< HEAD fIb +======= +vzp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fnj egz hsr @@ -106602,7 +183672,11 @@ kqh kqh ttD nNn +<<<<<<< HEAD sxT +======= +urm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKB foO bdo @@ -106843,11 +183917,19 @@ ghx ghx ghx ghx +<<<<<<< HEAD gBl uSb uSb uSb gBl +======= +fIt +uSb +uSb +uSb +fIt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uOb uOb lBR @@ -106869,7 +183951,11 @@ kIi rfu rfu rfu +<<<<<<< HEAD ghx +======= +akn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -107107,6 +184193,7 @@ tWK tWK tWK xhK +<<<<<<< HEAD tsK jGg vVH @@ -107114,6 +184201,15 @@ krV ogL jZI duI +======= +tnD +jGg +vVH +gkN +ogL +jZI +aHw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vVH vVH vVH @@ -107122,9 +184218,15 @@ nNn gzV nNn nNn +<<<<<<< HEAD axb tCV cFc +======= +evP +bVs +dgx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mJX ghx ghx @@ -107138,8 +184240,13 @@ ghx ghx ghx ghx +<<<<<<< HEAD lcA ghx +======= +psb +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -107367,10 +184474,17 @@ xby dSm hMS vVH +<<<<<<< HEAD uoS wPg fHg eek +======= +nGo +wPg +fHg +mkb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vVH fps usS @@ -107636,7 +184750,11 @@ vUs kqR hjQ nNn +<<<<<<< HEAD scQ +======= +eCg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aJu ong mJX @@ -108156,17 +185274,28 @@ puc kGP sEC dbH +<<<<<<< HEAD +======= +akn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx ghx ghx ghx +<<<<<<< HEAD ghx lcA psb psb lcA +======= +psb +psb +psb +psb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -108390,9 +185519,15 @@ ghx ghx ghx eZz +<<<<<<< HEAD efi xhK nCQ +======= +uOs +xhK +nGd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 swf vVH jli @@ -108420,7 +185555,11 @@ ghx ghx ghx ghx +<<<<<<< HEAD rcY +======= +pJm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt thA thA @@ -108647,7 +185786,11 @@ ghx ghx ghx iDt +<<<<<<< HEAD nbP +======= +fgN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xhK ikb swf @@ -108677,7 +185820,11 @@ ghx ghx ghx ghx +<<<<<<< HEAD rcY +======= +pJm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt thA thA @@ -108912,9 +186059,15 @@ vVH vVH dZW fHg +<<<<<<< HEAD lJS bol oSD +======= +ayS +aze +lsn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ldH xQm yaZ @@ -108934,8 +186087,13 @@ ghx ghx ghx ghx +<<<<<<< HEAD lcA iDt +======= +psb +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -109169,9 +186327,15 @@ nId myQ sby fHg +<<<<<<< HEAD bol bol oSD +======= +aEY +oad +gAV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ldH qiJ qTs @@ -110191,7 +187355,11 @@ ghx ghx axF dcw +<<<<<<< HEAD fGI +======= +sKT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sSl etw lXJ @@ -110212,7 +187380,11 @@ iJr vSK kse dbH +<<<<<<< HEAD ghx +======= +akn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -110477,7 +187649,11 @@ ghx ghx ghx psb +<<<<<<< HEAD iDt +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -110985,7 +188161,11 @@ psb psb psb fIt +<<<<<<< HEAD ghx +======= +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -111192,10 +188372,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq dhq dhq dhq +======= +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dhq dhq dhq @@ -111447,8 +188634,13 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt +======= +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt scw @@ -111463,8 +188655,13 @@ iDt scw scw iDt +<<<<<<< HEAD iDt ghx +======= +fIt +tvk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -111476,7 +188673,11 @@ ghx ghx ghx dcw +<<<<<<< HEAD bDd +======= +cdp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hBF owf bkX @@ -111703,9 +188904,15 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt +======= +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw scw @@ -111720,7 +188927,11 @@ scw scw scw scw +<<<<<<< HEAD iDt +======= +iwV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -111960,9 +189171,15 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt +======= +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw scw @@ -111977,7 +189194,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD scw +======= +gem +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -112001,7 +189222,11 @@ thA uPk jYj uAE +<<<<<<< HEAD dKS +======= +eni +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dbH dbH dbH @@ -112013,7 +189238,11 @@ psb psb psb fIt +<<<<<<< HEAD ghx +======= +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -112215,11 +189444,19 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt scw @@ -112234,7 +189471,11 @@ scw scw scw scw +<<<<<<< HEAD iDt +======= +iwV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -112471,12 +189712,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt scw @@ -112491,7 +189741,11 @@ scw scw scw iDt +<<<<<<< HEAD iDt +======= +iwV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -112728,12 +189982,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt scw @@ -112748,7 +190011,11 @@ scw scw scw scw +<<<<<<< HEAD iDt +======= +iwV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -112985,12 +190252,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +fKw +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt scw @@ -113005,7 +190281,11 @@ scw scw iDt scw +<<<<<<< HEAD iDt +======= +iwV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -113242,12 +190522,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt scw @@ -113262,7 +190551,11 @@ scw iDt scw iDt +<<<<<<< HEAD iDt +======= +iwV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -113499,12 +190792,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +fKw +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw iDt @@ -113519,7 +190821,11 @@ scw scw iDt scw +<<<<<<< HEAD scw +======= +gem +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -113545,7 +190851,11 @@ oXd bJp qdl uPk +<<<<<<< HEAD scw +======= +ltH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -113756,12 +191066,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +fKw +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt scw iDt @@ -113776,7 +191095,11 @@ scw scw iDt iDt +<<<<<<< HEAD iDt +======= +iwV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -113802,7 +191125,11 @@ uPk uPk uPk uPk +<<<<<<< HEAD ghx +======= +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -114013,12 +191340,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh dLN dLN @@ -114031,10 +191367,17 @@ vjh vjh uPl vjh +<<<<<<< HEAD ghx ghx ghx ghx +======= +hMv +qxN +fIt +tvk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -114270,12 +191613,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +fKw +fKw +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh dqx oDg @@ -114288,13 +191640,21 @@ wAQ njJ kcf vjh +<<<<<<< HEAD +======= +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx ghx ghx ghx +<<<<<<< HEAD ghx +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -114302,7 +191662,10 @@ iDt iDt iDt xMq +<<<<<<< HEAD xMq +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -114527,12 +191890,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh szu hdV @@ -114558,7 +191930,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD xMq +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq thA @@ -114784,9 +192160,15 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt +======= +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN dLN dLN @@ -114798,8 +192180,13 @@ dqx njJ cVD njJ +<<<<<<< HEAD eCz oFp +======= +hpl +dqx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dqx vjh nTO @@ -114811,14 +192198,22 @@ eQT eQT eQT nTO +<<<<<<< HEAD +======= +kXf +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt xMq xMq +<<<<<<< HEAD xMq xMq +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -115040,10 +192435,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt +======= +iZz +iZz +iZz +fKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN wxg ipd @@ -115068,15 +192470,26 @@ kAG pdc xzp iSf +<<<<<<< HEAD dBw +======= +faV +iDt +iDt +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt xMq +<<<<<<< HEAD xMq xMq xMq xMq +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -115296,11 +192709,19 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt xMx +======= +iZz +iZz +iZz +fKw +oIv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh pRZ uYj @@ -115327,14 +192748,24 @@ jvM nTO nTO nTO +<<<<<<< HEAD nJm +======= +fqG +iDt +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt xMq xMq xMq +<<<<<<< HEAD xMq xMq xMq +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -115551,6 +192982,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt @@ -115558,6 +192990,15 @@ iDt iDt iDt lCM +======= +iZz +iZz +iZz +iZz +iZz +fKw +lxY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh aYQ bLL @@ -115586,8 +193027,13 @@ tmB kCH iDt iDt +<<<<<<< HEAD xMq xMq +======= +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq thA @@ -115807,11 +193253,19 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN dLN dLN @@ -115823,10 +193277,17 @@ njJ bEi rVX dqx +<<<<<<< HEAD pSn cCF iAA wDs +======= +qJC +pzx +bqz +tXM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh vjh vjh @@ -115841,10 +193302,17 @@ aWV nTO nTO nTO +<<<<<<< HEAD iDt iDt xMq xMq +======= +kXf +iDt +iDt +xMq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -116064,17 +193532,29 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +fKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN bml msi njJ pDI +<<<<<<< HEAD bxX +======= +wdX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wzn njJ mZJ @@ -116100,7 +193580,11 @@ cRE eQT iDt iDt +<<<<<<< HEAD xMq +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq thA thA @@ -116321,26 +193805,45 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +fKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN uCk tAL njJ +<<<<<<< HEAD lWy +======= +mPp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jlG rQx duS lmK rVX fez +<<<<<<< HEAD lxn bVY whz sbO +======= +rqR +maM +aWo +ddK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh drP czD @@ -116357,7 +193860,11 @@ rmv eQT iDt iDt +<<<<<<< HEAD xMq +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq thA thA @@ -116578,11 +194085,19 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +fKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN sWo kmA @@ -116613,7 +194128,11 @@ iGj nTO nTO nTO +<<<<<<< HEAD iDt +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq thA @@ -116835,11 +194354,19 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt iDt +======= +iZz +iZz +iZz +fKw +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh sWo njJ @@ -117091,12 +194618,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq iDt iDt iDt iDt aVq +======= +iZz +iZz +iZz +iZz +fKw +myW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh sWo njJ @@ -117120,7 +194656,11 @@ eQT eQT eQT nTO +<<<<<<< HEAD ghx +======= +akn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt nTO kJw @@ -117348,12 +194888,21 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq iDt iDt iDt iDt aVq +======= +iZz +iZz +iZz +iZz +iZz +myW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh mYi njJ @@ -117605,6 +195154,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq iDt iDt @@ -117613,6 +195163,16 @@ vjh vjh vjh fXP +======= +iZz +iZz +iZz +bqf +vjh +vjh +vjh +nZC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eQH hDK dqx @@ -117621,7 +195181,11 @@ dqx rXg njJ uTo +<<<<<<< HEAD dqx +======= +cCG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 njJ rKs hLk @@ -117641,7 +195205,11 @@ cpe cpe nTO nTO +<<<<<<< HEAD iDt +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq thA @@ -117862,10 +195430,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq iDt iDt iDt +======= +iZz +iZz +fKw +fKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aqa oDB nhT @@ -118119,10 +195694,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq iDt iDt qXg +======= +iZz +iZz +iZz +bqf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh vjh vjh @@ -118154,7 +195736,11 @@ nTO nTO nTO nTO +<<<<<<< HEAD iDt +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt xMq xMq @@ -118376,11 +195962,19 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq iDt iDt iDt uEA +======= +iZz +iZz +iZz +iZz +mbq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN hlE dqx @@ -118392,7 +195986,11 @@ kpH dqx njJ isc +<<<<<<< HEAD dqx +======= +mEb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 njJ bsd fBs @@ -118634,10 +196232,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt +======= +iZz +mBV +iZz +fKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN dqx dqx @@ -118670,7 +196275,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD xMq +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq thA thA @@ -118891,10 +196500,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt ssu iDt +======= +iZz +iZz +nxP +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN rbT mts @@ -118905,13 +196521,22 @@ njJ njJ wRK vjh +<<<<<<< HEAD twb pzD +======= +oCo +dFR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vjh vjh vjh vjh +<<<<<<< HEAD ghx +======= +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -118927,7 +196552,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD xMq +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq thA thA @@ -119148,10 +196777,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt +======= +iZz +iZz +mBV +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN rbT lLN @@ -119165,6 +196801,7 @@ vjh jmc qDD dLN +<<<<<<< HEAD iDt iDt ghx @@ -119178,6 +196815,22 @@ ghx ghx ghx iDt +======= +uqX +adA +etz +ghx +ghx +ghx +ghx +ghx +ghx +ghx +ghx +ghx +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -119186,7 +196839,10 @@ iDt iDt xMq xMq +<<<<<<< HEAD xMq +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -119405,10 +197061,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dLN dLN dLN @@ -119422,8 +197085,13 @@ vjh dLN dLN dLN +<<<<<<< HEAD iDt iDt +======= +fKw +mzl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -119662,6 +197330,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt @@ -119681,6 +197350,27 @@ iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +fKw +iZz +iZz +iZz +iZz +oGJ +iZz +iZz +iZz +iZz +iZz +fKw +fKw +iZz +mzl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -119692,9 +197382,15 @@ ghx ghx ghx iDt +<<<<<<< HEAD xMq xMq xMq +======= +iDt +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq xMq @@ -119919,6 +197615,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt @@ -119938,6 +197635,27 @@ iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +mzl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -119949,7 +197667,11 @@ ghx ghx ghx iDt +<<<<<<< HEAD xMq +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq xMq @@ -120176,6 +197898,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt dhq @@ -120195,6 +197918,27 @@ iDt iDt iDt iDt +======= +iZz +iZz +dhq +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +mzl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -120437,6 +198181,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt @@ -120452,6 +198197,23 @@ iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +mzl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -120694,6 +198456,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD iDt iDt iDt @@ -120709,6 +198472,23 @@ iDt iDt iDt iDt +======= +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +iZz +mzl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -120828,7 +198608,11 @@ oSU szG szG iDt +<<<<<<< HEAD daZ +======= +tla +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt szG oSU @@ -120957,6 +198741,7 @@ dhq dhq dhq dhq +<<<<<<< HEAD dhq dhq dhq @@ -120967,6 +198752,18 @@ dhq dhq dhq ghx +======= +iZz +iZz +iZz +iZz +iZz +dhq +dhq +dhq +adA +etz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -128256,7 +206053,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD fIt +======= +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -128507,13 +206308,22 @@ oSU oSU oSU xMq +<<<<<<< HEAD cbu +======= +wUm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt +<<<<<<< HEAD iLP fIt +======= +gwW +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -128764,13 +206574,21 @@ oSU iDt iDt xMq +<<<<<<< HEAD cbu +======= +wUm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt mrI +<<<<<<< HEAD fIt +======= +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -129019,15 +206837,24 @@ oSU oSU iDt iDt +<<<<<<< HEAD jZN rcY +======= +xYQ +aKb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt iDt scw +<<<<<<< HEAD fIt +======= +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -129282,9 +207109,15 @@ iDt iDt iDt iDt +<<<<<<< HEAD qjs fIt fIt +======= +hWz +bwh +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -129533,16 +207366,26 @@ oSU iDt iDt iDt +<<<<<<< HEAD jZN rcY +======= +xYQ +pJm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt iDt iDt +<<<<<<< HEAD fIt fIt +======= +bwh +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -129688,10 +207531,17 @@ dhq dhq dhq dhq +<<<<<<< HEAD iZz iZz iZz iZz +======= +iDt +iDt +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -129799,8 +207649,13 @@ iDt iDt iDt iDt +<<<<<<< HEAD fIt fIt +======= +bwh +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -129946,8 +207801,13 @@ dhq dhq dhq dhq +<<<<<<< HEAD iZz iZz +======= +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -130057,7 +207917,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD fIt +======= +bwh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -130203,7 +208067,11 @@ dhq dhq dhq dhq +<<<<<<< HEAD iZz +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -130313,6 +208181,11 @@ xMq xMq xMq xMq +<<<<<<< HEAD +======= +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq oSU @@ -130424,8 +208297,11 @@ oSU oSU oSU oSU +<<<<<<< HEAD oSU oSU +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (192,1,1) = {" dhq @@ -130571,11 +208447,19 @@ oSU oSU oSU oSU +<<<<<<< HEAD oSU oSU oSU oSU oSU +======= +iDt +scw +scw +scw +xMq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -130829,11 +208713,19 @@ oSU oSU oSU oSU +<<<<<<< HEAD oSU oSU oSU oSU oSU +======= +iDt +scw +wme +scw +xMq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -131086,11 +208978,19 @@ oSU oSU oSU oSU +<<<<<<< HEAD oSU oSU oSU oSU oSU +======= +xMq +iDt +scw +scw +xMq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -131344,8 +209244,13 @@ oSU oSU oSU oSU +<<<<<<< HEAD oSU oSU +======= +xMq +xMq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSU oSU oSU @@ -132764,8 +210669,13 @@ dhq dhq dhq dhq +<<<<<<< HEAD iZz iZz +======= +iDt +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -133021,7 +210931,11 @@ dhq dhq dhq dhq +<<<<<<< HEAD iZz +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -133278,7 +211192,11 @@ dhq dhq dhq dhq +<<<<<<< HEAD iZz +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -133535,7 +211453,11 @@ dhq dhq dhq dhq +<<<<<<< HEAD iZz +======= +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ghx ghx ghx @@ -159372,7 +237294,11 @@ rex rNc icu rOB +<<<<<<< HEAD rcx +======= +dKk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ksi sJH lwR @@ -159613,17 +237539,29 @@ thA thA thA thA +<<<<<<< HEAD oif eJf eJf eJf keu +======= +gFX +pFv +eJf +eJf +faL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf eJf eJf lwR sJH +<<<<<<< HEAD irM +======= +gps +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 veK tUC fjQ @@ -159632,10 +237570,17 @@ xuB jkn jkn iyE +<<<<<<< HEAD ncO vAj lwR iDt +======= +qAP +cHA +lwR +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt iDt @@ -160146,7 +238091,11 @@ drD jkn jkn sEq +<<<<<<< HEAD vZS +======= +boU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aez sEq scw @@ -160400,7 +238349,11 @@ sJH oLs xaV diV +<<<<<<< HEAD ebK +======= +uJi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uzs sJH tUK @@ -161657,7 +239610,11 @@ thA thA thA thA +<<<<<<< HEAD thA +======= +lGf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA gjq @@ -161938,7 +239895,11 @@ gjq gjq gjq bOz +<<<<<<< HEAD aVp +======= +ouq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icB sGE diV @@ -162170,8 +240131,13 @@ thA thA szG szG +<<<<<<< HEAD oif thA +======= +gFX +lGf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -163198,13 +241164,22 @@ szG szG myZ eJf +<<<<<<< HEAD keu +======= +faL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf eJf eJf eJf +<<<<<<< HEAD oif szG +======= +gFX +wjA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -163460,14 +241435,24 @@ gjq gjq gjq gFX +<<<<<<< HEAD szG +======= +wjA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 szG gjq gjq gjq +<<<<<<< HEAD mTW gjq mTW +======= +ocS +gjq +ocS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -163697,6 +241682,7 @@ thA iLh jqj aiA +<<<<<<< HEAD wVq dcW kjt @@ -163705,6 +241691,16 @@ kUU hSt tKq sGM +======= +msu +dcW +kjt +wGZ +kUU +hSt +tKq +fqM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 haD lrz iLh @@ -163736,24 +241732,41 @@ gjq gjq gjq gjq +<<<<<<< HEAD keu +======= +faL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf cMk yep cMk eJf +<<<<<<< HEAD keu +======= +faL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf eJf eJf eJf +<<<<<<< HEAD keu +======= +faL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf eJf eJf eJf +<<<<<<< HEAD oif iDt +======= +gFX +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pfw thA thA @@ -163952,7 +241965,11 @@ thA thA thA iLh +<<<<<<< HEAD gAd +======= +tkT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ukd iLh aBX @@ -163967,7 +241984,11 @@ iLh iLh iwS iwS +<<<<<<< HEAD sbf +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt scw @@ -164215,16 +242236,28 @@ ini dwo eKN oQt +<<<<<<< HEAD ydH +======= +hTI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wUu xrs iLh vad +<<<<<<< HEAD kMP wMw hoZ iwS iDt +======= +wjP +wMw +hoZ +iwS +ixl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -164235,7 +242268,11 @@ gjq gjq gjq gjq +<<<<<<< HEAD mUf +======= +daO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aFG hZe xuo @@ -164469,14 +242506,22 @@ iLh hYb iLh iLh +<<<<<<< HEAD fGJ +======= +xvd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nAg fkt oQt xrs ilD iLh +<<<<<<< HEAD pog +======= +hIW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qPs xCr wds @@ -164499,6 +242544,7 @@ nia sjb hpM sjb +<<<<<<< HEAD eJf eJf eJf @@ -164507,6 +242553,16 @@ gQe gQe gQe nzG +======= +pFv +eJf +eJf +uBy +avs +avs +avs +aGR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf gjq gOU @@ -164718,7 +242774,11 @@ thA thA thA iDt +<<<<<<< HEAD kcW +======= +thA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ivF ivF xUF @@ -164733,8 +242793,13 @@ iLh iLh iLh iLh +<<<<<<< HEAD xkH oeB +======= +qPb +jSN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qxI sTh qMo @@ -164743,6 +242808,7 @@ cCb iDt iDt scw +<<<<<<< HEAD oif eJf eJf @@ -164753,17 +242819,37 @@ sjb khF oFZ jVx +======= +gFX +pFv +eJf +faL +eJf +pfg +sjb +gRg +oFZ +cew +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wQr kvf sjb gjq gjq gjq +<<<<<<< HEAD mrI scw jAv scw gem +======= +bUS +scw +jAv +scw +kNC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf gjq gOU @@ -164979,8 +243065,13 @@ iDt snd kkA erw +<<<<<<< HEAD wrl aOa +======= +abQ +cGS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhb aSC cQi @@ -164989,6 +243080,7 @@ ivF sqb gVm iwS +<<<<<<< HEAD iJM dNl qxI @@ -164996,6 +243088,15 @@ qxI rVC qMo iDt +======= +wPJ +qVK +bpq +qxI +rVC +qMo +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt ijY iDt @@ -165007,7 +243108,11 @@ gjq gjq gjq sjb +<<<<<<< HEAD sjx +======= +xDj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xgO rHk wQr @@ -165246,6 +243351,7 @@ ivF pcc fdX iwS +<<<<<<< HEAD iJM dNl qxI @@ -165253,6 +243359,15 @@ qxI coT qMo iDt +======= +xdh +otf +bYR +qxI +coT +qMo +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -165267,8 +243382,13 @@ sjb qEu jIX sgV +<<<<<<< HEAD vpl tQE +======= +cEl +rES +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vSi qLm qLm @@ -165276,7 +243396,11 @@ qLm vSi bie bie +<<<<<<< HEAD vzI +======= +cMk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bie bie cMk @@ -165287,11 +243411,19 @@ cMk eJf eJf eJf +<<<<<<< HEAD keu eJf eJf oif pfw +======= +faL +eJf +eJf +gFX +rYA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ebd iDt iDt @@ -165493,8 +243625,13 @@ scw snd hJp hby +<<<<<<< HEAD czz xYr +======= +nxY +fHV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jwB bIo nit @@ -165504,13 +243641,22 @@ iwS iwS iwS iwS +<<<<<<< HEAD oqj kTX +======= +tiX +ogu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iJL dwI qMo iDt +<<<<<<< HEAD iDt +======= +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt ebd @@ -165524,17 +243670,28 @@ cum mzr bgU quY +<<<<<<< HEAD nbU +======= +fvj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vSi vSi vdb mzu rDn vSi +<<<<<<< HEAD tKf lkY kZu qmT +======= +tEO +qDA +kZu +bKE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vpc kZu aYM @@ -165757,9 +243914,15 @@ tHX nit eZK ivF +<<<<<<< HEAD ktp lIU xrL +======= +smp +hkI +ktp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iwS sFd iuH @@ -165771,7 +243934,11 @@ gJK iwS wkB iDt +<<<<<<< HEAD jZN +======= +xYQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -165785,8 +243952,13 @@ jzy pve xjZ bGP +<<<<<<< HEAD mIT gsF +======= +hqv +sYz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vSi kZu uOf @@ -166002,13 +244174,22 @@ gjq gjq gjq gjq +<<<<<<< HEAD nfG qbU +======= +ppY +wEu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ivF jwH jwH jwH +<<<<<<< HEAD jHV +======= +pLS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aLz jul oRE @@ -166038,7 +244219,11 @@ sjb puX uig hPK +<<<<<<< HEAD ukv +======= +ilz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pve hEm ksn @@ -166263,7 +244448,11 @@ gjq scw hyj slX +<<<<<<< HEAD kwT +======= +oXx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ceY kbq sLR @@ -166278,9 +244467,15 @@ nlO nlO gwz nMH +<<<<<<< HEAD ciH iwS fpC +======= +jHh +iwS +gDh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 szX qMo iDt @@ -166293,7 +244488,11 @@ gjq sjb wQr wQr +<<<<<<< HEAD pcj +======= +cxI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wVe wQr vSi @@ -166517,7 +244716,11 @@ gjq gjq gjq gjq +<<<<<<< HEAD qsq +======= +gpo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ivF ivF ivF @@ -166528,11 +244731,19 @@ jnR jnR ivF ivF +<<<<<<< HEAD nRx pEg uyW iwS kDm +======= +eat +pEg +uyW +iwS +lJg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ePn oDV iqn @@ -166548,22 +244759,37 @@ gjq gjq gjq iYt +<<<<<<< HEAD dbi unM +======= +slh +dhV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lNH bit iQK kXr hVI gDN +<<<<<<< HEAD pZD uhs +======= +hSe +nyR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pve vSi kZu pAT +<<<<<<< HEAD xlQ lCA +======= +lYd +jCV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kZu jrQ qud @@ -166574,7 +244800,11 @@ hFL hFL nWH gnh +<<<<<<< HEAD iDt +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -166779,11 +245009,19 @@ gjq iDt iDt iDt +<<<<<<< HEAD mdV scw scw iDt xdY +======= +iDt +scw +scw +iDt +thA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iwS iwS iwS @@ -166795,7 +245033,11 @@ iwS iwS iwS iwS +<<<<<<< HEAD dYq +======= +lRn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qMo iDt scw @@ -166805,16 +245047,27 @@ gjq gjq gjq dLf +<<<<<<< HEAD vfg bQA hKT +======= +iem +xug +rTZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cHZ gaq kXr oGF ksn +<<<<<<< HEAD pZD ghQ +======= +nJL +kUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kUD kUD nWH @@ -166823,8 +245076,13 @@ nWH nWH nWH mHe +<<<<<<< HEAD dAq adm +======= +sPE +ceF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dTF nWH qeP @@ -166986,21 +245244,34 @@ thA thA thA thA +<<<<<<< HEAD kSw +======= +fIt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq xMq xMq xMq +<<<<<<< HEAD kSw +======= +fIt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cek cek uCN cek cek cek +<<<<<<< HEAD kSw thA +======= +fIt +sGw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -167054,7 +245325,11 @@ thA iwS rBM iwS +<<<<<<< HEAD iDt +======= +nyh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw gjq gjq @@ -167062,16 +245337,26 @@ gjq gjq gjq dLf +<<<<<<< HEAD vfg ajw +======= +gYd +vRn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rty lNH eMa hrJ wmT gDN +<<<<<<< HEAD lvT wSX +======= +bGn +kUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kUD kUD nWH @@ -167310,7 +245595,11 @@ thA thA scw scw +<<<<<<< HEAD xUw +======= +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt gjq gjq @@ -167319,17 +245608,29 @@ gjq gjq gjq dLf +<<<<<<< HEAD vfg ajw vjM +======= +mGH +eOJ +vAr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bff lNH kix aOf yaD +<<<<<<< HEAD wmb lEt eMO +======= +vvU +mtV +itf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nWH nWH oha @@ -167506,15 +245807,24 @@ hPs gBX gBX gBX +<<<<<<< HEAD ktt +======= +hPs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hPs nDE nDE nDE nDE nDE +<<<<<<< HEAD bUp gjq +======= +nDE +paw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -167561,6 +245871,7 @@ gjq gjq thA thA +<<<<<<< HEAD gqG thA thA @@ -167570,6 +245881,17 @@ myZ myZ gqG gjq +======= +psb +lGf +thA +psb +eAW +myZ +myZ +psb +fhL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -167577,9 +245899,15 @@ gjq gjq iYt tDU +<<<<<<< HEAD mod bQA eIU +======= +hcT +bQA +ajw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wUP hrJ siI @@ -167602,7 +245930,11 @@ whb xjC nWH gnh +<<<<<<< HEAD iDt +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt ulj iDt @@ -167768,7 +246100,11 @@ jlF jNf dpC cGQ +<<<<<<< HEAD oNW +======= +txX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nmr hVY gjq @@ -167835,8 +246171,13 @@ gjq jpS kNW kNW +<<<<<<< HEAD wxp wxp +======= +ryl +xNh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kNW kNW kNW @@ -167848,7 +246189,11 @@ nWH nWH nWH nWH +<<<<<<< HEAD tCO +======= +eSA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jRd sbU nWH @@ -168017,8 +246362,13 @@ thA xMq iDt oqL +<<<<<<< HEAD ucD eaw +======= +wmP +vTq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jsp wSz nFU @@ -168102,6 +246452,7 @@ pZD cQw gLF wpx +<<<<<<< HEAD unT iAp til @@ -168114,6 +246465,20 @@ cvB tzE gMw ggv +======= +gLF +gee +kVN +naq +mzu +gLF +gLF +dZq +cvB +tzE +pLh +eHo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rsY urG iDt @@ -168309,7 +246674,11 @@ rVB rVB rVB qQf +<<<<<<< HEAD gjq +======= +fhL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -168528,11 +246897,19 @@ thA thA thA thA +<<<<<<< HEAD kSw iDt ktt njf rBy +======= +fIt +nbB +ktt +tmy +lvU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fAV tGs obv @@ -168589,8 +246966,13 @@ gjq gjq gjq gjq +<<<<<<< HEAD jXc eJf +======= +psb +hYM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf psb myZ @@ -168788,6 +247170,7 @@ thA xMq iDt hPs +<<<<<<< HEAD eSE mVI elU @@ -168795,6 +247178,15 @@ nZi tWO jNf tXd +======= +bVT +nPS +cKy +mLX +tWO +jNf +pSA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qSo cPE cPE @@ -168864,7 +247256,11 @@ gjq jpS kuC kII +<<<<<<< HEAD nmu +======= +rRn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clz mml kNW @@ -168886,7 +247282,11 @@ rsY qjV qjV rsY +<<<<<<< HEAD vek +======= +hNn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -169051,7 +247451,11 @@ bCp fYi tCL jNf +<<<<<<< HEAD wcz +======= +wSC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hKI fWe ozX @@ -169076,8 +247480,13 @@ ucN iDt iDt qQf +<<<<<<< HEAD kxZ mES +======= +ouK +vkC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sXk rJz pFV @@ -169103,8 +247512,13 @@ gjq gjq gjq gjq +<<<<<<< HEAD eFw eJf +======= +psb +bZC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf psb myZ @@ -169145,7 +247559,11 @@ aIB aIB dNN psb +<<<<<<< HEAD iDt +======= +fXL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sVN iDt psb @@ -169305,7 +247723,11 @@ hPs xLV xLV nvE +<<<<<<< HEAD uKJ +======= +vcx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tCL jNf fDP @@ -169320,7 +247742,11 @@ gjq wUj qLB jpy +<<<<<<< HEAD vXe +======= +cgB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ssY wUj gjq @@ -169328,7 +247754,11 @@ ucN cXZ cVk gFj +<<<<<<< HEAD vZH +======= +vtR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kgz iDt iDt @@ -169380,7 +247810,11 @@ jpS jlK jpS szJ +<<<<<<< HEAD iKp +======= +nvy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kNW rrV xGt @@ -169393,17 +247827,28 @@ uUT vgD lvQ sUE +<<<<<<< HEAD sdc mPq scw qau +======= +rsY +jcA +scw +jai +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt iDt wOR +<<<<<<< HEAD xuo +======= +txm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itY iDt thA @@ -169592,7 +248037,11 @@ iDt qQf sEk qQf +<<<<<<< HEAD uxZ +======= +aPZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dBp jZe qYb @@ -169633,9 +248082,15 @@ iDt iDt ijY iDt +<<<<<<< HEAD iDt iDt aEM +======= +aEM +iDt +jpS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gKd gKd rsY @@ -169643,7 +248098,11 @@ hdb avh qGg uUT +<<<<<<< HEAD fyT +======= +ccv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lQh diI uUT @@ -169659,7 +248118,11 @@ iDt cCb scw iDt +<<<<<<< HEAD xuo +======= +ohI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tZp iDt iDt @@ -169814,8 +248277,13 @@ iDt iDt iDt oqL +<<<<<<< HEAD gLY twx +======= +iCp +wes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ldz fvK cIc @@ -169827,8 +248295,13 @@ jNf jNf jNf jNf +<<<<<<< HEAD xZg iDt +======= +xhK +kXf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt wUj @@ -169849,6 +248322,7 @@ ijY qQf qQf qQf +<<<<<<< HEAD uPx cfi pjz @@ -169856,6 +248330,15 @@ qQf qQf qQf pfw +======= +rIz +cfi +bGS +qQf +qQf +qQf +gVN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt iDt @@ -169867,7 +248350,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -169896,9 +248383,15 @@ rcY iDt iDt rsY +<<<<<<< HEAD mqs dTs oeP +======= +avi +dTs +cxt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uUT kmO rtR @@ -169910,16 +248403,28 @@ qQt scw scw iDt +<<<<<<< HEAD nqv +======= +qau +iDt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt +<<<<<<< HEAD jSQ cmZ xuo iDt jZN +======= +cmZ +dNN +iDt +xYQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -170071,8 +248576,13 @@ iDt iDt iDt oqL +<<<<<<< HEAD gvi xCa +======= +lrM +dnz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 axX auJ oVy @@ -170112,7 +248622,11 @@ rGq gQp iUG sXe +<<<<<<< HEAD xuo +======= +vpJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170131,6 +248645,7 @@ iDt iDt iDt iDt +<<<<<<< HEAD gqG scw iDt @@ -170140,6 +248655,17 @@ aIB aIB gqG iDt +======= +psb +mrk +iDt +psb +leU +aIB +aIB +psb +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170149,10 +248675,17 @@ iDt iDt iDt cCb +<<<<<<< HEAD qau scw qXg sdc +======= +jai +nLB +qXg +rsY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rsY czq rsY @@ -170167,8 +248700,13 @@ scw scw iDt scw +<<<<<<< HEAD qau ijY +======= +jai +jwz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170327,8 +248865,13 @@ iDt ijY hPs gBX +<<<<<<< HEAD oPa cjz +======= +hPs +tcL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vdW sTP jhH @@ -170346,7 +248889,11 @@ iDt ijY pfw wUj +<<<<<<< HEAD dtq +======= +pYn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jeJ aFg vwl @@ -170367,11 +248914,19 @@ qQf ofE awn qQf +<<<<<<< HEAD mri qQf ebd iDt nfG +======= +rVB +qQf +mCz +iDt +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pfw thA thA @@ -170387,7 +248942,11 @@ thA thA thA thA +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170395,7 +248954,11 @@ iDt scw iDt iDt +<<<<<<< HEAD iDt +======= +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170406,15 +248969,24 @@ iDt iDt iDt iDt +<<<<<<< HEAD mJZ iDt scw qQt scw +======= +qau +iDt +scw +qQt +oIt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw iwf uUT +<<<<<<< HEAD afs qCY iwf @@ -170425,6 +248997,18 @@ tej tej tej kso +======= +okc +bzD +iwf +wWw +aOG +wWw +wWw +wWw +aOG +qhR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170588,12 +249172,20 @@ dck tei fTF fTF +<<<<<<< HEAD fTF +======= +dbn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cIc uTp oVY pez +<<<<<<< HEAD ccX +======= +oOg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLg vVH vVH @@ -170606,15 +249198,26 @@ ntl hwu hwu wUj +<<<<<<< HEAD wwL wUj vOw eGW +======= +vmw +wUj +vOw +jEJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dZN eGW uRk dDt +<<<<<<< HEAD dDt +======= +crf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wYh dvw dDt @@ -170643,6 +249246,7 @@ thA thA thA thA +<<<<<<< HEAD dlu dlu dlu @@ -170656,6 +249260,21 @@ qgQ rrl nmO ozW +======= +fyI +fyI +fyI +fyI +fyI +fyI +fyI +fyI +pkq +pkq +guO +poC +dXk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170663,7 +249282,11 @@ iDt iDt scw iDt +<<<<<<< HEAD rcY +======= +qau +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt snL @@ -170671,14 +249294,22 @@ scw scw scw nUi +<<<<<<< HEAD nNy +======= +oTi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cbk lNa nUi iDt iDt iDt +<<<<<<< HEAD jZN +======= +xYQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170850,21 +249481,37 @@ cIc kqn oVY pez +<<<<<<< HEAD qsR aQQ fdm grU nKL +======= +anQ +aQQ +fdm +eIg +rIH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ukN nCs bZk gRZ +<<<<<<< HEAD kmg +======= +dAZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vOw eGW eGW uRk +<<<<<<< HEAD dDt +======= +tbl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dDt stG ykM @@ -170900,6 +249547,7 @@ thA thA thA thA +<<<<<<< HEAD dlu qbM wvu @@ -170908,14 +249556,31 @@ bPR qbM wvu bil +======= +fyI +tKm +eiH +eiH +puZ +tKm +eiH +sTb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ijY iDt iDt iDt +<<<<<<< HEAD kJx iDt iDt jZN +======= +hcZ +iDt +iDt +xYQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170927,11 +249592,19 @@ rxG iDt scw uWE +<<<<<<< HEAD qzq +======= +iwf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iwf qlk qlk iwf +<<<<<<< HEAD +======= +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -170940,8 +249613,12 @@ iDt iDt iDt iDt +<<<<<<< HEAD iDt jZN +======= +xYQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt thA thA @@ -171110,7 +249787,11 @@ oCU vVH vVH vVH +<<<<<<< HEAD lDE +======= +ivw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nKL hpF pXZ @@ -171157,6 +249838,7 @@ thA thA thA thA +<<<<<<< HEAD dlu nEI wvu @@ -171170,6 +249852,21 @@ iDt iDt iDt kJx +======= +fyI +aGb +eiH +eiH +puZ +aGb +eiH +sTb +scw +iDt +iDt +iDt +hcZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -171367,7 +250064,11 @@ bLc diN diN lgK +<<<<<<< HEAD jqn +======= +vlH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lWb eDq tDY @@ -171376,10 +250077,17 @@ izY eND qpB qpB +<<<<<<< HEAD jLB qpB qpB siv +======= +eIU +qpB +qpB +sfF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kRy qpB iwC @@ -171414,6 +250122,7 @@ thA thA thA thA +<<<<<<< HEAD dlu wvu wvu @@ -171427,6 +250136,21 @@ iDt ayJ iDt kJx +======= +fyI +eiH +eiH +eiH +puZ +eiH +eiH +sTb +iDt +iDt +luI +iDt +hcZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -171434,15 +250158,24 @@ iDt iDt iDt iDt +<<<<<<< HEAD rcY +======= +jai +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt iDt iDt +<<<<<<< HEAD mJZ iDt +======= +jai +wkB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -171649,7 +250382,11 @@ cBT dyf iOs gKQ +<<<<<<< HEAD eGW +======= +xAY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qQN wMt thA @@ -171671,6 +250408,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu rEn rEn @@ -171679,11 +250417,25 @@ ghA rEn wvu idH +======= +fyI +bEk +bEk +eiH +qAh +bEk +eiH +fwC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt +<<<<<<< HEAD kJx +======= +hcZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -171692,6 +250444,7 @@ ijY iDt iDt syw +<<<<<<< HEAD kNC kNC kNC @@ -171699,6 +250452,15 @@ tej fSm kNC gIl +======= +aOG +pJm +pJm +wWw +fSm +aOG +pCG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt cCb @@ -171870,7 +250632,11 @@ iDt hPs gBX hPs +<<<<<<< HEAD bSX +======= +jhj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pzu sRQ una @@ -171886,6 +250652,7 @@ nKL hpF uHv nup +<<<<<<< HEAD vYc dAZ nek @@ -171895,6 +250662,17 @@ rhP kkB dUO nGQ +======= +pCp +dAZ +eRp +qKS +dUO +fWQ +kkB +dUO +ylL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sSO lyg gjq @@ -171906,8 +250684,13 @@ bqF dyf iNy gKQ +<<<<<<< HEAD eGW qQN +======= +okz +okz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wMt thA thA @@ -171928,6 +250711,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu wvu wvu @@ -171936,11 +250720,25 @@ wvu wvu wvu wvu +======= +fyI +eiH +eiH +eiH +eiH +eiH +eiH +skr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt +<<<<<<< HEAD qSi +======= +kOR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt scw @@ -171950,8 +250748,13 @@ iDt scw scw iDt +<<<<<<< HEAD rDN sEv +======= +fep +edc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw iDt @@ -171959,7 +250762,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD jZN +======= +xYQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq thA thA @@ -172138,12 +250945,20 @@ pez tVf izn lgK +<<<<<<< HEAD pfn +======= +wrw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lWb eDq iXh lWb +<<<<<<< HEAD hRp +======= +upB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dAZ wqI xSn @@ -172163,8 +250978,13 @@ seA ybN seA gKQ +<<<<<<< HEAD jSL jSL +======= +jhi +jhi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wMt thA thA @@ -172185,6 +251005,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu ncx kYN @@ -172196,6 +251017,19 @@ wvu ayJ iDt iDt +======= +fyI +tjM +fsx +eiH +eiH +upU +fsx +skr +eGV +scw +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt scw @@ -172205,11 +251039,19 @@ scw scw scw scw +<<<<<<< HEAD oJD oJD scw sed nfG +======= +nKY +nKY +scw +eFH +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt iDt @@ -172400,7 +251242,11 @@ yiL yiL yiL eDq +<<<<<<< HEAD pDl +======= +ejb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dAZ emM wob @@ -172442,6 +251288,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu wvu wvu @@ -172450,11 +251297,25 @@ wvu wvu wvu wvu +======= +fyI +eiH +eiH +eiH +eiH +eiH +eiH +skr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt +<<<<<<< HEAD qSi +======= +kOR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw scw @@ -172462,9 +251323,15 @@ iDt scw scw scw +<<<<<<< HEAD kYo oJD oJD +======= +dVN +nKY +nKY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw aRt @@ -172640,7 +251507,11 @@ xMq iDt iDt ebd +<<<<<<< HEAD ktt +======= +hPs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gBX hPs cIc @@ -172656,6 +251527,7 @@ uBs uBs uBs xaH +<<<<<<< HEAD fCd nDp ubo @@ -172665,6 +251537,17 @@ gqZ vms nDp dwS +======= +erM +nDp +uFg +lgD +nDp +mtS +vms +nDp +tlt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vms iYU nZd @@ -172699,6 +251582,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu xxH xxH @@ -172707,11 +251591,25 @@ jkK xxH wvu mhj +======= +fyI +fgV +fgV +eiH +gLX +fgV +eiH +oAm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt +<<<<<<< HEAD kJx +======= +hcZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -172719,11 +251617,19 @@ iDt iDt iDt iDt +<<<<<<< HEAD kYo rIS kYo kYo kYo +======= +dVN +yib +dVN +dVN +dVN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt scw thA @@ -172913,7 +251819,11 @@ xuA tuc pPK yiL +<<<<<<< HEAD aVF +======= +gwl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rQZ bSk uQC @@ -172922,18 +251832,31 @@ bcm uQC nSk wQR +<<<<<<< HEAD kWH vao +======= +lEM +oVD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lyg gjq gjq gjq ncR +<<<<<<< HEAD eBU ile dyf ile neC +======= +uyo +epN +dyf +nnj +sWN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gKQ thA thA @@ -172956,6 +251879,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu wvu wvu @@ -172980,6 +251904,32 @@ kYo kYo kYo kYo +======= +fyI +eiH +eiH +eiH +puZ +eiH +eiH +sTb +iDt +scw +luI +iDt +hcZ +iDt +iDt +iDt +tla +iDt +iDt +iNo +dVN +dVN +dVN +dVN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -173170,7 +252120,11 @@ xuA tuc tuc yiL +<<<<<<< HEAD pRB +======= +sBH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cGl hgM pJu @@ -173182,14 +252136,24 @@ frS fiL hQt lyg +<<<<<<< HEAD gjq +======= +fhL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq wYP tDN +<<<<<<< HEAD tpK dyf xCb +======= +bPl +dyf +bOh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gDe gKQ thA @@ -173213,6 +252177,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu nEI wvu @@ -173226,12 +252191,31 @@ iDt iDt iDt kJx +======= +fyI +aGb +eiH +eiH +puZ +aGb +eiH +sTb +iDt +iDt +scw +iDt +hcZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt iDt +<<<<<<< HEAD kPz +======= +iNo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -173411,8 +252395,13 @@ xMq xMq xMq xMq +<<<<<<< HEAD kSw iDt +======= +fIt +nbB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xhK vVH vVH @@ -173424,7 +252413,11 @@ yiL vDx cxO xuA +<<<<<<< HEAD dkB +======= +wkd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bYg yiL qLD @@ -173444,9 +252437,15 @@ gjq gjq idN ntT +<<<<<<< HEAD xUR jbI oQN +======= +mtq +jbI +bqS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xtn gKQ thA @@ -173470,6 +252469,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu qbM wvu @@ -173478,11 +252478,25 @@ bPR qbM wvu bil +======= +fyI +tKm +eiH +eiH +puZ +tKm +eiH +sTb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt +<<<<<<< HEAD kJx +======= +hcZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -173684,8 +252698,13 @@ pgL lab cbz yiL +<<<<<<< HEAD iVu rnb +======= +fnt +fJZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hgM kyu hBg @@ -173701,9 +252720,15 @@ gjq gjq onJ mvv +<<<<<<< HEAD ile oTe cAz +======= +bfV +aUo +rth +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dEv gKQ thA @@ -173727,6 +252752,7 @@ tjo thA thA thA +<<<<<<< HEAD dlu dlu dlu @@ -173742,6 +252768,23 @@ iDx fQa iDt daZ +======= +fyI +fyI +fyI +fyI +fyI +fyI +fyI +fyI +jnW +uPY +jnW +jnW +kAk +iDt +tla +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt thA @@ -173938,11 +252981,19 @@ yiL agF tgP rGh +<<<<<<< HEAD vHM wyF yiL szz nrq +======= +iJE +wyF +yiL +cVV +dhi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hgM kyu nrF @@ -174007,7 +253058,11 @@ thA thA thA xMq +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -174182,8 +253237,13 @@ gjq gjq gjq gjq +<<<<<<< HEAD kSw iDt +======= +fIt +nbB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xhK oAP oua @@ -174198,8 +253258,13 @@ yiL yiL yiL yiL +<<<<<<< HEAD xHE xHE +======= +nEC +lOr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hgM fvO mBa @@ -174251,10 +253316,17 @@ iDt iDt iDt iDt +<<<<<<< HEAD aaD wqT aaD iDt +======= +vcj +wqT +vcj +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -174447,11 +253519,19 @@ swf vVH uVC oVY +<<<<<<< HEAD rwu tVf wRa gAn hgH +======= +tGJ +tVf +wRa +gAn +qNK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nmI kZi uME @@ -174465,7 +253545,11 @@ xhK xhK xhK xhK +<<<<<<< HEAD gjq +======= +paw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -174509,7 +253593,11 @@ iDt iDt iDt alW +<<<<<<< HEAD wVz +======= +dpw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alW iDt iDt @@ -174702,13 +253790,21 @@ xhK vVH fkV vVH +<<<<<<< HEAD kqn +======= +wEp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oVY sMs tVf wJi rME +<<<<<<< HEAD bol +======= +xvI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mMy uME uME @@ -174766,11 +253862,19 @@ iDt iDt vcj vcj +<<<<<<< HEAD tLc vcj vcj aVq daZ +======= +aDc +vcj +vcj +aVq +tla +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt xMq thA @@ -174965,7 +254069,11 @@ bWh pac hUz hUz +<<<<<<< HEAD bjp +======= +tGA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bjp poe ryu @@ -175030,7 +254138,11 @@ aVq iDt iDt iDt +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt ebd @@ -175213,7 +254325,11 @@ gjq gjq gjq upw +<<<<<<< HEAD msg +======= +pcT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jDG iRV fiD @@ -175231,7 +254347,11 @@ ihB ddp hBg nzj +<<<<<<< HEAD dKr +======= +rjd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pOk par rsM @@ -175538,10 +254658,17 @@ ijn vWz vWz swq +<<<<<<< HEAD eNS vcj aaD qtS +======= +vWz +vcj +vcj +dCq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -175795,8 +254922,13 @@ sIO wDG vyg dOq +<<<<<<< HEAD kOS uMq +======= +gLU +wVz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nul scw scw @@ -176051,11 +255183,19 @@ vcj igL vWz vWz +<<<<<<< HEAD dOq vWz vcj aaD xQu +======= +bFx +vWz +vcj +vcj +tsc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt xMq thA @@ -176064,7 +255204,11 @@ xMq xMq thA xMq +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -176311,7 +255455,11 @@ iyd vlZ gCh alW +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt xMq xMq @@ -176329,11 +255477,19 @@ iDt iDt iDt iDt +<<<<<<< HEAD nfG iDt iDt iDt nfG +======= +ppY +iDt +iDt +iDt +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq thA thA @@ -176766,14 +255922,24 @@ wRa wRa wRa vVH +<<<<<<< HEAD nRO +======= +tOE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ulz ulz ulz pNm +<<<<<<< HEAD eOz fdG uCU +======= +cLp +fdG +saX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -177023,7 +256189,11 @@ wRa wRa wRa vVH +<<<<<<< HEAD nCQ +======= +kUt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pKR ejX fjG @@ -177337,7 +256507,11 @@ scw scw scw scw +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt thA @@ -177355,8 +256529,13 @@ nxM vmP maQ oAe +<<<<<<< HEAD aUD xMq +======= +nxM +fCm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -177609,7 +256788,11 @@ thA thA thA mep +<<<<<<< HEAD upa +======= +kVI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qck lkz mep @@ -177848,6 +257031,7 @@ scw scw iDt thA +<<<<<<< HEAD gqG thA thA @@ -177856,6 +257040,16 @@ gqG scw gqG iDt +======= +psb +lGf +thA +thA +psb +mrk +psb +mbJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA gjq gjq @@ -177866,9 +257060,15 @@ thA thA nxM nxM +<<<<<<< HEAD qKH eVO aUR +======= +vmP +eVO +oAe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nxM nxM nxM @@ -178087,7 +257287,11 @@ thA thA thA thA +<<<<<<< HEAD rcY +======= +aKb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt xMq @@ -178100,7 +257304,11 @@ gjq gjq gjq gjq +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw thA thA @@ -178344,8 +257552,13 @@ thA thA thA thA +<<<<<<< HEAD mJZ iDt +======= +bmc +wkB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt scw scw @@ -178391,7 +257604,11 @@ thA thA thA thA +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt scw @@ -178566,7 +257783,11 @@ ovP ovP ovP gFX +<<<<<<< HEAD ovP +======= +iXc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ovP ovP ovP @@ -178605,12 +257826,21 @@ chg iDt scw scw +<<<<<<< HEAD xpO gNu gNu gNu gNu oZk +======= +bqq +mgS +mgS +mgS +mgS +jRX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -178822,7 +258052,11 @@ ovP ovP iDt scw +<<<<<<< HEAD gbz +======= +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ovP ovP ovP @@ -178858,6 +258092,7 @@ thA thA thA iDt +<<<<<<< HEAD rcY scw scw @@ -178869,6 +258104,19 @@ hog joW aqq oZk +======= +bmc +pwr +scw +bqq +uvA +pvi +uhF +uhF +gyg +kOM +jRX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -178913,7 +258161,11 @@ iDt bID vxf noX +<<<<<<< HEAD eNQ +======= +nKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bID iDt thA @@ -179115,6 +258367,7 @@ thA thA thA iDt +<<<<<<< HEAD rcY scw xMq @@ -179126,6 +258379,19 @@ sCZ qMO dVj anI +======= +aKb +scw +xMq +kuZ +pBR +eYX +sCZ +sCZ +oDD +oUh +kuZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq gjq @@ -179137,10 +258403,17 @@ bDO xMq xMq iDt +<<<<<<< HEAD gqG scw gqG thA +======= +psb +mrk +psb +lGf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -179163,6 +258436,7 @@ xMq iDt iDt iDt +<<<<<<< HEAD nfG iDt iDt @@ -179170,6 +258444,15 @@ nfG bID bID dmR +======= +ppY +iDt +iDt +ppY +bID +bID +sSN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bID bID thA @@ -179376,6 +258659,7 @@ xMq xMq xMq exw +<<<<<<< HEAD nwC syE hcj @@ -179392,6 +258676,24 @@ jTf jTf gqG szG +======= +fcA +syE +jaE +jaE +wPx +cUS +exw +bBO +gjq +gjq +mxK +pJm +aOG +wWw +psb +wjA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq iDt @@ -179633,6 +258935,7 @@ exw exw exw exw +<<<<<<< HEAD wwg bdr jUv @@ -179647,6 +258950,22 @@ exw mPq iDt neM +======= +abJ +bdr +pme +pme +aon +jjI +exw +exw +mgS +mgS +exw +mPq +iDt +cRN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qau xMq xMq @@ -179680,7 +258999,11 @@ iDt cCb iDt iDt +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bID anZ anZ @@ -179887,6 +259210,7 @@ iDt iDt xMq exw +<<<<<<< HEAD jiD utn vnK @@ -179905,6 +259229,26 @@ nrh iDt neM qau +======= +caA +mty +urQ +sQI +bdr +pme +pme +aon +ojy +oGC +lQv +nVx +qes +xOQ +xyr +iDt +cRN +jai +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq xMq iDt @@ -180144,6 +259488,7 @@ xMq xMq xMq exw +<<<<<<< HEAD cmg qrF ncd @@ -180159,12 +259504,33 @@ aBb myS exw dNN +======= +xiL +xlm +xLT +jgV +qlE +mNB +mNB +pyA +nrJ +onT +exw +hjc +jiw +exw +xvN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt qau iDt iDt +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt scw iDt @@ -180400,6 +259766,7 @@ xMq xMq xMq xMq +<<<<<<< HEAD exw quw xJW @@ -180410,6 +259777,18 @@ mYn byy mYn wPR +======= +uVb +qJB +mqd +xLT +wDb +oZG +oZG +rZY +oZG +eSC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exw exw exw @@ -180418,15 +259797,25 @@ exw mPq iDt iDt +<<<<<<< HEAD xlp scw fna +======= +qau +scw +wJy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt iDt eXH +<<<<<<< HEAD gGK +======= +jvU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bjU aJr vHZ @@ -180658,6 +260047,7 @@ sBy sBy sBy exw +<<<<<<< HEAD qre oZD lHI @@ -180678,12 +260068,38 @@ neM qau iZm fdP +======= +ghD +lKN +fLu +exw +xKq +iXO +exw +dXp +aqr +wOt +fHO +urG +cRN +iDt +scw +iDt +cRN +jai +nbz +vyp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt scw iDt eXH +<<<<<<< HEAD rwk +======= +hZJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 izJ gVO vjS @@ -180910,6 +260326,7 @@ thA xMq sBy sBy +<<<<<<< HEAD dQp rRu xBs @@ -180935,6 +260352,33 @@ neM qau iDt kRF +======= +dpb +loF +ikL +cLR +exw +jJl +daH +oLi +exw +mpU +mpU +bHJ +iHP +aqr +uMp +fHO +urG +cRN +iDt +iDt +scw +cRN +qau +iDt +tiT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt scw iDt @@ -180953,7 +260397,11 @@ nRc nRc bCt pHD +<<<<<<< HEAD djB +======= +tOb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hjM oex oex @@ -181166,6 +260614,7 @@ thA xMq xMq sBy +<<<<<<< HEAD qTp xTi bpc @@ -181181,6 +260630,23 @@ tmb exw wME tbd +======= +xNs +hZc +tZv +kKT +iAK +exw +hTY +dQy +oPm +exw +pPg +pPg +exw +obU +pvP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exw exw gFX @@ -181189,7 +260655,11 @@ iDt scw scw oZd +<<<<<<< HEAD kso +======= +qhR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt iDt @@ -181423,15 +260893,24 @@ thA xMq xMq sBy +<<<<<<< HEAD ghT pXy nqI sBy fbg +======= +gYv +rFU +qyH +sBy +dbO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sBy sBy exw exw +<<<<<<< HEAD bwh lyP iDv @@ -181439,13 +260918,28 @@ jMD sCZ obT ozx +======= +exw +cGZ +uAP +fNB +sCZ +eSC +ggz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exw xMq psb jTf +<<<<<<< HEAD jTf ork gIl +======= +wWw +uen +hoz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt cCb @@ -181454,7 +260948,11 @@ scw iDt iDt eXH +<<<<<<< HEAD nlN +======= +iIY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nlS yco rVd @@ -181680,6 +261178,7 @@ thA xMq xMq sBy +<<<<<<< HEAD kzU vxY sRf @@ -181696,6 +261195,24 @@ ekc leg oIQ inN +======= +oiM +qrB +lRO +sBy +lom +ete +laa +exw +exw +exw +nwA +tPT +kiO +iTr +rds +xQi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exw xMq psb @@ -181730,7 +261247,11 @@ xmx wEU rwD nxM +<<<<<<< HEAD dXF +======= +xnK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pNZ rQG jJV @@ -181937,6 +261458,7 @@ xMq xMq xMq sBy +<<<<<<< HEAD azI kSj lyf @@ -181953,6 +261475,24 @@ hjw xFT exw bor +======= +oHf +lOJ +eqE +sBy +sTL +idI +afb +bng +suF +exw +gbK +shF +qPV +wZW +exw +eXD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exw psb psb @@ -181964,11 +261504,19 @@ scw btU xUf syW +<<<<<<< HEAD jmJ hVX xUf eXH irO +======= +sCz +hVX +xUf +eXH +uIJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wiv fBw mLt @@ -181976,10 +261524,17 @@ mLt eKW wsu wsu +<<<<<<< HEAD wsu wsu wsu wsu +======= +xfv +urp +urp +bFW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pHD sGk hjM @@ -181987,7 +261542,11 @@ aJw sBJ qpD nxM +<<<<<<< HEAD qhp +======= +feD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nxM nxM pBW @@ -182195,6 +261754,7 @@ xMq qMT qMT qMT +<<<<<<< HEAD qon qMT qMT @@ -182212,6 +261772,25 @@ exw mxY xOd ubi +======= +qaS +qMT +qMT +lom +idI +iMb +xIO +tGE +exw +aOb +xEX +tGz +aOb +exw +rgq +sCb +grp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 psb xMq iDt @@ -182219,7 +261798,11 @@ iDt iDt iDt ioK +<<<<<<< HEAD vtW +======= +tqy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bja jvw jvw @@ -182233,10 +261816,17 @@ qcL plS pHD pHD +<<<<<<< HEAD eUe bCq bCq fPh +======= +hNq +vIu +vIu +kSG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pHD jKG hjM @@ -182450,6 +262040,7 @@ thA xMq xMq qMT +<<<<<<< HEAD jlv emw rqG @@ -182468,6 +262059,26 @@ rzq exw exw bpa +======= +hfs +bMk +mxR +tHb +kuq +lom +idI +tJh +qMT +exw +exw +hZW +aIn +xwi +cft +exw +exw +rJc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 psb psb iDt @@ -182476,11 +262087,19 @@ iDt scw iDt ioK +<<<<<<< HEAD jEA bja rlA jvw bja +======= +jDz +bja +czj +jvw +gIJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kRH xqY nzK @@ -182490,10 +262109,17 @@ fmr plS pHD pHD +<<<<<<< HEAD qMz imV fuS plS +======= +hNq +qpo +qpo +kSG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pHD qMz hjM @@ -182504,7 +262130,11 @@ nxM nxM nxM nxM +<<<<<<< HEAD mPO +======= +aRn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hjM rgE rgE @@ -182707,6 +262337,7 @@ xMq xMq xMq qMT +<<<<<<< HEAD dEc ygy nfK @@ -182726,6 +262357,27 @@ ktq exw phl ubi +======= +vVl +umM +cXI +oJo +iQY +dHi +pSq +oHR +iZC +exw +rEq +dFi +cRC +jbq +wNj +xTN +exw +wzH +grp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 psb iDt iDt @@ -182735,7 +262387,11 @@ scw btU btU btU +<<<<<<< HEAD qbG +======= +aoP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ako hjM hjM @@ -182747,10 +262403,17 @@ hjM hCC iXP pHD +<<<<<<< HEAD woC eXH eXH ida +======= +bSi +eXH +eXH +qYF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pHD qMz hjM @@ -182951,7 +262614,11 @@ tjo tjo tjo tjo +<<<<<<< HEAD luR +======= +riW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt tjo thA @@ -182964,6 +262631,7 @@ xMq xMq xMq qMT +<<<<<<< HEAD izU nYN iDK @@ -182993,6 +262661,37 @@ btU kCR btU ocp +======= +dOp +wFJ +xQj +wFJ +kuq +dHi +wgK +jSa +fZH +iGQ +gnJ +amz +hOG +hOG +sIl +qPc +exw +wzH +nYz +psb +iDt +iDt +ppY +iDt +gFX +btU +vfZ +btU +mSX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dYr nxM dTm @@ -183020,7 +262719,11 @@ nxM nxM nJd hjM +<<<<<<< HEAD qII +======= +iYd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tVA oiO rgE @@ -183208,7 +262911,11 @@ tjo tjo tjo tjo +<<<<<<< HEAD nlA +======= +vne +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt tjo thA @@ -183222,6 +262929,7 @@ qMT qMT qMT qMT +<<<<<<< HEAD kJG eeY ipg @@ -183239,6 +262947,25 @@ kPh dZL exw phl +======= +hZb +vKR +gVV +dnn +lom +phz +cps +fMC +iGQ +gnJ +qFO +hOG +hOG +oMj +wVd +exw +wzH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fuH psb iDt @@ -183246,11 +262973,19 @@ iDt iDt iDt btU +<<<<<<< HEAD btU sGf lca uTf dYr +======= +gCV +gcU +svx +tNw +mdy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nxM nxM nxM @@ -183258,9 +262993,15 @@ hjM hjM hjM hjM +<<<<<<< HEAD dsT vaZ ubI +======= +oEy +vaZ +bQx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hOk hjM hjM @@ -183278,7 +263019,11 @@ mco upa hjM fjg +<<<<<<< HEAD bif +======= +rxx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nCD rgE rgE @@ -183476,6 +263221,7 @@ thA thA xMq qMT +<<<<<<< HEAD jFY wVI aVJ @@ -183496,15 +263242,44 @@ aIA hfY exw phl +======= +hmF +mIs +aZU +hMZ +gVB +axw +lom +xqt +wgK +fkD +toi +exw +vfH +sRu +iWj +pVD +bsW +dad +exw +wzH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fuH psb iDt iDt iDt +<<<<<<< HEAD jCM btU idr qSe +======= +aDl +btU +gMd +mxZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aIU umC kJm @@ -183543,7 +263318,11 @@ phS kpG uAi qST +<<<<<<< HEAD iRP +======= +ngb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrE lKt rgE @@ -183733,6 +263512,7 @@ thA thA xMq qMT +<<<<<<< HEAD jkN qeW quJ @@ -183766,6 +263546,41 @@ wqi tBY efz sAI +======= +flK +gTa +idI +gxg +pSq +kmo +hWl +kmo +jUi +ibJ +jre +jre +jre +pTi +pWJ +ofR +eUm +exw +exw +pmA +psb +psb +mUt +mUt +mUt +dbB +btU +sry +dMl +pTy +bwp +shR +eGs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hjM hjM hjM @@ -183788,7 +263603,11 @@ scw ilN vIZ nxM +<<<<<<< HEAD bPk +======= +iXK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kmM sYU iio @@ -183979,7 +263798,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD pOl +======= +evh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tjo tjo tjo @@ -183990,6 +263813,7 @@ thA thA xMq qMT +<<<<<<< HEAD bcf vEC lvv @@ -184020,6 +263844,38 @@ btU btU btU gPj +======= +eGB +wUB +nof +gIs +pbF +tdc +sHa +ccL +eLB +jre +jre +jDV +jre +jre +jre +tRP +jre +jre +fuH +wzH +grp +psb +oQc +gaA +gaA +gaA +btU +btU +btU +idU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 btU btU ako @@ -184234,9 +264090,15 @@ iDt tjo iDt iDt +<<<<<<< HEAD pOl iDt edM +======= +evh +iDt +sNF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tjo tjo tjo @@ -184248,6 +264110,7 @@ thA xMq jre jre +<<<<<<< HEAD dvZ jre jre @@ -184279,6 +264142,39 @@ nyQ meL efo hJC +======= +rXw +jre +jre +piT +eJX +ePj +ppH +jre +jre +oXE +jWb +fCA +fCA +iaB +owK +hph +jre +adS +wzH +dfR +psb +iUr +exu +gaA +ygA +btU +ntm +nyQ +meL +pgg +hAU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ako hWV iiR @@ -184485,7 +264381,11 @@ tjo tjo tjo tjo +<<<<<<< HEAD pOl +======= +evh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt tjo tjo @@ -184505,6 +264405,7 @@ thA xMq xMq jre +<<<<<<< HEAD uBD lcm jre @@ -184536,16 +264437,56 @@ cWJ dYX pps aRQ +======= +kyV +thP +jre +jre +weT +weT +jre +jre +oXE +pfE +pBv +moX +oXE +xEV +xZS +jre +jre +oDb +wzH +awE +psb +xcf +uKc +exu +gaA +ioK +waH +kmq +ebO +jgW +mCx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ako rjr xQT xQT qmU xDb +<<<<<<< HEAD jEf qnt pGS dIZ +======= +oGO +qnt +pGS +ixa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aRr xDb xMq @@ -184762,6 +264703,7 @@ thA xMq xMq jre +<<<<<<< HEAD sJu fWE tjs @@ -184774,10 +264716,25 @@ vHe dZC jre vBt +======= +tKJ +kya +tjs +jIB +jIB +fCA +fCA +ehh +jPL +oPC +jre +nRE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre jre jre jre +<<<<<<< HEAD drw drw bpa @@ -184793,6 +264750,23 @@ aCl tHe tHe xRF +======= +dom +dom +rJc +psb +psb +qZZ +uKc +jww +gaA +ioK +wYH +jZt +hHz +hHz +hHz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ako hSF hSF @@ -184832,7 +264806,11 @@ foW ljL ljL agY +<<<<<<< HEAD bnG +======= +lub +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lub wbk ccg @@ -185007,7 +264985,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD pOl +======= +evh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tjo tjo tjo @@ -185019,6 +265001,7 @@ xMq xMq xMq jre +<<<<<<< HEAD nIY jwf cdO @@ -185050,17 +265033,58 @@ nHc nHc ofm okf +======= +eXc +rfQ +gLY +sHt +hzU +usm +tYu +isq +jMr +jre +jre +nVJ +xOc +eyP +rtw +rOx +fwB +dom +dXr +psb +lTl +uKc +wcn +gaA +gaA +ioK +aOe +pRs +pRs +jcr +nPs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ako xDb xDb xDb +<<<<<<< HEAD rHr +======= +jyJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mrU rQw xEb eVZ jTg +<<<<<<< HEAD fpp +======= +csu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xDb xDb iDt @@ -185077,9 +265101,15 @@ lyX iTB imH nxM +<<<<<<< HEAD mTX hjM qUe +======= +aXP +hjM +qJi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ljL fFn vmu @@ -185278,7 +265308,11 @@ jre jre jre jre +<<<<<<< HEAD iRS +======= +uTu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre jre jre @@ -185286,6 +265320,7 @@ jre jre jre jre +<<<<<<< HEAD bvc rXB udR @@ -185309,6 +265344,31 @@ jnY eQU ako xuQ +======= +lOA +ceQ +rRT +yfs +sTl +sTl +yfs +gTr +jgC +psb +qZZ +uKc +wcn +grL +oQc +ioK +waH +lSX +bFA +fTi +bWv +ako +vJl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qXO pGS bhw @@ -185322,7 +265382,11 @@ ffQ xDb clI iDt +<<<<<<< HEAD pco +======= +tJl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt xMq xMq @@ -185532,6 +265596,7 @@ xMq xMq jre jre +<<<<<<< HEAD uye ohk aAk @@ -185545,11 +265610,27 @@ ssm fpt mQk qKw +======= +hDL +qZG +vmW +nNe +tgj +mnA +jre +tVF +kUo +iKd +ees +mQk +sdF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mQk fwB fwB fwB fwB +<<<<<<< HEAD drw qEh psb @@ -185566,6 +265647,24 @@ wav pWi uHV cqv +======= +dom +lPs +psb +lTl +uKc +wcn +btU +vtu +btU +ale +rrR +tzR +qfy +aCw +uHV +cKL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gZb xwu cAr @@ -185579,8 +265678,13 @@ hoM xDb xMq iDt +<<<<<<< HEAD mJZ frt +======= +aKb +gnX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt xMq @@ -185788,6 +265892,7 @@ thA xMq xMq jre +<<<<<<< HEAD iDB mPQ wSs @@ -185823,6 +265928,43 @@ btU btU ako goJ +======= +kFc +kqg +wSs +wfP +uQv +qhb +oXE +jre +sRz +tec +vcD +jBB +mQk +jUb +mQk +mQk +fwB +nNg +fwB +dom +aWu +psb +psb +qZZ +wcn +ioK +pKl +btU +dVj +gra +lHV +btU +btU +ako +uCM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jeI pGS cDb @@ -185831,7 +265973,11 @@ drR oQY oQY soA +<<<<<<< HEAD pNy +======= +dvK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nid xDb xMq @@ -185849,8 +265995,13 @@ sqW gjq nxM ueD +<<<<<<< HEAD aUD eJf +======= +nxM +qOx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 upH fTG hkp @@ -185868,7 +266019,11 @@ bWK bWK neu hjR +<<<<<<< HEAD vNM +======= +uEf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -186045,6 +266200,7 @@ thA xMq xMq jre +<<<<<<< HEAD wEq ezd nla @@ -186080,6 +266236,43 @@ btU kKa ako wlF +======= +aMU +xzk +oXE +dYH +rlB +jMO +oXE +jre +tAT +btq +nRn +mQk +mQk +iBi +mQk +mbM +oje +gYq +fwB +dom +fSB +rXP +psb +xcf +jww +btU +jUs +btU +ewT +akN +uii +lOt +oJv +ako +acl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lYR pGS cDb @@ -186098,8 +266291,13 @@ iDt iDt scw iDt +<<<<<<< HEAD gqG eJf +======= +psb +pFv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf eJf eJf @@ -186293,7 +266491,11 @@ tjo tjo tjo iDt +<<<<<<< HEAD pOl +======= +evh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt thA @@ -186302,6 +266504,7 @@ thA xMq xMq jre +<<<<<<< HEAD mMI cBJ nla @@ -186332,6 +266535,38 @@ gCG cge dDq cLf +======= +kGD +eIR +oXE +cqw +nNe +hWR +iis +jre +dLA +pnw +biu +xZv +mQk +fja +prX +eud +kww +qPE +fwB +dom +gKE +nYz +psb +jww +oQc +btU +qYW +dBX +lln +jfF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jUB jUB jUB @@ -186339,7 +266574,11 @@ xDb xDb xDb xDb +<<<<<<< HEAD jCA +======= +gff +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nLe nQd oeT @@ -186364,9 +266603,15 @@ myZ myZ myZ myZ +<<<<<<< HEAD gdg kpC eMU +======= +wvF +kpC +cmY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vgM syn fDe @@ -186560,6 +266805,7 @@ xMq xMq jre jre +<<<<<<< HEAD xnf rdq aAk @@ -186573,10 +266819,26 @@ jre jre jre twS +======= +jVp +qhi +vmW +nNe +hts +hQv +jre +jre +oqE +jre +jre +jre +gWi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre jre jre jre +<<<<<<< HEAD drw drw xxo @@ -186596,11 +266858,36 @@ vMf tdL xDb qxv +======= +dom +dom +fSB +fuH +psb +mUt +mUt +btU +eqH +bCN +axj +fJA +jUB +aVM +vgW +qHA +bWM +xDb +uFF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 osr wiD dRz pwn +<<<<<<< HEAD pwn +======= +dUR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pwn jUB cuJ @@ -186624,9 +266911,15 @@ eJf eJf upH uuw +<<<<<<< HEAD jDi nzT eGl +======= +boc +eOB +bpw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lVw dDy nOS @@ -186641,7 +266934,11 @@ rbY ffe alM alM +<<<<<<< HEAD sbZ +======= +wtM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM iDt thA @@ -186820,6 +267117,7 @@ jre jre jre jre +<<<<<<< HEAD udf jre jre @@ -186837,11 +267135,31 @@ jre jre jre kFF +======= +sXa +jre +jre +jre +nzU +aWj +wSs +oXE +fOS +pWE +oXE +wSs +tpc +jre +jre +jre +sGG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre jre fuH fuH btU +<<<<<<< HEAD mkN meW xFG @@ -186851,6 +267169,17 @@ srM skU rHI non +======= +uUs +cQV +ijv +hPD +jUB +gIh +jjM +pfz +wyX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nMc sfy uCe @@ -186869,8 +267198,13 @@ thA thA thA thA +<<<<<<< HEAD gqG eJf +======= +psb +pFv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJf eJf eJf @@ -186878,12 +267212,21 @@ eJf myZ eJf eJf +<<<<<<< HEAD buW kpC kDb nqX qoZ sIA +======= +eJf +kpC +gWn +vZo +wxl +lOa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lVw jPu ffe @@ -186895,10 +267238,17 @@ ffe ffe ffe ffe +<<<<<<< HEAD heH gNh alM noQ +======= +ffe +oxO +alM +vZM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM iDt thA @@ -187076,6 +267426,7 @@ xMq xMq xMq jre +<<<<<<< HEAD igu kvT pZO @@ -187093,12 +267444,32 @@ cpO jre gVs hGg +======= +gAM +rOL +edR +nsQ +nsQ +ljq +jre +weT +jre +exQ +jre +dQN +jre +meX +jre +jwv +sBd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wSs vTp jre fuH fuH btU +<<<<<<< HEAD iWN cRN jFA @@ -187108,6 +267479,17 @@ ksH yaJ uOq vXD +======= +hvt +luR +mlT +lqZ +jUB +vyq +aow +kkF +vLY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xDb qSN atl @@ -187128,11 +267510,16 @@ thA thA thA thA +<<<<<<< HEAD nfG +======= +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gjq gjq alM gbL +<<<<<<< HEAD wJD eJf eJf @@ -187141,6 +267528,16 @@ awL jes qdx sIA +======= +alM +qOx +eJf +kpC +awL +xqw +xZy +lOa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rtt dgZ ffe @@ -187152,10 +267549,17 @@ oxO alM fWO alM +<<<<<<< HEAD jrk oxO alM iCD +======= +aUT +oxO +alM +ouU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM alM alM @@ -187334,6 +267738,7 @@ xMq xMq jre jre +<<<<<<< HEAD kUW jre eet @@ -187348,6 +267753,22 @@ jhu jre mza awF +======= +bTE +jre +tDS +dQN +vwD +jre +rYT +biE +olR +jre +jsO +jre +xGL +lVU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wSs wSs wSs @@ -187356,6 +267777,7 @@ jre fuH fuH btU +<<<<<<< HEAD vrr rcU gEX @@ -187363,6 +267785,15 @@ eML xDb jUB aVU +======= +mCd +hkQ +cZk +tHJ +xDb +jUB +dgt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jUB xDb xDb @@ -187371,7 +267802,11 @@ qWD oQY nvX jUB +<<<<<<< HEAD rOH +======= +pkz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lPC vpX xDb @@ -187392,12 +267827,21 @@ wCo oxO wCo eJf +<<<<<<< HEAD nfG upH cYi qqh naX sIA +======= +ppY +upH +cYi +ngo +naX +ulm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rtt rgB ffe @@ -187591,6 +268035,7 @@ xMq xMq xMq jre +<<<<<<< HEAD uiv jre jre @@ -187600,20 +268045,38 @@ vpJ gOd oTx hIE +======= +uIh +jre +jre +jre +uVr +sHe +frF +oTx +fQe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre vFg jre jre jre +<<<<<<< HEAD vyN jre kUW +======= +xth +jre +bTE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre jre fuH fuH btU btU +<<<<<<< HEAD btU btU btU @@ -187623,6 +268086,17 @@ aqp wbe jUB jGN +======= +xUf +xUf +btU +xDb +ybC +aqp +wbe +jUB +gSl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gHN qWD uDF @@ -187848,6 +268322,7 @@ thA xMq xMq jre +<<<<<<< HEAD dla jre xMq @@ -187865,6 +268340,25 @@ jre jre jre uiv +======= +sjd +jre +xMq +jre +oiC +jre +lvF +wFt +lvF +jre +htg +djH +pIh +jre +jre +jre +cXG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre xMq xMq @@ -187875,10 +268369,17 @@ thA thA thA xDb +<<<<<<< HEAD xtR ukz gPR bwe +======= +lfA +ukz +gPR +tFY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cxQ vJB wgI @@ -187903,7 +268404,11 @@ xMq xMq xMq alM +<<<<<<< HEAD xFU +======= +ciU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM apB ffe @@ -188104,7 +268609,11 @@ thA iDt rcY scw +<<<<<<< HEAD uNG +======= +ayL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aIB tiY xMq @@ -188121,7 +268630,11 @@ hMw jre xMq jre +<<<<<<< HEAD dla +======= +sjd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jre iDt thA @@ -188132,11 +268645,19 @@ thA thA thA xDb +<<<<<<< HEAD pPD tIu toG jUB kax +======= +fBy +tIu +toG +jUB +aov +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 anK nrC xDb @@ -188146,7 +268667,11 @@ ffe ffe ffe dOC +<<<<<<< HEAD dFD +======= +nIb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM alM alM @@ -188360,7 +268885,11 @@ iDt iDt iDt rcY +<<<<<<< HEAD luR +======= +riW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw scw iDt @@ -188380,7 +268909,11 @@ xMq tiY aIB dhH +<<<<<<< HEAD grg +======= +xvE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt thA thA @@ -188397,7 +268930,11 @@ xDb hjV ezu xDb +<<<<<<< HEAD slx +======= +sEN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ffe oxO dcd @@ -188416,12 +268953,20 @@ alM alM alM alM +<<<<<<< HEAD mLo +======= +yhn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eEY oxO dcd ffe +<<<<<<< HEAD wRO +======= +tBq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ffe ffe ffe @@ -188616,8 +269161,13 @@ iDt iDt iDt iDt +<<<<<<< HEAD tHF scw +======= +kLd +nLB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt scw iDt @@ -188650,10 +269200,17 @@ xMq xMq xMq xMq +<<<<<<< HEAD ozM nKl cgR tBW +======= +fWw +nKl +cgR +sWO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vRY ffe oxO @@ -188669,7 +269226,11 @@ oxO oxO iry jQi +<<<<<<< HEAD oxO +======= +jVa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oxO oxO oxO @@ -188679,7 +269240,11 @@ rUS tRd tRd nPI +<<<<<<< HEAD wjy +======= +nPI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nPI nPI nPI @@ -188881,9 +269446,15 @@ scw iDt cCb syw +<<<<<<< HEAD kNC kNC gIl +======= +pJm +pJm +pCG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt thA thA @@ -188927,7 +269498,11 @@ nsp oxO oxO oxO +<<<<<<< HEAD kOO +======= +oxO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oxO oxO oxO @@ -189396,7 +269971,11 @@ iDt iDt iDt iDt +<<<<<<< HEAD pOl +======= +evh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -189431,12 +270010,21 @@ xMq alM oxO ffe +<<<<<<< HEAD qvN qvN qvN biI qvN qvN +======= +qCu +qCu +qCu +oED +qCu +qCu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLY eGN lZX @@ -189688,17 +270276,27 @@ xMq alM oxO ffe +<<<<<<< HEAD qvN qvN qvN uUn qvN qvN +======= +qCu +qCu +qCu +pUX +qCu +qCu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLY vfe tsa wHb qLY +<<<<<<< HEAD abe wFN abe @@ -189716,6 +270314,25 @@ abe abe rnQ nPI +======= +eea +wFN +abe +nFz +wFN +abe +nFz +abe +abe +nFz +abe +abe +nFz +abe +abe +rnQ +quW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM alM thA @@ -189905,9 +270522,15 @@ rcY iDt scw iDt +<<<<<<< HEAD jmo keA vQz +======= +xkW +keA +lPl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt scw @@ -189921,9 +270544,15 @@ thA thA thA psb +<<<<<<< HEAD sRp gUQ sRp +======= +jkX +gUQ +jkX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 psb thA thA @@ -189940,17 +270569,30 @@ xMq xMq xMq psb +<<<<<<< HEAD iDt +======= +clI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq alM oxO ffe +<<<<<<< HEAD viR qvN qvN bOT qvN qvN +======= +sbP +qCu +qCu +eZA +qCu +qCu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLY tkP fPv @@ -190163,7 +270805,11 @@ iDt iDt iDt tBs +<<<<<<< HEAD dGZ +======= +vcf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tBs iDt iDt @@ -190204,6 +270850,7 @@ nsp ffe qLY qLY +<<<<<<< HEAD uHS ujp qvN @@ -190214,22 +270861,46 @@ oXr wpv qLY lMu +======= +xJn +kuT +qCu +qLY +qLY +qLY +oXr +fma +qLY +dRX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bUK oQo nmj ucl aHz +<<<<<<< HEAD dIS +======= +puw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gBb dJx htp eWh yjA +<<<<<<< HEAD tOf vPD lqU mDg nPI +======= +obF +vPD +lqU +ffe +xvU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM alM thA @@ -190423,6 +271094,7 @@ vRz wMj vRz iDt +<<<<<<< HEAD wkV tej kNC @@ -190432,6 +271104,17 @@ tej kNC tej cNh +======= +mxK +jTf +fOH +pJm +pJm +pJm +fOH +pJm +xvp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -190467,7 +271150,11 @@ cZT cZT pXj qLY +<<<<<<< HEAD wZv +======= +hRQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 axD qLY hEW @@ -190677,7 +271364,11 @@ tBs tBs tBs tBs +<<<<<<< HEAD rHR +======= +rQh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tBs tBs tBs @@ -190688,7 +271379,11 @@ rbZ rbZ pgo iDt +<<<<<<< HEAD hNF +======= +aDG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -190716,7 +271411,11 @@ iDt alM jCr ffe +<<<<<<< HEAD nAf +======= +fMZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pMF mqe hRC @@ -190724,6 +271423,7 @@ euM pMF sfv xyn +<<<<<<< HEAD dmj wPd lVt @@ -190742,6 +271442,26 @@ pfJ jrc pMF mbb +======= +oYD +wPd +lVt +yfa +pMF +fZA +mqL +pMF +bWU +gvf +mBP +vrw +mmG +pMF +hoa +pXq +pMF +mEW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rkl nPI oxO @@ -190929,7 +271649,11 @@ xMq tBs pwv sAu +<<<<<<< HEAD rqn +======= +dGS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tBs nHQ oik @@ -190945,8 +271669,13 @@ tuk ebB efM pgo +<<<<<<< HEAD rcY rSQ +======= +jai +rsG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt iDt @@ -190980,7 +271709,11 @@ dtU niy gtF ouP +<<<<<<< HEAD gLS +======= +qLY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cyh cXX bKI @@ -191195,7 +271928,11 @@ baR kAn kMN tBs +<<<<<<< HEAD mFR +======= +ebB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ebB ebB uXk @@ -191243,21 +271980,35 @@ bjn qbq iar xqu +<<<<<<< HEAD oir +======= +dmV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 slp fjt wgr xur reT +<<<<<<< HEAD rxM +======= +dTC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aLA bnh cNI tWd hJi +<<<<<<< HEAD wGN mDg pQG +======= +oOh +ffe +gzJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tRd alM thA @@ -191459,12 +272210,21 @@ efM uXk efM awy +<<<<<<< HEAD rcY iDt iDt svz keA ddv +======= +jai +wkB +iDt +var +keA +sys +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDt iDt iDt @@ -191487,12 +272247,21 @@ iDt alM oxO ffe +<<<<<<< HEAD oqd vHq aZk xNa pMF rdl +======= +jiB +vHq +aZk +iwQ +pMF +cBv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iQM qLY abe @@ -191716,19 +272485,32 @@ yav ebB awy iDt +<<<<<<< HEAD qau iDt xMq wrX efN xCj +======= +rcY +iDt +xMq +wrX +kpg +wrX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq thA thA iDt scw iDt +<<<<<<< HEAD vYN +======= +wzi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMq iDt iDt @@ -191747,6 +272529,7 @@ ffe hfL vHq obZ +<<<<<<< HEAD dIA rSu qLY @@ -191772,6 +272555,33 @@ abe abe pjr tRd +======= +icK +bnr +qLY +qLY +qLY +eea +abe +gLj +eea +wFN +gLj +eea +abe +gLj +eea +abe +gLj +eea +abe +gLj +eea +abe +abe +pjr +iTC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iWM alM thA @@ -191977,7 +272787,11 @@ wrX xMq xMq wrX +<<<<<<< HEAD qCJ +======= +csJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX xMq xMq @@ -192002,10 +272816,17 @@ alM oxO ffe ffe +<<<<<<< HEAD iwx ffe ffe xwd +======= +mZI +ffe +ffe +pVj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLY vgf qLY @@ -192234,7 +273055,11 @@ wrX wrX wrX wrX +<<<<<<< HEAD pSP +======= +vIm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX wrX xMq @@ -192258,7 +273083,11 @@ alM wOH oxO oxO +<<<<<<< HEAD ggS +======= +oxO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nyJ nSK ffe @@ -192471,8 +273300,13 @@ thA tBs tix tBs +<<<<<<< HEAD wgu dlB +======= +aCJ +pyn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jCL qEJ qEJ @@ -192480,16 +273314,27 @@ djD qEJ qEJ qEJ +<<<<<<< HEAD tJi +======= +kyf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wBA oTA rpK oTA epB +<<<<<<< HEAD oTA wrX wrX seN +======= +uFt +wrX +wrX +wBs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nBe tiV mjQ @@ -192734,6 +273579,7 @@ quB jmR vrC hbR +<<<<<<< HEAD gNJ qEJ eog @@ -192748,6 +273594,22 @@ cMj xNE lnw pwC +======= +whg +gQO +mPJ +puF +exn +hDf +qeR +bAF +nJy +rkz +hrY +hrY +fLx +qgv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wGv huJ wrX @@ -192762,17 +273624,30 @@ thA thA xMq xMq +<<<<<<< HEAD kNC kNC ebX iDt iDt nfG +======= +pJm +pJm +tSj +iDt +iDt +ppY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM alM alM alM +<<<<<<< HEAD aDe +======= +moy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tNJ tNJ nyJ @@ -192982,7 +273857,11 @@ thA thA tBs liS +<<<<<<< HEAD pxg +======= +saR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fdN tBs deP @@ -192991,6 +273870,7 @@ pQw cBP wAv fjH +<<<<<<< HEAD dNB gQO mPJ @@ -193004,6 +273884,21 @@ tSy uJt uJt hxI +======= +oqN +cWE +kWO +txf +oTA +sab +qYh +sab +pcB +qtd +uJt +uJt +efy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iAQ bkq uTX @@ -193021,16 +273916,27 @@ xMq iDt iDt iDt +<<<<<<< HEAD qZG ebX +======= +gsd +xvp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scw iDt lRI eNh oxO +<<<<<<< HEAD bEh vAx jXl +======= +uwR +vAx +oxO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oxO pvh oLa @@ -193239,28 +274145,47 @@ thA xMq tBs suA +<<<<<<< HEAD roq +======= +iWA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rHZ tBs dit bDH rYt +<<<<<<< HEAD rrf +======= +nBS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wAv jvs qEJ qEJ +<<<<<<< HEAD oxN +======= +vnW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mHJ oTA oTA syh oTA lqj +<<<<<<< HEAD oTA uJt uJt rcD +======= +erV +uJt +uJt +iJV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 smC oTM wrX @@ -193276,6 +274201,7 @@ xMq xMq iDt iDt +<<<<<<< HEAD xte iDt iDt @@ -193284,10 +274210,21 @@ iDt nfG alM bXf +======= +rkp +iDt +iDt +qpH +iDt +ppY +alM +dQl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ffe ffe ffe ffe +<<<<<<< HEAD ylQ ffe iry @@ -193298,6 +274235,18 @@ cma qUL oxO iry +======= +pQl +ffe +iry +jXl +oxO +iKG +iry +qUL +cma +sGL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alM alM alM @@ -193519,7 +274468,11 @@ uJt uJt uJt smC +<<<<<<< HEAD gyf +======= +dIG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX xMq xMq @@ -193533,6 +274486,7 @@ xMq lvt lvt lvt +<<<<<<< HEAD kdJ iDt iDt @@ -193546,6 +274500,21 @@ eLU wAk lPz rOz +======= +rlq +iDt +iDt +uwT +uwT +uwT +uwT +uwT +uwT +loO +gaF +qkg +wQx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ffe ffe ffe @@ -193758,10 +274727,17 @@ mku tBs tBs tBs +<<<<<<< HEAD fCw wrX hzd sdk +======= +vch +wrX +aMA +nbG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aIe wBA uJq @@ -193790,6 +274766,7 @@ xMq lvt lvt lvt +<<<<<<< HEAD kdJ lvt wnp @@ -193803,6 +274780,21 @@ oQV xvx rOz xvx +======= +rlq +lvt +uwT +uwT +qMk +crW +uwT +kgw +tjf +raQ +qTf +wQx +qTf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kAH mHu kwM @@ -193811,7 +274803,11 @@ qRO fgx cAB wQi +<<<<<<< HEAD wQi +======= +qlf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uIf thA thA @@ -194017,10 +275013,17 @@ tWc tBs kCx wrX +<<<<<<< HEAD umF kmn aIe lHB +======= +aMA +nbG +aIe +lmT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dzy ewC iLt @@ -194047,6 +275050,7 @@ lvt lvt lvt lvt +<<<<<<< HEAD mRp qbz wnp @@ -194060,15 +275064,38 @@ tLy jih gYO toP +======= +rjb +efR +uwT +dWL +fbA +lct +oGj +rWm +jWq +lvR +ddm +qvx +aZJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kAH mHu jlj tUo +<<<<<<< HEAD aQn hFb vqv wQi wQi +======= +cvj +hFb +vqv +wQi +tEs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uIf thA thA @@ -194274,21 +275301,36 @@ pmn tBs tBs tBs +<<<<<<< HEAD hrK icv wrX wrX fIn +======= +wrX +wrX +wrX +wrX +wyL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jcP oTA oTA epB oTA uko +<<<<<<< HEAD oTA uJt uJt rcD +======= +mEI +uJt +uJt +tWJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oTA wQC wrX @@ -194303,6 +275345,7 @@ rcY lvt lvt lvt +<<<<<<< HEAD nNV ege iPK @@ -194322,6 +275365,27 @@ laa qKt tUo aQn +======= +jyy +oyM +lGb +uwT +hkS +waz +jRt +rWm +rWm +uwT +qTf +wiX +qTf +qTf +uIf +pHW +qKt +tUo +cvj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hFb vqv qiN @@ -194531,21 +275595,36 @@ wMj lpL wMj tBs +<<<<<<< HEAD lry oTA hlS wrX uDC +======= +etH +etH +rBJ +wrX +wIC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wBA oTA bAF irQ bAF bYm +<<<<<<< HEAD bMe uJt uJt oTA +======= +rlt +uJt +uJt +bap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oTA tIw wrX @@ -194560,6 +275639,7 @@ rcY lvt lvt lvt +<<<<<<< HEAD ekN nce qcl @@ -194579,6 +275659,27 @@ mWj aNu tPG xEQ +======= +opE +ssj +sDB +sDB +sDB +rWm +cZf +rWm +tKY +uIf +uIf +uIf +uIf +uIf +uIf +mWj +aNu +tPG +baN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qaL vqv brt @@ -194788,21 +275889,36 @@ tBs aVi vGJ tBs +<<<<<<< HEAD etH etH eyU wrX uJI +======= +cMG +etH +oTA +lBN +qOu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xBt iih sab nMP sab qYh +<<<<<<< HEAD oTA avo tTw qfj +======= +rkz +peX +peX +bEn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vnj wrX wrX @@ -194817,6 +275933,7 @@ rcY lvt lvt lvt +<<<<<<< HEAD mnB tTK rSZ @@ -194835,11 +275952,35 @@ iWs mxc qRO rEj +======= +ctm +iln +xPs +rWm +kZe +rWm +tkX +eLs +xNR +hqH +vAS +igM +ssH +xyI +oRH +wzU +qRO +wuh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qRO mEL vqv fkN +<<<<<<< HEAD fkN +======= +gge +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uIf thA thA @@ -195047,7 +276188,11 @@ aOz tBs cPq etH +<<<<<<< HEAD etH +======= +qUf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX wrX ffp @@ -195056,11 +276201,19 @@ oTA syh oTA syh +<<<<<<< HEAD oTA wrX wrX hfm orU +======= +hAE +wrX +wrX +dgA +mKh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX xMq xMq @@ -195075,6 +276228,7 @@ lvt lvt lvt lvt +<<<<<<< HEAD asG qcl qcl @@ -195093,6 +276247,26 @@ jGR hFb mzb rEj +======= +kWk +sDB +sDB +sDB +nPo +rCs +kwn +teQ +uIf +qsa +pOL +pOL +pOL +gOA +mBY +hFb +mzb +wuh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rRl vqv wZV @@ -195303,7 +276477,11 @@ goB goB tBs wrX +<<<<<<< HEAD wrX +======= +ipg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX wrX wrX @@ -195327,6 +276505,7 @@ thA thA tjo tjo +<<<<<<< HEAD qZG ebX lvt @@ -195347,6 +276526,28 @@ pOL pOL opD jGR +======= +gsd +hxJ +lvt +lvt +lvt +rlq +lvt +lvt +uwT +uwT +bvw +oDw +gyO +uIf +xmM +bWH +bWH +bWH +kdg +xeF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hFb hFb qRO @@ -195560,15 +276761,25 @@ lvt lvt lvt lvt +<<<<<<< HEAD lvt +======= +scw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lvt wrX wrX wrX wrX +<<<<<<< HEAD daj wrX crg +======= +nfS +wrX +eoS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX wrX wrX @@ -195585,6 +276796,7 @@ thA tjo tjo tjo +<<<<<<< HEAD qZG kNC ebX @@ -195604,13 +276816,38 @@ odm odm nqy jGR +======= +syw +wWw +hxJ +lvt +rlq +lvt +lvt +lvt +uwT +sDB +sDB +uwT +uIf +rNK +oPt +oPt +oPt +tcX +xeF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qRO qRO qRO rRl ndb bnZ +<<<<<<< HEAD ulE +======= +eSq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uIf thA thA @@ -195823,9 +277060,15 @@ lvt xMq xMq wrX +<<<<<<< HEAD vle bWp nJZ +======= +wee +bWp +mCP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX xMq xMq @@ -195844,6 +277087,7 @@ tjo tjo tjo tjo +<<<<<<< HEAD qZG kNC nmy @@ -195865,6 +277109,29 @@ gcy jJG jJG plX +======= +gsd +pJm +dUm +pJm +wWw +pJm +gsd +iDt +ctC +pJm +opP +opP +opP +opP +lpy +lpy +tqJ +bpY +vfj +vfj +kJF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qZN akk qZN @@ -196110,6 +277377,7 @@ thA thA thA rcY +<<<<<<< HEAD iDt fCS iwq @@ -196118,6 +277386,16 @@ iCe lgP iCe vcH +======= +lvt +vEc +taC +duY +vgK +rGf +vgK +oBq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gnq xEF qSk @@ -196366,6 +277644,7 @@ thA thA thA thA +<<<<<<< HEAD rcY iDt fCS @@ -196374,6 +277653,16 @@ bqX rmG ryX sqH +======= +kLd +lLA +vEc +oPu +uTx +ejN +xVB +nMv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qSk sbd rEh @@ -196623,6 +277912,7 @@ thA thA thA thA +<<<<<<< HEAD rcY iDt fCS @@ -196632,6 +277922,17 @@ wKh aEK wKh odf +======= +aDG +lvt +vEc +taC +sGT +qNt +dwj +qNt +uVf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sbd jaY rhY @@ -196881,7 +278182,11 @@ thA thA thA syw +<<<<<<< HEAD kNC +======= +pJm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bgx bgx bgx @@ -197137,6 +278442,7 @@ thA thA thA thA +<<<<<<< HEAD vzD vzD vzD @@ -197147,6 +278453,18 @@ rEU oHo gOq bBb +======= +iDt +iDt +vzD +uAJ +vzD +eYY +aUu +oHo +eVw +rEU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vzD thA thA @@ -197395,6 +278713,7 @@ thA thA thA vzD +<<<<<<< HEAD yap qXY jCl @@ -197404,6 +278723,17 @@ jCl jCl jCl iVY +======= +vzD +vzD +jCl +mAn +beu +uZc +vzD +vzD +vzD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vzD thA thA @@ -197652,6 +278982,7 @@ thA thA thA vzD +<<<<<<< HEAD yap jCl bFq @@ -197661,6 +278992,17 @@ xEt jCl jCl iVY +======= +xLv +gvr +uZc +vzD +rEU +uZc +axu +rRN +xLv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vzD thA thA @@ -197909,6 +279251,7 @@ thA thA thA vzD +<<<<<<< HEAD vzD vzD vzD @@ -197918,6 +279261,17 @@ vzD vzD vzD vzD +======= +jCl +fXQ +vzD +vzD +fXX +vzD +vzD +rRN +jCl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vzD thA thA @@ -198165,6 +279519,7 @@ thA thA thA thA +<<<<<<< HEAD thA thA thA @@ -198176,6 +279531,19 @@ thA thA thA thA +======= +vzD +puL +phA +vzD +kfS +xYg +ibj +vzD +nQL +eYx +vzD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -198422,6 +279790,7 @@ thA thA thA thA +<<<<<<< HEAD thA thA thA @@ -198433,6 +279802,19 @@ thA thA thA thA +======= +vzD +nSU +ovB +vzD +kfS +hMA +iFw +vzD +bhI +uZc +vzD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -198679,6 +280061,7 @@ thA thA thA thA +<<<<<<< HEAD thA thA thA @@ -198690,6 +280073,19 @@ thA thA thA thA +======= +vzD +vzD +vzD +vzD +vzD +vzD +vzD +vzD +vzD +vzD +vzD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thA thA thA @@ -218597,7 +299993,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD aaX +======= +qzn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vbG hHG hHG @@ -218854,7 +300254,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD fhB +======= +liV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vbG hHG hHG @@ -219113,8 +300517,13 @@ wNO bln bln bln +<<<<<<< HEAD xDQ xDQ +======= +wDS +wDS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -219199,11 +300608,19 @@ wNO wNO wNO bln +<<<<<<< HEAD gnZ bln hcw lSu gnZ +======= +oEB +bln +hcw +lSu +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -219215,11 +300632,19 @@ wNO wNO wNO bln +<<<<<<< HEAD gnZ lSu weW bln gnZ +======= +oEB +lSu +weW +bln +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -219370,8 +300795,13 @@ wNO bln bln bln +<<<<<<< HEAD rPp rPp +======= +dTI +dTI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -219713,11 +301143,19 @@ wNO bln bln lSu +<<<<<<< HEAD eqn sEB sEB sEB sjU +======= +bln +sEB +sEB +sEB +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln lSu bln @@ -219729,11 +301167,19 @@ lSu bln lSu bln +<<<<<<< HEAD eqn sEB sEB sEB sjU +======= +bln +sEB +sEB +sEB +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln mQb bln @@ -220233,7 +301679,11 @@ tqR sEB fUR lSu +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jNZ sEB sEB @@ -220241,7 +301691,11 @@ sEB sEB sEB rzO +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lSu fUR sEB @@ -220740,7 +302194,11 @@ bln uer bln bln +<<<<<<< HEAD umb +======= +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR mXT cJt @@ -220756,14 +302214,22 @@ sEB sEB qVo lSu +<<<<<<< HEAD umb +======= +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR mXT cJt iMu fUR oqJ +<<<<<<< HEAD iWb +======= +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lSu lSu bln @@ -220771,7 +302237,11 @@ bln bln bln bln +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -220783,7 +302253,11 @@ aBR aBR aBR aBR +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aBR aBR aBR @@ -221012,7 +302486,11 @@ sEB sEB sEB sEB +<<<<<<< HEAD ntx +======= +rhJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lSu fUR fUR @@ -221034,7 +302512,11 @@ bln bln bln lSu +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aBR aBR aBR @@ -221252,6 +302734,7 @@ bln bln bln bln +<<<<<<< HEAD gnZ lSu fBN @@ -221259,6 +302742,15 @@ fUR irX kyg rwW +======= +oEB +lSu +xOk +fUR +kod +kyg +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -221272,15 +302764,25 @@ sEB uhx uhx uhx +<<<<<<< HEAD rwW jHX fJd +======= +uhx +jHX +tLm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR lSu fUR kod gFL +<<<<<<< HEAD rwW +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -221508,7 +303010,11 @@ bln lBD bln lSu +<<<<<<< HEAD hjU +======= +jNZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKU kKU rzO @@ -221772,7 +303278,11 @@ fUR fUR ykb wOy +<<<<<<< HEAD fHb +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -221786,7 +303296,11 @@ sEB uhx uhx uhx +<<<<<<< HEAD fHb +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bzg otG uhx @@ -221794,7 +303308,11 @@ lSu uhx ykb wOy +<<<<<<< HEAD fHb +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -222023,16 +303541,26 @@ bln bln miY fUR +<<<<<<< HEAD fNy xAk txd +======= +eYK +xAk +xaf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR uRx jdY rsw rin uhx +<<<<<<< HEAD caX +======= +rcS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sEB sEB sEB @@ -222042,7 +303570,11 @@ sEB sEB oMa uhx +<<<<<<< HEAD tbR +======= +pgt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dcG jXm otG @@ -222054,7 +303586,11 @@ jdY rsw phu uhx +<<<<<<< HEAD dsg +======= +jls +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln lSu bln @@ -222535,10 +304071,17 @@ bln bln fsm bln +<<<<<<< HEAD tIc fUR fUR mXH +======= +miY +fUR +fUR +kVA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wWS mVE nDJ @@ -222582,7 +304125,11 @@ bln bln bln bln +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aBR aBR aBR @@ -222803,7 +304350,11 @@ fld ycA lpH uhx +<<<<<<< HEAD oJH +======= +vCm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sEB sEB sEB @@ -222813,7 +304364,11 @@ sEB sEB fiv uhx +<<<<<<< HEAD jDS +======= +sjz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lKc uMm dvO @@ -222825,7 +304380,11 @@ fld ycA lpH uhx +<<<<<<< HEAD hgx +======= +pSK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln lSu bln @@ -223049,15 +304608,26 @@ bln bln bln bln +<<<<<<< HEAD hWW ydI ydI qKJ +======= +miY +ydI +ydI +nWM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kHl mVE nDJ wOy +<<<<<<< HEAD rwW +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -223071,7 +304641,11 @@ sEB uhx uhx uhx +<<<<<<< HEAD fHb +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bzg dvO uhx @@ -223079,7 +304653,11 @@ lSu uhx ovm wOy +<<<<<<< HEAD fHb +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -223301,9 +304879,15 @@ bln bln lBD bln +<<<<<<< HEAD bln bln hjU +======= +lSu +bln +jNZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKU kKU sEB @@ -223565,13 +305149,21 @@ hEI hEI biY biY +<<<<<<< HEAD kCY +======= +rkk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bLs xRI ydI ior wOy +<<<<<<< HEAD fHb +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -223585,7 +305177,11 @@ sEB uhx uhx uhx +<<<<<<< HEAD rwW +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bzg oVX fUR @@ -223593,7 +305189,11 @@ lSu fUR tvm wOy +<<<<<<< HEAD rwW +======= +uhx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhx uhx uhx @@ -223814,11 +305414,19 @@ bln bln bln bln +<<<<<<< HEAD bln stJ bln lJO cyV +======= +lSu +stJ +bln +lJO +dxI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 muv qVN biY @@ -223839,8 +305447,13 @@ prs sEB sEB sEB +<<<<<<< HEAD pJb waT +======= +fiv +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR fUR bAo @@ -224075,17 +305688,28 @@ bln bln lJO lJO +<<<<<<< HEAD jEB +======= +ldJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nOx cwe dIx laB laB lJO +<<<<<<< HEAD iku nDJ wOy jBK +======= +lXA +nDJ +wOy +pGy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR rzO lSu @@ -224112,19 +305736,31 @@ fUR bln uer bln +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lSu bln bln bln lSu +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aBR aBR aBR @@ -224367,7 +306003,11 @@ wOy eyk fUR bln +<<<<<<< HEAD iWb +======= +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -224589,14 +306229,21 @@ uer bln lJO kQg +<<<<<<< HEAD ylt ylV gfY +======= +ofc +ylV +gjI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lJO lJO lJO lJO fUR +<<<<<<< HEAD nmA oor fUR @@ -224604,16 +306251,30 @@ fUR fUR shT kHq +======= +lzU +wwi +fUR +fUR +fUR +wUf +iQd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oOP ccS ccS ccS lVY +<<<<<<< HEAD oHY +======= +hHl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xuW fUR fUR fUR +<<<<<<< HEAD gjN nuM fUR @@ -224621,11 +306282,24 @@ fUR fUR lSF tku +======= +ePV +eHX +fUR +fUR +fUR +drb +tuD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR fUR fUR fUR +<<<<<<< HEAD stJ +======= +rNn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -224841,7 +306515,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln lJO @@ -224853,24 +306531,39 @@ lJO fjF qhO lJO +<<<<<<< HEAD lIT qpt fBQ tHB +======= +iVv +qpt +fBQ +syL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vmC syL dwb fsv cuc hgr +<<<<<<< HEAD qsh +======= +fbF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hgr xFs fsv cmV bXx aui +<<<<<<< HEAD qTj +======= +bXx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 btW jJd eyj @@ -224878,9 +306571,15 @@ lGL bXx oMq tEc +<<<<<<< HEAD uUu sEg iVi +======= +iGd +mKJ +vKD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI tKI tKI @@ -225110,11 +306809,19 @@ ndz hjI xmo vmx +<<<<<<< HEAD uBL nvI nvI oTc cQa +======= +eTe +nvI +nvI +oTc +nvI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nvI fwM fsv @@ -225126,17 +306833,29 @@ xFs fsv dpU swK +<<<<<<< HEAD iCw +======= +swK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ubx swK swK swK wfF +<<<<<<< HEAD rUv nqD thX peM iES +======= +swK +nqD +thX +peM +ddd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mKa ldw bCQ @@ -225385,12 +307104,21 @@ jLM fUR fUR fUR +<<<<<<< HEAD koQ koQ fUR fUR fUR krW +======= +ort +ort +fUR +fUR +fUR +mYA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nEA nwT nwT @@ -225399,7 +307127,11 @@ nwT tKI pgE tKI +<<<<<<< HEAD iWb +======= +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lBD bln mQb @@ -225443,11 +307175,19 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln bln bln +======= +wNO +wNO +wNO +wNO +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -225612,8 +307352,13 @@ bln bln stJ bln +<<<<<<< HEAD bln bln +======= +lSu +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cyH hjI nbj @@ -225650,14 +307395,24 @@ fUR teE bKA nwT +<<<<<<< HEAD hAo tzM vgj +======= +wvJ +tzM +aUM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI bCQ tKI tKI +<<<<<<< HEAD bln +======= +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mQb bln bln @@ -225704,7 +307459,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -225869,7 +307628,11 @@ lBD bln bln uer +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln lJO lJO @@ -225947,12 +307710,21 @@ aBR bln bln bln +<<<<<<< HEAD bln bln bln bln bln bln +======= +mQb +bln +bln +bln +lSu +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -226147,7 +307919,11 @@ rMu kHP cuc mVE +<<<<<<< HEAD nAH +======= +ich +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nAH nAH mVE @@ -226155,13 +307931,21 @@ xFs jLM qHO fUR +<<<<<<< HEAD juu +======= +nyT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kBU xgX juu gNL fUR +<<<<<<< HEAD qAB +======= +usU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cTh iJl ooa @@ -226202,6 +307986,7 @@ aBR bln bln bln +<<<<<<< HEAD bln bln bln @@ -226213,6 +307998,19 @@ tCr tCr bln bln +======= +mQb +bln +mQb +bln +hAM +lej +eRE +qQk +tTO +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -226367,6 +308165,20 @@ bln bln bln bln +<<<<<<< HEAD +======= +lSu +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +bln +bln +<<<<<<< HEAD bln bln bln @@ -226376,13 +308188,14 @@ bln bln bln bln +======= +mQb +mQb bln bln bln -bln -bln -bln -bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln lJO cKB @@ -226460,6 +308273,7 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -226472,6 +308286,20 @@ bln bln bln bln +======= +mQb +uer +bln +bvb +tMa +bln +bln +bvb +tMa +uer +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -226620,6 +308448,7 @@ ozo bln bln bln +<<<<<<< HEAD tCr tCr tCr @@ -226641,6 +308470,29 @@ uer bln bln bln +======= +hPv +kdS +kdS +eRE +wvw +kdS +kdS +eRE +kdS +kdS +kdS +eRE +qQk +kdS +kdS +kdS +kdS +kdS +eRE +gSd +kdS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lJO gwM xdU @@ -226669,11 +308521,19 @@ xFs jLM iYy tma +<<<<<<< HEAD agG mxQ pXU pSd jsh +======= +juu +mxQ +pXU +kSA +vUI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUR tkc nsr @@ -226715,6 +308575,7 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -226730,6 +308591,23 @@ bln bln bln bln +======= +mQb +mQb +bln +bln +lSu +chn +bln +cnx +bln +chn +bln +bln +lSu +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -226876,8 +308754,13 @@ bln bln bln bln +<<<<<<< HEAD bln tCr +======= +mQb +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -226886,20 +308769,34 @@ bln bln bln muK +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln hty bln +<<<<<<< HEAD tCr bln bln +======= +mQb +bln +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mQb bln bln bln lJO +<<<<<<< HEAD keT +======= +eXa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sHO hjI lJO @@ -226918,7 +308815,11 @@ lvW uTI cuc mVE +<<<<<<< HEAD nAH +======= +ich +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nAH nAH mVE @@ -226935,14 +308836,22 @@ nwT goI nwT nwT +<<<<<<< HEAD aLO +======= +fZK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wRM iox tKI bCQ tKI tKI +<<<<<<< HEAD bln +======= +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stJ fsm bln @@ -226970,6 +308879,7 @@ aBR aBR bln bln +<<<<<<< HEAD bln tCr tCr @@ -226988,6 +308898,26 @@ tCr mVm tCr tCr +======= +mQb +hAM +lej +ujK +vTh +ujK +ujK +obe +bln +tmR +mQb +obe +ujK +lej +vTh +qQk +ujK +hAM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -227133,8 +309063,13 @@ bln bln bln bln +<<<<<<< HEAD bln tCr +======= +mQb +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -227143,16 +309078,28 @@ bln uei tmR uei +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei bln +<<<<<<< HEAD tCr bln bln bln bln +======= +mQb +bln +bln +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mQb bln lJO @@ -227181,12 +309128,21 @@ mVE mVE xFs pLn +<<<<<<< HEAD aDy tKI ljK tXs ljK rUa +======= +dpl +tKI +wKu +tXs +ljK +aRe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI hbt cTD @@ -227198,7 +309154,11 @@ tKI tKI kPq tKI +<<<<<<< HEAD qjC +======= +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -227228,23 +309188,38 @@ aBR bln bln bln +<<<<<<< HEAD tCr bln bln +======= +vap +bln +ntK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln tmR +<<<<<<< HEAD +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln +<<<<<<< HEAD bln bln tCr +======= +lSu +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -227389,10 +309364,21 @@ wNO bln bln bln +<<<<<<< HEAD bln bln tCr bln +======= +uer +bln +bvb +tMa +uei +tmR +uei +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -227401,12 +309387,17 @@ uei tmR uei bln +<<<<<<< HEAD uei tmR uei bln bln bln +======= +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -227440,14 +309431,24 @@ aWN pLn qFs tKI +<<<<<<< HEAD rvW +======= +mqa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xqj vsT gXr tKI +<<<<<<< HEAD rVt ihc bod +======= +gec +ihc +sJI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI hsQ bCQ @@ -227485,8 +309486,13 @@ aBR bln bln bln +<<<<<<< HEAD tCr bln +======= +fPc +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xxB xxB xxB @@ -227500,9 +309506,15 @@ xxB xxB xxB xxB +<<<<<<< HEAD bln tCr bln +======= +lSu +fPc +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -227645,6 +309657,7 @@ wNO wNO bln bln +<<<<<<< HEAD bln bln bln @@ -227667,6 +309680,30 @@ bln mQb bln bln +======= +mQb +bln +bln +ebW +mQb +uei +tmR +uei +bln +uei +tmR +uei +bln +uei +tmR +uei +bln +lSu +lSu +mQb +ntK +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uer bln mZm @@ -227694,7 +309731,11 @@ npq ecU gkZ tlO +<<<<<<< HEAD kyc +======= +udA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI tKI kJO @@ -227703,7 +309744,11 @@ kJO tKI tKI stP +<<<<<<< HEAD dVX +======= +vwi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oLo tKI iUW @@ -227742,8 +309787,13 @@ aBR bln bln bln +<<<<<<< HEAD tCr bln +======= +bvb +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tmR tmR tmR @@ -227758,7 +309808,11 @@ tmR tmR tmR bln +<<<<<<< HEAD tCr +======= +bvb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -227905,7 +309959,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -227919,11 +309977,18 @@ uei tmR uei bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD sxQ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln miY @@ -227941,7 +310006,11 @@ esv lCb ddZ eUA +<<<<<<< HEAD nhS +======= +aoc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oCO oCO oCO @@ -227953,11 +310022,19 @@ tKI tKI tKI tKI +<<<<<<< HEAD jXC wBb xvk wBb kQV +======= +hZo +wBb +xvk +wBb +uZC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI tKI tKI @@ -227969,6 +310046,7 @@ tKI lSu bln bln +<<<<<<< HEAD gnZ bln bln @@ -227978,6 +310056,17 @@ bln bln bln gnZ +======= +oEB +bln +bln +bln +oEB +bln +bln +bln +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -227997,9 +310086,15 @@ aBR aBR aBR bln +<<<<<<< HEAD bln bln tCr +======= +mQb +bln +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln xxB xxB @@ -228015,7 +310110,11 @@ xxB xxB xxB bln +<<<<<<< HEAD tCr +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -228159,10 +310258,17 @@ wNO wNO bln bln +<<<<<<< HEAD tCr tCr tCr bln +======= +hAM +kdS +kdS +obe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -228199,7 +310305,11 @@ eUi eBB tNd nor +<<<<<<< HEAD qiT +======= +sst +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cgw mZu hjv @@ -228210,13 +310320,21 @@ tKI dat kDv tKI +<<<<<<< HEAD kEs +======= +jEE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wBb fgo aSI nEq tKI +<<<<<<< HEAD kCv +======= +ybY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gvp nSr tKI @@ -228256,13 +310374,22 @@ aBR bln bln bln +<<<<<<< HEAD tCr bln bln +======= +uap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD +======= +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln sEB bln @@ -228272,8 +310399,13 @@ bln bln bln bln +<<<<<<< HEAD mVm bln +======= +fPc +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -228416,14 +310548,22 @@ wNO wNO bln bln +<<<<<<< HEAD tCr +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln tmR +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln tmR @@ -228435,8 +310575,13 @@ bln vsI eGr eGr +<<<<<<< HEAD oLO nhb +======= +eGr +hNJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sxF kjw biY @@ -228451,7 +310596,11 @@ bln efI efI lJO +<<<<<<< HEAD jaS +======= +mLd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hBG pEs aFH @@ -228478,7 +310627,11 @@ edN jLf tlm jLf +<<<<<<< HEAD dpZ +======= +fsj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI htd bln @@ -228512,8 +310665,13 @@ bln bln bln bln +<<<<<<< HEAD bln tCr +======= +lSu +dzZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln xxB xxB @@ -228529,7 +310687,11 @@ xxB xxB xxB bln +<<<<<<< HEAD tCr +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -228672,11 +310834,19 @@ wNO wNO wNO bln +<<<<<<< HEAD bln tCr bln fbh tZf +======= +mQb +yfW +tMa +cnx +tmR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tmR sEB sEB @@ -228711,7 +310881,11 @@ lJO wDf sAR sAR +<<<<<<< HEAD cBD +======= +lCn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kPy dQI pPT @@ -228770,8 +310944,13 @@ bln ozo bln bln +<<<<<<< HEAD tCr bln +======= +bvb +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tmR tmR tmR @@ -228786,8 +310965,13 @@ tmR tmR tmR bln +<<<<<<< HEAD tCr bln +======= +bvb +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -228929,6 +311113,7 @@ wNO wNO wNO bln +<<<<<<< HEAD bln tCr bln @@ -228937,6 +311122,12 @@ bln bln bln tmR +======= +mQb +vap +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -228946,6 +311137,7 @@ bln bln tmR bln +<<<<<<< HEAD sEB eGr eGr @@ -228955,6 +311147,21 @@ bvd eAh aiT hjI +======= +bln +mQb +tmR +mQb +sEB +eGr +eGr +eGr +pVN +bvd +eAh +biY +bhQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hjI hjI eUf @@ -228967,9 +311174,15 @@ lJO lJO mCT mut +<<<<<<< HEAD lGo xhg pGy +======= +kby +oLm +rbE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wCL tTc wtr @@ -229005,7 +311218,11 @@ lSu lSu lSu bln +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -229026,9 +311243,15 @@ bln bln bln bln +<<<<<<< HEAD bln tCr muK +======= +mQb +fPc +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xxB xxB xxB @@ -229043,7 +311266,11 @@ xxB xxB xxB bln +<<<<<<< HEAD tCr +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -229187,10 +311414,17 @@ wNO wNO bln bln +<<<<<<< HEAD tCr mVm tCr bln +======= +fYT +kdS +kdS +hPv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -229238,7 +311472,11 @@ qnj omg hzL kRc +<<<<<<< HEAD oWu +======= +lNV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 paZ tOw iKX @@ -229282,9 +311520,15 @@ bln bln bln bln +<<<<<<< HEAD bln bln mVm +======= +mQb +mQb +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -229293,6 +311537,7 @@ bln bln bln sEB +<<<<<<< HEAD bln bln bln @@ -229302,6 +311547,17 @@ bln bln tCr bln +======= +mQb +bln +bln +bln +mQb +bln +bln +ebW +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -229447,8 +311703,17 @@ bln bln bln bln +<<<<<<< HEAD bln bln +======= +fPc +mQb +uei +tmR +uei +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -229457,11 +311722,15 @@ uei tmR uei bln +<<<<<<< HEAD uei tmR uei bln bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln miY @@ -229492,7 +311761,11 @@ gpp lsi xhx qnj +<<<<<<< HEAD nct +======= +ddQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gAB ykG ykG @@ -229506,7 +311779,11 @@ kEM vkW gak tKI +<<<<<<< HEAD oKu +======= +dBJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI nMj bln @@ -229539,9 +311816,15 @@ bln bln bln bln +<<<<<<< HEAD bln bln tCr +======= +mQb +bln +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln xxB xxB @@ -229557,8 +311840,13 @@ xxB xxB xxB bln +<<<<<<< HEAD tCr bln +======= +chn +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -229701,11 +311989,19 @@ wNO wNO bln bln +<<<<<<< HEAD bln bln bln tCr bln +======= +mQb +uer +bln +oHg +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -229718,7 +312014,11 @@ uei tmR uei bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln miY @@ -229795,10 +312095,17 @@ bln bln uGo bln +<<<<<<< HEAD bln bln bln tCr +======= +mQb +mQb +bln +bvb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln tmR tmR @@ -229814,7 +312121,11 @@ tmR tmR tmR bln +<<<<<<< HEAD tCr +======= +bvb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -229958,11 +312269,19 @@ wNO wNO bln bln +<<<<<<< HEAD bln bln bln tCr bln +======= +mQb +mQb +bln +yfW +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -229975,7 +312294,11 @@ uei tmR uei bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lJO hEI lJO @@ -230006,7 +312329,11 @@ gpp bAB xEE qnj +<<<<<<< HEAD hlW +======= +aOx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ykG ykG rCj @@ -230025,6 +312352,7 @@ tKI mZf ooL maT +<<<<<<< HEAD wSM oMd maT @@ -230034,6 +312362,17 @@ maT sEB bln gnZ +======= +nNZ +oSK +maT +vEG +rEr +maT +sEB +bln +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -230052,10 +312391,17 @@ bln bln cWX bln +<<<<<<< HEAD bln bln bln tCr +======= +mQb +lSu +bln +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln xxB xxB @@ -230071,7 +312417,11 @@ xxB xxB xxB bln +<<<<<<< HEAD tCr +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -230215,10 +312565,17 @@ wNO wNO bln bln +<<<<<<< HEAD bln bln bln tCr +======= +uer +mQb +lSu +wOq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -230232,7 +312589,11 @@ uei tmR uei bln +<<<<<<< HEAD tCr +======= +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lJO khW iSn @@ -230282,11 +312643,19 @@ tKI maT maT maT +<<<<<<< HEAD sym bde jIE bde ksf +======= +xmk +bde +kXr +aRx +kjd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 maT miY xeg @@ -230311,12 +312680,21 @@ cWX bln bln bln +<<<<<<< HEAD bln tCr bln bln bln bln +======= +lSu +pMM +bln +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -230328,7 +312706,11 @@ bln bln bln bln +<<<<<<< HEAD tCr +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -230472,10 +312854,18 @@ wNO wNO bln bln +<<<<<<< HEAD bln bln bln tCr +======= +lSu +bln +bln +vap +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -230489,7 +312879,10 @@ bln bln bln bln +<<<<<<< HEAD tCr +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lJO gDZ gDZ @@ -230528,7 +312921,11 @@ neq muy muy gRp +<<<<<<< HEAD sbv +======= +kjh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI plg jdW @@ -230539,16 +312936,28 @@ tKI cYo tEL maT +<<<<<<< HEAD wSM hFU kXr hFU bNo +======= +nNZ +jME +kXr +hTk +rEr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 maT mZf kKU kKU +<<<<<<< HEAD dPX +======= +vJv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -230566,6 +312975,7 @@ bln bln cWX bln +<<<<<<< HEAD bln bln bln @@ -230575,10 +312985,22 @@ tCr bln bln bln +======= +lSu +bln +mQb +fPc +mQb +lSu +lSu +uer +nAx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln sEB tmR sEB +<<<<<<< HEAD bln bln bln @@ -230586,6 +313008,15 @@ bln tCr tCr tCr +======= +mQb +cIf +gSd +ahG +ujK +ujK +obe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -230732,6 +313163,7 @@ bln bln bln bln +<<<<<<< HEAD tCr tCr tCr @@ -230747,6 +313179,23 @@ tCr tCr tCr tCr +======= +obe +kdS +kdS +eRE +xAs +kdS +kdS +eRE +wvw +kdS +qQk +eRE +kdS +hBf +kdS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lJO gLZ cXp @@ -230798,7 +313247,11 @@ kLZ jPc xKj hyY +<<<<<<< HEAD pdR +======= +xDu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 huI gbv maT @@ -230806,7 +313259,11 @@ kXr maT maT kXr +<<<<<<< HEAD bln +======= +htd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -230823,6 +313280,7 @@ bln bln cWX bln +<<<<<<< HEAD bln bln bln @@ -230831,13 +313289,28 @@ bln bln bln bln +======= +lSu +bln +mQb +fPc +bln +mQb +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln jlJ jWl jlJ +<<<<<<< HEAD bln bln +======= +aMZ +vap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -230987,18 +313460,31 @@ wNO bln bln bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln vbG bln +======= +mQb +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231023,7 +313509,11 @@ lJO qzs jnV lJO +<<<<<<< HEAD sHy +======= +tdY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gHS iMT hqx @@ -231059,7 +313549,11 @@ kVl czv cCW wyB +<<<<<<< HEAD gTb +======= +mSP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wyB tEj maT @@ -231077,17 +313571,27 @@ bln bln bln bln +<<<<<<< HEAD riT uqG bln bln bln bln +======= +xYt +atB +bln +bln +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj pRj pRj pRj pRj +<<<<<<< HEAD pRj bln jlJ @@ -231098,6 +313602,18 @@ bln bln bln bln +======= +mNY +bln +jlJ +hTq +jlJ +bln +chn +bln +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231246,20 +313762,34 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln bln vbG +======= +lSu +lSu +bln +bln +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln uer bln mQb bln +<<<<<<< HEAD bln stJ bln +======= +ntK +stJ +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231318,8 +313848,13 @@ huI huI huI uqg +<<<<<<< HEAD ndK kXr +======= +pUi +maT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231336,6 +313871,7 @@ ptf pRj pRj uqG +<<<<<<< HEAD sEB sEB sEB @@ -231354,6 +313890,26 @@ jlJ bln bln bln +======= +kKU +kKU +rzO +bln +pRj +emx +kpn +awt +wAW +mNY +nxm +jlJ +rbb +jlJ +jlJ +obe +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231499,15 +314055,26 @@ wNO wNO wNO bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln ozo bln bln +<<<<<<< HEAD bln bln bln vbG +======= +lSu +mQb +bln +uap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln fsm lBD @@ -231517,7 +314084,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln lJO @@ -231564,7 +314135,11 @@ hbY tKI tKI tKI +<<<<<<< HEAD ghl +======= +kUF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ajw ajw otd @@ -231575,8 +314150,13 @@ otd otd uqn kLZ +<<<<<<< HEAD huI maT +======= +jcJ +kXr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231602,15 +314182,24 @@ rej iaT daS swS +<<<<<<< HEAD cRX +======= +mNY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mNY smj smj iCX glh bln +<<<<<<< HEAD bln bln +======= +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231756,6 +314345,7 @@ wNO wNO wNO bln +<<<<<<< HEAD bln bln bln @@ -231766,6 +314356,18 @@ bln bln vbG bln +======= +mQb +bln +ntK +bln +lSu +lSu +mQb +bln +ebW +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -231805,7 +314407,11 @@ hMg cke kTC qnj +<<<<<<< HEAD qwn +======= +dei +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wpC vZg gta @@ -231839,7 +314445,11 @@ qjQ qjQ qjQ qjQ +<<<<<<< HEAD rLo +======= +jDl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qjQ bln bln @@ -231849,7 +314459,11 @@ qPw csE hRw pRj +<<<<<<< HEAD vZW +======= +eDJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ptf daS ptf @@ -231861,12 +314475,21 @@ mRU qAI snw mNY +<<<<<<< HEAD kkp ooU ipE glh bln bln +======= +qDS +ooU +ipE +glh +mQb +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -232013,6 +314636,7 @@ wNO wNO wNO bln +<<<<<<< HEAD bln bln bln @@ -232027,6 +314651,22 @@ bln bln bln bln +======= +uer +bln +bln +lSu +lSu +bln +uer +bln +fPc +bln +lSu +bln +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stJ bln bln @@ -232047,7 +314687,11 @@ hEI lJO lJO dDV +<<<<<<< HEAD sFN +======= +oaR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lJO lJO lJO @@ -232104,26 +314748,44 @@ ptf hZQ cZN ybu +<<<<<<< HEAD jYL pRj ycS vGi lDr sup +======= +qrr +pRj +ycS +pRj +lDr +pRj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ptf pRj kqK dnM swS mXN +<<<<<<< HEAD vUz +======= +gDv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mNY qIf fFx czR glh +<<<<<<< HEAD bln bln +======= +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -232271,6 +314933,7 @@ wNO wNO bln bln +<<<<<<< HEAD bln bln bln @@ -232279,11 +314942,25 @@ bln bln bln vbG +======= +hMQ +mQb +bln +bln +bln +hMQ +bln +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln stJ bln +<<<<<<< HEAD bln +======= +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -232340,7 +315017,11 @@ ajw mmi wiz mmi +<<<<<<< HEAD vmn +======= +sln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wam wam wam @@ -232352,9 +315033,15 @@ ajw tAS hoD hoD +<<<<<<< HEAD gAY wjZ sJn +======= +hoD +wjZ +get +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qjQ bln ptf @@ -232363,6 +315050,7 @@ sUS ybu vUW pRj +<<<<<<< HEAD nkI daS daS @@ -232381,6 +315069,26 @@ mNY glh bln bln +======= +mKA +yiR +daS +iJh +wRu +pRj +pRj +kuR +kCC +lDh +pRj +mNY +mNY +pyI +mNY +glh +mQb +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -232528,6 +315236,7 @@ aBR tGr tGr tGr +<<<<<<< HEAD mSQ atc atc @@ -232537,6 +315246,17 @@ pLe tGr tCj sDl +======= +umh +jZo +jZo +jZo +jZo +umh +tGr +xAs +jbe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -232563,14 +315283,22 @@ hEI hjI wPr oSy +<<<<<<< HEAD sDl +======= +pLg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybQ ybQ ybQ ybQ ybQ ybQ +<<<<<<< HEAD sDl +======= +vsF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jOt ozw eRw @@ -232578,7 +315306,11 @@ gpp gJz nQv nDY +<<<<<<< HEAD tEu +======= +tzP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tKI wuA nAr @@ -232590,7 +315322,11 @@ nAr nAr wNR tKI +<<<<<<< HEAD ssg +======= +jnp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ajw ajw ajw @@ -232820,14 +315556,22 @@ hEI hjI wPr oSy +<<<<<<< HEAD sSA +======= +sDl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybQ gGZ lye ebL edn ybQ +<<<<<<< HEAD sDl +======= +sCK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jOt ozw aJA @@ -232854,7 +315598,11 @@ vlN ajw wiz ajw +<<<<<<< HEAD vmn +======= +nNu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wam wam wam @@ -232877,7 +315625,11 @@ ace ybu thW pRj +<<<<<<< HEAD uhX +======= +ntO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dnM nzp wEW @@ -233083,22 +315835,36 @@ oPI khR khR eRh +<<<<<<< HEAD uiM +======= +ybQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jOt jOt ozw aJA xSL gJz +<<<<<<< HEAD uXy +======= +eUx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 imO kGF tKI wBb tKI +<<<<<<< HEAD skw ipF qpp +======= +xua +llR +fOs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dsf xjF xem @@ -233125,12 +315891,20 @@ jAq qxb nrm hoD +<<<<<<< HEAD rea +======= +qIP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qjQ bln pRj vSE +<<<<<<< HEAD eGX +======= +mqI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qOl ujj pRj @@ -233138,7 +315912,11 @@ dOH hjH qTS dNC +<<<<<<< HEAD xBX +======= +iRJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj wls qxY @@ -233147,11 +315925,19 @@ cjL gfC pRj daS +<<<<<<< HEAD viE pRj pRj pRj vsI +======= +mxg +pRj +pRj +pRj +oMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -233341,7 +316127,11 @@ bnz jxq sOz vGI +<<<<<<< HEAD ptk +======= +oRZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lEE idO aJA @@ -233351,9 +316141,15 @@ tKI tKI tKI tKI +<<<<<<< HEAD qRR tKI aes +======= +blY +tKI +wrP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alT taf kGQ @@ -233391,11 +316187,19 @@ kYF jOJ qzM pRj +<<<<<<< HEAD dOH uIx osI osI hjH +======= +qFC +uIx +osI +osI +xbq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj nDy hUI @@ -233404,11 +316208,19 @@ nVR iWZ bse xHe +<<<<<<< HEAD pBB lPE daS nNr sEB +======= +oBZ +lPE +daS +nNr +qVo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -233558,7 +316370,11 @@ tGr bln bln bln +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln tGr tGr @@ -233610,7 +316426,11 @@ pdf pdf wBb tKI +<<<<<<< HEAD pPE +======= +aiQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alT dcs kin @@ -233646,6 +316466,7 @@ pRj csE kSD csE +<<<<<<< HEAD nOk pRj xOl @@ -233653,6 +316474,15 @@ hjH daS pXv kNZ +======= +uwd +pRj +poO +hjH +daS +pXv +kEC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj bxV uKP @@ -233661,11 +316491,19 @@ hUI lLm mLa qSY +<<<<<<< HEAD pRj pRj pRj pRj vsI +======= +daS +pRj +igG +pRj +qVo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -233848,14 +316686,22 @@ hEI hjI xJJ oSy +<<<<<<< HEAD sSA +======= +sDl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybQ egF jYV jDW hPf ybQ +<<<<<<< HEAD sDl +======= +eaG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jOt ozw ons @@ -233868,11 +316714,19 @@ tKI wBb bcx qiK +<<<<<<< HEAD tda lit qiP noF dqV +======= +rrB +lit +qiP +fgc +obQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nxD rbC kXr @@ -233900,7 +316754,11 @@ qjQ bln bln pRj +<<<<<<< HEAD rKQ +======= +wVr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 drs pRj pRj @@ -233919,10 +316777,17 @@ pRj pRj wFg pRj +<<<<<<< HEAD bln bln bln bln +======= +pRj +pRj +pRj +eHC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -234105,21 +316970,33 @@ hEI hjI wPr oSy +<<<<<<< HEAD sDl +======= +pLg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybQ ybQ ybQ ybQ ybQ ybQ +<<<<<<< HEAD sDl +======= +vsF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jOt ozw ons gpp lGz pMv +<<<<<<< HEAD qaD +======= +bso +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dBB tKI wBb @@ -234154,15 +317031,24 @@ qdC jBf dhY qjQ +<<<<<<< HEAD sEB sEB +======= +oot +oot +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj daS tut qai qoK pXv +<<<<<<< HEAD exy +======= +pXv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pXv pXv pXv @@ -234177,9 +317063,15 @@ ptf xHe ptf bln +<<<<<<< HEAD bln bln bln +======= +uer +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -234389,7 +317281,11 @@ tKI dMv pdf tKI +<<<<<<< HEAD drG +======= +iUM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ssc cXl wRx @@ -234435,8 +317331,13 @@ xHe ptf bln bln +<<<<<<< HEAD bln bln +======= +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -234583,7 +317484,11 @@ tGr miY bln bln +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mZf bln lSu @@ -234617,7 +317522,11 @@ lJO lJO lJO lJO +<<<<<<< HEAD mzy +======= +kcZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 biY biY sDl @@ -234878,19 +317787,32 @@ sTj hos biY sDl +<<<<<<< HEAD uqV sDl hDU ksU cFX fHY +======= +sDl +sDl +hDU +dAQ +fVU +iYe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hDU gpp aJA gpp fUr pMv +<<<<<<< HEAD cOb +======= +eAQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pHy tKI tKI @@ -234905,8 +317827,13 @@ rCC gLN rCC eVl +<<<<<<< HEAD wBF uDr +======= +rCC +dXh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cHb cHb mOA @@ -234939,7 +317866,11 @@ bln bln bln bln +<<<<<<< HEAD sEB +======= +jNZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nME bln bln @@ -235138,7 +318069,11 @@ hDU hDU hDU hDU +<<<<<<< HEAD heG +======= +lyy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aJm iFj hDU @@ -235182,8 +318117,13 @@ hoD abz qjQ qjQ +<<<<<<< HEAD sEB sEB +======= +oot +oot +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj uWW daS @@ -235195,9 +318135,15 @@ bln bln bln bln +<<<<<<< HEAD sEB xbV sEB +======= +jNZ +xbV +qVo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235207,7 +318153,11 @@ ptf bln bln bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235391,10 +318341,17 @@ hEI qGU biY biY +<<<<<<< HEAD kqx mQh xKb vMc +======= +mSY +mQh +xKb +njD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMW apI tOi @@ -235432,7 +318389,11 @@ nZh lNG tue qjQ +<<<<<<< HEAD hxE +======= +jBf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nvx lis aud @@ -235454,7 +318415,11 @@ bln bln fkF cPp +<<<<<<< HEAD sEB +======= +rwt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235462,11 +318427,19 @@ ptf xHe ptf bln +<<<<<<< HEAD bln bln bln bln bln +======= +ntK +bln +mQb +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235681,7 +318654,11 @@ vlL qxQ eBe hnC +<<<<<<< HEAD qmi +======= +cah +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aSh ycQ nZh @@ -235710,7 +318687,11 @@ bln bln bln bln +<<<<<<< HEAD sEB +======= +lbc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235721,7 +318702,11 @@ ptf bln bln bln +<<<<<<< HEAD sEB +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235743,8 +318728,13 @@ bln bln bln bln +<<<<<<< HEAD tCr tCr +======= +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235921,7 +318911,11 @@ wvK aKs tgH gst +<<<<<<< HEAD vSw +======= +iXM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vWW vWW vWW @@ -235967,7 +318961,11 @@ bln bln bln bln +<<<<<<< HEAD sEB +======= +tIC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -235989,6 +318987,7 @@ eoL ptf bln bln +<<<<<<< HEAD tCr tCr tCr @@ -236003,6 +319002,22 @@ bln bln tCr tCr +======= +mQb +bln +bln +bln +bln +bln +mQb +bln +bln +bln +bln +bln +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -236155,7 +319170,11 @@ bln bln lJO oXf +<<<<<<< HEAD rlX +======= +xSx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fdF lJO vqS @@ -236178,15 +319197,24 @@ kFu sJr vBu gst +<<<<<<< HEAD iFh +======= +sbY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xAy xAy tge ozH bZg gst +<<<<<<< HEAD tZR nsq +======= +hYG +jYG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dOw dOw yhe @@ -236246,11 +319274,18 @@ nkO ptf bln bln +<<<<<<< HEAD tCr +======= +uer +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -236260,6 +319295,15 @@ bln bln bln tCr +======= +uer +bln +bln +mQb +bln +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -236381,7 +319425,11 @@ tGr tGr bln jNZ +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jNZ bln ntK @@ -236411,7 +319459,11 @@ bln bln dvY lJO +<<<<<<< HEAD eKX +======= +nLE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 erl oDH fVm @@ -236419,10 +319471,17 @@ ndz oIB biY biY +<<<<<<< HEAD hhN iLi oJT spV +======= +gNC +iLi +oJT +wwO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gad gAk tMI @@ -236440,10 +319499,17 @@ sto lpj gst gst +<<<<<<< HEAD oiK bLW xjP sXf +======= +npP +bLW +xjP +qcI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gxO dKK xmN @@ -236460,7 +319526,11 @@ iOS mYs fxn pRj +<<<<<<< HEAD kCn +======= +mgo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 daS pRj iaT @@ -236497,12 +319567,17 @@ lDF wSU ovy pRj +<<<<<<< HEAD bHZ +======= +qYR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qvk tXb ptf bln bln +<<<<<<< HEAD tCr tCr tCr @@ -236515,6 +319590,20 @@ tCr bln bln bln +======= +bln +bln +mQb +bln +lSu +bln +mQb +mQb +bln +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -236684,9 +319773,15 @@ biY biY biY biY +<<<<<<< HEAD wkC lnE wkC +======= +ede +iKj +bPp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bXm lnc lnc @@ -236707,11 +319802,19 @@ wEh rCC sOn aBh +<<<<<<< HEAD tNY dqX aBh sOn rzm +======= +eaE +wkN +aBh +sOn +sOn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tue tue tue @@ -236748,7 +319851,11 @@ suR pRj pRj ick -pRj +<<<<<<< HEAD +pRj +======= +ivm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj pRj mNY @@ -236758,6 +319865,7 @@ mNY mNY mNY mNY +<<<<<<< HEAD bln bln bln @@ -236773,6 +319881,23 @@ bln bln bln bln +======= +hPv +lej +hBf +eRE +ujK +ujK +eRE +ujK +ujK +eRE +ujK +hPv +bln +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -236918,6 +320043,7 @@ xAs xAs xAs xAs +<<<<<<< HEAD tCj wPN wPN @@ -236926,6 +320052,16 @@ aeV lJO lJO vNK +======= +xAs +hIv +wPN +wPN +lJO +lJO +lJO +otM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hDc wGG psR @@ -236956,8 +320092,13 @@ bep dnq gOy dnq +<<<<<<< HEAD sIg pTB +======= +srw +yld +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pTB pTB pTB @@ -236968,8 +320109,13 @@ dnq dyN rGl hJE +<<<<<<< HEAD kzC wLU +======= +vYA +hzV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rGl vTo oMO @@ -236979,7 +320125,11 @@ ptd obj obj obj +<<<<<<< HEAD iAt +======= +obj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 obj obj obj @@ -237013,6 +320163,7 @@ gBv tjH aUK gGs +<<<<<<< HEAD qAq aUj aUj @@ -237031,6 +320182,26 @@ tCr tCr tCr bln +======= +bbU +aUj +aUj +nce +mQb +mQb +bln +lSu +bln +mQb +mQb +bln +bln +yfW +fCR +ujK +ujK +dMo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -237180,15 +320351,24 @@ sDl sDl sDl hEI +<<<<<<< HEAD iwj kEB +======= +sop +bJX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fFb rtq lJO lJO lJO lJO +<<<<<<< HEAD baE +======= +htJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 apX hjI hdh @@ -237213,7 +320393,11 @@ cKq cKq qsy iwz +<<<<<<< HEAD oTg +======= +dLQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iwz xwC jwt @@ -237226,7 +320410,11 @@ rQn iwz iwz iwz +<<<<<<< HEAD eYP +======= +uag +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iwz nQO bmv @@ -237267,7 +320455,11 @@ mXa qCl mNY aUj +<<<<<<< HEAD uNu +======= +vWy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kLc oFY sIN @@ -237283,11 +320475,19 @@ pXY vyU uOE bln +<<<<<<< HEAD bln tCr bln tCr bln +======= +chb +bln +ntK +bln +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -237437,9 +320637,15 @@ sDl sDl sDl hEI +<<<<<<< HEAD giR rkd rmU +======= +nFG +sjp +rqk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ure lJO bZx @@ -237470,8 +320676,13 @@ xIS mgj mgj mgj +<<<<<<< HEAD mZS mgV +======= +srw +jOy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ljp gHe sni @@ -237479,11 +320690,19 @@ bep qrJ uLC xzh +<<<<<<< HEAD dnq qcu bDR wXW mpy +======= +aNE +qcu +bDR +wXW +cYj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bep ylU dnq @@ -237504,7 +320723,11 @@ pRj rAO fhW mNY +<<<<<<< HEAD vjx +======= +anz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mDf nLb kNp @@ -237521,8 +320744,13 @@ kCn kCn kCn kCn +<<<<<<< HEAD xtX azC +======= +ioQ +jMn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pZG toq uDE @@ -237530,7 +320758,11 @@ xFB rkc gxR uaG +<<<<<<< HEAD kAK +======= +iLY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iLY iLY bxa @@ -237540,12 +320772,21 @@ pXY pXY fcP bln +<<<<<<< HEAD bln tCr bln tCr bln bln +======= +chb +bln +mQb +bln +bvb +jHb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ozo bln bln @@ -237680,7 +320921,11 @@ ooL tDg tDg oFI +<<<<<<< HEAD gnZ +======= +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sgW akQ lSu @@ -237699,15 +320944,26 @@ lJO lJO lJO lJO +<<<<<<< HEAD wrN bZx bWn huM +======= +bZx +bZx +bWn +seL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nUr ibk xwr xgg +<<<<<<< HEAD aFx +======= +xId +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 whQ kka fmm @@ -237734,14 +320990,22 @@ gfb pYB gfb gfb +<<<<<<< HEAD nqU +======= +vtg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rcE rcE rcE hVc jII jII +<<<<<<< HEAD dnq +======= +rLl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ylU dnq jII @@ -237752,7 +321016,11 @@ jqT hcL hcL bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -237793,6 +321061,7 @@ iLY lqE pXY pXY +<<<<<<< HEAD vyU vyU uOE @@ -237802,6 +321071,17 @@ tCr bln tCr bln +======= +pXY +pXY +uOE +bln +chb +bln +uer +bln +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -237940,10 +321220,17 @@ kyy cJi abb oFI +<<<<<<< HEAD gnZ abb oFI gnZ +======= +oEB +abb +oFI +oEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 abb oFI rzG @@ -237955,7 +321242,11 @@ bZx bZx bZx bZx +<<<<<<< HEAD snv +======= +mgs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kQi oWk bWn @@ -237976,11 +321267,19 @@ pAZ ucn tLi pAZ +<<<<<<< HEAD xyl dnq qjm dxK hbp +======= +tVd +uLC +jCT +dxK +xax +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oyp phf sEl @@ -237991,9 +321290,15 @@ odN iZq dpH gfb +<<<<<<< HEAD ydT iIA fSC +======= +mYG +iIA +fGQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iIA cvg qQb @@ -238002,15 +321307,24 @@ okb ylU jwl jII +<<<<<<< HEAD bln +======= +kps +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hcL bXF kcm mGm hcL bln +<<<<<<< HEAD bln bln +======= +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln ptf ptf @@ -238026,12 +321340,20 @@ fxR aQR csT csT +<<<<<<< HEAD cQH +======= +csT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mNY kCn mNY dUn +<<<<<<< HEAD eEm +======= +thC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cpH kbJ kbJ @@ -238042,14 +321364,21 @@ epY vWe kIt kMY +<<<<<<< HEAD wRc lha kAK +======= +omT +lha +iLY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iLY iLY bxa pXY pXY +<<<<<<< HEAD vyU vyU xLS @@ -238059,6 +321388,17 @@ tCr bln tCr bln +======= +pXY +pXY +xLS +bln +chb +bln +lSu +bln +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -238212,11 +321552,19 @@ bZx bZx bZx bZx +<<<<<<< HEAD snv krQ skZ bWn eOK +======= +gYm +krQ +skZ +bWn +nch +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMX xIz bIc @@ -238233,11 +321581,19 @@ pAZ wtj lBD bcN +<<<<<<< HEAD bQV hIS bfl dxK wvw +======= +qzy +adP +adP +dxK +wzk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wzk wzk wzk @@ -238294,14 +321650,22 @@ kbJ kbJ wkw yaL +<<<<<<< HEAD wrc +======= +saO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eVV rat dNG sth aUj aUj +<<<<<<< HEAD stI +======= +rNZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iLY iLY lqE @@ -238311,6 +321675,7 @@ pXY vyU uOE bln +<<<<<<< HEAD bln tCr bln @@ -238318,6 +321683,15 @@ tCr bln bln bln +======= +chb +bln +mQb +bln +chb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -238446,15 +321820,24 @@ aWk diC bJj lyG +<<<<<<< HEAD jko +======= +teq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bXy feJ xWb jDM brx rai +<<<<<<< HEAD twP sPK +======= +amn +hzG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wZD iDq bln @@ -238469,11 +321852,19 @@ bZx bZx bZx bZx +<<<<<<< HEAD snv krQ gYp bWn lvm +======= +gYm +krQ +gYp +bWn +iUO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 egL ssF pSu @@ -238491,7 +321882,11 @@ mQb bNy qWZ oVR +<<<<<<< HEAD jOi +======= +apo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oVR dxK xVq @@ -238505,12 +321900,21 @@ dkb kmi iYb xaA +<<<<<<< HEAD vXV wjv pec fJl xMR bJy +======= +ovx +gMq +pec +fJl +xMR +fYE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cpm dnq ylU @@ -238518,9 +321922,15 @@ dnq paM paM hcL +<<<<<<< HEAD fUI hdj ssr +======= +jqT +hdj +jqT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hcL paM paM @@ -238532,7 +321942,11 @@ pRj pRj daS mNY +<<<<<<< HEAD prF +======= +gFI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bdR xaI xaI @@ -238558,7 +321972,11 @@ ycB qtj qtj aUj +<<<<<<< HEAD kAK +======= +iLY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iLY iLY bxa @@ -238567,6 +321985,7 @@ pXY pXY pXY fcP +<<<<<<< HEAD bln bln tCr @@ -238575,6 +321994,16 @@ tCr bln bln bln +======= +lSu +chb +bln +uer +mQb +bvb +tMa +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -238715,10 +322144,17 @@ fDc eGA iDq jSt +<<<<<<< HEAD kvh wPN tCj sDl +======= +mfH +wPN +xAs +jbe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sDl sDl bHI @@ -238726,11 +322162,19 @@ bZx bZx bZx bZx +<<<<<<< HEAD snv krQ thI bWn oQE +======= +gYm +krQ +thI +bWn +tsz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMX hSl ueS @@ -238747,9 +322191,15 @@ pAZ stJ fsm qWZ +<<<<<<< HEAD aDZ mpP uLp +======= +lvA +gKU +aoW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dxK fbw hue @@ -238767,7 +322217,11 @@ ool jRC cgC jaq +<<<<<<< HEAD cua +======= +vvT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cpm dnq ylU @@ -238808,14 +322262,24 @@ yaL yaL yaL yaL +<<<<<<< HEAD sSJ +======= +pmi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bTF nHe jDP wTg +<<<<<<< HEAD jWJ gyR clG +======= +bRj +gyR +fhX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kAK iLY lqE @@ -238825,11 +322289,19 @@ pXY pXY uOE bln +<<<<<<< HEAD bln tCr bln tCr bln +======= +yfW +jKQ +bln +mQb +ebW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -238983,7 +322455,11 @@ bZx bZx bZx bZx +<<<<<<< HEAD snv +======= +gYm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 krQ gYp bWn @@ -239001,6 +322477,7 @@ xhw eJe pXn pAZ +<<<<<<< HEAD nyE qWZ qWZ @@ -239009,6 +322486,16 @@ ldT qWZ dxK wzk +======= +jDB +qWZ +qWZ +qWZ +wrk +qWZ +dxK +cct +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hue xit wfK @@ -239018,7 +322505,11 @@ iYb iYb iYb iYb +<<<<<<< HEAD rpu +======= +kFW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybI nnR tuz @@ -239026,11 +322517,19 @@ eRZ qpZ rAA cpm +<<<<<<< HEAD mpy sYu ckc paM sqq +======= +ooV +bwD +qdI +paM +pdg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nBk nBk oSY @@ -239038,7 +322537,11 @@ nBk nBk aCX paM +<<<<<<< HEAD gZk +======= +tUG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jZU uFh hwx @@ -239061,7 +322564,11 @@ mNY akL tvF tvF +<<<<<<< HEAD aYS +======= +qya +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gTK ruO fKe @@ -239070,10 +322577,17 @@ aQW pVK wRd gGt +<<<<<<< HEAD yhC rIX kAK nRV +======= +uJR +rIX +iLY +lqE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fcP cSx vyU @@ -239082,6 +322596,7 @@ vyU vyU fcP bln +<<<<<<< HEAD bln tCr tCr @@ -239090,6 +322605,16 @@ bln bln bln bln +======= +pMM +mQb +lSu +bln +fYT +tTO +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -239240,27 +322765,48 @@ bZx bZx bZx bZx +<<<<<<< HEAD snv gMK huT bWn exq +======= +gYm +gMK +huT +bWn +ukJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xMX vvu joh mdM +<<<<<<< HEAD bZB rDq iMw wZp +======= +wBa +fSP +iMw +rRd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bWn piB eJe utR pAZ +<<<<<<< HEAD lBD qWZ qHD +======= +kIL +qWZ +vij +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bMZ paK aVH @@ -239288,7 +322834,11 @@ ylU bep paM xxQ +<<<<<<< HEAD nnM +======= +gMl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kzO gdP ykL @@ -239336,6 +322886,7 @@ aZH fDn fDn gka +<<<<<<< HEAD bln bln bln @@ -239347,6 +322898,19 @@ bln bln bln bln +======= +uMs +mQb +bln +fPc +mQb +bln +bln +bln +chb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -239487,7 +323051,11 @@ iDq iDq ciG mfH +<<<<<<< HEAD sDl +======= +jbe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sDl sDl sDl @@ -239497,7 +323065,11 @@ bZx bZx bZx bZx +<<<<<<< HEAD snv +======= +gYm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lwO vTg bWn @@ -239521,7 +323093,11 @@ xCv vWL nci tPC +<<<<<<< HEAD uks +======= +xkI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gnM aHW clP @@ -239531,7 +323107,11 @@ clP clP clP clP +<<<<<<< HEAD rya +======= +rwn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eWc nDA vvi @@ -239539,7 +323119,11 @@ xpJ vYs suL gCn +<<<<<<< HEAD hUl +======= +qIx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dZQ aNs dnq @@ -239552,7 +323136,11 @@ nBk nBk iiT paM +<<<<<<< HEAD jZU +======= +wxY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hFi bts nlr @@ -239600,10 +323188,17 @@ gka gka gka gka +<<<<<<< HEAD bln tCr tCr tCr +======= +aao +bvb +tMa +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -239737,7 +323332,11 @@ feJ uGr uGr iDq +<<<<<<< HEAD pLx +======= +jBr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lAL gPp iDq @@ -239755,10 +323354,17 @@ psN psN psN wqx +<<<<<<< HEAD gEb gYp bWn tEn +======= +cJd +gYp +bWn +bTJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cGt wRI qdE @@ -239768,6 +323374,7 @@ ntK mQb bln jII +<<<<<<< HEAD gMx lsH jJr @@ -239775,15 +323382,32 @@ qWZ qWZ qWZ bpf +======= +ooV +wTL +eff +qWZ +qWZ +qWZ +svR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xRw nYv qVp xKJ +<<<<<<< HEAD rmM pZh oYI aCk uPY +======= +veH +pZh +oYI +aCk +wzk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 knU kPv dxK @@ -239837,7 +323461,11 @@ dth bTF wRd gka +<<<<<<< HEAD swe +======= +igw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lAu vWr vWr @@ -239858,9 +323486,15 @@ lhC maY gka bln +<<<<<<< HEAD tCr bln tCr +======= +chb +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -240034,7 +323668,11 @@ grA fwQ nOH gxU +<<<<<<< HEAD jJR +======= +gZq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybv ybv ybv @@ -240114,10 +323752,17 @@ brY lhC lhC gka +<<<<<<< HEAD bln tCr bln tCr +======= +lSu +chb +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -240264,7 +323909,11 @@ sDl sDl sDl psN +<<<<<<< HEAD eUR +======= +xir +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nTp nTp kxp @@ -240272,7 +323921,11 @@ kQc cxz nnx bWn +<<<<<<< HEAD sfz +======= +rkV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 npu oMS npu @@ -240282,7 +323935,11 @@ nSo jII pAZ pAZ +<<<<<<< HEAD dnq +======= +rLl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJe utR tmQ @@ -240315,7 +323972,11 @@ dnq vrX pua paM +<<<<<<< HEAD pEY +======= +wik +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vJI uud gdP @@ -240323,7 +323984,11 @@ pjl uOn msU paM +<<<<<<< HEAD khu +======= +lxi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bbo pbE vja @@ -240346,7 +324011,11 @@ mNY ixG aPf dzJ +<<<<<<< HEAD neV +======= +drd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 twt mEw sSJ @@ -240372,9 +324041,15 @@ rQf mUs gka bln +<<<<<<< HEAD tCr bln tCr +======= +chb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -240521,9 +324196,15 @@ sDl sDl sDl psN +<<<<<<< HEAD nUI dkY nCW +======= +riB +dkY +wLc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hzY bRn fng @@ -240537,7 +324218,11 @@ bWn bWn mae pAZ +<<<<<<< HEAD usz +======= +mDy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eZL ljx nxW @@ -240547,7 +324232,11 @@ qXF dMX gER nOH +<<<<<<< HEAD bQd +======= +xVc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybv xzT cHO @@ -240560,7 +324249,11 @@ bln kta jLa rBL +<<<<<<< HEAD fYF +======= +uMN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clE jQI qnr @@ -240590,6 +324283,7 @@ dPT pRj pMu gVD +<<<<<<< HEAD gSQ ajF qwe @@ -240597,6 +324291,15 @@ uJH hHF roj rIr +======= +kPu +ajF +qwe +uJH +iAc +roj +gXN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pRj kCn mNY @@ -240608,7 +324311,11 @@ gTK myX sSJ gka +<<<<<<< HEAD eEh +======= +oAs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fab eDC uIV @@ -240628,10 +324335,17 @@ viH viH rQf gka +<<<<<<< HEAD bln tCr bln tCr +======= +mQb +bvb +jHb +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -240786,11 +324500,19 @@ pfe aeQ mdX pfe +<<<<<<< HEAD ktK fGr olt qSP eSm +======= +oyd +vws +mjf +wEb +sIZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pfe pfe jII @@ -240857,10 +324579,17 @@ xtQ hIH kCn mNY +<<<<<<< HEAD wiM tMD ehJ xFM +======= +hFJ +tMD +ehJ +fMt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 twt tXB sSJ @@ -240868,7 +324597,11 @@ gka uXC fab fNv +<<<<<<< HEAD iEd +======= +wuo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wuo nnw spv @@ -240885,10 +324618,17 @@ lhC lhC lhC gka +<<<<<<< HEAD bln tCr bln tCr +======= +mQb +chb +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -241013,8 +324753,13 @@ lQc lQc nbp mgU +<<<<<<< HEAD nbt ioi +======= +bvX +ccF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fad azx tDw @@ -241038,11 +324783,19 @@ iiH teP teP teP +<<<<<<< HEAD kGJ gMK fng rHc oOt +======= +qbk +gMK +fng +rHc +mxF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uog vVY uog @@ -241050,7 +324803,11 @@ uog nfU bzI uog +<<<<<<< HEAD qzU +======= +yaF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mny dnq wmK @@ -241075,8 +324832,13 @@ kta kta dHa kta +<<<<<<< HEAD wal wDi +======= +kta +cPK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qQC jtN aYq @@ -241085,7 +324847,11 @@ kta qQG nlT krv +<<<<<<< HEAD ylF +======= +hyc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fdy fdy fdy @@ -241105,7 +324871,11 @@ cLN cLN cLN fdy +<<<<<<< HEAD oXc +======= +eKb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nzq cLN cLN @@ -241114,7 +324884,11 @@ kKH pRj eAj sro +<<<<<<< HEAD apL +======= +dgp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qkT kzA whW @@ -241126,7 +324900,11 @@ glc fab ktw bny +<<<<<<< HEAD qDj +======= +jQe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xBp bYw bYw @@ -241143,9 +324921,15 @@ phL lhC gka bln +<<<<<<< HEAD tCr bln tCr +======= +chb +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -241269,7 +325053,11 @@ bln npb bln lSu +<<<<<<< HEAD rhf +======= +hIO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rPP eNl vbF @@ -241299,7 +325087,11 @@ vDb vvh vPC pvm +<<<<<<< HEAD tJZ +======= +dMi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cvC kQc iYG @@ -241307,7 +325099,11 @@ kQc kOV kQc kQc +<<<<<<< HEAD kkr +======= +iJN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gOy gOy fKF @@ -241315,7 +325111,11 @@ qjg utR tmQ lkI +<<<<<<< HEAD smI +======= +lvl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aog ktl dEI @@ -241342,7 +325142,11 @@ xXt gET gMM jba +<<<<<<< HEAD iot +======= +mKC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oQp oQp lCY @@ -241362,7 +325166,11 @@ oQp oQp oQp oQp +<<<<<<< HEAD lEK +======= +mxX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oQp oQp kPg @@ -241373,7 +325181,11 @@ fFy mNY bTq xUP +<<<<<<< HEAD fQU +======= +gRt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rpF twt fcg @@ -241399,10 +325211,17 @@ efE kJU lhC gka +<<<<<<< HEAD bln tCr bln tCr +======= +tMc +chb +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -241526,7 +325345,11 @@ bln npb bln bln +<<<<<<< HEAD rhf +======= +hIO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vyd ePr kGc @@ -241536,7 +325359,11 @@ mgU kqc kqc kqc +<<<<<<< HEAD wAq +======= +jct +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jaw xwf aPd @@ -241550,6 +325377,7 @@ bgN bgN uwB lvS +<<<<<<< HEAD xLO fGM aac @@ -241557,14 +325385,28 @@ nUJ qbA csB stB +======= +dYA +fGM +hrO +nUJ +qbA +csB +gtB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tny dLo fBF xUU wYZ aKI +<<<<<<< HEAD xUU avd +======= +peq +obb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qJV vBh fiE @@ -241573,9 +325415,15 @@ utR tmQ axf kzD +<<<<<<< HEAD kJP lhv heS +======= +nsj +lhv +sDV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybv xwm vzT @@ -241589,8 +325437,13 @@ kta kta eoJ kta +<<<<<<< HEAD wal tEK +======= +kta +lEJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qQC hNg rFD @@ -241599,8 +325452,13 @@ kta vtz fuM vXh +<<<<<<< HEAD jZB rWn +======= +hyc +tdK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mJa gDV fxl @@ -241618,8 +325476,13 @@ eQX rWn rWn gDV +<<<<<<< HEAD cSP dAk +======= +tro +eKb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jRV uOL gQq @@ -241638,9 +325501,15 @@ wfn ras fkj fab +<<<<<<< HEAD nsK dfq ghj +======= +iag +dfq +ein +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xBp imd imd @@ -241656,10 +325525,17 @@ lhC gsk lhC gka +<<<<<<< HEAD bln tCr bln tCr +======= +lSu +chb +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -241783,12 +325659,21 @@ bln miY oot oot +<<<<<<< HEAD rhf jDt wtg diq ehy vtZ +======= +hIO +jDt +wtg +diq +uet +ptr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mgU fUj kcc @@ -241884,20 +325769,35 @@ hOc bID qnC vkz +<<<<<<< HEAD uoF pcg deD fLH +======= +aom +pcg +deD +unG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qnC isX eBI oEt gka +<<<<<<< HEAD gFR fab fyQ wuo vuK +======= +vKy +fab +fyQ +wuo +wuo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nnw cDK uvk @@ -241914,9 +325814,15 @@ lhC lhC gka bln +<<<<<<< HEAD tCr bln tCr +======= +chb +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -242040,9 +325946,15 @@ bln npb bln bln +<<<<<<< HEAD rhf rhf rhf +======= +hIO +hIO +hIO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bUx bUx bUx @@ -242070,7 +325982,11 @@ jOQ jOQ jOQ jOQ +<<<<<<< HEAD cyZ +======= +deY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 deY fhz deY @@ -242079,7 +325995,11 @@ deY deY deY wAZ +<<<<<<< HEAD oAz +======= +tVd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uLC xQg fwm @@ -242132,7 +326052,11 @@ vvv tTV jtA bID +<<<<<<< HEAD rlL +======= +obo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 miw gCK cMd @@ -242140,6 +326064,7 @@ lHC vzU ahm qnC +<<<<<<< HEAD xBh qGQ sOE @@ -242147,6 +326072,15 @@ wcx mGV qnC sIp +======= +bjK +qGQ +sOE +wcx +fVy +qnC +nAw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uif wRd gka @@ -242171,9 +326105,15 @@ vBm lfp gka bln +<<<<<<< HEAD tCr bln tCr +======= +bvb +hZu +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -242338,7 +326278,11 @@ skl skl pAZ pAZ +<<<<<<< HEAD dnq +======= +rLl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gOy utR tmQ @@ -242397,7 +326341,11 @@ dcC jGB akz sCA +<<<<<<< HEAD aSw +======= +mta +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ojv bAT eri @@ -242427,10 +326375,17 @@ rQf rQf mUs gka +<<<<<<< HEAD bln tCr bln tCr +======= +mQb +chb +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -242642,7 +326597,11 @@ oyj gwK nEV bry +<<<<<<< HEAD fDM +======= +vPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fLq hro tKi @@ -242656,9 +326615,15 @@ wHj mBB juH ojv +<<<<<<< HEAD hut mDw jDT +======= +lqi +mDw +tbH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qKQ aTj uif @@ -242684,10 +326649,17 @@ fyR lhC lhC gka +<<<<<<< HEAD bln tCr bln tCr +======= +mQb +chb +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -242828,7 +326800,11 @@ kpj fGq eig jNp +<<<<<<< HEAD sDl +======= +jbe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sDl sDl sDl @@ -242852,6 +326828,7 @@ vXU drZ yfF jII +<<<<<<< HEAD gMx oas jJr @@ -242859,11 +326836,24 @@ qWZ qWZ qWZ dWX +======= +eff +kxA +eff +qWZ +qWZ +qWZ +aCP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wKI iFs qVp lpM +<<<<<<< HEAD mjs +======= +slP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hsx hpR pIk @@ -242921,7 +326911,11 @@ rGu eZO wRd gka +<<<<<<< HEAD xNn +======= +lzJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 snO pIm vWr @@ -242942,9 +326936,15 @@ pMC qWJ gka bln +<<<<<<< HEAD tCr bln tCr +======= +chb +bln +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -243080,7 +327080,11 @@ kzw kzw cAC xAQ +<<<<<<< HEAD voA +======= +iMg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jNp jNp jNp @@ -243091,7 +327095,11 @@ sDl sDl sDl skl +<<<<<<< HEAD jOQ +======= +uFS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 skl nOl oCF @@ -243102,24 +327110,40 @@ ygB mJO oCF ygB +<<<<<<< HEAD bLa +======= +bSW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oCF ygB lBD jII jII jII +<<<<<<< HEAD ifd +======= +aVr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xwC utR pAZ bln qWZ +<<<<<<< HEAD oxe vmj aqB pVq nVZ +======= +bGc +vmj +aqB +pVq +rkI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oRk mvc mvc @@ -243127,9 +327151,15 @@ rAW kwz ghJ uEm +<<<<<<< HEAD sqU lpM klP +======= +aEz +lpM +rEo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 euf jzn mhQ @@ -243166,7 +327196,11 @@ bDz rSC inE oPU +<<<<<<< HEAD wuV +======= +xpc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qnC qnC sCA @@ -243198,10 +327232,17 @@ gka gka gka gka +<<<<<<< HEAD bln tCr tCr tCr +======= +aao +bvb +tMa +bln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -243351,6 +327392,7 @@ skl jOQ skl ygB +<<<<<<< HEAD xkp ygB ygB @@ -243373,6 +327415,30 @@ pAZ wXn qWZ eWP +======= +gQI +ygB +ygB +ugX +ygB +ygB +nJH +ygB +ygB +rsV +ygB +fEZ +ygB +tSb +aab +dcI +sNI +bUH +pAZ +hLw +qWZ +ydk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tGF iUT aVH @@ -243385,12 +327451,20 @@ hCV nkb ptB mvc +<<<<<<< HEAD olH +======= +lzb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 anu jly fXb mhQ +<<<<<<< HEAD eeq +======= +oYN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jUD nZb lRf @@ -243406,13 +327480,21 @@ uwO rSx kRP kRP +<<<<<<< HEAD lSw +======= +uFV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cAR kNk tmA bNE hht +<<<<<<< HEAD gMN +======= +hxe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xnE tvd egV @@ -243425,6 +327507,7 @@ vzU pZn bBd xSv +<<<<<<< HEAD aIg rjh xZl @@ -243432,6 +327515,15 @@ qaF pna aIg ktx +======= +gyR +lLD +xZl +qaF +pna +gyR +cod +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uif jKe wRd @@ -243454,9 +327546,15 @@ haC haC haC haC +<<<<<<< HEAD qCB bln bln +======= +hso +lSu +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -243618,6 +327716,7 @@ rMN alO alO qCI +<<<<<<< HEAD xKT alO qhF @@ -243632,6 +327731,22 @@ qWZ qWZ qWZ tUO +======= +fhg +alO +fEe +hYD +hYD +waU +xwC +kKX +pAZ +luG +qWZ +qWZ +qWZ +qKn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qWZ lpM xxx @@ -243645,16 +327760,26 @@ xLF lpM oGQ wKw +<<<<<<< HEAD vFb +======= +mZT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mhQ hUV aks nLH xex mhQ +<<<<<<< HEAD ufw rpG jtY +======= +cBk +kdA +reb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xVK tfx tyK @@ -243673,6 +327798,7 @@ guU ayq hpI bID +<<<<<<< HEAD sSS rOU rcN @@ -243680,6 +327806,15 @@ qxy siz iUx kTQ +======= +iKh +rOU +qXt +jEo +fEL +boX +vjQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lCD pNO nFc @@ -243705,16 +327840,27 @@ bEa dCy dMK gka +<<<<<<< HEAD +======= +nce +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln +<<<<<<< HEAD bln bln bln bln bln +======= +lSu +hAM +sds +ntK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -243877,7 +328023,11 @@ iPm iPm iPm iPm +<<<<<<< HEAD mVW +======= +pcx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hay cfr dct @@ -243887,9 +328037,15 @@ pAZ wtj eJK qWZ +<<<<<<< HEAD kjY bCW uLp +======= +kGe +lWd +dOF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lpM byx aJN @@ -243925,11 +328081,16 @@ kQf hDh vnt keP +<<<<<<< HEAD xJi +======= +qTa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ctr avk gxP bID +<<<<<<< HEAD tZO uCK nKj @@ -243946,11 +328107,33 @@ qWy pna hqV uge +======= +phw +uCK +gJN +ckX +iub +inn +oUw +vfU +pdV +gyR +psu +uGT +qWy +pna +gyR +jmD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xrg dxn aPD aPD +<<<<<<< HEAD vlb +======= +rHx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fKf pst bWQ @@ -243963,6 +328146,7 @@ uYO rOe gka bln +<<<<<<< HEAD bln bln bln @@ -243970,6 +328154,15 @@ bln bln tCr bln +======= +mQb +mQb +lSu +lSu +mQb +bln +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -244114,7 +328307,11 @@ nmq kqG pVL pVL +<<<<<<< HEAD sDl +======= +jbe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sDl sDl skl @@ -244132,12 +328329,20 @@ wVD uja uja uja +<<<<<<< HEAD bsn +======= +iyJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uja uja uja uja +<<<<<<< HEAD vdO +======= +uHN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vrX utR pAZ @@ -244145,7 +328350,11 @@ eAu hFr qWZ oVR +<<<<<<< HEAD sNQ +======= +lfo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oVR lpM dbs @@ -244172,7 +328381,11 @@ vXh cvS ewi cvS +<<<<<<< HEAD eUI +======= +svV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kwX gDp egp @@ -244182,7 +328395,11 @@ pJQ pJQ pJQ keP +<<<<<<< HEAD tJv +======= +vei +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bTx nvW xxs @@ -244190,9 +328407,15 @@ bID bID bID bID +<<<<<<< HEAD cfT kvH uIz +======= +nnp +res +eLM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bID bID bID @@ -244206,10 +328429,17 @@ gyR gyR gyR aPD +<<<<<<< HEAD wqc umz sbK wij +======= +lQe +umz +sbK +tOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gka gka gka @@ -244219,6 +328449,7 @@ fDn fDn fDn gka +<<<<<<< HEAD bln bln bln @@ -244228,6 +328459,17 @@ bln tCr bln bln +======= +ujK +gSd +lej +ujK +ujK +ujK +yhY +bvb +ftY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -244381,6 +328623,7 @@ skl eFW rlV ygB +<<<<<<< HEAD xEJ gJC akD @@ -244395,15 +328638,37 @@ qSh hsB uja jcy +======= +jMx +gJC +akD +qIU +uUM +uja +jHG +jcF +vVw +jcF +qSh +hsB +uja +ltY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iuv utR pAZ fsm efv bcN +<<<<<<< HEAD jYd ugI lIs +======= +yan +fVf +epC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lpM vPF uEm @@ -244418,7 +328683,11 @@ sIt sIt sIt log +<<<<<<< HEAD aTG +======= +kpA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hGh raf raf @@ -244428,7 +328697,11 @@ iuv pDi cvS cGA +<<<<<<< HEAD rgi +======= +cGA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pNq lBS aTp @@ -244467,6 +328740,7 @@ cht eiI bum wWM +<<<<<<< HEAD vvf pcI ehP @@ -244475,15 +328749,32 @@ uLr bDl sEB sEB +======= +hVf +pcI +ehP +uDi +aPD +tfk +sEB +qVo +chb +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln +<<<<<<< HEAD bln bln tCr bln +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -244637,11 +328928,16 @@ jOQ skl dxh xri +<<<<<<< HEAD vAo +======= +ttI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cmL lLf asa kCu +<<<<<<< HEAD gHj uja sfD @@ -244649,6 +328945,15 @@ gjT szK upx uOy +======= +uKR +uja +lsF +pBs +eYF +sNj +fKR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hsB uja ise @@ -244658,11 +328963,19 @@ pAZ bln lBD pAZ +<<<<<<< HEAD mDv sUi tEd lpM eEC +======= +hZf +rYE +xUg +lpM +luk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aTw iFL hpe @@ -244674,7 +328987,11 @@ dGU wdg bVv wdg +<<<<<<< HEAD sTV +======= +ukR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pwf oUL qKz @@ -244707,7 +329024,11 @@ uAK wSo wSo vZt +<<<<<<< HEAD iHm +======= +qhI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rXe hHN bJD @@ -244732,16 +329053,28 @@ lzy sEB sEB sEB +<<<<<<< HEAD +======= +xhA +bln +bln +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD tCr tCr tCr tCr bln bln +======= +chb +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -244895,14 +329228,22 @@ skl ddr ccp ygB +<<<<<<< HEAD kCb +======= +vrD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gya tfO urd xTU uja aty +<<<<<<< HEAD gjT +======= +pBs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uja uja uja @@ -244933,11 +329274,19 @@ sIt sIt log mhQ +<<<<<<< HEAD rXN mhQ mhQ mhQ dnq +======= +pOH +mhQ +mhQ +mhQ +rLl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jtE vXh cvS @@ -244946,7 +329295,11 @@ bRH caZ hgK caZ +<<<<<<< HEAD gDp +======= +rqN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 btg pGo uoE @@ -244958,7 +329311,11 @@ jlV hHN hHN iRw +<<<<<<< HEAD cYf +======= +vuf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bSG uop tHj @@ -244981,6 +329338,7 @@ daM pyM kxY ccz +<<<<<<< HEAD okk lVm qrm @@ -245001,6 +329359,28 @@ bln bln bln bln +======= +xCs +lVm +aPD +mzz +aPD +bDl +ooL +qVo +chb +bln +lSu +bln +mQb +bln +bln +bln +chb +bln +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -245141,13 +329521,21 @@ lbk sDl sDl skl +<<<<<<< HEAD yhL +======= +vaW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 deY skl gDz xlH kbN +<<<<<<< HEAD dym +======= +nzn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 skl ygB ygB @@ -245159,6 +329547,7 @@ maB fpa uja oiz +<<<<<<< HEAD gjT uja kDz @@ -245178,6 +329567,27 @@ mfW toT mfW aeF +======= +pBs +uja +kDz +mBm +twU +uja +uPT +poL +vBh +wRk +wRk +wRk +wRk +wRk +cRu +mfW +vKZ +mfW +uxm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eta brp mfW @@ -245186,12 +329596,21 @@ ccs amN hHu tZZ +<<<<<<< HEAD vBh vBh dqs aVw gxq rlb +======= +mfW +mfW +oyY +aVw +gxq +aVw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vBh vBh vBh @@ -245203,7 +329622,11 @@ iGa caZ vpR caZ +<<<<<<< HEAD oDk +======= +sqN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kRP fwO fwO @@ -245219,7 +329642,11 @@ cEw cEw cEw cEw +<<<<<<< HEAD rII +======= +woc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fwq hHN lRR @@ -245243,6 +329670,7 @@ iaY duh duh duh +<<<<<<< HEAD bln bln sEB @@ -245258,6 +329686,23 @@ bln bln bln bln +======= +mQb +bln +lbc +bvb +jHb +bln +bln +mQb +bln +bln +bln +chb +mQb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -245388,7 +329833,11 @@ ihb bnM iRM kkl +<<<<<<< HEAD tAK +======= +xiq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gUs ykw lbk @@ -245412,18 +329861,31 @@ ygB ybE eKJ ulk +<<<<<<< HEAD rgM uja uja uja jnh +======= +ugZ +uja +uja +uja +kqP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uja uja uja hsB uja +<<<<<<< HEAD uuh lyh +======= +ehq +kOq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iuv vrX iuv @@ -245432,7 +329894,11 @@ iuv iuv iuv vrX +<<<<<<< HEAD maX +======= +uJN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iuv xNF ylU @@ -245445,7 +329911,11 @@ iuv iuv iuv iuv +<<<<<<< HEAD rpG +======= +uJN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iuv iuv iuv @@ -245474,7 +329944,11 @@ dUv cEw rLs xUV +<<<<<<< HEAD xmL +======= +rLs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cEw cmJ rwC @@ -245500,6 +329974,7 @@ dFo kKy duh bln +<<<<<<< HEAD bln bln sEB @@ -245515,6 +329990,23 @@ bln bln bln bln +======= +ntK +bln +lbc +chb +bln +lSu +bln +mQb +bln +bln +bln +chb +bln +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -245665,6 +330157,7 @@ ykA skl lQr lkj +<<<<<<< HEAD ipx seH lvY @@ -245691,18 +330184,54 @@ rbh rbh qPD jIY +======= +iov +seH +lvY +mmA +whk +uja +aJi +aJi +eCT +uja +oUO +msG +xWG +uja +kyL +hNU +kyL +kyL +rwZ +oTu +ucu +adv +oTu +oTu +srw +kfr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dKW ylU lDo dnq iuu dnq +<<<<<<< HEAD dnq +======= +ebH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dnq apb dnq bep +<<<<<<< HEAD mpy +======= +srw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dnq dnq ivo @@ -245757,6 +330286,7 @@ lhO fFi duh bln +<<<<<<< HEAD bln bln sEB @@ -245770,6 +330300,21 @@ bln tCr bln bln +======= +mQb +bln +lbc +chb +bln +lSu +bln +bln +uer +bln +bln +bvb +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -245912,17 +330457,27 @@ bln bln fsm bUx +<<<<<<< HEAD uek wph fnS skl qpU xsm +======= +buR +kVe +fnS +skl +hir +kAT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jOQ skl pOo piC ygB +<<<<<<< HEAD fXo aos cUH @@ -245931,14 +330486,29 @@ beF vme lrE gUw +======= +noJ +aos +uWo +iUs +ozk +nsu +fdV +kux +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uja uja uja hsB uja mdZ +<<<<<<< HEAD hMM lEb +======= +ros +bnm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mdZ exw hmb @@ -245948,9 +330518,15 @@ hmb hmb exw tLF +<<<<<<< HEAD gIf dBA gIf +======= +lFb +qRE +lFb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 azw azw mao @@ -246014,13 +330590,22 @@ alb nTL cHf qHg +<<<<<<< HEAD tmR bln sEB +======= +umg +mQb +lbc +chb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -246028,6 +330613,13 @@ mVm bln bln bln +======= +mQb +bln +chn +bln +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -246169,6 +330761,7 @@ bUx bUx bUx bUx +<<<<<<< HEAD maM aXx fnS @@ -246176,11 +330769,21 @@ skl eoV npZ qQV +======= +oBV +aXq +fnS +skl +bVx +idP +irn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 skl gmW gmW gmW ltV +<<<<<<< HEAD tip gxT ltV @@ -246205,24 +330808,62 @@ iuE gWl hKn lHi +======= +lAW +ksl +ltV +uja +tXk +tXk +tUn +uja +jlP +dHg +twU +uja +dka +fKV +jLK +tJY +phr +eik +cby +otW +jLc +lvb +xWk +sTH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso dEV bai azw jqE kZb +<<<<<<< HEAD tSK azw fMg fqW pHS +======= +cJk +azw +xxi +fqW +sfd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nCb kWL cvS pjF nhw cvS +<<<<<<< HEAD bEB +======= +aMh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kNA mOo jPh @@ -246270,6 +330911,7 @@ njm njm njm duh +<<<<<<< HEAD sEB ipM bln @@ -246284,6 +330926,22 @@ bln bln bln bln +======= +mZf +ipM +bln +lbc +chb +mQb +bln +bln +lSu +bln +mQb +bln +chb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ozo bln bln @@ -246348,7 +331006,11 @@ wNO wNO wNO bln +<<<<<<< HEAD aaX +======= +qzn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vbG tkU tkU @@ -246420,7 +331082,11 @@ fhu bLI ykw skl +<<<<<<< HEAD blX +======= +ugA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 deY skl kQE @@ -246431,6 +331097,7 @@ skl hDV skl byP +<<<<<<< HEAD blX eHX ceU @@ -246440,6 +331107,17 @@ qfJ seB mcT xwL +======= +ugA +hNp +tFI +eHb +hcs +bdp +nmH +tiI +hLW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bVI uja uja @@ -246450,6 +331128,7 @@ uja uja uja uja +<<<<<<< HEAD scG cKJ hJS @@ -246462,6 +331141,20 @@ nxc lgb xre lHi +======= +sJC +aSM +fjN +xhV +mPl +ybb +fJS +hFR +rxJ +lGN +xul +sTH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso dEV bai @@ -246470,7 +331163,11 @@ rEp fTC blU azw +<<<<<<< HEAD eul +======= +bbO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hhT vnN pQp @@ -246519,9 +331216,15 @@ qwF qwF qwF wYJ +<<<<<<< HEAD bln bln bln +======= +sEB +sEB +sEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kUu bln bln @@ -246530,11 +331233,20 @@ bln bln oxR bln +<<<<<<< HEAD sEB +======= +lbc +chb +mQb +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -246543,6 +331255,12 @@ bln bln bln bln +======= +chb +bln +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -246605,7 +331323,11 @@ wNO wNO wNO bln +<<<<<<< HEAD fhB +======= +liV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vbG tkU tkU @@ -246677,26 +331399,44 @@ ekW vRN fEA uHF +<<<<<<< HEAD jyE jyE qdK eqq ejY +======= +wjj +wjj +qdK +eqq +krZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eqq eqq eqq eqq +<<<<<<< HEAD mkM eqq fjO qvh skl erH +======= +xuL +eqq +lrl +qvh +skl +eFG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ffZ vfW vfW mZK lvk +<<<<<<< HEAD qiG czo kKL @@ -246719,6 +331459,30 @@ nxc lgb uSE hyQ +======= +gzI +gIN +kKL +mBr +kKL +pyE +suo +qZg +rxY +ryn +eDs +vTm +sxt +shh +bHJ +xgy +xgy +uYE +rxJ +lGN +ozU +fuc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso dEV kHI @@ -246727,7 +331491,11 @@ feU fTC qEj azw +<<<<<<< HEAD tJV +======= +rUQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 orE aTE hMH @@ -246776,6 +331544,7 @@ sMg sMg qwF aPD +<<<<<<< HEAD bln bln bln @@ -246788,15 +331557,37 @@ bln nFO bln sEB +======= +nQr +sEB +sEB +nyA +htd +uer +bln +mQb +bln +nFO +mQb +lbc +chb +bln +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln bln tCr bln +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -246933,6 +331724,7 @@ aML iLv hSJ ykw +<<<<<<< HEAD fNz wSc blX @@ -246976,13 +331768,62 @@ rRs jik lJW lHi +======= +ygL +jTw +ugA +eym +ugA +aBK +fhz +ugA +fhz +vjg +byP +mOf +vHJ +mOf +skl +opt +eOl +qFE +cGB +cGB +gsI +tLL +spy +kKL +kKL +kKL +qUI +lik +tWj +rxY +jCK +jdV +bZm +uQc +mYR +mpU +ryJ +xgy +faW +dHf +rWI +cOy +sTH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso dEV bai azw hnV fTC +<<<<<<< HEAD xSu +======= +nej +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 azw azw azw @@ -247032,6 +331873,7 @@ kfa qCn tCB qwF +<<<<<<< HEAD bln bln bln @@ -247040,22 +331882,45 @@ czY bln bln bln +======= +sEB +sEB +sEB +sEB +fdb +bln +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln nFO bln +<<<<<<< HEAD sEB +======= +lbc +chb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln +<<<<<<< HEAD bln bln tCr bln bln bln +======= +bvb +jHb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -247195,6 +332060,7 @@ rFP rFP skl skl +<<<<<<< HEAD utW kiI skl @@ -247222,17 +332088,51 @@ utG rxY bzF dXR +======= +wYS +tYF +skl +ugA +goY +skl +cFr +cQx +cFr +skl +fRq +vfW +tBw +nUj +mpH +aAe +xjT +spy +kKL +jZy +aqV +lgx +xay +lko +rxY +ntE +rhG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mdZ mdZ mdZ exw exw exw +<<<<<<< HEAD kXS +======= +dRB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exw exw exw tLF +<<<<<<< HEAD cwh dEV whg @@ -247241,14 +332141,31 @@ eub eyc qPt uTc +======= +bDB +dEV +dYU +azw +xbB +eyc +qPt +goa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 biR dmI tdE veU +<<<<<<< HEAD vEQ kRP kRP oiB +======= +pkf +kRP +kRP +rWH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kRP pao cGA @@ -247280,7 +332197,11 @@ xGM gHl flH afR +<<<<<<< HEAD rPn +======= +iVg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kqq cnq nqb @@ -247289,6 +332210,7 @@ uxx sMg sMg qwF +<<<<<<< HEAD bln bln hDG @@ -247297,10 +332219,21 @@ czY bln bln bln +======= +sEB +sEB +hDG +sEB +fdb +mQb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln oxR bln +<<<<<<< HEAD sEB bln bln @@ -247312,6 +332245,19 @@ bln tCr bln bln +======= +lbc +chb +bln +mQb +uer +bln +lSu +bln +bln +ebW +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -247452,6 +332398,7 @@ bln lBD bln skl +<<<<<<< HEAD rWA skl skl @@ -247490,6 +332437,46 @@ wBr lEO wqt jae +======= +dow +skl +skl +giO +hFw +skl +hED +jlk +pSF +skl +eXf +vfW +qfG +iay +dCF +aAe +fbM +kVa +kKL +nWG +kKL +kKL +bYC +isC +rxY +fzK +iIm +fzK +jRA +wXb +bOZ +gpM +jZj +luP +dWI +lEO +lRj +msE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso kjK bai @@ -247504,7 +332491,11 @@ tdE fBR fKi tHr +<<<<<<< HEAD euR +======= +rRA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 soK kRP nMN @@ -247546,11 +332537,19 @@ qwF qwF qwF qwF +<<<<<<< HEAD bln bln bln bln czY +======= +sEB +sEB +sEB +sEB +fdb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -247558,6 +332557,7 @@ bln bln nFO bln +<<<<<<< HEAD sEB bln bln @@ -247570,6 +332570,20 @@ tCr bln bln bln +======= +lbc +bvb +jHb +bln +bln +bln +lSu +lSu +bln +uap +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -247709,6 +332723,7 @@ ntK mQb bln skl +<<<<<<< HEAD bkM oWV skl @@ -247746,6 +332761,45 @@ fWW mMZ bid nzt +======= +eZW +deY +skl +vhF +jPv +rhv +dEL +vhF +vsx +skl +hYL +vfW +sul +eGM +eGM +soI +tLL +erd +kKL +mfP +qgH +kKL +vJJ +awu +uzu +tbL +cEe +fzK +sZB +jRA +toT +spz +jHe +mPr +gOa +jKs +gDq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso lCi dEV @@ -247758,7 +332812,11 @@ azw fVK rGw azw +<<<<<<< HEAD eiY +======= +ePT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tZm pBA aQZ @@ -247771,7 +332829,11 @@ esC eUI kRP qyR +<<<<<<< HEAD bve +======= +qyR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kRP gDp cvS @@ -247800,6 +332862,7 @@ uQy swu swu swu +<<<<<<< HEAD swu swu swu @@ -247816,16 +332879,43 @@ bln nFO bln sEB +======= +dvZ +dvZ +dvZ +dvZ +dvZ +dvZ +dvZ +heE +bln +mQb +bln +mQb +bln +nFO +mQb +lbc +chb +bln +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln bln mVm bln bln +======= +chn +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -247964,6 +333054,7 @@ bln bln bln bln +<<<<<<< HEAD gDh skl tSd @@ -247977,11 +333068,27 @@ vOd mnn skl ruX +======= +stJ +skl +sNL +skl +skl +jOK +deY +rhv +eLN +iDe +dyA +skl +gaC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vfW eOl vfW vfW lvk +<<<<<<< HEAD jiU qVG wpm @@ -248004,6 +333111,30 @@ qSU hSq pdC pdC +======= +crv +acN +mch +mzX +qBi +kKL +kKL +tjG +rxY +uWS +hjl +xBj +ddw +hjz +wqo +spz +eYS +arZ +eME +hSq +jLt +ieJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vwO hHg jyp @@ -248017,7 +333148,11 @@ sEz jFZ uoV gnb +<<<<<<< HEAD gTi +======= +pZB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 whh pQL nCV @@ -248027,7 +333162,11 @@ kRP kRP kRP kRP +<<<<<<< HEAD qyR +======= +wCI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qyR kRP gDp @@ -248054,6 +333193,7 @@ gtg cEw bCT kfs +<<<<<<< HEAD sEB bln bln @@ -248082,6 +333222,36 @@ bln bln tCr bln +======= +kfs +kfs +qVo +bln +bln +mQb +bln +mQb +bln +bln +yfW +jHb +mQb +bln +uer +bln +cwn +bln +lbc +chb +bln +uer +mQb +bln +mQb +bln +bln +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -248222,6 +333392,7 @@ bln bln bln bln +<<<<<<< HEAD aHh ooL skl @@ -248234,18 +333405,37 @@ hqv wHK skl mOH +======= +oUb +ooL +skl +cwT +deY +deY +skl +ygS +oGr +pDA +skl +pyl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uRo uRo uRo nCu cZt cZt +<<<<<<< HEAD qtG +======= +vnw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL lli uar gAt kKL +<<<<<<< HEAD nxw fzK kQx @@ -248271,6 +333461,33 @@ nah azw cXu frP +======= +jcs +fzK +mbm +dTa +sav +ymf +nuD +pQD +lsA +xmD +awe +lsA +lEO +atS +lmQ +lBB +dEV +bai +azw +pdm +vYH +etv +azw +dnI +vHo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oIJ nRd lwQ @@ -248281,8 +333498,13 @@ art tHr tHr tHr +<<<<<<< HEAD bpZ chW +======= +xDX +qkR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pBA xfb dpB @@ -248311,25 +333533,44 @@ gtg hpI qAT kfs +<<<<<<< HEAD kfs kfs sEB bln bln bln +======= +dtc +kfs +qVo +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln +======= +mQb +bln +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln shH +<<<<<<< HEAD vsI sEB +======= +mjY +qVo +bza +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -248337,10 +333578,16 @@ bln bln bln bln +<<<<<<< HEAD mVm bln bln bln +======= +chb +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -248482,9 +333729,15 @@ bln bln bln skl +<<<<<<< HEAD fpF deY hJF +======= +cwH +deY +ugA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 skl skl skl @@ -248492,14 +333745,22 @@ gmW gmW dGO dGO +<<<<<<< HEAD tEs dGO dGO tEs +======= +kBc +dGO +dGO +kBc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dGO dGO gmW gmW +<<<<<<< HEAD tpZ mGF kKL @@ -248521,15 +333782,45 @@ cql fqX dEV kIK +======= +lgw +lJn +kKL +kAQ +jJA +jJA +sRw +vNU +vNU +tvt +peP +spz +qOG +dnE +gpr +izC +hku +lmQ +epw +dEV +hjA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 azw pxV oQD vDh azw +<<<<<<< HEAD fNA eqp cTV fHz +======= +aXg +bGq +cTV +bOp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lwQ qfi sEK @@ -248537,12 +333828,20 @@ eHg ahL wVw xyy +<<<<<<< HEAD bCr +======= +whU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bYK srn pBA drH +<<<<<<< HEAD vSx +======= +tNz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kRP gDp cvS @@ -248568,6 +333867,7 @@ uUH vuu xvj rCW +<<<<<<< HEAD lfF fJe sEB @@ -248587,10 +333887,32 @@ sEB tmR jrI oaQ +======= +ygl +fJe +sEB +oot +oot +oot +oot +oot +oot +oot +sjh +oot +oot +oot +oot +oot +pcb +jrI +iXg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oaQ oaQ oaQ qHg +<<<<<<< HEAD tmR tmR tmR @@ -248599,6 +333921,16 @@ bln bln bln bln +======= +uAL +uAL +uAL +rzO +bvb +tMa +sMy +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -248737,11 +334069,19 @@ bln fsm bln uer +<<<<<<< HEAD yjo skl skl qiL qiL +======= +bln +skl +skl +qFA +qFA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 skl fsm tlH @@ -248757,6 +334097,7 @@ knl knl knl gmW +<<<<<<< HEAD ijw bRO kKL @@ -248778,13 +334119,40 @@ vbI gVh kjK arZ +======= +aJa +gJD +kKL +jOC +uWy +xBf +byJ +mNP +foI +tvt +peP +spz +pau +dnE +uTq +izC +qiv +saF +lBB +kjK +gdc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 azw mwF sbc qYV azw gIY +<<<<<<< HEAD iBj +======= +dDR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mcW sFG lwQ @@ -248827,11 +334195,26 @@ loV kfs kfs kfs +<<<<<<< HEAD sEB +======= +qVo +bln +bln +mQb +mQb +bln +bln +bln +chb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -248853,6 +334236,19 @@ sEB tmR tCr bln +======= +mQb +mQb +bln +bln +bln +hMM +mHR +sEB +tmR +sEB +rrh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -248995,12 +334391,21 @@ bln bln stJ bln +<<<<<<< HEAD bln skl qjn iRa skl tlH +======= +qtD +skl +wMY +lWG +skl +oFc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH dGO knl @@ -249014,6 +334419,7 @@ knl knl knl dGO +<<<<<<< HEAD ksR rEH kKL @@ -249039,6 +334445,33 @@ hgh czS fVo qbd +======= +jMu +duT +kKL +tdU +fXw +abZ +qfz +mNP +vNU +tvt +pQD +lsA +nwn +fSs +lsA +lEO +ksc +saF +lBB +dEV +bai +hgh +qlD +fVo +etW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rzS hgh pLt @@ -249050,7 +334483,11 @@ juw nji tkf ikz +<<<<<<< HEAD oSQ +======= +vyW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tHr pBA pBA @@ -249060,7 +334497,11 @@ jbC kRP gDp cvS +<<<<<<< HEAD sEB +======= +rsh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qwF qwF qwF @@ -249082,6 +334523,7 @@ sEB hpI loV kfs +<<<<<<< HEAD bln sEB sEB @@ -249115,6 +334557,41 @@ sEB sEB sEB sEB +======= +sEB +sEB +qVo +bln +mQb +mQb +bln +bln +mQb +bln +yfW +jHb +bln +mQb +bln +mQb +mQb +bln +bln +bln +mQb +bln +bln +tJK +sEB +tmR +sEB +fAW +ajx +ajx +ajx +kKU +kKU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mfD mfD mfD @@ -249178,7 +334655,11 @@ bln bln lBD bln +<<<<<<< HEAD rST +======= +xZq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln qRv @@ -249188,7 +334669,11 @@ hHG wNO wNO wNO +<<<<<<< HEAD khz +======= +pUa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -249253,10 +334738,17 @@ bln bln bln bln +<<<<<<< HEAD gbM iRa iRa gbM +======= +bxS +lWG +lWG +bxS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH tlH dGO @@ -249272,6 +334764,7 @@ knl knl dGO uar +<<<<<<< HEAD bXb kKL xFz @@ -249296,12 +334789,42 @@ hgh qit xxg nDl +======= +lby +kKL +rAY +fYJ +qMF +jpg +mNP +qpm +tvt +peP +spz +tsu +uGe +fDf +mbw +rDN +qbG +qbG +onP +jyp +hgh +kbS +xxg +ehU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uau hgh kBL xPT cxA +<<<<<<< HEAD lka +======= +bij +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vkD cey lux @@ -249349,6 +334872,7 @@ wvI wvI pwF wvI +<<<<<<< HEAD sEB sEB sEB @@ -249371,6 +334895,30 @@ bln bln bln sEB +======= +nyZ +kKU +kKU +kKU +kKU +ajx +ajx +mgv +bln +bln +mQb +mQb +bln +jqx +jEK +tmR +jEK +ktX +mQb +uer +bln +mZf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mfD mfD xow @@ -249439,10 +334987,17 @@ lBD bln bln bln +<<<<<<< HEAD xDQ xDQ bln khz +======= +wDS +wDS +bln +pUa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -249510,10 +335065,17 @@ bln bln tlH tlH +<<<<<<< HEAD gbM iRa iRa gbM +======= +bxS +lWG +lWG +bxS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH tlH dGO @@ -249529,6 +335091,7 @@ knl knl dGO uar +<<<<<<< HEAD wla kKL eTT @@ -249554,11 +335117,42 @@ wiO mnF lKZ xGh +======= +sVW +kKL +dBN +kOx +hye +byJ +mNP +aoO +tvt +peP +spz +sAt +bSp +jWm +tay +rRt +lso +mRy +dEV +eKI +hgh +hmE +mnF +tjv +xYS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fCM qQx mcW cxA +<<<<<<< HEAD lyl +======= +bZI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nMu wDe hxs @@ -249582,7 +335176,11 @@ lvG cvS cvS lvG +<<<<<<< HEAD bVZ +======= +cvS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tYZ kRP wOn @@ -249598,6 +335196,7 @@ pzn wvI bBM mIE +<<<<<<< HEAD mdQ hBE kJK @@ -249613,20 +335212,46 @@ haC qCB bln bln +======= +ldr +hBE +kJK +iZr +sHs +jXr +aLJ +puf +dyg +haC +haC +haC +fOU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln +<<<<<<< HEAD +======= +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln sdr dZX xcZ dZX swF +<<<<<<< HEAD bln bln bln +======= +xEn +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln mfD khy @@ -249635,7 +335260,11 @@ ghY ccw cQL pbs +<<<<<<< HEAD xHY +======= +uvu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bPc ptY ptY @@ -249643,7 +335272,11 @@ ptY ptY ptY ptY +<<<<<<< HEAD vyt +======= +dLL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vyt vyt vyt @@ -249696,8 +335329,13 @@ lBD bln lBD bln +<<<<<<< HEAD wUD wUD +======= +vOy +vOy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -249767,10 +335405,17 @@ bln tlH tlH tlH +<<<<<<< HEAD uUq gHL iRa gbM +======= +aDM +aEj +lWG +bxS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH tlH gmW @@ -249785,6 +335430,7 @@ knl knl hNx gmW +<<<<<<< HEAD sDM gAt kKL @@ -249807,6 +335453,30 @@ mqq vSa fuY clK +======= +uKY +gAt +kKL +asN +bUy +bUy +gBJ +vNU +vNU +tvt +ulR +qjW +qmh +iuL +tii +lEO +fPI +ghb +mqq +vSa +fuY +oXb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pKb eTM vkG @@ -249815,7 +335485,11 @@ lUb vWm pbW sco +<<<<<<< HEAD amJ +======= +iBo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lzM wbw ddu @@ -249840,20 +335514,34 @@ gDp gDp gDp cvS +<<<<<<< HEAD cGA kRP uyU gGC heQ nll +======= +muX +kRP +fYY +qwo +sOd +eUK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ign ebr iJK ebr bzE dYI +<<<<<<< HEAD vep nDi +======= +wvI +wTB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xke ldr vhT @@ -249863,7 +335551,11 @@ gRI lwd mka wvI +<<<<<<< HEAD msd +======= +rnp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wvI bln bln @@ -249874,11 +335566,19 @@ bln bln bln bln +<<<<<<< HEAD bln bln sdr dZX nto +======= +lSu +bln +sdr +dZX +gpB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ote swF swF @@ -249895,7 +335595,11 @@ uVp sTx vyt vyt +<<<<<<< HEAD yfT +======= +vyt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vyt vyt vyt @@ -249953,8 +335657,13 @@ bln bln lBD lBD +<<<<<<< HEAD wUD wUD +======= +vOy +vOy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -250024,10 +335733,17 @@ bln tlH tlH tlH +<<<<<<< HEAD uUq gHL gHL uUq +======= +aDM +aEj +aEj +aDM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH tlH dGO @@ -250042,6 +335758,7 @@ aBf knl knl dGO +<<<<<<< HEAD gdK qgT kKL @@ -250068,6 +335785,34 @@ mJM jOz dEg vBD +======= +rVE +oqY +kKL +kKL +kKL +sIb +uXd +iiE +oIj +quS +jNo +hvQ +gUv +tCk +fYz +izC +izC +tLF +fqR +qEM +lso +ioE +mJM +jOz +dEg +hmx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hgh eei niu @@ -250084,7 +335829,11 @@ hRH dXi mmh ikz +<<<<<<< HEAD piI +======= +hTx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cvS kRP kRP @@ -250109,7 +335858,11 @@ vXv hGs gOY ylM +<<<<<<< HEAD vep +======= +wvI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jWt cXV nDq @@ -250118,6 +335871,7 @@ swx ldr ldr rSW +<<<<<<< HEAD xgr mVe fVE @@ -250137,6 +335891,27 @@ tis qci tWy dqg +======= +aHt +wvI +fVE +wvI +mQb +bln +uer +bln +bln +mQb +bln +bln +bln +lSu +dZX +tis +dZX +tWy +dZX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 swF swF qFu @@ -250210,8 +335985,13 @@ lBD lBD bln bln +<<<<<<< HEAD wUD wUD +======= +vOy +vOy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -250281,10 +336061,17 @@ bln bln tlH bln +<<<<<<< HEAD uUq gHL gHL uUq +======= +aDM +aEj +aEj +aDM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH tlH dGO @@ -250301,6 +336088,7 @@ knl dGO uar lli +<<<<<<< HEAD dwq any kKL @@ -250321,6 +336109,28 @@ lso vwO lso dCs +======= +nkE +xwq +kKL +mzf +blM +fzK +cax +fFe +gcP +gcP +gcP +kJr +tpO +gpS +izC +xHr +lso +vwO +lso +ioE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mJM obG dEf @@ -250356,7 +336166,11 @@ uep vsZ hnd kRP +<<<<<<< HEAD lop +======= +wCN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 don gJs gJs @@ -250366,7 +336180,11 @@ iJK ebr bzE pMq +<<<<<<< HEAD vep +======= +wvI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bHu cAu xwc @@ -250374,17 +336192,30 @@ raA vRC nSw qUu +<<<<<<< HEAD qUu +======= +imJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fvR kiE fTB pwF +<<<<<<< HEAD bln bln bln bln bln bln +======= +mQb +mQb +bln +bln +bln +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -250467,8 +336298,13 @@ bln lBD bln bln +<<<<<<< HEAD rPp rPp +======= +dTI +dTI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -250537,12 +336373,21 @@ bln bln bln bln +<<<<<<< HEAD bln kKL oEC gHL kKL tlH +======= +qtD +kKL +cMr +aEj +kKL +oFc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH dGO knl @@ -250556,11 +336401,16 @@ knl knl knl dGO +<<<<<<< HEAD xPf +======= +bZW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lRs tml kKL kKL +<<<<<<< HEAD aft jsR cpY @@ -250579,15 +336429,43 @@ vwO pxn xjg swI +======= +uFE +xqk +cpY +cpY +hhO +tLI +uoY +xqU +tLI +fNZ +fKZ +cpY +tLF +nOj +vwO +gnT +hgh +ohb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mTS obu mjI fCM +<<<<<<< HEAD qPu niu uOW lwQ ade +======= +dIL +hDq +tXc +lwQ +gkX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oeW aTZ fle @@ -250604,7 +336482,11 @@ vSY ubq lfL gdz +<<<<<<< HEAD isP +======= +iPz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cwu kRP kRP @@ -250614,7 +336496,11 @@ hlp cGA kRP npD +<<<<<<< HEAD wfu +======= +npD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 npD npD gGj @@ -250643,11 +336529,19 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln dZX kJI +======= +ntK +mQb +mQb +dZX +vGw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fgU hPe vMA @@ -250659,7 +336553,11 @@ fQu aiY pnR xfg +<<<<<<< HEAD rjH +======= +uza +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iAk aRD hHb @@ -250678,7 +336576,11 @@ euc ujs mYh ogF +<<<<<<< HEAD lIK +======= +hfy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uBi uBi lqz @@ -250723,6 +336625,7 @@ lBD bln bln bln +<<<<<<< HEAD kPS hHG hHG @@ -250731,6 +336634,16 @@ khz wNO wNO khz +======= +dHF +hHG +hHG +hHG +pUa +wNO +wNO +pUa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -250793,11 +336706,19 @@ wNO bln bln fsm +<<<<<<< HEAD yjo kKL kKL odZ odZ +======= +bln +kKL +kKL +wsr +wsr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL tlH tlH @@ -250814,6 +336735,7 @@ knl knl gmW uar +<<<<<<< HEAD hNK bfy kKL @@ -250829,25 +336751,56 @@ sJg sJg sJg kqP +======= +gUa +uNN +kKL +rBz +sSX +pns +cpY +vzH +uuO +uuO +uuO +uuO +uuO +uuO +guA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cpY lkr lso vwO +<<<<<<< HEAD nCz +======= +fME +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nKa dqO icA joa dqO nKa +<<<<<<< HEAD tWZ niu +======= +qYx +qWe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 agK lwQ lwQ bEL +<<<<<<< HEAD sjX moE +======= +weI +syv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bEL lwQ lwQ @@ -250857,7 +336810,11 @@ lwQ bEL lwQ qQp +<<<<<<< HEAD bXT +======= +gGI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 isP ePi rdG @@ -250865,7 +336822,11 @@ vQP rdG jzY xlh +<<<<<<< HEAD jQt +======= +hKY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uep uep uep @@ -250879,9 +336840,15 @@ noR wDg rqD wDg +<<<<<<< HEAD uin vep xEL +======= +edw +wvI +ksb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xyT jvR fFC @@ -250889,7 +336856,11 @@ nnn iIs iDQ msN +<<<<<<< HEAD gVC +======= +drK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lyH isu lmy @@ -250901,8 +336872,13 @@ bln bln bln bln +<<<<<<< HEAD bln bln +======= +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dZX lIW fgU @@ -250918,7 +336894,11 @@ frq rlS cfe mXi +<<<<<<< HEAD nDz +======= +mzZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mRI bLz bLz @@ -251052,9 +337032,15 @@ bln efv bln kKL +<<<<<<< HEAD xIh lli eEr +======= +uUp +lli +sQS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL @@ -251062,14 +337048,22 @@ gmW gmW gmW gmW +<<<<<<< HEAD tEs dGO dGO tEs +======= +kBc +dGO +dGO +kBc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gmW gmW gmW gmW +<<<<<<< HEAD kav lCO oEe @@ -251080,10 +337074,23 @@ hxY cpY aMI arW +======= +oOw +aOW +dXx +rOw +ctS +qjJ +nPc +cpY +mmw +oKX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fkk fkk fkk fkk +<<<<<<< HEAD spj cmd vrw @@ -251093,19 +337100,38 @@ vwO dKf nKa kyW +======= +dkZ +dlH +aBP +ofl +lso +vwO +ePP +nKa +dGq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wKe vHf cZd nKa +<<<<<<< HEAD mPG ted krS qkc +======= +lIP +cJX +krS +aOU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mbB rDa mrB jQD slc +<<<<<<< HEAD dMB rjC qjF @@ -251116,6 +337142,18 @@ tOO qQp qQp lWj +======= +wZu +xza +qjF +pPO +qOj +iyK +uzr +qQp +qQp +wjD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rZm sOO lRD @@ -251137,6 +337175,7 @@ lmA oqc oAD xKX +<<<<<<< HEAD vep pBI sCm @@ -251146,6 +337185,17 @@ xAm qSC ldr oOx +======= +wvI +pBI +sCm +xFf +kdC +kRw +fUW +jeR +pMN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mgD oKL elT @@ -251159,21 +337209,36 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +dZX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dZX dZX dZX dZX +<<<<<<< HEAD oOO +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iDp swF osm iqu fcu +<<<<<<< HEAD uOk pnR oTS oPv +======= +vQz +pnR +oTS +uxG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iAk mWw hHb @@ -251186,8 +337251,13 @@ pza pza pza pza +<<<<<<< HEAD rcO wLK +======= +iHp +cFM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mEx ujs mYh @@ -251310,6 +337380,7 @@ gsK kKU kKL cvF +<<<<<<< HEAD xUt lli kKL @@ -251317,10 +337388,20 @@ gDL iyY tlH vww +======= +sQS +lli +kKL +tRq +iyY +tlH +uMW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH dGO iyg hHq +<<<<<<< HEAD aNj xTI gmW @@ -251345,10 +337426,37 @@ gtw iZD vrw sLy +======= +hfd +syC +gmW +cvH +kbL +kKL +soE +neE +kKL +kKL +cvn +btK +aUt +vnA +ooG +oUp +syI +xbn +hJo +vaL +gtw +wAJ +aBP +xVo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso qEM pJC nKa +<<<<<<< HEAD dhk cDT iTE @@ -251358,6 +337466,17 @@ uYm kcj krS bna +======= +jWO +cDT +rLL +cAI +cMN +met +idm +krS +ljB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xtc wxH voj @@ -251367,7 +337486,11 @@ laD xPv mGO tAx +<<<<<<< HEAD wbN +======= +qOj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 grT lEo shy @@ -251388,7 +337511,11 @@ sZF sZF wDK npD +<<<<<<< HEAD tZG +======= +cbC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nZH xbC dPj @@ -251398,18 +337525,37 @@ npD npD npD npD +<<<<<<< HEAD fvX fvX cnh cnh oSw ybF +======= +mdI +npD +npD +npD +wvI +fTH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wvI wvI wvI wvI vep wvI +<<<<<<< HEAD +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +<<<<<<< HEAD bln bln bln @@ -251417,11 +337563,14 @@ bln bln bln bln +======= +lSu bln bln bln -bln -bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mwo swF eDh @@ -251548,6 +337697,7 @@ wNO wNO wNO wNO +<<<<<<< HEAD reu jas jas @@ -251571,11 +337721,37 @@ xea isj gBs lyv +======= +hAM +kdS +kdS +eRE +qQk +cvJ +kdS +eRE +kdS +kdS +kdS +dop +kdS +kdS +kdS +kKL +enY +kKL +kKL +eaQ +lqL +aiu +ijd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iyY tlH tlH tlH dGO +<<<<<<< HEAD ubK uRo aNj @@ -251602,12 +337778,41 @@ gtw iZD vrw krE +======= +brm +uRo +hfd +jDX +gmW +bkR +pAX +kKL +hfg +hQW +kKL +soR +yfg +odF +lia +dgR +haJ +tYt +nRW +gtw +aoM +niO +gtw +wAJ +aBP +kNf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso cbs nGA nKa nTV jPl +<<<<<<< HEAD bGD kXM nKa @@ -251615,6 +337820,15 @@ xXV eYn wjL wbN +======= +jGJ +kXM +nKa +uze +eYn +wjL +niU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iWP xIW lrc @@ -251624,10 +337838,17 @@ lCC iKl iKl xyc +<<<<<<< HEAD dVw bkV ree mpR +======= +sPJ +bkV +ree +lOV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qQp tQc jbx @@ -251637,12 +337858,20 @@ tQc tQc qQp hRA +<<<<<<< HEAD lal +======= +dBb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rkL cga api sZF +<<<<<<< HEAD sKf +======= +tKH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wRr npD cmw @@ -251650,6 +337879,7 @@ nZH msT npD npD +<<<<<<< HEAD hRe hRe alq @@ -251657,6 +337887,26 @@ dFA sZF nBQ sZF +======= +ouW +aQj +alq +dFA +sZF +gTi +emT +wzv +oCE +gcT +gcT +lSu +bln +bln +bln +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -251667,6 +337917,7 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -251680,6 +337931,10 @@ bln bln bln bln +======= +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 swF jsq ben @@ -251805,8 +338060,12 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh bln +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -251815,12 +338074,17 @@ bln bln bln bln +<<<<<<< HEAD +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln kKL +<<<<<<< HEAD aXv bSi kKL @@ -251828,11 +338092,21 @@ acm tDy kKL tts +======= +fOq +lli +kKL +tAN +tDy +kKL +ftk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iyY tlH tlH tlH dGO +<<<<<<< HEAD nOI uRo aNj @@ -251859,6 +338133,34 @@ aHZ nsH vrw jlT +======= +vxW +uRo +hfd +rsy +gmW +oiU +xQU +kKL +kKL +kuJ +kKL +cqb +aYu +gYT +lia +njj +qEn +tFe +eay +eay +gtw +gtw +aHZ +ehL +aBP +ofl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso qEM xwz @@ -251873,13 +338175,22 @@ gOb gOb aSo aSo +<<<<<<< HEAD cCD +======= +gLn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZD lnC klc lDM +<<<<<<< HEAD kNa ica +======= +dVS +bAj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lDM klc rWR @@ -251892,20 +338203,30 @@ laD laD laD xLK +<<<<<<< HEAD nHX +======= +pDL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hRA ist rkL uFz tFV sZF +<<<<<<< HEAD edT wRr +======= +ecW +fed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 npD bPY rwe wGO npD +<<<<<<< HEAD vMN hRe ves @@ -251926,6 +338247,22 @@ bln bln bln bln +======= +umD +pgc +dws +dhR +iye +sZF +xkr +gTi +cip +oCE +lSu +mQb +mQb +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -251933,7 +338270,17 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +uer +mQb +mQb +bln +mQb +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -251951,7 +338298,11 @@ wSw fPZ itl tQM +<<<<<<< HEAD koX +======= +itl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itl qCU vyt @@ -252062,8 +338413,13 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh bln +======= +chb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -252078,11 +338434,19 @@ uei bln bln kKL +<<<<<<< HEAD aPP kKL kKL jRt fTn +======= +enY +kKL +kKL +eRf +lfU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL @@ -252092,11 +338456,16 @@ mMb kKL kKL iyY +<<<<<<< HEAD fvm +======= +vFT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL rCf +<<<<<<< HEAD hlt kKL iqA @@ -252116,6 +338485,27 @@ fhS pAn cpY bao +======= +uOm +kKL +rsf +kKL +kKL +tSF +kKL +kKL +cpY +twn +nBt +jJQ +rlE +mBL +vjA +uDv +aFh +cpY +pxp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lso brj mbk @@ -252128,6 +338518,7 @@ lQG oxU pxX bCf +<<<<<<< HEAD kmf qOW hDC @@ -252137,6 +338528,17 @@ lDM pjZ vzN oXq +======= +wor +wor +mfX +sZD +vgx +lDM +dxO +omo +jdm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xWT klc uiF @@ -252156,6 +338558,7 @@ lGs rfo vzs sZF +<<<<<<< HEAD wUb mlo npD @@ -252177,6 +338580,37 @@ bln bln uer bln +======= +sKf +naF +npD +ebr +iJK +ebr +npD +olM +xUW +sKf +tbQ +sKf +sZF +ddA +sZF +sZF +sZF +bln +quy +uer +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +<<<<<<< HEAD bln bln bln @@ -252189,11 +338623,18 @@ bln bln bln bln -bln -bln -bln -bln -bln +======= +hPv +ujK +ujK +hBf +eRE +ujK +ujK +ujK +iNl +ujK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 swF swF swF @@ -252205,7 +338646,11 @@ kCV bkr qOy pbs +<<<<<<< HEAD rAL +======= +nZN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qMH ptY ptY @@ -252213,7 +338658,11 @@ ptY ptY ptY ptY +<<<<<<< HEAD vyt +======= +dLL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vyt vyt vyt @@ -252319,8 +338768,13 @@ wNO wNO wNO wNO +<<<<<<< HEAD vHT bln +======= +sAd +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -252335,6 +338789,7 @@ uei bln bln mMb +<<<<<<< HEAD hAW jVm sON @@ -252360,22 +338815,59 @@ xUt fKk kKL xOE +======= +nJK +puz +kSc +kSc +lRZ +lRZ +tYS +lRZ +vjq +lRZ +lRZ +vjq +pbS +lRZ +lRZ +iLn +niE +bMF +pJi +ovz +kKL +sQS +sna +kKL +nFt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL kKL kKL kKL +<<<<<<< HEAD nXs +======= +pcM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL kKL kKL kKL +<<<<<<< HEAD oFB opH oFB +======= +glz +kjN +hAl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vBG rMS pKw @@ -252387,6 +338879,7 @@ rZR bCf wor wor +<<<<<<< HEAD kqN vFW noW @@ -252397,6 +338890,18 @@ rIc tVB klc tDA +======= +qxG +vFW +noW +nOh +bNH +bNH +rIc +gpR +klc +ooy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gsT eDH iYs @@ -252406,6 +338911,7 @@ dVc nfD sUT bIQ +<<<<<<< HEAD fFJ hRA npo @@ -252417,10 +338923,24 @@ sKf mlo npD ebr +======= +gib +hRA +npo +woa +uQj +htH +sZF +akd +mlo +npD +tMS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iJK cpl npD fWL +<<<<<<< HEAD qUM fZT dFA @@ -252428,6 +338948,23 @@ axC sZF uNw vjZ +======= +qHt +iiB +dFA +nhO +sZF +awO +vjZ +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +bln +<<<<<<< HEAD bln bln bln @@ -252448,12 +338985,27 @@ bln bln bln bln +======= +mQb +mQb +mQb bln bln bln +yfW +nTX +bln +lSu bln bln bln +uer +mQb +bln +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln oiy oiy @@ -252576,7 +339128,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -252585,7 +339141,11 @@ bln uei tmR uei +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -252593,6 +339153,7 @@ bln bln kKL kKL +<<<<<<< HEAD tOe rkm fEY @@ -252609,11 +339170,30 @@ tbK ssM lli jRt +======= +aeS +plI +whe +chc +dDz +kKL +sQS +sQS +lli +sQS +lli +kKL +kRV +ssM +lli +eRf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL kKL lli +<<<<<<< HEAD xUt lli vYY @@ -252636,6 +339216,30 @@ pxn vBG mQr idp +======= +sQS +lli +uwE +tnu +eUU +sdf +vmO +eYm +kKL +tvZ +kKL +kVv +wgo +lcs +eGg +kKL +rjP +vwO +pxn +vBG +ulL +kGm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rZZ opc qPI @@ -252644,6 +339248,7 @@ cgs bCf wor wor +<<<<<<< HEAD apt amE vgx @@ -252652,6 +339257,16 @@ kAZ gUg amv cTJ +======= +kjP +amE +vgx +lDM +oXq +gUg +amv +sxs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 klc aSo aSo @@ -252670,13 +339285,18 @@ tMO tMO tMO sZF +<<<<<<< HEAD hil +======= +nfF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mlo npD wPE iJK pyY npD +<<<<<<< HEAD vBa vLo hyL @@ -252688,6 +339308,19 @@ vjZ bln bln bln +======= +lYT +waF +jmY +ptp +iye +sZF +eZu +vjZ +mQb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -252698,7 +339331,11 @@ iAf iAf iAf bln +<<<<<<< HEAD bln +======= +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -252833,7 +339470,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -252842,7 +339483,11 @@ bln uei tmR uei +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -252856,8 +339501,13 @@ mMb kKL kKL kKL +<<<<<<< HEAD qUo pjM +======= +fsJ +ekj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nLY lli gAt @@ -252865,6 +339515,7 @@ kKL lIC lRZ pQa +<<<<<<< HEAD eDD nhv lli @@ -252888,6 +339539,31 @@ dig pbF kKL rjP +======= +rOv +fuf +lli +kDO +wsk +hVR +lli +obt +xWM +dku +kKL +nqn +lHA +ddi +kKL +tvZ +kKL +pdB +oBD +lqM +aYk +kKL +vpx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qEM bbM vBG @@ -252914,7 +339590,11 @@ dDw qHz ekE fzo +<<<<<<< HEAD czF +======= +fGY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qaU jtH qpb @@ -252927,16 +339607,28 @@ jDc tMO nMb sZF +<<<<<<< HEAD qwO +======= +oGN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wRr npD ebr hcG +<<<<<<< HEAD bEH npD vtr mmC iQw +======= +nZH +npD +vtr +giv +aQj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dFA oMs sZF @@ -252944,8 +339636,13 @@ eZu vjZ bln bln +<<<<<<< HEAD bln bln +======= +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -253087,10 +339784,17 @@ wNO wNO wNO wNO +<<<<<<< HEAD reu xog xog raq +======= +hAM +kdS +kdS +nyZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -253116,11 +339820,16 @@ bxe bxe mHB kKL +<<<<<<< HEAD gEl +======= +ycO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL aIE lRZ +<<<<<<< HEAD cCR lli mRN @@ -253136,13 +339845,34 @@ cOQ vgU kdw qpQ +======= +rmP +lli +pKX +sQS +qdq +sQS +qdq +lli +qdq +sQS +unu +hxa +kXW +saC +xWr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL tvZ cDw lli lli lli +<<<<<<< HEAD iXB +======= +nfE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL cwO vwO @@ -253162,7 +339892,11 @@ ubk ndJ rHz fdY +<<<<<<< HEAD xuM +======= +vjN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wXh xCQ ufN @@ -253176,7 +339910,11 @@ nmC cEo kQJ mFE +<<<<<<< HEAD dRe +======= +bdT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bsi cmy nAN @@ -253184,6 +339922,7 @@ kCo ezf cnb sZF +<<<<<<< HEAD sKf wRr npD @@ -253193,12 +339932,27 @@ npD npD sZF iqr +======= +uTV +fed +npD +npD +nvh +npD +npD +sZF +fzO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF sZF sZF sZF eZu +<<<<<<< HEAD sZF +======= +vjZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -253213,7 +339967,11 @@ weR lQO hJD iAf +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -253344,7 +340102,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -253352,7 +340114,11 @@ bln bln tmR bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln tmR bln @@ -253367,6 +340133,7 @@ bln vsI acE acE +<<<<<<< HEAD wtX eqJ ktJ @@ -253374,10 +340141,20 @@ oBQ mHB gUY rmR +======= +acE +kXQ +gWV +oBQ +mHB +gUY +iLn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lli kKL kKL lRZ +<<<<<<< HEAD hfG xUt tNb @@ -253402,6 +340179,32 @@ jzR fpA kKL tXg +======= +pEc +sQS +wfE +opU +ykd +sQS +wfE +qch +gyd +tTK +aXc +eUU +iCo +kiX +enH +kKL +tvZ +kKL +lne +rrg +atI +fpA +kKL +rtf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qEM lso bGT @@ -253409,11 +340212,19 @@ vBG wvW moG vBG +<<<<<<< HEAD ayR oMR hsC vBG uSS +======= +rWg +oMR +cNL +vBG +eTY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xrb qhN amE @@ -253422,16 +340233,27 @@ klc pgY hXU oRu +<<<<<<< HEAD hIe uKj dDw fWn +======= +ccR +uKj +dDw +fsz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qgu tYA vds mrD liz +<<<<<<< HEAD rKX +======= +txH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mFE nEc klk @@ -253441,6 +340263,7 @@ sSj tMO jYy sZF +<<<<<<< HEAD vwr wRr eZu @@ -253454,14 +340277,35 @@ xpT hEZ sZF kCh +======= +jPi +fed +nGv +hQK +eZu +pGG +sZF +dlS +pZZ +xpT +hEZ +sZF +lGH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eZu sZF sZF vjZ sZF +<<<<<<< HEAD gar bln fBN +======= +lSu +bln +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vYq iAf tUh @@ -253601,8 +340445,13 @@ wNO wNO wNO wNO +<<<<<<< HEAD wHr bln +======= +sAd +ftY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cnx tmR tmR @@ -253627,24 +340476,41 @@ kxv fIs kxv jju +<<<<<<< HEAD lXC lFG rlH +======= +qNZ +lFG +qRo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gxh gxh gxh kKL gAt +<<<<<<< HEAD hfG gAt xUt gPo +======= +pEc +gAt +sQS +hFm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL mMb mMb kKL +<<<<<<< HEAD cjh +======= +xds +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL @@ -253663,16 +340529,28 @@ vwO mqq ivB vBG +<<<<<<< HEAD loG iOu sZF sZF puB +======= +dxq +jAG +sZF +sZF +jbf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF sZF sxw ayI +<<<<<<< HEAD ktD +======= +jdA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mSM ozN sZF @@ -253685,10 +340563,17 @@ sZF fLQ mjH qLy +<<<<<<< HEAD obr xMM nqd ttO +======= +vds +iCj +nqd +eUN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mFE fil pWY @@ -253698,6 +340583,7 @@ oqT tMO vIe sZF +<<<<<<< HEAD xsA wRr dDo @@ -253712,20 +340598,46 @@ eGK sZF eZu eZu +======= +gWh +wRr +lMa +frz +dhv +pZZ +hLX +pZZ +pZZ +sKf +eGK +sZF +cXR +aTc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xpT bdx sKf cmq +<<<<<<< HEAD gar bln bln +======= +lSu +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vYq fWS weR jdJ xVO jAQ +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -253858,8 +340770,13 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh bln +======= +chb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -253881,7 +340798,11 @@ bln sEB acE acE +<<<<<<< HEAD het +======= +acE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lQf swt xTp @@ -253889,41 +340810,72 @@ pDQ xBL wJM wJM +<<<<<<< HEAD rlH kKL dnL hfG +======= +qRo +kKL +dnL +pEc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL pVl kKL kKL +<<<<<<< HEAD kbp tlH tlH kKL diK +======= +xUd +tlH +tlH +kKL +rEM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL tlH tlH bln kKL +<<<<<<< HEAD emx vIL fOg kQH snR +======= +dYS +aXc +amW +qmq +kWV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 asg kKL kdF qGV hUx +<<<<<<< HEAD bSC +======= +xVv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF sZF sZF sZF sZF +<<<<<<< HEAD sKf +======= +ayd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wEV sKf sZF @@ -253931,7 +340883,11 @@ sZF sZF sZF lpC +<<<<<<< HEAD uWp +======= +sZF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF pwV pwV @@ -253957,32 +340913,53 @@ sZF sZF hEZ mlo +<<<<<<< HEAD fUx sKf +======= +lCc +lRK +xKx +bHc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF sZF sZF sZF sZF sZF +<<<<<<< HEAD sZF sZF eZu +======= +sVA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF sZF sZF vjZ sZF +<<<<<<< HEAD gar bln fBN +======= +lSu +bln +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vYq iAf qPY tUh xVO jAQ +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -254115,15 +341092,26 @@ wNO wNO wNO wNO +<<<<<<< HEAD dqA jas jas nIe +======= +fYT +kdS +kdS +wSp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR uei +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -254149,7 +341137,11 @@ bqe gxh kKL hOu +<<<<<<< HEAD hfG +======= +pEc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hJx lli fAF @@ -254158,7 +341150,11 @@ kKL mMb mMb kKL +<<<<<<< HEAD cjh +======= +xds +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL mMb mMb @@ -254174,7 +341170,11 @@ kKL xcy rvZ hUx +<<<<<<< HEAD veq +======= +cie +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aLX vng gNT @@ -254190,7 +341190,11 @@ xwM daR mQg lRW +<<<<<<< HEAD hkt +======= +qDm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hkt hkt hkt @@ -254209,16 +341213,30 @@ sWs sXK xTQ sWs +<<<<<<< HEAD sWs sWs sWs sWs xTQ vwN +======= +rzV +sWs +sWs +rzV +xTQ +vwN +rzV +rzV +rzV +vtO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sWs sWs sWs sWs +<<<<<<< HEAD leE sWs sWs @@ -254231,6 +341249,16 @@ sZF bln bln bln +======= +skI +osn +nzN +ktf +sZF +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -254240,7 +341268,11 @@ jAQ iAf iAf bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -254375,7 +341407,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -254403,14 +341439,22 @@ cvF lli kKL mwu +<<<<<<< HEAD rlH kKL kKL gRL +======= +qRo +kKL +kKL +lwI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL jhS tOX kKL +<<<<<<< HEAD kaI xIh wvJ @@ -254426,24 +341470,53 @@ igX igX kKL neQ +======= +hVz +uUp +khs +kKL +xds +dYS +amW +amW +amW +amW +rkh +igX +igX +kKL +mVS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL fyZ hUx +<<<<<<< HEAD veq +======= +cie +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF eFS sZF sZF sZF sZF +<<<<<<< HEAD npD +======= +sZF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eZi sKf mFj npD +<<<<<<< HEAD bEo +======= +eMn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sou mZH sZF @@ -254459,6 +341532,7 @@ sKf sKf sKf ktf +<<<<<<< HEAD dPP sKf sKf @@ -254485,6 +341559,35 @@ sKf wRr wEV sZF +======= +tEe +sKf +sKf +lVS +oLn +jgL +gCu +elE +xJv +bge +sKf +jgL +sKf +jgL +xpT +sKf +ktf +mFj +sKf +jgL +sKf +sKf +jgL +wRr +wEV +sZF +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -254493,11 +341596,18 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln bln bln +======= +fPc +mQb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -254632,12 +341742,21 @@ wNO wNO wNO wNO +<<<<<<< HEAD ngh bln uei tmR uei bln +======= +chb +mQb +uei +tmR +uei +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -254663,16 +341782,27 @@ qqB gxh kKL weF +<<<<<<< HEAD hfG +======= +pEc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL moF cjI kKL pQa +<<<<<<< HEAD erq erq oPw srU +======= +wWo +wWo +oPO +jPq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xWM kKL kKL @@ -254682,18 +341812,30 @@ kKL kKL kKL kKL +<<<<<<< HEAD nLs +======= +meZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aJG sQE hwE hwE cMe +<<<<<<< HEAD veq +======= +cie +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uvt tlP wIg vzX +<<<<<<< HEAD bJJ +======= +gAz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cyX sZF npD @@ -254701,7 +341843,11 @@ npD npD npD npD +<<<<<<< HEAD mSv +======= +hTu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 npD npD npD @@ -254719,8 +341865,13 @@ npD npD npD npD +<<<<<<< HEAD tvx qNX +======= +npD +gDE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 npD npD npD @@ -254746,14 +341897,24 @@ bln bln uer bln +<<<<<<< HEAD +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln bln bln +======= +yfW +mQb +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -254889,8 +342050,13 @@ wNO wNO wNO bln +<<<<<<< HEAD vHT bln +======= +sAd +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uei tmR uei @@ -254920,12 +342086,20 @@ hJx qFW kKL hOu +<<<<<<< HEAD hfG +======= +pEc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hJx mzM hUi kKL +<<<<<<< HEAD uar +======= +eqP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unu kKL kKL @@ -254939,13 +342113,21 @@ jSC bdS dtb hUD +<<<<<<< HEAD bOh +======= +nNi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rvZ lso lso rCu cYE +<<<<<<< HEAD tCG +======= +hZT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 idi cZU kBl @@ -254957,8 +342139,13 @@ awK ppQ mrA mtI +<<<<<<< HEAD axc wgR +======= +dAh +mYp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owC tsr moL @@ -254967,12 +342154,21 @@ wHc aEA dng dAB +<<<<<<< HEAD ubh ubh ubh ubh ubh ubh +======= +rHi +rHi +rHi +rHi +rHi +rHi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLY pnA qFp @@ -255000,6 +342196,7 @@ pHR wEV vjZ bln +<<<<<<< HEAD bln bln bln @@ -255009,6 +342206,17 @@ bln bln bln uer +======= +mQb +bln +bln +mQb +mQb +bln +mQb +uer +fPc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -255146,7 +342354,11 @@ wNO wNO wNO bln +<<<<<<< HEAD vnS +======= +uap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln uei tmR @@ -255177,13 +342389,21 @@ lli gxh kKL kKL +<<<<<<< HEAD hfG +======= +pEc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL kKL kKL kIl +<<<<<<< HEAD nNI +======= +cqN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL eIk xry @@ -255198,11 +342418,19 @@ qMm hUD sOH hUx +<<<<<<< HEAD rek rek hUx rNQ tCG +======= +igt +rek +hUx +rNQ +hZT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 idi aID gky @@ -255212,11 +342440,16 @@ cgZ uvt iBa pra +<<<<<<< HEAD dyW +======= +axZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mtI lUf keZ owC +<<<<<<< HEAD jIP qOH veX @@ -255230,6 +342463,21 @@ ubh ubh ubh ubh +======= +pXt +qOH +jIP +wHc +sgL +pTU +itt +rHi +rHi +rHi +rHi +rHi +rHi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLY baF fvk @@ -255258,6 +342506,7 @@ wEV vjZ bln bln +<<<<<<< HEAD bln bln bln @@ -255268,6 +342517,18 @@ bln bln bln bln +======= +mQb +bln +bln +mQb +bln +mQb +bln +fPc +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -255403,7 +342664,11 @@ wNO wNO wNO bln +<<<<<<< HEAD ngh +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -255455,11 +342720,19 @@ qMm hUD pyJ lPh +<<<<<<< HEAD rBp hUD ebb cYE tCG +======= +aJj +hUD +ebb +cYE +hZT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 idi aID ddk @@ -255474,6 +342747,7 @@ mtI uxj eNK owC +<<<<<<< HEAD wAx jTZ ftt @@ -255487,6 +342761,21 @@ ubh ubh ubh ubh +======= +xGA +jTZ +xGA +wHc +xKk +emK +uvU +rHi +rHi +rHi +rHi +rHi +rHi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qLY oCA fvk @@ -255507,22 +342796,39 @@ tgx tgx tgx tgx +<<<<<<< HEAD ctF tmR +======= +qLY +xSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF rzL gea sZF +<<<<<<< HEAD +======= +mQb +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +<<<<<<< HEAD bln bln bln bln bln bln +======= +mQb bln -bln -bln -bln +pMM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -255660,6 +342966,7 @@ wNO wNO wNO wNO +<<<<<<< HEAD dqA jas jas @@ -255682,6 +342989,30 @@ bYr bYx jas ike +======= +fYT +kdS +kdS +eRE +kdS +kdS +kdS +eRE +kdS +kdS +xFn +eRE +kdS +kdS +kdS +eRE +kdS +gSd +lej +eRE +kdS +lVr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL hTB sRI @@ -255714,9 +343045,15 @@ nVr wFO bzA hUD +<<<<<<< HEAD lso byK hMs +======= +eaT +byK +sDd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bRd fqQ wIg @@ -255755,6 +343092,7 @@ hfc ocD diL qVz +<<<<<<< HEAD pNY edp dcr @@ -255762,6 +343100,15 @@ aRl bCL ofr sBx +======= +luD +tfl +dXI +pTT +eLm +jVs +hfc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hfc jCE adY @@ -255770,6 +343117,7 @@ sZF pHR wEV sZF +<<<<<<< HEAD bln bln bln @@ -255783,6 +343131,21 @@ bln bln bln bln +======= +mQb +uer +mQb +mQb +ntK +bln +bln +mQb +bln +yfW +nwD +bln +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -255955,7 +343318,11 @@ kKL kKL gkP kKL +<<<<<<< HEAD wKY +======= +ilq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eSn bJQ qCA @@ -255973,7 +343340,11 @@ vfo hUD lso cYE +<<<<<<< HEAD nYY +======= +fkw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ult bsG wGF @@ -255998,7 +343369,11 @@ mfV xpA uHc cpg +<<<<<<< HEAD gUX +======= +gRA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cpg cdl pMF @@ -256014,11 +343389,19 @@ dbr aFJ xJj xJj +<<<<<<< HEAD lvh iVT ogl ffz bzB +======= +klW +iVT +ogl +eyR +goe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diL vTJ apT @@ -256027,6 +343410,7 @@ vjZ laf wEV vjZ +<<<<<<< HEAD bln bln bln @@ -256041,6 +343425,22 @@ bln bln bln bln +======= +mQb +bln +bln +mQb +uer +bln +bln +mQb +mQb +fPc +bln +bln +mQb +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -256212,7 +343612,11 @@ nqn kKL gkP kKL +<<<<<<< HEAD yfY +======= +tgv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 huB ogd hff @@ -256230,7 +343634,11 @@ cLJ iQQ lso cYE +<<<<<<< HEAD uIS +======= +gAZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ult wjz tXh @@ -256242,7 +343650,11 @@ pKJ rIU tLM mtI +<<<<<<< HEAD vtA +======= +nRX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sfY owC bYS @@ -256256,7 +343668,11 @@ jbU jbU jbU jbU +<<<<<<< HEAD bFr +======= +bkQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 drr qhL qhL @@ -256286,6 +343702,7 @@ wEV vjZ bln bln +<<<<<<< HEAD bln bln bln @@ -256298,6 +343715,20 @@ bln bln bln bln +======= +uer +mQb +bln +mQb +bln +bln +mQb +fPc +bln +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -256465,11 +343896,19 @@ tml kKL kLb qpd +<<<<<<< HEAD oNy kKL gkP kKL flV +======= +obl +kKL +gkP +kKL +sTA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ivH lVF pup @@ -256487,7 +343926,11 @@ bwl hUD uff cYE +<<<<<<< HEAD hXt +======= +gAZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ult hpC rIU @@ -256497,10 +343940,17 @@ irA uzi pdy fiS +<<<<<<< HEAD uTL mtI nRX jVL +======= +agJ +mtI +vtA +muP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owC owC owC @@ -256509,8 +343959,13 @@ wHc mYq nyH lFW +<<<<<<< HEAD rEd pZA +======= +jzH +mde +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gSN jbU wnX @@ -256520,10 +343975,17 @@ pvB ehd ehd ehd +<<<<<<< HEAD wmX ooo rtn qEv +======= +ehd +ooo +rtn +huq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vDu lva lva @@ -256542,6 +344004,7 @@ pHR wEV vjZ bln +<<<<<<< HEAD bln bln bln @@ -256551,6 +344014,17 @@ bln bln bln bln +======= +uer +bln +mQb +mQb +mQb +bln +bln +bln +yfW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -256731,7 +344205,11 @@ bla sil hUD hUD +<<<<<<< HEAD fgm +======= +pGT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qok iZn xzd @@ -256744,7 +344222,11 @@ wND iQQ rvZ cYE +<<<<<<< HEAD uIS +======= +aPl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ult vuq tfM @@ -256777,6 +344259,7 @@ wve hfc hfc hfc +<<<<<<< HEAD iWI kRI nXp @@ -256784,6 +344267,15 @@ gvM kva oXT uPa +======= +mns +hEP +wGt +dAl +hWt +ocJ +mBs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ccQ aCb wAY @@ -256799,6 +344291,10 @@ pHR wEV sZF bln +<<<<<<< HEAD +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -256806,9 +344302,14 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln +======= +fPc +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -256987,7 +344488,11 @@ kCg gjc bLQ vaE +<<<<<<< HEAD tSt +======= +hUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hUD hUD hUD @@ -256999,9 +344504,15 @@ sEi sEi naP hUD +<<<<<<< HEAD jed iIk jed +======= +tRo +iQa +tRo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ult ult wBk @@ -257027,7 +344538,11 @@ gaT bZc qlO jbU +<<<<<<< HEAD ily +======= +hzb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hdH qhL dkK @@ -257049,25 +344564,43 @@ vVP vVP vVP vVP +<<<<<<< HEAD ctF tmR +======= +qLY +xSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZF pHR wEV sZF +<<<<<<< HEAD bln bln bln bln +======= +mQb +mQb +bln +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln vzD vzD vzD gQw gQw +<<<<<<< HEAD vsI bln bln +======= +oMa +bln +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -257240,6 +344773,7 @@ lIC lli unu kKL +<<<<<<< HEAD hno poy poy @@ -257247,6 +344781,15 @@ vvJ hUD ybr bpL +======= +nMT +poy +poy +nRV +hUD +ygf +dsZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pIw hUD ktz @@ -257259,7 +344802,11 @@ iQQ lso rNQ lso +<<<<<<< HEAD aop +======= +pkg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yar mdl rIU @@ -257280,9 +344827,15 @@ jbU pEE cAG nbq +<<<<<<< HEAD hAq nDB nfW +======= +iNY +kiQ +xGK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jbU lhu hdH @@ -257313,8 +344866,13 @@ wRr wEV vjZ bln +<<<<<<< HEAD bln bln +======= +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln vzD @@ -257322,8 +344880,13 @@ oIR vzD jCl kir +<<<<<<< HEAD sEB bln +======= +qVo +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -257497,7 +345060,11 @@ bcC eFO unu kKL +<<<<<<< HEAD hno +======= +tUO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 poy poy vvJ @@ -257517,7 +345084,11 @@ dFO cYE lso hDb +<<<<<<< HEAD azU +======= +exm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nIl nVC abM @@ -257534,10 +345105,17 @@ ujP htO sqn jbU +<<<<<<< HEAD iyP dUe ank wgH +======= +gEy +dUe +ank +baX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUM wlW jbU @@ -257570,17 +345148,28 @@ wRr sKf vjZ bln +<<<<<<< HEAD bln bln bln +======= +mQb +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln vzD vzD vzD kir vzD +<<<<<<< HEAD sEB bln +======= +rwt +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -257754,12 +345343,21 @@ weF fMc aME kKL +<<<<<<< HEAD qLf poy poy lNk hUD nbL +======= +kIr +poy +poy +tav +hUD +uZu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rGd whC hUD @@ -257779,8 +345377,13 @@ gqK nxU gjg dxg +<<<<<<< HEAD gJi fVC +======= +ivG +aYi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dkr cHQ jDm @@ -257794,11 +345397,19 @@ jbU anP cRK uMK +<<<<<<< HEAD udQ oMT qwJ jbU whc +======= +rep +oMT +ppz +jbU +uQR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iZQ llw aus @@ -257836,9 +345447,15 @@ ydh dFG uZc gQw +<<<<<<< HEAD bln bln bln +======= +mQb +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -258011,7 +345628,11 @@ nLY lli aME kKL +<<<<<<< HEAD ttv +======= +ptS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 poy poy hUe @@ -258054,12 +345675,17 @@ pbQ pbQ pbQ pbQ +<<<<<<< HEAD eQQ +======= +jbU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lKq pMY kLy bGA lKq +<<<<<<< HEAD bNu hUf bKm @@ -258071,6 +345697,19 @@ pJc iBO tPx trn +======= +tYW +oYn +cfR +xMT +hjE +lqN +bkS +pJc +iBO +xfp +agd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bgx buv jhC @@ -258093,9 +345732,15 @@ uZc cDk sGZ gQw +<<<<<<< HEAD bln bln bln +======= +mQb +mQb +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -258260,6 +345905,7 @@ iwO uYR kKL kKL +<<<<<<< HEAD tfu aMa tfu @@ -258269,6 +345915,17 @@ xUT uZn kKL ttv +======= +kKL +aMa +kKL +kKL +kKL +iVD +uZn +kKL +ptS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 prg prg caY @@ -258279,7 +345936,11 @@ gEE gEE gEE oNC +<<<<<<< HEAD gEE +======= +nmD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gEE gEE tva @@ -258293,7 +345954,11 @@ sxZ oOo xvy wLl +<<<<<<< HEAD axc +======= +tKD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oLg eLr wtT @@ -258301,10 +345966,17 @@ mbK jQS eNK aYJ +<<<<<<< HEAD sSz aYJ aYJ bXL +======= +jpN +aYJ +aYJ +dwZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eLr eaa via @@ -258312,15 +345984,24 @@ aYJ lAw aYJ aYJ +<<<<<<< HEAD aYJ +======= +wib +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eLr hAm via via tPz iRN +<<<<<<< HEAD via ojP +======= +odR +leo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qFt pTY lcu @@ -258351,7 +346032,11 @@ gTq fNa gQw bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -258525,9 +346210,15 @@ kKL pzV uZn kKL +<<<<<<< HEAD xXU spW kVE +======= +jbz +nKb +god +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xse iQQ gEE @@ -258550,7 +346241,11 @@ pJV mZG mZG qEZ +<<<<<<< HEAD axc +======= +urk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dFW aYJ aYJ @@ -258558,7 +346253,11 @@ aYJ aYJ wUt urK +<<<<<<< HEAD xjU +======= +mNt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nJT urK urK @@ -258576,8 +346275,13 @@ pJV pJV pJV aYJ +<<<<<<< HEAD aYJ sSE +======= +cTR +leo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wOX efk jTr @@ -258608,6 +346312,10 @@ gQw gQw vzD bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -258670,7 +346378,10 @@ wNO wNO wNO wNO +<<<<<<< HEAD wNO +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (181,1,3) = {" wNO @@ -258773,11 +346484,19 @@ kKL kKL kKL kKL +<<<<<<< HEAD qAS fUc jaX glI gZR +======= +cDv +fUc +jaX +glI +mRY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kKL kKL mbG @@ -258787,7 +346506,11 @@ hUD hUD hUD hUD +<<<<<<< HEAD gEE +======= +cEz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gEE gEE gEE @@ -258801,6 +346524,7 @@ gqj emp cYE lso +<<<<<<< HEAD kvG wLl qXp @@ -258808,6 +346532,15 @@ uxA pUn wLl dzg +======= +qbp +wLl +qfA +uxA +pUn +wLl +jYF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fXr dFj dFj @@ -258815,26 +346548,45 @@ uZB oni nxa qwN +<<<<<<< HEAD tkS dFj dFj gwm dFj niC +======= +cLK +dFj +dFj +dFj +dFj +xnM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xnM xnM fLl wMm +<<<<<<< HEAD wqb niC +======= +xnM +wqb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xnM xnM xnM xnM lYg xYj +<<<<<<< HEAD pIt kfZ +======= +kkX +leo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qFt bYu qkH @@ -258865,6 +346617,12 @@ bln bln bln bln +<<<<<<< HEAD +======= +lSu +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -258925,9 +346683,12 @@ wNO wNO wNO wNO +<<<<<<< HEAD wNO wNO wNO +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (182,1,3) = {" wNO @@ -259030,15 +346791,25 @@ iSQ qji pyD kKL +<<<<<<< HEAD mqO +======= +gCs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUc sBi xYA ldi lUC +<<<<<<< HEAD vhm oLG jbu +======= +cZc +oLG +eQF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oxV oxV jbG @@ -259069,6 +346840,7 @@ wnT wnT oHK oHK +<<<<<<< HEAD cbF dEC oHK @@ -259094,6 +346866,33 @@ wLl wLl hjE vWo +======= +xer +wKi +oHK +oHK +umv +cPt +nOa +hnP +nsZ +fki +iIJ +hYE +iIJ +dia +nsZ +nsZ +uoC +nsZ +uoC +nsZ +nsZ +nsZ +nsZ +hjE +xSg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fOl cyL jAI @@ -259119,6 +346918,23 @@ bRz vzD bln bln +<<<<<<< HEAD +======= +mQb +bln +bln +mQb +uer +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +bln +bln +<<<<<<< HEAD bln bln bln @@ -259127,13 +346943,10 @@ bln bln bln bln -bln -bln -bln -bln -bln -bln -bln +======= +wNO +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -259317,12 +347130,21 @@ cYE lso pHX nDd +<<<<<<< HEAD qWh lmY haQ snI bZQ elf +======= +soz +faq +ofi +snI +bZQ +gSq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ojF rQW ftN @@ -259330,6 +347152,7 @@ bxP vvE tJG oHK +<<<<<<< HEAD goq goq rDH @@ -259350,6 +347173,28 @@ cQs bdQ nsZ bkF +======= +hJH +hJH +tPL +eOx +nsZ +nsZ +uoC +gzH +uoC +nsZ +nsZ +fFQ +igd +mzg +tIq +tIq +cQs +bdQ +nsZ +pnK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cSw cmx yeC @@ -259374,6 +347219,13 @@ lEz kPw dAx gQw +<<<<<<< HEAD +======= +mQb +mQb +uer +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -259386,11 +347238,15 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln bln bln +======= +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -259545,7 +347401,11 @@ fLb oHh kKL bpQ +<<<<<<< HEAD bsc +======= +kcT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oih dmL lUC @@ -259587,6 +347447,7 @@ vaA gXJ wgU oHK +<<<<<<< HEAD pnq goq rDH @@ -259603,6 +347464,24 @@ awa awa awa xUk +======= +nWe +hJH +tPL +oiZ +nsZ +izD +wbR +djG +eqj +bjI +tqs +sqt +sqt +sqt +sqt +sqt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aWg xgK nsZ @@ -259631,6 +347510,16 @@ lbf esF bRz gQw +<<<<<<< HEAD +======= +mQb +bln +bln +bln +bln +lSu +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -259640,6 +347529,7 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -259648,6 +347538,9 @@ bln bln bln bln +======= +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -259801,11 +347694,19 @@ eOm kKL kKL kKL +<<<<<<< HEAD dvS pwd glI tsR gZR +======= +mly +pwd +glI +tsR +mRY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lUC tXV kvX @@ -259815,7 +347716,11 @@ qrQ wrX wrX wrX +<<<<<<< HEAD gEE +======= +cEz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gEE gEE gEE @@ -259829,9 +347734,15 @@ urw emp bvI lso +<<<<<<< HEAD mtT pLa jJF +======= +cUB +nYm +mNi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yeB uuC hDb @@ -259846,6 +347757,7 @@ hhP oHK iZl iZl +<<<<<<< HEAD ieb iZl wLl @@ -259860,6 +347772,22 @@ awa awa awa xUk +======= +sVi +iZl +nsZ +fBJ +tkp +tur +bjL +sjl +fZy +fZy +fZy +fZy +fZy +gPC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wvz srW nsZ @@ -259889,6 +347817,16 @@ bRz bVL vzD bln +<<<<<<< HEAD +======= +fsm +bln +bln +uer +bln +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -259897,6 +347835,7 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -259905,6 +347844,9 @@ bln bln bln bln +======= +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -260062,11 +348004,19 @@ pfP apD ugG gIt +<<<<<<< HEAD fkc lUC ccT nyC opw +======= +mnW +lUC +ccT +nyC +eUz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oTA oTA hIN @@ -260104,6 +348054,7 @@ aju gPY qWu fbl +<<<<<<< HEAD foy krY awa @@ -260111,6 +348062,15 @@ awa awa awa jvc +======= +rlu +nsZ +mFb +aHX +aHX +aHX +xgF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa @@ -260126,7 +348086,11 @@ ihu epH rDZ rDZ +<<<<<<< HEAD tBP +======= +ePu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rDZ rDZ bgx @@ -260145,6 +348109,19 @@ gQw gQw vzD vzD +<<<<<<< HEAD +======= +lSu +bln +bln +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +<<<<<<< HEAD bln bln bln @@ -260152,10 +348129,10 @@ bln bln bln bln -bln -bln -bln -bln +======= +lSu +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -260321,7 +348298,11 @@ lUC lUC lUC lUC +<<<<<<< HEAD daX +======= +wrX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pxi wrX tLQ @@ -260335,7 +348316,11 @@ gEE gEE iKQ cpq +<<<<<<< HEAD gEE +======= +ueF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gEE gEE tva @@ -260361,13 +348346,22 @@ wgO fTT bUa wgL +<<<<<<< HEAD phB krY +======= +bhm +nsZ +awa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa awa +<<<<<<< HEAD jvc +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa @@ -260377,7 +348371,11 @@ xUk aSB tHT nsZ +<<<<<<< HEAD lHm +======= +vmK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oZn sFj rck @@ -260398,6 +348396,7 @@ vzD vzD bln bln +<<<<<<< HEAD bln bln tCr @@ -260414,6 +348413,24 @@ tCr tCr tCr tCr +======= +mQb +bln +bln +fYT +eRE +ujK +ujK +eRE +wOq +eRE +ujK +ujK +eRE +lej +lej +hAM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -260578,8 +348595,13 @@ tlH tlH tlH nXb +<<<<<<< HEAD ngY iQt +======= +wrX +tuQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oHH tAA efH @@ -260600,6 +348622,7 @@ jbG nzV cYE dfB +<<<<<<< HEAD wck pFg hXC @@ -260608,10 +348631,21 @@ kuV cAi qWn nQq +======= +ymj +pFg +hXC +qad +kuV +cAi +qWn +dik +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fOR tFF tia qNn +<<<<<<< HEAD hek gNi krY @@ -260620,11 +348654,25 @@ bUa fbl nHf krY +======= +uIQ +gNi +oHK +dUh +bUa +fbl +aDr +nsZ +awa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa awa +<<<<<<< HEAD jvc +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa @@ -260634,6 +348682,7 @@ xUk sqt duE nsZ +<<<<<<< HEAD ijW xsP rms @@ -260641,6 +348690,15 @@ sXC rDZ rDZ rnu +======= +xDa +abT +jJZ +tuy +rDZ +rDZ +mBk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rDZ rDZ bgx @@ -260654,8 +348712,13 @@ vzD bln bln bln +<<<<<<< HEAD bln bln +======= +mQb +uer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -260670,8 +348733,13 @@ bln bln bln bln +<<<<<<< HEAD tCr bln +======= +chn +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -260836,27 +348904,46 @@ tlH tlH nXb wrX +<<<<<<< HEAD xun +======= +iqW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wrX oHH oHH oHH oHH qPL +<<<<<<< HEAD nCa erI gGE qPL pRG mtN +======= +qiL +erI +gGE +qPL +pdD +asv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dFt vHI vHI dFt dFt +<<<<<<< HEAD jub hQO cMv +======= +fdj +lah +asU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qPL elw elw @@ -260873,15 +348960,26 @@ mEJ mEJ krY srP +<<<<<<< HEAD pGp lIk srP krY +======= +rou +lIk +srP +nsZ +awa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa awa +<<<<<<< HEAD jvc +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa @@ -260909,10 +349007,17 @@ vzD vrO vzD bln +<<<<<<< HEAD bln bln bln bln +======= +mQb +bln +mQb +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln sUN @@ -260927,8 +349032,13 @@ sUN tmR sUN bln +<<<<<<< HEAD tCr bln +======= +sFJ +nwD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -261110,7 +349220,11 @@ gVt pCI pCI vsM +<<<<<<< HEAD vns +======= +avc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nfB cMJ eBg @@ -261118,7 +349232,11 @@ kCs omh peV elw +<<<<<<< HEAD tZe +======= +oOc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nvY qpu oPP @@ -261133,12 +349251,20 @@ vJS bUa ubY qHn +<<<<<<< HEAD krY +======= +nsZ +awa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 awa awa awa awa +<<<<<<< HEAD jvc +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wQY nmz nmz @@ -261166,11 +349292,19 @@ jCl vpg gQw bln +<<<<<<< HEAD bln bln bln bln bln +======= +uer +bln +bln +mQb +ntK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln sUN tmR @@ -261183,8 +349317,13 @@ bln sUN tmR sUN +<<<<<<< HEAD bln tCr +======= +hty +uap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -261390,12 +349529,18 @@ ciS bUa jPx jxb +<<<<<<< HEAD luJ bEJ +======= +dqI +oEE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bEJ mXe bEJ qbb +<<<<<<< HEAD piM hLO hLO @@ -261404,6 +349549,16 @@ hLO uAx pFl cyG +======= +miK +xRv +xRv +xRv +xRv +goy +hWD +oiI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nsZ uCJ hjE @@ -261422,6 +349577,7 @@ vrO vrO vrO gQw +<<<<<<< HEAD bln bln bln @@ -261429,6 +349585,19 @@ bln bln bln bln +======= +mQb +ntK +mQb +bln +bln +mQb +bln +sUN +tmR +sUN +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sUN tmR sUN @@ -261437,11 +349606,15 @@ sUN tmR sUN bln +<<<<<<< HEAD sUN tmR sUN bln tCr +======= +dzZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -261606,7 +349779,11 @@ tlH tlH tlH nXb +<<<<<<< HEAD tlH +======= +oFc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tlH tlH tlH @@ -261646,18 +349823,32 @@ gpj oQn iBl pLr +<<<<<<< HEAD hRF krY +======= +mKO +sPq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xLq xLq aoo vIg +<<<<<<< HEAD ykE qEV wpi gZx tIq tIq +======= +jED +qEV +cRq +qVZ +ybf +ybf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vaa xLq xLq @@ -261681,11 +349872,23 @@ pxQ vzD bln bln +<<<<<<< HEAD bln bln bln bln bln +======= +mQb +bln +bln +uer +bln +sUN +tmR +sUN +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sUN tmR sUN @@ -261694,11 +349897,15 @@ sUN tmR sUN bln +<<<<<<< HEAD sUN tmR sUN bln bln +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -261772,7 +349979,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD khz +======= +pUa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO vbG hHG @@ -261904,6 +350115,7 @@ fbl eIC trK qEz +<<<<<<< HEAD krY xLq xLq @@ -261920,6 +350132,24 @@ xLq grs nsZ pdO +======= +nsZ +vyz +xLq +kvR +qVZ +kgo +sCx +iHc +qVZ +nQj +auK +vaa +xLq +xLq +nsZ +ufb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dDm rDZ rDZ @@ -261955,10 +350185,17 @@ sUN tmR sUN bln +<<<<<<< HEAD bln tCr tCr tCr +======= +rdJ +ujK +lej +hAM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -262031,6 +350268,7 @@ wNO wNO wNO wNO +<<<<<<< HEAD kPS hHG hHG @@ -262039,6 +350277,16 @@ khz wNO wNO khz +======= +dHF +hHG +hHG +hHG +pUa +wNO +wNO +pUa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -262128,7 +350376,11 @@ tlH tlH sEB qPL +<<<<<<< HEAD qgn +======= +nbK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vXy ixv qPL @@ -262161,7 +350413,11 @@ gVe whP mOc gYt +<<<<<<< HEAD krY +======= +nsZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oOb ezJ iba @@ -262169,18 +350425,30 @@ gas rjK nlP xTV +<<<<<<< HEAD imy dHM +======= +rGY +nzA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 auK vaa xLq xLq nsZ rDZ +<<<<<<< HEAD pxu rDZ swa pxu +======= +rDZ +rDZ +swa +rDZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rDZ bgx vzD @@ -262190,10 +350458,17 @@ vzD geJ sMo bgx +<<<<<<< HEAD tfm qbh oGm axy +======= +rkH +qbh +oGm +mJq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mJq mJq sEB @@ -262207,15 +350482,26 @@ bln bln tmR bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln tmR bln bln +<<<<<<< HEAD bln bln bln tCr +======= +fsm +mQb +bln +vap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -262289,8 +350575,13 @@ wNO wNO bln bln +<<<<<<< HEAD xDQ xDQ +======= +wDS +wDS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -262407,21 +350698,37 @@ fTW dxm sHM elw +<<<<<<< HEAD aFt hAT xyE hDp kjr +======= +cIb +hAT +xyE +hDp +hDp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 elw omh omh omh omh +<<<<<<< HEAD cbq elw nsZ nsZ vdM +======= +eHV +elw +nsZ +nsZ +qaz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nsZ nsZ bgx @@ -262472,8 +350779,13 @@ tmR tmR cnx bln +<<<<<<< HEAD tCr bln +======= +sFJ +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -262546,8 +350858,13 @@ wNO wNO bln bln +<<<<<<< HEAD wUD wUD +======= +vOy +vOy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -262664,17 +350981,29 @@ dbw omh sHM elw +<<<<<<< HEAD sVf +======= +jqw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 axN qvE nhI hDp elw +<<<<<<< HEAD uKx rpV fTW bwM hds +======= +qrP +rpV +fTW +bwM +xGx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lEv clV wmG @@ -262682,12 +351011,20 @@ jLW nkh tLT wvv +<<<<<<< HEAD fHC +======= +lEP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lEP oEj xmR oEj +<<<<<<< HEAD oEj +======= +ohU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oEj myO oEj @@ -262702,12 +351039,21 @@ oEj xmR oEj dww +<<<<<<< HEAD dFZ mbT nBB xQh xCz mjt +======= +ygm +bgx +qUQ +xQh +xCz +mJq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mJq mJq vsI @@ -262726,10 +351072,17 @@ bln tmR bln bln +<<<<<<< HEAD bln bln bln tCr +======= +mQb +bln +bln +vap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -262803,8 +351156,13 @@ wNO wNO bln bln +<<<<<<< HEAD rPp rPp +======= +dTI +dTI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -262897,7 +351255,11 @@ bln bln bln bln +<<<<<<< HEAD sEB +======= +miY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tpd wwI tPY @@ -262927,6 +351289,7 @@ elw elw elw elw +<<<<<<< HEAD rft icE idt @@ -262944,6 +351307,25 @@ bhk cYI jCl jCl +======= +lxR +icE +idt +nCd +bXD +elw +puY +opN +faG +tKO +hyV +bgx +tHw +tVx +ltP +jCl +uZc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jCl jCl vzD @@ -262969,7 +351351,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln sUN tmR @@ -262983,10 +351369,17 @@ sUN tmR sUN bln +<<<<<<< HEAD bln tCr tCr tCr +======= +cIf +lej +ujK +fYT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -263154,7 +351547,11 @@ bln bln bln bln +<<<<<<< HEAD sEB +======= +miY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tpd hOt ejn @@ -263174,10 +351571,17 @@ udw jZM sEB omh +<<<<<<< HEAD amK omh sED xSw +======= +jrX +omh +sED +gjM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 upv gjM gjM @@ -263186,6 +351590,7 @@ gjM tIW gjM aUl +<<<<<<< HEAD xnt egR pSz @@ -263198,12 +351603,30 @@ qQa bgx gti lOq +======= +lmx +mHq +pSz +elw +pIu +mEU +enq +nkH +qQa +bgx +ave +wpn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jCl xWo axu bFq jCl +<<<<<<< HEAD jCl +======= +uZc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jCl jtn jCl @@ -263221,6 +351644,7 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -263228,6 +351652,15 @@ bln bln bln bln +======= +chb +mQb +uer +mQb +bln +nEa +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sUN tmR sUN @@ -263240,8 +351673,13 @@ sUN tmR sUN bln +<<<<<<< HEAD bln bln +======= +chn +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -263313,17 +351751,30 @@ wNO wNO wNO wNO +<<<<<<< HEAD khz wNO aaX +======= +pUa +wNO +qzn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vbG hHG hHG hHG +<<<<<<< HEAD khz wNO wNO khz +======= +pUa +wNO +wNO +pUa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -263411,6 +351862,7 @@ bln lSu lSu bln +<<<<<<< HEAD sEB tpd tpd @@ -263427,6 +351879,24 @@ nJo hdz quK xdM +======= +miY +tpd +tpd +tpd +qKq +qPL +fPX +dFt +jZM +dFt +jZM +dFt +nJo +dFt +quK +dFt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jZM jZM sEB @@ -263437,15 +351907,25 @@ omh omh omh omh +<<<<<<< HEAD omh fTW +======= +cNe +dbw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rpV jYc fTW cJs fTW +<<<<<<< HEAD fTW omh +======= +tlf +pSz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 elw mWf mWf @@ -263453,7 +351933,11 @@ mWf hyV trm bgx +<<<<<<< HEAD vzD +======= +gti +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vzD vzD vzD @@ -263471,13 +351955,18 @@ twZ bMb rEU vXd +<<<<<<< HEAD jCl +======= +uZc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mwQ vzD bln bln bln bln +<<<<<<< HEAD bln bln bln @@ -263485,6 +351974,19 @@ bln bln bln bln +======= +pMM +bln +mQb +bln +bln +uer +mQb +sUN +tmR +sUN +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sUN tmR sUN @@ -263493,6 +351995,7 @@ sUN tmR sUN bln +<<<<<<< HEAD sUN tmR sUN @@ -263501,6 +352004,12 @@ tCr bln bln bln +======= +ebW +bln +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -263572,7 +352081,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD fhB +======= +liV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vbG hHG hHG @@ -263668,22 +352181,35 @@ bln bln bln bln +<<<<<<< HEAD vsI sEB sEB +======= +hMM +ooL +ooL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jZM xVG jZM xVG jZM +<<<<<<< HEAD sEB gZa sEB +======= +ooL +ooL +ooL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jZM xVG jZM xVG jZM +<<<<<<< HEAD sEB sEB sEB @@ -263694,11 +352220,25 @@ sEB sEB sEB sEB +======= +ooL +ooL +ooL +ooL +ooL +ooL +ooL +ooL +ooL +nXb +buU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 omh skW omh omh omh +<<<<<<< HEAD omh skW omh @@ -263712,6 +352252,20 @@ trm bgx bln bln +======= +skW +omh +pSz +omh +ooL +ooL +ooL +hyV +trm +bgx +gti +vzD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -263723,9 +352277,15 @@ bFq jCl nuj jCl +<<<<<<< HEAD gUT jCl jCl +======= +mEz +uZc +uZc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 syT vzD jCl @@ -263735,12 +352295,20 @@ bln bln bln bln +<<<<<<< HEAD +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD bln bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln sUN tmR @@ -263749,15 +352317,26 @@ bln sUN tmR sUN +<<<<<<< HEAD bln +======= +mQb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sUN tmR sUN bln +<<<<<<< HEAD tCr bln bln bln +======= +chb +bln +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -263950,25 +352529,42 @@ bln bln lSu lSu +<<<<<<< HEAD bln omh fTW +======= +nXb +omh +omh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xTy qNV rCT xTy qNV +<<<<<<< HEAD mhq omh bln +======= +omh +omh +omh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln hyV fiU bgx +<<<<<<< HEAD bln bln +======= +vzD +vzD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -263992,12 +352588,21 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln bln bln mVm +======= +obe +ujK +eRE +ujK +ujK +dMo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln sUN tmR @@ -264011,8 +352616,13 @@ sUN tmR sUN bln +<<<<<<< HEAD tCr bln +======= +sFJ +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264186,6 +352796,7 @@ bln lSu bln dFt +<<<<<<< HEAD kAm jZM gBI @@ -264199,6 +352810,21 @@ jZM gBI dFt bln +======= +tsP +jZM +vYw +dFt +tMa +bln +bln +dFt +tsP +jZM +vYw +dFt +tMa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264217,13 +352843,21 @@ vJk vJk qbW omh +<<<<<<< HEAD +======= +hZN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln bln +<<<<<<< HEAD bln bln +======= +hZN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264240,7 +352874,11 @@ bln bln bln vzD +<<<<<<< HEAD caU +======= +lPq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vzD bln bln @@ -264254,7 +352892,11 @@ bln bln bln bln +<<<<<<< HEAD tCr +======= +chb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264268,9 +352910,15 @@ bln bln bln bln +<<<<<<< HEAD mVm bln bln +======= +vap +lSu +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264472,14 +353120,22 @@ tQX wLk nXg tRX +<<<<<<< HEAD drm +======= +pIy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 omh bln bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264511,6 +353167,7 @@ bln bln bln bln +<<<<<<< HEAD tCr tCr tCr @@ -264528,6 +353185,24 @@ tCr tCr bln bln +======= +obe +lej +iNl +ahG +ujK +ujK +lej +eRE +lej +ujK +ujK +eRE +wvw +ujK +bFP +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264582,6 +353257,10 @@ wNO wNO wNO wNO +<<<<<<< HEAD +======= +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (204,1,3) = {" wNO @@ -264701,18 +353380,32 @@ bln bln jZM oeh +<<<<<<< HEAD kLs vmR jZM bln +======= +jZM +vmR +jZM +htd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln jZM vmR +<<<<<<< HEAD kLs woU jZM bln +======= +jZM +woU +jZM +htd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264736,6 +353429,10 @@ bln bln bln bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264752,10 +353449,16 @@ bln bln bln bln +<<<<<<< HEAD bln vsI sEB sEB +======= +hMM +ooL +rwt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264787,7 +353490,11 @@ bln bln ozo bln +<<<<<<< HEAD bln +======= +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -264946,7 +353653,11 @@ wNO wNO wNO bln +<<<<<<< HEAD fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -264977,6 +353688,7 @@ bln bln bln bln +<<<<<<< HEAD fBN bln bln @@ -264990,10 +353702,28 @@ uOE bln bln bln +======= +xOk +lSu +lSu +cSx +pXY +pXY +xuR +vyU +pXY +oOB +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -265044,7 +353774,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -265237,12 +353971,21 @@ bln bln bln bln +<<<<<<< HEAD nRV vyU vyU vyU vyU vyU +======= +lqE +vyU +pXY +pXY +pXY +pXY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fcP bln bln @@ -265250,6 +353993,10 @@ bln bln bln bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -265299,9 +354046,14 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln +======= +wNO +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -265554,11 +354306,19 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln bln bln +======= +wNO +wNO +wNO +wNO +wNO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -266021,7 +354781,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -266231,8 +354995,47 @@ wNO wNO wNO bln +<<<<<<< HEAD +fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +<<<<<<< HEAD fBN bln +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -266248,37 +355051,10 @@ bln bln bln bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -fBN -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -266535,7 +355311,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -267306,7 +356086,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -267415,7 +356199,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD tNN +======= +wLI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kDs kDs kDs @@ -267516,8 +356304,47 @@ wNO wNO wNO bln +<<<<<<< HEAD +fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +<<<<<<< HEAD fBN bln +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -267533,37 +356360,10 @@ bln bln bln bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -fBN -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -267820,7 +356620,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -268077,7 +356881,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -268187,7 +356995,11 @@ wNO wNO tkU tkU +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -268591,7 +357403,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -268801,8 +357617,47 @@ wNO wNO wNO bln +<<<<<<< HEAD +fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +<<<<<<< HEAD fBN bln +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -268818,37 +357673,10 @@ bln bln bln bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -fBN -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln -bln +<<<<<<< HEAD +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -268958,7 +357786,11 @@ wNO tkU tkU tkU +<<<<<<< HEAD uFg +======= +qtv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -269105,7 +357937,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -269215,7 +358051,11 @@ wNO tkU tkU tkU +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -269362,7 +358202,11 @@ bln bln bln bln +<<<<<<< HEAD bln +======= +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -269618,8 +358462,13 @@ bln bln bln bln +<<<<<<< HEAD bln bln +======= +lSu +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln wNO wNO @@ -269875,9 +358724,15 @@ bln bln bln bln +<<<<<<< HEAD bln bln bln +======= +lSu +bln +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -270086,7 +358941,11 @@ wNO wNO wNO bln +<<<<<<< HEAD fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -270117,7 +358976,11 @@ bln bln bln bln +<<<<<<< HEAD fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -270132,10 +358995,17 @@ bln bln bln bln +<<<<<<< HEAD fBN bln fBN bln +======= +xOk +bln +xOk +lSu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -270757,7 +359627,11 @@ wNO wNO tkU tkU +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -271371,7 +360245,11 @@ wNO wNO bln bln +<<<<<<< HEAD fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -271402,7 +360280,11 @@ bln bln bln bln +<<<<<<< HEAD fBN +======= +xOk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -272299,7 +361181,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -272553,7 +361439,11 @@ wNO (235,1,3) = {" wNO wNO +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO bln @@ -272810,7 +361700,11 @@ wNO (236,1,3) = {" wNO wNO +<<<<<<< HEAD aaX +======= +qzn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO bln @@ -273067,7 +361961,11 @@ wNO (237,1,3) = {" wNO wNO +<<<<<<< HEAD fhB +======= +liV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO bln @@ -273327,7 +362225,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -274612,7 +363514,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -274628,7 +363534,11 @@ vbG hHG hHG hHG +<<<<<<< HEAD aaX +======= +qzn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -274885,7 +363795,11 @@ vbG hHG hHG hHG +<<<<<<< HEAD fhB +======= +liV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wNO wNO wNO @@ -275383,7 +364297,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -275396,8 +364314,13 @@ wNO wNO bln bln +<<<<<<< HEAD xDQ xDQ +======= +wDS +wDS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln wNO @@ -275653,8 +364576,13 @@ wNO wNO bln bln +<<<<<<< HEAD wUD wUD +======= +vOy +vOy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -275910,8 +364838,13 @@ wNO wNO bln bln +<<<<<<< HEAD rPp rPp +======= +dTI +dTI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bln bln bln @@ -276411,7 +365344,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG @@ -277182,7 +366119,11 @@ wNO wNO wNO wNO +<<<<<<< HEAD lgH +======= +fwx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hHG hHG hHG diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 484f0b6e21c..2a889cf2fc6 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -13,6 +13,7 @@ "aag" = ( /turf/closed/wall, /area/station/commons/fitness) +<<<<<<< HEAD "aaj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -29,6 +30,8 @@ dir = 4 }, /area/station/science/lab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aal" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -78,6 +81,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "aaL" = ( /obj/structure/table, /obj/effect/turf_decal/siding/white/corner, @@ -88,6 +92,8 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/medical/office) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "abI" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -186,6 +192,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +<<<<<<< HEAD "adC" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -195,6 +202,8 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "adD" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, @@ -258,6 +267,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) +<<<<<<< HEAD "afe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -266,6 +276,8 @@ /obj/effect/decal/cleanable/wrapping, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afj" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -304,6 +316,16 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/carpet, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"afM" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afZ" = ( /obj/machinery/vending/coffee, /obj/structure/disposalpipe/segment, @@ -314,6 +336,7 @@ /mob/living/simple_animal/bot/secbot/beepsky/armsky, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +<<<<<<< HEAD "agf" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/lights/mixed{ @@ -351,6 +374,17 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_half, /area/station/cargo/bitrunning/den) +======= +"agi" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ago" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/iron, @@ -362,6 +396,7 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +<<<<<<< HEAD "agB" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/light/directional/north, @@ -370,6 +405,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "agN" = ( /obj/structure/table/glass, /obj/item/radio/intercom/directional/west, @@ -399,6 +436,7 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) +<<<<<<< HEAD "agP" = ( /obj/item/storage/box/syringes, /obj/item/storage/box/beakers{ @@ -414,6 +452,8 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "agR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -427,11 +467,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD "ahb" = ( /obj/structure/lattice/catwalk, /obj/item/banner/cargo, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ahe" = ( /obj/machinery/airalarm/directional/east, /obj/structure/cable, @@ -480,6 +523,7 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) +<<<<<<< HEAD "ahu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -500,6 +544,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ahD" = ( /obj/structure/displaycase/trophy, /turf/open/floor/wood, @@ -525,6 +571,7 @@ dir = 4 }, /turf/open/floor/iron/dark/corner{ +<<<<<<< HEAD dir = 1 }, /area/station/engineering/atmos) @@ -618,6 +665,76 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +======= + dir = 1 + }, +/area/station/engineering/atmos) +"ahW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Corporate Showroom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "showroom" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"aib" = ( +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"aid" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"aij" = ( +/obj/structure/chair, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"aiw" = ( +/obj/structure/window/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"aja" = ( +/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/office) +"ajq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"ajI" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/vending/drugs, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"ajK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, @@ -678,6 +795,7 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +<<<<<<< HEAD "akQ" = ( /obj/structure/table/wood, /obj/structure/sign/picture_frame/showroom/three{ @@ -694,6 +812,21 @@ }, /turf/open/floor/wood, /area/station/command/corporate_showroom) +======= +"akF" = ( +/obj/machinery/flasher/directional/north{ + id = "AI" + }, +/obj/structure/table/wood/fancy/blue, +/obj/effect/spawner/random/aimodule/neutral, +/obj/machinery/door/window/right/directional/east{ + name = "Core Modules"; + req_access = list("captain") + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "akZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -707,6 +840,38 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) +<<<<<<< HEAD +======= +"alu" = ( +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/structure/crate, +/obj/effect/turf_decal/arrows{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"alw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"alA" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + name = "Quartermaster Junction" + }, +/obj/effect/mapping_helpers/mail_sorting/supply/qm_office, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "alE" = ( /turf/open/floor/iron, /area/station/security/courtroom) @@ -716,10 +881,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/mechbay) +<<<<<<< HEAD "alG" = ( /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "alI" = ( /obj/machinery/door/window/left/directional/east{ name = "Bridge Deliveries"; @@ -762,6 +930,7 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +<<<<<<< HEAD "aml" = ( /obj/structure/secure_safe/hos{ pixel_x = 36; @@ -771,6 +940,8 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "amo" = ( /obj/structure/chair{ dir = 8; @@ -864,6 +1035,7 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +<<<<<<< HEAD "aoc" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -884,6 +1056,22 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/qm) +======= +"anX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/status_display/evac/directional/west, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aok" = ( /turf/open/floor/iron, /area/station/cargo/storage) @@ -915,6 +1103,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"apC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "apJ" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -924,6 +1119,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +<<<<<<< HEAD "apT" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -1543,6 +1739,648 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +======= +"apO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"apS" = ( +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"apT" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"aqa" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) +"aqh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"aqs" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"aqt" = ( +/obj/structure/table, +/obj/item/folder/yellow, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/item/paper/pamphlet/gateway, +/turf/open/floor/iron, +/area/station/command/gateway) +"aqu" = ( +/obj/structure/closet/wardrobe/green, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"aqG" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"aqS" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"ara" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"arg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ark" = ( +/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/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"art" = ( +/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/grimy, +/area/station/tcommsat/computer) +"asi" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, +/obj/item/stack/sheet/iron{ + amount = 30 + }, +/obj/item/radio{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/stack/cable_coil, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"asm" = ( +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/trimline/brown/warning, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/medical/medbay/lobby) +"asz" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/mineral/plasma{ + amount = 35 + }, +/obj/structure/cable, +/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/dark, +/area/station/ai_monitored/command/storage/satellite) +"asB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"asM" = ( +/obj/machinery/computer/prisoner/management{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +"asT" = ( +/obj/effect/spawner/structure/window, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/lobby) +"atf" = ( +/obj/structure/table/glass, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"atk" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"atN" = ( +/obj/structure/cable, +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/office) +"aub" = ( +/obj/effect/spawner/random/structure/grille, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"auc" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"auh" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"aum" = ( +/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/light/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"auw" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin7"; + name = "Cabin 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/dorms) +"auJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"ava" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/item/storage/box/lights/mixed, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"avb" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_half, +/area/station/medical/cryo) +"avc" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Gateway - Access" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/command/gateway) +"avq" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"avr" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"avx" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"avA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"avK" = ( +/turf/closed/wall, +/area/station/maintenance/fore/lesser) +"avU" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/button/door/directional/east{ + id = "Cabin2"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"awy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple, +/obj/structure/sign/warning/test_chamber/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"awO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "rdoffice"; + name = "Research Director's Shutters" + }, +/turf/open/floor/plating, +/area/station/science/server) +"axd" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = -32 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"axe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 3"; + name = "Cell 3 locker" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"axx" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"axJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"axK" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/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, +/area/station/security/prison) +"axO" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/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/white, +/area/station/security/prison) +"axW" = ( +/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/structure/disposalpipe/segment, +/turf/open/floor/iron/white/side, +/area/station/medical/medbay/lobby) +"aye" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/space, +/area/space/nearstation) +"ayg" = ( +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"ayr" = ( +/turf/open/floor/iron, +/area/station/engineering/break_room) +"ayz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/effect/decal/cleanable/wrapping, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"ayH" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/port) +"ayO" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + 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/hallway/primary/central) +"ayV" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"azd" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/space, +/area/space/nearstation) +"azg" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"azv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"azz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"azE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"azF" = ( +/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/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) +"azZ" = ( +/obj/structure/closet/crate, +/obj/item/reagent_containers/cup/bowl, +/obj/effect/spawner/random/contraband/prison, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/storage/box/drinkingglasses, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/box/drinkingglasses, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"aAb" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +"aAg" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"aAs" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"aAt" = ( +/obj/machinery/light_switch/directional/south, +/obj/effect/spawner/random/vending/colavend, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"aAA" = ( +/obj/docking_port/stationary/mining_home{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"aAB" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"aAI" = ( +/obj/structure/sign/plaques/kiddie/perfect_man{ + pixel_y = 32 + }, +/obj/effect/spawner/random/decoration/showcase, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"aAK" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/gateway) +"aAS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"aAT" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Bridge - Port Access" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"aBw" = ( +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"aBL" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"aBM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/item/cigbutt{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"aBQ" = ( +/obj/structure/cable, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"aBW" = ( +/obj/machinery/button/ignition/incinerator/atmos, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"aBX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) "aCi" = ( @@ -1564,6 +2402,7 @@ /obj/item/wallframe/digital_clock, /turf/open/floor/iron, /area/station/commons/storage/tools) +<<<<<<< HEAD "aCz" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/cable, @@ -1571,6 +2410,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aCE" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10.1-Central-from-Aft"; @@ -1682,10 +2523,13 @@ /obj/item/poster/random_official, /turf/open/floor/iron/dark, /area/station/security/office) +<<<<<<< HEAD "aEp" = ( /obj/structure/sign/departments/cargo, /turf/closed/wall, /area/station/cargo/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aEr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1698,6 +2542,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD "aEy" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -1708,6 +2553,19 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +"aEA" = ( +/obj/structure/table/wood, +/obj/item/staff/broom, +/obj/item/wrench, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/wood/large, +/area/station/service/theater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aEH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -1722,10 +2580,13 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) +<<<<<<< HEAD "aFb" = ( /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aFd" = ( /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, @@ -1740,6 +2601,14 @@ /obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/wood, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"aFW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/mirror/directional/west, +/turf/open/floor/wood, +/area/station/service/theater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aFZ" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -1782,6 +2651,20 @@ "aGM" = ( /turf/open/floor/iron, /area/station/security/range) +<<<<<<< HEAD +======= +"aGQ" = ( +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aGS" = ( /obj/structure/sign/warning/no_smoking, /turf/closed/wall, @@ -1794,6 +2677,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "aGW" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -1811,6 +2695,8 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/station/science/genetics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aHh" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -1851,6 +2737,23 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD +======= +"aHH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aHM" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -1861,6 +2764,7 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/station/science/research) +<<<<<<< HEAD "aHW" = ( /obj/machinery/door/airlock/mining{ name = "Drone Bay" @@ -1872,6 +2776,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/cargo/drone_bay) +======= +"aHN" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/event_spawn, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"aHR" = ( +/obj/structure/sign/warning/biohazard, +/turf/closed/wall/r_wall, +/area/station/science/research) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aIl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -1948,10 +2866,13 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +<<<<<<< HEAD "aJh" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJj" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -1974,6 +2895,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD "aJt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1982,10 +2904,13 @@ /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, /area/station/cargo/miningoffice) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJv" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/station/engineering/supermatter) +<<<<<<< HEAD "aJw" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -2000,6 +2925,8 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -2092,6 +3019,20 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +<<<<<<< HEAD +======= +"aKN" = ( +/obj/structure/chair/office, +/obj/machinery/requests_console/directional/north{ + department = "Quartermaster's Desk"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/landmark/start/depsec/supply, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aKO" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2151,6 +3092,47 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD +======= +"aLW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/stamp/head/qm{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/item/stamp/granted{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/stamp/denied{ + pixel_x = -7; + pixel_y = 5 + }, +/obj/item/stamp/void{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/effect/spawner/random/entertainment/money_medium{ + pixel_y = -6; + pixel_x = -3 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/clipboard{ + pixel_x = 10; + pixel_y = 8 + }, +/obj/item/coin/gold{ + pixel_y = -5; + pixel_x = 10 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aMb" = ( /obj/structure/table, /obj/item/cultivator, @@ -2253,6 +3235,21 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +<<<<<<< HEAD +======= +"aNQ" = ( +/obj/structure/table, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/suture, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aNZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -2280,6 +3277,7 @@ /obj/effect/turf_decal/trimline/brown/warning, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD "aOt" = ( /obj/effect/turf_decal/siding/white{ dir = 9 @@ -2631,6 +3629,310 @@ /obj/machinery/porta_turret/ai{ dir = 4 }, +======= +"aOA" = ( +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"aOC" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/security/brig) +"aOH" = ( +/obj/structure/table, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) +"aPk" = ( +/obj/structure/closet/crate/preopen, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"aPm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/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/medical/medbay/central) +"aPq" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Auxilliary Surgery" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"aPs" = ( +/obj/structure/displaycase/captain{ + pixel_y = 5 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"aPv" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"aPw" = ( +/obj/machinery/ai_slipper{ + uses = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"aPx" = ( +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/structure/closet_empty/crate, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"aPH" = ( +/obj/structure/bed/dogbed/runtime, +/obj/item/toy/cattoy, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/mob/living/basic/pet/cat/runtime, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"aPX" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/server) +"aQe" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "MiniSat Exterior - Starboard Aft"; + network = list("minisat") + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"aQR" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space, +/area/space/nearstation) +"aQS" = ( +/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, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/science/central) +"aRo" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"aRt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"aRz" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"aRI" = ( +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) +"aRV" = ( +/obj/machinery/porta_turret/ai{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"aSe" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"aSk" = ( +/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/yellow{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"aSm" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"aSv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/reagent_dispensers/beerkeg, +/obj/item/toy/figure/qm{ + pixel_x = 3; + pixel_y = 12 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"aSQ" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"aST" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"aSZ" = ( +/obj/machinery/door/poddoor{ + id = "QMLoaddoor2"; + name = "Supply Dock Loading Door" + }, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"aTs" = ( +/mob/living/basic/slime, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"aTD" = ( +/obj/machinery/vending/coffee, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"aTU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"aTV" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/ai) +"aUm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"aUn" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"aUt" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"aUx" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +"aUC" = ( +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/item/reagent_containers/cup/rag, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -3; + pixel_y = 9 + }, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +"aUK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"aUP" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"aVd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"aVl" = ( +/obj/machinery/porta_turret/ai{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "aVn" = ( @@ -2743,6 +4045,7 @@ "aWO" = ( /obj/machinery/ai_slipper{ uses = 10 +<<<<<<< HEAD }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) @@ -2763,6 +4066,11 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aXa" = ( /turf/closed/wall, /area/station/security/prison/mess) @@ -2849,6 +4157,17 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD +======= +"aYl" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Lab - Test Chamber"; + network = list("ss13","rd","xeno") + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aYw" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -2866,6 +4185,7 @@ }, /turf/open/space, /area/space/nearstation) +<<<<<<< HEAD "aYy" = ( /obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ @@ -2879,6 +4199,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aYz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -2919,6 +4241,7 @@ "aZj" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 +<<<<<<< HEAD }, /obj/machinery/computer/order_console/mining, /turf/open/floor/iron, @@ -2994,6 +4317,103 @@ /obj/effect/mapping_helpers/broken_floor, /obj/machinery/light/small/dim/directional/west, /turf/open/floor/plating, +======= + }, +/obj/machinery/computer/order_console/mining, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"aZr" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/button/door{ + desc = "A door remote control switch for the exterior brig doors."; + id = "outerbrig"; + name = "Brig Exterior Door Control"; + normaldoorcontrol = 1; + pixel_x = 6; + pixel_y = 7; + req_access = list("security") + }, +/obj/machinery/button/flasher{ + id = "secentranceflasher"; + name = "Brig Entrance Flasher"; + pixel_y = -3; + req_access = list("security") + }, +/obj/machinery/button/door{ + desc = "A door remote control switch for the interior brig doors."; + id = "innerbrig"; + name = "Brig Interior Door Control"; + normaldoorcontrol = 1; + pixel_x = -6; + pixel_y = 7; + req_access = list("security") + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"aZv" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "ordnancebridge" + }, +/obj/machinery/button/door{ + id = "ordnancebridge"; + pixel_x = -24; + req_one_access = list("maint_tunnels","science") + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"aZA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/south{ + id = "PermaLockdown"; + name = "Panic Button"; + req_access = list("brig") + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"aZL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"aZR" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"bar" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 10 + }, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 18; + start_on = 0 + }, +/obj/item/kitchen/rollingpin{ + pixel_x = -4 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/port/aft) "bas" = ( /obj/machinery/airalarm/directional/west, @@ -3018,6 +4438,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/office) +<<<<<<< HEAD "baB" = ( /obj/structure/table/glass, /obj/structure/cable, @@ -3030,12 +4451,23 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "baE" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance/two, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"baG" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "baM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3085,6 +4517,25 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD +======= +"bbT" = ( +/obj/structure/closet/crate, +/obj/item/stack/cable_coil, +/obj/item/crowbar, +/obj/item/screwdriver{ + pixel_y = 16 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +"bcb" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/science/research) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bcf" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -3099,6 +4550,29 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"bcw" = ( +/obj/structure/cable, +/obj/structure/sign/poster/official/random/directional/west, +/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/commons/fitness/recreation) +"bcx" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bcT" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -3118,6 +4592,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD +======= +"bdb" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/random/directional/east, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bdv" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/trunk, @@ -3138,6 +4626,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/medical/surgery/theatre) +<<<<<<< HEAD "bdE" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -3148,6 +4637,8 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bdP" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -3253,6 +4744,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD "bfy" = ( /obj/item/retractor, /obj/item/hemostat{ @@ -3262,6 +4754,8 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bfM" = ( /obj/machinery/door/airlock/public/glass{ name = "Art Storage" @@ -3416,6 +4910,7 @@ /obj/machinery/component_printer, /turf/open/floor/iron/white, /area/station/science/explab) +<<<<<<< HEAD "biz" = ( /obj/structure/table, /obj/item/analyzer, @@ -3426,6 +4921,8 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "biA" = ( /obj/machinery/holopad, /obj/effect/turf_decal/delivery, @@ -3447,6 +4944,7 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD "bjf" = ( /obj/structure/table, /obj/machinery/status_display/ai/directional/west, @@ -3460,6 +4958,8 @@ /obj/item/ai_module/supplied/freeform, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bjl" = ( /obj/machinery/rnd/production/techfab/department/service, /obj/effect/turf_decal/trimline/brown/warning{ @@ -3536,6 +5036,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD +======= +"bjK" = ( +/obj/structure/tank_holder/extinguisher, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay Cryogenics"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bjP" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/foyer) @@ -3557,6 +5070,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"bkJ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bkM" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine, @@ -3585,6 +5107,7 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "blg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/structure/crate, @@ -3603,6 +5126,8 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "blu" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/west, @@ -3646,6 +5171,7 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD "bmn" = ( /obj/structure/cable, /obj/machinery/camera/motion/directional/south{ @@ -3657,6 +5183,8 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bmB" = ( /obj/machinery/light_switch/directional/south, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -3722,6 +5250,24 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +<<<<<<< HEAD +======= +"bny" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; + name = "Antechamber Turret Control"; + pixel_x = 30; + req_access = list("minisat") + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bnA" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -3832,6 +5378,29 @@ dir = 4 }, /area/station/service/chapel) +<<<<<<< HEAD +======= +"bpq" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bpu" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -3859,6 +5428,27 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"bpY" = ( +/obj/machinery/light/small/directional/west, +/obj/item/clothing/mask/animal/horsehead, +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/south, +/obj/item/cigarette/pipe, +/obj/item/clothing/mask/fakemoustache, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/wood, +/area/station/service/theater) +"bqg" = ( +/obj/structure/cable, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bqk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -3867,6 +5457,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +<<<<<<< HEAD +======= +"bqC" = ( +/obj/structure/table/wood, +/obj/item/cigarette/pipe, +/turf/open/floor/wood, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bqJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3879,12 +5477,15 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) +<<<<<<< HEAD "bqP" = ( /obj/effect/landmark/start/depsec/supply, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bqX" = ( /turf/closed/wall/r_wall, /area/station/medical/chemistry) @@ -3917,6 +5518,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD "brN" = ( /obj/structure/table, /obj/item/clothing/gloves/latex, @@ -3929,6 +5531,8 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "brO" = ( /obj/structure/transit_tube/diagonal/topleft, /turf/open/space, @@ -3995,6 +5599,7 @@ }, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "bsv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -4018,6 +5623,24 @@ /area/station/service/theater) "bsE" = ( /obj/structure/cable, +======= +"bsz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"bsC" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/theater) +"bsE" = ( +/obj/structure/cable, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/sorting/mail{ @@ -4061,6 +5684,7 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "btD" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -4117,6 +5741,76 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) +======= +"btC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +"btG" = ( +/obj/structure/window/spawner/directional/west, +/obj/structure/table, +/obj/item/storage/belt/utility/full, +/obj/item/borg/upgrade/rename, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"btL" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/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/white, +/area/station/science/ordnance/storage) +"bug" = ( +/obj/structure/lattice, +/obj/item/tank/internals/oxygen/empty, +/turf/open/space/basic, +/area/space/nearstation) +"buj" = ( +/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 = 9 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"buk" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/fore) +"bus" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/item/extinguisher{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/extinguisher, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"buv" = ( +/obj/structure/sign/warning/secure_area/directional/west, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/closet/bombcloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "buE" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/window/spawner/directional/west, @@ -4152,6 +5846,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD +======= +"buL" = ( +/obj/structure/closet/secure_closet/exile, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "buN" = ( /obj/structure/flora/bush/large/style_random, /obj/structure/disposalpipe/segment, @@ -4179,6 +5884,31 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD +======= +"bvl" = ( +/obj/machinery/newscaster/directional/east, +/obj/structure/table, +/obj/item/stack/package_wrap{ + pixel_x = 2; + pixel_y = -3 + }, +/obj/item/stack/package_wrap{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_y = 16 + }, +/obj/machinery/digital_clock/directional/north, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bvJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -4187,6 +5917,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/robotics/lab) +<<<<<<< HEAD "bvU" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/siding/purple{ @@ -4197,6 +5928,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bvY" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -4245,6 +5978,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD "bxc" = ( /obj/structure/sink{ dir = 8; @@ -4254,6 +5988,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/warehouse) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bxf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4288,6 +6024,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD +======= +"bxr" = ( +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/space/basic, +/area/space/nearstation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bxE" = ( /obj/machinery/camera/directional/south{ c_tag = "Chemistry South"; @@ -4351,6 +6094,44 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +<<<<<<< HEAD +======= +"byE" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "rdrnd"; + name = "Research and Development Containment Control"; + pixel_x = -6; + req_access = list("rd") + }, +/obj/machinery/button/door/directional/north{ + id = "rdordnance"; + name = "Ordnance Containment Control"; + pixel_x = 6; + req_access = list("rd") + }, +/obj/machinery/button/door/directional/north{ + id = "rdoffice"; + name = "Privacy Control"; + pixel_y = 34; + req_access = list("rd") + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +"byQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "byR" = ( /obj/structure/sign/warning/secure_area/directional/north, /obj/structure/cable, @@ -4387,6 +6168,25 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +<<<<<<< HEAD +======= +"bzV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig" + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/turf/open/floor/iron, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bAA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4423,6 +6223,21 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD +======= +"bBy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bBA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4433,6 +6248,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "bBC" = ( /obj/structure/sign/poster/random/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -4440,6 +6256,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bBK" = ( /obj/structure/table, /obj/item/storage/dice, @@ -4518,6 +6336,18 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +<<<<<<< HEAD +======= +"bDn" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bDp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4561,6 +6391,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) +<<<<<<< HEAD "bEA" = ( /obj/structure/cable, /obj/machinery/camera/directional/south{ @@ -4638,6 +6469,46 @@ "bGo" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 +======= +"bEv" = ( +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{ + name = "Burn Chamber Exterior Airlock" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"bEA" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/south{ + c_tag = "Chief Medical Officer's Office"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/machinery/requests_console/directional/south{ + department = "Chief Medical Officer's Desk"; + name = "Chief Medical Officer's Requests Console" + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"bEC" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"bEK" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/plating, @@ -4815,6 +6686,7 @@ location = "11.1-Command-Starboard" }, /obj/structure/cable, +<<<<<<< HEAD /turf/open/floor/iron, /area/station/hallway/primary/central) "bKe" = ( @@ -4832,6 +6704,332 @@ "bKz" = ( /turf/closed/wall/mineral/plastitanium, /area/station/security/execution/transfer) +======= +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"bER" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"bEW" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Customs Checkpoint" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/modular_computer/preset/id, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"bFr" = ( +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"bFC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"bFH" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/trunk, +/obj/structure/cable, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"bFN" = ( +/obj/machinery/chem_dispenser, +/obj/machinery/button/door/directional/north{ + id = "pharmacy_shutters"; + name = "pharmacy shutters control"; + pixel_x = 24; + req_access = list("medical") + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"bGo" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/spawner/random/structure/crate_loot, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"bGu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"bGC" = ( +/turf/closed/wall, +/area/station/hallway/primary/central) +"bGJ" = ( +/obj/structure/chair/stool/bar/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/commons/lounge) +"bGL" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"bHb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/grass, +/area/station/science/research) +"bHr" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/warden) +"bHt" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"bHv" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/closed/wall, +/area/station/cargo/warehouse) +"bHD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"bHE" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"bHN" = ( +/obj/item/radio/intercom/directional/south, +/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/grimy, +/area/station/security/detectives_office) +"bHQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"bIa" = ( +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"bIi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"bIq" = ( +/obj/structure/table/wood, +/obj/machinery/button/ticket_machine{ + pixel_x = 38 + }, +/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/item/paper_bin/carbon{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/stamp/head/hop{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "hopqueue"; + name = "Queue Shutters Control"; + pixel_x = -6; + pixel_y = -34; + req_access = list("hop") + }, +/obj/item/pen{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/machinery/button/photobooth{ + pixel_x = 26 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"bIv" = ( +/obj/machinery/smartfridge/organ, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/aft) +"bIw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"bIH" = ( +/obj/structure/chair/comfy/beige, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/bridge) +"bIO" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"bIU" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"bJk" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"bJp" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"bJq" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"bJG" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"bJQ" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"bJW" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=12-Central-Starboard"; + location = "11.1-Command-Starboard" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"bJX" = ( +/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/cargo/storage) +"bKv" = ( +/obj/item/pen, +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/machinery/newscaster/directional/north, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"bKz" = ( +/turf/closed/wall/mineral/plastitanium, +/area/station/security/execution/transfer) +"bKB" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bKT" = ( /obj/machinery/door/airlock/grunge{ name = "Prison Forestry" @@ -4844,6 +7042,33 @@ "bLd" = ( /turf/closed/wall, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD +======= +"bLh" = ( +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{ + pixel_x = 5; + pixel_y = 16 + }, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/liqueur{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{ + pixel_x = 15; + pixel_y = 16 + }, +/obj/item/storage/fancy/coffee_condi_display{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bLj" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -4860,6 +7085,22 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating/airless, /area/space/nearstation) +<<<<<<< HEAD +======= +"bLY" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bMa" = ( /obj/structure/disposaloutlet{ dir = 4; @@ -4905,11 +7146,14 @@ }, /turf/open/floor/iron/checker, /area/station/engineering/atmos/pumproom) +<<<<<<< HEAD "bME" = ( /obj/structure/table, /obj/item/cigarette/pipe, /turf/open/floor/plating, /area/station/maintenance/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bMM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -4929,6 +7173,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +<<<<<<< HEAD "bMW" = ( /obj/structure/sign/warning/vacuum/external/directional/south, /obj/machinery/light/small/directional/north, @@ -4940,6 +7185,8 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bMY" = ( /turf/closed/wall, /area/station/medical/office) @@ -4984,16 +7231,29 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD "bNv" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bNE" = ( /obj/machinery/light/directional/east, /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"bNN" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bNP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -5032,10 +7292,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port/aft) +<<<<<<< HEAD "bOP" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment, +======= +"bPc" = ( +/obj/effect/turf_decal/trimline/brown/filled/shrink_ccw{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/cargo/storage) "bPi" = ( @@ -5068,6 +7335,7 @@ "bQj" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 +<<<<<<< HEAD }, /obj/structure/cable, /turf/open/floor/plating, @@ -5104,6 +7372,65 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/engine, /area/station/science/explab) +======= + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"bQk" = ( +/obj/item/bodypart/arm/left, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"bQl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Cargo Office"; + name = "Cargo Office Fax Machine" + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"bQN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"bQO" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Bar - Starboard" + }, +/obj/structure/cable, +/obj/effect/spawner/random/entertainment/arcade, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/lounge) +"bQQ" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/machinery/smartfridge/extract/preloaded, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"bRb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/scientist, +/turf/open/floor/engine, +/area/station/science/explab) +"bRp" = ( +/obj/effect/spawner/random/decoration/microwave{ + dir = 1; + pixel_y = 2 + }, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bRq" = ( /obj/structure/table/wood, /obj/item/food/grown/harebell{ @@ -5182,6 +7509,7 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +<<<<<<< HEAD "bSp" = ( /obj/machinery/door/airlock/mining{ name = "Quartermaster's Office" @@ -5195,6 +7523,8 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/diagonal, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bSr" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/airalarm/directional/west, @@ -5202,6 +7532,33 @@ dir = 8 }, /area/station/commons/fitness) +<<<<<<< HEAD +======= +"bSs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/table/glass, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/screwdriver{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/requests_console/directional/west{ + department = "Pharmacy"; + name = "Pharmacy Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/ore_update, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bSY" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -5224,6 +7581,23 @@ }, /turf/open/floor/iron, /area/station/commons/lounge) +<<<<<<< HEAD +======= +"bTm" = ( +/obj/structure/table/reinforced, +/obj/item/wheelchair{ + pixel_y = -3 + }, +/obj/item/wheelchair, +/obj/item/wheelchair{ + pixel_y = 3 + }, +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bTq" = ( /obj/machinery/camera/motion/directional/south{ c_tag = "AI Upload Chamber - Port"; @@ -5234,6 +7608,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +<<<<<<< HEAD "bUb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/brown/filled/corner{ @@ -5245,16 +7620,59 @@ /obj/effect/decal/cleanable/wrapping, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bUc" = ( /obj/machinery/shower/directional/west, /obj/effect/landmark/start/assistant, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +<<<<<<< HEAD "bUg" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"bUk" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/kitchen) +"bUo" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/plasteel{ + amount = 15 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/structure/fireaxecabinet/mechremoval/directional/east, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"bUt" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/item/radio/intercom/directional/west, +/obj/item/pinpointer/nuke, +/obj/item/disk/nuclear, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bUC" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -5325,6 +7743,38 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD +======= +"bVK" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + frequency = 1449; + id_tag = "virology_airlock_interior"; + name = "Virology Interior Airlock" + }, +/obj/machinery/door_buttons/access_button{ + idDoor = "virology_airlock_interior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Button"; + pixel_x = 8; + pixel_y = -24; + req_access = list("virology") + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/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/medical/virology, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bWe" = ( /obj/structure/table/glass, /obj/structure/reagent_dispensers/wall/virusfood/directional/west, @@ -5350,6 +7800,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD "bWs" = ( /obj/structure/cable, /obj/machinery/door/airlock/external{ @@ -5361,6 +7812,8 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bWw" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/computer/pod/old/mass_driver_controller/trash{ @@ -5368,6 +7821,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +<<<<<<< HEAD "bWA" = ( /obj/machinery/light/directional/west, /obj/machinery/piratepad/civilian, @@ -5381,6 +7835,8 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bWM" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/blue, @@ -5420,6 +7876,37 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +<<<<<<< HEAD +======= +"bXc" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/machinery/requests_console/directional/east{ + department = "Research Lab"; + name = "Research Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/trimline/purple/filled/warning/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/lab) +"bXg" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bXk" = ( /obj/machinery/telecomms/server/presets/command, /turf/open/floor/circuit/telecomms/mainframe, @@ -5497,6 +7984,7 @@ "bYz" = ( /turf/open/floor/circuit, /area/station/maintenance/port/aft) +<<<<<<< HEAD "bYF" = ( /obj/structure/sign/chalkboard_menu, /turf/closed/wall, @@ -5514,6 +8002,29 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +"bYN" = ( +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"bZb" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Doors"; + pixel_y = 1; + req_access = list("xenobiology") + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bZq" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/stripes/line{ @@ -5566,11 +8077,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/courtroom) +<<<<<<< HEAD "car" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "caO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -5579,6 +8093,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD +======= +"caV" = ( +/obj/vehicle/sealed/mecha/ripley/cargo, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/iron/recharge_floor, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cbg" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -5595,6 +8117,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +<<<<<<< HEAD "cbz" = ( /turf/closed/wall, /area/station/cargo/storage) @@ -5610,6 +8133,22 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/medical/office) +======= +"cbp" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/normal/directional/north, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"cbz" = ( +/turf/closed/wall, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ccc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -5618,6 +8157,7 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +<<<<<<< HEAD "cci" = ( /obj/machinery/computer/mecha{ dir = 8 @@ -5635,6 +8175,8 @@ /obj/machinery/computer/security/telescreen/rd/directional/north, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ccD" = ( /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -5671,6 +8213,22 @@ }, /turf/open/floor/iron, /area/station/commons/toilet/auxiliary) +<<<<<<< HEAD +======= +"cdC" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"cdS" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cdX" = ( /turf/closed/wall, /area/station/engineering/storage/tech) @@ -5728,6 +8286,7 @@ }, /turf/open/space, /area/space/nearstation) +<<<<<<< HEAD "ceY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5738,6 +8297,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ceZ" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -5781,6 +8342,7 @@ /obj/machinery/oven/range, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +<<<<<<< HEAD "cfJ" = ( /obj/structure/cable, /obj/structure/table/wood/fancy/black, @@ -5823,6 +8385,15 @@ /obj/machinery/door/window/right/directional/east, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +"cfH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cgi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark/side{ @@ -5855,6 +8426,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"cgP" = ( +/obj/machinery/air_sensor/ordnance_burn_chamber, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"cgZ" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cha" = ( /obj/machinery/door/airlock/research/glass{ name = "Ordnance Lab" @@ -5865,6 +8448,19 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) +<<<<<<< HEAD +======= +"chn" = ( +/obj/structure/sign/warning/secure_area/directional/south, +/obj/structure/table/reinforced, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "chH" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5892,6 +8488,7 @@ }, /turf/closed/wall, /area/station/maintenance/central) +<<<<<<< HEAD "cia" = ( /obj/structure/sign/poster/random/directional/south, /obj/effect/turf_decal/tile/blue, @@ -5900,6 +8497,8 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cii" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -5907,6 +8506,18 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) +<<<<<<< HEAD +======= +"ciE" = ( +/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 = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ciG" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5971,6 +8582,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) +<<<<<<< HEAD +======= +"ckB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ckE" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -5986,6 +8608,7 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD "clf" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/brown{ @@ -6058,6 +8681,57 @@ /obj/item/folder/red, /turf/open/floor/carpet, /area/station/command/bridge) +======= +"clj" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"cln" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/research) +"clp" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/port) +"clq" = ( +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"clE" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"clO" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Inner Pipe Access"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "O2 To Pure" + }, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"clQ" = ( +/turf/closed/wall, +/area/station/command/teleporter) +"cml" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cmB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -6076,6 +8750,34 @@ /obj/item/bodypart/leg/left, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +<<<<<<< HEAD +======= +"cmX" = ( +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "QMLoad"; + name = "Loading Conveyor"; + pixel_x = -13; + pixel_y = -5 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"cna" = ( +/obj/structure/table, +/obj/item/storage/box/lights/mixed{ + pixel_y = 9; + pixel_x = 8 + }, +/obj/item/storage/box/lights/mixed{ + pixel_y = 5; + pixel_x = -6 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cnc" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -6158,12 +8860,25 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +<<<<<<< HEAD "coE" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 +======= +"com" = ( +/obj/structure/cable, +/obj/machinery/netpod, +/obj/machinery/light/directional/west, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) +"coz" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /turf/open/floor/iron, /area/station/cargo/storage) @@ -6189,10 +8904,30 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD +======= +"cpn" = ( +/obj/structure/table, +/obj/machinery/newscaster/directional/north, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cpp" = ( /obj/structure/sign/poster/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "cpw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6214,6 +8949,8 @@ /obj/item/computer_disk/medical, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cpH" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/yellow, @@ -6268,6 +9005,29 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/station/solars/port/aft) +<<<<<<< HEAD +======= +"cqm" = ( +/obj/item/disk/data{ + pixel_x = 9; + pixel_y = -1 + }, +/obj/item/disk/tech_disk{ + pixel_x = -2; + pixel_y = -3 + }, +/obj/item/disk/design_disk{ + name = "component design disk"; + pixel_y = 6 + }, +/obj/structure/table/wood, +/obj/item/toy/talking/ai{ + name = "\improper Nanotrasen-brand toy AI"; + pixel_y = 6 + }, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cqp" = ( /obj/machinery/airalarm/directional/north, /obj/effect/spawner/random/structure/closet_private, @@ -6278,6 +9038,17 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD +======= +"cqy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cqD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -6378,10 +9149,28 @@ /obj/effect/landmark/navigate_destination, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD "csy" = ( /obj/structure/dresser, /turf/open/floor/wood, /area/station/service/theater) +======= +"csz" = ( +/obj/structure/table, +/obj/item/raw_anomaly_core/random{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/raw_anomaly_core/random{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/raw_anomaly_core/random, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "csQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -6404,6 +9193,7 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron, /area/station/maintenance/port/aft) +<<<<<<< HEAD "ctu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6413,6 +9203,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ctL" = ( /obj/machinery/computer/records/security{ dir = 4 @@ -6433,6 +9225,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) +<<<<<<< HEAD "cua" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, @@ -6442,6 +9235,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/warehouse) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cuc" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -6453,6 +9248,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "cuh" = ( +<<<<<<< HEAD /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, @@ -6463,6 +9259,11 @@ /obj/effect/turf_decal/trimline/purple/filled/warning, /turf/open/floor/iron, /area/station/science/lab) +======= +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cuk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -6484,6 +9285,35 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"cuM" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = -4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"cuO" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/closet/firecloset, +/obj/structure/sign/warning/secure_area/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cuZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -6516,6 +9346,20 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"cvv" = ( +/obj/machinery/conveyor/inverted{ + dir = 10; + id = "QMLoad2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/railing, +/turf/open/floor/plating, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cvw" = ( /obj/machinery/recharge_station, /turf/open/floor/iron/dark, @@ -6555,6 +9399,7 @@ /obj/machinery/shower/directional/south, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) +<<<<<<< HEAD "cvU" = ( /obj/structure/table/wood, /obj/item/storage/briefcase/secure{ @@ -6573,6 +9418,8 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cvY" = ( /turf/open/floor/plating/airless, /area/station/solars/port/aft) @@ -6658,6 +9505,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/robotics/lab) +<<<<<<< HEAD "cwE" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -6668,6 +9516,8 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cwF" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -6691,6 +9541,16 @@ }, /turf/open/floor/iron, /area/station/security/prison/visit) +<<<<<<< HEAD +======= +"cwP" = ( +/obj/structure/sign/poster/random/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cwX" = ( /obj/machinery/door/window/brigdoor/left/directional/south{ name = "Command Desk"; @@ -6701,6 +9561,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "cwY" = ( +<<<<<<< HEAD /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 @@ -6708,6 +9569,20 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/storage) +======= +/obj/machinery/conveyor{ + dir = 1; + id = "packageExternal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/spawner/directional/west, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/start/hangover, +/turf/open/floor/plating, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cxi" = ( /obj/item/solar_assembly, /obj/item/solar_assembly, @@ -6783,10 +9658,13 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "cxT" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cxU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -6806,6 +9684,17 @@ }, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD +======= +"cyE" = ( +/obj/machinery/portable_atmospherics/pipe_scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cyG" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -6823,6 +9712,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +<<<<<<< HEAD +======= +"cyU" = ( +/obj/structure/table/wood, +/obj/item/toy/plush/carpplushie{ + greyscale_colors = "#ff5050#000000"; + name = "\improper Nanotrasen wildlife department space carp plushie" + }, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cyW" = ( /turf/open/floor/iron, /area/station/engineering/atmos) @@ -6835,6 +9735,7 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/white, /area/station/medical/abandoned) +<<<<<<< HEAD "cza" = ( /obj/effect/turf_decal/trimline/blue/corner{ dir = 1 @@ -6855,6 +9756,8 @@ /obj/structure/sign/departments/rndserver/directional/north, /turf/open/floor/iron/white, /area/station/science/research) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "czs" = ( /obj/structure/easel, /obj/effect/mapping_helpers/broken_floor, @@ -6868,6 +9771,16 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/security/lockers) +<<<<<<< HEAD +======= +"czD" = ( +/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/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "czG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6884,6 +9797,7 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating/airless, /area/space/nearstation) +<<<<<<< HEAD "czN" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -6903,6 +9817,33 @@ /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/closed/wall/r_wall, +======= +"czP" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"czT" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"cAf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/structure/crate, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"cAm" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/engineering/supermatter) "cAG" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -6938,6 +9879,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +<<<<<<< HEAD "cBv" = ( /obj/structure/table/glass, /obj/machinery/cell_charger, @@ -6951,6 +9893,8 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cBy" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -6967,6 +9911,7 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/medical/storage) +<<<<<<< HEAD "cBO" = ( /obj/structure/fireaxecabinet/directional/south, /obj/item/paper_bin{ @@ -6980,6 +9925,8 @@ /obj/structure/table/glass, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cBV" = ( /obj/machinery/mech_bay_recharge_port{ dir = 8 @@ -6990,6 +9937,7 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/cargo/miningoffice) +<<<<<<< HEAD "cCe" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -7004,6 +9952,46 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"cCM" = ( +/obj/structure/lattice/catwalk, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/colocup{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/colocup{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/cigarette/rollie/cannabis{ + pixel_y = -3 + }, +/turf/open/space/basic, +/area/space/nearstation) +"cCN" = ( +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/structure/table, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/machinery/airalarm/directional/west, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cCR" = ( /obj/item/radio/intercom/directional/east, /obj/structure/kitchenspike, @@ -7023,6 +10011,37 @@ /obj/item/instrument/guitar, /turf/open/space/basic, /area/space/nearstation) +<<<<<<< HEAD +======= +"cDM" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"cDO" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/power_store/cell/high, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cDP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7040,6 +10059,14 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"cDV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cDX" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -7048,6 +10075,7 @@ }, /turf/open/floor/iron, /area/station/commons/lounge) +<<<<<<< HEAD "cEe" = ( /obj/machinery/recharger{ pixel_y = 4 @@ -7067,6 +10095,29 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +======= +"cEv" = ( +/obj/item/food/grown/wheat, +/obj/item/food/grown/watermelon, +/obj/item/food/grown/citrus/orange, +/obj/item/food/grown/grapes, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cEx" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/station/service/theater) +"cEY" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cFa" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -7077,10 +10128,31 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"cFl" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/item/kitchen/rollingpin, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cFp" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/commons/storage/primary) +<<<<<<< HEAD +======= +"cFr" = ( +/obj/structure/table, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/flasher/directional/south{ + id = "AI" + }, +/obj/effect/spawner/round_default_module, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cFu" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -7091,6 +10163,17 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD +======= +"cGq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cGu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -7127,6 +10210,7 @@ }, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +<<<<<<< HEAD "cHp" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, /obj/structure/table, @@ -7164,11 +10248,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cHE" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD "cHN" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/camera/directional/east{ @@ -7177,6 +10264,21 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +======= +"cHG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cHQ" = ( /obj/machinery/computer/security/mining{ dir = 1 @@ -7186,12 +10288,20 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +<<<<<<< HEAD "cIa" = ( /obj/structure/cable, /obj/machinery/status_display/evac/directional/west, /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/construction/storage_wing) +======= +"cHR" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cId" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -7201,6 +10311,7 @@ }, /turf/open/floor/plating, /area/station/science/genetics) +<<<<<<< HEAD "cIg" = ( /obj/structure/secure_safe/caps_spare, /obj/structure/table/glass, @@ -7214,6 +10325,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/teleporter) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cIK" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -7261,6 +10374,7 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +<<<<<<< HEAD "cJp" = ( /obj/machinery/status_display/supply, /turf/closed/wall, @@ -7275,6 +10389,18 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"cJt" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/computer/cargo{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cJv" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/chem_heater/withbuffer, @@ -7287,6 +10413,35 @@ /obj/structure/table/wood, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +<<<<<<< HEAD +======= +"cJL" = ( +/obj/structure/sign/directions/evac, +/turf/closed/wall/r_wall, +/area/station/medical/chemistry) +"cJS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"cJT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cKd" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -7319,6 +10474,20 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"cKN" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/item/storage/backpack/satchel/leather/withwallet{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cKW" = ( /obj/structure/secure_safe/directional/north, /obj/machinery/camera/directional/north{ @@ -7369,6 +10538,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD +======= +"cLN" = ( +/obj/structure/sign/departments/exodrone/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cMb" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -7392,6 +10568,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness) +<<<<<<< HEAD "cMJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -7399,6 +10576,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cML" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -7424,6 +10603,26 @@ /obj/effect/landmark/navigate_destination, /turf/open/floor/iron/white, /area/station/medical/psychology) +<<<<<<< HEAD +======= +"cNb" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/computer/security/qm{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"cNg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cNk" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -7443,14 +10642,18 @@ "cNS" = ( /turf/open/floor/iron, /area/station/maintenance/port/aft) +<<<<<<< HEAD "cNX" = ( /obj/item/stack/rods, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cOa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/service/hydroponics) +<<<<<<< HEAD "cOk" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -7467,6 +10670,12 @@ }, /turf/open/floor/iron, /area/station/science/lab) +======= +"cOj" = ( +/obj/structure/sign/chalkboard_menu, +/turf/closed/wall, +/area/station/commons/storage/primary) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cOl" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -7486,11 +10695,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD "cOt" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cON" = ( /obj/structure/table, /obj/item/pai_card, @@ -7508,6 +10720,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/cmo) +<<<<<<< HEAD +======= +"cOT" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cOX" = ( /obj/structure/sign/warning/radiation/rad_area/directional/north, /obj/effect/turf_decal/stripes/line{ @@ -7517,6 +10738,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD "cPa" = ( /obj/structure/sign/warning/secure_area/directional/south, /turf/open/floor/plating, @@ -7534,6 +10756,8 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cPQ" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/fyellow, @@ -7573,6 +10797,25 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"cQz" = ( +/obj/structure/table/glass, +/obj/machinery/light_switch/directional/north, +/obj/item/storage/briefcase/secure{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cQQ" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ @@ -7621,11 +10864,14 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +<<<<<<< HEAD "cRZ" = ( /obj/structure/sink/directional/east, /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cSg" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -7651,6 +10897,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD +======= +"cSu" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cSv" = ( /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -7690,6 +10942,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD +======= +"cTk" = ( +/obj/machinery/camera/motion/directional/south{ + active_power_usage = 0; + c_tag = "Armory - External"; + use_power = 0 + }, +/turf/open/space/basic, +/area/space/nearstation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cTl" = ( /obj/structure/table/glass, /obj/item/reagent_containers/syringe, @@ -7732,6 +10995,7 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "cTR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -7745,6 +11009,8 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cUd" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -7765,6 +11031,7 @@ }, /turf/open/floor/wood, /area/station/security/office) +<<<<<<< HEAD "cUm" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -7772,6 +11039,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cUw" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -7786,6 +11055,7 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/wood, /area/station/commons/dorms) +<<<<<<< HEAD "cUy" = ( /obj/effect/landmark/navigate_destination/bar, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7800,6 +11070,8 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/plating, /area/station/commons/toilet/auxiliary) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cUH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -7814,6 +11086,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD "cUL" = ( /obj/structure/cable, /obj/structure/sign/poster/official/random/directional/east, @@ -7822,11 +11095,27 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cUP" = ( /obj/effect/spawner/random/structure/closet_private, /obj/item/clothing/under/misc/assistantformal, /turf/open/floor/wood, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"cUX" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law, +/obj/machinery/light/small/directional/west, +/obj/item/paper/fluff/gateway, +/obj/item/coin/plasma, +/obj/item/melee/chainofcommand, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cVj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -7843,6 +11132,20 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD +======= +"cVC" = ( +/obj/structure/cable, +/obj/machinery/mineral/stacking_unit_console{ + pixel_x = 32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cVJ" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -7856,6 +11159,7 @@ "cWr" = ( /obj/structure/disposalpipe/segment{ dir = 4 +<<<<<<< HEAD }, /turf/open/floor/carpet, /area/station/service/library) @@ -7912,6 +11216,73 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= + }, +/turf/open/floor/carpet, +/area/station/service/library) +"cWs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/library) +"cWu" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"cWy" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Distro to Waste" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"cWD" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"cWI" = ( +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"cWM" = ( +/obj/machinery/door/airlock/external{ + name = "Construction Zone" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) +"cWT" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"cXc" = ( +/obj/structure/table, +/obj/item/food/grown/poppy/lily, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cXg" = ( /obj/machinery/recharge_station, /obj/machinery/light/small/directional/west, @@ -7929,6 +11300,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) +<<<<<<< HEAD "cXD" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -7940,6 +11312,24 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +"cXE" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/filled/line, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"cXH" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/sign/poster/official/safety_eye_protection/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cXP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -7975,6 +11365,35 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +<<<<<<< HEAD +======= +"cYJ" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/door/firedoor, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/machinery/door/window/left/directional/north{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cYL" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -7990,6 +11409,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"cYY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cZi" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -8035,6 +11463,14 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD +======= +"daa" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dac" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8149,6 +11585,7 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/white, /area/station/security/prison/safe) +<<<<<<< HEAD "dcO" = ( /obj/effect/turf_decal/trimline/brown/filled/shrink_ccw{ dir = 8 @@ -8162,6 +11599,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ddc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, @@ -8218,6 +11657,7 @@ /obj/item/wrench, /turf/open/floor/iron, /area/station/commons/storage/primary) +<<<<<<< HEAD "ddR" = ( /obj/effect/turf_decal/trimline/brown/corner{ dir = 1 @@ -8234,6 +11674,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_half, /area/station/cargo/bitrunning/den) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "deb" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, @@ -8348,6 +11790,18 @@ "dfC" = ( /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +<<<<<<< HEAD +======= +"dfK" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/cargo_technician, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dfO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8447,6 +11901,7 @@ }, /turf/open/space, /area/space/nearstation) +<<<<<<< HEAD "dgy" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -8471,6 +11926,8 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dgz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -8507,6 +11964,7 @@ "dhp" = ( /obj/machinery/modular_computer/preset/engineering, /obj/effect/turf_decal/tile/blue/half/contrasted{ +<<<<<<< HEAD dir = 1 }, /turf/open/floor/iron/dark, @@ -8978,6 +12436,539 @@ /turf/open/water, /area/station/service/hydroponics/garden) "dsb" = ( +======= + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"dhs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"dhu" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"dhw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dhz" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"dhN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/range) +"dhU" = ( +/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/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dhW" = ( +/obj/structure/table/reinforced, +/obj/item/kitchen/fork/plastic, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"dhX" = ( +/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/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"dia" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Chemistry West"; + network = list("ss13","medbay") + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"dim" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/blue{ + desc = "An old pair of nitrile gloves, with no sterile properties."; + name = "old nitrile gloves" + }, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical, +/obj/item/reagent_containers/cup/rag, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"diq" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/west{ + name = "Containment Pen #5"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"dit" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"diC" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Atmospherics Maintenance" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"diE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"diJ" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"diX" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"dji" = ( +/obj/structure/lattice, +/obj/structure/sign/warning/electric_shock/directional/south, +/turf/open/space/basic, +/area/space/nearstation) +"djn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"dkx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"dkC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"dkL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"dkO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"dkW" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"dkX" = ( +/obj/structure/cable, +/obj/machinery/light/cold/directional/north, +/obj/machinery/computer/security/telescreen/isolation/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"dla" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"dlb" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"dlc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/break_room) +"dlr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dlG" = ( +/obj/structure/cable, +/obj/item/radio/intercom/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) +"dlH" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"dlL" = ( +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plating, +/area/station/maintenance/port) +"dme" = ( +/obj/effect/turf_decal/arrows{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/plating, +/area/station/cargo/storage) +"dmJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Airlock" + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +"dmK" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/command) +"dmO" = ( +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"dmP" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"dno" = ( +/turf/open/floor/iron/white, +/area/station/medical/virology) +"dnH" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Doors" + }, +/turf/open/floor/plating, +/area/station/engineering/storage_shared) +"dnJ" = ( +/obj/effect/spawner/random/structure/grille, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"dnW" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "N2O to Pure" + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dox" = ( +/obj/structure/rack, +/obj/item/screwdriver{ + pixel_y = 16 + }, +/obj/item/hand_labeler, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"doD" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/firecloset, +/obj/item/clothing/glasses/meson/engine, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"doI" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"doM" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/small/directional/north, +/obj/structure/rack, +/obj/item/storage/toolbox/electrical, +/turf/open/floor/iron/white, +/area/station/science/explab) +"dpg" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "roboticsprivacy2"; + name = "Robotics Shutters" + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/window/left/directional/north{ + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"dpl" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 3 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"dpn" = ( +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"dps" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=14.9-CrewQuarters-Central"; + location = "14.8-Dorms-Lockers" + }, +/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/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"dpx" = ( +/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/light/floor, +/turf/open/floor/iron, +/area/station/commons/locker) +"dpI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"dpN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"dpU" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Central Aft" + }, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"dqc" = ( +/obj/machinery/door/airlock/security/glass{ + name = "N2O Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/turf/open/floor/iron/dark, +/area/station/maintenance/port/fore) +"dqo" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/obj/machinery/door/poddoor/preopen{ + id = "Disposal Exit"; + name = "Disposal Exit Vent" + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"dqu" = ( +/obj/item/book/manual/wiki/security_space_law{ + name = "space law"; + pixel_y = 2 + }, +/obj/item/toy/gun, +/obj/item/restraints/handcuffs, +/obj/structure/table/wood, +/obj/item/clothing/head/collectable/hos{ + name = "novelty HoS hat" + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"dqx" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"dqy" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/porta_turret/ai, +/obj/machinery/computer/security/telescreen/minisat/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"dqE" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/item/lightreplacer{ + pixel_y = 7 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) +"dqI" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"dqM" = ( +/obj/item/wrench, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"dqN" = ( +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dqX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/wood, +/area/station/service/theater) +"drm" = ( +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"drq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"drw" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/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) +"drA" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"drE" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"dsb" = ( /obj/effect/turf_decal/plaque{ icon_state = "L13" }, @@ -9061,6 +13052,11798 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"dtB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dtE" = ( +/obj/structure/table/reinforced, +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/stamp{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/pen/red{ + pixel_y = 10 + }, +/obj/item/dest_tagger{ + pixel_x = 9; + pixel_y = 10 + }, +/obj/item/pen/screwdriver{ + pixel_x = -7; + pixel_y = 7 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"dtY" = ( +/obj/machinery/meter/monitored/waste_loop, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"duc" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/textured_half, +/area/station/cargo/bitrunning/den) +"duk" = ( +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"duu" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/medbay/central) +"duw" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"duF" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/security/brig) +"duG" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"duI" = ( +/turf/closed/wall, +/area/station/command/bridge) +"duW" = ( +/obj/machinery/computer/security, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/requests_console/directional/north{ + department = "Quartermaster's Desk"; + name = "Security Requests Console" + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"dve" = ( +/obj/structure/cable, +/obj/effect/spawner/random/maintenance, +/obj/machinery/recharge_station, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dvn" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"dvJ" = ( +/obj/structure/tank_dispenser, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"dvP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +"dvT" = ( +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/machinery/power/solar_control{ + dir = 4; + id = "aftport"; + name = "Port Quarter Solar Control" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"dvV" = ( +/obj/machinery/nuclearbomb/beer{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/structure/table/wood, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"dvZ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=11-Command-Port"; + location = "10.2-Aft-Port-Corner" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dwf" = ( +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dwk" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Morgue"; + network = list("ss13","medbay") + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +"dwm" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/clothing/costume, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dwz" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/engineering/atmos) +"dwH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dwI" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/delivery_chute{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/west, +/obj/machinery/door/window/right/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"dwJ" = ( +/obj/structure/lattice, +/obj/effect/spawner/random/structure/grille, +/turf/open/space, +/area/space/nearstation) +"dwZ" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"dxe" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/evidence) +"dxk" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"dxo" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"dxq" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"dxK" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/purple, +/turf/open/space/basic, +/area/space/nearstation) +"dyd" = ( +/obj/machinery/vending/assist, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dye" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"dyq" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/digital_clock/directional/south, +/obj/item/surgery_tray/full, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"dyr" = ( +/obj/machinery/status_display/door_timer{ + id = "Cell 3"; + name = "Cell 3"; + pixel_x = 32; + pixel_y = -32 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/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) +"dyw" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndlab2"; + name = "Secondary Research and Development Shutter" + }, +/turf/open/floor/plating, +/area/station/science/lab) +"dzw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"dzX" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +"dzY" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"dAc" = ( +/obj/structure/closet/crate/trashcart/laundry, +/obj/effect/spawner/random/contraband/prison, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison) +"dAk" = ( +/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/cargo/storage) +"dBb" = ( +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/research) +"dBE" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Cargo Bay Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/storage) +"dBV" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"dBZ" = ( +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/light_switch/directional/west, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"dCm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"dCo" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/security/courtroom) +"dCx" = ( +/obj/machinery/computer/shuttle/mining{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"dDe" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security{ + name = "Interrogation" + }, +/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/dark, +/area/station/security/interrogation) +"dDo" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"dDq" = ( +/obj/effect/landmark/start/bartender, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"dDx" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Command Hallway" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"dDE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Locker Room" + }, +/obj/effect/decal/cleanable/dirt, +/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/commons/locker) +"dDH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock{ + name = "Bar Storage" + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/turf/open/floor/wood, +/area/station/service/bar/backroom) +"dDP" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/airless, +/area/station/solars/starboard/fore) +"dDZ" = ( +/obj/machinery/door/airlock/external{ + name = "Common Mining Dock" + }, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/plating, +/area/station/hallway/primary/port) +"dEi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"dEx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"dEF" = ( +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"dEH" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"dEV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/research) +"dEX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/grunge{ + name = "Quiet Room" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/library) +"dFg" = ( +/obj/structure/cable, +/turf/open/floor/carpet/orange, +/area/station/command/heads_quarters/qm) +"dFi" = ( +/obj/structure/closet/l3closet/virology, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"dFo" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"dFz" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Court Cell"; + req_access = list("brig") + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"dFH" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"dFW" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Brig - Hallway - Entrance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/brig) +"dGa" = ( +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/grass, +/area/station/science/research) +"dGq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/stairs/left{ + dir = 1 + }, +/area/station/engineering/atmos) +"dGu" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Gateway Atrium" + }, +/obj/effect/turf_decal/delivery, +/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/command/gateway, +/turf/open/floor/iron, +/area/station/command/gateway) +"dGv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"dGC" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/trimline/brown/filled/end{ + dir = 1 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"dGD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/filled/corner, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dGQ" = ( +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"dGW" = ( +/obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/iron, +/area/station/security/brig) +"dHc" = ( +/turf/closed/wall, +/area/station/hallway/primary/port) +"dHg" = ( +/obj/machinery/computer/atmos_alert, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"dHi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/mining{ + name = "Cargo Bay" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/landmark/navigate_destination, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"dHz" = ( +/obj/effect/turf_decal/trimline/brown/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"dHG" = ( +/obj/machinery/atmospherics/components/binary/crystallizer{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dHM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"dHN" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#EFB341" + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"dHY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/medical/patient_stretcher, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/medical/abandoned) +"dIm" = ( +/obj/machinery/modular_computer/preset/id, +/obj/machinery/requests_console/directional/north{ + department = "Chief Engineer's Desk"; + name = "Chief Engineer's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"dIy" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/central) +"dIK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dIO" = ( +/turf/closed/wall, +/area/station/commons/toilet/restrooms) +"dIP" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/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/hallway/secondary/entry) +"dIS" = ( +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"dIV" = ( +/obj/machinery/door/window/right/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"dIW" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnancefreezer" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"dJk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/chem_master, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"dJo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron/white, +/area/station/science/explab) +"dJK" = ( +/turf/open/floor/iron/stairs/right{ + dir = 1 + }, +/area/station/engineering/atmos) +"dJN" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) +"dJP" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/paper/monitorkey, +/obj/item/computer_disk/engineering, +/obj/item/computer_disk/engineering, +/obj/item/computer_disk/engineering, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"dJT" = ( +/obj/item/reagent_containers/cup/rag, +/obj/structure/table/wood, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"dJX" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"dKl" = ( +/obj/structure/sign/warning/pods, +/turf/closed/wall/r_wall, +/area/station/maintenance/department/engine) +"dKm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"dKC" = ( +/turf/closed/wall, +/area/station/maintenance/aft/lesser) +"dKE" = ( +/obj/structure/closet/secure_closet/atmospherics, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dKG" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"dKK" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"dKO" = ( +/obj/structure/urinal/directional/north, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"dKY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"dLc" = ( +/obj/machinery/gravity_generator/main, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) +"dLh" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/dresser, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"dLl" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/atmos/glass{ + name = "Hypertorus Fusion Reactor" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"dLm" = ( +/obj/machinery/sparker/directional/north{ + id = "Xenobio" + }, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"dLn" = ( +/obj/structure/rack, +/obj/item/wrench/medical, +/obj/effect/turf_decal/siding/white, +/obj/item/food/popsicle/creamsicle_orange, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) +"dLq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, +/obj/effect/mapping_helpers/mail_sorting/service/theater, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"dLu" = ( +/obj/machinery/newscaster/directional/north, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"dLy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"dLC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"dLN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"dLQ" = ( +/obj/item/clothing/suit/hazardvest, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"dLT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood/large, +/area/station/service/theater) +"dLU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"dMb" = ( +/obj/structure/table, +/obj/item/analyzer, +/obj/item/healthanalyzer, +/obj/machinery/camera/directional/south{ + c_tag = "Technical Storage" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"dMk" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"dMv" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dMz" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"dMH" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) +"dMN" = ( +/obj/effect/landmark/start/paramedic, +/obj/effect/turf_decal/loading_area/white{ + color = "#52B4E9"; + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"dMO" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"dMY" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"dNw" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"dNz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"dNB" = ( +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"dNC" = ( +/obj/structure/sink/directional/south, +/obj/machinery/light/small/dim/directional/west, +/mob/living/basic/mouse/brown/tom, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"dNX" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"dOg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/office) +"dOs" = ( +/obj/structure/sign/warning/no_smoking, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/room) +"dOw" = ( +/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/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"dOx" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dOA" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"dON" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"dOO" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"dOQ" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/delivery, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/iron, +/area/station/engineering/main) +"dOY" = ( +/obj/effect/spawner/random/engineering/tank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dPh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"dPm" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 5 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +"dPy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"dPF" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/engine, +/area/station/science/cytology) +"dPJ" = ( +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dPL" = ( +/obj/structure/filingcabinet/security{ + pixel_x = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/evidence) +"dPQ" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"dPV" = ( +/obj/machinery/porta_turret/ai, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"dPY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/central) +"dQy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random/directional/east, +/obj/machinery/light/cold/directional/east, +/obj/machinery/modular_computer/preset/cargochat/service{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"dQA" = ( +/obj/machinery/computer/rdservercontrol{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/server) +"dQE" = ( +/obj/structure/table/glass, +/obj/structure/cable, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"dQG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/girder, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"dQH" = ( +/obj/machinery/telecomms/processor/preset_three, +/obj/machinery/camera/directional/north{ + c_tag = "Telecomms - Server Room - Fore-Starboard"; + network = list("ss13","tcomms") + }, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) +"dQL" = ( +/obj/machinery/light_switch/directional/west{ + pixel_x = -20 + }, +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/light/small/directional/west, +/obj/machinery/computer/security/telescreen/med_sec/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"dQO" = ( +/obj/effect/landmark/start/atmospheric_technician, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"dQP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"dQT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"dRj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"dRp" = ( +/obj/machinery/holopad, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/engineering/main) +"dRx" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"dRA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"dRE" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"dRF" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dRH" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"dRN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"dRR" = ( +/obj/structure/sign/warning/vacuum/external/directional/east, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"dRX" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"dRY" = ( +/obj/structure/chair/office, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/service/library) +"dRZ" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L4" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dSB" = ( +/obj/machinery/door/airlock/grunge{ + name = "Cell 3" + }, +/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/safe) +"dSE" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster/directional/north, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/wood, +/area/station/commons/dorms) +"dSF" = ( +/obj/structure/punching_bag, +/obj/effect/turf_decal/trimline/dark_red, +/turf/open/floor/iron/white/textured_large, +/area/station/commons/fitness) +"dSG" = ( +/obj/structure/closet/wardrobe/miner, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"dSH" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/shipping{ + pixel_x = -6; + pixel_y = 15 + }, +/obj/item/multitool{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/storage/box/lights/mixed{ + pixel_x = 8; + pixel_y = 11 + }, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 5 + }, +/obj/item/storage/box/shipping{ + pixel_x = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"dSJ" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/wood/large, +/area/station/service/theater) +"dTi" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Holodeck Door" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "holodeck" + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"dTp" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"dTq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Antechamber" + }, +/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/structure/cable/layer3, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"dTr" = ( +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"dTv" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/under/misc/assistantformal, +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"dTN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"dTQ" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"dTS" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"dTV" = ( +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/structure/table/glass, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"dTX" = ( +/obj/effect/landmark/start/chemist, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"dUd" = ( +/obj/structure/noticeboard/qm, +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/command/heads_quarters/qm) +"dUj" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"dUo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"dUB" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"dVb" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"dVc" = ( +/obj/machinery/shieldgen, +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Secure Storage" + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"dVm" = ( +/obj/effect/landmark/start/cook, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"dVp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"dVt" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + 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/medical/medbay/central) +"dVv" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"dVN" = ( +/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/medical/chemistry) +"dVT" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Pure to Fuel Pipe" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"dVX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/item/target/clown, +/obj/item/target/clown, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/closet/crate/secure{ + desc = "A secure crate containing various materials for building a customised test-site."; + name = "Test Site Materials Crate"; + req_access = list("ordnance") + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"dWd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"dWf" = ( +/obj/structure/sign/plaques/kiddie{ + pixel_y = 32 + }, +/obj/machinery/camera/directional/north{ + c_tag = "AI Upload Chamber - Fore"; + network = list("aiupload") + }, +/obj/structure/table/wood/fancy/green, +/obj/effect/spawner/random/aimodule/harmless, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai_upload) +"dWg" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/food/pie/cream, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/kitchen) +"dWA" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/chair/stool/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"dWG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"dWI" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"dWN" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"dXe" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"dXg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"dXj" = ( +/obj/structure/chair{ + pixel_y = -2 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"dXl" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "PermaLockdown"; + name = "Lockdown Shutters" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/security/prison) +"dXs" = ( +/obj/structure/secure_safe/directional/north{ + name = "armory safe A" + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"dXA" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/random/contraband/prison, +/obj/machinery/firealarm/directional/north, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"dXH" = ( +/obj/structure/chair, +/obj/effect/landmark/start/assistant, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"dXQ" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"dXR" = ( +/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/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"dXU" = ( +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"dYa" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dYb" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"dYg" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Central Primary Hallway - Starboard - Kitchen" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dYh" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/security/courtroom) +"dYi" = ( +/obj/structure/table, +/obj/item/stock_parts/micro_laser{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 2 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"dYl" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"dYG" = ( +/obj/structure/sign/poster/official/anniversary_vintage_reprint/directional/north, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"dYK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"dYT" = ( +/obj/machinery/rnd/destructive_analyzer, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/lab) +"dZb" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/folder{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "roboticsprivacy"; + name = "Robotics Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 6 + }, +/obj/machinery/door/window/left/directional/east{ + name = "Robotics Desk"; + req_access = list("robotics") + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"dZm" = ( +/turf/closed/wall, +/area/station/commons/storage/tools) +"dZy" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/bodybags, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"dZB" = ( +/obj/machinery/door/poddoor{ + id = "QMLoaddoor"; + name = "Supply Dock Loading Door" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"eaa" = ( +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"eau" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 8 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"eaA" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"eaF" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"eaN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"eaP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/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) +"eaQ" = ( +/obj/structure/cable, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"ebd" = ( +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"ebg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ebr" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=0-SecurityDesk"; + location = "16-Fore" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"ebx" = ( +/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/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"ebC" = ( +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ebG" = ( +/obj/machinery/computer/slot_machine{ + pixel_y = 2 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"ebK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"ebM" = ( +/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/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ebV" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "roboticsprivacy"; + name = "Robotics Shutters" + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"ebY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"ecm" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=1"; + location = "Disposals" + }, +/obj/structure/plasticflaps, +/obj/machinery/door/window/right/directional/south{ + name = "Delivery Door"; + req_access = list("cargo") + }, +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"ecp" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"ecq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/general, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ecz" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/port/aft) +"ecA" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"ecB" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"ecD" = ( +/obj/item/bot_assembly/floorbot{ + created_name = "FloorDiffBot"; + desc = "Why won't it work?"; + name = "FloorDiffBot" + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"ecO" = ( +/turf/open/floor/carpet, +/area/station/service/library) +"edl" = ( +/obj/docking_port/stationary/escape_pod, +/turf/open/space/basic, +/area/space) +"edq" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/commons/dorms) +"edr" = ( +/obj/item/flashlight/flare/candle{ + pixel_x = 1; + pixel_y = 10 + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"edu" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/starboard/aft) +"edC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"edH" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/computer/records/medical/laptop{ + dir = 8; + pixel_y = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"edN" = ( +/obj/effect/spawner/structure/window, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"edQ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"eeg" = ( +/turf/closed/wall/mineral/plastitanium, +/area/station/hallway/secondary/entry) +"eek" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"eem" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"eeq" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"eew" = ( +/obj/structure/rack, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, +/obj/item/clothing/suit/hooded/ablative, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"eey" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/rack, +/obj/item/storage/briefcase{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/storage/briefcase/secure{ + pixel_x = 2; + pixel_y = -2 + }, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"eeT" = ( +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"efa" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"efd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) +"eft" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/closet/secure_closet/security/sec, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"efC" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"efN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/button/door/directional/east{ + id = "atmoshfr"; + name = "Radiation Shutters Control"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/light/no_nightlight/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"efY" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/engineering, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"efZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"egb" = ( +/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/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ege" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"egg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) +"egk" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"egn" = ( +/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/yellow{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"egp" = ( +/obj/item/storage/briefcase/secure, +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/storage/briefcase/secure, +/obj/item/assembly/flash/handheld, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"egs" = ( +/obj/effect/spawner/random/maintenance/two, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"egF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"egP" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"egR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/medical/abandoned) +"egS" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ehg" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"ehn" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"ehs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/research) +"ehv" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"ehB" = ( +/obj/machinery/door/poddoor{ + id = "SecJusticeChamber"; + name = "Justice Vent" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/security/execution/education) +"ehE" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/photocopier, +/turf/open/floor/iron/white, +/area/station/medical/office) +"ehG" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/mess, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"ehH" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Chapel - Port" + }, +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"ehX" = ( +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"ehY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/tcommsat/server) +"ehZ" = ( +/obj/machinery/door/poddoor/preopen{ + id = "prison release"; + name = "Prisoner Processing Blast Door" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/button/door/directional/west{ + id = "prison release"; + name = "Labor Camp Shuttle Lockdown"; + req_access = list("brig") + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"eiO" = ( +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/sec{ + pixel_y = 7 + }, +/obj/item/storage/backpack/duffelbag/sec, +/turf/open/floor/iron/dark, +/area/station/security/office) +"eje" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"ejg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) +"ejl" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/commons/dorms) +"ejp" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"ejF" = ( +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"ejH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Space Bridge" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "xeno_blastdoor"; + name = "Biohazard Containment Door" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/research) +"ejL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/machinery/camera/directional/east{ + c_tag = "Science Server Room"; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/server) +"ejP" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ejR" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/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/prison) +"ejX" = ( +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"ekb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"ekh" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ekk" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"eks" = ( +/obj/effect/decal/cleanable/oil, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"eky" = ( +/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/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"ekB" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"ekG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/maintenance/starboard/lesser) +"ekI" = ( +/obj/structure/broken_flooring/singular/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ekP" = ( +/obj/machinery/door/window/brigdoor/security/cell/left/directional/south{ + id = "Cell 2"; + name = "Cell 2" + }, +/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/trimline/red/filled/line, +/turf/open/floor/iron, +/area/station/security/brig) +"ekQ" = ( +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/item/kirbyplants/random/dead/research_director, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"ekR" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/iron, +/area/station/commons/lounge) +"ekV" = ( +/obj/machinery/mass_driver/ordnance, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"elb" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"elc" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"eli" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/disposaloutlet{ + dir = 4; + name = "Cargo Deliveries" + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"elm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"ely" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/folder/yellow{ + pixel_x = 4 + }, +/obj/machinery/requests_console/directional/west{ + department = "Engineering"; + name = "Engineering Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"elz" = ( +/obj/structure/rack, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = 3 + }, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = -3 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"elJ" = ( +/turf/closed/wall/r_wall, +/area/station/science/server) +"elV" = ( +/obj/machinery/airalarm/directional/north, +/obj/item/clothing/under/misc/assistantformal, +/obj/effect/landmark/start/hangover, +/obj/effect/spawner/random/structure/closet_private, +/turf/open/floor/wood, +/area/station/commons/dorms) +"eme" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"emf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/central) +"emh" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"eml" = ( +/obj/machinery/light/directional/south, +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"emN" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port) +"emU" = ( +/obj/structure/cable, +/obj/machinery/netpod, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) +"emY" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/command/bridge) +"enf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/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/maintenance/starboard/greater) +"enF" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Security Post - Research Division"; + network = list("ss13","rd") + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"enG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +"enK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"enO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"enS" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/item/controller, +/obj/item/compact_remote, +/obj/item/compact_remote, +/turf/open/floor/iron/white, +/area/station/science/explab) +"eoj" = ( +/obj/machinery/meter{ + name = "Mixed Air Tank Out" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"eol" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"eoo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"eov" = ( +/obj/machinery/computer/slot_machine{ + pixel_y = 2 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"eoC" = ( +/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/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"eoD" = ( +/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/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"eoU" = ( +/obj/structure/grille, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"eoZ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"epF" = ( +/obj/machinery/chem_master/condimaster{ + desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; + name = "SapMaster XP" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/directional/north{ + c_tag = "Hydroponics - Fore" + }, +/obj/machinery/button/door/directional/north{ + id = "hydro_service"; + name = "Service Shutter Control"; + req_access = list("hydroponics") + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"epH" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"epM" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space/basic, +/area/space/nearstation) +"epO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"eqc" = ( +/obj/structure/disposalpipe/junction/yjunction, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/station/medical/medbay/central) +"eqf" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space/basic, +/area/station/solars/port/fore) +"eqn" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"eqt" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eqS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/mob/living/basic/spider/giant/sgt_araneus, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"eqU" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"erh" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"eru" = ( +/obj/structure/rack, +/obj/item/stack/cable_coil{ + pixel_x = -1; + pixel_y = -3 + }, +/obj/item/wrench, +/obj/item/flashlight/seclite, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"erx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/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) +"erF" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/virology/glass{ + name = "Virology Access" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/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/medical/general, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"erP" = ( +/obj/structure/transit_tube/curved{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"erS" = ( +/obj/structure/table/wood, +/obj/item/camera_film{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/camera_film{ + pixel_y = 9 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"esd" = ( +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/structure/table/wood, +/obj/structure/light_construct/small/directional/north, +/obj/machinery/newscaster/directional/north, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"ese" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"esk" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/storage/tcomms) +"esH" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/cigbutt{ + pixel_y = 7 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"esK" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"esR" = ( +/obj/machinery/button/flasher{ + id = "secentranceflasher"; + name = "Brig Entrance Flasher"; + pixel_x = -6; + pixel_y = -38; + req_access = list("security") + }, +/obj/machinery/button/flasher{ + id = "holdingflash"; + name = "Holding Cell Flasher"; + pixel_x = 6; + pixel_y = -38; + req_access = list("security") + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/security/brig) +"esT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/science/research) +"etn" = ( +/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/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port) +"ets" = ( +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"ett" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/acidic_buffer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/basic_buffer{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/formaldehyde{ + pixel_x = 1 + }, +/obj/structure/sign/warning/chem_diamond/directional/north, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"etv" = ( +/obj/item/kirbyplants/random, +/obj/structure/light_construct/small/directional/east, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"etA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"etK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"etV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/chem_heater/withbuffer, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"euj" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"euo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/service/cafeteria) +"eup" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"eur" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"eut" = ( +/turf/closed/wall, +/area/station/science/robotics/lab) +"euw" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/firealarm/directional/west, +/obj/machinery/camera/directional/north{ + c_tag = "Science Mechbay"; + network = list("ss13","rd") + }, +/obj/machinery/button/door/directional/north{ + id = "mechbay"; + name = "Mech Bay Shutters Control"; + req_access = list("robotics") + }, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"euQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/white, +/area/station/science/research) +"euT" = ( +/obj/structure/lattice/catwalk, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/space/basic, +/area/space/nearstation) +"euX" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/security/medical) +"evf" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"evD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"evE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"evI" = ( +/obj/machinery/computer/teleporter, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +"evY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/landmark/start/depsec/medical, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"ewc" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin{ + name = "Jim Norton's Quebecois Coffee disposal unit" + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"ewf" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"ewh" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/wrench, +/obj/machinery/light_switch/directional/south, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/server) +"ewj" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"ewk" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"ewB" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"ewC" = ( +/obj/machinery/camera{ + c_tag = "Warden's Office"; + dir = 10 + }, +/obj/structure/table, +/obj/machinery/button/door{ + desc = "Controls the shutters over the cell windows."; + id = "Secure Gate"; + name = "Cell Window Control"; + pixel_x = -6; + pixel_y = 7; + req_access = list("security"); + specialfunctions = 4 + }, +/obj/machinery/button/door{ + desc = "Controls the shutters over the brig windows."; + id = "briglockdown"; + name = "Brig Lockdown Control"; + pixel_x = 6; + pixel_y = 7; + req_access = list("security") + }, +/obj/machinery/button/door{ + desc = "Controls the blast doors in front of the prison wing."; + id = "Prison Gate"; + name = "Prison Wing Lockdown"; + pixel_y = -3; + req_access = list("brig") + }, +/obj/item/key/security, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"ewR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Tech Storage" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/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/engineering/tech_storage, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"ewT" = ( +/obj/machinery/door/airlock{ + name = "Prison Showers" + }, +/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, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) +"exC" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L3" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"exN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"exQ" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"eyd" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/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) +"eyl" = ( +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"eyD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"eyX" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) +"ezg" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"ezw" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/item/kirbyplants/random{ + pixel_x = -7 + }, +/obj/machinery/camera/directional/north, +/obj/machinery/digital_clock/directional/east, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/item/poster/traitor, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"ezT" = ( +/obj/machinery/door/airlock/research{ + name = "Research Division Access" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/research) +"eAe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"eAi" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/bar) +"eAq" = ( +/obj/structure/closet/wardrobe/white, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"eAr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/mob/living/basic/pet/dog/corgi/puppy/void{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/science/research) +"eAL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"eBn" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eBw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance{ + name = "Research Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"eBz" = ( +/obj/structure/table/wood, +/obj/machinery/status_display/ai/directional/north, +/obj/item/flashlight/lamp, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"eBO" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/item/surgery_tray/full, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/suit/apron/surgical, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"eBU" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"eCg" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"eCn" = ( +/obj/effect/landmark/blobstart, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"eCB" = ( +/obj/machinery/door/airlock/silver{ + name = "Bathroom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/captain, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/captain/private) +"eCK" = ( +/obj/machinery/computer/arcade/orion_trail{ + desc = "For gamers only. Casuals need not apply."; + icon_screen = "library"; + icon_state = "oldcomp"; + name = "Gamer Computer" + }, +/obj/structure/sign/poster/contraband/lusty_xenomorph/directional/west, +/obj/item/toy/katana{ + desc = "As seen in your favourite Japanese cartoon."; + name = "anime katana" + }, +/obj/structure/table/wood, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"eCS" = ( +/obj/machinery/door/airlock/external{ + name = "Space Shack" + }, +/turf/open/floor/plating, +/area/station/maintenance/space_hut) +"eDc" = ( +/obj/machinery/door/airlock/atmos{ + name = "Hypertorus Fusion Reactor" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"eDC" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"eDL" = ( +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = -8 + }, +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/captain/private) +"eDX" = ( +/obj/structure/sign/departments/science/directional/east, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"eEa" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/smartfridge/drying, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 9 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"eEf" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Bar - Backroom" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/bar/backroom) +"eEn" = ( +/obj/structure/closet/crate/coffin, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/service/chapel/funeral) +"eEx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"eED" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/crate, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"eEG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) +"eEH" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/command/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central) +"eEP" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"eER" = ( +/obj/structure/rack, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, +/obj/item/healthanalyzer, +/obj/structure/disposalpipe/segment, +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/north, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath/medical, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"eFC" = ( +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/locker) +"eFG" = ( +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/fire{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/south, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"eFJ" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/kirbyplants/organic/plant3, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"eFR" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"eFX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"eGd" = ( +/obj/machinery/door/window/left/directional/north{ + name = "MiniSat Walkway Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"eGm" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Aft Primary Hallway - Middle" + }, +/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/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"eGC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"eGJ" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/medical/medbay/central) +"eGV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"eHf" = ( +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"eHR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/random/directional/north, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eHS" = ( +/obj/structure/chair/stool/bar/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/commons/lounge) +"eIc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/directional/south, +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"eIy" = ( +/obj/structure/cable, +/obj/machinery/photocopier, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"eIO" = ( +/turf/closed/wall, +/area/station/maintenance/department/medical/central) +"eIV" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) +"eJd" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/prison/directional/north, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"eJh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"eJo" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/table/wood, +/obj/item/camera_film{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/camera_film{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"eJp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"eJy" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-maint-passthrough" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/science/research) +"eJM" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - CO2" + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"eJZ" = ( +/obj/effect/spawner/random/structure/chair_comfy{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eKv" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"eKw" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/modular_computer/preset/civilian{ + dir = 8 + }, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) +"eKA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/research) +"eKD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"eKG" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"eKP" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/freezerchamber) +"eLa" = ( +/obj/structure/table/wood, +/obj/item/storage/briefcase/secure{ + desc = "A large briefcase with a digital locking system, and the Nanotrasen logo emblazoned on the sides."; + name = "\improper Nanotrasen-brand secure briefcase exhibit"; + pixel_y = 2 + }, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"eLh" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"eLk" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"eLr" = ( +/obj/machinery/door/window/left/directional/south{ + name = "MiniSat Walkway Access" + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"eLv" = ( +/obj/machinery/door/firedoor, +/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/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"eLI" = ( +/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, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"eLX" = ( +/obj/structure/chair, +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"eLY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"eMa" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Command Hallway - Port" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"eMb" = ( +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = -8 + }, +/turf/closed/wall/r_wall, +/area/station/hallway/secondary/command) +"eMf" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/small/directional/south, +/obj/structure/window/spawner/directional/east, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"eMG" = ( +/obj/structure/closet/lasertag/blue, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"eMH" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"eMI" = ( +/obj/structure/disposalpipe/segment, +/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/medical/medbay/central) +"eMK" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"eMW" = ( +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/grass, +/area/station/science/research) +"eMY" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"eNb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"eNh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"eNk" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"eNl" = ( +/obj/machinery/newscaster/directional/north, +/obj/machinery/vending/wardrobe/coroner_wardrobe, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"eNR" = ( +/turf/closed/wall, +/area/station/ai_monitored/aisat/exterior) +"eNV" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"eOb" = ( +/obj/machinery/vending/wardrobe/cargo_wardrobe, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) +"eOl" = ( +/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/supply/general, +/obj/machinery/door/airlock/maintenance{ + name = "Quartermaster Maintenance" + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"eOm" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"eOo" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/button/door/directional/east{ + id = "rdgene"; + name = "Primary Genetics Shutters Control"; + pixel_y = 6; + req_access = list("science") + }, +/obj/machinery/button/door/directional/east{ + id = "rdgene2"; + name = "Secondary Genetics Shutters Control"; + pixel_y = -6; + req_access = list("science") + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"eOs" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Prison Wing" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "perma-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/brig) +"eOJ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"eOP" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Containment Pen #6"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"eOQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ + dir = 1 + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"ePg" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"ePj" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/suit_storage_unit/industrial/loader, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"ePu" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/science/robotics/mechbay) +"ePA" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/machinery/light/small/directional/south, +/obj/machinery/button/door/directional/south{ + id = "FitnessShower"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/fitness/recreation) +"ePN" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"ePT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/window/left/directional/south{ + name = "Cytology Pen"; + req_access = list("research") + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +"ePX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/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/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"eQe" = ( +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"eQg" = ( +/obj/machinery/flasher/directional/south{ + id = "AI" + }, +/obj/machinery/porta_turret/ai{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"eQr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"eQs" = ( +/obj/machinery/air_sensor/air_tank, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"eQE" = ( +/turf/closed/wall, +/area/station/service/bar/backroom) +"eQJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/meter, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"eQL" = ( +/obj/machinery/camera/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"eQO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"eQT" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"eQY" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eRb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"eRc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"eRd" = ( +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/delivery_chute{ + dir = 4; + name = "Crate Returns" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"eRn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"eRR" = ( +/obj/structure/table, +/obj/item/screwdriver{ + pixel_y = 16 + }, +/obj/item/wirecutters, +/obj/item/multitool, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"eRX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/office) +"eSa" = ( +/obj/item/wrench, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eSb" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"eSl" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"eSr" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"eSy" = ( +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"eSC" = ( +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/item/clothing/glasses/regular/hipster{ + name = "Hipster Glasses" + }, +/turf/open/floor/wood/large, +/area/station/service/theater) +"eSR" = ( +/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/medical/virology) +"eTn" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"eTt" = ( +/obj/structure/cable, +/obj/structure/table/wood/fancy/black, +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_x = 3; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/bottle/champagne{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/cigarette/cigar{ + pixel_x = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/north{ + pixel_x = -5 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"eTI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"eTU" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"eUe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"eUu" = ( +/obj/structure/transit_tube/crossing/horizontal, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) +"eUA" = ( +/obj/structure/table/glass, +/obj/machinery/light/small/directional/north, +/obj/item/folder/white{ + pixel_y = 4 + }, +/obj/item/pen/red, +/obj/machinery/camera/directional/north{ + c_tag = "Virology Isolation A"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"eUN" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/treatment_center) +"eUW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/central) +"eVa" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/south{ + name = "Reception Window" + }, +/obj/item/paper, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/item/storage/fancy/donut_box, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "briglockdown"; + name = "Warden Desk Shutters" + }, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Brig Control Desk"; + req_access = list("armory") + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) +"eVi" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"eVm" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"eVy" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/cake_ingredients, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"eVz" = ( +/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/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"eVX" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"eWn" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eWo" = ( +/obj/machinery/door/poddoor/shutters{ + id = "teleshutter"; + name = "Teleporter Access Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/button/door/directional/east{ + id = "teleshutter"; + name = "Teleporter Shutter Control"; + pixel_y = 5; + req_access = list("teleporter") + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"eWp" = ( +/obj/machinery/suit_storage_unit/cmo, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/vending/wallmed/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"eWq" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"eWu" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to External Air Ports" + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"eWy" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"eWA" = ( +/obj/structure/toilet/greyscale{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) +"eWB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"eWO" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/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) +"eWW" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eXj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) +"eXx" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"eXy" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/obj/effect/spawner/random/trash/garbage{ + spawn_loot_count = 3; + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"eXA" = ( +/obj/structure/bookcase/random/adult, +/turf/open/floor/wood, +/area/station/service/library) +"eXT" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Chapel Office Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"eYe" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"eYj" = ( +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"eYu" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution/red, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"eYw" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to Distro" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"eYz" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"eYE" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/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/medical/virology) +"eYT" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/cable, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"eZe" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/wood, +/area/station/commons/lounge) +"eZf" = ( +/obj/machinery/libraryscanner, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"eZo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"eZz" = ( +/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/research{ + name = "Genetics Lab" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/white, +/area/station/science/genetics) +"eZI" = ( +/obj/structure/table, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 7 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/range) +"eZN" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"eZR" = ( +/obj/structure/displaycase/labcage, +/turf/open/floor/engine, +/area/station/command/heads_quarters/rd) +"fad" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"fag" = ( +/obj/item/food/cracker, +/obj/item/food/cracker{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/trash/boritos{ + desc = "Why does it look like boritos? Nobody would feed unhealthy snacks to pets, right?"; + name = "cracker bag"; + pixel_x = -14 + }, +/turf/open/floor/grass, +/area/station/science/research) +"fak" = ( +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/lobby) +"faD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/science/xenobiology) +"faL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/medical/patient_stretcher, +/obj/item/food/pizzaslice/moldy/bacteria, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"faW" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/table, +/obj/structure/cable, +/obj/item/poster/random_official, +/obj/item/poster/random_official{ + pixel_y = 10 + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"fbf" = ( +/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/engineering/main) +"fbg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/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/freezer, +/area/station/commons/toilet/restrooms) +"fbl" = ( +/mob/living/basic/pet/penguin/baby/permanent{ + dir = 8 + }, +/turf/open/floor/grass, +/area/station/science/research) +"fbs" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"fbE" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/structure/table{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/modular_computer/laptop/preset/civilian, +/turf/open/floor/wood, +/area/station/service/cafeteria) +"fbI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"fbP" = ( +/obj/structure/cable, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"fbX" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"fck" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"fcq" = ( +/turf/closed/wall, +/area/station/maintenance/port/greater) +"fcA" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/structure/sign/warning/secure_area/directional/west{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fcJ" = ( +/obj/structure/lattice, +/obj/item/shard, +/turf/open/space/basic, +/area/space/nearstation) +"fcM" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"fdl" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"fdH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"fdQ" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/disablers, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/requests_console/directional/west{ + department = "Security"; + name = "Security Requests Console" + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"fdX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"fdZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"fea" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/landmark/start/depsec/supply, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"fec" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"fee" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"fev" = ( +/obj/effect/turf_decal/bot_red, +/obj/machinery/recharge_station, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"feF" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos) +"feY" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"ffd" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"fff" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"ffj" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"ffH" = ( +/turf/closed/wall, +/area/station/hallway/primary/fore) +"ffL" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/effect/turf_decal/trimline/brown/warning, +/obj/item/reagent_containers/cup/rag, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/aquarium_kit, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"ffP" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating/foam{ + initial_gas_mix = "TEMP=2.7" + }, +/area/space/nearstation) +"ffU" = ( +/obj/effect/turf_decal/siding/purple, +/obj/machinery/camera/directional/south{ + c_tag = "Science Ordnance Mix Lab"; + network = list("ss13","rd") + }, +/obj/machinery/computer/atmos_control/ordnancemix{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"fgl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"fgn" = ( +/mob/living/simple_animal/hostile/retaliate/goose/vomit, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"fgu" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"fgA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"fgH" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"fgJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/central) +"fgN" = ( +/obj/structure/chair/stool/directional/east, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"fgS" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/machinery/flasher/directional/east{ + id = "hopflash"; + pixel_y = -26 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"fgY" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/security/general, +/turf/open/floor/iron, +/area/station/security/office) +"fhe" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"fhi" = ( +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"fhl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fhn" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/gibs/down, +/mob/living/simple_animal/bot/mulebot{ + name = "Leaping Rabbit" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fhp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fhv" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/item/extinguisher, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fhA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"fhB" = ( +/obj/machinery/holopad, +/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/cargo/lobby) +"fhD" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"fhG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fhI" = ( +/obj/structure/light_construct/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fhP" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Prison Common Room"; + network = list("ss13","prison") + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) +"fhQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"fhU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/security/telescreen/ordnance/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"fia" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Access" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/poddoor/preopen{ + id = "transitlockdown" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"fii" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/office) +"fip" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"fix" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"fiA" = ( +/turf/open/floor/iron, +/area/station/security/prison/garden) +"fiE" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Port Mix to North Ports" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fiH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/central) +"fiK" = ( +/obj/structure/table/glass, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"fiS" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"fiX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fjb" = ( +/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/white, +/area/station/science/research) +"fjd" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"fje" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"fjn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port) +"fjq" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/aft) +"fjv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/light/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fjw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/poster/official/random/directional/west, +/obj/machinery/conveyor{ + dir = 1; + id = "packageExternal" + }, +/obj/machinery/door/window/left/directional/north{ + req_access = list("shipping") + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"fjD" = ( +/turf/closed/wall, +/area/station/commons/toilet/auxiliary) +"fkb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) +"fkd" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/effect/spawner/random/bureaucracy/pen, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"fke" = ( +/obj/effect/turf_decal/trimline/purple/line, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"fkk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/trimline/purple, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"fkl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"fkr" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fky" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"fkD" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"fkP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"fkT" = ( +/obj/effect/landmark/start/chaplain, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"fkW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"flb" = ( +/obj/structure/railing, +/turf/open/space/basic, +/area/space/nearstation) +"flk" = ( +/obj/machinery/door/airlock/grunge{ + name = "Cell 2" + }, +/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/safe) +"flm" = ( +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fln" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Fore" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"flu" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"flx" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/library) +"flB" = ( +/obj/machinery/computer/holodeck{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"flE" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"flG" = ( +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/east, +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"flN" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/plating, +/area/station/maintenance/port) +"flQ" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/service/library) +"flS" = ( +/obj/item/storage/toolbox/emergency, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"flX" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/tile/neutral/half, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 1 + }, +/obj/effect/turf_decal/bot_white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 4 + }, +/area/station/medical/morgue) +"fma" = ( +/turf/closed/wall/r_wall, +/area/station/science/robotics/lab) +"fmn" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"fmo" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"fms" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fmw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"fmx" = ( +/obj/structure/noticeboard/directional/north{ + desc = "A memorial wall for pinning mementos upon."; + name = "memorial board" + }, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/service/chapel/funeral) +"fmG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance{ + name = "Mining Dock Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fmJ" = ( +/obj/structure/rack, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tcomms) +"fmM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 10 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"fmS" = ( +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = -8 + }, +/turf/closed/wall, +/area/station/medical/medbay/lobby) +"fmX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fnc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"fnf" = ( +/obj/machinery/telecomms/message_server/preset, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"fnh" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"fnE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/command/teleporter) +"fnJ" = ( +/obj/effect/spawner/random/structure/closet_empty/crate, +/obj/item/clothing/gloves/color/fyellow, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fnN" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/security/holding_cell) +"fnO" = ( +/obj/structure/rack, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"fnT" = ( +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/obj/item/storage/box{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/box, +/obj/machinery/requests_console/directional/west{ + department = "Atmospherics"; + name = "Atmospherics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"fod" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/central) +"foB" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/light_switch/directional/west, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"foP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/storage) +"fpd" = ( +/obj/machinery/door/window/right/directional/west{ + name = "MiniSat Airlock Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"fpg" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/status_display/evac/directional/west, +/obj/item/surgery_tray/full, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"fpj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) +"fpn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fpy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, +/area/station/service/library) +"fpA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"fpD" = ( +/obj/machinery/vatgrower, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +"fpE" = ( +/obj/structure/rack, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"fpV" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"fqe" = ( +/obj/machinery/door/poddoor/shutters{ + name = "Warehouse Shutters"; + id = "warehouse" + }, +/turf/open/floor/catwalk_floor, +/area/station/cargo/warehouse) +"fqB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/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/dark, +/area/station/commons/fitness/recreation) +"fqD" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/wood, +/area/station/commons/lounge) +"fqR" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"fqV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"frm" = ( +/obj/structure/bodycontainer/crematorium{ + dir = 1; + id = "crematoriumChapel" + }, +/obj/effect/turf_decal/trimline/dark_red/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/service/chapel/office) +"frs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"fru" = ( +/turf/closed/wall, +/area/station/cargo/drone_bay) +"frw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/rack, +/obj/item/tank/internals/anesthetic, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/medical/abandoned) +"frE" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"frZ" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "External Gas to Loop" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"fsb" = ( +/obj/item/kirbyplants/organic/plant18, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"fsh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"fsm" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"fsN" = ( +/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, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"fsQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ftb" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space, +/area/space/nearstation) +"ftd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ftj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"ftK" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance/four, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ftM" = ( +/obj/structure/sign/warning/pods, +/turf/closed/wall, +/area/station/commons/locker) +"ftQ" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) +"fuc" = ( +/obj/structure/frame/machine{ + anchored = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/circuit/green/off, +/area/station/science/research) +"fur" = ( +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"fuu" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmospherics_engine) +"fuA" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"fvE" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/central) +"fvK" = ( +/obj/structure/table, +/obj/item/transfer_valve{ + pixel_x = 5 + }, +/obj/item/transfer_valve, +/obj/item/transfer_valve{ + pixel_x = -5 + }, +/obj/item/transfer_valve{ + pixel_x = 5 + }, +/obj/item/transfer_valve, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"fwb" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +"fwd" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"fwz" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"fwD" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/chaplain, +/obj/item/radio/intercom/chapel/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"fwG" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fwP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fxa" = ( +/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/engineering/break_room) +"fxj" = ( +/obj/machinery/door/airlock/security{ + name = "Court Cell" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) +"fxr" = ( +/obj/structure/lattice/catwalk, +/obj/item/instrument/musicalmoth{ + name = "Syl Labee" + }, +/obj/structure/marker_beacon/olive, +/turf/open/space/basic, +/area/space/nearstation) +"fxI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"fxQ" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"fxT" = ( +/obj/machinery/door/airlock/wood{ + doorClose = 'sound/effects/doorcreaky.ogg'; + doorOpen = 'sound/effects/doorcreaky.ogg'; + name = "The Gobetting Barmaid" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fxW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"fym" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fyz" = ( +/obj/structure/plasticflaps, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"fyJ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"fyK" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"fyY" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "N2 to Airmix" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"fzd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"fzi" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"fzl" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/station/solars/port/fore) +"fzr" = ( +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/west, +/obj/structure/water_source/puddle, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"fzE" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fzM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fAe" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Engineering Security Post" + }, +/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, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"fAt" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"fAA" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/machinery/airalarm/directional/east, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"fAE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"fAI" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"fAL" = ( +/turf/closed/wall, +/area/station/security/detectives_office) +"fBc" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/yellow/warning, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fBo" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Magboot Storage"; + pixel_x = -1; + req_access = list("eva") + }, +/obj/structure/rack, +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"fBz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fBJ" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"fBY" = ( +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) +"fCn" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Firing Range" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/range) +"fCt" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fDc" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fDk" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fDC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/commons/dorms) +"fDL" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/computer/apc_control, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"fEg" = ( +/obj/machinery/door/airlock{ + name = "Service Hall" + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"fEn" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"fEC" = ( +/obj/structure/table/wood, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/radio/intercom/directional/north, +/obj/item/reagent_containers/cup/glass/mug{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"fEK" = ( +/turf/closed/wall, +/area/station/medical/medbay/central) +"fEL" = ( +/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) +"fEO" = ( +/obj/structure/cable, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) +"fEW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"fEX" = ( +/obj/structure/cable, +/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/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"fFa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fFi" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/dark, +/area/station/medical/office) +"fFo" = ( +/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/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"fFq" = ( +/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/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"fFu" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port) +"fFA" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fFC" = ( +/obj/structure/table, +/obj/item/storage/bag/construction, +/obj/item/storage/bag/construction, +/obj/item/storage/bag/construction, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/structure/sign/poster/official/build/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"fGp" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fGs" = ( +/obj/machinery/pdapainter{ + pixel_y = 2 + }, +/obj/machinery/requests_console/directional/north{ + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"fGv" = ( +/obj/structure/cable, +/obj/effect/landmark/start/scientist, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/lab) +"fGy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"fGC" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Detective Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"fGH" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"fGM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"fGN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"fGP" = ( +/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/white, +/area/station/security/prison/mess) +"fGR" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - N2" + }, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"fGS" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + location = "Engineering" + }, +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) +"fGW" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"fHd" = ( +/obj/machinery/power/shieldwallgen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +"fHy" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"fHC" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"fHD" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/dna_infuser, +/obj/item/infuser_book, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"fHU" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"fHV" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/effect/spawner/random/bureaucracy/folder{ + spawn_random_offset = 1 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"fIo" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"fIE" = ( +/obj/machinery/telecomms/server/presets/supply, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"fIR" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/space/basic, +/area/space/nearstation) +"fIS" = ( +/obj/machinery/airalarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fIZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"fJc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"fJp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"fJt" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"fJy" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/engine) +"fJC" = ( +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"fJP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"fJW" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"fKf" = ( +/obj/machinery/telecomms/bus/preset_three, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) +"fKg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"fKv" = ( +/obj/machinery/light_switch/directional/south, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"fKG" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/engine/cult, +/area/station/service/library) +"fKL" = ( +/obj/machinery/door/airlock/security{ + name = "Customs Desk" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"fKP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"fKZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/depsec/engineering, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"fLd" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"fLe" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fLp" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"fLq" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Inner Pipe Access"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"fLr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Science Lobby"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/destructive_scanner, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"fLz" = ( +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"fLI" = ( +/obj/structure/chair{ + name = "Bailiff" + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"fLJ" = ( +/obj/structure/cable, +/obj/machinery/power/tracker, +/turf/open/floor/plating/airless, +/area/station/solars/starboard/fore) +"fMf" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"fMm" = ( +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"fMn" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"fMp" = ( +/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/hallway/primary/central) +"fMy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"fMN" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"fMT" = ( +/obj/structure/table, +/obj/item/radio/intercom/directional/south, +/obj/machinery/computer/monitor{ + dir = 1 + }, +/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/ai_monitored/command/storage/satellite) +"fNa" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"fNh" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Prison Gate"; + name = "Security Blast Door" + }, +/obj/effect/turf_decal/delivery, +/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) +"fNz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/structure/sign/poster/contraband/random/directional/south, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"fNI" = ( +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"fNR" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"fNS" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"fOf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/range) +"fOu" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"fOw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/range) +"fOB" = ( +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Brig Maintenance" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fOS" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/item/food/grown/banana, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/grass, +/area/station/medical/virology) +"fPh" = ( +/obj/machinery/gateway/centerstation, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"fPw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"fPD" = ( +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"fQj" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 24; + name = "SS13: Auxiliary Dock, Station-Port"; + shuttle_id = "whiteship_home"; + width = 35 + }, +/turf/open/space/basic, +/area/space) +"fQo" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"fQr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"fQD" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"fQW" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"fQZ" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"fRe" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"fRg" = ( +/obj/item/food/snowcones/clown, +/turf/open/floor/fake_snow, +/area/station/maintenance/port/aft) +"fRl" = ( +/obj/structure/table, +/obj/item/storage/crayons, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/commons/dorms) +"fRr" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"fRu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"fRG" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) +"fRS" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"fRU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fRW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"fSd" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/lounge) +"fSz" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"fSY" = ( +/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) +"fTn" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"fTE" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"fTL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"fTT" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"fUg" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Storage" + }, +/obj/machinery/suit_storage_unit/engine, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"fUj" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"fUr" = ( +/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/plating, +/area/station/maintenance/port/fore) +"fUx" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/machinery/smartfridge/organ, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"fVa" = ( +/obj/structure/cable, +/obj/machinery/light_switch/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"fVc" = ( +/obj/effect/spawner/random/structure/crate, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"fVt" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"fVA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"fVC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"fVF" = ( +/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, +/area/station/hallway/primary/starboard) +"fVJ" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fVU" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"fVY" = ( +/obj/structure/closet/secure_closet/chemical, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"fWc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"fWl" = ( +/obj/machinery/restaurant_portal/restaurant, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) +"fWm" = ( +/obj/item/toy/plush/beeplushie{ + desc = "Maybe hugging this will make you feel better about yourself."; + name = "Therabee" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"fWn" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/closet/crate, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"fWw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"fWA" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/greater) +"fWK" = ( +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/north{ + name = "MuleBot Access"; + req_access = list("shipping") + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + location = "Research" + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/lesser) +"fWW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"fXb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"fXd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/science/robotics, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"fXi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to Gas" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"fXj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"fXK" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison) +"fXZ" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/oil/streak, +/obj/effect/turf_decal/trimline/brown/filled/arrow_cw, +/turf/open/floor/iron, +/area/station/cargo/storage) +"fYb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/security/office) +"fYc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Medical Freezer Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"fYg" = ( +/obj/machinery/computer/mechpad{ + dir = 8 + }, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) +"fYm" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/fax{ + fax_name = "Security Office"; + name = "Security Office Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/security/office) +"fYq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"fYx" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"fYC" = ( +/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/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"fYJ" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"fYX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"fZa" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/service/library) +"fZw" = ( +/obj/structure/table, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -10; + pixel_y = -1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"fZL" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Gravity Generator Room" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/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/engineering/construction, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"fZV" = ( +/obj/structure/chair/stool/bar/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/lounge) +"gae" = ( +/obj/effect/spawner/xmastree, +/turf/open/floor/wood, +/area/station/commons/lounge) +"gag" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Library Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port) +"gal" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"gaG" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gaN" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gaU" = ( +/obj/machinery/button/door/directional/west{ + id = "hop"; + name = "Privacy Shutters Control"; + req_access = list("hop") + }, +/obj/effect/mapping_helpers/ianbirthday, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"gaV" = ( +/obj/structure/sign/directions/evac, +/obj/structure/sign/directions/medical{ + pixel_y = 8 + }, +/obj/structure/sign/directions/science{ + pixel_y = -8 + }, +/turf/closed/wall, +/area/station/security/courtroom) +"gbf" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"gbn" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/south{ + pixel_x = 6 + }, +/obj/machinery/button/door/directional/south{ + id = "cmoprivacy"; + name = "CMO Privacy Shutters"; + pixel_x = -8; + req_access = list("cmo") + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/west, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"gbG" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/item/storage/box/lights/mixed, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gbJ" = ( +/obj/structure/broken_flooring/singular/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gbS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) +"gbY" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-maint-passthrough" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/science/research) +"gcA" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=5-Customs"; + location = "4-Customs" + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"gcL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + name = "Security Mech Garage Door Controls"; + id = "secmechbay"; + req_access = list("security") + }, +/turf/open/floor/iron, +/area/station/security/office) +"gcU" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/obj/machinery/door/airlock/research{ + name = "Robotics Lab" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"gcV" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/grass, +/area/station/science/research) +"gda" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/space/basic, +/area/space/nearstation) +"gdb" = ( +/turf/closed/wall/r_wall, +/area/station/security/range) +"gdp" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_half, +/area/station/medical/cryo) +"gdF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"gdL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/storage/box/masks, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"gdZ" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/white, +/area/station/security/prison/visit) +"gem" = ( +/obj/structure/table, +/obj/item/storage/briefcase/secure{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/iron/dark, +/area/station/security/office) +"gev" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"gey" = ( +/obj/machinery/door/window/left/directional/south{ + name = "MiniSat Walkway Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"geD" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"geE" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/grass, +/area/station/medical/virology) +"geR" = ( +/obj/structure/table, +/obj/item/papercutter{ + pixel_x = 9; + pixel_y = 4 + }, +/obj/item/stamp/denied{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/stamp/granted{ + pixel_x = -7 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"geV" = ( +/obj/structure/sink/directional/east, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"gfa" = ( +/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/plating, +/area/station/maintenance/port/fore) +"gfe" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/table, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"gfk" = ( +/obj/structure/table/wood, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +"gfD" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"gfU" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/aisat/exterior) +"gfZ" = ( +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"ggj" = ( +/turf/closed/wall, +/area/station/security/evidence) +"ggq" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ggH" = ( +/obj/effect/spawner/random/structure/chair_maintenance, +/turf/open/floor/iron/checker, +/area/station/maintenance/aft/lesser) +"ggM" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"ggO" = ( +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"ggU" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ggZ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"ghc" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/office) +"ghk" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/lobby) +"ghl" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Starboard Primary Hallway" + }, +/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/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ghK" = ( +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +"ghL" = ( +/turf/closed/wall/r_wall, +/area/space/nearstation) +"gil" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/obj/machinery/airlock_sensor/incinerator_ordmix{ + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"giA" = ( +/turf/closed/wall/r_wall, +/area/station/tcommsat/computer) +"giH" = ( +/obj/machinery/vending/engivend, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/main) +"giT" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/port) +"gja" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/secure_closet/personal, +/obj/effect/spawner/random/bureaucracy/briefcase, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"gjk" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gjr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/lounge) +"gjv" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Maximum Security Test Chamber"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"gjF" = ( +/obj/machinery/vending/wardrobe/jani_wardrobe, +/turf/open/floor/iron, +/area/station/service/janitor) +"gjZ" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison/visit) +"gkc" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/doppler_array, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"gkn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"gkx" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"gkC" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Doors"; + pixel_y = 4; + req_access = list("xenobiology") + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"gkD" = ( +/obj/machinery/recharger{ + pixel_y = 3 + }, +/obj/item/restraints/handcuffs{ + pixel_y = 3 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"gkM" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"gkU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gle" = ( +/obj/structure/table/glass, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"gll" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/port/aft) +"glv" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"glz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"glP" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/theater) +"gma" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"gmi" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"gmk" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"gms" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/medical/abandoned) +"gmt" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"gmH" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/command/bridge) +"gmI" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gmN" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"gmS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gmT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"gmX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/chapel) +"gnc" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"gnh" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space, +/area/space/nearstation) +"gnk" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gnm" = ( +/obj/effect/landmark/start/warden, +/obj/structure/chair/office, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_red/filled/line, +/turf/open/floor/iron, +/area/station/security/warden) +"gnt" = ( +/obj/structure/cable, +/obj/effect/spawner/random/decoration/showcase, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"gnA" = ( +/obj/structure/lattice/catwalk, +/obj/structure/easel, +/obj/item/canvas/twentythree_twentythree, +/turf/open/space/basic, +/area/space/nearstation) +"gnB" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"gnL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"gnS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gog" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"gon" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"goW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"goX" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"goZ" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"gpc" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=1-BrigCells"; + location = "0-SecurityDesk" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gpf" = ( +/obj/structure/chair/wood/wings, +/turf/open/floor/carpet, +/area/station/service/theater) +"gpk" = ( +/obj/structure/table, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/crowbar, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/plant_analyzer, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"gpv" = ( +/obj/structure/cable, +/obj/machinery/door/airlock{ + name = "Custodial Closet" + }, +/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/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/landmark/navigate_destination/janitor, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"gpB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/science/lab) +"gpF" = ( +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 8 + }, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/commons/fitness) +"gpQ" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/engineering/atmos) +"gpS" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Captain's Office" + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"gqa" = ( +/obj/structure/frame/machine{ + anchored = 1 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/circuit/green/off, +/area/station/science/research) +"gqj" = ( +/obj/structure/sink/directional/west, +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gqm" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rdgene"; + name = "Genetics Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"gqA" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/button/door/directional/south{ + id = "evashutter"; + name = "E.V.A. Storage Shutter Control"; + req_access = list("command") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"gqI" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/virology) +"gqP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port) +"gqV" = ( +/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/medical/virology) +"gqX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"grb" = ( +/obj/item/tank/internals/oxygen/red{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/tank/internals/oxygen/red{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/tank/internals/anesthetic{ + pixel_x = 2 + }, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/structure/closet/crate/preopen, +/obj/item/wrench, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"grl" = ( +/obj/item/tank/internals/oxygen, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/central) +"grm" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) +"grw" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"grZ" = ( +/obj/structure/chair, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals - Fore Arm - Far" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"gsn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gso" = ( +/obj/effect/landmark/start/roboticist, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"gsr" = ( +/obj/effect/decal/cleanable/dirt, +/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/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"gsO" = ( +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/station/service/library) +"gsP" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Kitchen - Cold Room" + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"gsW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay Clinic" + }, +/obj/effect/landmark/navigate_destination, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"gtb" = ( +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"gtk" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/white, +/area/station/security/prison) +"gto" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"gtR" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"gtU" = ( +/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/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gtV" = ( +/obj/machinery/computer/mecha{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"gub" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"guo" = ( +/obj/machinery/door/poddoor/incinerator_atmos_main, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"guC" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/sink/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"guD" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"guG" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"guI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -6; + pixel_y = 27 + }, +/turf/open/floor/iron, +/area/station/service/janitor) +"guO" = ( +/obj/structure/table/wood, +/obj/machinery/light_switch/directional/west, +/obj/item/storage/briefcase/secure{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/storage/lockbox/medal, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"guR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"guS" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"guU" = ( +/obj/machinery/button/flasher{ + id = "visitorflash"; + pixel_x = -6; + pixel_y = 24 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/button/door/directional/north{ + id = "visitation"; + name = "Visitation Shutters"; + pixel_x = 6; + req_access = list("brig") + }, +/turf/open/floor/iron, +/area/station/security/brig) +"guV" = ( +/obj/effect/landmark/start/atmospheric_technician, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"guX" = ( +/turf/closed/wall, +/area/station/commons/storage/primary) +"gva" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"gvg" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "abandoned_kitchen" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gvl" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/structure/bed/dogbed/ian, +/mob/living/basic/pet/dog/corgi/ian, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"gvm" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/commons/lounge) +"gvA" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"gvC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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) +"gvG" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gvH" = ( +/obj/structure/lattice/catwalk, +/obj/item/barcodescanner, +/turf/open/space/basic, +/area/space/nearstation) +"gvI" = ( +/obj/structure/sign/warning/vacuum/directional/south, +/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/aft/lesser) +"gvJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/locker) +"gvS" = ( +/obj/machinery/bci_implanter, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/explab) +"gwc" = ( +/obj/structure/chair/stool/bar/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/lounge) +"gwd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"gwf" = ( +/turf/open/floor/glass/reinforced, +/area/station/science/research) +"gwK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/engineering/tank, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gwS" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"gwZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"gxb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gxu" = ( +/obj/machinery/button/door/directional/south{ + id = "warehouse"; + name = "Warehouse Shutters Control" + }, +/obj/effect/turf_decal/trimline/red/filled/warning/corner{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay - Aft"; + pixel_x = 14 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"gxx" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/checker, +/area/station/engineering/atmos/storage/gas) +"gxM" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/table, +/obj/item/stack/package_wrap{ + pixel_x = 2; + pixel_y = -3 + }, +/obj/item/stack/package_wrap{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/item/stack/package_wrap{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/dest_tagger{ + pixel_x = -9; + pixel_y = 12 + }, +/obj/item/hand_labeler_refill{ + pixel_x = -11; + pixel_y = -3 + }, +/obj/item/stack/wrapping_paper, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"gya" = ( +/obj/structure/table, +/obj/item/storage/box/hug{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/razor{ + pixel_x = -8; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"gyg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"gyG" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/security/glass{ + name = "Gear Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"gyH" = ( +/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/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen #8"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"gyJ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - Crystallizer" + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light/no_nightlight/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gyK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"gyO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/theater) +"gyQ" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance) +"gzi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"gzm" = ( +/obj/machinery/door/morgue{ + name = "Confession Booth (Chaplain)"; + req_access = list("chapel_office") + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"gzs" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gzO" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"gzW" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/effect/landmark/start/depsec/medical, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"gAd" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"gAe" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"gAf" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gAk" = ( +/obj/machinery/recharger{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/structure/secure_safe/directional/east, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -12; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"gAt" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"gAu" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space, +/area/space/nearstation) +"gAw" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"gAx" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"gAB" = ( +/obj/structure/table/glass, +/obj/item/hand_labeler, +/obj/item/radio/headset/headset_med, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gAH" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"gAT" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"gAU" = ( +/obj/structure/table, +/obj/item/aicard, +/obj/item/ai_module/reset, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"gBe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"gBx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"gBD" = ( +/turf/closed/wall/r_wall, +/area/station/command/teleporter) +"gBY" = ( +/obj/structure/closet/emcloset, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/commons/fitness/recreation) +"gCy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"gCA" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"gCD" = ( +/obj/machinery/computer/warrant{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gCE" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Prison Hallway Port"; + network = list("ss13","prison") + }, +/obj/machinery/light/directional/south, +/obj/item/storage/box/prisoner{ + pixel_y = 8 + }, +/obj/item/storage/box/prisoner, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"gCT" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gCW" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"gDh" = ( +/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/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"gDq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/effect/spawner/random/structure/closet_empty/crate, +/obj/item/circuitboard/machine/thermomachine, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"gDv" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gDT" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"gDZ" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"gEe" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/green{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"gEg" = ( +/turf/closed/wall, +/area/station/security/execution/education) +"gEk" = ( +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"gEl" = ( +/obj/structure/bed, +/obj/item/bedsheet/red, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) +"gEv" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, +/obj/structure/cable/multilayer/connected, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"gEx" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"gEF" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/color/fyellow, +/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/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gEN" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"gES" = ( +/obj/machinery/computer/shuttle/labor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"gEX" = ( +/obj/structure/sign/plaques/kiddie/badger{ + pixel_y = 32 + }, +/obj/item/food/grown/poppy{ + pixel_y = 2 + }, +/obj/item/food/grown/poppy{ + pixel_y = 2 + }, +/obj/item/food/grown/poppy{ + pixel_y = 2 + }, +/obj/item/food/grown/poppy{ + pixel_y = 2 + }, +/obj/item/food/grown/poppy{ + pixel_y = 2 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/service/chapel/funeral) +"gFd" = ( +/obj/machinery/power/terminal, +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/east, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"gFi" = ( +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gFy" = ( +/obj/machinery/rnd/production/protolathe/department/science, +/turf/open/floor/iron/dark, +/area/station/science/lab) +"gFL" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"gFO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/wood, +/area/station/service/theater) +"gFQ" = ( +/turf/closed/wall/r_wall, +/area/station/science/research) +"gFR" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron, +/area/station/security/brig) +"gGa" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L5" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gGf" = ( +/obj/structure/sign/poster/official/random/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"gGh" = ( +/obj/structure/closet/crate/coffin, +/turf/open/floor/plating, +/area/station/service/chapel/funeral) +"gGo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gGy" = ( +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"gGK" = ( +/obj/machinery/computer/operating, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Primary Surgery"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"gHo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/holding_cell) +"gHw" = ( +/obj/machinery/atmospherics/components/tank, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"gHA" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/shotgun, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"gHE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gHI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"gHY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"gIc" = ( +/obj/structure/chair{ + name = "Judge" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"gIe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) +"gIi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/science/lab) +"gIm" = ( +/obj/structure/table, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"gIB" = ( +/obj/structure/light_construct/directional/north, +/obj/effect/decal/cleanable/greenglow, +/obj/structure/showcase/machinery/cloning_pod{ + desc = "An old prototype cloning pod, permanently decommissioned following the incident."; + name = "decommissioned cloner" + }, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"gIC" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gIK" = ( +/obj/structure/closet/bombcloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"gIM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/service/hydroponics, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"gIO" = ( +/obj/machinery/computer/communications, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"gIS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"gJi" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "PermaLockdown"; + name = "Lockdown Shutters" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/door/airlock/security/glass{ + id_tag = "permaouter"; + name = "Permabrig Transfer" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/station/security/prison) +"gJl" = ( +/obj/effect/turf_decal/siding/purple, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"gJm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"gJu" = ( +/obj/structure/rack, +/obj/item/stack/rods{ + amount = 23 + }, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gJD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/noticeboard/directional/north, +/obj/item/paper/guides/jobs/medical/morgue{ + pixel_y = 31 + }, +/obj/structure/bed/medical/emergency, +/obj/machinery/iv_drip, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"gJM" = ( +/obj/structure/cable, +/obj/machinery/power/smes, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"gJV" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gKc" = ( +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"gKe" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance" + }, +/obj/structure/disposalpipe/segment, +/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/fore) +"gKw" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gKD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Lab - Central East"; + network = list("ss13","rd","xeno") + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"gKH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/office) +"gKK" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"gKO" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"gKS" = ( +/obj/machinery/gibber, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"gLb" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/security/prison) +"gLe" = ( +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"gLi" = ( +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"gLm" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/spawner/random/engineering/tank, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"gLo" = ( +/obj/machinery/power/terminal, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"gLr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"gLI" = ( +/obj/machinery/door/poddoor/massdriver_ordnance, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"gLJ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/vending/medical, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"gLK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"gLU" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding{ + dir = 9 + }, +/obj/item/stock_parts/matter_bin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/flatpack{ + board = /obj/item/circuitboard/machine/flatpacker + }, +/obj/item/multitool, +/turf/open/floor/iron, +/area/station/science/lab) +"gLY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/emergency_bed, +/obj/item/emergency_bed, +/obj/item/toy/figure/md, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"gMt" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gMy" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"gMB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"gMG" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Power Monitoring" + }, +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"gMQ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-maint-passthrough" + }, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/research) +"gMZ" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/fore) +"gNh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"gNl" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"gNy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-right" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"gNC" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/engine, +/area/station/science/explab) +"gNP" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "MiniSat Exterior - Fore Starboard"; + network = list("minisat") + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"gNT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"gNW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"gOa" = ( +/obj/structure/table, +/obj/item/book/manual/hydroponics_pod_people, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"gOp" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gOr" = ( +/obj/machinery/airalarm/directional/north, +/obj/item/kirbyplants/organic/applebush, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gOv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"gOy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"gOB" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"gOS" = ( +/obj/structure/cable, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/beaker, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/dropper, +/obj/machinery/camera/directional/north{ + c_tag = "Virology Isolation B"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"gOT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/mechbay) +"gOY" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"gPh" = ( +/obj/item/clothing/head/fedora, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/commons/lounge) +"gPl" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/requests_console/directional/west{ + department = "Morgue"; + name = "Morgue Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"gPA" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"gPN" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/small/directional/north, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"gPY" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"gQa" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"gQf" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/space/basic, +/area/space/nearstation) +"gQg" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"gQw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison) +"gQG" = ( +/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/medical/medbay/central) +"gQK" = ( +/obj/effect/spawner/random/decoration/statue, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"gQQ" = ( +/turf/closed/wall, +/area/station/engineering/break_room) +"gRb" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"gRp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"gSn" = ( +/obj/item/wrench, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gSu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"gSH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/rnd/server/master, +/turf/open/floor/circuit/telecomms/server, +/area/station/science/server) +"gSW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"gTh" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/gravity_generator) +"gTk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"gTn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"gTo" = ( +/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/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) +"gTt" = ( +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"gTC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/item/crowbar, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gTP" = ( +/obj/machinery/light/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gTS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"gTU" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"gUf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"gUt" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"gUx" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"gUH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/structure/fake_stairs/directional/north, +/turf/open/floor/iron, +/area/station/cargo/storage) +"gUP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"gUS" = ( +/turf/closed/wall, +/area/station/science/xenobiology/hallway) +"gUY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/chair/stool/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"gVj" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"gVl" = ( +/obj/machinery/recharge_station, +/obj/machinery/light_switch/directional/west, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"gVn" = ( +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/medical/office) +"gVx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"gVE" = ( +/obj/structure/table/glass, +/obj/machinery/cell_charger, +/obj/item/stack/cable_coil, +/obj/item/assembly/igniter, +/obj/item/stock_parts/power_store/cell, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"gVO" = ( +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/research) +"gWc" = ( +/obj/machinery/computer/prisoner/gulag_teleporter_computer{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"gWl" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"gWn" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"gWv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"gWz" = ( +/mob/living/simple_animal/bot/mulebot, +/obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=1"; + location = "QM #2" + }, +/turf/open/floor/catwalk_floor, +/area/station/cargo/storage) +"gWH" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"gWL" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/service/cafeteria) +"gWT" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/bed/medical/emergency, +/turf/open/floor/iron/white, +/area/station/security/medical) +"gXd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/service/janitor) +"gXe" = ( +/obj/structure/mirror/directional/west, +/obj/item/lipstick/black, +/obj/item/lipstick/jade{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/lipstick/purple{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/port) +"gXl" = ( +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/floor/grass, +/area/station/medical/virology) +"gXp" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/station/solars/port/aft) +"gXs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"gXu" = ( +/turf/open/floor/plating, +/area/station/engineering/main) +"gXw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/circuit/telecomms, +/area/station/science/xenobiology) +"gXz" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"gXF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"gXW" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/pipedispenser/disposal, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"gYe" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/explab) +"gYi" = ( +/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) +"gYl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/insectguts, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"gYw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ + dir = 1 + }, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"gYA" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"gYC" = ( +/obj/effect/spawner/random/trash/mess, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"gYE" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/obj/effect/spawner/random/trash/garbage{ + spawn_loot_count = 3 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"gYO" = ( +/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/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"gYU" = ( +/turf/closed/wall, +/area/station/service/chapel/funeral) +"gYV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/item/broken_bottle{ + pixel_x = 9; + pixel_y = -4 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, +/obj/effect/mapping_helpers/mail_sorting/service/kitchen, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"gZu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/white, +/area/station/science/lab) +"gZG" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) +"gZM" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space, +/area/space/nearstation) +"gZV" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"haa" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/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/engineering/main) +"hav" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"haA" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/machinery/newscaster/directional/west, +/obj/item/pen/invisible, +/turf/open/floor/engine/cult, +/area/station/service/library) +"haE" = ( +/obj/structure/mirror/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/commons/toilet/auxiliary) +"haP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"haR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/main) +"hbv" = ( +/turf/closed/wall/r_wall, +/area/station/medical/coldroom) +"hbK" = ( +/turf/closed/wall, +/area/station/maintenance/department/science/xenobiology) +"hbM" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"hbO" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + 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/medical/chemistry) +"hbQ" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"hbR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"hcc" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"hcl" = ( +/obj/item/target, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"hcm" = ( +/obj/structure/plasticflaps/opaque{ + name = "Service Deliveries" + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + location = "Service" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"hcv" = ( +/obj/effect/landmark/observer_start, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/effect/turf_decal/plaque{ + icon_state = "L13" + }, +/obj/structure/cable, +<<<<<<< HEAD +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"dsk" = ( +/obj/structure/closet/secure_closet/warden, +/obj/item/gun/energy/laser, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"dsl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/grass, +/area/station/medical/virology) +"dsq" = ( +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" +======= +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hcP" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"hcR" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/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/medical/virology) +"hcT" = ( +/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/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"hcU" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"hda" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/central) +"hdg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"hdk" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hdp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/closed/wall, +/area/station/engineering/atmos/pumproom) +"hdy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Xenolab"; + name = "Test Chamber Blast Door" + }, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"hdI" = ( +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hdM" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"hdZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hed" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hei" = ( +/obj/item/stack/sheet/cardboard{ + amount = 14 + }, +/obj/item/stack/package_wrap, +/turf/open/floor/iron, +/area/station/security/prison/work) +"hep" = ( +/obj/effect/landmark/blobstart, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hey" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"heE" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"heF" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L14" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"heL" = ( +/obj/structure/chair/stool/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"heR" = ( +/obj/structure/cable, +/turf/closed/wall, +/area/station/command/heads_quarters/qm) +"heS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/mop_bucket/janitorialcart, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/service/janitor) +"heV" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Fuel Pipe to Filter" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hfa" = ( +/obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"hfi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hft" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"hfA" = ( +/obj/machinery/door/airlock/grunge{ + name = "Cell 1" + }, +/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/safe) +"hfH" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave/engineering/cell_included, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/checker, +/area/station/engineering/storage_shared) +"hgt" = ( +/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/brig) +"hgu" = ( +/obj/machinery/defibrillator_mount/directional/south, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/south, +/obj/structure/bed/medical, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"hgA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"hgB" = ( +/obj/machinery/vending/wardrobe/chem_wardrobe, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hgE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden, +/turf/open/floor/iron/stairs/right{ + dir = 8 + }, +/area/station/engineering/atmos) +"hhl" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/range) +"hhp" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Shutters" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + }, +/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 = 4 + }, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/plating, +<<<<<<< HEAD +/area/station/science/ordnance/storage) +"dss" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/computer/atmos_control/nocontrol/master{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"dsI" = ( +/obj/machinery/airalarm/directional/south, +======= +/area/station/security/brig) +"hht" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) +"hhN" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/lounge) +"hhR" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hif" = ( +/obj/structure/mannequin/skeleton, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"hio" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hip" = ( +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"hiu" = ( +/obj/machinery/computer/records/security, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"hiy" = ( +/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"hiB" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"hiM" = ( +/obj/machinery/food_cart, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"hiZ" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/structure/disposalpipe/segment, +/obj/item/bikehorn/rubberducky, +/obj/machinery/light_switch/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"hjp" = ( +/obj/item/clothing/mask/gas, +/obj/effect/spawner/random/structure/table_or_rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hjt" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"hjw" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/cytology{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/biopsy_tool{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"hjx" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hjG" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Morgue Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/medical/morgue) +"hjH" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"hjS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hkj" = ( +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"hko" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"hkE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/obj/effect/landmark/start/depsec/science, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) +"hkG" = ( +/turf/open/floor/wood, +/area/station/commons/lounge) +"hkH" = ( +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 4 + }, +/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/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/research) +"hkJ" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Auxiliary Base Construction" + }, +/obj/machinery/button/door/directional/south{ + id = "aux_base_shutters"; + name = "Public Shutters Control"; + req_access = list("aux_base") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"hkV" = ( +/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) +"hld" = ( +/obj/machinery/disposal/delivery_chute{ + dir = 1; + name = "Science Deliveries" + }, +/obj/structure/plasticflaps{ + name = "Science Deliveries" + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/departments/science/directional/south{ + color = "#D381C9" + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"hlj" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/machinery/button/door/directional/north{ + id = "detective_shutters"; + name = "detective's office shutters control"; + req_access = list("detective") + }, +/obj/structure/detectiveboard/directional/east, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"hlq" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hlu" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"hlx" = ( +/turf/closed/wall, +/area/station/security/interrogation) +"hlz" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"hlB" = ( +/obj/machinery/flasher/directional/north{ + id = "AI" + }, +/obj/effect/spawner/random/aimodule/harmful, +/obj/structure/table/wood/fancy/red, +/obj/machinery/door/window/brigdoor/left/directional/west{ + name = "High-Risk Modules"; + req_access = list("captain") + }, +/obj/item/ai_module/reset/purge{ + pixel_y = 11 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) +"hlD" = ( +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"hlE" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "mining" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"hlF" = ( +/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/aft/lesser) +"hlN" = ( +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/engine/vacuum, +/area/space/nearstation) +"hmf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"hml" = ( +/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/arrows/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hmq" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"hmu" = ( +/obj/machinery/modular_computer/preset/cargochat/security{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/end{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"hmy" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Permabrig Kitchen" + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"hnn" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "CO2 to Pure" + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hnp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"hnr" = ( +/obj/structure/chair/stool/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/lounge) +"hns" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) +"hnv" = ( +/obj/effect/turf_decal/bot, +/obj/structure/mecha_wreckage/ripley, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"hnG" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage"; + name = "Secure Storage" + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"hnV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/brown/filled/line, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"hor" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Warehouse Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/warehouse) +"hoE" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hoN" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/machinery/door/window/right/directional/west{ + name = "Pharmacy Desk"; + req_access = list("medical") + }, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 8 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = -5 + }, +/obj/item/reagent_containers/syringe/epinephrine, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"hoY" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"hpi" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L2" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hpj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"hpv" = ( +/obj/item/storage/bag/plants/portaseeder, +/obj/item/plant_analyzer, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/watering_can, +/obj/structure/rack, +/obj/item/vending_refill/hydroseeds, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"hpB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"hqb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/medical/abandoned) +"hqr" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) +"hqD" = ( +/obj/machinery/door/airlock/mining{ + name = "Quartermaster's Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/diagonal_edge, +/obj/effect/turf_decal/tile/brown/diagonal_centre, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/diagonal, +/area/station/command/heads_quarters/qm) +"hqE" = ( +/obj/machinery/telecomms/bus/preset_four, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"hqL" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/shower/directional/west{ + name = "emergency shower" + }, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"hqM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"hqT" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"hrh" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"hrC" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/checkpoint/supply) +"hrG" = ( +/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/grimy, +/area/station/service/chapel/office) +"hrM" = ( +/obj/machinery/vending/boozeomat, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -28 + }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"hse" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/trimline/dark_red/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_red/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/mid_joiner{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/service/chapel/office) +"hsx" = ( +/obj/machinery/door/airlock/mining{ + name = "Drone Bay" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/effect/landmark/navigate_destination, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"hsF" = ( +/obj/machinery/door/airlock{ + id_tag = "AuxToilet3"; + name = "Unit 3" + }, +/turf/open/floor/plating, +/area/station/commons/toilet/auxiliary) +"hsN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/chapel) +"hsZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"hta" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"htb" = ( +/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/iron, +/area/station/security/holding_cell) +"htd" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"htk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/station/commons/fitness) +"htn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/research) +"hto" = ( +/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/service/chapel/funeral) +"htr" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"htD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"htE" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/primary/port) +"htG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"htO" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/librarian, +/turf/open/floor/wood, +/area/station/service/library) +"htP" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"htS" = ( +/obj/structure/fluff/iced_abductor, +/turf/open/misc/asteroid/basalt/airless, +/area/space/nearstation) +"htY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"huj" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"hum" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/greater) +"huq" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"hux" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/command/teleporter) +"huy" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"huF" = ( +/obj/item/clothing/suit/costume/snowman, +/obj/item/clothing/head/costume/snowman, +/turf/open/floor/fake_snow, +/area/station/maintenance/port/aft) +"huG" = ( +/turf/closed/wall, +/area/station/service/kitchen/coldroom) +"huZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"hve" = ( +/obj/structure/cable, +/obj/machinery/computer/shuttle/mining/common, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/plating, +/area/station/security/checkpoint/customs) +"hvk" = ( +/obj/effect/spawner/random/bureaucracy/birthday_wrap, +/obj/item/stack/package_wrap{ + pixel_y = 5 + }, +/obj/item/stack/package_wrap{ + pixel_y = 2 + }, +/obj/item/stack/package_wrap, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south, +/obj/structure/table, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"hvo" = ( +/obj/structure/filingcabinet, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"hvr" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Central Primary Hallway - Fore - Courtroom" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hvs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"hvB" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/brown/filled/warning, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"hvI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/structure/plaque/static_plaque/golden/commission/meta, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"hvJ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hvO" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"hvR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"hwe" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/west{ + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"hwg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"hwo" = ( +/obj/structure/rack, +/obj/item/clothing/under/misc/mailman, +/obj/item/clothing/under/misc/vice_officer, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hwt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"hwz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"hwF" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hwZ" = ( +/obj/structure/chair/stool/directional/north, +/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) +"hxd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/end{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"hxe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/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 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"hxo" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/storage) +"hxq" = ( +/obj/machinery/chem_mass_spec, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"hxt" = ( +/obj/structure/closet/secure_closet/personal, +/obj/machinery/light/small/directional/north, +/obj/item/clothing/under/misc/assistantformal, +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"hxu" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"hxw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +<<<<<<< HEAD +/turf/open/floor/iron, +/area/station/service/hydroponics) +"dsQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/bridge) +"dsV" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Distro Staging to Filter" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"dtg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Recreation Area" + }, +/obj/structure/cable, +======= +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"hxz" = ( +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 3 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 13; + pixel_y = 5 + }, +/obj/item/watertank, +/obj/item/grenade/chem_grenade/antiweed, +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"hxB" = ( +/obj/item/kirbyplants/organic/plant21, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"hxD" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"hxV" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"hxW" = ( +/obj/machinery/door/window/right/directional/north{ + name = "Gas Ports" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "justice gas pump" + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"hxY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"hye" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hyh" = ( +/obj/machinery/shower/directional/south{ + name = "emergency shower" + }, +/obj/effect/turf_decal/trimline/blue/end, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hyn" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"hyD" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Inner Pipe Access"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"hyN" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/ai_monitored/command/storage/eva) +"hyT" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"hyW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"hyX" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"hyZ" = ( +/obj/machinery/flasher/directional/east{ + id = "AI"; + pixel_y = 26 + }, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/window/brigdoor/right/directional/east{ + name = "Tertiary AI Core Access"; + req_access = list("ai_upload"); + pixel_x = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"hza" = ( +/obj/vehicle/sealed/mecha/ripley/paddy/preset, +/turf/open/floor/iron/recharge_floor, +/area/station/security/mechbay) +"hzb" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/directional/north, +/obj/effect/landmark/start/shaft_miner, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"hzt" = ( +/obj/structure/transit_tube/curved/flipped, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hzw" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"hzJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"hzL" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"hAk" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"hAq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"hAu" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/locker) +"hAF" = ( +/obj/machinery/camera/directional/south{ + c_tag = "MiniSat Exterior Access"; + network = list("minisat") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hAL" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "visitation"; + name = "Visitation Shutters" + }, +/obj/machinery/door/window/right/directional/east, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"hAN" = ( +/obj/structure/cable, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"hAW" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Research Director's Office - Observation Cage"; + network = list("ss13","rd") + }, +/turf/open/floor/engine, +/area/station/command/heads_quarters/rd) +"hBm" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hBo" = ( +/mob/living/simple_animal/bot/mulebot, +/obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + location = "QM #1" + }, +/turf/open/floor/catwalk_floor, +/area/station/cargo/storage) +"hBr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +<<<<<<< HEAD +/area/station/commons/dorms) "dtt" = ( /obj/machinery/mech_bay_recharge_port{ dir = 1 @@ -9186,10 +24969,2053 @@ network = list("ss13","medbay") }, /obj/machinery/status_display/ai/directional/south, +======= +/area/station/hallway/primary/central) +"hBB" = ( +/obj/machinery/computer/rdconsole{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +"hBC" = ( +/obj/structure/kitchenspike_frame, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hBD" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"hBH" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/basic, +/area/space/nearstation) +"hBI" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/west{ + c_tag = "Science Ordnance Test Lab" + }, +/obj/item/assembly/prox_sensor{ + pixel_y = 2 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = 9; + pixel_y = -2 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/machinery/requests_console/directional/west{ + department = "Ordnance Test Range"; + name = "Test Range Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"hBY" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"hCl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"hCn" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hCt" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"hCy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/cryo_cell, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"hCG" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Port Primary Hallway - Mining Shuttle" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"hCK" = ( +/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) +"hCT" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"hDa" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hDe" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"hDp" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/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/medical/medbay/central) +"hDE" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/iron/white, +/area/station/security/prison) +"hDX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/checkpoint/supply) +"hEc" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) +"hEq" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/mining_weather_monitor/directional/east, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"hEr" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hEw" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/bot_white, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hEA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"hET" = ( +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/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/blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"hEV" = ( +/obj/effect/decal/cleanable/garbage, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"hEX" = ( +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"hFz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"hFD" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hFM" = ( +/obj/effect/spawner/random/structure/closet_empty/crate, +/obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/random/maintenance/two, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hGi" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hGk" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"hGl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"hGF" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"hGL" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"hHd" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"hHt" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"hHK" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) +"hHO" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) +"hHR" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/under/misc/assistantformal, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"hIm" = ( +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" + }, +/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/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"hIp" = ( +/obj/structure/fake_stairs/directional/south, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hIu" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"hIx" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/medical_doctor, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/surgery/aft) +"hIJ" = ( +/obj/structure/cable, +/obj/machinery/chem_heater/withbuffer, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hIQ" = ( +/obj/structure/cable, +/obj/effect/landmark/start/security_officer, +/turf/open/floor/iron, +/area/station/security/office) +"hIZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/grille, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"hJi" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering Supermatter Aft"; + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"hJv" = ( +/obj/structure/chair/stool/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/dorms) +"hJF" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/button/door/directional/south{ + id = "mechbay"; + name = "Mech Bay Shutters Control"; + req_access = list("robotics") + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"hJH" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/port) +"hJI" = ( +/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/yellow{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"hJJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/tcommsat/server) +"hJO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hKg" = ( +/turf/closed/wall, +/area/station/cargo/miningoffice) +"hKi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"hKp" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port) +"hKv" = ( +/obj/structure/chair/pew/left, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"hKB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"hKG" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"hKQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hKV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"hLs" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"hLv" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"hLB" = ( +/obj/structure/rack, +/obj/item/crowbar/red, +/obj/item/restraints/handcuffs, +/obj/item/wrench, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hLJ" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/box, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"hLL" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hLZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"hMn" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + 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/construction/storage_wing) +"hMo" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Vacant Office Maintenance" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/turf/open/floor/plating, +/area/station/maintenance/port) +"hMq" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"hMv" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen #1"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"hMy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/warden) +"hME" = ( +/obj/structure/table/wood, +/obj/item/taperecorder{ + pixel_x = 3 + }, +/obj/item/storage/box/evidence, +/obj/item/flashlight/seclite, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"hMQ" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Holodeck Control" + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"hNb" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/security/office) +"hNn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/station/commons/lounge) +"hNz" = ( +/obj/structure/chair, +/obj/effect/landmark/start/depsec/science, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) +"hNA" = ( +/obj/structure/table, +/obj/machinery/camera/directional/south{ + c_tag = "Science Toxins Launch"; + network = list("ss13","rd") + }, +/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver{ + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"hND" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"hOh" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/brown/filled/warning, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"hOp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hOR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/trash/soap{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) +"hPk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hPu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 5 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"hPv" = ( +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/structure/table/wood, +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"hPK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"hPM" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hQc" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Quartermaster"; + name = "Quartermaster's Fax Machine" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/requests_console/directional/north{ + department = "Quartermaster's Desk"; + name = "Quartermaster's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/ore_update, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"hQu" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hQv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-right" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"hQy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/engineering{ + name = "Port Bow Solar Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"hQB" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hQE" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/chair/pew/left, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"hQY" = ( +/obj/machinery/door/window/right/directional/north{ + name = "Petting Zoo" + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron, +/area/station/science/research) +"hRf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"hRl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"hRq" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering{ + name = "Engine Room" + }, +/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/engineering/general, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/engineering/main) +"hRv" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"hRQ" = ( +/obj/machinery/disposal/bin{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"hRU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"hRW" = ( +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"hSe" = ( +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/north, +/obj/structure/table/wood, +/obj/item/phone{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"hSf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/stack/cable_coil, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"hSg" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/cafeteria) +"hSi" = ( +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stack/sheet/mineral/plasma{ + amount = 30 + }, +/obj/item/gps, +/obj/structure/closet/crate/engineering, +/turf/open/floor/plating, +/area/station/engineering/main) +"hSl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/poster/official/moth_piping/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"hSr" = ( +/obj/machinery/holopad/secure, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"hSt" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"hSG" = ( +/obj/structure/closet/lasertag/red, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"hSH" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) +"hSO" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"hSQ" = ( +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/turf/open/floor/iron/dark/smooth_half{ + dir = 4 + }, +/area/station/medical/morgue) +"hTb" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/command/gateway) +"hTq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hTE" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"hTG" = ( +/obj/structure/cable, +/obj/machinery/power/terminal, +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"hTM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"hTV" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/highsecurity{ + name = "Gravity Generator Foyer" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/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/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"hUd" = ( +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"hUn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"hUu" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"hUB" = ( +/obj/machinery/suit_storage_unit/hos, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) +"hUN" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/space_hut) +"hUO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"hVn" = ( +/obj/machinery/door/window/right/directional/east{ + name = "Containment Pen #8"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"hVE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"hVN" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + frequency = 1449; + id_tag = "virology_airlock_exterior"; + name = "Virology Exterior Airlock" + }, +/obj/machinery/door_buttons/access_button{ + dir = 1; + idDoor = "virology_airlock_exterior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Button"; + pixel_y = -24; + req_access = list("virology") + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"hVX" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/newscaster/directional/south, +/obj/effect/landmark/blobstart, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/west{ + id = "Toilet2"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/trash/graffiti{ + pixel_x = -32; + spawn_loot_chance = 50 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"hVY" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hWa" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"hWj" = ( +/obj/machinery/computer/slot_machine{ + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"hWx" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"hWy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/teleporter) +"hWC" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/structure/fake_stairs/directional/north, +/turf/open/floor/iron, +/area/station/cargo/storage) +"hWD" = ( +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"hWF" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/locker) +"hWK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/depsec/supply, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"hWW" = ( +/obj/structure/bookcase/random, +/turf/open/floor/iron, +/area/station/security/prison) +"hXd" = ( +/obj/effect/turf_decal/trimline/blue/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple, +/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/science/research) +"hXh" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"hXn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"hXC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"hXJ" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"hXQ" = ( +/obj/machinery/vending/cola/red, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"hYd" = ( +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/office) +"hYl" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 14 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"hYr" = ( +/obj/machinery/holopad, +/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/blue/anticorner/contrasted, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay/lobby) +"hYs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"hYx" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageSort2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"hYA" = ( +/obj/item/assembly/timer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/assembly/timer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/assembly/igniter{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/assembly/igniter{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/assembly/igniter{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/assembly/igniter{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/assembly/timer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/assembly/timer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/structure/table/glass, +/obj/item/storage/pill_bottle/epinephrine{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"hYE" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"hYG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"hZg" = ( +/obj/structure/closet/crate, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/light_switch/directional/north, +/obj/effect/spawner/random/engineering/flashlight, +/obj/effect/spawner/random/engineering/flashlight, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"hZn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"hZy" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/smooth_half{ dir = 8 }, /area/station/medical/morgue) +"hZA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) +"hZO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"hZQ" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/port/fore) +"hZV" = ( +/turf/closed/wall/r_wall, +/area/station/medical/morgue) +"hZZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iam" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"iar" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port) +"ias" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"iaK" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"iaQ" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"iaS" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/kitchen) +"iaT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iaZ" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=16-Fore"; + location = "15-Court" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"ibw" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"ibz" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ibH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + name = "justice injector" + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"ibX" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ica" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"icb" = ( +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Justice Chamber"; + req_access = list("armory") + }, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Justice Chamber"; + req_access = list("armory") + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "executionfireblast" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"ich" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/turf/closed/wall, +/area/station/engineering/atmos) +"icj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/central) +"icC" = ( +/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/fore) +"icR" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"icS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"idr" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/fitness/recreation) +"idA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"idL" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"idR" = ( +/obj/structure/table, +/obj/item/food/dough, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"ied" = ( +/obj/structure/table, +/obj/item/paper/fluff/holodeck/disclaimer, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"iem" = ( +/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) +"iep" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"iev" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/cargo/sorting) +"ieH" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"ieI" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) +"ieV" = ( +/turf/closed/wall/r_wall, +/area/station/security/holding_cell) +"ifh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ifn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"ifE" = ( +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"ifF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"ifJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"ifM" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"ifP" = ( +/obj/item/stack/sheet/cardboard, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ifQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"igh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/gateway) +"igi" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"ign" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/space_hut) +"igy" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/requests_console/directional/east{ + department = "Atmospherics"; + name = "Atmospherics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"igz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"igP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"igS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "PermaLockdown"; + name = "Lockdown Shutters" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/security/prison) +"igV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"igZ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Teleport Access" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/turf/open/floor/iron, +/area/station/command/teleporter) +"ihb" = ( +/turf/closed/wall, +/area/station/security/prison/shower) +"ihq" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/central) +"ihv" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"ihx" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"ihN" = ( +/obj/machinery/computer/security/telescreen/prison/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/office) +"ihW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) +"ihX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"iio" = ( +/obj/machinery/door/airlock/command{ + name = "Research Director's Office" + }, +/obj/machinery/door/firedoor, +/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/airlock/access/all/science/rd, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"iit" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Primary Hallway - Fore - Port Corner" + }, +/obj/machinery/computer/piratepad_control/civilian{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iix" = ( +/obj/item/flashlight/lamp, +/obj/machinery/newscaster/directional/west, +/obj/structure/table/wood, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"iiE" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Head of Personnel's Office"; + name = "Head of Personnel's Fax Machine" + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"iiL" = ( +/obj/machinery/air_sensor/mix_tank, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"iiN" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ije" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"iji" = ( +/obj/machinery/vending/hydronutrients, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ijv" = ( +/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/delivery, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"ijZ" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"ikb" = ( +/turf/open/floor/iron, +/area/station/commons/dorms) +"iki" = ( +/obj/structure/table, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 5 + }, +/obj/item/clothing/mask/balaclava, +/obj/item/storage/backpack/duffelbag/sec/surgery{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"ikr" = ( +/obj/structure/closet/emcloset, +/obj/machinery/camera/directional/south{ + c_tag = "Science Entry"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/checker, +/area/station/science/research) +"iks" = ( +/obj/effect/landmark/start/clown, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/theater) +"ikw" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"ikC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"ikL" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"ikO" = ( +/obj/machinery/newscaster/directional/north, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/reagent_containers/dropper, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) +"ikR" = ( +/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/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ikS" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/folder/white{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/paper_bin/carbon{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/turf/open/floor/carpet, +/area/station/medical/psychology) +"ikY" = ( +/obj/structure/sign/warning/secure_area/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"ikZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/range) +"ilg" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"ilh" = ( +/turf/closed/wall, +/area/station/maintenance/fore) +"ili" = ( +/obj/effect/turf_decal/trimline/purple/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"ilq" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/storage/toolbox/emergency, +/obj/structure/cable, +/obj/effect/spawner/random/engineering/flashlight, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +"ilx" = ( +/obj/structure/closet/emcloset, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"ilC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/grunge{ + name = "Quiet Room" + }, +/turf/open/floor/wood, +/area/station/service/library) +"ilJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"ilQ" = ( +/obj/structure/closet/crate/bin, +/obj/item/knife/kitchen, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/broken/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"ilR" = ( +/obj/machinery/holopad/secure, +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"ilT" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Shared Engineering Storage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"imt" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 9 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +<<<<<<< HEAD "dwm" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -9402,6 +27228,450 @@ /area/station/maintenance/port/fore) "dBV" = ( /obj/docking_port/stationary/escape_pod{ +======= +"imw" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Containment Pen #3"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"imU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ina" = ( +/obj/machinery/stasis{ + dir = 4 + }, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"inw" = ( +/obj/machinery/disposal/bin{ + desc = "A pneumatic waste disposal unit. This one leads into space!"; + name = "deathsposal unit" + }, +/obj/structure/sign/warning/deathsposal/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"inB" = ( +/obj/structure/tank_dispenser/oxygen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"inH" = ( +/obj/structure/table/wood, +/obj/item/pai_card, +/turf/open/floor/wood, +/area/station/service/library) +"inL" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"inQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"inX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "corporate_privacy"; + name = "Showroom Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/corporate_showroom) +"ioc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iom" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/door/window/right/directional/east{ + name = "Infirmary" + }, +/turf/open/floor/iron/white, +/area/station/security/medical) +"iov" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"iox" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"ioy" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"ioZ" = ( +/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/lockers) +"ipy" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"ipz" = ( +/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/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/office) +"ipG" = ( +/obj/structure/table, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"ipM" = ( +/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/science/lab) +"ipR" = ( +/obj/machinery/recharge_station, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"ipX" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Brig - Labor Shuttle Dock" + }, +/obj/machinery/gulag_item_reclaimer{ + pixel_y = 24 + }, +/obj/machinery/flasher/directional/east{ + id = "PRelease"; + pixel_y = 20 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +"iqc" = ( +/obj/structure/reflector/single/anchored{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"iqo" = ( +/obj/effect/landmark/start/quartermaster, +/turf/open/floor/carpet/orange, +/area/station/command/heads_quarters/qm) +"iqq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"iqt" = ( +/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/cargo/storage) +"iqx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"iqz" = ( +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"iqB" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"iqN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Council Chamber" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"iqU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/warning, +/obj/effect/turf_decal/trimline/brown/warning, +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"irm" = ( +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Kitchen" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/maintenance/starboard/greater) +"irz" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Inner Pipe Access"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "N2 to Pure" + }, +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"irL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/office) +"irQ" = ( +/obj/structure/mop_bucket, +/obj/item/mop, +/obj/effect/landmark/blobstart, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"irY" = ( +/obj/machinery/power/emitter/welded, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"isc" = ( +/obj/docking_port/stationary/random{ + name = "lavaland"; + shuttle_id = "pod_2_lavaland" + }, +/turf/open/space, +/area/space) +"ise" = ( +/obj/effect/turf_decal/bot, +/obj/item/robot_suit, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"isk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"isl" = ( +/obj/machinery/light/small/broken/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"isn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"isr" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "atmoshfr" + }, +/turf/open/floor/plating, +/area/station/engineering/atmospherics_engine) +"isu" = ( +/obj/effect/landmark/start/paramedic, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"isA" = ( +/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/construction/storage_wing) +"isI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/iron/checker, +/area/station/maintenance/aft/lesser) +"isO" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/obj/machinery/door/window/left/directional/north{ + name = "Danger: Conveyor Access"; + req_access = list("maint_tunnels") + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"isV" = ( +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"isX" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/east{ + name = "Engineering Desk"; + req_access = list("engineering") + }, +/obj/item/folder/yellow{ + pixel_x = 4 + }, +/obj/item/pen{ + pixel_x = 5 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"itg" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/bar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"itn" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/engine, +/area/station/science/explab) +"itp" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"itr" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/station/command/bridge) +"itC" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"itW" = ( +/obj/effect/decal/cleanable/dirt, +/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/plating, +/area/station/maintenance/starboard/greater) +"itY" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Doors" + }, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/iron/dark, +/area/station/engineering/break_room) +"iug" = ( +/obj/machinery/mechpad, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) +"iui" = ( +/obj/effect/turf_decal/box, +/turf/open/floor/iron/textured, +/area/station/engineering/atmos) +"iun" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 4 }, /turf/open/space/basic, @@ -9957,6 +28227,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +<<<<<<< HEAD /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/large, @@ -10475,10 +28746,2645 @@ /area/station/medical/chemistry) "dUj" = ( /obj/structure/chair/office{ +======= +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iuB" = ( +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iuE" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/drinkingglass, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"iva" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"ivb" = ( +/obj/machinery/disposal/bin, +/obj/machinery/camera/directional/east{ + c_tag = "Garden" + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"ivc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"ivu" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/directional/west{ + c_tag = "Prison Cafeteria"; + network = list("ss13","prison") + }, +/obj/item/food/energybar, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"ivx" = ( +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port) +"ivy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"ivB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"ivC" = ( +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/structure/closet/crate, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"ivM" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/station/service/library) +"ivR" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"iwj" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"iwt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall, +/area/station/engineering/atmos) +"iwA" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/item/book/manual/wiki/robotics_cyborgs, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/toolbox/electrical, +/obj/item/multitool, +/obj/item/clothing/head/utility/welding, +/obj/item/clothing/glasses/welding, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"iwL" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/medical/morgue) +"iwO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ixd" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ixm" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Prison Wing" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "perma-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig) +"ixr" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"ixv" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"ixw" = ( +/obj/machinery/holopad, +/obj/machinery/camera/directional/south{ + c_tag = "MiniSat Exterior - Aft"; + network = list("minisat") + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"ixP" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"ixT" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/structure/closet/crate/silvercrate, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"ixV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ixY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"iyc" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"iym" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"iyy" = ( +/obj/structure/table, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/reagent_containers/blood{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"iyC" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door_buttons/airlock_controller{ + idExterior = "virology_airlock_exterior"; + idInterior = "virology_airlock_interior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Console"; + pixel_x = 24; + pixel_y = -24; + req_access = list("virology") + }, +/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/medical/virology) +"iyV" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=11.1-Command-Starboard"; + location = "11-Command-Port" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"izd" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/commons/fitness/recreation) +"ize" = ( +/obj/structure/rack, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/spawner/random/techstorage/medical_all, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"izl" = ( +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"izp" = ( +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"izr" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/grunge{ + name = "Courtroom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"izv" = ( +/obj/item/flashlight/lantern{ + pixel_y = 7 + }, +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"izA" = ( +/obj/structure/sink/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"izD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/landmark/start/depsec/medical, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"izG" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"izI" = ( +/obj/machinery/newscaster/directional/south, +/obj/structure/closet/secure_closet/quartermaster, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/camera/directional/south, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"izZ" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/effect/landmark/generic_maintenance_landmark, +/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/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"iAj" = ( +/obj/structure/rack, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/timer, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"iAk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/item/stack/cable_coil, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"iAp" = ( +/obj/machinery/atmospherics/components/binary/valve/digital, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"iAq" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"iAs" = ( +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"iAu" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"iAA" = ( +/obj/item/toy/beach_ball/branded{ + pixel_y = 7 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"iAN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"iAR" = ( +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/servingdish, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"iBf" = ( +/obj/structure/closet, +/obj/item/stack/sheet/iron{ + amount = 34 + }, +/obj/item/extinguisher/mini, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iBm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"iBp" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Departure Lounge Airlock" + }, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"iBq" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/fore/lesser) +"iBt" = ( +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/station/service/cafeteria) +"iBL" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"iCj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = 40; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"iCr" = ( +/obj/structure/rack, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"iCJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"iCN" = ( +/obj/effect/turf_decal/arrows/white, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"iCV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"iCX" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iDh" = ( +/obj/machinery/computer/communications{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/keycard_auth/wall_mounted/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"iDq" = ( +/obj/effect/turf_decal/box, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/security_officer, +/turf/open/floor/iron/dark, +/area/station/security/range) +"iDG" = ( +/obj/structure/table, +/obj/item/stock_parts/scanning_module{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = -5 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"iDN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"iDP" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/wood, +/area/station/security/office) +"iEj" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"iEm" = ( +/obj/structure/reagent_dispensers/plumbed, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iEv" = ( +/obj/structure/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/aft) +"iEE" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/iron, +/area/station/commons/dorms) +"iEK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"iEZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/service/theater) +"iFh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"iFi" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"iFz" = ( +/turf/open/floor/iron, +/area/station/security/prison) +"iFC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/cafeteria) +"iFF" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +"iFI" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"iFR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) +"iFX" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"iGj" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) +"iGq" = ( +/obj/structure/lattice, +/obj/item/broken_bottle, +/turf/open/space/basic, +/area/space/nearstation) +"iGr" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Port to Filter" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iGA" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"iGB" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/cargo/bitrunning/den) +"iHc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/commons/fitness) +"iHn" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"iHp" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"iHu" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"iHv" = ( +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"iHy" = ( +/obj/machinery/rnd/production/circuit_imprinter, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) +"iHD" = ( +/turf/closed/wall/r_wall, +/area/station/security/courtroom) +"iHH" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"iHS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/security/glass{ + name = "Security Post - Cargo" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"iId" = ( +/obj/machinery/conveyor{ + id = "mining" + }, +/obj/machinery/brm, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"iIf" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Locker Room Entrance" + }, +/obj/structure/cable, +/obj/structure/sign/departments/lawyer/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) +"iIq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"iIE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"iIP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"iIQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"iJj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/chapel) +"iJl" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/command) +"iJC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"iJD" = ( +/obj/item/instrument/guitar, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"iJK" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/plumbed{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"iKj" = ( +/obj/machinery/photocopier{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"iKL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"iKT" = ( +/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/hallway/primary/central) +"iKV" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/south{ + name = "Atmospherics Desk"; + req_access = list("atmospherics") + }, +/obj/item/folder/yellow{ + pixel_x = 5 + }, +/obj/item/pen{ + pixel_x = 5 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"iLe" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 5 + }, +/turf/open/space, +/area/space/nearstation) +"iLk" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L12" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iLq" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/turf_decal/siding, +/turf/open/floor/iron, +/area/station/science/lab) +"iLw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"iLH" = ( +/obj/machinery/flasher/directional/west{ + id = "Cell 1" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"iLT" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/start/bitrunner, +/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/textured_half, +/area/station/cargo/bitrunning/den) +"iMd" = ( +/obj/structure/bed/medical/emergency{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"iMi" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/turf/open/floor/carpet, +/area/station/command/bridge) +"iMk" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"iMo" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/security/detectives_office, +/turf/open/floor/iron, +/area/station/security/brig) +"iMr" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "chem_lockdown"; + name = "Chemistry Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"iMs" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/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) +"iMv" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"iMF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Custodial Closet" + }, +/obj/machinery/light_switch/directional/west, +/obj/machinery/requests_console/directional/north{ + department = "Janitorial"; + name = "Janitorial Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron, +/area/station/service/janitor) +"iMG" = ( +/obj/structure/chair/stool/directional/south, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"iMQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/mob/living/basic/lizard/wags_his_tail, +/turf/open/floor/plating, +/area/station/service/janitor) +"iMR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"iMS" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/main) +"iNc" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"iNi" = ( +/obj/item/shard, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"iNo" = ( +/obj/structure/filingcabinet/filingcabinet, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay Psychology Office"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"iNB" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/table/glass, +/obj/item/papercutter, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"iNC" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"iNH" = ( +/obj/structure/lattice/catwalk, +/obj/item/banner/cargo, +/turf/open/space/basic, +/area/space/nearstation) +"iNK" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Doors"; + pixel_y = 1; + req_access = list("xenobiology") + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"iNQ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"iOc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"iOm" = ( +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"iOp" = ( +/obj/machinery/door/airlock/command{ + name = "Command Desk" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"iOr" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/garden) +"iOt" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"iOD" = ( +/obj/machinery/atmospherics/components/binary/tank_compressor{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"iOJ" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"iOS" = ( +/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, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"iPb" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/visit) +"iPe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/science/lab) +"iPp" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/machinery/light/small/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/spawner/random/bureaucracy/pen, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"iPx" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iPy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/medical/virology) +"iPB" = ( +/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/hallway/secondary/entry) +"iPE" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"iPM" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/office) +"iPT" = ( +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/station/commons/lounge) +"iPX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 2"; + name = "Cell 2 locker" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"iQd" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"iQg" = ( +/obj/structure/chair, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/security/holding_cell) +"iQi" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/science/lab) +"iQj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"iQr" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"iQy" = ( +/obj/structure/sign/warning/pods{ + pixel_x = 30 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"iQF" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"iQI" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"iQO" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iQP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"iRc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white, +/area/station/science/research) +"iRg" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"iRh" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "MiniSat Space Access Airlock" + }, +/obj/machinery/door/poddoor/preopen{ + id = "transitlockdown" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"iRr" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Arrivals - Middle Arm" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"iRy" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/radio/intercom/directional/west, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"iRW" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"iRY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Foyer" + }, +/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/structure/cable/layer3, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +"iSh" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"iSk" = ( +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"iSl" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"iSt" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/rag{ + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/monkey_energy{ + pixel_x = -7; + pixel_y = 7 + }, +/turf/open/floor/iron/white/smooth_half, +/area/station/commons/fitness) +"iSI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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/engineering/main) +"iSU" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/rcl/pre_loaded, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +"iTc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"iTC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iTH" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"iTO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/start/depsec/science, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) +"iTQ" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Doors"; + pixel_y = 1; + req_access = list("xenobiology") + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"iTX" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iTZ" = ( +/turf/closed/wall/r_wall, +/area/station/security/lockers) +"iUe" = ( +/obj/structure/table/wood, +/obj/item/lipstick{ + pixel_y = 5 + }, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/structure/sign/poster/random/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/service/theater) +"iUf" = ( +/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/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +"iUm" = ( +/turf/closed/wall, +/area/station/hallway/secondary/exit/departure_lounge) +"iUs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iUv" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison) +"iUE" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"iUJ" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + 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/white, +/area/station/medical/treatment_center) +"iVi" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin6"; + name = "Cabin 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/dorms) +"iVs" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"iVt" = ( +/obj/effect/decal/remains/human{ + desc = "They look like human remains. The bones are charred and burned."; + name = "charred remains" + }, +/turf/open/floor/engine/vacuum, +/area/space/nearstation) +"iVA" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"iVE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"iVJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"iVN" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/commons/dorms) +"iVO" = ( +/obj/structure/closet/masks, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"iWc" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"iWj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) +"iWk" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "chapel_shutters_space"; + name = "chapel shutters control"; + pixel_x = -6 + }, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) +"iWy" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/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/science/ordnance/storage) +"iWB" = ( +/obj/item/storage/fancy/candle_box, +/obj/machinery/light/small/directional/east, +/obj/structure/rack/skeletal, +/turf/open/floor/engine/cult, +/area/station/service/library) +"iWD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/office) +"iWJ" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"iWT" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/structure/table, +/obj/item/clipboard, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"iWU" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/break_room) +"iWZ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"iXb" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iXp" = ( +/obj/structure/table, +/obj/item/analyzer, +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"iXt" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"iXC" = ( +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port) +"iXT" = ( +/obj/structure/cable, +/obj/machinery/door/airlock{ + id_tag = "commissarydoor"; + name = "Commissary" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central) +"iYc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"iYA" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Bridge - Starboard" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"iYD" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"iYE" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnanceburn" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"iYG" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"iYO" = ( +/obj/structure/table, +/obj/item/circular_saw, +/obj/item/scalpel{ + pixel_y = 16 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"iYP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"iYU" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) +"iYW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"iZd" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/left/directional/east{ + name = "Kitchen Delivery"; + req_access = list("kitchen") + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"iZi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/chapel) +"iZm" = ( +/obj/machinery/shower/directional/south{ + name = "emergency shower" + }, +/obj/effect/turf_decal/trimline/blue/end, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iZn" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/syringes{ + pixel_y = 4 + }, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"iZC" = ( +/obj/structure/closet/crate, +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/spawner/random/entertainment/dice, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"iZF" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"iZS" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) +"jaj" = ( +/obj/structure/chair, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/security/office) +"jaq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jau" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/flasher/directional/east{ + id = "secentranceflasher" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron, +/area/station/security/brig) +"jay" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"jaO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"jaY" = ( +/obj/effect/turf_decal/box/red, +/obj/machinery/atmospherics/components/unary/outlet_injector{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/cytology) +"jbd" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"jbg" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/research) +"jbk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology Lab - Central South"; + dir = 9; + network = list("ss13","rd","xeno") + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"jbF" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb, +/obj/item/shard, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jcc" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"jcw" = ( +/obj/machinery/atmospherics/components/tank, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"jcy" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jcI" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/structure/closet/secure_closet/psychology, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"jcJ" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Doors" + }, +/obj/structure/cable, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/engineering/break_room) +"jcR" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/courtroom) +"jdg" = ( +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/window/fulltile, +/turf/open/floor/grass, +/area/station/hallway/secondary/exit/departure_lounge) +"jdv" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"jdH" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/siding/white, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Cold Storage"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) +"jdR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jdX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/science/server) +"jdZ" = ( +/obj/docking_port/stationary/random{ + dir = 4; + name = "lavaland"; + shuttle_id = "pod_3_lavaland" + }, +/turf/open/space, +/area/space) +"jef" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jei" = ( +/obj/machinery/light/cold/directional/south, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/bot_white, +/obj/machinery/vending/wardrobe/medi_wardrobe, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"jej" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jew" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/cytology) +"jeI" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"jeL" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/medicine, +/obj/item/clothing/neck/stethoscope, +/obj/item/wrench/medical, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) +"jfa" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/vending/games, +/turf/open/floor/wood, +/area/station/service/library) +"jff" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/brig) +"jfg" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"jfn" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Primary Treatment Centre" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"jfr" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/office) +"jfv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port) +"jfB" = ( +/obj/machinery/door/airlock/external{ + name = "Mining Dock Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/miningoffice) +"jfC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"jfG" = ( +/turf/closed/wall, +/area/station/maintenance/disposal) +"jfN" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"jfO" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/treatment_center) +"jfS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"jfU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/central) +"jfX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/trimline/green/line, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +"jgk" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"jgt" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix to Distro Staging" + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jgy" = ( +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/structure/table/wood, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/grimy, +/area/station/security/interrogation) +"jgE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"jgK" = ( +/obj/structure/sign/poster/random/directional/south, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"jgT" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#EFB341" + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"jgW" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"jhd" = ( +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/station/solars/starboard/fore) +"jhk" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"jhn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"jhp" = ( +/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/yellow{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"jhv" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"jhD" = ( +/obj/structure/closet/radiation, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"jhS" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"jhY" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"jie" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"jis" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/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/service/chapel) +"jiI" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Bridge - Port" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"jjj" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"jjm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"jjn" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jjs" = ( +/obj/effect/spawner/random/engineering/tank, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"jjv" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"jjy" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"jjC" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/item/food/grown/banana, +/turf/open/floor/grass, +/area/station/medical/virology) +"jjF" = ( +/obj/structure/table/reinforced, +/obj/item/holosign_creator/robot_seat/bar, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"jjG" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Recreation Area - Fore" + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"jjM" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"jjN" = ( +/obj/structure/chair/stool/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"jjS" = ( +/obj/item/kirbyplants/organic/plant6, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"jkj" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/office) +"jku" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jkG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/transit_tube/station/dispenser{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"jkT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"jkX" = ( +/obj/machinery/door_buttons/access_button{ + idDoor = "xeno_airlock_interior"; + idSelf = "xeno_airlock_control"; + name = "Access Button"; + pixel_x = 29; + pixel_y = -8; + req_access = list("xenobiology") + }, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/soap, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"jle" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/folder/yellow{ + pixel_x = 8; + pixel_y = -1 + }, +/obj/item/ammo_casing/rocket{ + pixel_x = -2; + pixel_y = 19; + name = "Dud Rocket"; + desc = "An 84mm High Explosive rocket. This one's a dud. Pretty sure." + }, +/obj/item/computer_disk/quartermaster{ + pixel_x = 9; + pixel_y = 13 + }, +/obj/effect/spawner/random/entertainment/lighter{ + pixel_x = -7; + pixel_y = -4 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"jln" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) +"jlA" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jlJ" = ( +/obj/effect/spawner/random/entertainment/arcade, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"jlM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jlU" = ( +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) +"jlY" = ( +/obj/structure/urinal/directional/north, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"jmc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"jml" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"jmq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"jmr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/starboard/lesser) +"jms" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jmv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison) +"jmJ" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port) +"jmR" = ( +/obj/structure/closet/secure_closet/security/cargo, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"jmT" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jmU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"jmY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Gateway Chamber" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/command/gateway, +/turf/open/floor/iron, +/area/station/command/gateway) +"jnl" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-left" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/turf_decal/tile/blue/half/contrasted{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 1 }, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD "dUo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10687,10 +31593,207 @@ c_tag = "Central Primary Hallway - Starboard - Kitchen" }, /obj/structure/disposalpipe/segment, +======= +"jnt" = ( +/obj/structure/bookcase, +/turf/open/floor/wood, +/area/station/command/bridge) +"jnA" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/easel, +/obj/item/canvas/nineteen_nineteen, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/twentythree_twentythree, +/turf/open/floor/wood, +/area/station/service/library) +"jnI" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Teleporter Room" + }, +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +"jnQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - Central Fore" + }, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +"joj" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"joo" = ( +/obj/effect/landmark/start/station_engineer, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"joq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"jox" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"joP" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/station/commons/lounge) +"jpj" = ( +/obj/item/radio/intercom/directional/north, +/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) +"jpr" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/command_all, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"jpw" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"jpx" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/rnd_all, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"jpA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/space_hut) +"jpG" = ( +/obj/structure/closet/secure_closet/miner, +/obj/machinery/camera/directional/north{ + c_tag = "Mining Dock" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"jpO" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jpU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"jpX" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) +"jqa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jqd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"jql" = ( +/obj/machinery/door/airlock{ + id_tag = "AuxToilet2"; + name = "Unit 2" + }, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) +"jqp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/port) +"jqr" = ( +/obj/machinery/computer/security/mining{ + dir = 4 + }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"jqQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"jrb" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"jrk" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "hopqueue"; + name = "HoP Queue Shutters" + }, +/obj/effect/turf_decal/loading_area, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"jrL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, +<<<<<<< HEAD /area/station/hallway/primary/central) "dYh" = ( /obj/machinery/holopad, @@ -10813,17 +31916,1852 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, +======= +/area/station/commons/locker) +"jrY" = ( +/obj/machinery/door/airlock/external{ + name = "Transport Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"jsh" = ( +/obj/structure/table/glass, +/obj/item/folder/white{ + pixel_y = 2 + }, +/obj/item/screwdriver{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/radio/headset/headset_med, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/firealarm/directional/south, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"jsi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"jsj" = ( +/obj/machinery/shower/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/white/textured, +/area/station/medical/surgery/theatre) +"jso" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"jsq" = ( +/obj/structure/sink/directional/west, +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/structure/light_construct/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"jsr" = ( +/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, +/area/station/service/chapel/funeral) +"jsH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"jsL" = ( +/obj/structure/rack, +/obj/item/extinguisher, +/obj/item/storage/belt/utility, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"jsP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"jtf" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix to Ports" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jtl" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"jtp" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"jtA" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 6 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 4 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 2 + }, +/obj/item/clothing/glasses/hud/health, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/medical/treatment_center) +"jtI" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/lab) +"jtS" = ( +/obj/structure/table/reinforced, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/circuitboard/mecha/ripley/main, +/obj/item/circuitboard/mecha/ripley/peripherals, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"juf" = ( +/obj/machinery/telecomms/bus/preset_two, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"juj" = ( +/obj/structure/closet/secure_closet/brig, +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) +"juC" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "O2 to Airmix" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"juH" = ( +/obj/machinery/firealarm/directional/west{ + pixel_y = -9 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/vending/cytopro, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"juJ" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"juV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"jvf" = ( +/obj/machinery/computer/mech_bay_power_console, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/maintenance/port/aft) +"jvj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jvm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"jvo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"jvr" = ( +/obj/structure/table/glass, +/obj/item/folder/blue, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/glasses/hud/health, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"jvu" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/filingcabinet, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"jvv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"jvB" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"jvL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/engine, +/area/station/science/explab) +"jvO" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/mob/living/simple_animal/bot/secbot/pingsky, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"jvQ" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Petting Zoo" + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron, +/area/station/science/research) +"jvX" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/shower/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"jwj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"jwp" = ( +/obj/structure/table/glass, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/reagent_containers/dropper{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"jws" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"jwv" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/newscaster/directional/south, +/obj/effect/landmark/start/assistant, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/east{ + id = "AuxToilet1"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) +"jwy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Recreation Area" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"jwE" = ( +/obj/structure/cable, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"jwP" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/explab) +"jwW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Corporate Showroom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "showroom" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"jxc" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/treatment_center) +"jxf" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, +/obj/machinery/air_sensor/ordnance_freezer_chamber, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"jxm" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/construction/plumbing, +/obj/item/construction/plumbing, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"jxv" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Captain's Office"; + name = "Captain's Fax Machine" + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"jxH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/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/science/xenobiology) +"jxM" = ( +/obj/item/radio/intercom/directional/west{ + pixel_y = -10 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 6 + }, +/obj/structure/table/reinforced, +/obj/machinery/fax{ + fax_name = "Engineering Lobby"; + name = "Engineering Lobby Fax Machine" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"jxS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison) +"jxV" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + 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/brig) +"jxW" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/station/science/genetics) +"jye" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"jyq" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/obj/machinery/newscaster/directional/east, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/effect/turf_decal/tile/bar, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "eaN" = ( +======= +"jyr" = ( +/obj/effect/landmark/start/depsec/science, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) +"jyt" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"jyF" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"jyH" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/start/security_officer, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) +"jyQ" = ( +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"jzp" = ( +/turf/closed/wall, +/area/station/commons/vacant_room/office) +"jzw" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"jzC" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Animal Pen A" + }, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"jzD" = ( +/obj/machinery/holopad/secure, +/turf/open/floor/iron/dark, +/area/station/security/office) +"jzE" = ( +/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, +/area/station/construction/storage_wing) +"jzN" = ( +/turf/closed/wall/r_wall, +/area/station/command/corporate_showroom) +"jzT" = ( +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"jAd" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jAl" = ( +/obj/machinery/computer/records/security, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"jAm" = ( +/obj/effect/spawner/xmastree, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/service/chapel) +"jAs" = ( +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"jAt" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"jAN" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/office) +"jAO" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"jAP" = ( +/obj/structure/cable, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"jAV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jBk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"jBl" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"jBp" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin{ + name = "Jim Norton's Quebecois Coffee disposal unit" + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"jBu" = ( +/obj/effect/landmark/start/cargo_technician, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/station/cargo/storage) +"jBy" = ( +/obj/machinery/light_switch/directional/south, +/obj/machinery/conveyor_switch/oneway{ + id = "packageSort2"; + name = "Sort and Deliver"; + pixel_x = -2; + pixel_y = 12 + }, +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "packageExternal"; + name = "Crate Returns"; + pixel_x = -5; + pixel_y = -3 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/obj/effect/turf_decal/trimline/white/corner, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"jBC" = ( +/obj/structure/table, +/obj/item/clothing/head/soft/grey{ + pixel_x = -2; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"jBF" = ( +/obj/structure/water_source/puddle, +/obj/structure/flora/bush/large/style_random{ + pixel_y = 0 + }, +/obj/structure/cable, +/turf/open/floor/grass, +/area/station/medical/virology) +"jBO" = ( +/obj/item/dice/d20, +/obj/item/dice, +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/dice, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/light_construct/small/directional/south, +/obj/structure/sign/poster/contraband/random/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"jBU" = ( +/obj/structure/chair/office/tactical{ + dir = 1 + }, +/obj/effect/landmark/start/coroner, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/medical/morgue) +"jBY" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"jCj" = ( +/obj/item/toy/basketball, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jCk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"jCn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/central) +"jCw" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jCx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/tank/plasma{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"jCM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"jCO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"jDf" = ( +/obj/structure/table, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/item/storage/box/bandages{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/storage/medkit/regular, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/syringe, +/turf/open/floor/iron/white, +/area/station/security/medical) +"jDB" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/security/prison/work) +"jEa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"jEc" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jEr" = ( +/obj/machinery/holopad/secure, +/obj/machinery/flasher/directional/west{ + id = "AI"; + pixel_y = -26 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/window/brigdoor/left/directional/west{ + name = "Secondary AI Core Access"; + req_access = list("ai_upload"); + pixel_x = -4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"jEI" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"jER" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"jFr" = ( +/obj/structure/sign/poster/party_game, +/turf/closed/wall, +/area/space/nearstation) +"jFy" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"jFB" = ( +/obj/machinery/iv_drip, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"jFK" = ( +/obj/machinery/washing_machine, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison) +"jFO" = ( +/obj/structure/closet/firecloset, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"jFZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"jGa" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"jGb" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"jGl" = ( +/obj/effect/landmark/secequipment, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/security/office) +"jGo" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"jGr" = ( +/turf/closed/wall/r_wall, +/area/station/tcommsat/server) +"jGt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"jGv" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"jGw" = ( +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"jGA" = ( +/obj/structure/table/wood/poker, +/turf/open/floor/wood, +/area/station/commons/lounge) +"jGG" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/treatment_center) +"jGN" = ( +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/machinery/computer/security/telescreen/minisat/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/ai_monitored/command/storage/satellite) +"jGO" = ( +/obj/machinery/hydroponics/soil, +/obj/item/cultivator, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"jHg" = ( +/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/white, +/area/station/science/research) +"jHm" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"jHw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"jHA" = ( +/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/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"jHB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +"jHQ" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"jHW" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/brown/filled/warning, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"jHX" = ( /obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +"jIg" = ( +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/multitool, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"jIk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/commons/lounge) +"jIl" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/mining{ + name = "Mining Office" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"jIz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"jIR" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/maintenance/space_hut) +"jIV" = ( +/obj/effect/spawner/random/structure/chair_maintenance, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"jIW" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jIY" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/machinery/camera/autoname/directional/west, +/obj/structure/displaycase/trophy, +/turf/open/floor/wood, +/area/station/service/library) +"jJd" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/effect/landmark/start/depsec/medical, +/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/checkpoint/medical) +"jJi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/carpet, +/area/station/service/chapel) +"jJk" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"jJl" = ( +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/servingdish, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"jJm" = ( +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"jJp" = ( +/obj/machinery/button/flasher{ + id = "IsolationFlash"; + pixel_x = -23; + pixel_y = 8 + }, +/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) +"jJC" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/space, +/area/space/nearstation) +"jJR" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/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/siding/purple, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"jJY" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers{ + pixel_y = 7 + }, +/turf/open/floor/iron/dark/textured, +/area/station/medical/chem_storage) +"jKa" = ( +/obj/machinery/door/airlock/research{ + name = "Testing Labs" + }, +/obj/machinery/door/firedoor, +/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/research, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/lab) +"jKc" = ( +/obj/effect/turf_decal/trimline/brown/filled/shrink_cw{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"jKi" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Bar" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/commons/lounge) +"jKq" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Two"; + space_dir = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"jKz" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"jKA" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"jKG" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/yellow/warning, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jKS" = ( +/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/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"jLg" = ( +/obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=14-Starboard-Central"; + location = "13.3-Engineering-Central" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"jLo" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/main) +"jLw" = ( +/obj/structure/marker_beacon/burgundy, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) +"jLy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"jLD" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jLG" = ( +/obj/structure/railing/corner, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"jLQ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/right/directional/north{ + name = "Head of Personnel's Desk"; + req_access = list("hop") + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/south{ + name = "Reception Window" + }, +/obj/machinery/door/poddoor/preopen{ + id = "hop"; + name = "Privacy Shutters" + }, +/obj/structure/cable, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +"jMb" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/light/directional/north, +/obj/structure/statue/gold/qm, +/obj/machinery/status_display/supply{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/brown/diagonal_centre, +/obj/effect/turf_decal/tile/yellow/diagonal_edge, +/obj/effect/turf_decal/siding/yellow{ + dir = 10 + }, +/turf/open/floor/iron/diagonal, +/area/station/cargo/storage) +"jMo" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) +"jMx" = ( +/obj/structure/closet/crate, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/onion, +/obj/item/food/grown/onion, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"jMy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "detective_shutters"; + name = "Detective's Office Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/detectives_office) +"jMJ" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_y = 6 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Prison Sanitarium"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) +"jML" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/space_heater, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"jMY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-left" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"jMZ" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod One"; + space_dir = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"jNl" = ( +/obj/structure/table, +/obj/item/storage/medkit/regular{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/medkit/regular, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"jNo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"jNp" = ( +/obj/machinery/atmospherics/components/trinary/filter{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"jNN" = ( +/obj/item/storage/box/lights/mixed, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"jNP" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Aft Primary Hallway" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"jNR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/cargo_technician, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/station/cargo/storage) +"jNZ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Telecomms - Server Room - Aft-Port"; + network = list("ss13","tcomms") + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"jOb" = ( +/obj/docking_port/stationary/mining_home/common{ + dir = 2 + }, +/turf/open/floor/plating, +/area/station/hallway/primary/port) +"jOv" = ( +/obj/structure/rack, +/obj/item/wrench, +/obj/item/screwdriver, +/obj/machinery/camera/directional/east{ + c_tag = "Vacant Commissary" + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"jOw" = ( +/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/medical/chemistry) +"jOG" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L10" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jON" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"jOR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"jPe" = ( +/obj/structure/table, +/obj/item/airlock_painter, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/main) +"jPf" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway - Engineering" + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"jPm" = ( +/obj/machinery/atmospherics/components/tank/air, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"jPE" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"jPH" = ( +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/checker, +/area/station/engineering/atmos/storage/gas) +"jPJ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/space/basic, +/area/space/nearstation) +"jPU" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=3-Central-Port"; + location = "2.1-Leaving-Storage" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jQa" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jQr" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"jQz" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 + }, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"jQM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Council Chamber" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"jRb" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/trash/food_packaging, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) +"jRc" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"jRg" = ( +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"jRo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/table, +/obj/item/hand_labeler_refill{ + pixel_x = 12; + pixel_y = -3 + }, +/obj/effect/spawner/random/bureaucracy/birthday_wrap{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/stack/package_wrap{ + pixel_x = -6; + pixel_y = 18 + }, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"jRz" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jRD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jRO" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/camera/directional/north{ + c_tag = "Science Research Office"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/trimline/purple/filled/warning, +/turf/open/floor/iron, +/area/station/science/lab) +"jRZ" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/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/engineering/general, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"jSb" = ( +/obj/machinery/light_switch/directional/west, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"jSf" = ( +/obj/structure/chair/stool/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/lounge) +"jSj" = ( +/obj/machinery/door/airlock/research{ + glass = 1; + name = "Slime Euthanization Chamber"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"jSk" = ( +/turf/open/floor/engine, +/area/station/science/explab) +"jSq" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock{ + name = "Garden" + }, +/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/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"jSA" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"jTi" = ( +/obj/machinery/hydroponics/soil, +/obj/machinery/camera/directional/west{ + c_tag = "Prison Forestry"; + network = list("ss13","prison") + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"jTl" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"jTs" = ( +/obj/item/kirbyplants/potty, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"jTy" = ( +/obj/structure/table/wood, +/obj/item/book/granter/action/spell/smoke/lesser{ + name = "mysterious old book of cloud-chasing" + }, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/nullrod{ + pixel_x = 4 + }, +/obj/item/organ/internal/heart, +/obj/item/soulstone/anybody/chaplain, +/turf/open/floor/cult, +/area/station/service/chapel/office) +"jTH" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/pdapainter/security, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) +"jTM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/station/service/theater) +"jTN" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Science Ordnance Storage"; + network = list("ss13","rd") + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"jTR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"jTS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Hypertorus Fusion Reactor Chamber Aft" + }, +/obj/structure/closet/radiation, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"jTZ" = ( +/turf/closed/wall, +/area/station/security/execution/transfer) +"jUb" = ( +/turf/closed/wall, +/area/station/maintenance/port/aft) +"jUh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side, +/area/station/science/lobby) +"jUi" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/airlock_sensor/incinerator_atmos{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"jUj" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Chapel - Funeral Parlour" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{ + pixel_x = 24 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"jUm" = ( +/obj/structure/closet/secure_closet/bar/all_access{ + pixel_x = -3; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"jUq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"jUs" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"jUu" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ +<<<<<<< HEAD dir = 8 }, /turf/open/floor/iron, @@ -15878,9 +38816,385 @@ /area/station/maintenance/starboard/aft) "fQh" = ( /obj/machinery/chem_dispenser/drinks/beer{ +======= dir = 1 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jUx" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"jUA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/office/light, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"jUH" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Fitness Ring" + }, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"jUP" = ( +/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, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"jUT" = ( /obj/structure/table, +/obj/effect/turf_decal/delivery, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +"jUW" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"jVb" = ( +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"jVl" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/teleporter) +"jVv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"jVy" = ( +/obj/machinery/portable_atmospherics/pump/lil_pump, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/button/door/directional/north{ + id = "rdordnance"; + name = "Ordnance Containment Control"; + req_access = list("rd") + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"jVG" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 2; + pixel_y = 2 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"jVZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/west{ + name = "Outer Window" + }, +/obj/machinery/door/window/brigdoor/left/directional/east{ + name = "Security Desk"; + req_access = list("security") + }, +/obj/item/folder/red, +/obj/item/pen, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"jWg" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jWE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"jWR" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/chair/stool{ + name = "Jim Norton's Quebecois Coffee stool" + }, +/turf/open/floor/wood, +/area/station/service/cafeteria) +"jXe" = ( +/obj/structure/lattice, +/obj/item/wirecutters, +/turf/open/space/basic, +/area/space/nearstation) +"jXq" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"jXu" = ( +/turf/closed/wall, +/area/station/maintenance/port/fore) +"jXw" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"jXy" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/service/library) +"jXz" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"jXE" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"jXK" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/science/research, +/turf/open/floor/iron/white, +/area/station/science/lab) +"jXM" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"jXO" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"jXQ" = ( +/obj/structure/closet/secure_closet/medical2, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"jYr" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"jYu" = ( +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) +"jYv" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"jYy" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"jYD" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"jYI" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"jYL" = ( +/obj/machinery/recharger, +/obj/item/restraints/handcuffs, +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"jZz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jZC" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/space, +/area/space/nearstation) +"jZP" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"jZR" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"jZW" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"jZZ" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Bridge - Council Chamber" + }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"kag" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"kat" = ( +/obj/structure/sign/warning/vacuum/external, +/turf/closed/wall, +/area/station/cargo/miningoffice) +"kaC" = ( +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"kaF" = ( +/obj/effect/turf_decal/trimline/purple/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/research) +"kaS" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos) +"kaU" = ( +/obj/structure/closet{ + name = "evidence closet 3" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/item/poster/traitor, +/turf/open/floor/iron/dark, +/area/station/security/evidence) +"kbo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kbz" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"kbB" = ( +/obj/structure/chair/sofa/corp/right, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"kbN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/mousetraps{ + pixel_x = -5; + pixel_y = 14 + }, +/obj/structure/table, +<<<<<<< HEAD /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/light/small/directional/south, /obj/machinery/digital_clock/directional/south, @@ -17490,12 +40804,188 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/junction/yjunction{ dir = 8 +======= +/obj/item/storage/box/mousetraps{ + pixel_x = 12; + pixel_y = 15 + }, +/obj/item/radio/intercom/directional/north, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -1; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/station/service/janitor) +"kbR" = ( +/obj/structure/sign/poster/official/cleanliness/directional/east, +/obj/machinery/door/window/right/directional/north{ + name = "Hydroponics Delivery"; + req_access = list("hydroponics") + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"kbU" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/closet/crate/solarpanel_small, +/turf/open/floor/iron, +/area/station/engineering/main) +"kcg" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"kch" = ( +/obj/structure/table, +/obj/item/clothing/under/suit/black_really, +/obj/machinery/light/small/directional/north, +/obj/item/radio/intercom/directional/north, +/obj/item/clothing/accessory/waistcoat, +/obj/item/clothing/suit/toggle/lawyer/black, +/obj/item/clothing/under/suit/red, +/obj/item/clothing/neck/tie/black, +/obj/item/clothing/under/costume/buttondown/slacks/service, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms) +"kcn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"kcu" = ( +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"kcF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"kcU" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space, +/area/space/nearstation) +"kcV" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Cooling Loop Bypass" + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"kcZ" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/wrench/medical, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Storage"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"kdx" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=8.1-Aft-to-Escape"; + location = "8-Central-to-Aft" + }, +/obj/effect/turf_decal/plaque{ + icon_state = "L9" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kdy" = ( +/obj/structure/frame/computer{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/mechbay) +"kdL" = ( +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"kdN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"kdO" = ( +/obj/machinery/door/airlock/security{ + name = "Court Cell" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"kdX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"ken" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/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/maintenance/port/fore) +"keK" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"keL" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/junction, +/turf/open/floor/iron, +/area/station/security/brig) +"keR" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "guS" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -18835,6 +42325,327 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "gSk" = ( +======= +"keX" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kfp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"kfA" = ( +/obj/effect/landmark/start/head_of_personnel, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"kfC" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"kfL" = ( +/turf/closed/wall/mineral/plastitanium, +/area/station/commons/fitness/recreation) +"kfT" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"kgg" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"kgr" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"kgx" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/morgue) +"kgy" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/office) +"kgz" = ( +/obj/machinery/smartfridge/chemistry/virology/preloaded, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"kgC" = ( +/obj/machinery/door/poddoor/incinerator_ordmix, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"kgV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kgW" = ( +/obj/structure/rack, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/machinery/light_switch/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"kha" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/pdapainter/medbay, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"khm" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/mob/living/simple_animal/bot/secbot/beepsky/officer, +/turf/open/floor/iron, +/area/station/security/brig) +"kho" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Mass Driver"; + req_access = list("chapel_office") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"khu" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/checkpoint/engineering) +"khD" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Crematorium Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"khZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/hallway/primary/central) +"kif" = ( +/obj/item/emptysandbag, +/obj/item/emptysandbag, +/obj/item/emptysandbag, +/obj/item/emptysandbag{ + pixel_x = 8 + }, +/obj/item/emptysandbag{ + pixel_x = -9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"kir" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/mail_sorting/service/library, +/turf/open/floor/plating, +/area/station/maintenance/port) +"kiy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"kiz" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"kiE" = ( +/obj/item/book/manual/nuclear, +/turf/open/floor/plating/foam{ + initial_gas_mix = "TEMP=2.7" + }, +/area/space/nearstation) +"kiH" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/central) +"kiJ" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) +"kiW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"kjG" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/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/siding/purple, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/science/rd_office, +/turf/open/floor/iron/white, +/area/station/science/research) +"kjO" = ( +/obj/structure/table, +/obj/item/restraints/handcuffs/cable/white, +/obj/item/toy/plush/pkplush{ + name = "C.H.E.R.U.B." + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kka" = ( +/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, +/turf/open/floor/carpet, +/area/station/service/theater) +"kkk" = ( +/obj/machinery/computer/cargo{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/button/door/directional/west{ + id = "QMLoaddoor"; + name = "Loading Doors"; + pixel_y = -8; + req_access = list("cargo") + }, +/obj/machinery/button/door/directional/west{ + id = "QMLoaddoor2"; + name = "Loading Doors"; + pixel_y = 8; + req_access = list("cargo") + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kkr" = ( +/obj/structure/plasticflaps/opaque, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + location = "Atmospherics" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) +"kkB" = ( +/obj/machinery/mineral/ore_redemption{ + dir = 4; + input_dir = 8; + output_dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/east{ + name = "Ore Redemption Window" + }, +/obj/machinery/door/window/left/directional/west{ + req_access = list("cargo"); + name = "Cargo Security Window" + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"kkU" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/directional/west{ + c_tag = "Captain's Office - Emergency Escape" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/central) +"kkX" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight, +/obj/item/analyzer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/assembly/signaler, +/obj/item/stack/rods{ + amount = 25 + }, +/obj/item/stack/cable_coil, +/obj/item/gps, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/gps, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"klf" = ( +/obj/item/folder, +/obj/item/folder, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/table/wood, +/obj/item/taperecorder, +/obj/item/tape, +/turf/open/floor/wood, +/area/station/service/library) +"klj" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/light/small/directional/north, /obj/structure/table, /obj/item/reagent_containers/cup/bottle/epinephrine{ @@ -18861,6 +42672,367 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ +<<<<<<< HEAD +======= + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"klp" = ( +/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, +/turf/open/floor/iron, +/area/station/security/brig) +"kls" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"klt" = ( +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"klu" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"klw" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"klI" = ( +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/turf/open/floor/carpet, +/area/station/command/bridge) +"klK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"klL" = ( +/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/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"klS" = ( +/obj/machinery/griddle, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"klT" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"klZ" = ( +/obj/machinery/status_display/evac, +/turf/closed/wall, +/area/station/commons/lounge) +"kmN" = ( +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kmW" = ( +/obj/machinery/door/poddoor/massdriver_trash, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"kmZ" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/command/gateway) +"knd" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/comfy/black, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/service/library) +"knf" = ( +/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/freezer, +/area/station/commons/toilet/restrooms) +"knj" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "E.V.A. Storage" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/command/eva, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"knt" = ( +/obj/machinery/mech_bay_recharge_port, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"knI" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"knK" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"knQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"knY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/lab) +"knZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"koa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"koc" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/directional/east{ + c_tag = "Prison Workshop"; + network = list("ss13","prison") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison/work) +"kop" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kor" = ( +/turf/closed/wall, +/area/station/maintenance/department/science/central) +"kou" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"koW" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=10.2-Aft-Port-Corner"; + location = "10.1-Central-from-Aft" + }, +/obj/effect/turf_decal/plaque{ + icon_state = "L5" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kpi" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/status_display/ai/directional/west, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"kpB" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kpI" = ( +/obj/structure/table, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -8 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -8 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/warning/vacuum/external/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kpV" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"kqh" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/landmark/start/bitrunner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half, +/area/station/cargo/bitrunning/den) +"kqm" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + 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/medical/medbay/lobby) +"kqM" = ( +/obj/effect/turf_decal/stripes/corner, +/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, +/area/station/security/mechbay) +"kqZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/random/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"krc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"kre" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/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/prison) +"krt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, +/obj/item/storage/toolbox/fishing, +/obj/item/storage/toolbox/fishing, +/obj/item/fishing_rod, +/obj/item/fishing_rod, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"krL" = ( +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"krN" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/item/assembly/timer{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/assembly/timer{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/assembly/timer{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/assembly/timer, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"ksg" = ( +/obj/effect/turf_decal/stripes/line{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 1 }, /turf/open/floor/iron/white, @@ -18875,6 +43047,7 @@ /area/station/engineering/atmospherics_engine) "gSz" = ( /obj/structure/cable, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/red/filled/warning, @@ -33959,6 +58132,4278 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, +======= +/turf/open/floor/iron, +/area/station/security/range) +"ksk" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/storage/tools) +"kso" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"ksM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ksT" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"ktl" = ( +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"ktw" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/space/basic, +/area/space/nearstation) +"ktz" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"ktD" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"ktG" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"ktK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"ktW" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"kud" = ( +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"kui" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"kuD" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) +"kuK" = ( +/obj/machinery/power/tracker, +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/station/solars/port/fore) +"kuS" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/brown/anticorner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kuW" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"kvd" = ( +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"kvr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"kvv" = ( +/obj/structure/chair, +/turf/open/floor/iron/grimy, +/area/station/security/interrogation) +"kvK" = ( +/obj/machinery/meter, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kvN" = ( +/obj/structure/closet/crate/coffin, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/plating, +/area/station/service/chapel/funeral) +"kvO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"kvV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kwb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"kwh" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kwp" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "gateshutter"; + name = "Gateway Access Shutter" + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"kww" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"kwy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/science/research) +"kwC" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Brig - Hallway - Starboard" + }, +/turf/open/floor/iron, +/area/station/security/brig) +"kwF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"kwQ" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kwX" = ( +/obj/structure/table/wood, +/obj/item/storage/crayons, +/turf/open/floor/wood, +/area/station/service/library) +"kwZ" = ( +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"kxa" = ( +/obj/machinery/chem_master, +/obj/structure/noticeboard/directional/south, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"kxw" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_10k, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"kxz" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"kxA" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/office) +"kxC" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/pen, +/obj/machinery/button/door/directional/east{ + id = "Engineering"; + name = "Engineering Lockdown"; + pixel_y = 16; + req_access = list("engineering") + }, +/obj/machinery/button/door/directional/east{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_y = 24; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/security/telescreen/engine/directional/east, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"kxH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"kxW" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kyc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"kyh" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"kym" = ( +/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/aft) +"kys" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"kyu" = ( +/obj/structure/lattice/catwalk, +/obj/item/toy/figure/cargotech, +/turf/open/space/basic, +/area/space/nearstation) +"kyQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"kyR" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"kyX" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"kyZ" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/sign/departments/aisat/directional/south, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"kzg" = ( +/obj/machinery/ntnet_relay, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) +"kzj" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"kzD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security{ + name = "Brig" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/security/court, +/obj/effect/mapping_helpers/airlock/access/any/security/general, +/turf/open/floor/iron, +/area/station/security/courtroom) +"kzG" = ( +/turf/open/floor/iron/recharge_floor, +/area/station/maintenance/port/aft) +"kzI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"kzQ" = ( +/obj/effect/turf_decal/siding/purple, +/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/science/research) +"kzZ" = ( +/obj/structure/bed/dogbed, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"kAc" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"kAp" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Disposals Chute" + }, +/obj/machinery/disposal/delivery_chute{ + dir = 8; + name = "disposals chute"; + pixel_x = 5 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +"kAF" = ( +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"kAI" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kAT" = ( +/obj/effect/landmark/start/head_of_security, +/obj/structure/chair/comfy/black, +/turf/open/floor/iron/dark, +/area/station/security/office) +"kBg" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/table, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = -13; + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"kBh" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"kBl" = ( +/obj/machinery/airalarm/directional/north, +/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/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"kBm" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"kBu" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/item/storage/box/bodybags{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/item/storage/box/disks{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/clothing/gloves/latex{ + pixel_x = 4; + pixel_y = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"kBQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"kBS" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kBT" = ( +/obj/machinery/door/poddoor/shutters{ + id = "teleshutter"; + name = "Teleporter Access Shutter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/command/teleporter) +"kCq" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/modular_computer/preset/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"kCt" = ( +/obj/machinery/status_display/door_timer{ + id = "Cell 2"; + name = "Cell 2"; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"kCC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"kCD" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"kCN" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kCZ" = ( +/turf/closed/wall, +/area/station/service/hydroponics) +"kDa" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Main Hallway - South"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"kDk" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Permabrig Visitation" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/station/security/brig) +"kDp" = ( +/obj/machinery/light/directional/north, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"kDG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/central) +"kDS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port) +"kDY" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Secure Tech Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"kEe" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kEm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"kEp" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"kEs" = ( +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"kFa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/cargo_technician, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"kFg" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"kFp" = ( +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kFC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rdrnd"; + name = "Research and Development Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/lab) +"kFK" = ( +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"kFM" = ( +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/service/library) +"kFS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"kFT" = ( +/obj/item/kirbyplants/organic/plant13, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"kGc" = ( +/obj/machinery/computer/rdconsole, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"kGq" = ( +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kGs" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"kGv" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"kGJ" = ( +/obj/machinery/door/window/right/directional/east{ + name = "Research Delivery"; + req_access = list("science") + }, +/obj/machinery/light_switch/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/science/lab) +"kGR" = ( +/obj/machinery/button/ignition{ + id = "Xenobio"; + pixel_x = -4; + pixel_y = -3 + }, +/obj/machinery/button/door/directional/north{ + id = "Xenolab"; + name = "Test Chamber Blast Doors"; + pixel_x = 6; + pixel_y = -2; + req_access = list("xenobiology") + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/computer/security/telescreen/test_chamber/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"kHg" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/central) +"kHk" = ( +/obj/machinery/vending/wardrobe/viro_wardrobe, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"kHn" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Command Hallway - Central" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"kHt" = ( +/obj/machinery/camera{ + c_tag = "Xenobiology Lab - Pen #2"; + dir = 9; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"kHN" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/engine, +/area/station/science/explab) +"kHO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kHV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall, +/area/station/maintenance/port/fore) +"kIG" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port) +"kIJ" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kIR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kIY" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"kJi" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"kJx" = ( +/obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/service/library) +"kJO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kKd" = ( +/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/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"kKh" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/sign/poster/official/help_others/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"kKk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering Supermatter Port"; + network = list("ss13","engine") + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"kKp" = ( +/obj/structure/rack, +/obj/item/gun/energy/laser/carbine/practice{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/gun/energy/laser/practice{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/gun/energy/laser/practice{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/range) +"kKq" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/stripes/line, +/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/dark, +/area/station/engineering/atmos) +"kKv" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent, +/turf/open/space/basic, +/area/space/nearstation) +"kKw" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/station/commons/locker) +"kKF" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/white, +/area/station/security/prison) +"kKO" = ( +/obj/structure/fake_stairs/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +"kKT" = ( +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper, +/obj/structure/table, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"kKZ" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/mess) +"kLg" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"kLh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kLi" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"kLp" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Inner Pipe Access"; + req_access = list("atmospherics") + }, +/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/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"kMd" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/obj/effect/spawner/random/structure/closet_empty, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"kMk" = ( +/obj/item/book/manual/wiki/chemistry{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/grenades, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/clothing/glasses/science, +/obj/item/clothing/glasses/science, +/obj/item/book/manual/wiki/plumbing{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/reagent_containers/dropper, +/obj/structure/table, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/sign/poster/official/periodic_table/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"kMl" = ( +/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/purple, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kMr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"kMF" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kMG" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/hydroponics) +"kMX" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms) +"kNx" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Air to Ports" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kNA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"kNO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"kNV" = ( +/obj/machinery/door/airlock/engineering{ + name = "Port Quarter Solar Access" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"kOf" = ( +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"kOh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Medbay Security Post" + }, +/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/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"kOB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, +/obj/effect/mapping_helpers/mail_sorting/service/law_office, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"kOK" = ( +/turf/open/floor/plating, +/area/station/hallway/primary/port) +"kON" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kOQ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"kOY" = ( +/obj/machinery/disposal/bin, +/obj/machinery/light_switch/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Recreation Area - Aft" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"kPw" = ( +/obj/structure/table, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/item/geiger_counter{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/radio/off{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"kPy" = ( +/obj/structure/table, +/obj/item/surgical_drapes, +/obj/item/cautery, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"kPQ" = ( +/obj/machinery/door/airlock/external{ + name = "Space Shack" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kPU" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"kPZ" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"kQe" = ( +/turf/closed/wall, +/area/station/science/genetics) +"kQm" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/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/prison) +"kQq" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kQv" = ( +/obj/machinery/light/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +"kQO" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/mob/living/basic/sloth/citrus, +/turf/open/floor/iron, +/area/station/cargo/storage) +"kQP" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/qm) +"kQT" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"kQX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Crew Quarters Access" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/locker) +"kRe" = ( +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"kRf" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/yellow/filled/end, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 10 + }, +/obj/structure/rack, +/obj/item/storage/box{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"kRi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"kRk" = ( +/obj/machinery/announcement_system, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"kRA" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"kRF" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "ordnancebridge" + }, +/obj/machinery/button/door{ + id = "ordnancebridge"; + pixel_y = 24; + req_one_access = list("maint_tunnels","science") + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"kRV" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"kSo" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/security/holding_cell) +"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 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"kSB" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank/large, +/turf/open/floor/iron, +/area/station/engineering/main) +"kSD" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Aft Primary Hallway - Aft" + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/primary/aft) +"kSE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kSN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +"kSP" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/structure/sign/departments/botany/directional/east, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kST" = ( +/obj/machinery/shieldgen, +/turf/open/floor/plating, +/area/station/engineering/main) +"kTn" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/locker) +"kTO" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/hand_labeler, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"kTZ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"kUb" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"kUm" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"kUG" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"kUJ" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"kUQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"kUT" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/service/hydroponics/garden) +"kUZ" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/library) +"kVg" = ( +/obj/machinery/computer/pandemic, +/obj/structure/cable, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"kVq" = ( +/obj/structure/sign/warning/secure_area/directional/east, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"kVs" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kVN" = ( +/turf/open/floor/carpet, +/area/station/service/chapel) +"kVR" = ( +/obj/effect/spawner/random/engineering/vending_restock, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"kVU" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"kWc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"kWd" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"kWg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron, +/area/station/command/gateway) +"kWn" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +"kWE" = ( +/obj/machinery/smartfridge/organ, +/obj/effect/turf_decal/tile/dark_blue/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) +"kWL" = ( +/obj/structure/sign/directions/command{ + dir = 4; + pixel_y = -8 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/turf/closed/wall, +/area/station/hallway/secondary/command) +"kWO" = ( +/obj/structure/sign/directions/medical{ + pixel_y = -7 + }, +/turf/closed/wall, +/area/station/medical/pharmacy) +"kWP" = ( +/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/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"kWU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/station/medical/virology) +"kWV" = ( +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-left" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"kWZ" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +"kXa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/urinal/directional/west, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) +"kXp" = ( +/obj/machinery/camera/autoname{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/landmark/start/depsec/engineering, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"kXt" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"kXx" = ( +/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/starboard/fore) +"kXA" = ( +/obj/machinery/space_heater, +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"kXD" = ( +/obj/structure/bed/medical/emergency, +/obj/item/radio/intercom/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay Foyer"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"kXG" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"kXU" = ( +/obj/structure/closet/crate/necropolis{ + desc = "Presumably placed here by top men."; + name = "\improper Ark of the Covenant" + }, +/obj/item/toy/clockwork_watch{ + desc = "An ancient piece of machinery, made from an unknown metal by an unknown maker."; + name = "\improper Ancient Relic" + }, +/mob/living/basic/pet/dog/corgi{ + desc = "Make sure you give him plenty of bellyrubs, or he'll melt your skin off."; + name = "\improper Keeper of the Ark" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kXY" = ( +/obj/effect/turf_decal/trimline/purple/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"kYd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"kYg" = ( +/turf/closed/wall, +/area/station/security/office) +"kYn" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"kYo" = ( +/obj/machinery/power/turbine/turbine_outlet{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"kYv" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"kYD" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"kYG" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/room) +"kYH" = ( +/obj/machinery/light/directional/east, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"kYP" = ( +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"kYU" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/ordnance/office) +"kZk" = ( +/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/maintenance/aft/lesser) +"kZn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) +"kZq" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"kZx" = ( +/turf/closed/wall, +/area/station/science/lab) +"kZF" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) +"kZG" = ( +/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/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/office) +"kZI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/structure/crate, +/obj/effect/turf_decal/bot_white, +/obj/structure/closet/crate, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"laa" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"laf" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"lah" = ( +/obj/structure/rack, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lak" = ( +/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/cargo/sorting) +"lav" = ( +/obj/structure/girder, +/obj/effect/spawner/random/structure/grille, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lay" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"laE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) +"laI" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"laK" = ( +/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/hallway/primary/central) +"laL" = ( +/obj/machinery/door/airlock{ + name = "Maintenance Bathroom" + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"laT" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/obj/machinery/door/airlock{ + name = "Kitchen Cold Room" + }, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen/coldroom) +"lbh" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison/visit) +"lbH" = ( +/mob/living/basic/chicken{ + name = "Featherbottom"; + real_name = "Featherbottom" + }, +/obj/structure/flora/bush/fullgrass, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"lbL" = ( +/obj/effect/decal/cleanable/insectguts, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"lbX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/window/spawner/directional/west, +/obj/structure/sign/poster/random/directional/north, +/obj/effect/spawner/random/structure/musician/piano/random_piano, +/turf/open/floor/wood/large, +/area/station/service/theater) +"lcG" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"lcJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/port) +"ldc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"ldg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/siding/wideplating_new/corner, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"lds" = ( +/obj/structure/table, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"ldJ" = ( +/obj/machinery/light/directional/north, +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ldK" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"ldO" = ( +/obj/effect/landmark/blobstart, +/obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ldP" = ( +/turf/closed/wall/r_wall, +/area/station/ai_monitored/command/storage/satellite) +"ldQ" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"lek" = ( +/obj/machinery/power/smes, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"lew" = ( +/obj/machinery/power/smes/full, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"leP" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"lfc" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"lfk" = ( +/obj/effect/turf_decal/trimline/yellow/filled/end{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) +"lfm" = ( +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) +"lfu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"lfG" = ( +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"lge" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/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/command/gateway) +"lgg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"lgj" = ( +/obj/structure/bed/medical{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) +"lgl" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"lgw" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay Main Hallway - CMO"; + network = list("ss13","medbay") + }, +/obj/structure/noticeboard/cmo{ + dir = 4; + pixel_x = 32 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"lgC" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"lgL" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"lgS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"lgT" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/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/medical/medbay/central) +"lhk" = ( +/obj/structure/table, +/obj/item/storage/medkit/brute, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"lhD" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"lhF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/prison) +"lhT" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"lia" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"lih" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/theater) +"liz" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering{ + name = "Engine Room" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/engineering/main) +"liC" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"liD" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"liL" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"liO" = ( +/obj/structure/cable, +/obj/machinery/bluespace_vendor/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/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/commons/fitness/recreation) +"liU" = ( +/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/structure/railing{ + dir = 9 + }, +/obj/machinery/disposal/bin/tagger, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"liX" = ( +/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, +/area/station/cargo/lobby) +"lje" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ljf" = ( +/obj/structure/table, +/obj/item/wirecutters, +/obj/item/screwdriver{ + pixel_x = -2; + pixel_y = 10 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/syndicatebomb/training, +/turf/open/floor/iron, +/area/station/security/office) +"ljm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"ljq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"ljD" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"ljF" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"ljH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution{ + dir = 8 + }, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"ljL" = ( +/obj/structure/chair/comfy/black, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/bridge) +"lkc" = ( +/obj/machinery/barsign, +/turf/closed/wall, +/area/station/commons/lounge) +"lku" = ( +/obj/structure/cable, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"lkW" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"llk" = ( +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "aftport"; + name = "Aft-Port Solar Array" + }, +/turf/open/floor/iron/solarpanel/airless, +/area/station/solars/port/aft) +"lln" = ( +/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 = 6 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"lls" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"llC" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/glass/reinforced, +/area/station/science/research) +"llU" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"lma" = ( +/obj/structure/chair/stool/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"lmk" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +"lmn" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"lmx" = ( +/obj/machinery/light_switch/directional/west, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/food/grown/poppy{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/food/grown/poppy{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/flashlight/flare/candle{ + pixel_x = 12; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"lmF" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"lmL" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Abandoned Warehouse" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"lmT" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) +"lnc" = ( +/turf/closed/wall, +/area/station/commons/dorms) +"lnu" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/toy/figure/scientist, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/lab) +"lnH" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/primary/fore) +"lnM" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/item/reagent_containers/cup/bottle/ammonia, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"lnP" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"lnR" = ( +/obj/structure/table, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"lnT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/main) +"lnX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"loh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"loA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"loR" = ( +/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/construction/storage_wing) +"loW" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"loY" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/obj/effect/spawner/random/armory/dragnet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"lpo" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"lpp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"lpt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"lpA" = ( +/obj/machinery/air_sensor/nitrogen_tank, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"lpD" = ( +/obj/machinery/biogenerator, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lpN" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "viro-passthrough" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/medical/medbay/central) +"lpR" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/item/computer_disk/ordnance, +/obj/item/computer_disk/ordnance, +/obj/item/computer_disk/ordnance, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"lpS" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lqh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"lqL" = ( +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/obj/machinery/computer/rdconsole, +/turf/open/floor/iron/dark, +/area/station/science/lab) +"lqQ" = ( +/turf/closed/wall, +/area/station/service/hydroponics/garden) +"lqT" = ( +/obj/structure/table, +/obj/item/razor{ + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"lqW" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"lrh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/security/prison) +"lro" = ( +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"lrp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"lrK" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"lrL" = ( +/obj/item/taperecorder, +/obj/item/camera, +/obj/structure/table/wood, +/obj/item/radio/intercom/directional/south, +/obj/structure/sign/painting/library_private{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/engine/cult, +/area/station/service/library) +"lrR" = ( +/obj/machinery/light/directional/south, +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"lrZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chem_lockdown"; + name = "Chemistry Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"lsf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/service/hop_office, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"lsJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/station/medical/medbay/central) +"lsP" = ( +/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) +"lsU" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/table, +/obj/item/stack/package_wrap{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/effect/spawner/random/bureaucracy/birthday_wrap{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/dest_tagger{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/stack/wrapping_paper{ + pixel_x = -4; + pixel_y = -7 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"lsV" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/west, +/obj/machinery/dna_scannernew, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"lta" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/meter, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"ltb" = ( +/obj/machinery/vending/security, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"ltg" = ( +/obj/structure/chair/stool/directional/north, +/obj/machinery/camera/directional/west{ + c_tag = "Solar Maintenance - Fore Starboard" + }, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"ltm" = ( +/obj/machinery/atmospherics/components/tank/oxygen{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"ltv" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"ltW" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/paper, +/obj/machinery/door/window/left/directional/south{ + name = "Hydroponics Window"; + req_access = list("hydroponics") + }, +/obj/effect/turf_decal/delivery, +/obj/item/pen, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "hydro_service"; + name = "Service Shutter" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"ltX" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"lug" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"lup" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/flasher/directional/south{ + id = "AI"; + pixel_x = 26 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"lus" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"luF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"luN" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/closet/secure_closet/security/med, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"luV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/window/right/directional/west{ + name = "Shooting Range" + }, +/turf/open/floor/iron, +/area/station/security/range) +"lvh" = ( +/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/trimline/red/filled/warning, +/obj/effect/turf_decal/caution/stand_clear/red, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"lvs" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres, +/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/east{ + 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) +"lvU" = ( +/obj/machinery/door/airlock{ + id_tag = "Toilet4"; + name = "Unit 4" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"lvY" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/vending/boozeomat/all_access, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"lvZ" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office" + }, +/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/dark, +/area/station/security/office) +"lwg" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/gateway) +"lwm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"lwt" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law{ + pixel_y = 3 + }, +/obj/item/radio/intercom/command/directional/north, +/obj/item/paper/fluff/jobs/engineering/frequencies, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"lwx" = ( +/obj/structure/flora/bush/sunny/style_random, +/obj/machinery/camera/directional/north{ + c_tag = "Virology Test Subject Chamber"; + network = list("ss13","medbay") + }, +/turf/open/floor/grass, +/area/station/medical/virology) +"lxf" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/button/door/directional/west{ + id = "Cabin5"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) +"lxm" = ( +/obj/machinery/atmospherics/components/trinary/mixer/airmix{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lxp" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"lxt" = ( +/obj/item/cigbutt, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lxv" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Technical Storage - Secure" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"lxM" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port) +"lyu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison) +"lyx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/bed/medical/emergency, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"lyF" = ( +/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, +/turf/open/floor/iron, +/area/station/security/office) +"lyL" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"lyN" = ( +/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/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"lzJ" = ( +/obj/structure/cable, +/turf/open/floor/iron/solarpanel/airless, +/area/station/solars/port/aft) +"lzL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"lzM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"lzU" = ( +/obj/structure/table/glass, +/obj/machinery/light/small/directional/south, +/obj/item/folder/white{ + pixel_y = 4 + }, +/obj/item/pen/red, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"lAa" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/caution, +/turf/open/floor/plating, +/area/station/cargo/storage) +"lAe" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/command/heads_quarters/rd) +"lAh" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"lAi" = ( +/obj/machinery/disposal/delivery_chute{ + dir = 1; + name = "Security Deliveries" + }, +/obj/structure/plasticflaps{ + name = "Security Deliveries" + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/sign/departments/security/directional/south{ + color = "#DE3A3A" + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"lAu" = ( +/turf/open/space/basic, +/area/space/nearstation) +"lAH" = ( +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Research Director Observation"; + req_access = list("rd") + }, +/turf/open/floor/engine, +/area/station/command/heads_quarters/rd) +"lAM" = ( +/turf/closed/wall/r_wall, +/area/station/security/brig) +"lAY" = ( +/obj/structure/closet{ + name = "evidence closet 5" + }, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/evidence) +"lBg" = ( +/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/locked, +/obj/machinery/door/airlock/vault{ + name = "Vault" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/all/supply/vault, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"lBm" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"lBA" = ( +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"lBN" = ( +/obj/machinery/computer/security/telescreen/tcomms/directional/east, +/obj/machinery/computer/telecomms/monitor{ + dir = 8; + network = "tcommsat" + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"lCb" = ( +/obj/structure/cable, +/obj/structure/sign/poster/ripped/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"lCG" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"lCN" = ( +/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/starboard/fore) +"lDe" = ( +/obj/machinery/door/poddoor/shutters/window{ + id = "armory"; + name = "Armory Shutters" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"lDj" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/closet/l3closet, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"lDo" = ( +/obj/item/radio/off, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/central) +"lDA" = ( +/obj/structure/closet/wardrobe/black, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"lDP" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"lEr" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"lEu" = ( +/obj/effect/spawner/random/engineering/tank, +/turf/open/floor/plating, +/area/station/maintenance/port) +"lEF" = ( +/obj/structure/frame/machine, +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"lEH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"lEP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"lFo" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/vending/cigarette, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"lFq" = ( +/obj/structure/sign/warning/biohazard, +/turf/closed/wall/r_wall, +/area/station/science/cytology) +"lFs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"lFF" = ( +/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/port/fore) +"lFZ" = ( +/obj/structure/chair/pew/right, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) +"lGj" = ( +/obj/machinery/vending/wardrobe/det_wardrobe, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"lGL" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"lGR" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lGS" = ( +/obj/docking_port/stationary/public_mining_dock, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) +"lGT" = ( +/obj/structure/sign/departments/science/directional/east{ + name = "\improper ROBOTICS!" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"lHe" = ( +/obj/machinery/reagentgrinder{ + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"lHh" = ( +/obj/structure/cable, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"lHk" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port) +"lHx" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"lHK" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/carpet, +/area/station/service/chapel) +"lIa" = ( +/obj/structure/table/wood, +/obj/item/folder, +/obj/item/folder, +/obj/item/pen, +/turf/open/floor/wood, +/area/station/service/library) +"lIc" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"lIB" = ( +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/entertainment/lighter, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"lIX" = ( +/obj/structure/chair/comfy/brown, +/turf/open/floor/engine/cult, +/area/station/service/library) +"lJh" = ( +/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/engineering/gravity_generator) +"lJj" = ( +/obj/structure/showcase/cyborg/old{ + pixel_y = 20 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"lJm" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/newscaster/directional/south, +/obj/effect/landmark/start/assistant, +/obj/effect/landmark/start/hangover, +/obj/effect/spawner/random/trash/graffiti{ + pixel_x = -32; + spawn_loot_chance = 50 + }, +/obj/machinery/button/door/directional/west{ + id = "Toilet3"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"lJn" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"lJr" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"lKu" = ( +/obj/effect/landmark/carpspawn, +/turf/open/space/basic, +/area/space) +"lKA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"lKN" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"lKZ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"lLk" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"lLq" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"lLu" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"lLw" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Shower" + }, +/obj/machinery/shower/directional/south, +/obj/structure/curtain, +/turf/open/floor/iron/freezer, +/area/station/commons/fitness/recreation) +"lLB" = ( +/obj/structure/table/glass, +/obj/item/wrench, +/obj/item/crowbar, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"lLC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"lLF" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Central Primary Hallway - Port" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"lLG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"lLR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"lMh" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/trimline/neutral/end, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/service/chapel/office) +"lMq" = ( +/turf/open/misc/asteroid/basalt/airless, +/area/space/nearstation) +"lMC" = ( +/obj/machinery/computer/atmos_control/oxygen_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lMI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Departure Lounge" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"lMJ" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"lMW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lMY" = ( +/obj/machinery/shower/directional/east, +/obj/machinery/light/small/directional/south, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) +"lNb" = ( +/obj/structure/closet, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lNf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"lNh" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Prison Sanitarium" + }, +/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, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"lNF" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/landmark/event_spawn, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"lNH" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"lNO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"lNP" = ( +/obj/effect/turf_decal/box/white{ + color = "#9FED58" + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"lNW" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/security/office) +"lNX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/office) +"lNY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lOg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"lOl" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix Outlet Pump" + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lOr" = ( +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"lOA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - External Airlock" + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"lOK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lOU" = ( +/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/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"lOZ" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"lPa" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"lPc" = ( +/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/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"lPi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"lPl" = ( +/obj/machinery/light/directional/west, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/office) +"lPn" = ( +/obj/machinery/light/small/dim/directional/north, +/obj/structure/rack, +/obj/item/pushbroom, +/obj/effect/decal/cleanable/dirt, +/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"lPt" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Jetpack Storage"; + pixel_x = -1; + req_access = list("eva") + }, +/obj/structure/rack, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"lPy" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/spawner/random/structure/crate, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"lPz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"lPB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/spawner/random/structure/twelve_percent_spirit_board, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"lPC" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"lPJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/security/prison) +"lPS" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Doors"; + pixel_y = 4; + req_access = list("xenobiology") + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 10; + pixel_y = -1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"lPZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "council blast"; + name = "Council Blast Doors" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/bridge) +"lQf" = ( +/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/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"lQm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"lQp" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/security/prison/visit) +"lQC" = ( +/obj/structure/closet/l3closet/security, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/security/brig) +"lQI" = ( +/obj/effect/spawner/random/trash/caution_sign, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"lQW" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"lRA" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"lRS" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"lRT" = ( +/obj/structure/sign/directions/evac, +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/central) +"lSw" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/cytology) +"lSy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"lSz" = ( +/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/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"lTi" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/directional/south{ + c_tag = "Xenobiology Lab - Central North"; + network = list("ss13","rd","xeno") + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"lTj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/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) +"lTq" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/command/bridge) +"lTA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"lTB" = ( +/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/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"lTE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"lTM" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"lTR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side, +/area/station/medical/treatment_center) +"lUj" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/firealarm/directional/south, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"lUp" = ( +/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/spawner/random/trash/mess, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/starboard/lesser) +"lUx" = ( +/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/bot_white, +/turf/open/floor/iron, +/area/station/cargo/storage) +"lUz" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"lUD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/spawner/random/structure/chair_flipped, +/turf/open/floor/iron/checker, +/area/station/maintenance/aft/lesser) +"lUK" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Dormitories - Aft" + }, +/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/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"lUS" = ( +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"lUY" = ( +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) +"lVe" = ( +/obj/machinery/mass_driver/trash{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"lVl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"lVp" = ( +/turf/closed/wall, +/area/station/cargo/lobby) +"lVB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"lVH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "commissaryshutter"; + name = "Vacant Commissary Shutter" + }, +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"lVM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"lWa" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"lWd" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"lWg" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/clothing/glasses/sunglasses/big, +/obj/item/stamp/law, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"lWm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"lWq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"lWG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"lWL" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"lWM" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Lab - Pen #6"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"lWN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/vacuum/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"lXl" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"lXm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/vacuum/external, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"lXr" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"lXu" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"lXA" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"lXG" = ( +/obj/machinery/door/airlock/external/glass{ + name = "Supply Door Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/storage) +"lXL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/meter, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"lXN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"lXS" = ( +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"lYc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) +"lYk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/science/ordnance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"lYx" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"lYG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"lYH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/starboard/lesser) "lYL" = ( /obj/effect/turf_decal/tile/blue{ @@ -33986,6 +62431,15 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD +======= +"lZM" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lZV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34140,6 +62594,23 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/security/mechbay) +<<<<<<< HEAD +======= +"mcF" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Doors"; + pixel_y = 4; + req_access = list("xenobiology"); + sync_doors = 4 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mcP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -34185,6 +62656,7 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +<<<<<<< HEAD "mdv" = ( /obj/effect/landmark/blobstart, /obj/effect/turf_decal/stripes/line{ @@ -34193,6 +62665,8 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mdy" = ( /obj/effect/landmark/blobstart, /obj/structure/cable, @@ -34208,11 +62682,14 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +<<<<<<< HEAD "mdW" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mei" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, @@ -34286,6 +62763,18 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD +======= +"mgo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/gambling, +/obj/effect/spawner/random/entertainment/gambling, +/obj/effect/spawner/random/entertainment/gambling, +/turf/open/floor/wood, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mgv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34327,6 +62816,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) +<<<<<<< HEAD "mhu" = ( /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/east, @@ -34335,6 +62825,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mhA" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -34352,6 +62844,25 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD +======= +"mhM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/window/right/directional/south{ + name = "Cargo Desk"; + req_access = list("shipping") + }, +/obj/item/newspaper{ + pixel_x = -5 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mhR" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -34370,6 +62881,13 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/engine) +<<<<<<< HEAD +======= +"mie" = ( +/obj/structure/flora/bush/flowers_yw, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mig" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -34405,6 +62923,7 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD "miq" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 4 @@ -34418,6 +62937,8 @@ /obj/machinery/button/ignition/incinerator/atmos, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mix" = ( /obj/structure/frame/machine, /obj/item/circuitboard/machine/chem_master, @@ -34452,6 +62973,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) +<<<<<<< HEAD "miY" = ( /obj/structure/table, /obj/item/papercutter{ @@ -34468,6 +62990,8 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mjd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34518,6 +63042,7 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "mkB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -34526,6 +63051,8 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mkO" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34536,6 +63063,7 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/textured, /area/station/medical/chem_storage) +<<<<<<< HEAD "mkU" = ( /obj/machinery/atmospherics/components/binary/pump/on, /obj/machinery/light/small/directional/east, @@ -34544,6 +63072,8 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mlu" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -34570,6 +63100,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"mlH" = ( +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mlK" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/red{ @@ -34577,18 +63114,29 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD "mlY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mma" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/service/janitor) +<<<<<<< HEAD +======= +"mml" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mmm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34597,6 +63145,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD "mmt" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/turf_decal/bot_white, @@ -34613,6 +63162,8 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mmA" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/camera/directional/south{ @@ -34655,12 +63206,15 @@ }, /turf/open/floor/iron/checker, /area/station/science/research) +<<<<<<< HEAD "mmN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/poster/contraband/random/directional/east, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mmR" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -34762,6 +63316,23 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +<<<<<<< HEAD +======= +"mnP" = ( +/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/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mnU" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34769,6 +63340,7 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/security/brig) +<<<<<<< HEAD "mor" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34781,6 +63353,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mos" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -34861,6 +63435,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/chapel, /area/station/service/chapel) +<<<<<<< HEAD +======= +"mqn" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/button/door/directional/west{ + id = "Disposal Exit"; + name = "Disposal Vent Control"; + req_access = list("maint_tunnels") + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mqu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, @@ -34892,10 +63481,13 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +<<<<<<< HEAD "mrj" = ( /obj/item/toy/beach_ball/branded, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mru" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -34911,6 +63503,15 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD +======= +"mrG" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/lighter, +/turf/open/floor/carpet, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mrJ" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -34931,6 +63532,7 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD "mrU" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/effect/turf_decal/stripes/line{ @@ -34951,6 +63553,8 @@ /obj/effect/mapping_helpers/mail_sorting/supply/disposals, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "msd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -34960,11 +63564,14 @@ /obj/structure/altar_of_gods, /turf/open/floor/iron/dark, /area/station/service/chapel) +<<<<<<< HEAD "msn" = ( /obj/structure/lattice/catwalk, /obj/item/toy/figure/cargotech, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "msu" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -34984,11 +63591,27 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) +<<<<<<< HEAD +======= +"msJ" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red, +/obj/structure/cable, +/obj/machinery/requests_console/directional/south{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "msN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +<<<<<<< HEAD "msQ" = ( /obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/junction{ @@ -34996,11 +63619,22 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "msR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"msT" = ( +/obj/structure/table, +/obj/item/food/mint, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mta" = ( /obj/machinery/camera/directional/north{ c_tag = "Starboard Primary Hallway - tech_storage" @@ -35016,6 +63650,19 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD +======= +"mtb" = ( +/obj/structure/table/wood, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/folder/blue, +/obj/item/clothing/head/collectable/hop{ + name = "novelty HoP hat" + }, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mtj" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/siding/white, @@ -35050,6 +63697,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/commons/dorms) +<<<<<<< HEAD "mtV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35058,6 +63706,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mtZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35085,6 +63735,19 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +<<<<<<< HEAD +======= +"mun" = ( +/obj/structure/showcase/machinery/tv{ + dir = 1; + pixel_x = 2; + pixel_y = 3 + }, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mup" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room" @@ -35096,6 +63759,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"muq" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mur" = ( /obj/machinery/light/directional/north, /obj/machinery/status_display/evac/directional/north, @@ -35129,6 +63801,20 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD +======= +"muZ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Departure Lounge - Port Fore" + }, +/obj/item/kirbyplants/organic/plant24, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mvg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35137,6 +63823,7 @@ }, /turf/open/floor/carpet, /area/station/service/library) +<<<<<<< HEAD "mvm" = ( /obj/structure/table, /obj/item/stack/package_wrap, @@ -35149,11 +63836,14 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/dark, /area/station/command/teleporter) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mvo" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "mvr" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/plasteel{ @@ -35177,6 +63867,8 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/wood, /area/station/service/theater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mvN" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -35196,6 +63888,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/office) +<<<<<<< HEAD "mwi" = ( /obj/machinery/door/airlock/maintenance{ name = "Disposal Access" @@ -35216,6 +63909,43 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +"mvZ" = ( +/obj/machinery/light/directional/south, +/obj/structure/rack, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ + pixel_x = -2; + pixel_y = -3 + }, +/obj/item/wrench, +/obj/item/multitool, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/incident_display/bridge/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"mwj" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/west, +/obj/machinery/requests_console/directional/north{ + department = "Head of Security's Desk"; + name = "Head of Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/button/door/directional/north{ + id = "hosspace"; + name = "Space Shutters Control"; + pixel_x = -24 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mwm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -35223,6 +63953,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +<<<<<<< HEAD +======= +"mwo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mww" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35231,6 +63972,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"mwP" = ( +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mwY" = ( /obj/effect/spawner/random/trash/garbage, /obj/effect/landmark/generic_maintenance_landmark, @@ -35245,6 +63997,7 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) +<<<<<<< HEAD "mxk" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -35259,6 +64012,8 @@ /obj/item/paper/pamphlet/gateway, /turf/open/floor/iron, /area/station/command/gateway) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mxn" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) @@ -35279,6 +64034,16 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"mxx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mxI" = ( /obj/structure/disposalpipe/junction/flip, /obj/structure/cable, @@ -35321,6 +64086,19 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) +<<<<<<< HEAD +======= +"myG" = ( +/obj/structure/sign/directions/evac, +/obj/structure/sign/directions/medical{ + pixel_y = 8 + }, +/obj/structure/sign/directions/science{ + pixel_y = -8 + }, +/turf/closed/wall, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "myH" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -35328,11 +64106,14 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/prison) +<<<<<<< HEAD "myS" = ( /obj/structure/sign/warning/vacuum/external/directional/north, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "myY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35345,12 +64126,15 @@ /obj/machinery/vending/autodrobe/all_access, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD "mzc" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/entertainment/lighter, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mzg" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/red, @@ -35358,6 +64142,39 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) +<<<<<<< HEAD +======= +"mzj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"mzm" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/book/manual/chef_recipes, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mzu" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35387,12 +64204,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/visit) +<<<<<<< HEAD "mzY" = ( /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/cargo/warehouse) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mAb" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, @@ -35584,6 +64404,7 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "mDi" = ( /obj/structure/lattice/catwalk, /obj/item/reagent_containers/cup/glass/bottle/rum{ @@ -35603,6 +64424,8 @@ }, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mDu" = ( /obj/structure/cable, /obj/effect/landmark/start/hangover, @@ -35621,6 +64444,22 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"mDC" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Doors"; + pixel_y = 4; + req_access = list("xenobiology") + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mDL" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/delivery, @@ -35672,6 +64511,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +<<<<<<< HEAD "mEI" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/cake_ingredients, @@ -35684,6 +64524,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mEL" = ( /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, @@ -35752,6 +64594,7 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/engineering/main) +<<<<<<< HEAD "mFq" = ( /obj/machinery/camera/directional/east{ c_tag = "Theater - Stage" @@ -35765,6 +64608,8 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/wood/large, /area/station/service/theater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mFr" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating/airless, @@ -35880,6 +64725,7 @@ /obj/machinery/vending/modularpc, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD "mHH" = ( /obj/structure/table, /obj/item/multitool{ @@ -35904,6 +64750,8 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mHK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35967,6 +64815,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "mJf" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -35975,6 +64824,8 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mJk" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -36053,6 +64904,7 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "mKh" = ( /obj/structure/sign/poster/contraband/random/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36072,6 +64924,8 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mKu" = ( /obj/machinery/light_switch/directional/west, /obj/structure/cable, @@ -36100,6 +64954,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"mLp" = ( +/obj/effect/landmark/start/quartermaster, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/diagonal_centre, +/obj/effect/turf_decal/tile/yellow/diagonal_edge, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/open/floor/iron/diagonal, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mLu" = ( /obj/machinery/camera/directional/south{ c_tag = "Science Hallway - RD Office"; @@ -36215,6 +65084,7 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +<<<<<<< HEAD "mMI" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36227,6 +65097,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mMK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -36265,6 +65137,7 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/station/commons/storage/tools) +<<<<<<< HEAD "mNw" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -36279,6 +65152,8 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mNO" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/light_construct/directional/west, @@ -36302,12 +65177,15 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD "mOX" = ( /obj/structure/table, /obj/item/food/mint, /obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mPh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36373,6 +65251,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/range) +<<<<<<< HEAD "mPX" = ( /obj/machinery/chem_dispenser, /obj/machinery/button/door/directional/north{ @@ -36384,6 +65263,20 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +"mQa" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Port Primary Hallway - Middle" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mQe" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -36533,6 +65426,33 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"mSI" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; + icon_state = "control_stun"; + name = "AI Upload Turret Control"; + pixel_y = 28 + }, +/obj/item/radio/intercom/directional/north{ + broadcasting = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = -26 + }, +/obj/effect/landmark/start/cyborg, +/obj/machinery/light/small/directional/west, +/obj/machinery/computer/security/telescreen/aiupload/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mSM" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -36640,6 +65560,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +<<<<<<< HEAD "mUM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/effect/decal/cleanable/dirt, @@ -36654,10 +65575,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mUQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +<<<<<<< HEAD "mVo" = ( /obj/item/cultivator, /obj/item/crowbar, @@ -36669,6 +65593,26 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +"mVf" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 7; + pixel_y = 12 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mVp" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/effect/mapping_helpers/broken_floor, @@ -36714,6 +65658,7 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/bar/backroom) +<<<<<<< HEAD "mWe" = ( /obj/structure/cable, /obj/machinery/netpod, @@ -36721,6 +65666,14 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/catwalk_floor/iron_dark, /area/station/cargo/bitrunning/den) +======= +"mWd" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mWA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36756,6 +65709,7 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/medical/storage) +<<<<<<< HEAD "mWD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36766,6 +65720,8 @@ /obj/structure/fake_stairs/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mWU" = ( /turf/open/floor/iron, /area/station/maintenance/space_hut) @@ -36777,6 +65733,23 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD +======= +"mWY" = ( +/obj/item/bodypart/chest/robot{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/bodypart/head/robot{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mWZ" = ( /obj/item/folder/red, /obj/item/pen, @@ -36838,6 +65811,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "mXK" = ( /obj/item/food/grown/wheat, /obj/item/food/grown/watermelon, @@ -36853,6 +65827,21 @@ "mYa" = ( /turf/open/floor/iron/dark/textured_large, /area/station/science/cytology) +======= +"mXO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "qmroom" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/qm) +"mYb" = ( +/obj/structure/chair, +/obj/machinery/computer/security/telescreen/interrogation/directional/west, +/turf/open/floor/iron/grimy, +/area/station/security/interrogation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mYq" = ( /obj/effect/turf_decal/plaque{ icon_state = "L8" @@ -36914,6 +65903,41 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +<<<<<<< HEAD +======= +"mZc" = ( +/obj/structure/table/wood, +/obj/item/clothing/head/costume/sombrero/green, +/obj/structure/sign/poster/random/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood/large, +/area/station/service/theater) +"mZz" = ( +/obj/machinery/light/directional/west, +/obj/structure/table, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mZC" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -36988,6 +66012,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/central) +<<<<<<< HEAD "naI" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -36998,6 +66023,8 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "naN" = ( /obj/machinery/button/door/directional/west{ id = "transitlockdown"; @@ -37014,6 +66041,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +<<<<<<< HEAD +======= +"nbd" = ( +/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/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nbJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37021,6 +66057,7 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/service/hydroponics) +<<<<<<< HEAD "nbM" = ( /obj/machinery/conveyor/inverted{ dir = 10; @@ -37032,6 +66069,8 @@ /obj/structure/railing, /turf/open/floor/plating, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nbS" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -37101,6 +66140,7 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD "nco" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37110,6 +66150,8 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ncq" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37190,6 +66232,7 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "ndv" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/button/door/directional/west{ @@ -37202,6 +66245,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ndI" = ( /obj/item/kirbyplants/organic/plant20, /obj/effect/turf_decal/stripes/line{ @@ -37287,6 +66332,7 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) +<<<<<<< HEAD "nfC" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -37300,6 +66346,8 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nfK" = ( /obj/structure/toilet{ pixel_y = 8 @@ -37355,12 +66403,15 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/prison) +<<<<<<< HEAD "nhe" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nhh" = ( /obj/structure/table/wood, /obj/item/gavelblock, @@ -37370,6 +66421,7 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +<<<<<<< HEAD "nhP" = ( /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) @@ -37385,6 +66437,32 @@ /obj/item/circuitboard/mecha/ripley/peripherals, /turf/open/floor/iron, /area/station/science/robotics/lab) +======= +"nhr" = ( +/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) +"nhP" = ( +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai_upload) +"nhS" = ( +/obj/machinery/vending/cigarette, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/plating, +/area/station/commons/toilet/auxiliary) +"nhU" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/porta_turret/ai, +/obj/machinery/computer/security/telescreen/research/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nib" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -37452,6 +66530,7 @@ }, /turf/open/floor/circuit/green, /area/station/science/robotics/mechbay) +<<<<<<< HEAD "njh" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/trimline/brown/line, @@ -37467,6 +66546,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_half, /area/station/cargo/bitrunning/den) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "njr" = ( /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/spawner/random/engineering/tank, @@ -37564,6 +66645,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/security/office) +<<<<<<< HEAD "nlK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37577,6 +66659,8 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nlP" = ( /obj/structure/table, /obj/item/stock_parts/subspace/treatment, @@ -37584,11 +66668,14 @@ /obj/item/stock_parts/subspace/treatment, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) +<<<<<<< HEAD "nlS" = ( /obj/structure/table/wood/poker, /obj/item/storage/dice, /turf/open/floor/wood, /area/station/commons/lounge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nlT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37600,6 +66687,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD "nlY" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -37608,6 +66696,8 @@ /obj/structure/closet/crate, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nmf" = ( /obj/machinery/smartfridge, /obj/machinery/door/poddoor/shutters/preopen{ @@ -37634,6 +66724,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/wood, /area/station/command/corporate_showroom) +<<<<<<< HEAD "nms" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37641,10 +66732,26 @@ /obj/machinery/photocopier, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nmF" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"nmI" = ( +/obj/machinery/light/directional/south, +/obj/structure/rack, +/obj/item/clothing/under/color/blue, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/neck/tie/blue, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nmN" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -37691,6 +66798,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD +======= +"nnh" = ( +/obj/machinery/light_switch/directional/south, +/obj/structure/table/wood, +/obj/item/razor{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/cigarette/cigar, +/obj/item/reagent_containers/cup/glass/flask/gold, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nnl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/disposalpipe/segment{ @@ -37708,6 +66829,24 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +<<<<<<< HEAD +======= +"nnq" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/table, +/obj/machinery/firealarm/directional/north, +/obj/item/stack/sheet/iron/five, +/obj/item/radio/intercom/directional/east{ + pixel_y = 8 + }, +/obj/item/stack/cable_coil/five, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nnt" = ( /obj/effect/turf_decal/bot, /obj/structure/cable, @@ -37719,6 +66858,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "nnL" = ( /obj/machinery/light_switch/directional/south, /obj/machinery/conveyor_switch/oneway{ @@ -37742,6 +66882,8 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nnR" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -37832,6 +66974,7 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) +<<<<<<< HEAD "noX" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -37860,6 +67003,8 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "npv" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -37872,6 +67017,7 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +<<<<<<< HEAD "npy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37883,6 +67029,8 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "npY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -37920,6 +67068,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +<<<<<<< HEAD "nqC" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -37927,6 +67076,8 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/cargo/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nqD" = ( /obj/structure/closet{ name = "evidence closet 2" @@ -37999,6 +67150,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"nrB" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/railing{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"nrM" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/cafeteria) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nrV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/iron/dark, @@ -38033,6 +67204,7 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD "nsg" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/computer/records/security{ @@ -38055,6 +67227,13 @@ /obj/item/clothing/head/utility/welding, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +======= +"nsh" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nsk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38125,6 +67304,19 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +<<<<<<< HEAD +======= +"nsT" = ( +/obj/effect/mapping_helpers/broken_floor, +/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/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nsZ" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -38168,6 +67360,7 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/storage) +<<<<<<< HEAD "ntA" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -38189,6 +67382,49 @@ /obj/machinery/door/airlock/security/glass{ name = "Brig Control" }, +======= +"ntm" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Disposal Access" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"ntA" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ntM" = ( +/obj/machinery/power/solar_control{ + id = "foreport"; + name = "Port Bow Solar Control" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"ntP" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control" + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/cable, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -38241,6 +67477,7 @@ /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 +<<<<<<< HEAD }, /turf/open/floor/iron/white, /area/station/medical/office) @@ -38271,6 +67508,22 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +======= + }, +/turf/open/floor/iron/white, +/area/station/medical/office) +"nut" = ( +/obj/structure/cable, +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/storage) +"nuB" = ( +/obj/structure/secure_safe/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "nuI" = ( @@ -38328,6 +67581,16 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"nwa" = ( +/obj/structure/closet/wardrobe/pjs, +/obj/effect/landmark/start/hangover/closet, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/dorms) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nwl" = ( /obj/machinery/door/window/right/directional/north{ name = "Medical Deliveries"; @@ -38339,6 +67602,20 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/medical/storage) +<<<<<<< HEAD +======= +"nwm" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/effect/landmark/start/quartermaster, +/obj/item/binoculars, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nwq" = ( /obj/structure/table, /obj/machinery/firealarm/directional/south, @@ -38347,6 +67624,7 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD "nwx" = ( /obj/item/storage/box/matches{ pixel_x = -2; @@ -38371,6 +67649,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nwC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -38381,8 +67661,4133 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, /turf/closed/wall, /area/station/engineering/atmos/pumproom) +<<<<<<< HEAD "nwT" = ( /obj/structure/disposalpipe/sorting/mail/flip{ +======= +"nwL" = ( +/obj/machinery/computer/upload/ai, +/obj/machinery/door/window/right/directional/south{ + name = "Upload Console Window"; + req_access = list("ai_upload") + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"nwT" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/mail_sorting/service/chapel, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"nwU" = ( +/obj/structure/cable, +/obj/machinery/bluespace_vendor/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"nwV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/grunge{ + name = "Courtroom" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"nxi" = ( +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "garbage"; + name = "disposal conveyor" + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"nxu" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"nxy" = ( +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"nxz" = ( +/obj/structure/bookcase/random/reference, +/turf/open/floor/wood, +/area/station/service/library) +"nxA" = ( +/obj/effect/landmark/navigate_destination/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/reagent_containers/cup/rag, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"nxF" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"nxG" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"nxH" = ( +/obj/machinery/door/airlock{ + name = "Bar" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/bar/backroom) +"nxO" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"nxU" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) +"nyb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"nyf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/work) +"nyy" = ( +/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, +/area/station/science/robotics/mechbay) +"nyF" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals - Aft Arm" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"nyV" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"nyX" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"nyZ" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L7" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"nzo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nzz" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/clothing/costume, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nzD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"nzN" = ( +/obj/effect/landmark/navigate_destination, +/turf/closed/wall/r_wall, +/area/station/engineering/storage/tech) +"nzP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nzQ" = ( +/obj/structure/bed/medical/anchored{ + dir = 8 + }, +/obj/item/bedsheet/medical{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"nzS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"nAb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nAC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"nAG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"nAN" = ( +/obj/machinery/door/airlock/grunge{ + name = "Cell 4" + }, +/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/safe) +"nAW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"nBa" = ( +/obj/structure/cable, +/turf/open/floor/iron/solarpanel/airless, +/area/station/solars/starboard/aft) +"nBf" = ( +/obj/item/wrench, +/obj/item/stack/sheet/glass{ + amount = 30 + }, +/obj/item/stack/sheet/iron{ + amount = 30 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/structure/closet, +/obj/item/vending_refill/cigarette, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/wood, +/area/station/service/bar/backroom) +"nBj" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/explab) +"nBp" = ( +/obj/structure/sink/directional/east, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nBs" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"nBu" = ( +/obj/effect/turf_decal/arrows/white{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"nBy" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nBB" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay Clinic" + }, +/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/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"nBF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"nCa" = ( +/obj/machinery/meter/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/door/window/left/directional/east{ + name = "Ordnance Freezer Chamber Access"; + req_access = list("ordnance") + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"nCc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/surgery/aft) +"nCr" = ( +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"nCu" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"nCw" = ( +/obj/machinery/door/airlock/external{ + name = "Space Shack" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nCB" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/requests_console/directional/east{ + department = "Captain's Desk"; + name = "Captain's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"nCG" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Science Ordnance Test Lab"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"nCI" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/security/prison) +"nCL" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nCQ" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"nDk" = ( +/obj/structure/table, +/obj/item/storage/fancy/cigarettes{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/folder/red{ + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) +"nDr" = ( +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"nDw" = ( +/obj/machinery/atmospherics/components/tank, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"nDG" = ( +/obj/item/radio/intercom/directional/south, +/turf/closed/wall, +/area/station/cargo/lobby) +"nDO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"nDP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"nDT" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nDW" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"nEb" = ( +/obj/structure/table, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/glasses/science, +/obj/item/clothing/glasses/science, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"nEe" = ( +/obj/structure/cable, +/obj/machinery/light_switch/directional/south, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"nEB" = ( +/obj/structure/sign/poster/random/directional/east, +/obj/machinery/requests_console/directional/south{ + department = "Kitchen"; + name = "Kitchen Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"nEC" = ( +/turf/open/floor/carpet, +/area/station/command/bridge) +"nEF" = ( +/obj/structure/bed/medical/anchored{ + dir = 4 + }, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/item/electropack, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"nET" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"nEZ" = ( +/obj/machinery/plate_press, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/security/prison/work) +"nFa" = ( +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nFe" = ( +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"nFn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/locker) +"nFL" = ( +/obj/machinery/camera/directional/north{ + c_tag = "MiniSat Exterior - Fore"; + network = list("minisat") + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"nGd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/central) +"nGo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"nGp" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/dice, +/turf/open/floor/iron, +/area/station/commons/locker) +"nGq" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nGr" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"nGz" = ( +/obj/structure/rack, +/obj/item/radio/off{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/radio/off{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/office) +"nGA" = ( +/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/yellow{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"nGE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/random/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"nGK" = ( +/obj/structure/chair/stool/directional/east, +/turf/open/floor/wood, +/area/station/commons/lounge) +"nHB" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"nHG" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple/corner, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"nIj" = ( +/obj/structure/easel, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"nIP" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/pai_card, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"nIR" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"nJn" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"nJo" = ( +/obj/machinery/smartfridge/organ, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "main_surgery" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) +"nJr" = ( +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) +"nJu" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"nJA" = ( +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/airlock_controller/incinerator_ordmix{ + pixel_x = -24 + }, +/obj/machinery/button/ignition/incinerator/ordmix{ + pixel_x = 24; + pixel_y = -6 + }, +/obj/machinery/button/door/incinerator_vent_ordmix{ + pixel_x = 24; + pixel_y = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"nJG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"nJH" = ( +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"nJJ" = ( +/obj/structure/disposalpipe/segment, +/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/neutral{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"nJL" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/components/tank/air, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nJM" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) +"nJW" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/corner, +/turf/open/floor/iron, +/area/station/security/brig) +"nKr" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 15; + name = "arrivals"; + roundstart_template = /datum/map_template/shuttle/arrival/box; + shuttle_id = "arrival_stationary"; + width = 7 + }, +/turf/open/space/basic, +/area/space) +"nKu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_y = 48; + pixel_x = 9 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"nKE" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"nKG" = ( +/obj/item/kirbyplants/organic/plant5, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"nKI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"nKM" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"nKO" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/newscaster/directional/east, +/obj/effect/landmark/start/assistant, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/south{ + id = "Toilet4"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/trash/graffiti{ + pixel_y = -32; + spawn_loot_chance = 50 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"nLq" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"nLx" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"nLz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"nLG" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"nLZ" = ( +/obj/item/toy/beach_ball/branded, +/turf/open/space/basic, +/area/space/nearstation) +"nMf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"nMj" = ( +/obj/structure/window/fulltile, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/maintenance/starboard/aft) +"nMz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/machinery/button/door/directional/west{ + id = "commissaryshutter"; + name = "Commissary Shutter Control" + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"nMK" = ( +/obj/machinery/biogenerator, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"nMP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nMV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/security/range) +"nMY" = ( +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"nNe" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/floor/grass, +/area/station/science/research) +"nNo" = ( +/obj/machinery/biogenerator, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"nNw" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"nNB" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"nNH" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/commons/vacant_room/office) +"nNJ" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"nNL" = ( +/turf/closed/mineral/volcanic, +/area/space/nearstation) +"nNW" = ( +/obj/structure/disposaloutlet{ + dir = 4; + name = "Cargo Deliveries" + }, +/obj/effect/turf_decal/siding/purple, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"nNY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"nOi" = ( +/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/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"nOj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"nOp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"nOq" = ( +/obj/machinery/holopad/secure, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"nOv" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/office) +"nOw" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"nOK" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/research) +"nOU" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom{ + broadcasting = 1; + dir = 8; + listening = 0; + name = "Station Intercom (Court)" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"nOZ" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"nPf" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"nPt" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port) +"nPu" = ( +/obj/structure/bookcase/random/fiction, +/turf/open/floor/wood, +/area/station/service/library) +"nPJ" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"nPK" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/garden) +"nPN" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"nQz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/janitor_supplies, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"nQA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"nQC" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Firing Range" + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = -12 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/range) +"nQQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/no_nightlight/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) +"nQR" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageSort2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/door/window/right/directional/east{ + name = "Crate Security Door"; + req_access = list("shipping") + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"nQX" = ( +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"nRp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) +"nRr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"nRz" = ( +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/stack/sheet/glass/fifty, +/obj/structure/closet/crate/engineering/electrical, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"nRI" = ( +/obj/structure/filingcabinet{ + pixel_x = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"nRQ" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/security/telescreen/ordnance/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"nRU" = ( +/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/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"nRZ" = ( +/turf/closed/wall/r_wall, +/area/station/security/medical) +"nSe" = ( +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"nSn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"nSs" = ( +/obj/structure/showcase/cyborg/old{ + pixel_y = 20 + }, +/obj/item/radio/intercom/directional/north{ + broadcasting = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"nSB" = ( +/obj/item/toy/figure/roboticist, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"nTd" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/item/seeds/cannabis, +/obj/item/seeds/cannabis, +/obj/item/seeds/cannabis, +/obj/item/food/grown/mushroom/glowshroom, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"nTk" = ( +/obj/structure/flora/bush/jungle/c/style_random, +/obj/machinery/light/small/directional/east, +/turf/open/floor/grass, +/area/station/medical/virology) +"nTn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nTA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"nTH" = ( +/obj/structure/cable, +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line, +/turf/open/floor/iron, +/area/station/security/warden) +"nUp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"nUF" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"nVq" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nVx" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/machinery/newscaster/directional/north, +/obj/effect/spawner/random/bureaucracy/pen, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"nVy" = ( +/obj/effect/landmark/start/lawyer, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"nVG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"nVJ" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/chem_pack{ + pixel_x = 10; + pixel_y = 10 + }, +/obj/item/storage/box/rxglasses{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/stack/medical/gauze{ + pixel_x = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/medical/treatment_center) +"nVL" = ( +/obj/structure/grille/broken, +/obj/item/bouquet/poppy, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"nWk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison/visit) +"nWl" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"nWu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/office) +"nWy" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"nWS" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space, +/area/space/nearstation) +"nXm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"nXG" = ( +/obj/machinery/newscaster/directional/north, +/obj/machinery/computer/slot_machine{ + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/lounge) +"nXK" = ( +/obj/docking_port/stationary/random{ + dir = 4; + name = "lavaland"; + shuttle_id = "pod_4_lavaland" + }, +/turf/open/space/basic, +/area/space) +"nXM" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"nYa" = ( +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" + }, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, +/turf/open/floor/iron/white, +/area/station/science/ordnance) +"nYl" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/machinery/ore_silo, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"nYy" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"nYJ" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"nYL" = ( +/obj/machinery/door/airlock/hatch{ + name = "Xenobiology Maintenance" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"nYO" = ( +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/pestspray{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/structure/table, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/random/food_or_drink/seed{ + spawn_all_loot = 1; + spawn_random_offset = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"nYU" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"nZf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) +"nZh" = ( +/obj/machinery/vending/assist, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"nZk" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/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) +"nZm" = ( +/turf/closed/wall, +/area/station/medical/morgue) +"nZn" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"nZq" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/service/library) +"nZt" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"nZz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/wood, +/area/station/commons/lounge) +"nZC" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/vending/wardrobe/robo_wardrobe, +/obj/machinery/button/door/directional/north{ + id = "roboticsprivacy"; + name = "Robotics Privacy Control"; + pixel_x = -24; + req_access = list("robotics") + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"nZH" = ( +/obj/machinery/bookbinder, +/turf/open/floor/wood, +/area/station/service/library) +"nZL" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +"oac" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"oae" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"oah" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"oaj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"oao" = ( +/obj/machinery/button/door/directional/east{ + id = "abandoned_kitchen"; + name = "Shutters Control" + }, +/obj/item/book/manual/wiki/cooking_to_serve_man{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -11; + pixel_y = 14 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = -10; + pixel_y = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oap" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/anesthetic{ + pixel_x = 3 + }, +/obj/item/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -3 + }, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"oar" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/effect/landmark/start/chemist, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"oaw" = ( +/obj/structure/table/reinforced, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"oaB" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/status_display/evac/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/research) +"obk" = ( +/obj/item/target/alien, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"obl" = ( +/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 + }, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/iron/white, +/area/station/security/medical) +"obw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/station/commons/dorms) +"obF" = ( +/obj/machinery/computer/exoscanner_control{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay - Drone Launch Room"; + pixel_x = 14 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"obG" = ( +/turf/closed/wall, +/area/station/service/theater) +"obN" = ( +/obj/effect/turf_decal/trimline/purple/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/research) +"obQ" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/taperecorder{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"ocg" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"ocl" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/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/office) +"ocB" = ( +/obj/structure/table/wood, +/obj/machinery/microwave{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +"ocC" = ( +/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/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"ocG" = ( +/obj/structure/disposaloutlet{ + dir = 8; + name = "Prisoner Delivery" + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) +"ocN" = ( +/obj/structure/rack, +/obj/item/book/manual/wiki/infections{ + pixel_y = 7 + }, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"ocP" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"ocQ" = ( +/obj/machinery/chem_heater/withbuffer, +/obj/machinery/light/small/directional/south, +/obj/machinery/button/door/directional/south{ + id = "pharmacy_shutters_2"; + name = "pharmacy shutters control"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"ocS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"odh" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/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/door/firedoor, +/turf/open/floor/iron/white, +/area/station/security/prison) +"odp" = ( +/obj/structure/bookcase/random, +/turf/open/floor/plating/airless, +/area/station/engineering/atmos) +"odu" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Cryogenics Bay" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/office) +"odI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Hydroponics Backroom" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"oet" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"oew" = ( +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"oeR" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"ofe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/item/cigbutt{ + pixel_y = 7 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"ofk" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"ofQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ofS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Secure Gear Storage" + }, +/obj/effect/turf_decal/delivery, +/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/security/armory, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"ogb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/carpet, +/area/station/service/theater) +"ogk" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light_switch/directional/south, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"ogL" = ( +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/soap{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/captain/private) +"oha" = ( +/obj/structure/rack, +/obj/item/storage/briefcase{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/storage/briefcase/secure{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/taperecorder, +/obj/item/clothing/glasses/sunglasses, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"ohm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"oho" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"ohD" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/machinery/door/window/right/directional/west{ + name = "Containment Pen #6"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"ohE" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/central) +"ohH" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"ohI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/science/server) +"ohW" = ( +/obj/structure/rack, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/gas, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/starboard/lesser) +"ohZ" = ( +/obj/machinery/suit_storage_unit/rd, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Research Director's Office"; + network = list("ss13","rd") + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) +"oic" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/skub{ + name = "medicinal skub" + }, +/obj/item/toy/cattoy, +/turf/open/floor/plating, +/area/station/medical/abandoned) +"oip" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"oir" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"oiI" = ( +/obj/machinery/air_sensor/nitrous_tank, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"oiQ" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"ojo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/station/science/research) +"ojt" = ( +/obj/item/plant_analyzer, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"ojv" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - Toxins" + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"ojz" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Space Bridge Access" + }, +/obj/machinery/button/door/directional/north{ + id = "supplybridge"; + name = "Shuttle Bay Space Bridge Control" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ojW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/arrows/red{ + dir = 1 + }, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"okj" = ( +/obj/structure/cable, +/obj/machinery/camera/motion/directional/south{ + c_tag = "Vault"; + network = list("vault") + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"okP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/security/hos_office, +/turf/open/floor/wood, +/area/station/security/office) +"okQ" = ( +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"okV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"okX" = ( +/obj/structure/window/spawner/directional/west, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/service/theater) +"ola" = ( +/turf/closed/wall, +/area/station/science/robotics/mechbay) +"oli" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/space_hut) +"oll" = ( +/obj/effect/spawner/random/engineering/tank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oln" = ( +/obj/machinery/telecomms/server/presets/medical, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"olq" = ( +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"olw" = ( +/turf/closed/wall, +/area/station/security/courtroom) +"olD" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) +"olG" = ( +/obj/item/kirbyplants/random, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light/small/directional/east, +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/red, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) +"olN" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 13; + name = "port bay 2"; + shuttle_id = "ferry_home"; + width = 5 + }, +/turf/open/space/basic, +/area/space) +"olP" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/plating, +/area/station/hallway/secondary/service) +"omd" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"ome" = ( +/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/ai_monitored/turret_protected/ai_upload) +"omm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"omA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) +"omF" = ( +/obj/machinery/teleport/station, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +"omV" = ( +/obj/effect/spawner/random/structure/grille, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"onf" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"onv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"onD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table/glass, +/obj/item/storage/box/petridish{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/storage/box/petridish{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/machinery/requests_console/directional/east{ + department = "Xenobiology"; + name = "Xenobiology Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/machinery/button/door/directional/south{ + id = "XenoPens"; + name = "Xenobiology Shutters"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"onI" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"onN" = ( +/obj/structure/table/wood, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/spawner/random/bureaucracy/paper, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"oog" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"ool" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oor" = ( +/turf/closed/wall, +/area/station/security/checkpoint/supply) +"oos" = ( +/obj/machinery/door/airlock{ + id_tag = "Toilet1"; + name = "Unit 1" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"ooz" = ( +/obj/structure/closet/emcloset, +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Lab - Airlock"; + network = list("ss13","rd","xeno") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"ooG" = ( +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/station/security/office) +"ooP" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"ooT" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ope" = ( +/turf/closed/wall, +/area/station/security/mechbay) +"oph" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/effect/landmark/start/mime, +/turf/open/floor/carpet, +/area/station/service/theater) +"opF" = ( +/obj/machinery/hydroponics/soil, +/obj/item/cultivator, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"opG" = ( +/obj/structure/cable, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"opZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ + dir = 1 + }, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"oqc" = ( +/obj/effect/spawner/random/structure/table, +/turf/open/floor/iron/checker, +/area/station/maintenance/aft/lesser) +"oqe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"oqi" = ( +/obj/effect/landmark/start/paramedic, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"oqk" = ( +/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/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"oqK" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oqT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"orp" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/commons/locker) +"orv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/department/science/central) +"orx" = ( +/obj/structure/cable, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"orT" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"orU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"osc" = ( +/obj/structure/cable, +/obj/effect/spawner/random/decoration/showcase, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"ose" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"osw" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/security/brig) +"osz" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space, +/area/space/nearstation) +"osH" = ( +/obj/structure/secure_safe/hos{ + pixel_x = 36; + pixel_y = 28 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"ota" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposaloutlet{ + dir = 4; + name = "Cargo Deliveries" + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/effect/turf_decal/siding/yellow, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"ote" = ( +/obj/structure/table, +/obj/item/computer_disk{ + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/computer_disk{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/obj/machinery/airalarm/directional/west, +/obj/item/computer_disk/ordnance{ + pixel_x = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"otj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"otn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/meter, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"otu" = ( +/turf/closed/wall, +/area/station/service/chapel) +"otB" = ( +/obj/machinery/button/door/directional/east{ + id = "rdrnd"; + name = "Primary Research Shutters Control"; + pixel_y = 6; + req_access = list("science") + }, +/obj/machinery/button/door/directional/east{ + id = "rndlab2"; + name = "Secondary Research Shutters Control"; + pixel_y = -6; + req_access = list("science") + }, +/obj/machinery/modular_computer/preset/cargochat/science{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/lab) +"otG" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) +"otI" = ( +/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/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"otM" = ( +/obj/structure/closet/crate, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/security/prison/work) +"otQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ouj" = ( +/obj/structure/bed/medical/emergency, +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/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, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) +"ouk" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/holopad, +/turf/open/floor/carpet, +/area/station/service/theater) +"oul" = ( +/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/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"out" = ( +/obj/structure/lattice, +/obj/item/reagent_containers/cup/glass/bottle/goldschlager, +/turf/open/space/basic, +/area/space/nearstation) +"ouu" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo Bay - Fore" + }, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ouM" = ( +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/turf/open/floor/wood, +/area/station/service/library) +"ouR" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"ouX" = ( +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +"ouY" = ( +/obj/structure/table, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/stack/rods/fifty, +/obj/effect/spawner/random/trash/janitor_supplies, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/mining_weather_monitor/directional/east, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"ouZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/research) +"ove" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"ovf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/storage/gas) +"ovK" = ( +/obj/structure/closet/secure_closet/hop, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"ovX" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"owf" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Staff Entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/office) +"owi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"owp" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"owv" = ( +/obj/machinery/computer/atmos_alert, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"oww" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/chair/office/light, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"owM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"owU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"owZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oxd" = ( +/obj/machinery/holopad, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"oxf" = ( +/obj/structure/table, +/obj/structure/sign/departments/medbay/directional/north, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oxj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/medical/abandoned) +"oxk" = ( +/obj/machinery/door/window/right/directional/east{ + name = "Engineering Deliveries"; + req_access = list("engineering") + }, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) +"oxx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"oxR" = ( +/obj/structure/table, +/obj/item/pipe_dispenser{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/pipe_dispenser, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"oxT" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/item/storage/photo_album/chapel, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"oxV" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"oxW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oxX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/modular_computer/preset/id{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"oyj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"oyx" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/newscaster/directional/south, +/obj/effect/landmark/blobstart, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/east{ + id = "AuxToilet3"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/plating, +/area/station/commons/toilet/auxiliary) +"oyO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"oyY" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/service/bar) +"ozm" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"ozs" = ( +/obj/machinery/door/airlock/engineering{ + name = "Starboard Bow Solar Access" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"ozX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"oAa" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants/organic/plant14, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"oAu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"oAN" = ( +/obj/machinery/gulag_teleporter, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"oAQ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/transit_tube/horizontal, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/space, +/area/space/nearstation) +"oBn" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/machinery/light/small/directional/east, +/turf/open/floor/grass, +/area/station/medical/virology) +"oBq" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"oBv" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/medical/coldroom) +"oBz" = ( +/turf/closed/wall, +/area/station/security/checkpoint/science) +"oBA" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/food_or_drink/booze{ + spawn_random_offset = 1 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"oBD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"oBM" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east{ + name = "Hydroponics Desk"; + req_access = list("hydroponics") + }, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"oBO" = ( +/obj/structure/cable, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"oCb" = ( +/obj/structure/chair, +/obj/item/radio/intercom/chapel/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"oCn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/iron, +/area/station/service/bar) +"oCE" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/grass, +/area/station/science/genetics) +"oCN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"oCO" = ( +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/south, +/mob/living/basic/chicken{ + name = "Kentucky"; + real_name = "Kentucky" + }, +/obj/structure/flora/grass/jungle/b/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"oCR" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/suit_storage_unit/security, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"oCX" = ( +/obj/structure/sign/warning/biohazard, +/turf/closed/wall/r_wall, +/area/station/science/xenobiology/hallway) +"oDc" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"oDl" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"oDH" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/crowbar, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_x = 4; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"oDJ" = ( +/obj/structure/sign/warning/vacuum/external, +/turf/closed/wall, +/area/station/cargo/storage) +"oDW" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/firealarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"oDX" = ( +/obj/structure/punching_bag, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison) +"oEm" = ( +/obj/structure/cable, +/obj/machinery/computer/security{ + dir = 1 + }, +/obj/item/paper/crumpled{ + default_raw_text = "Hey, assholes. We don't need a couch in the meeting room, I threw it out the airlock. I don't care if it's real leather, go patrol like you're paid to do instead of cycling through cameras all shift!"; + name = "old, crumpled note" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/office) +"oEq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"oEu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood/poker, +/turf/open/floor/wood, +/area/station/commons/lounge) +"oEx" = ( +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"oEB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oED" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = 1 + }, +/obj/machinery/light/cold/dim/directional/east, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"oEM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/flasher/directional/east{ + id = "justiceflash" + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"oEO" = ( +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/structure/closet/crate, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"oEP" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Aft Primary Hallway" + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/lobby) +"oET" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Engine Coolant Bypass" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"oFt" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/engineering/atmos) +"oFG" = ( +/obj/machinery/door/poddoor/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutter" + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/brigdoor/right/directional/north{ + req_access = list("brig_entrance") + }, +/obj/item/folder/red{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/paper, +/obj/item/pen, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) +"oFH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"oFK" = ( +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oFM" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Waste to Filter" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"oFR" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Cargo Bay Bridge Access" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "north-maint-viewingdeck" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"oFS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"oFT" = ( +/obj/structure/table, +/obj/item/integrated_circuit/loaded/speech_relay, +/obj/item/integrated_circuit/loaded/hello_world{ + pixel_y = 2; + pixel_x = 3 + }, +/turf/open/floor/iron, +/area/station/science/explab) +"oFX" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Ordnance Lab Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/plating, +/area/station/science/ordnance) +"oGf" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "viro-passthrough" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/medical/medbay/central) +"oGj" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/box, +/obj/machinery/portable_atmospherics/canister, +/obj/item/radio/intercom/directional/north, +/obj/structure/sign/warning/gas_mask/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"oGn" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Fuel Closet" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"oGw" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/space/basic, +/area/space/nearstation) +"oGH" = ( +/obj/machinery/light/directional/east, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/paper_bin{ + pixel_x = -11; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = -11; + pixel_y = 7 + }, +/obj/item/hand_labeler{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/prison/directional/east, +/turf/open/floor/iron, +/area/station/security/warden) +"oGK" = ( +/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/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"oGN" = ( +/obj/effect/landmark/start/cyborg, +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/north{ + c_tag = "AI Upload Foyer"; + network = list("aiupload") + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +"oGZ" = ( +/obj/structure/table, +/obj/item/storage/bag/tray/cafeteria, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"oHj" = ( +/obj/structure/table, +/obj/item/folder/blue{ + pixel_x = -18; + pixel_y = 3 + }, +/obj/item/paper_bin{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 3; + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) +"oHw" = ( +/obj/structure/cable, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"oHy" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"oHC" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) +"oHE" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - Distro Loop" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/machinery/meter/monitored/distro_loop, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"oHG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"oHJ" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"oHO" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"oIa" = ( +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) +"oId" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/space, +/area/space/nearstation) +"oIg" = ( +/turf/closed/wall/r_wall, +/area/station/science/genetics) +"oIG" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/station/solars/starboard/fore) +"oIM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"oIW" = ( +/obj/structure/sign/warning/vacuum/directional/east, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"oJj" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"oJr" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/trackimp, +/obj/item/storage/lockbox/loyalty, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"oJu" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"oJD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + 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/medical/treatment_center) +"oJH" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"oJL" = ( +/obj/machinery/computer/atmos_control/nitrogen_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oJY" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Incinerator Access" + }, +/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/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"oKc" = ( +/obj/structure/sign/departments/court/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"oKx" = ( +/obj/structure/tank_dispenser, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"oKA" = ( +/obj/machinery/door/airlock/hatch{ + name = "Telecomms Control Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) +"oKI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oKM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"oKU" = ( +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) +"oLD" = ( +/obj/structure/chair/comfy/beige, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/bridge) +"oLF" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"oLK" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/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/trimline/red/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"oLS" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/testlab) +"oLV" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"oLZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "hosprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hos) +"oMh" = ( +/obj/structure/filingcabinet, +/obj/machinery/computer/security/telescreen/minisat/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) +"oMx" = ( +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/machinery/door/airlock/maintenance{ + name = "Mining Dock Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/cargo/miningoffice) +"oMA" = ( +/turf/closed/wall/r_wall, +/area/station/science/cytology) +"oMR" = ( +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole/bookmanagement{ + dir = 8 + }, +/obj/structure/noticeboard/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"oMW" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "mechbay"; + name = "Mech Bay Shutters" + }, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"oMY" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"oNl" = ( +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/commons/locker) +"oNs" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"oNy" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "chem_lockdown"; + name = "Chemistry Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"oNP" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/office) +"oOl" = ( +/obj/machinery/flasher/directional/north{ + id = "AI" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai_upload) +"oOz" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"oOB" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/wrench, +/obj/item/clothing/glasses/welding, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/science/lab) +"oOE" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/iannewyear, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"oOU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"oOW" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space, +/area/space/nearstation) +"oOZ" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oPc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"oPf" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) +"oPh" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"oPj" = ( +/obj/structure/table, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/machinery/camera/directional/west{ + c_tag = "Telecomms - Storage" + }, +/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, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"oPq" = ( +/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) +"oPv" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"oPx" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/wood, +/area/station/commons/lounge) +"oPD" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"oPS" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/olive, +/turf/open/space/basic, +/area/space/nearstation) +"oPY" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"oPZ" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oQg" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"oQk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +"oQJ" = ( +/obj/structure/table, +/obj/item/storage/box/gloves{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/storage/box/masks{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"oQZ" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=1.5-Fore-Central"; + location = "1-BrigCells" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"oRn" = ( +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"oRs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/cook, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"oRM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"oRO" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +"oRR" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Outer Vault"; + name = "storage wing camera"; + network = list("ss13","vault") + }, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/obj/structure/window/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"oRV" = ( +/obj/structure/table, +/obj/machinery/newscaster/directional/east, +/obj/machinery/camera/directional/south{ + c_tag = "Departure Lounge - Security Post" + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/taperecorder{ + pixel_x = 4 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"oSc" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"oSf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"oSo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "corporate_privacy"; + name = "Showroom Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/corporate_showroom) +"oSy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oTa" = ( +/obj/machinery/vending/cart{ + req_access = list("hop") + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"oTj" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oTw" = ( +/obj/machinery/door/airlock/mining{ + name = "Deliveries" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/supply/shipping, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"oTD" = ( +/obj/structure/frame/computer, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"oTK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/flasher/directional/west{ + id = "Cell 3"; + pixel_y = -22 + }, +/obj/structure/bed, +/obj/item/bedsheet, +/turf/open/floor/iron, +/area/station/security/brig) +"oTR" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"oUh" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"oUu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/server) +"oUy" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"oUz" = ( +/obj/structure/rack, +/obj/item/book/manual/wiki/engineering_guide{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/effect/spawner/random/trash/janitor_supplies, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"oUB" = ( +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/hangover, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"oUE" = ( +/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/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"oUK" = ( +/obj/structure/table, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"oUU" = ( +/obj/structure/weightmachine/weightlifter, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) +"oVd" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"oVn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"oVL" = ( +/obj/structure/table, +/obj/item/folder, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/photo_album/prison, +/obj/item/camera, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) +"oVY" = ( +/obj/structure/chair{ + dir = 8; + name = "Defense" + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"oWa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"oWc" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/aft) +"oWk" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/aft) +"oWm" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/computer/security/telescreen/engine/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"oWF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"oWH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -38531,6 +71936,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +<<<<<<< HEAD /obj/effect/turf_decal/tile/bar, /turf/open/floor/iron, /area/station/hallway/primary/central) @@ -38733,10 +72139,791 @@ "nCw" = ( /obj/machinery/door/airlock/external{ name = "Space Shack" +======= +/turf/open/floor/wood, +/area/station/service/bar/backroom) +"oWQ" = ( +/obj/structure/rack, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/twenty, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"oWT" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Head of Personnel" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/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) +"oXl" = ( +/obj/machinery/telecomms/server/presets/science, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"oXJ" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/closet/crate/engineering/electrical, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/stack/cable_coil, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"oXK" = ( +/obj/structure/safe/vault, +/obj/item/storage/briefcase/secure/riches, +/obj/item/storage/backpack/duffelbag/syndie/hitman, +/obj/item/card/id/advanced/silver/reaper, +/obj/item/lazarus_injector, +/obj/item/gun/energy/disabler, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/item/clothing/neck/stethoscope, +/obj/item/book{ + desc = "An undeniably handy book."; + icon_state = "bookknock"; + name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" + }, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"oXL" = ( +/obj/machinery/disposal/bin, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/office) +"oXR" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"oYg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"oYp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/office) +"oYr" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"oYv" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/button/door/directional/west{ + id = "Cabin4"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"oYM" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"oYZ" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/rd) +"oZj" = ( +/obj/structure/table/wood, +/obj/item/storage/photo_album/library, +/obj/structure/sign/painting/large/library_private{ + dir = 8; + pixel_x = -29 + }, +/turf/open/floor/engine/cult, +/area/station/service/library) +"oZs" = ( +/obj/structure/bed/medical/emergency{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/old, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/starboard/lesser) +"oZv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"oZL" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"oZO" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"oZZ" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 2 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"pab" = ( +/obj/structure/table, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tcomms) +"pan" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/ai_monitored/aisat/exterior) +"pav" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/camera/directional/north{ + c_tag = "Prison Visitation"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"paD" = ( +/turf/closed/wall, +/area/station/cargo/bitrunning/den) +"paQ" = ( +/obj/structure/window/spawner/directional/south, +/obj/machinery/computer/cargo/request{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"paU" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"pbb" = ( +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/science/research) +"pbf" = ( +/obj/effect/turf_decal/siding/blue/corner{ + dir = 1 + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"pbt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"pbz" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"pbL" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/side, +/area/station/medical/medbay/lobby) +"pbS" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat" + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat" + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"pbU" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/service_all, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"pcc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"pck" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"pcm" = ( +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"pcM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"pcS" = ( +/obj/item/stack/ore/silver, +/obj/item/stack/ore/silver, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/rack, +/obj/item/shovel{ + pixel_x = -5 + }, +/obj/item/pickaxe{ + pixel_x = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"pdg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"pdi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"pdl" = ( +/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/service/hydroponics) +"pdx" = ( +/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/item/cigbutt/roach, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"pdI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron, +/area/station/security/brig) +"pdT" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"pdU" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"pdV" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/airlock/medical/glass{ + name = "Coroner's Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/coroner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"pdX" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 5; + height = 7; + name = "Cargo Bay"; + shuttle_id = "cargo_home"; + width = 12 + }, +/turf/open/space/basic, +/area/space) +"pdY" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"pem" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"peF" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/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/commons/fitness/recreation) +"peM" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/storage/gas) +"peX" = ( +/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 = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pfe" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +"pfs" = ( +/obj/structure/closet/secure_closet{ + name = "contraband locker"; + req_access = list("armory") + }, +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/contraband/armory, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"pfP" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"pfR" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"pfU" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"pgD" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chapel Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"pgJ" = ( +/obj/structure/chair/stool/directional/north, +/obj/machinery/camera/directional/west{ + c_tag = "Solar Maintenance - Fore Port" + }, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"pgK" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"pgM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/sink/directional/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"pgU" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"pha" = ( +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/command/gateway) +"phn" = ( +/obj/structure/reflector/single/anchored{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"phz" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=7-Command-Starboard"; + location = "6-Port-Central" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"phJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Desk" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"phN" = ( +/obj/machinery/camera/directional/west{ + c_tag = "AI Chamber - Port"; + network = list("aicore") + }, +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"phP" = ( +/obj/structure/table, +/obj/item/exodrone{ + pixel_y = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"phR" = ( +/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/service/chapel) +"phS" = ( +/obj/structure/reagent_dispensers/cooking_oil, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"pic" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"piv" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"piw" = ( +/obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +"piz" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"piA" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/structure/closet_private, +/obj/item/clothing/under/misc/assistantformal, +/turf/open/floor/wood, +/area/station/commons/dorms) +"piJ" = ( +/obj/machinery/suit_storage_unit/medical, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"piM" = ( +/obj/structure/rack, +/obj/item/clothing/under/color/red, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/neck/tie/red, +/obj/item/clothing/head/soft/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"piT" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_x = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"pjd" = ( +/turf/open/floor/plating, +/area/station/commons/fitness/recreation) +"pjh" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"pjs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"pjS" = ( +/obj/machinery/vending/cigarette, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"pke" = ( +/obj/effect/turf_decal/siding/red{ + dir = 6 + }, +/obj/effect/landmark/start/depsec/science, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) +"pkx" = ( +/obj/machinery/modular_computer/preset/research{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +"pkF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/photocopier, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"pkH" = ( +/obj/structure/rack, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"pkK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"pkM" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"pkQ" = ( +/obj/machinery/door/airlock/external{ + name = "Security External Airlock" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +<<<<<<< HEAD /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -43816,6 +78003,486 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/disposalpipe/segment, +======= +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"pkT" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"plp" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Lab - Pen #1"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"plD" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Pure to Mix" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"pma" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/port/fore) +"pmb" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/light/cold/dim/directional/south, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) +"pmc" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/landmark/start/chaplain, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/station/service/chapel/office) +"pmj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"pmo" = ( +/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/wood, +/area/station/service/lawoffice) +"pms" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"pmA" = ( +/obj/machinery/door/firedoor, +/obj/machinery/smartfridge/food, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/turf/open/floor/iron, +/area/station/service/kitchen) +"pmK" = ( +/obj/effect/landmark/start/mime, +/turf/open/floor/carpet, +/area/station/service/theater) +"pmW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"pmZ" = ( +/obj/machinery/light_switch/directional/west{ + pixel_y = 26 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/holosign_creator/robot_seat/restaurant, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"pnk" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"pnx" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"pnD" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/structure/closet_private, +/obj/item/clothing/under/suit/navy, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"pnE" = ( +/obj/machinery/air_sensor/carbon_tank, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) +"pnH" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +"pnI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/miningoffice) +"pnJ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"pnN" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"poc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"pof" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/entertainment/lighter, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"poj" = ( +/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/start/shaft_miner, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"pom" = ( +/turf/open/floor/iron, +/area/station/engineering/storage_shared) +"poq" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +"poJ" = ( +/obj/machinery/telecomms/hub/preset, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) +"poM" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"poS" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"ppB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/bridge) +"ppC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/station/science/cytology) +"ppG" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"ppI" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"ppJ" = ( +/obj/machinery/door/morgue{ + name = "Chapel Garden" + }, +/turf/open/floor/cult, +/area/station/service/chapel/funeral) +"ppU" = ( +/obj/structure/closet/emcloset, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"ppX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security{ + name = "Detective's Office" + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/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/detective, +/turf/open/floor/iron, +/area/station/security/detectives_office) +"pqb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"pqc" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"pqi" = ( +/obj/structure/chair, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"pql" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"pqt" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/machinery/module_duplicator, +/turf/open/floor/iron/white, +/area/station/science/explab) +"pqz" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"pqH" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"pqI" = ( +/obj/structure/lattice/catwalk, +/obj/item/fish_feed, +/turf/open/space/basic, +/area/space/nearstation) +"prc" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Chemistry North"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"prg" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/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) +"prv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/brig) +"prx" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Virology Airlock"; + network = list("ss13","medbay") + }, +/obj/structure/closet/l3closet, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"pry" = ( +/obj/effect/turf_decal/stripes/line, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"prD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/library) +"prT" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"prU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"prY" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/office) +"psc" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"psj" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"psl" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"psp" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"psr" = ( +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole, +/turf/open/floor/wood, +/area/station/service/library) +"pst" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"psv" = ( +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) +"psw" = ( +/obj/machinery/computer/security/hos{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +"psy" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/east, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) +"psz" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"psT" = ( +/turf/open/floor/iron/dark, +/area/station/science/lab) +"psU" = ( +/obj/machinery/door/window/right/directional/east{ + name = "Containment Pen #1"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"psV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/maintenance/aft/lesser) "psZ" = ( @@ -43868,6 +78535,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"pur" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/gambling, +/turf/open/floor/wood, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "puG" = ( /obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/stripes/line{ @@ -43911,6 +78586,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/security/brig) +<<<<<<< HEAD +======= +"puW" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "puZ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -43918,6 +78600,7 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD "pvl" = ( /obj/machinery/light/directional/south, /obj/structure/rack, @@ -43934,6 +78617,8 @@ /obj/machinery/incident_display/bridge/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pvm" = ( /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, @@ -43957,6 +78642,7 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) +<<<<<<< HEAD "pvZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, @@ -43964,6 +78650,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pwm" = ( /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/circuit/telecomms/mainframe, @@ -43980,11 +78668,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +<<<<<<< HEAD "pwL" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/caution, /turf/open/floor/plating, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pwM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -44027,12 +78718,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +<<<<<<< HEAD "pxM" = ( /obj/structure/cable, /obj/structure/table, /obj/item/storage/bag/tray, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pxN" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -44096,6 +78790,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD +======= +"pyR" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch/directional/south, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pyU" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -44115,6 +78819,7 @@ }, /turf/open/floor/iron, /area/station/security/office) +<<<<<<< HEAD "pzn" = ( /obj/structure/cable, /obj/structure/table/reinforced, @@ -44131,6 +78836,8 @@ /obj/item/binoculars, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pzu" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -44228,6 +78935,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/lounge) +<<<<<<< HEAD +======= +"pBs" = ( +/obj/structure/sign/warning/cold_temp/directional/north{ + name = "\improper CRYOGENICS" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pBG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44288,6 +79006,22 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/dark, /area/station/medical/break_room) +<<<<<<< HEAD +======= +"pCs" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay - Mailroom" + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/white/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pCt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44304,6 +79038,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +<<<<<<< HEAD "pCI" = ( /obj/structure/table/glass, /obj/item/reagent_containers/dropper, @@ -44322,12 +79057,25 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pCJ" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, /turf/open/floor/wood, /area/station/commons/lounge) +<<<<<<< HEAD +======= +"pCL" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/sink/directional/east, +/obj/structure/sign/poster/official/cleanliness/directional/south, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pCO" = ( /obj/machinery/holopad, /obj/machinery/status_display/evac/directional/north, @@ -44361,12 +79109,15 @@ }, /turf/open/floor/iron/white/side, /area/station/science/lobby) +<<<<<<< HEAD "pDw" = ( /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/cargo/drone_bay) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pDx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -44475,6 +79226,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +<<<<<<< HEAD "pFF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44483,6 +79235,8 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pFG" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -44625,6 +79379,14 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) +<<<<<<< HEAD +======= +"pHK" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pHS" = ( /obj/structure/light_construct/directional/east, /turf/open/floor/wood, @@ -44742,6 +79504,7 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) +<<<<<<< HEAD "pJB" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/bar, @@ -44760,6 +79523,8 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pJE" = ( /turf/open/floor/iron, /area/station/commons/locker) @@ -44781,6 +79546,29 @@ }, /turf/open/floor/plating, /area/station/medical/chemistry) +<<<<<<< HEAD +======= +"pJY" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Bridge - Command Chair" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "bridge blast"; + name = "Bridge Access Blast Door Control"; + req_access = list("command") + }, +/obj/machinery/button/door/directional/south{ + id = "council blast"; + name = "Council Chamber Blast Door Control"; + pixel_y = -34; + req_access = list("command") + }, +/turf/open/floor/carpet, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pKa" = ( /obj/structure/cable, /obj/structure/bed/medical/emergency, @@ -44789,6 +79577,7 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +<<<<<<< HEAD "pKr" = ( /obj/item/reagent_containers/cup/bottle/multiver{ pixel_x = 7; @@ -44810,6 +79599,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pKs" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -44917,11 +79708,14 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD "pNa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pNb" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -44941,6 +79735,21 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"pNk" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/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/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pNp" = ( /obj/machinery/light/small/broken/directional/west, /obj/structure/table, @@ -44948,6 +79757,14 @@ /obj/item/clothing/mask/gas/cyborg, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD +======= +"pNC" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/construction/storage_wing) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pNR" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, @@ -44975,6 +79792,34 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/security/checkpoint/customs) +<<<<<<< HEAD +======= +"pOk" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/item/assembly/signaler{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/assembly/signaler{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/assembly/signaler{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/assembly/signaler{ + pixel_y = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pOv" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -44997,6 +79842,19 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +<<<<<<< HEAD +======= +"pOK" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pON" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45053,6 +79911,18 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron, /area/station/security/prison/safe) +<<<<<<< HEAD +======= +"pQh" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/solars/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pQj" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -45083,6 +79953,7 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "pQw" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -45096,6 +79967,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pQy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -45103,6 +79976,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD +======= +"pQC" = ( +/obj/structure/table/wood, +/obj/machinery/firealarm/directional/south, +/obj/item/storage/photo_album/bar, +/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/service/bar/backroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pQG" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -45120,11 +80005,21 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/storage/gas) +<<<<<<< HEAD +======= +"pQO" = ( +/obj/structure/sign/warning/secure_area/directional/west, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pQW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "pQX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -45132,6 +80027,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pRb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45159,10 +80056,13 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "pRr" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/station/cargo/warehouse) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pRu" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, @@ -45178,6 +80078,17 @@ /obj/item/reagent_containers/spray/pepper, /turf/open/floor/iron, /area/station/security/execution/transfer) +<<<<<<< HEAD +======= +"pRM" = ( +/obj/structure/window/spawner/directional/south, +/mob/living/basic/cow{ + name = "Betsy"; + real_name = "Betsy" + }, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pSa" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -45192,6 +80103,7 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD "pSq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ @@ -45210,6 +80122,8 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pSw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45220,6 +80134,7 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD "pSB" = ( /obj/structure/table/glass, /obj/machinery/computer/records/medical/laptop, @@ -45228,6 +80143,8 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pSS" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube/junction/flipped{ @@ -45237,6 +80154,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/space, /area/space/nearstation) +<<<<<<< HEAD +======= +"pSY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/tank_holder/extinguisher, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"pTf" = ( +/obj/structure/cable, +/turf/open/floor/iron/goonplaque, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pTm" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -45294,6 +80225,18 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/central) +<<<<<<< HEAD +======= +"pUk" = ( +/obj/machinery/camera/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pUl" = ( /obj/machinery/shower/directional/east, /obj/effect/decal/cleanable/dirt, @@ -45324,6 +80267,19 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron, /area/station/hallway/secondary/service) +<<<<<<< HEAD +======= +"pUM" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/white/corner, +/obj/machinery/firealarm/directional/north, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/pen, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pUS" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -45346,6 +80302,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/brig) +<<<<<<< HEAD "pVR" = ( /obj/structure/table/wood, /obj/item/radio/intercom/directional/east, @@ -45355,12 +80312,29 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +======= +"pVV" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/table, +/obj/item/storage/box/bandages{ + pixel_y = 6; + pixel_x = 4 + }, +/obj/effect/spawner/random/entertainment/cigarette_pack{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pVZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "pWp" = ( /obj/structure/table, /obj/item/storage/bag/plants, @@ -45804,6 +80778,379 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +======= +"pWb" = ( +/obj/machinery/light/directional/west, +/obj/machinery/piratepad/civilian, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pWA" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=2.1-Leaving-Storage"; + location = "1.5-Fore-Central" + }, +/obj/effect/turf_decal/plaque{ + icon_state = "L6" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"pWB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Mix" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"pWD" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/corner, +/area/station/medical/medbay/lobby) +"pWN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Command Hallway" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"pWR" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"pWT" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"pWX" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"pXh" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"pXj" = ( +/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/purple, +/turf/open/floor/iron/white, +/area/station/science/explab) +"pXl" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Hydroponics - Aft" + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"pXA" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"pXC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"pXM" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"pYn" = ( +/obj/structure/sign/plaques/kiddie/library{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"pYw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/office) +"pYE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pYL" = ( +/obj/machinery/door/firedoor, +/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/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"pYM" = ( +/obj/machinery/status_display/supply, +/turf/closed/wall, +/area/station/cargo/storage) +"pZc" = ( +/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/science/lobby) +"pZi" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1; + name = "killroom vent" + }, +/turf/open/floor/circuit/telecomms, +/area/station/science/xenobiology) +"pZn" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"pZp" = ( +/obj/structure/chair/stool/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) +"pZG" = ( +/obj/machinery/power/solar_control{ + id = "forestarboard"; + name = "Starboard Bow Solar Control" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) +"pZW" = ( +/obj/structure/lattice, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/space/basic, +/area/space/nearstation) +"qaf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"qag" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron, +/area/station/maintenance/port) +"qaq" = ( +/obj/machinery/newscaster/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"qaw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"qaA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"qaG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/central) +"qaP" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L3" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qaT" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"qbr" = ( +/obj/structure/bed/medical{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) +"qby" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"qbC" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/button/door/directional/west{ + id = "hosprivacy"; + name = "Privacy Shutters Control" + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +"qbE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutter" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) +"qbZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"qcd" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) +"qcy" = ( +/obj/machinery/newscaster/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Courtroom - Gallery" + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"qcD" = ( +/obj/structure/rack, +/obj/item/aicard, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"qcP" = ( +/obj/effect/landmark/blobstart, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qcQ" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/commons/lounge) +"qdm" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/security/execution/transfer) +"qdw" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/machinery/door/airlock/external, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"qdy" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/station/commons/dorms) +"qdI" = ( +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 5 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -45822,6 +81169,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plating, /area/station/maintenance/central) +<<<<<<< HEAD "qek" = ( /obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 @@ -45846,6 +81194,8 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qeo" = ( /obj/machinery/newscaster/directional/north, /obj/structure/dresser, @@ -45874,6 +81224,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "qeS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45881,6 +81232,24 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"qeQ" = ( +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 3; + pixel_y = -23 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/window/brigdoor/left/directional/west{ + name = "Primary AI Core Access"; + req_access = list("ai_upload") + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qeZ" = ( /obj/effect/decal/cleanable/oil, /obj/structure/cable, @@ -45984,6 +81353,18 @@ /obj/machinery/power/supermatter_crystal/engine, /turf/open/floor/engine, /area/station/engineering/supermatter) +<<<<<<< HEAD +======= +"qgl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/structure/steam_vent, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qgn" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -46160,6 +81541,18 @@ /mob/living/simple_animal/bot/floorbot, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD +======= +"qiY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/east, +/obj/structure/table/wood, +/obj/item/food/pie/cream, +/turf/open/floor/wood/large, +/area/station/service/theater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qjf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46197,6 +81590,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/plating, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD "qjM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46212,6 +81606,20 @@ /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +"qjH" = ( +/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/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qkl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -46234,6 +81642,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) +<<<<<<< HEAD "qks" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46243,6 +81652,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qkA" = ( /obj/machinery/computer/security, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -46270,6 +81681,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD +======= +"qlz" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qlG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -46289,6 +81708,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +<<<<<<< HEAD +======= +"qlW" = ( +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qmf" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/table/wood, @@ -46299,6 +81727,12 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +<<<<<<< HEAD +======= +"qmi" = ( +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qmu" = ( /obj/machinery/modular_computer/preset/id{ dir = 8 @@ -46321,6 +81755,17 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +<<<<<<< HEAD +======= +"qmE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qmO" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, @@ -46333,6 +81778,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD +======= +"qnj" = ( +/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/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qno" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -46347,6 +81802,16 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) +<<<<<<< HEAD +======= +"qnr" = ( +/obj/structure/cable, +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qnt" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -46411,6 +81876,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"qoY" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qph" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/spawner/random/medical/patient_stretcher, @@ -46428,6 +81904,7 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD "qps" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46435,10 +81912,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/warehouse) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qpD" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/ai_monitored/command/nuke_storage) +<<<<<<< HEAD "qpK" = ( /obj/structure/table/wood, /obj/machinery/fax{ @@ -46448,6 +81928,8 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qpM" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/wood, @@ -46458,6 +81940,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/library) +<<<<<<< HEAD "qqp" = ( /obj/structure/table, /obj/item/clipboard, @@ -46485,6 +81968,38 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +======= +"qqr" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"qqs" = ( +/obj/structure/table, +/obj/item/multitool{ + pixel_x = 4; + pixel_y = 12 + }, +/obj/item/multitool{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_y = -4 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/item/multitool{ + pixel_y = 10 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qrg" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/circuit/green{ @@ -46515,6 +82030,15 @@ }, /turf/open/floor/engine/co2, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"qrw" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qrF" = ( /obj/machinery/computer/exodrone_control_console{ dir = 1 @@ -46528,6 +82052,18 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/bitrunning/den) +<<<<<<< HEAD +======= +"qrO" = ( +/obj/machinery/chem_dispenser/drinks{ + dir = 1 + }, +/obj/machinery/newscaster/directional/south, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qrQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/north{ @@ -46642,6 +82178,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +<<<<<<< HEAD "qtu" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -46657,12 +82194,21 @@ }, /turf/open/floor/iron/diagonal, /area/station/cargo/storage) +======= +"qtq" = ( +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/crap, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qua" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "qub" = ( /obj/machinery/newscaster/directional/east, /obj/structure/table, @@ -46685,11 +82231,14 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "quc" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy, /turf/open/space/basic, /area/space/nearstation) +<<<<<<< HEAD "quh" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -46699,6 +82248,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qul" = ( /obj/machinery/power/terminal, /obj/effect/turf_decal/stripes/line, @@ -46721,8 +82272,1665 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/holding_cell) +<<<<<<< HEAD "qvi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +======= +"quT" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/storage) +"qvJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"qvP" = ( +/obj/item/kirbyplants/random, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/calendar/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"qvQ" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Containment Pen #4"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"qvV" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, +/area/station/cargo/storage) +"qvY" = ( +/obj/structure/closet/secure_closet/miner, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"qwh" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/holding_cell) +"qwi" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qwl" = ( +/obj/machinery/airalarm/directional/north, +/obj/item/clothing/under/suit/burgundy, +/obj/effect/landmark/start/hangover, +/obj/effect/spawner/random/structure/closet_private, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"qwG" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/port) +"qwI" = ( +/obj/structure/sign/departments/chemistry/pharmacy, +/turf/closed/wall, +/area/station/medical/pharmacy) +"qwK" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/iron, +/area/station/commons/dorms) +"qwR" = ( +/obj/structure/sign/directions/evac, +/obj/structure/sign/directions/medical{ + pixel_y = 8 + }, +/obj/structure/sign/directions/science{ + pixel_y = -8 + }, +/turf/closed/wall, +/area/station/service/library) +"qwY" = ( +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/command) +"qxh" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) +"qxr" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"qxt" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"qxE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/meter, +/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/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"qxJ" = ( +/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/cargo/lobby) +"qyb" = ( +/obj/structure/chair{ + pixel_y = -2 + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"qyc" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space, +/area/space/nearstation) +"qyr" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"qyt" = ( +/obj/machinery/door/window/brigdoor/security/cell/left/directional/south{ + id = "Cell 3"; + name = "Cell 3" + }, +/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/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"qyC" = ( +/turf/closed/wall, +/area/station/engineering/atmos/pumproom) +"qyI" = ( +/obj/structure/noticeboard/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qyQ" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/engineering_welding, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) +"qyT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"qzg" = ( +/obj/structure/closet/emcloset, +/obj/structure/sign/warning/vacuum/external/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qzs" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/space, +/area/space/nearstation) +"qzz" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"qzC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"qzE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/carpet, +/area/station/service/theater) +"qzK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qzS" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/wood, +/area/station/service/library) +"qzV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/prison) +"qAc" = ( +/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/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"qAf" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/mob/living/basic/bot/medbot/autopatrol, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/medical/medbay/lobby) +"qAA" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/computer/security/mining{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"qAN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"qAX" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/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/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/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/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"qBq" = ( +/obj/structure/rack, +/obj/effect/landmark/blobstart, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"qBy" = ( +/turf/closed/wall, +/area/station/command/heads_quarters/hop) +"qBC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qBF" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"qBK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/explab) +"qCh" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L10" + }, +/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/hallway/primary/central) +"qCj" = ( +/obj/structure/sign/departments/science, +/turf/closed/wall, +/area/station/science/lobby) +"qCl" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"qCm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qCv" = ( +/obj/machinery/telecomms/processor/preset_two, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) +"qCx" = ( +/obj/effect/decal/cleanable/wrapping, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"qCC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qCK" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/button/door/directional/east{ + id = "maintwarehouse"; + name = "Privacy Shutters Control" + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"qCL" = ( +/obj/structure/cable, +/obj/structure/sink/directional/east, +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/cryo) +"qCM" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +"qCP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"qCS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"qCY" = ( +/obj/structure/sign/directions/evac, +/turf/closed/wall, +/area/station/maintenance/department/science/central) +"qDa" = ( +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"qDb" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Gamer Lair" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qDg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison) +"qDi" = ( +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"qDy" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"qDA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/bot, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"qDD" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals - Fore Arm" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"qDS" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"qDW" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"qEb" = ( +/obj/structure/chair/pew/right, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"qEf" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"qEt" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"qEy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"qEG" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/iron, +/area/station/security/prison) +"qEK" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"qFo" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Bar" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/lounge) +"qFF" = ( +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 5 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/green{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 5 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"qFP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"qFU" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/iron, +/area/station/commons/locker) +"qGa" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/grunge{ + name = "Courtroom" + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"qGn" = ( +/obj/structure/table, +/obj/item/hfr_box/body/waste_output, +/obj/item/hfr_box/body/moderator_input, +/obj/item/hfr_box/body/fuel_input, +/obj/item/hfr_box/body/interface, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"qGs" = ( +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"qGv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/dorms) +"qGK" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Doors" + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/break_room) +"qGP" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qGQ" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/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) +"qGV" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qGZ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"qHa" = ( +/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/cargo/drone_bay) +"qHh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qHm" = ( +/obj/machinery/pdapainter/engineering, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/security/telescreen/ce/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"qHs" = ( +/obj/structure/sign/warning/docking, +/turf/closed/wall, +/area/station/hallway/secondary/entry) +"qHt" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/conveyor_switch/oneway{ + id = "mining"; + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"qHK" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qHY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"qIl" = ( +/turf/closed/wall, +/area/station/hallway/secondary/command) +"qIp" = ( +/obj/structure/sign/poster/official/cleanliness/directional/east, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/north{ + c_tag = "Jim Norton's Quebecois Coffee" + }, +/obj/structure/noticeboard/directional/north, +/obj/item/reagent_containers/condiment/sugar{ + pixel_y = 4 + }, +/obj/item/storage/pill_bottle/happinesspsych{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/storage/box/coffeepack, +/obj/item/storage/box/coffeepack/robusta, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/structure/closet/secure_closet/freezer/empty/open, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +"qIq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"qIu" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/turf/open/floor/iron, +/area/station/commons/locker) +"qIB" = ( +/obj/structure/closet, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + desc = "Takes you to a whole new level of thinking."; + name = "Meta-Cider" + }, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"qIL" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "MiniSat Exterior - Port Fore"; + network = list("minisat") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"qIS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"qJa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/range) +"qJb" = ( +/obj/machinery/requests_console/directional/west{ + department = "Detective"; + name = "Detective Requests Console" + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/machinery/camera/directional/west{ + c_tag = "Detective's Office" + }, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"qJd" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +"qJi" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "visitation"; + name = "Visitation Shutters" + }, +/obj/machinery/door/window/left/directional/east, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/security/prison/visit) +"qJn" = ( +/obj/machinery/chem_master, +/obj/structure/noticeboard/directional/east, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"qJH" = ( +/obj/machinery/vending/autodrobe/all_access, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"qJU" = ( +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qKg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/gateway) +"qKi" = ( +/obj/machinery/vending/wardrobe/chap_wardrobe, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"qKn" = ( +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"qKs" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qKD" = ( +/obj/structure/sign/poster/random/directional/east, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"qKR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"qLe" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/research) +"qLk" = ( +/obj/structure/table/glass, +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/toy/figure/cmo, +/obj/structure/cable, +/obj/item/stamp/head/cmo{ + pixel_x = -9 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"qLp" = ( +/obj/structure/table/wood, +/obj/item/toy/mecha/honk{ + pixel_y = 12 + }, +/obj/item/toy/dummy, +/obj/item/lipstick/purple{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/lipstick/jade{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/lipstick/black, +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/theater) +"qLu" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) +"qLw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"qLJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"qLP" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/bureaucracy/folder{ + spawn_random_offset = 1 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"qLR" = ( +/obj/structure/rack, +/obj/machinery/airalarm/directional/west, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"qLU" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 8 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qLY" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Arrivals - Middle Arm - Far" + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"qMe" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/airlock/public/glass{ + name = "Fitness Room" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/commons/fitness) +"qMf" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "gateshutter"; + name = "Gateway Shutter Control"; + pixel_y = -34; + req_access = list("command") + }, +/obj/machinery/button/door/directional/south{ + id = "evashutter"; + name = "E.V.A. Storage Shutter Control"; + req_access = list("command") + }, +/turf/open/floor/carpet, +/area/station/command/bridge) +"qMm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qMP" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/green/filled/line{ + 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/hallway/primary/central) +"qMT" = ( +/obj/item/shard, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"qMW" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"qNb" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock" + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) +"qNi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) +"qNj" = ( +/obj/machinery/light_switch/directional/south, +/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/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"qNk" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"qNw" = ( +/obj/machinery/atmospherics/components/binary/valve/digital, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"qNz" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"qNA" = ( +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 4 + }, +/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/siding/purple, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"qNG" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/courtroom) +"qNI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/prison) +"qNO" = ( +/obj/structure/table/glass, +/obj/item/folder/blue{ + pixel_y = 3 + }, +/obj/item/pen, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/obj/effect/turf_decal/tile/blue, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"qNV" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/bridge) +"qOk" = ( +/obj/structure/table/optable, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"qOs" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"qOu" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"qOw" = ( +/obj/machinery/power/tracker, +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/station/solars/starboard/aft) +"qOz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix Bypass" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"qOM" = ( +/obj/machinery/vending/hydronutrients, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qOO" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/disposal/bin, +/obj/machinery/light/cold/directional/west, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"qOP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"qOT" = ( +/obj/item/storage/bag/trash, +/obj/machinery/airalarm/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"qOV" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/effect/spawner/random/entertainment/deck{ + pixel_x = -6 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"qOW" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qOZ" = ( +/obj/machinery/requests_console/directional/south{ + department = "Mining"; + name = "Mining Requests Console" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"qPs" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/indigo, +/turf/open/space/basic, +/area/space/nearstation) +"qPC" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation B" + }, +/obj/machinery/door/firedoor, +/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/medical/virology, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"qPF" = ( +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"qPJ" = ( +/turf/closed/wall, +/area/station/security/checkpoint/medical) +"qPS" = ( +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/mob/living/basic/pet/dog/corgi/puppy/slime, +/turf/open/floor/grass, +/area/station/science/research) +"qPT" = ( +/obj/machinery/recharge_station, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) +"qQd" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/carpet, +/area/station/service/library) +"qQm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"qQu" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"qQJ" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"qQX" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) +"qQY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"qRa" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"qRe" = ( +/obj/effect/turf_decal/siding/purple, +/obj/item/kirbyplants/random, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"qRf" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/station/service/library) +"qRg" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"qRh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"qRk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"qRq" = ( +/obj/structure/table/glass, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -8 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"qRz" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"qRI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/hallway/secondary/command) +"qRL" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"qRM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"qRO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"qRS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"qRU" = ( +/obj/machinery/computer/quantum_console, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) +"qRV" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"qSc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"qSf" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) +"qSh" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/solars/starboard/fore) +"qSk" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/turf/closed/wall, +/area/station/maintenance/port) +"qSp" = ( +/obj/structure/rack, +/obj/item/flashlight, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/airlock_painter, +/obj/item/crowbar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"qSP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"qST" = ( +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"qTf" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 9; + id = "mining" + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"qTz" = ( +/obj/structure/cable, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"qTA" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Mix to Filter" + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qTF" = ( +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/food/cherrycupcake{ + pixel_y = 10 + }, +/obj/item/food/muffin/berry{ + pixel_x = 18; + pixel_y = 9 + }, +/obj/item/food/cakeslice/pound_cake_slice{ + pixel_x = 4; + pixel_y = -5 + }, +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +"qTH" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/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) +"qTJ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Departure Lounge - Port Aft" + }, +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/kirbyplants/organic/plant4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"qTL" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Cargo Bay Bridge Access" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"qTR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/medbay/lobby) +"qTS" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"qTU" = ( +/obj/item/retractor, +/obj/item/hemostat{ + pixel_x = -10 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"qTX" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"qUz" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"qUQ" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/space_hut) +"qVc" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"qVi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"qVo" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 9; + height = 25; + name = "MetaStation emergency evac bay"; + shuttle_id = "emergency_home"; + width = 29 + }, +/turf/open/space/basic, +/area/space) +"qVt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/lounge) +"qVy" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"qWg" = ( +/obj/structure/lattice, +/obj/structure/sign/warning/secure_area/directional/east, +/turf/open/space/basic, +/area/space/nearstation) +"qWm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/commons/fitness) +"qWF" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/fore) +"qWG" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"qWK" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chemistry Maintenance" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"qWR" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/warning{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 1 }, /turf/open/floor/engine/vacuum, @@ -46734,6 +83942,7 @@ "qvP" = ( /obj/item/kirbyplants/random, /obj/structure/disposalpipe/segment, +<<<<<<< HEAD /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, @@ -48213,6 +85422,16 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +======= +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"qWX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/white, /area/station/science/research) "qXa" = ( @@ -48315,6 +85534,7 @@ /obj/structure/closet, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +<<<<<<< HEAD "qYb" = ( /obj/structure/closet{ name = "evidence closet 3" @@ -48326,6 +85546,8 @@ /obj/item/poster/traitor, /turf/open/floor/iron/dark, /area/station/security/evidence) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qYd" = ( /obj/structure/cable, /turf/open/floor/iron/white, @@ -48341,12 +85563,32 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/tcommsat/server) +<<<<<<< HEAD +======= +"qYt" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qYw" = ( /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, /area/station/science/research) +<<<<<<< HEAD +======= +"qYC" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/command/nuke_storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qZa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48392,6 +85634,14 @@ "qZI" = ( /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"qZO" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qZV" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -48456,30 +85706,99 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/station/solars/port/fore) +<<<<<<< HEAD +======= +"raJ" = ( +/obj/structure/secure_safe/caps_spare, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "raK" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +<<<<<<< HEAD "raN" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "raT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/chair/stool/directional/west, /turf/open/floor/wood, /area/station/commons/lounge) +<<<<<<< HEAD +======= +"rbd" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/portable_atmospherics/pipe_scrubber, +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rbi" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD +======= +"rbs" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/suture, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rbw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/warden) +<<<<<<< HEAD +======= +"rbD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"rbF" = ( +/obj/machinery/mass_driver/chapelgun, +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/machinery/light/small/directional/north, +/obj/item/gps, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rbG" = ( /obj/structure/rack, /obj/effect/spawner/random/clothing/costume, @@ -48514,6 +85833,13 @@ }, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD +======= +"rcR" = ( +/obj/structure/sign/departments/cargo, +/turf/closed/wall, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rcW" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -48542,11 +85868,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) +<<<<<<< HEAD "rdq" = ( /obj/structure/noticeboard/qm, /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rdt" = ( /obj/structure/sign/warning/vacuum/external/directional/north, /turf/open/floor/plating, @@ -48584,6 +85913,29 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +<<<<<<< HEAD +======= +"rem" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Service Hallway"; + name = "Service Fax Machine" + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ret" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -48678,6 +86030,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/robotics/lab) +<<<<<<< HEAD "rgV" = ( /obj/structure/rack, /obj/item/aicard, @@ -48688,12 +86041,15 @@ /obj/machinery/computer/security/telescreen/minisat/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rgZ" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD "rha" = ( /obj/item/pen, /obj/structure/table/reinforced, @@ -48711,6 +86067,8 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rhe" = ( /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/stalky/style_random, @@ -48726,12 +86084,15 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD "rhs" = ( /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/plating, /area/station/maintenance/port/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rhx" = ( /obj/machinery/door/window/left/directional/north{ name = "Inner Pipe Access"; @@ -48748,6 +86109,20 @@ /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/station/command/teleporter) +<<<<<<< HEAD +======= +"rhL" = ( +/obj/machinery/computer/security/mining, +/obj/machinery/keycard_auth/wall_mounted/directional/north, +/obj/item/radio/intercom/directional/north{ + pixel_y = 34 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rhU" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/spawner/random/structure/crate, @@ -48780,6 +86155,14 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating/airless, /area/station/solars/port/fore) +<<<<<<< HEAD +======= +"riU" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/caution, +/turf/open/floor/plating, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "riW" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/door/window/left/directional/north{ @@ -48844,12 +86227,15 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +<<<<<<< HEAD "rka" = ( /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, /area/station/construction/storage_wing) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rke" = ( /obj/machinery/recharge_station, /turf/open/floor/plating, @@ -48862,6 +86248,35 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/aft) +<<<<<<< HEAD +======= +"rkx" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/stack/cable_coil, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rkA" = ( /obj/structure/table, /obj/item/cultivator, @@ -48893,6 +86308,21 @@ /obj/item/target/syndicate, /turf/open/floor/engine, /area/station/science/explab) +<<<<<<< HEAD +======= +"rla" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/cable, +/obj/structure/table/glass, +/obj/item/clothing/glasses/science, +/obj/item/clothing/glasses/science, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rlg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -48914,6 +86344,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD +======= +"rlr" = ( +/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/bot_white, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rlu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -48946,6 +86387,16 @@ /obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/plating, /area/station/maintenance/fore) +<<<<<<< HEAD +======= +"rmL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/wrapping, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/effect/landmark/start/cargo_technician, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rmO" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -48957,6 +86408,20 @@ dir = 4 }, /area/station/service/chapel) +<<<<<<< HEAD +======= +"rmS" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rnb" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/spawner/random/trash/garbage{ @@ -48992,6 +86457,20 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/office) +<<<<<<< HEAD +======= +"rnf" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rng" = ( /obj/structure/cable, /obj/effect/landmark/start/hangover, @@ -49025,6 +86504,7 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/station/science/research) +<<<<<<< HEAD "rnD" = ( /obj/item/stack/sheet/iron/fifty, /obj/item/stack/rods/fifty, @@ -49039,12 +86519,25 @@ /obj/structure/closet/crate/engineering, /turf/open/floor/plating, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rnX" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD +======= +"rod" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/arrow_cw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/arrow_ccw, +/turf/open/floor/iron, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "roe" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 @@ -49071,10 +86564,23 @@ /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +<<<<<<< HEAD "rpr" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/science/xenobiology/hallway) +======= +"roG" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin/tagger, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rps" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -49164,6 +86670,7 @@ /obj/effect/spawner/random/structure/grille, /turf/open/space/basic, /area/space/nearstation) +<<<<<<< HEAD "rrw" = ( /obj/machinery/computer/records/security{ dir = 4 @@ -49173,6 +86680,18 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +======= +"rrz" = ( +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 1 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light/small/directional/south, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rrL" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ @@ -49185,6 +86704,7 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) +<<<<<<< HEAD "rrP" = ( /obj/structure/table/wood, /obj/machinery/door/window/right/directional/south{ @@ -49201,6 +86721,8 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rrT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red{ @@ -49222,11 +86744,14 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +<<<<<<< HEAD "rsa" = ( /obj/machinery/door/firedoor, /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rsc" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -49298,6 +86823,7 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD "rtp" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -49322,11 +86848,32 @@ /obj/effect/mapping_helpers/requests_console/ore_update, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +"rtj" = ( +/obj/machinery/igniter/incinerator_ordmix, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +"rtz" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/pdapainter/supply, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rtD" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/aft) +<<<<<<< HEAD "rtG" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49338,6 +86885,8 @@ }, /turf/open/floor/iron, /area/station/service/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rtI" = ( /obj/effect/landmark/secequipment, /obj/effect/turf_decal/bot, @@ -49379,6 +86928,25 @@ /obj/structure/bed/medical/emergency, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD +======= +"rud" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/start/bitrunner, +/obj/machinery/holopad, +/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/textured_half, +/area/station/cargo/bitrunning/den) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rul" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49504,6 +87072,24 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +<<<<<<< HEAD +======= +"rwa" = ( +/obj/structure/table, +/obj/item/storage/bag/plants, +/obj/item/reagent_containers/cup/watering_can, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rwd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/green{ @@ -49568,6 +87154,25 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/white, /area/station/medical/abandoned) +<<<<<<< HEAD +======= +"rxa" = ( +/obj/machinery/door/poddoor/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutter" + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/brigdoor/left/directional/north{ + req_access = list("security") + }, +/obj/structure/desk_bell{ + pixel_x = -3; + pixel_y = 2 + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rxc" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -49630,12 +87235,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "ryn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/water_source/puddle, /obj/item/reagent_containers/cup/watering_can, /turf/open/floor/grass, /area/station/security/prison/garden) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ryo" = ( /obj/effect/turf_decal/siding/white, /obj/effect/turf_decal/trimline/brown/warning, @@ -49674,6 +87282,18 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/prison/visit) +<<<<<<< HEAD +======= +"ryV" = ( +/obj/effect/turf_decal/trimline/brown/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rza" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49692,6 +87312,15 @@ /mob/living/basic/goat/pete, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) +<<<<<<< HEAD +======= +"rzo" = ( +/obj/structure/cable, +/obj/effect/landmark/start/cargo_technician, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rzq" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/corner, @@ -49723,6 +87352,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"rzB" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rzJ" = ( /obj/effect/landmark/start/lawyer, /turf/open/floor/iron, @@ -49766,6 +87405,7 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD "rAi" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -49785,6 +87425,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rAo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, @@ -49799,6 +87441,7 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD "rAt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -49806,6 +87449,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rAG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49827,6 +87472,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "rBP" = ( /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/arrows/red{ @@ -49834,6 +87480,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rBU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49842,6 +87490,7 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "rCa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49851,6 +87500,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +======= +"rBY" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/maintenance/port/fore) "rCn" = ( @@ -50088,9 +87742,63 @@ "rGC" = ( /turf/open/floor/iron/dark, /area/station/security/courtroom) +<<<<<<< HEAD "rHn" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter) +======= +"rHh" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 9; + pixel_y = 4 + }, +/obj/structure/cable, +/obj/item/radio{ + pixel_x = -6; + pixel_y = -3 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) +"rHk" = ( +/obj/structure/table/glass, +/obj/item/folder/blue{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/folder/white, +/obj/item/pen{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/computer_disk/medical, +/obj/item/computer_disk/medical, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"rHn" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"rHq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 6 + }, +/obj/structure/sign/warning/secure_area/directional/east{ + pixel_y = 32 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 6 + }, +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rHz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50127,6 +87835,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "rIm" = ( /obj/structure/sign/poster/official/cleanliness/directional/west, /obj/structure/sink/directional/south, @@ -50136,6 +87845,8 @@ /obj/structure/mirror/directional/north, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rIG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -50160,6 +87871,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD "rIR" = ( /obj/structure/cable, /obj/machinery/door/airlock/external{ @@ -50169,6 +87881,8 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/solars/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rIZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 1 @@ -50182,6 +87896,14 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD +======= +"rJh" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/secure_safe/directional/west, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rJk" = ( /obj/machinery/door/airlock{ name = "Theater Backstage" @@ -50190,6 +87912,21 @@ /obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"rJr" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Head of Personnel's Office" + }, +/obj/structure/table/wood, +/obj/machinery/light/directional/south, +/obj/item/papercutter{ + pixel_x = -4 + }, +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rJA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50268,11 +88005,14 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/station/science/explab) +<<<<<<< HEAD "rKF" = ( /obj/structure/table, /obj/item/food/dough, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rKG" = ( /obj/structure/cable, /obj/machinery/door/airlock/virology/glass{ @@ -50323,6 +88063,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD "rKX" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -50330,6 +88071,8 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rKZ" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -50359,6 +88102,7 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +<<<<<<< HEAD "rLL" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -50369,15 +88113,45 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rLZ" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/engine) +<<<<<<< HEAD "rMp" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +"rMe" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Doors"; + pixel_y = 4; + req_access = list("xenobiology") + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"rMr" = ( +/obj/structure/table/glass, +/obj/item/experi_scanner{ + pixel_y = -3 + }, +/obj/item/experi_scanner{ + pixel_y = 1 + }, +/obj/item/experi_scanner{ + pixel_y = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rMu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/space_heater, @@ -50398,6 +88172,7 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +<<<<<<< HEAD "rMH" = ( /obj/structure/table, /obj/effect/turf_decal/bot, @@ -50417,6 +88192,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rMI" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, @@ -50517,6 +88294,7 @@ /obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +<<<<<<< HEAD "rOZ" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -50529,6 +88307,8 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rPe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50550,6 +88330,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +<<<<<<< HEAD +======= +"rPp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rPA" = ( /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/flowers_yw/style_random, @@ -50591,6 +88384,7 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +<<<<<<< HEAD "rQe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50600,6 +88394,53 @@ "rQw" = ( /turf/open/floor/plating/airless, /area/station/solars/starboard/fore) +======= +"rQk" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security Post - Medbay"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/light/small/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/requests_console/directional/north{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"rQl" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rdgene2"; + name = "Genetics Lab Shutters" + }, +/obj/machinery/door/window/left/directional/east{ + name = "Genetics Desk"; + req_access = list("genetics") + }, +/obj/item/folder, +/obj/item/pen, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/science/genetics) +"rQw" = ( +/turf/open/floor/plating/airless, +/area/station/solars/starboard/fore) +"rQD" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/trimline/brown/filled/line, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rQS" = ( /obj/structure/table, /obj/item/storage/box/evidence{ @@ -50633,6 +88474,7 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +<<<<<<< HEAD "rRd" = ( /obj/machinery/camera/directional/west{ c_tag = "Departure Lounge - Port Fore" @@ -50658,6 +88500,15 @@ /obj/structure/sign/poster/random/directional/east, /turf/open/floor/iron, /area/station/commons/storage/primary) +======= +"rRm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/cigarette, +/turf/open/floor/wood, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rRB" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -50678,6 +88529,20 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/science/genetics) +<<<<<<< HEAD +======= +"rRR" = ( +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rRZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -50773,6 +88638,14 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD +======= +"rUd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rUo" = ( /obj/structure/bed, /obj/effect/spawner/random/bedsheet, @@ -50853,6 +88726,16 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD +======= +"rVb" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/security/prison/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rVn" = ( /turf/open/floor/iron, /area/station/cargo/lobby) @@ -50873,6 +88756,31 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +<<<<<<< HEAD +======= +"rVT" = ( +/obj/structure/table, +/obj/item/folder/white{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -3; + pixel_y = -6 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/trimline/purple/filled/warning, +/turf/open/floor/iron, +/area/station/science/lab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rVY" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50893,6 +88801,7 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +<<<<<<< HEAD "rWp" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -50923,6 +88832,8 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rWH" = ( /obj/machinery/door/window/left/directional/south{ name = "HoP's Desk"; @@ -50972,6 +88883,29 @@ }, /turf/open/floor/iron, /area/station/security/prison/visit) +<<<<<<< HEAD +======= +"rXT" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"rXW" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/table/glass, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Pharmacy"; + network = list("ss13","medbay") + }, +/obj/item/book/manual/wiki/chemistry{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/grenades, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rXX" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -51155,6 +89089,35 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +<<<<<<< HEAD +======= +"saD" = ( +/obj/machinery/light_switch/directional/north, +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/mug{ + pixel_x = 13; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/mug{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/mug{ + pixel_x = 13; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/ice{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "saN" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/wood, @@ -51169,6 +89132,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +<<<<<<< HEAD "sbo" = ( /obj/machinery/requests_console/directional/south{ department = "Mining"; @@ -51179,6 +89143,8 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sbp" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -51204,12 +89170,28 @@ /mob/living/basic/parrot/poly, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +<<<<<<< HEAD "sbD" = ( /obj/structure/sign/directions/medical{ pixel_y = -7 }, /turf/closed/wall, /area/station/medical/pharmacy) +======= +"sbF" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageExternal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/spawner/directional/west, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/warning/directional/west, +/turf/open/floor/plating, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sbG" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -51233,6 +89215,23 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +<<<<<<< HEAD +======= +"sbP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/effect/landmark/start/cargo_technician, +/turf/open/floor/iron, +/area/station/cargo/storage) +"sbX" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/decal/cleanable/dirt, +/obj/item/plant_analyzer, +/turf/open/floor/grass, +/area/station/security/prison/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sch" = ( /turf/closed/wall, /area/station/security/medical) @@ -51309,6 +89308,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD "sdt" = ( /obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/spray/pestspray{ @@ -51329,6 +89329,8 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sdu" = ( /obj/structure/cable, /turf/open/floor/carpet, @@ -51372,6 +89374,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "seE" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -51385,10 +89388,13 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/station/cargo/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "seN" = ( /obj/structure/sign/directions/evac, /turf/closed/wall/r_wall, /area/station/hallway/primary/aft) +<<<<<<< HEAD "seO" = ( /obj/effect/turf_decal/trimline/brown/warning{ dir = 8 @@ -51396,6 +89402,8 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sfg" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -51444,6 +89452,7 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/security/evidence) +<<<<<<< HEAD "sfW" = ( /obj/machinery/conveyor/inverted{ dir = 6; @@ -51466,6 +89475,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +"sgc" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sgh" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 @@ -51494,6 +89514,7 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/station/science/research) +<<<<<<< HEAD "sgU" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -51517,6 +89538,8 @@ /obj/effect/mapping_helpers/requests_console/ore_update, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sgX" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -51538,6 +89561,7 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD "shp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51553,6 +89577,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "shq" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/shower/directional/south, @@ -51589,6 +89615,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"sik" = ( +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/end{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sip" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51688,6 +89726,7 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +<<<<<<< HEAD "skj" = ( /obj/structure/table, /obj/item/storage/medkit/regular{ @@ -51700,6 +89739,8 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "skx" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -51714,11 +89755,216 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/lab) +<<<<<<< HEAD "skD" = ( +======= +"skW" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/medical/morgue) +"slc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/vehicle/ridden/janicart, +/obj/item/key/janitor, +/turf/open/floor/iron, +/area/station/service/janitor) +"sli" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"sls" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) +"sly" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"slC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) +"slD" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"slI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) +"slZ" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"smg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"sml" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"smt" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"smB" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/machinery/autolathe, +/turf/open/floor/iron, +/area/station/cargo/storage) +"smG" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"smZ" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"snb" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"snu" = ( +/obj/structure/table/wood, +/obj/machinery/door/window/right/directional/south{ + name = "Captain's Desk"; + req_access = list("captain") + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"snB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/engineering/gravity_generator) +"snE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"snZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"soa" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/plating, +/area/station/commons/toilet/auxiliary) +"soi" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/command/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central) +"sok" = ( +/obj/item/storage/box, +/turf/open/floor/plating, +/area/station/maintenance/port) +"sou" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Departure Lounge Airlock" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"sox" = ( +/obj/structure/table, +/obj/item/training_toolbox, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"soU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"soW" = ( +/obj/structure/rack, +/obj/effect/spawner/random/techstorage/security_all, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"soX" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, +<<<<<<< HEAD /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/cargo/storage) @@ -51907,11 +90153,18 @@ /area/station/service/lawoffice) "spd" = ( /obj/effect/landmark/event_spawn, +======= +/turf/open/floor/wood, +/area/station/service/lawoffice) +"spd" = ( +/obj/effect/landmark/event_spawn, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD "spe" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -51920,17 +90173,28 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +"spf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/station/ai_monitored/command/nuke_storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sph" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/color_adapter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "spy" = ( /obj/effect/spawner/random/vending/colavend, /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/port) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "spH" = ( /obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ @@ -51941,6 +90205,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD "spP" = ( /obj/effect/turf_decal/trimline/brown/corner{ dir = 4 @@ -51950,6 +90215,8 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sqt" = ( /obj/machinery/disposal/delivery_chute{ dir = 1; @@ -51990,6 +90257,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "sqN" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/brown/anticorner{ @@ -51997,6 +90265,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "src" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/broken_floor, @@ -52012,6 +90282,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central) +<<<<<<< HEAD "srr" = ( /obj/structure/railing{ dir = 1 @@ -52020,6 +90291,8 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "srP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52080,6 +90353,7 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "stq" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -52087,6 +90361,8 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stC" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -52106,6 +90382,16 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD +======= +"stI" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/item/binoculars, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stL" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52132,11 +90418,54 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"sul" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 11 + }, +/obj/item/folder/yellow{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/folder/yellow{ + pixel_x = -9; + pixel_y = 1 + }, +/obj/item/paper{ + pixel_x = -5 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"sus" = ( +/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/structure/sign/poster/official/random/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "suD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison) +<<<<<<< HEAD "suK" = ( /obj/structure/table/wood, /obj/item/lipstick{ @@ -52149,6 +90478,8 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "suP" = ( /obj/structure/lattice, /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ @@ -52208,6 +90539,21 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) +<<<<<<< HEAD +======= +"svK" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 6 + }, +/obj/structure/sign/warning/fire/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "svQ" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres{ @@ -52295,6 +90641,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white/side, /area/station/science/lobby) +<<<<<<< HEAD +======= +"sxk" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sxn" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, @@ -52303,12 +90657,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +<<<<<<< HEAD "sxt" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/iron/dark/textured_large, /area/station/science/cytology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sxA" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/cable, @@ -52322,6 +90679,7 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/science/lab) +<<<<<<< HEAD "sxN" = ( /obj/structure/railing{ dir = 10 @@ -52338,11 +90696,28 @@ }, /turf/open/floor/iron/diagonal, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sxR" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +<<<<<<< HEAD +======= +"sxX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/table/wood, +/obj/item/stack/sheet/cloth/ten, +/obj/item/toy/crayon/spraycan, +/obj/item/stack/rods/ten, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood/large, +/area/station/service/theater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "syc" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -52449,6 +90824,7 @@ "szp" = ( /turf/closed/wall, /area/station/commons/fitness/recreation) +<<<<<<< HEAD "szD" = ( /obj/machinery/computer/security/mining, /obj/machinery/keycard_auth/wall_mounted/directional/north, @@ -52460,6 +90836,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "szJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/janitor, @@ -52519,6 +90897,7 @@ /obj/item/stack/cable_coil, /turf/open/space/basic, /area/space/nearstation) +<<<<<<< HEAD "sBq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52544,6 +90923,8 @@ /obj/item/compact_remote, /turf/open/floor/iron/white, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sBL" = ( /obj/structure/chair/stool/directional/west, /obj/effect/mapping_helpers/broken_floor, @@ -52573,6 +90954,39 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"sCc" = ( +/obj/structure/table, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = 10 + }, +/obj/item/pen/blue{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/pen/fountain{ + pixel_x = 10 + }, +/obj/item/pen/red{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/stamp/denied{ + pixel_y = -1 + }, +/obj/item/stamp{ + pixel_x = -9; + pixel_y = -1 + }, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sCh" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52601,6 +91015,7 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, /area/station/engineering/atmospherics_engine) +<<<<<<< HEAD "sCt" = ( /obj/machinery/light/directional/west, /obj/structure/table, @@ -52622,6 +91037,20 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +======= +"sCs" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "QMLoad2"; + name = "Unloading Conveyor"; + pixel_x = -13; + pixel_y = -4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sCv" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ @@ -52686,6 +91115,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD "sDB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/effect/mapping_helpers/airlock/locked, @@ -52698,6 +91128,8 @@ /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sDC" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52782,6 +91214,7 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "sDY" = ( /obj/structure/table/wood, /obj/item/poster/random_official, @@ -52798,6 +91231,8 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/carpet, /area/station/command/corporate_showroom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sEk" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/structure/cable, @@ -52854,6 +91289,7 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +<<<<<<< HEAD "sEO" = ( /obj/machinery/mass_driver/chapelgun, /obj/structure/sign/warning/vacuum/external/directional/north, @@ -52865,12 +91301,32 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) +======= +"sEM" = ( +/obj/machinery/airalarm/directional/east, +/obj/item/food/poppypretzel{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/food/hotcrossbun{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sEZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/stripes/white/line, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +<<<<<<< HEAD "sFe" = ( /obj/structure/cable, /turf/open/floor/carpet/orange, @@ -52882,6 +91338,18 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/station/security/prison/garden) +======= +"sFi" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/fake_stairs/directional/south, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sFo" = ( /obj/machinery/button/crematorium{ id = "crematoriumChapel"; @@ -52932,11 +91400,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "sGs" = ( /obj/machinery/light/directional/east, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sGw" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ dir = 9 @@ -52978,6 +91449,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD "sGV" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -52986,6 +91458,8 @@ /obj/machinery/barsign, /turf/closed/wall, /area/station/commons/lounge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sHg" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/camera/directional/south{ @@ -53015,6 +91489,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"sHX" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sIe" = ( /turf/closed/wall/r_wall, /area/station/security/execution/transfer) @@ -53068,6 +91550,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/engineering/supermatter) +<<<<<<< HEAD "sKj" = ( /obj/structure/table, /obj/item/clipboard, @@ -53077,6 +91560,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/server) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sKs" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -53116,6 +91601,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD +======= +"sLf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sLp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -53134,6 +91634,7 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/hallway/primary/central) +<<<<<<< HEAD "sLJ" = ( /obj/effect/turf_decal/siding/white{ dir = 6 @@ -53143,6 +91644,24 @@ }, /turf/open/water, /area/station/service/hydroponics/garden) +======= +"sLF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Science Research"; + network = list("ss13","rd") + }, +/obj/machinery/light/small/directional/south, +/obj/structure/noticeboard/rd{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/science/lab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sLN" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom/directional/north{ @@ -53200,6 +91719,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +<<<<<<< HEAD +======= +"sMo" = ( +/obj/structure/sign/poster/official/cleanliness/directional/west, +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/mirror/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sMB" = ( /obj/machinery/door/window/brigdoor/security/cell/left/directional/south{ id = "Cell 1"; @@ -53294,6 +91825,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) +<<<<<<< HEAD "sOe" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/brown{ @@ -53301,6 +91833,8 @@ }, /turf/open/floor/iron, /area/station/construction/storage_wing) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sOi" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -53358,6 +91892,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/brig) +<<<<<<< HEAD "sPh" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -53377,10 +91912,36 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +======= +"sPj" = ( +/obj/machinery/door/airlock/command{ + name = "Head of Security's Office" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mapping_helpers/airlock/access/all/security/hos, /obj/effect/landmark/navigate_destination, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +<<<<<<< HEAD +======= +"sPq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sPy" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53401,6 +91962,18 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/white, /area/station/science/explab) +<<<<<<< HEAD +======= +"sPO" = ( +/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 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sPV" = ( /obj/structure/closet/secure_closet/captains, /obj/structure/window/reinforced/spawner/directional/north, @@ -53411,12 +91984,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "sQh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sQp" = ( /obj/machinery/exodrone_launcher, /obj/item/exodrone, @@ -53674,6 +92250,16 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +<<<<<<< HEAD +======= +"sTU" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sTW" = ( /obj/effect/turf_decal/tile/yellow, /obj/structure/disposalpipe/segment{ @@ -53690,6 +92276,22 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"sUc" = ( +/obj/machinery/conveyor/inverted{ + dir = 6; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sUo" = ( /turf/open/floor/engine/air, /area/station/engineering/atmos) @@ -53701,6 +92303,26 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"sUy" = ( +/obj/structure/table/wood, +/obj/structure/sign/picture_frame/showroom/one{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/two{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sUC" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53715,6 +92337,15 @@ }, /turf/open/floor/iron, /area/station/security/brig) +<<<<<<< HEAD +======= +"sUD" = ( +/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, +/area/station/cargo/miningoffice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sUJ" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance/two, @@ -53828,6 +92459,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "sWq" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -53842,6 +92474,8 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sWs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -53881,6 +92515,14 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD +======= +"sWU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sWV" = ( /turf/closed/wall/r_wall, /area/station/security/detectives_office) @@ -53951,6 +92593,7 @@ /obj/structure/chair/office{ dir = 4 }, +<<<<<<< HEAD /turf/open/floor/plating, /area/station/maintenance/port/aft) "sYp" = ( @@ -54149,6 +92792,190 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, +======= +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"sYh" = ( +/obj/structure/sign/plaques/kiddie/perfect_drone{ + pixel_y = 32 + }, +/obj/structure/table/wood, +/obj/item/storage/backpack/duffelbag/drone, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"sYp" = ( +/obj/machinery/vending/boozeomat, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"sZa" = ( +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/siding/wood, +/obj/effect/landmark/start/clown, +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood/large, +/area/station/service/theater) +"sZo" = ( +/obj/machinery/light/directional/north, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, +/obj/effect/turf_decal/stripes/line, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"sZH" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/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/medical/medbay/central) +"sZI" = ( +/obj/structure/table, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/core, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"sZK" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"sZN" = ( +/obj/machinery/atmospherics/components/binary/pump, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"sZP" = ( +/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/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"sZU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tak" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"tar" = ( +/obj/machinery/medical_kiosk, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"taz" = ( +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "forestarboard"; + name = "Fore-Starboard Solar Array" + }, +/turf/open/floor/iron/solarpanel/airless, +/area/station/solars/starboard/fore) +"taI" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/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/medical/medbay/central) +"taO" = ( +/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/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"taW" = ( +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, +/area/station/medical/virology) +"taX" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"taZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"tbd" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"tbl" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/door/airlock/public/glass{ + name = "Bar" + }, +/turf/open/floor/iron, +/area/station/commons/lounge) +"tbp" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Server Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/server) +"tbI" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"tbK" = ( +/obj/structure/bookcase/random/nonfiction, +/turf/open/floor/wood, +/area/station/service/library) +"tck" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/white, /area/station/medical/medbay/central) "tcn" = ( @@ -54157,10 +92984,48 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"tcr" = ( +/obj/structure/table/wood, +/obj/item/storage/box/coffeepack{ + pixel_x = 15; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/glass/bottle/juice/cream{ + pixel_x = 15; + pixel_y = 2 + }, +/obj/machinery/coffeemaker/impressa, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tcu" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/security/courtroom) +<<<<<<< HEAD +======= +"tcx" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/item/aicard, +/obj/item/pai_card, +/obj/item/circuitboard/aicore, +/obj/machinery/keycard_auth/wall_mounted/directional/north{ + pixel_x = -5 + }, +/obj/machinery/button/door/directional/north{ + id = "xeno_blastdoor"; + name = "Xenobiology Containment Control"; + pixel_x = 8; + req_access = list("rd") + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tcC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -54188,6 +93053,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +<<<<<<< HEAD "tcY" = ( /obj/effect/landmark/start/quartermaster, /obj/structure/cable, @@ -54200,6 +93066,8 @@ }, /turf/open/floor/iron/diagonal, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tdf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -54226,6 +93094,7 @@ "tdW" = ( /turf/closed/wall/r_wall, /area/station/security/execution/education) +<<<<<<< HEAD "ted" = ( /obj/item/radio/intercom/directional/west, /obj/structure/table/glass, @@ -54243,6 +93112,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tep" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -54252,6 +93123,20 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD +======= +"teq" = ( +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/watering_can, +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tew" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -54341,6 +93226,7 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +<<<<<<< HEAD "tgz" = ( /obj/item/dice/d20, /obj/item/dice, @@ -54354,6 +93240,8 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tgC" = ( /obj/structure/noticeboard/directional/south, /obj/structure/table/wood, @@ -54375,6 +93263,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD "tgE" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -54410,6 +93299,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tgI" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -54480,6 +93371,22 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +<<<<<<< HEAD +======= +"tik" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/machinery/rnd/production/techfab/department/cargo, +/turf/open/floor/iron, +/area/station/cargo/storage) +"tit" = ( +/obj/structure/sink/directional/east, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tiA" = ( /obj/machinery/door/airlock{ id_tag = "Cabin2"; @@ -54493,6 +93400,7 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/port) +<<<<<<< HEAD "tiV" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating_new{ @@ -54503,6 +93411,22 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"tjc" = ( +/obj/structure/table/reinforced, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -8; + pixel_y = 9 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/cell_charger, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tjf" = ( /obj/machinery/hydroponics/soil{ pixel_y = 8 @@ -54544,6 +93468,7 @@ }, /turf/open/floor/iron, /area/station/security/brig) +<<<<<<< HEAD "tjz" = ( /obj/structure/table/reinforced, /obj/item/stock_parts/power_store/cell/high{ @@ -54558,6 +93483,8 @@ /obj/machinery/cell_charger, /turf/open/floor/iron, /area/station/science/robotics/lab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tjE" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/spawner/random/structure/closet_maintenance, @@ -54579,6 +93506,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD "tjR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/mirror/directional/west, @@ -54591,6 +93519,8 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tkf" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/conveyor{ @@ -54692,6 +93622,7 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, +<<<<<<< HEAD /turf/open/floor/iron/white, /area/station/science/cytology) "tmn" = ( @@ -54709,12 +93640,18 @@ /obj/machinery/light/small/broken/directional/east, /turf/open/floor/iron, /area/station/cargo/warehouse) +======= +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/science/cytology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tmq" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "tms" = ( /obj/machinery/turretid{ icon_state = "control_stun"; @@ -54760,6 +93697,8 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/white, /area/station/security/prison/mess) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tmz" = ( /obj/machinery/door/poddoor/shutters{ dir = 1; @@ -54833,6 +93772,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +<<<<<<< HEAD +======= +"tnk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate_abandoned, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tnm" = ( /obj/structure/chair{ dir = 1 @@ -54848,6 +93796,15 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +<<<<<<< HEAD +======= +"tnF" = ( +/obj/machinery/light/small/dim/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tnG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/showcase/machinery/oldpod{ @@ -54876,6 +93833,7 @@ }, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD "tou" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -54917,6 +93875,23 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +======= +"toK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"toM" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"toR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/dark/textured_large, /area/station/science/cytology) "toV" = ( @@ -54949,6 +93924,18 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD +======= +"tpA" = ( +/obj/machinery/cell_charger{ + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/item/stock_parts/power_store/cell/high, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tpD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -54964,6 +93951,7 @@ /obj/machinery/griddle, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +<<<<<<< HEAD "tpY" = ( /obj/structure/table, /obj/item/reagent_containers/cup/beaker{ @@ -54995,6 +93983,8 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tqd" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, @@ -55024,6 +94014,15 @@ /obj/effect/spawner/random/clothing/costume, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD +======= +"tqo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/effect/landmark/start/cargo_technician, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tqx" = ( /obj/machinery/door/window/left/directional/north{ name = "Mass Driver Control Door"; @@ -55063,6 +94062,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +<<<<<<< HEAD "tro" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -55070,6 +94070,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "trx" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/light/directional/north, @@ -55100,6 +94102,15 @@ "tsd" = ( /turf/closed/wall, /area/station/maintenance/space_hut) +<<<<<<< HEAD +======= +"tsi" = ( +/obj/structure/sign/warning/vacuum/external/directional/east, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tst" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55195,6 +94206,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "ttT" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -55206,6 +94218,8 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ttW" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -55274,6 +94288,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +<<<<<<< HEAD +======= +"tvv" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/closed/wall, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tvE" = ( /turf/closed/wall/r_wall, /area/station/command/gateway) @@ -55301,6 +94324,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/space, /area/space/nearstation) +<<<<<<< HEAD "twg" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -55314,11 +94338,24 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "twj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD +======= +"twl" = ( +/obj/structure/table, +/obj/item/hand_tele, +/obj/machinery/airalarm/directional/west, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "twr" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, @@ -55487,6 +94524,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD +======= +"tzI" = ( +/obj/structure/table/reinforced, +/obj/item/emergency_bed, +/obj/item/emergency_bed{ + pixel_y = 3 + }, +/obj/item/emergency_bed{ + pixel_y = 6 + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tzJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55624,6 +94676,24 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"tCC" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"tCF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tCG" = ( /obj/effect/landmark/navigate_destination, /turf/open/floor/iron, @@ -55643,10 +94713,13 @@ }, /turf/open/floor/iron, /area/station/security/office) +<<<<<<< HEAD "tCN" = ( /obj/structure/cable, /turf/closed/wall, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tCS" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/fore) @@ -55702,6 +94775,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +<<<<<<< HEAD /obj/effect/turf_decal/tile/bar{ dir = 1 }, @@ -55877,6 +94951,164 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/service) +======= +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tEm" = ( +/obj/structure/broken_flooring/pile/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"tEr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"tEt" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/research) +"tEy" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"tEP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tcomms) +"tFj" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"tFr" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"tGI" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"tGL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tGS" = ( +/obj/structure/cable, +/obj/machinery/door/window/left/directional/south{ + name = "Containment Pen #2"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"tGU" = ( +/obj/structure/sign/poster/random/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/machinery/light/small/broken/directional/east, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"tGX" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) +"tHE" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/central) +"tHR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"tHT" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"tHZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/hallway/secondary/entry) +"tIa" = ( +/obj/structure/cable/multilayer/connected, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"tIb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"tId" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/camera/directional/east{ + c_tag = "Science Maintenance Corridor"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white, +/area/station/science/research) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tIe" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, @@ -55930,6 +95162,20 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"tIR" = ( +/obj/structure/table/wood, +/obj/item/storage/photo_album{ + pixel_y = -4 + }, +/obj/item/camera{ + pixel_y = 4 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tJb" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -55952,6 +95198,20 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +<<<<<<< HEAD +======= +"tJB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tJE" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /turf/open/floor/iron/dark, @@ -55987,6 +95247,7 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +<<<<<<< HEAD "tJQ" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -55995,6 +95256,8 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/sorting) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tKa" = ( /obj/machinery/newscaster/directional/west, /obj/structure/cable, @@ -56037,6 +95300,43 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"tKR" = ( +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Research Division"; + name = "Research Division Fax Machine"; + pixel_x = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"tLb" = ( +/obj/structure/sign/warning/electric_shock/directional/south, +/turf/open/space/basic, +/area/space/nearstation) +"tLc" = ( +/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/machinery/door_buttons/airlock_controller{ + idExterior = "xeno_airlock_exterior"; + idInterior = "xeno_airlock_interior"; + idSelf = "xeno_airlock_control"; + name = "Access Console"; + pixel_x = -25; + pixel_y = -25; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tLd" = ( /obj/structure/chair/office{ dir = 8 @@ -56046,6 +95346,23 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +<<<<<<< HEAD +======= +"tLg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = -8; + pixel_y = -24 + }, +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -8; + pixel_y = -36 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tLi" = ( /obj/effect/landmark/start/captain, /obj/structure/chair/comfy/brown{ @@ -56071,6 +95388,27 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD +======= +"tLH" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/item/disk/tech_disk{ + pixel_x = -6 + }, +/obj/item/disk/tech_disk{ + pixel_x = 6 + }, +/obj/item/disk/tech_disk{ + pixel_y = 6 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/lab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tLN" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -56091,6 +95429,14 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/fore) +<<<<<<< HEAD +======= +"tMn" = ( +/obj/structure/cable, +/obj/structure/railing/corner/end, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tMA" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10-Aft-To-Central"; @@ -56135,12 +95481,38 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD "tMX" = ( /obj/effect/turf_decal/trimline/brown/filled/shrink_cw{ dir = 8 }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"tMS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"tMY" = ( +/obj/structure/cable, +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/item/radio/off{ + pixel_x = -11; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/item/binoculars, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tNg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56165,12 +95537,31 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD "tND" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit/green{ luminosity = 2 }, /area/station/ai_monitored/command/nuke_storage) +======= +"tNC" = ( +/obj/structure/table/wood, +/obj/structure/sign/picture_frame/showroom/three{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/four{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/item/pai_card{ + desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; + name = "\improper Nanotrasen-brand personal AI device exhibit" + }, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tNH" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -56314,6 +95705,22 @@ /obj/machinery/digital_clock/directional/south, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD +======= +"tPt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/mining{ + name = "Mining Office" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tPw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -56349,11 +95756,48 @@ /obj/item/clothing/mask/surgical, /turf/open/floor/iron/showroomfloor, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD "tQo" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, /mob/living/basic/sloth/citrus, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"tPW" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/filingcabinet/filingcabinet, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"tQp" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/machinery/button/door/directional/west{ + id = "qmroom"; + name = "Privacy Blast Doors Control"; + pixel_y = -7 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -22; + pixel_y = 5 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tQC" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom, /obj/effect/turf_decal/delivery, @@ -56410,6 +95854,7 @@ "tSw" = ( /turf/closed/wall, /area/station/maintenance/aft/greater) +<<<<<<< HEAD "tSy" = ( /obj/machinery/vending/autodrobe, /obj/structure/sign/poster/contraband/clown/directional/east, @@ -56422,6 +95867,8 @@ /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tSP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56439,6 +95886,7 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD "tTd" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -56446,6 +95894,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/cargo/miningoffice) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tTB" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2, /obj/structure/window/reinforced/spawner/directional/south, @@ -56493,6 +95943,7 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD "tTZ" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/structure/table, @@ -56506,6 +95957,23 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/medical/chemistry) +======= +"tUc" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/item/computer_disk{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/computer_disk{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tUl" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser, @@ -56524,6 +95992,20 @@ "tUn" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD +======= +"tUt" = ( +/obj/structure/table/glass, +/obj/item/clothing/accessory/armband/hydro, +/obj/item/clothing/suit/apron, +/obj/item/wrench, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tUu" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -56583,6 +96065,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/execution/education) +<<<<<<< HEAD +======= +"tVk" = ( +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south, +/obj/structure/rack, +/obj/item/storage/briefcase/secure, +/obj/item/cigarette/cigar, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tVm" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -56687,6 +96183,19 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +<<<<<<< HEAD +======= +"tWU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/departments/vault/directional/north{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tWV" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -56727,6 +96236,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +<<<<<<< HEAD +======= +"tXO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tXU" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -56802,6 +96323,16 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/security/execution/transfer) +<<<<<<< HEAD +======= +"tYU" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tYW" = ( /obj/machinery/light/directional/south, /obj/structure/cable, @@ -56859,6 +96390,7 @@ /obj/item/canvas/twentythree_twentythree, /turf/open/floor/iron, /area/station/commons/storage/tools) +<<<<<<< HEAD "tZV" = ( /obj/structure/window/spawner/directional/west, /obj/structure/window/spawner/directional/south, @@ -56869,6 +96401,8 @@ /obj/structure/flora/grass/jungle/b/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tZX" = ( /obj/structure/window/spawner/directional/west, /obj/machinery/light/floor, @@ -56901,6 +96435,7 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +<<<<<<< HEAD "uak" = ( /obj/machinery/status_display/evac/directional/north, /obj/item/folder/yellow{ @@ -56916,6 +96451,8 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uam" = ( /obj/effect/turf_decal/plaque{ icon_state = "L6" @@ -56957,6 +96494,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD +======= +"uaN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uaR" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -56996,6 +96542,19 @@ /obj/structure/sign/directions/evac, /turf/closed/wall/r_wall, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD +======= +"ubj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/poddoor/shutters{ + name = "Warehouse Shutters"; + id = "warehouse" + }, +/turf/open/floor/catwalk_floor, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ubl" = ( /obj/machinery/telecomms/broadcaster/preset_left, /turf/open/floor/circuit/telecomms/mainframe, @@ -57043,6 +96602,30 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) +<<<<<<< HEAD +======= +"ubF" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light/small/directional/south, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ubQ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -57141,6 +96724,16 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"udU" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ued" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57206,6 +96799,7 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +<<<<<<< HEAD "ueI" = ( /obj/machinery/light_switch/directional/west{ pixel_x = -20 @@ -57233,6 +96827,8 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uga" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -57255,6 +96851,7 @@ name = "Transport Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ +<<<<<<< HEAD dir = 8 }, /turf/open/floor/plating, @@ -57952,10 +97549,690 @@ /area/station/commons/locker) "usV" = ( /obj/structure/table/wood, +======= + dir = 8 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"ugP" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ugY" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"uha" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/start/depsec/supply, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"uhq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"uhs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"uht" = ( +/obj/machinery/vending/tool, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"uhu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"uhx" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"uhI" = ( +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"uhP" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/lounge) +"uhT" = ( +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"uhW" = ( +/obj/structure/cable, +/obj/machinery/door/window/right/directional/west{ + name = "Theater Stage" + }, +/turf/open/floor/carpet, +/area/station/service/theater) +"uiw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) +"uiB" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"uiK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"uiM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"uiR" = ( +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) +"ujk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/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/science/ordnance) +"ujH" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"ujJ" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/science/central) +"ujM" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"ujT" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"uke" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/booze{ + spawn_loot_count = 3; + spawn_loot_double = 0; + spawn_random_offset = 1 + }, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"ukk" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"ukm" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/small/directional/east, +/obj/structure/bed, +/obj/item/bedsheet/qm, +/obj/effect/landmark/start/quartermaster, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"ukq" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ukv" = ( +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/cultivator, +/obj/item/clothing/head/utility/chefhat, +/obj/machinery/camera/directional/west{ + c_tag = "Service - Starboard" + }, +/obj/item/storage/box/lights/mixed, +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"uky" = ( +/obj/machinery/smartfridge/drinks, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"ulv" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/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/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/research) +"ulA" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space, +/area/space/nearstation) +"ulE" = ( +/obj/machinery/door/poddoor/massdriver_chapel, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/station/service/chapel/funeral) +"ulR" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"umS" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/button/door/directional/west{ + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_y = -9 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"unc" = ( +/obj/structure/disposalpipe/segment, +/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/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"unk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + filter_type = list(/datum/gas/nitrogen) + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"unt" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/light/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"uny" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"unK" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/prison/directional/north, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, +<<<<<<< HEAD +======= +/obj/item/restraints/handcuffs, +/turf/open/floor/carpet, +/area/station/security/detectives_office) +"unL" = ( +/turf/closed/wall, +/area/station/maintenance/starboard/greater) +"unP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"unR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"uoe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uoj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"uok" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"uor" = ( +/obj/machinery/door/poddoor{ + id = "QMLoaddoor2"; + name = "Supply Dock Loading Door" + }, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/cargo/storage) +"uou" = ( +/obj/structure/rack, +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/motion/directional/west{ + c_tag = "Armory - Internal" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"uoM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 1"; + name = "Cell 1 locker" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"upe" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Interrogation room"; + network = list("interrogation") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"upM" = ( +/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/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"upN" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"upR" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"upT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron/white, +/area/station/science/explab) +"uqi" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/engineering{ + name = "Auxiliary Base Construction" + }, +/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/engineering/aux_base, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"uqp" = ( +/obj/machinery/door/airlock/research{ + name = "Research Division Access" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-entrance" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/research) +"uqA" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"uqL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"uqO" = ( +/obj/structure/table, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/item/multitool/circuit{ + pixel_x = 7 + }, +/obj/item/multitool/circuit, +/obj/item/multitool/circuit{ + pixel_x = -8 + }, +/turf/open/floor/iron/white, +/area/station/science/explab) +"uqX" = ( +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"ure" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"urf" = ( +/obj/structure/closet/secure_closet/injection{ + name = "educational injections locker"; + pixel_x = 2 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"urs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"urA" = ( +/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/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"urE" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"urG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/plumbed, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"urK" = ( +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron, +/area/station/commons/dorms) +"urQ" = ( +/obj/structure/lattice/catwalk, +/obj/item/stack/cable_coil, +/turf/open/space/basic, +/area/station/solars/starboard/fore) +"urR" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/grimy, +/area/station/security/interrogation) +"urS" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"usg" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/table/reinforced, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/item/clothing/head/utility/welding, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"ush" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"usi" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/port) +"usk" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Auxiliary Bathrooms" + }, +/obj/effect/decal/cleanable/dirt, +/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/commons/toilet/auxiliary) +"uso" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"usA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"usB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"usC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) +"usD" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Departure Lounge - Starboard Aft" + }, +/obj/item/kirbyplants/organic/plant16, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"usJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"usK" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"usP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"usQ" = ( +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/dark, /area/station/command/bridge) "uta" = ( @@ -57979,6 +98256,7 @@ c_tag = "Security - Office - Starboard" }, /obj/structure/disposalpipe/segment{ +<<<<<<< HEAD dir = 4 }, /turf/open/floor/wood, @@ -58370,6 +98648,473 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +======= + dir = 4 + }, +/turf/open/floor/wood, +/area/station/security/office) +"uth" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"utk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"utt" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) +"utD" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"utE" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Theater - Stage" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east, +/obj/structure/table/wood, +/obj/item/clothing/glasses/monocle, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/wood/large, +/area/station/service/theater) +"utM" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=13.3-Engineering-Central"; + location = "13.2-Tcommstore" + }, +/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/hallway/primary/starboard) +"utS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/hangover, +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/service/bar) +"uuc" = ( +/obj/structure/chair/pew/left, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) +"uud" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/wrapping, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"uuv" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"uuD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"uuO" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/mechbay) +"uvw" = ( +/obj/machinery/status_display/supply{ + pixel_y = 32 + }, +/obj/machinery/conveyor{ + dir = 5; + id = "QMLoad2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"uvC" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/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) +"uvP" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/virology/glass{ + name = "Containment Cells" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/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/medical/virology, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"uwa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"uwe" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/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/engineering/main) +"uwf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/book/manual/wiki/security_space_law, +/obj/machinery/camera/directional/south{ + c_tag = "Security Post - Cargo" + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"uwh" = ( +/obj/structure/chair/comfy{ + dir = 1 + }, +/obj/item/clothing/suit/costume/wellworn_shirt/messy/graphic/gamer, +/obj/item/clothing/head/fedora, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"uwy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/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/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"uwK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/start/roboticist, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"uwM" = ( +/obj/effect/landmark/start/depsec/supply, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"uwQ" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"uxa" = ( +/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/hallway/primary/port) +"uxb" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"uxm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"uxt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/meter, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"uxS" = ( +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"uya" = ( +/obj/machinery/disposal/delivery_chute, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/east, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"uyd" = ( +/obj/structure/sign/warning/pods/directional/east, +/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) +"uyf" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/filled/line, +/turf/open/floor/iron, +/area/station/cargo/storage) +"uyh" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"uyi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/south{ + id = "prisonereducation"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"uyr" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uyw" = ( +/obj/effect/landmark/start/chief_medical_officer, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"uyY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/station/service/library) +"uza" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/visit) +"uzb" = ( +/obj/structure/rack, +/obj/machinery/light/directional/east, +/obj/item/fuel_pellet, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"uzc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/server) +"uzi" = ( +/obj/structure/lattice, +/obj/structure/chair/sofa/corp/left{ + desc = "Looks like someone threw it out. Covered in donut crumbs."; + dir = 4; + name = "couch" + }, +/turf/open/space/basic, +/area/space/nearstation) +"uzk" = ( +/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 = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"uzl" = ( +/obj/machinery/camera/directional/west{ + active_power_usage = 0; + c_tag = "Turbine Vent"; + network = list("turbine"); + use_power = 0 + }, +/turf/open/space/basic, +/area/space/nearstation) +"uzJ" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + 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/medical/medbay/central) +"uAg" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"uAu" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"uAC" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"uAE" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"uAM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port) +"uBj" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"uBp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"uBy" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Science Robotics Workshop"; + network = list("ss13","rd") + }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/north{ + pixel_x = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"uBC" = ( +/obj/machinery/mass_driver/shack{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/station/maintenance/space_hut) +"uBF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"uBG" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uBI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -58401,12 +99146,15 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/iron, /area/station/security/prison) +<<<<<<< HEAD "uDf" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/start/hangover, /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/command) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uDn" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow{ @@ -58465,6 +99213,16 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD +======= +"uEs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uEw" = ( /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, @@ -58485,6 +99243,20 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD +======= +"uEA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uEC" = ( /obj/machinery/conveyor{ dir = 4; @@ -58495,6 +99267,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +<<<<<<< HEAD "uEM" = ( /obj/item/radio/intercom/directional/north, /obj/structure/sign/poster/official/random/directional/east, @@ -58503,10 +99276,22 @@ }, /turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/entry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uEO" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD +======= +"uEP" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uET" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -58633,6 +99418,23 @@ }, /turf/open/floor/iron/white, /area/station/security/prison/visit) +<<<<<<< HEAD +======= +"uGq" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Virology Lab"; + network = list("ss13","medbay") + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uGr" = ( /obj/machinery/door/airlock/maintenance{ name = "Crematorium" @@ -58665,6 +99467,27 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/aft) +<<<<<<< HEAD +======= +"uGU" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Port Primary Hallway" + }, +/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/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uGX" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -58685,12 +99508,15 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD "uHh" = ( /obj/machinery/chem_master, /obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uHo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58708,12 +99534,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD "uHw" = ( /obj/effect/turf_decal/siding/white{ dir = 8 }, /turf/open/water, /area/station/service/hydroponics/garden) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uHA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -58802,6 +99631,25 @@ /obj/machinery/computer/accounting, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +<<<<<<< HEAD +======= +"uJz" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/flatpack{ + board = /obj/item/circuitboard/machine/flatpacker; + pixel_x = -5 + }, +/obj/item/multitool{ + pixel_x = 8 + }, +/turf/open/floor/iron/checker, +/area/station/engineering/storage_shared) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uJB" = ( /obj/structure/chair/stool/directional/east, /turf/open/floor/iron, @@ -58919,6 +99767,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +<<<<<<< HEAD "uLA" = ( /obj/structure/table, /obj/structure/disposalpipe/segment{ @@ -58949,6 +99798,19 @@ }, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) +======= +"uLE" = ( +/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/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uLK" = ( /obj/structure/flora/bush/pale/style_random, /obj/structure/flora/bush/ferny/style_random, @@ -58958,10 +99820,13 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/grass, /area/station/science/research) +<<<<<<< HEAD "uLP" = ( /obj/structure/sign/departments/exodrone/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uMb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58987,6 +99852,16 @@ dir = 4 }, /area/station/medical/chem_storage) +<<<<<<< HEAD +======= +"uMj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uMR" = ( /obj/machinery/holopad, /turf/open/floor/iron/white/side{ @@ -59072,6 +99947,17 @@ /obj/effect/spawner/random/trash/box, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"uNZ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/closet/crate, +/obj/item/toy/plush/lizard_plushie/green{ + name = "Loads-The-Crates" + }, +/turf/open/space/basic, +/area/space/nearstation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uOd" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, @@ -59217,6 +100103,20 @@ }, /turf/open/floor/iron/dark, /area/station/security/evidence) +<<<<<<< HEAD +======= +"uQL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uRa" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -59226,6 +100126,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +<<<<<<< HEAD "uRd" = ( /obj/structure/table/reinforced, /obj/item/folder/white{ @@ -59250,6 +100151,8 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uRl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -59298,6 +100201,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/prison) +<<<<<<< HEAD "uSb" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -59305,6 +100209,8 @@ }, /turf/open/floor/iron, /area/station/construction/storage_wing) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uSz" = ( /obj/structure/table, /obj/item/phone{ @@ -59314,6 +100220,7 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "uSF" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -59355,6 +100262,42 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +======= +"uSM" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 1 + }, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"uSO" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/effect/turf_decal/arrows/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"uTj" = ( +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"uTw" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/spawner/random/maintenance, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"uTF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark, /area/station/security/brig) @@ -59397,6 +100340,19 @@ /obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +<<<<<<< HEAD +======= +"uUb" = ( +/obj/machinery/reagentgrinder, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/table/glass, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uUg" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, @@ -59409,6 +100365,7 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) +<<<<<<< HEAD "uUB" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -59434,6 +100391,16 @@ /turf/open/space/basic, /area/space/nearstation) "uUL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 +======= +"uUL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -59485,6 +100452,358 @@ /obj/structure/sign/poster/official/nanotrasen_logo/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) +"uVm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uVv" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"uVx" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"uVE" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) +"uVJ" = ( +/obj/effect/spawner/random/structure/grille, +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"uVQ" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"uWk" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/science/xenobiology/hallway) +"uWn" = ( +/obj/machinery/nuclearbomb/selfdestruct, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"uWo" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/turf/open/floor/iron, +/area/station/security/brig) +"uWs" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/mechbay) +"uWt" = ( +/obj/structure/rack, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/suture, +/obj/item/reagent_containers/syringe/multiver, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"uWx" = ( +/obj/effect/turf_decal/bot/left, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"uWA" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/machinery/door/window/left/directional/west{ + name = "Secure Art Exhibition"; + req_access = list("library") + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/obj/effect/spawner/random/decoration/statue{ + spawn_loot_chance = 50 + }, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/carpet/royalblue, +/area/station/service/library) +"uWK" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock{ + name = "Theater Backstage" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/station/service/theater) +"uWL" = ( +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/maintenance/port/aft) +"uWS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) +"uWU" = ( +/obj/structure/table/reinforced, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/bar) +"uXd" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/main) +"uXt" = ( +/obj/docking_port/stationary/syndicate/northwest{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"uXG" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Psychology Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"uXS" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/closet/secure_closet/hydroponics, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"uYi" = ( +/turf/open/floor/plating/airless, +/area/station/solars/starboard/aft) +"uYl" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"uYm" = ( +/obj/machinery/meter, +/obj/machinery/door/window/left/directional/north{ + name = "Gas Ports" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"uYp" = ( +/turf/closed/wall, +/area/station/medical/break_room) +"uYB" = ( +/obj/structure/cable, +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"uYD" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port) +"uYH" = ( +/obj/structure/reflector/double/anchored{ + dir = 5 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"uYI" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + 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/medical/chemistry) +"uYL" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 5 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +"uYP" = ( +/obj/structure/cable, +/obj/machinery/door/window/left/directional/north{ + name = "Containment Pen #7"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"uYT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"uZa" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron, +/area/station/security/prison/work) +"uZj" = ( +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/obj/structure/sign/directions/command{ + pixel_y = -8 + }, +/turf/closed/wall/r_wall, +/area/station/commons/storage/tools) +"uZo" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"uZu" = ( +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/kitchen) +"uZD" = ( +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/service/chapel) +"uZK" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"uZL" = ( +/obj/machinery/requests_console/directional/north{ + department = "Law Office"; + name = "Lawyer Requests Console" + }, +/obj/machinery/newscaster/directional/west, +/obj/structure/aquarium/lawyer, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"uZP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +<<<<<<< HEAD +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) +"uUX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) +"uVd" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) +"uVf" = ( +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_y = 12 + }, +/obj/item/electronics/airalarm{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/electronics/firealarm{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/item/electronics/airalarm{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/electronics/firealarm{ + pixel_x = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/structure/sign/poster/official/nanotrasen_logo/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) "uVj" = ( /obj/machinery/button/ignition{ id = "Xenobio"; @@ -59802,11 +101121,33 @@ c_tag = "Prison Isolation Cell"; network = list("ss13","prison","isolation") }, +======= +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"vae" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Prison Isolation Cell"; + network = list("ss13","prison","isolation") + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/white, /area/station/security/prison/safe) +<<<<<<< HEAD +======= +"vag" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vaB" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -59875,6 +101216,16 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD +======= +"vbF" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/station/ai_monitored/command/nuke_storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vbL" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -59922,6 +101273,7 @@ }, /turf/open/floor/plating, /area/station/service/chapel/funeral) +<<<<<<< HEAD "vdi" = ( /obj/machinery/camera/directional/west{ c_tag = "Security - Office - Port" @@ -59929,6 +101281,34 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, +======= +"vde" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/north{ + id = "warehouse"; + name = "Warehouse Shutters Control" + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch, +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"vdg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/netpod, +/obj/effect/decal/cleanable/robot_debris, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) +"vdi" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Office - Port" + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/security/office) "vdx" = ( @@ -59943,6 +101323,19 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"vdW" = ( +/obj/structure/cable, +/obj/structure/closet/crate, +/obj/effect/turf_decal/bot/left, +/obj/structure/window/spawner/directional/east, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "veo" = ( /obj/structure/weightmachine/weightlifter{ color = "#f5a183"; @@ -59957,6 +101350,7 @@ /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/siding/white{ dir = 4 +<<<<<<< HEAD }, /turf/open/floor/iron/dark, /area/station/medical/storage) @@ -60193,6 +101587,272 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +======= + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"veO" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"veS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"vfa" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/treatment_center) +"vfh" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Research Test Chamber"; + req_access = list("science") + }, +/turf/open/floor/engine, +/area/station/science/explab) +"vfk" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"vfv" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"vfC" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"vfO" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"vfU" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"vgd" = ( +/obj/machinery/door/airlock/engineering{ + name = "Telecomms Storage" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/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/engineering/tcoms, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tcomms) +"vgr" = ( +/obj/item/crowbar, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"vgu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"vgv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/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/command/gateway) +"vgW" = ( +/obj/machinery/door/window/left/directional/west{ + name = "MiniSat Airlock Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"vgZ" = ( +/obj/structure/table/glass, +/obj/structure/cable, +/obj/machinery/fax{ + fax_name = "Chief Medical Officer's Office"; + name = "Chief Medical Officer's Fax Machine" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +"vhb" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"vhj" = ( +/obj/structure/chair{ + name = "Judge" + }, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Courtroom" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/courtroom) +"vht" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"vhv" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmospherics_engine) +"vhB" = ( +/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/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"vhD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security{ + name = "Evidence Storage" + }, +/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/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/evidence) +"via" = ( +/obj/machinery/door/airlock/medical{ + name = "Medical Cold Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/medical/coldroom) +"vif" = ( +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"vip" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/machinery/airalarm/directional/north, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/station/medical/virology) +"vis" = ( +/obj/structure/filingcabinet, +/obj/item/folder/documents, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/poster/traitor, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"viF" = ( +/obj/machinery/computer/upload/borg, +/obj/machinery/door/window/left/directional/south{ + name = "Cyborg Upload Console Window"; + req_access = list("ai_upload") + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"viH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"viQ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/prison/garden) +"viS" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) +"viU" = ( +/obj/effect/landmark/start/atmospheric_technician, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"vjg" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/tile/brown/diagonal_centre, +/obj/effect/turf_decal/tile/yellow/diagonal_edge, +/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/siding/yellow/corner{ + dir = 8 + }, +/turf/open/floor/iron/diagonal, +/area/station/cargo/storage) +"vjk" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/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/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"vjn" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/hallway/primary/central) "vjv" = ( @@ -60246,6 +101906,33 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +<<<<<<< HEAD +======= +"vjX" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/door/firedoor, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/pen, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters_2"; + name = "Pharmacy Shutters" + }, +/obj/machinery/door/window/right/directional/east{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vjZ" = ( /obj/structure/table, /turf/open/floor/iron/dark/side, @@ -60321,6 +102008,16 @@ /obj/effect/spawner/random/techstorage/rnd_secure_all, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +<<<<<<< HEAD +======= +"vlk" = ( +/obj/effect/turf_decal/trimline/red/filled/warning, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vlq" = ( /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron, @@ -60329,6 +102026,7 @@ /obj/item/target/alien/anchored, /obj/machinery/camera/preset/ordnance{ dir = 5 +<<<<<<< HEAD }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless{ @@ -60347,6 +102045,60 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +======= + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless{ + luminosity = 2 + }, +/area/station/science/ordnance/bomb) +"vlH" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"vlP" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +"vlY" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/directional/north{ + c_tag = "Science Robotics Office"; + network = list("ss13","rd") + }, +/obj/item/radio/intercom/directional/north, +/obj/item/storage/medkit{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/storage/medkit{ + pixel_x = -5; + pixel_y = -1 + }, +/obj/item/healthanalyzer{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/healthanalyzer{ + pixel_x = -3; + pixel_y = -4 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"vlZ" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) @@ -60359,6 +102111,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +<<<<<<< HEAD "vms" = ( /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60368,6 +102121,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vmx" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 @@ -60384,6 +102139,7 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +<<<<<<< HEAD "vmS" = ( /obj/machinery/camera/directional/north, /obj/machinery/airalarm/directional/north, @@ -60393,6 +102149,14 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) +======= +"vmU" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vmX" = ( /obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, @@ -60446,11 +102210,14 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +<<<<<<< HEAD "vnP" = ( /obj/structure/lattice, /obj/structure/sign/warning/secure_area/directional/east, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vnV" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/siding/wood{ @@ -60483,6 +102250,8 @@ }, /obj/effect/turf_decal/delivery/white{ color = "#52B4E9" +<<<<<<< HEAD +======= }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -60491,10 +102260,22 @@ /obj/effect/turf_decal/tile/neutral/half, /obj/effect/turf_decal/tile/neutral/half{ dir = 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /turf/open/floor/iron/dark/smooth_half{ dir = 4 }, +<<<<<<< HEAD +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/tile/neutral/half, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 4 + }, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/medical/morgue) "voQ" = ( /obj/machinery/disposal/bin, @@ -60617,6 +102398,7 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +<<<<<<< HEAD "vqN" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -60626,6 +102408,8 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vqU" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -60633,6 +102417,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "vre" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -60649,6 +102434,8 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vrn" = ( /obj/item/seeds/wheat, /obj/item/seeds/sugarcane, @@ -60708,6 +102495,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/toilet/auxiliary) +<<<<<<< HEAD "vsz" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -60721,6 +102509,8 @@ "vsD" = ( /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vsG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -60731,6 +102521,26 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD +======= +"vsI" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/obj/item/stack/sheet/glass, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/signaler, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vsO" = ( /obj/machinery/conveyor{ dir = 1; @@ -60741,6 +102551,19 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) +<<<<<<< HEAD +======= +"vsU" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vth" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -60809,10 +102632,54 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +<<<<<<< HEAD "vtT" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"vtI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/lights/mixed{ + pixel_x = -4; + pixel_y = 18 + }, +/obj/item/storage/box/lights/mixed{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/service/janitor) +"vtK" = ( +/obj/machinery/reagentgrinder{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -6 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Bar - Counter" + }, +/obj/structure/table, +/obj/machinery/requests_console/directional/south{ + department = "Bar"; + name = "Bar Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vtX" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -60826,6 +102693,7 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +<<<<<<< HEAD "vuf" = ( /obj/item/assembly/timer{ pixel_x = -3; @@ -60867,6 +102735,8 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vun" = ( /turf/closed/wall, /area/station/medical/storage) @@ -60877,6 +102747,23 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD +======= +"vuz" = ( +/obj/structure/closet/crate, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/spawner/random/engineering/flashlight, +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vuJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -60958,6 +102845,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"vwi" = ( +/obj/structure/table, +/obj/item/cigarette/pipe, +/turf/open/floor/plating, +/area/station/maintenance/port) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vwn" = ( /obj/item/kirbyplants/organic/plant10, /turf/open/floor/wood/large, @@ -60970,6 +102865,7 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/fitness/recreation) +<<<<<<< HEAD "vwL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -60985,6 +102881,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vwP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61034,6 +102932,19 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"vxE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vxJ" = ( /obj/machinery/power/emitter/welded{ dir = 1 @@ -61041,6 +102952,20 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"vxO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vxT" = ( /obj/structure/chair/comfy{ dir = 4 @@ -61058,6 +102983,26 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/iron/white, /area/station/medical/abandoned) +<<<<<<< HEAD +======= +"vyi" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/station/command/corporate_showroom) +"vyv" = ( +/obj/structure/table, +/obj/machinery/status_display/ai/directional/west, +/obj/machinery/flasher/directional/south{ + id = "AI" + }, +/obj/item/ai_module/reset{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/item/ai_module/supplied/freeform, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vyy" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/dirt, @@ -61087,6 +103032,21 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD +======= +"vzt" = ( +/obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/obj/item/surgery_tray/full/morgue, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/medical/morgue) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzx" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/siding/purple{ @@ -61094,6 +103054,17 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +<<<<<<< HEAD +======= +"vzG" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/secondary/entry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzI" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line, @@ -61117,6 +103088,7 @@ }, /turf/open/floor/iron/checker, /area/station/engineering/atmos/storage/gas) +<<<<<<< HEAD "vzJ" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -61129,6 +103101,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzL" = ( /obj/structure/cable, /mob/living/carbon/human/species/monkey, @@ -61165,6 +103139,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD "vAm" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -61175,6 +103150,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAH" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -61191,6 +103168,22 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +<<<<<<< HEAD +======= +"vAT" = ( +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAX" = ( /obj/structure/chair/sofa/left/brown, /obj/structure/sign/poster/official/get_your_legs/directional/north, @@ -61262,6 +103255,7 @@ /turf/open/floor/iron, /area/station/engineering/gravity_generator) "vCu" = ( +<<<<<<< HEAD /obj/structure/table/wood, /obj/item/clothing/head/costume/sombrero/green, /obj/structure/sign/poster/random/directional/east, @@ -61272,6 +103266,24 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/wood/large, /area/station/service/theater) +======= +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) +"vCC" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/sign/poster/contraband/random/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vCN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -61316,6 +103328,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) +<<<<<<< HEAD "vDO" = ( /obj/structure/table/glass, /obj/item/clothing/accessory/armband/hydro, @@ -61327,6 +103340,8 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vDV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -61392,12 +103407,59 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +<<<<<<< HEAD +======= +"vEv" = ( +/obj/machinery/computer/mecha{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/machinery/requests_console/directional/east{ + department = "Research Director's Desk"; + name = "Research Director's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/computer/security/telescreen/rd/directional/north, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vEw" = ( /obj/structure/chair/stool/directional/south, /obj/item/radio/intercom/prison/directional/north, /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/security/prison) +<<<<<<< HEAD +======= +"vEC" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/item/radio/headset/headset_medsci{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vEH" = ( /obj/machinery/door/window/right/directional/east{ name = "Danger: Conveyor Access"; @@ -61551,6 +103613,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD +======= +"vHa" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vHs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -61671,6 +103740,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD "vJo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -61704,6 +103774,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vJy" = ( /obj/structure/rack, /obj/item/stack/sheet/cardboard, @@ -61747,6 +103819,7 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +<<<<<<< HEAD "vKi" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed{ @@ -61759,11 +103832,21 @@ }, /turf/open/floor/iron, /area/station/cargo/warehouse) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vKm" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"vKn" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/structure/crate_loot, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vKt" = ( /obj/structure/table/wood/fancy/royalblue, /obj/structure/sign/painting/library_secure{ @@ -61774,6 +103857,15 @@ }, /turf/open/floor/carpet/royalblue, /area/station/service/library) +<<<<<<< HEAD +======= +"vKC" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vKL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -61832,6 +103924,14 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD +======= +"vLM" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/dice, +/turf/open/floor/wood, +/area/station/commons/lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vLX" = ( /obj/item/wrench, /turf/open/floor/iron/dark, @@ -61849,6 +103949,7 @@ /obj/machinery/portable_atmospherics/canister/water_vapor, /turf/open/floor/iron, /area/station/service/janitor) +<<<<<<< HEAD "vMt" = ( /mob/living/simple_animal/bot/mulebot, /obj/structure/cable, @@ -61858,6 +103959,8 @@ }, /turf/open/floor/catwalk_floor, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vMw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61872,6 +103975,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD "vMI" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/porta_turret/ai, @@ -61879,6 +103983,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vML" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61915,6 +104021,15 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD +======= +"vNp" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vNv" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61960,6 +104075,13 @@ /obj/effect/mapping_helpers/airlock/access/any/command/maintenance, /turf/open/floor/plating, /area/station/maintenance/central) +<<<<<<< HEAD +======= +"vOz" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vOK" = ( /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/bot, @@ -62003,6 +104125,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD +======= +"vPu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/electrolyzer, +/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vPy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62099,6 +104233,17 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"vQT" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vQV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -62160,6 +104305,7 @@ /obj/structure/disposalpipe/junction/flip, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD "vRu" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -62172,6 +104318,24 @@ }, /turf/open/space/basic, /area/space/nearstation) +======= +"vRr" = ( +/obj/effect/turf_decal/trimline/brown/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/corner{ + dir = 8 + }, +/obj/machinery/door/airlock/mining{ + name = "Bitrunning Den" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/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/textured_half, +/area/station/cargo/bitrunning/den) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vRN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -62211,6 +104375,22 @@ "vRU" = ( /turf/open/floor/carpet, /area/station/service/theater) +<<<<<<< HEAD +======= +"vSh" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vSo" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -62292,6 +104472,7 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) +<<<<<<< HEAD "vTL" = ( /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, @@ -62304,6 +104485,8 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/port/greater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vTV" = ( /obj/effect/turf_decal/trimline/neutral/warning{ dir = 10 @@ -62371,6 +104554,7 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) +<<<<<<< HEAD "vVg" = ( /obj/machinery/light_switch/directional/north, /obj/structure/table/wood, @@ -62429,6 +104613,25 @@ dir = 4 }, /obj/structure/cable, +======= +"vVp" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/sign/poster/contraband/random/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"vVr" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"vVw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -62524,11 +104727,14 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) +<<<<<<< HEAD "vWA" = ( /obj/structure/fake_stairs/directional/east, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vWB" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -62542,6 +104748,29 @@ dir = 1 }, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"vWD" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/structure/table, +/obj/item/clothing/gloves/cargo_gauntlet{ + pixel_y = 8 + }, +/obj/item/clothing/gloves/cargo_gauntlet{ + pixel_y = 5 + }, +/obj/item/clothing/gloves/cargo_gauntlet{ + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/random{ + pixel_x = -9 + }, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vWF" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -62568,6 +104797,7 @@ "vXt" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 +<<<<<<< HEAD }, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -62575,6 +104805,15 @@ /turf/open/floor/iron/white/corner{ dir = 1 }, +======= + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/engineering/atmos) "vXC" = ( /obj/machinery/door/airlock/maintenance{ @@ -62606,6 +104845,7 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/gateway) +<<<<<<< HEAD "vYD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -62619,6 +104859,40 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +======= +"vYl" = ( +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"vYD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) +"vYE" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) +"vYF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig" + }, +/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/cyclelink_helper_multi{ + cycle_id = "brig-entrance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/turf/open/floor/iron, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vYI" = ( /obj/structure/sign/warning/secure_area/directional/north, /obj/structure/closet/radiation, @@ -62655,6 +104929,7 @@ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/west, +<<<<<<< HEAD /obj/structure/cable, /obj/structure/sign/warning/bodysposal/directional/south, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -62721,10 +104996,76 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +======= +/obj/structure/cable, +/obj/structure/sign/warning/bodysposal/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) +"vZm" = ( +/turf/closed/wall, +/area/station/security/lockers) +"vZt" = ( +/obj/structure/table, +/obj/item/plate, +/obj/item/flashlight/flare/candle, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio{ + desc = "An old handheld radio. You could use it, if you really wanted to."; + icon_state = "radio"; + name = "old radio"; + pixel_y = 15 + }, +/turf/open/floor/plating, +/area/station/maintenance/space_hut) +"vZB" = ( +/obj/structure/sign/directions/evac, +/turf/closed/wall, +/area/station/maintenance/aft/lesser) +"vZE" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port) +"vZF" = ( +/obj/structure/chair/office/light, +/obj/effect/landmark/start/chemist, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"vZM" = ( +/obj/machinery/airalarm/directional/south, +/obj/item/stack/package_wrap{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/stack/package_wrap, +/obj/structure/table/wood, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/wood, +/area/station/service/bar/backroom) +"vZQ" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/command) +"vZX" = ( +/obj/machinery/door/airlock{ + name = "Theater Stage" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD "vZY" = ( /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance" @@ -62742,6 +105083,8 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/medical/break_room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wac" = ( /obj/item/stack/sheet/glass/fifty{ pixel_x = 3; @@ -62749,6 +105092,19 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"waf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/structure/cable, +/obj/machinery/computer/security/telescreen/turbine/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wag" = ( /obj/machinery/computer/records/medical, /obj/structure/cable, @@ -62832,6 +105188,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/storage) +<<<<<<< HEAD "wbv" = ( /obj/structure/sign/warning/vacuum/external/directional/north, /obj/effect/turf_decal/stripes/line{ @@ -62844,6 +105201,28 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +======= +"wbp" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/red/filled/warning/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"wbv" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/vending/coffee, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"wbF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/light_switch/directional/east, /turf/open/floor/iron, /area/station/engineering/main) @@ -62851,6 +105230,7 @@ /obj/effect/spawner/random/trash/bin, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "wbT" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 @@ -62860,6 +105240,15 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"wbW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wcf" = ( /obj/structure/closet/crate/coffin, /obj/structure/window/spawner/directional/east, @@ -62888,6 +105277,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD +======= +"wcy" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/brown/filled/arrow_cw{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wcL" = ( /obj/machinery/door/window/left/directional/west{ name = "Library Desk Door"; @@ -62900,6 +105299,7 @@ /obj/machinery/airalarm/directional/east, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ +<<<<<<< HEAD dir = 4 }, /turf/open/floor/iron, @@ -63082,6 +105482,146 @@ /obj/structure/chair/office{ dir = 8 }, +======= + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wde" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) +"wdr" = ( +/turf/closed/wall, +/area/station/hallway/secondary/entry) +"wdv" = ( +/obj/effect/turf_decal/siding/purple, +/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/start/scientist, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) +"wdB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/button/door/directional/east{ + id = "engsm"; + name = "Radiation Shutters Control"; + req_access = list("engineering") + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"wdG" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin3"; + name = "Cabin 6" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/dorms) +"wdK" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) +"wdM" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/lobby) +"wem" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"wen" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"wep" = ( +/obj/structure/sign/departments/chemistry/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay Main Hallway - Virology Junction"; + network = list("ss13","medbay") + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"weq" = ( +/obj/structure/sign/warning/secure_area{ + desc = "A warning sign which reads 'BOMB RANGE"; + name = "BOMB RANGE" + }, +/turf/closed/wall, +/area/station/science/ordnance/bomb) +"wev" = ( +/obj/structure/rack, +/obj/item/storage/box, +/turf/open/floor/plating, +/area/station/maintenance/port) +"wez" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"weC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/locker) +"weJ" = ( +/obj/machinery/door/airlock{ + name = "Central Emergency Storage" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central) +"weS" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) +"wfm" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"wfn" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"wfu" = ( +/obj/structure/chair/office{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/carpet, /area/station/commons/vacant_room/office) "wfA" = ( @@ -63108,12 +105648,28 @@ dir = 1 }, /area/station/engineering/atmos/storage/gas) +<<<<<<< HEAD "wfY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/storage) +======= +"wfD" = ( +/obj/structure/fireaxecabinet/directional/south, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_y = 3 + }, +/obj/machinery/light_switch/directional/east, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wfZ" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63136,6 +105692,37 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"wgl" = ( +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/structure/table/wood, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/spawner/random/food_or_drink/booze{ + spawn_loot_count = 2; + spawn_random_offset = 1 + }, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wgm" = ( +/obj/structure/sign/poster/contraband/random/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wgs" = ( /obj/machinery/door/airlock{ id_tag = "Cabin4"; @@ -63155,11 +105742,24 @@ /obj/structure/sign/map/right, /turf/closed/wall, /area/station/commons/storage/tools) +<<<<<<< HEAD +======= +"wgQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/supply/disposals, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wha" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/item/stock_parts/matter_bin, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +<<<<<<< HEAD "whc" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -63168,6 +105768,8 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/station/maintenance/disposal) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "whr" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -63178,6 +105780,20 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +<<<<<<< HEAD +======= +"whs" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/storage/toolbox/emergency, +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "whx" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63255,6 +105871,7 @@ /area/station/hallway/secondary/entry) "wiS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +<<<<<<< HEAD /obj/structure/cable, /obj/machinery/light/small/directional/west, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -66269,12 +108886,30 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "xnv" = ( +======= +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/mail_sorting/science/xenobiology, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"wjn" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +<<<<<<< HEAD "xnT" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/south, @@ -66775,6 +109410,3436 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, +======= +"wjK" = ( +/obj/item/clothing/head/hats/tophat, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) +"wjQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"wjT" = ( +/obj/machinery/power/smes, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) +"wkh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"wki" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/wood, +/area/station/service/library) +"wkv" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/item/laser_pointer/red, +/turf/open/space/basic, +/area/space/nearstation) +"wkL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Secure Gate"; + name = "Brig Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig) +"wkM" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"wkX" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/wood, +/area/station/commons/lounge) +"wlj" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/machinery/light/small/directional/north, +/turf/open/floor/cult, +/area/station/service/chapel/funeral) +"wll" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/directional/east, +/obj/item/folder/blue, +/obj/item/hand_tele, +/obj/item/stamp/head/captain, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"wlx" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Foyer - Shared Storage" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) +"wlz" = ( +/turf/closed/wall/r_wall, +/area/station/security/mechbay) +"wlL" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + 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/commons/storage/tools) +"wmc" = ( +/obj/structure/closet/secure_closet/evidence, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/evidence) +"wmf" = ( +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) +"wmg" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"wmr" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/vehicle/ridden/secway, +/turf/open/floor/iron, +/area/station/security/office) +"wmz" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"wmL" = ( +/turf/closed/wall/r_wall, +/area/station/science/xenobiology/hallway) +"wmT" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"wna" = ( +/obj/effect/turf_decal/siding/purple, +/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/science/ordnance) +"wnQ" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/structure/tank_dispenser{ + pixel_x = -1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"wnT" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/door/window/left/directional/south{ + name = "MiniSat Walkway Access" + }, +/obj/machinery/camera/directional/east{ + c_tag = "MiniSat Exterior - Aft Port"; + network = list("minisat") + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"wnW" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/medical/morgue) +"wnY" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/engine, +/area/station/command/heads_quarters/rd) +"woc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port) +"woi" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Arrivals - Aft Arm - Far" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"wov" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/abandoned) +"woz" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) +"woG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/office) +"woL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"woV" = ( +/obj/machinery/door/window/left/directional/north, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"woY" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"wpi" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"wpn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"wpo" = ( +/obj/item/storage/box/matches{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/cigarette/cigar{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/cigarette/cigar/cohiba, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"wpr" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"wpw" = ( +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"wpx" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wpJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/highsecurity{ + name = "AI Upload" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/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/command/ai_upload, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"wpO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"wqh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/landmark/start/roboticist, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) +"wqA" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"wqH" = ( +/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/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/photobooth/security, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"wqJ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"wrc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"wrg" = ( +/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 = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/white/corner, +/area/station/hallway/primary/aft) +"wrn" = ( +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wrJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/start/roboticist, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) +"wrZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/theater) +"wsk" = ( +/obj/structure/railing/corner/end/flip, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"wsq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security{ + name = "Armory" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/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/ai_monitored/security/armory) +"wss" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/item/folder/yellow{ + pixel_y = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Bridge - Central" + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"wst" = ( +/obj/machinery/door/airlock{ + name = "Unisex Showers" + }, +/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/freezer, +/area/station/commons/toilet/restrooms) +"wsv" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/door/airlock/medical/glass{ + name = "Cryogenics Bay" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"wsD" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"wsG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/water_source/puddle, +/obj/item/reagent_containers/cup/watering_can, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"wsI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"wsL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/requests_console/directional/west{ + department = "Robotics"; + name = "Robotics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"wsQ" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/structure/closet/secure_closet/security, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) +"wsS" = ( +/obj/machinery/door/airlock/external{ + name = "Departure Lounge Airlock"; + space_dir = 2 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"wsW" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_y = 5 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -4 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 1 + }, +/area/station/medical/chem_storage) +"wsX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig) +"wto" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-maint-passthrough" + }, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Access" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/research) +"wtu" = ( +/obj/effect/decal/cleanable/blood/gibs/limb, +/obj/structure/rack, +/obj/item/storage/medkit/regular, +/obj/item/stack/medical/suture, +/obj/item/stack/medical/suture, +/obj/item/stack/medical/mesh, +/obj/item/clothing/glasses/hud/health, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/starboard/lesser) +"wtw" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Prison Central"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/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/white, +/area/station/security/prison) +"wtB" = ( +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +"wtP" = ( +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/effect/landmark/start/research_director, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"wtX" = ( +/obj/structure/table/wood, +/obj/item/folder/yellow, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"wtZ" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wuj" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/flasher/directional/east{ + id = "holdingflash" + }, +/turf/open/floor/iron, +/area/station/security/holding_cell) +"wuo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"wuM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"wvd" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin5"; + name = "Cabin 3" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/dorms) +"wvh" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/aft) +"wvo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/commons/vacant_room/commissary) +"wvr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port) +"wvB" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/firealarm/directional/north, +/obj/item/storage/box/bodybags, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/pushbroom, +/obj/structure/closet{ + name = "janitorial supplies" + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"wvF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"wvP" = ( +/obj/machinery/iv_drip, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"wvR" = ( +/obj/machinery/mineral/stacking_machine{ + input_dir = 2 + }, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"wvU" = ( +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"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" + }, +/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, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"wwW" = ( +/obj/effect/turf_decal/trimline/purple/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"wwY" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"wxe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"wxh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"wxj" = ( +/turf/open/floor/iron/dark, +/area/station/security/office) +"wxk" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"wxn" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"wxF" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"wxG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"wxM" = ( +/obj/machinery/status_display/door_timer{ + id = "Cell 1"; + name = "Cell 1"; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"wyn" = ( +/obj/machinery/hydroponics/soil, +/obj/item/shovel/spade, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/grass, +/area/station/security/prison/garden) +"wyo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"wyp" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/light/small/directional/north, +/obj/structure/table/wood, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/under/suit/black_really, +/obj/item/clothing/glasses/sunglasses, +/obj/machinery/camera/directional/north{ + c_tag = "Corporate Showroom" + }, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) +"wyu" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"wyz" = ( +/obj/structure/chair{ + dir = 4; + name = "Prosecution" + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"wyC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) +"wyG" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wyP" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "mining" + }, +/obj/machinery/bouldertech/refinery/smelter, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"wyS" = ( +/obj/machinery/computer/cargo{ + dir = 4 + }, +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"wyV" = ( +/turf/open/floor/carpet/orange, +/area/station/command/heads_quarters/qm) +"wzd" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/table, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/item/flashlight/lamp, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"wzq" = ( +/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/structure/cable, +/turf/open/floor/iron, +/area/station/security/office) +"wzy" = ( +/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/ticket_machine/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"wzH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai_upload) +"wzK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wAk" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"wAt" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/effect/spawner/random/trash/soap, +/obj/structure/sign/poster/random/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood/large, +/area/station/service/theater) +"wAA" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"wBe" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/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/prison) +"wBn" = ( +/obj/structure/chair/stool/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) +"wBq" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/obj/item/toy/figure/geneticist, +/obj/item/radio/intercom/directional/west, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = -9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"wBs" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"wBu" = ( +/obj/structure/chair/office, +/obj/effect/landmark/start/head_of_personnel, +/obj/machinery/light_switch{ + pixel_x = 38; + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + id = "hopflash"; + pixel_x = 38; + pixel_y = -25 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +"wBE" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"wBF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wBM" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"wBT" = ( +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/service/theater) +"wBV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Gas to Cold Loop" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"wBW" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"wCb" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/research) +"wCe" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/maintenance, +/obj/item/storage/belt/utility, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"wCf" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/obj/structure/sign/warning/vacuum/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"wCl" = ( +/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/hallway/primary/starboard) +"wCq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/server) +"wCL" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"wCO" = ( +/obj/structure/chair{ + name = "Judge" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) +"wCS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"wDh" = ( +/obj/machinery/vending/wardrobe/chef_wardrobe, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 6 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light_switch/directional/south{ + pixel_x = -6 + }, +/obj/machinery/button/door/directional/south{ + id = "kitchen_service"; + name = "Service Shutter Control"; + pixel_x = 6; + req_access = list("kitchen") + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"wDq" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"wDG" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Distribution Loop" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"wDH" = ( +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/wood, +/area/station/service/library) +"wEf" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ + dir = 1 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"wEn" = ( +/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/grimy, +/area/station/service/chapel/office) +"wEz" = ( +/obj/item/stack/sheet/cardboard, +/obj/effect/spawner/random/trash/janitor_supplies, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"wEG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wER" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"wFa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"wFe" = ( +/obj/machinery/computer/teleporter{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/command/teleporter) +"wFi" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Unfiltered & Air to Mix" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"wFk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "hosspace"; + name = "Space Shutters" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hos) +"wFy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"wFM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"wFV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) +"wGa" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Primary Hallway - Starboard - Art Storage" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wGz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/light_construct/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wGE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/research) +"wGH" = ( +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/corner, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/sign/departments/rndserver/directional/north, +/turf/open/floor/iron/white, +/area/station/science/research) +"wGR" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/commons/dorms) +"wHd" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"wHj" = ( +/obj/machinery/door/airlock{ + name = "Unit B" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"wHu" = ( +/turf/closed/wall, +/area/station/science/lobby) +"wHJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) +"wHL" = ( +/obj/machinery/vending/wardrobe/bar_wardrobe, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood, +/area/station/service/bar/backroom) +"wHW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/station/ai_monitored/command/nuke_storage) +"wIa" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"wIB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"wIF" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"wIM" = ( +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/security/prison) +"wJw" = ( +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"wJD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/explab) +"wJL" = ( +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) +"wJV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"wJX" = ( +/turf/open/floor/iron/dark, +/area/station/security/brig) +"wKc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"wKu" = ( +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/commons/lounge) +"wKC" = ( +/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, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"wKG" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Cytology - Secure Pen"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/cytology) +"wKX" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"wLu" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/station/service/library) +"wLw" = ( +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"wLx" = ( +/obj/structure/closet/wardrobe/mixed, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"wLz" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) +"wMx" = ( +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"wMz" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"wMT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/space_heater, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) +"wNa" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/research) +"wNh" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +"wNm" = ( +/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/ai_monitored/turret_protected/aisat_interior) +"wNp" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/west{ + id = "Cabin6"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"wNH" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/gateway) +"wNN" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L9" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wNO" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"wOl" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"wOm" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/security/prison/safe) +"wOo" = ( +/obj/structure/punching_bag, +/obj/effect/turf_decal/trimline/dark_red, +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/directional/east{ + name = "Fitness Room" + }, +/turf/open/floor/iron/white/textured_large, +/area/station/commons/fitness) +"wOy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink/directional/west, +/obj/item/mop, +/turf/open/floor/iron, +/area/station/service/janitor) +"wOz" = ( +/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/medical/office) +"wOB" = ( +/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/main) +"wOF" = ( +/obj/effect/spawner/random/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/north{ + c_tag = "Service Maintenance" + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"wOI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"wOR" = ( +/obj/effect/landmark/event_spawn, +/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/command/bridge) +"wOS" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Robotics Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"wPo" = ( +/obj/item/radio/intercom/directional/west{ + freerange = 1; + listening = 0; + name = "Common Channel"; + pixel_y = -8 + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_y = -8 + }, +/obj/effect/landmark/start/ai, +/obj/machinery/button/door/directional/south{ + id = "AI Chamber entrance shutters"; + name = "AI Chamber Entrance Shutters Control"; + pixel_x = -24; + req_access = list("ai_upload") + }, +/obj/machinery/button/door/directional/south{ + id = "AI Core shutters"; + name = "AI Core Shutters Control"; + pixel_x = 24; + req_access = list("ai_upload") + }, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) +"wPB" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"wPD" = ( +/obj/machinery/meter{ + name = "Mixed Air Tank In" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"wPE" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/lounge) +"wPG" = ( +/obj/machinery/flasher/portable, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"wPH" = ( +/obj/structure/sign/warning/electric_shock/directional/east, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/head/utility/welding, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"wPM" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"wPU" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + 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/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) +"wPZ" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ + dir = 1 + }, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) +"wQa" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/lab) +"wQb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/commons/dorms) +"wQj" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"wQw" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space, +/area/space/nearstation) +"wQz" = ( +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wQI" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rdrnd"; + name = "Research and Development Shutters" + }, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/science/lab) +"wQP" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wQU" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/burgundy, +/turf/open/space, +/area/space/nearstation) +"wRg" = ( +/obj/machinery/door/poddoor/incinerator_atmos_aux, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +"wRm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"wRp" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"wRB" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/structure/table/wood, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"wRD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/mmi, +/obj/structure/table, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"wRF" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) +"wRL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Cytology Lab - Worklab"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/science/cytology) +"wRT" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"wRZ" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"wSe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"wSq" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/photocopier, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +"wSs" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/wood, +/area/station/commons/lounge) +"wSv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"wSI" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/east{ + name = "Hydroponics Desk"; + req_access = list("hydroponics") + }, +/obj/structure/desk_bell{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"wTp" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Weapon Distribution"; + req_access = list("armory") + }, +/obj/item/paper, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/south{ + name = "Requests Window" + }, +/obj/item/pen, +/obj/item/papercutter, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"wTs" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Port-Fore" + }, +/obj/structure/reagent_dispensers/fueltank/large, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"wTv" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/modular_computer/preset/cargochat/cargo{ + dir = 8 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"wTF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"wTO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/evidence) +"wUj" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/lobby) +"wUm" = ( +/obj/machinery/shower/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) +"wUt" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"wUG" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/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/medical/medbay/central) +"wUH" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Break Room"; + network = list("ss13","medbay") + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/vending/coffee, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"wUM" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/effect/turf_decal/stripes/line, +/obj/item/clothing/head/utility/welding{ + pixel_y = 9 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/item/clothing/head/utility/welding{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/clothing/head/utility/welding{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) +"wUQ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"wVa" = ( +/obj/machinery/conveyor{ + dir = 9; + id = "garbage" + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"wVd" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster/directional/south, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) +"wVo" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"wVt" = ( +/obj/structure/table, +/obj/item/radio/intercom/directional/west, +/obj/item/storage/box/deputy, +/turf/open/floor/iron/dark, +/area/station/security/office) +"wVy" = ( +/obj/structure/sink/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"wVO" = ( +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/reagentgrinder{ + pixel_y = 4 + }, +/obj/item/reagent_containers/pill/morphine{ + name = "Exponential Entrophy"; + pixel_x = -9; + pixel_y = -4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/starboard/lesser) +"wVQ" = ( +/obj/structure/closet/cardboard, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"wVW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"wWe" = ( +/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, +/obj/machinery/door/airlock/public/glass{ + name = "Vault Storage" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/vault, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/construction/storage_wing) +"wWk" = ( +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"wWo" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 9 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/official/report_crimes/directional/north, +/turf/open/floor/iron/dark/smooth_half{ + dir = 4 + }, +/area/station/medical/morgue) +"wWs" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"wWN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 9 + }, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"wWV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5; + pixel_y = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"wXc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"wXv" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Disposal Conveyor Access" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/disposal) +"wXF" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/lesser) +"wXP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"wXT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/security/courtroom) +"wYe" = ( +/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 = 9 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wYi" = ( +/obj/machinery/door/window/right/directional/north{ + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/toxin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/toxin{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/west, +/obj/machinery/requests_console/directional/south{ + department = "Medbay"; + name = "Medbay Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/medical/storage) +"wYl" = ( +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"wYs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/broken_flooring/corner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"wYx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"wYB" = ( +/turf/closed/wall, +/area/station/hallway/secondary/service) +"wZe" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Chapel Office" + }, +/obj/effect/landmark/navigate_destination, +/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/service/chapel_office, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"wZg" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/science/research) +"wZk" = ( +/obj/machinery/light_switch/directional/north, +/obj/structure/showcase/cyborg/old{ + pixel_y = 20 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"wZl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"wZo" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 10; + id = "mining" + }, +/obj/machinery/bouldertech/refinery, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"wZw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"wZz" = ( +/turf/closed/wall, +/area/station/security/prison/safe) +"wZA" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"wZU" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"xaj" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/gloves{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/item/assembly/igniter{ + pixel_y = -3 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"xar" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xaL" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Science Hallway - Research"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white, +/area/station/science/research) +"xba" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/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/engineering/main) +"xbd" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"xbg" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"xbT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/hallway/secondary/service) +"xbY" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/structure/cable, +/turf/open/floor/iron/white/smooth_large, +/area/station/command/heads_quarters/cmo) +"xbZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) +"xcv" = ( +/obj/effect/turf_decal/stripes/line, +/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, +/area/station/security/mechbay) +"xcz" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"xcO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/structure/disposalpipe/sorting/mail, +/obj/effect/mapping_helpers/mail_sorting/service/bar, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"xcW" = ( +/obj/machinery/computer/atmos_control/air_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xdm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/holding_cell) +"xdn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"xdq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall, +/area/station/engineering/atmos/pumproom) +"xdx" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +"xdF" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"xdJ" = ( +/turf/closed/wall, +/area/station/medical/surgery/aft) +"xdQ" = ( +/obj/structure/sign/warning/hot_temp/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"xdV" = ( +/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"xdX" = ( +/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, +/turf/open/floor/iron/white/side, +/area/station/science/lobby) +"xej" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"xel" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/central) +"xen" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) +"xew" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"xeN" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port) +"xff" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple/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/science/research) +"xfm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/structure/microscope, +/turf/open/floor/iron/white, +/area/station/science/cytology) +"xfx" = ( +/obj/structure/table/glass, +/obj/item/stack/medical/mesh, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side{ + 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 + }, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Fore Primary Hallway Cells" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) +"xfF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"xfI" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) +"xfV" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/research) +"xga" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + name = "CMO Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"xgb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xgi" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/bot, +/obj/item/bodypart/arm/right/robot{ + pixel_x = 3 + }, +/obj/item/bodypart/arm/left/robot{ + pixel_x = -3 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/machinery/ecto_sniffer{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"xgn" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/item/storage/belt/medical{ + pixel_y = 6 + }, +/obj/item/storage/belt/medical{ + pixel_y = 4 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/medical/treatment_center) +"xgx" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xgB" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"xgD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xgE" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/power/port_gen/pacman, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/multilayer/connected, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"xgG" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/clothing/costume, +/turf/open/floor/plating, +/area/station/maintenance/port) +"xgL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"xgN" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xgV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/break_room) +"xgZ" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"xhb" = ( +/obj/machinery/meter, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"xhh" = ( +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) +"xip" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"xit" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) +"xiv" = ( +/obj/item/kirbyplants/organic/plant11, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) +"xiL" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/science/xenobiology) +"xiW" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"xjb" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom/directional/north{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = -8 + }, +/obj/item/radio/intercom/directional/west{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel"; + pixel_x = -8 + }, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) +"xjg" = ( +/mob/living/basic/bot/cleanbot/medbay, +/turf/open/floor/iron/white, +/area/station/medical/storage) +"xjh" = ( +/turf/closed/wall, +/area/station/security/checkpoint/customs) +"xjm" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{ + dir = 4 + }, +/turf/open/floor/iron/dark/airless, +/area/station/science/ordnance/freezerchamber) +"xjA" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Central Primary Hallway - Fore" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xjC" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/wood, +/area/station/service/library) +"xjH" = ( +/turf/closed/wall/r_wall, +/area/station/medical/virology) +"xjI" = ( +/obj/structure/cable, +/obj/machinery/holopad, +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +"xkj" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"xko" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"xkq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/office) +"xkr" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L13" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xkv" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"xkw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) +"xkE" = ( +/obj/machinery/recharge_station, +/obj/effect/landmark/start/hangover, +/obj/effect/spawner/random/trash/graffiti{ + pixel_y = -32; + spawn_loot_chance = 50 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"xkV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xkY" = ( +/obj/structure/table, +/obj/item/instrument/harmonica, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison) +"xld" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xlf" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/pen/red, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"xlv" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) +"xly" = ( +/obj/machinery/door/morgue{ + name = "Confession Booth" + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"xlF" = ( +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xlH" = ( +/obj/structure/cable, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"xlU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) +"xlW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/locker) +"xmb" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xme" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/effect/turf_decal/siding/purple/corner, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"xml" = ( +/obj/machinery/computer/message_monitor{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"xmD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/medical/memeorgans, +/obj/structure/closet/crate/freezer, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"xmT" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 1 + }, +/turf/open/space, +/area/space/nearstation) +"xnk" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"xno" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"xnr" = ( +/turf/open/floor/carpet, +/area/station/commons/vacant_room/office) +"xnt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"xnv" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"xnT" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/security/warden) +"xnU" = ( +/obj/machinery/shower/directional/east, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"xoa" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"xoj" = ( +/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/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"xop" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xor" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/science/explab) +"xoK" = ( +/obj/effect/landmark/start/botanist, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xpb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/commons/fitness) +"xpi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"xpo" = ( +/turf/open/floor/carpet, +/area/station/commons/dorms) +"xpB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"xpC" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xpE" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"xpH" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xpL" = ( +/obj/structure/closet/secure_closet/chief_medical, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/item/screwdriver, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"xpY" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) +"xpZ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Telecomms - Server Room - Aft-Starboard"; + network = list("ss13","tcomms") + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +"xqc" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xqn" = ( +/obj/effect/spawner/random/trash/mess, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"xqv" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/item/storage/bag/tray, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"xqI" = ( +/obj/machinery/computer/security/labor{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) +"xqL" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Command Hallway" + }, +/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/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"xrd" = ( +/obj/machinery/door/morgue{ + name = "Private Study"; + req_access = list("library") + }, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/engine/cult, +/area/station/service/library) +"xrr" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"xrv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xrG" = ( +/obj/structure/fireaxecabinet/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - Port" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) +"xrN" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"xrS" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/engineering/main) +"xrW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"xsd" = ( +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"xsn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) +"xsy" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) +"xsB" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) +"xsH" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"xsV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/table/reinforced, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/kitchen) +"xtp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"xtr" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Space Bridge Access" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "supplybridge"; + name = "Shuttle Bay Space Bridge Control" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "north-maint-viewingdeck" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"xtu" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"xtw" = ( +/obj/item/stack/rods, +/turf/open/space/basic, +/area/space/nearstation) +"xtz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"xtH" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xtY" = ( +/obj/machinery/computer/security/telescreen/auxbase/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) +"xtZ" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/space/basic, +/area/space/nearstation) +"xug" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/port) +"xuA" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xuD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"xuH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"xuK" = ( +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "foreport"; + name = "Fore-Port Solar Array" + }, +/turf/open/floor/iron/solarpanel/airless, +/area/station/solars/port/fore) +"xuS" = ( +/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/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xuV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/closed/wall/r_wall, +/area/station/maintenance/aft/lesser) +"xvd" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/delivery, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"xvf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"xvn" = ( +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"xvt" = ( +/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/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"xvI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"xvR" = ( +/obj/structure/table, +/obj/item/paper/guides/jobs/engi/gravity_gen, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/effect/spawner/random/bureaucracy/pen, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"xvZ" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"xwa" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/disposal/delivery_chute, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"xwf" = ( +/obj/structure/weightmachine/weightlifter, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) +"xwl" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "roboticsprivacy2"; + name = "Robotics Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/robotics/lab) +"xww" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/storage/tech) +"xwB" = ( +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) +"xwD" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xwP" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xwS" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Monkey Pen"; + req_access = list("genetics") + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/grass, +/area/station/science/genetics) +"xwV" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"xwZ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/fore) "xxg" = ( /obj/effect/turf_decal/stripes/line{ @@ -66795,6 +112860,7 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +<<<<<<< HEAD "xxs" = ( /obj/effect/turf_decal/delivery, /obj/structure/table, @@ -66808,6 +112874,8 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xxF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -66827,6 +112895,19 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"xxQ" = ( +/obj/structure/table, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/research) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xxU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66841,6 +112922,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) +<<<<<<< HEAD "xyd" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -66854,6 +112936,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xyp" = ( /obj/machinery/status_display/evac/directional/north, /obj/structure/cable, @@ -66884,6 +112968,43 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"xyz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"xyA" = ( +/obj/structure/table, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/plunger, +/obj/item/plunger, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"xyI" = ( +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/sign/clock/directional/south, +/turf/open/water, +/area/station/service/hydroponics/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xyM" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -66940,6 +113061,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD "xzB" = ( /obj/structure/table, /obj/effect/turf_decal/siding{ @@ -66957,6 +113079,12 @@ /obj/item/multitool, /turf/open/floor/iron, /area/station/science/lab) +======= +"xzx" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xAb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66982,6 +113110,15 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +<<<<<<< HEAD +======= +"xAi" = ( +/obj/machinery/vending/autodrobe, +/obj/structure/sign/poster/contraband/clown/directional/east, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/wood, +/area/station/service/theater) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xAl" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -67022,6 +113159,7 @@ /area/station/commons/locker) "xAW" = ( /obj/effect/turf_decal/stripes/line{ +<<<<<<< HEAD dir = 8 }, /obj/structure/cable, @@ -67286,6 +113424,275 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +======= + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"xBq" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) +"xBw" = ( +/obj/machinery/door/airlock/engineering{ + name = "Starboard Quarter Solar Access" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) +"xBx" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xBF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) +"xBX" = ( +/obj/machinery/firealarm/directional/east, +/turf/closed/wall, +/area/station/security/checkpoint/customs) +"xCf" = ( +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/electropack, +/obj/structure/table, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"xCg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"xCl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) +"xCo" = ( +/obj/structure/rack, +/obj/item/storage/box/flashes{ + pixel_x = 3 + }, +/obj/item/storage/box/teargas{ + pixel_x = 1; + pixel_y = -2 + }, +/obj/item/gun/grenadelauncher, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"xCx" = ( +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/structure/table/glass, +/obj/item/book/manual/hydroponics_pod_people, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/machinery/requests_console/directional/west{ + department = "Hydroponics"; + name = "Hydroponics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xCz" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) +"xCD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xCF" = ( +/obj/structure/transit_tube/curved{ + dir = 4 + }, +/turf/open/space, +/area/space/nearstation) +"xCH" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, +/turf/open/floor/engine, +/area/station/science/cytology) +"xCR" = ( +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chem_lockdown"; + name = "Chemistry Shutters" + }, +/obj/machinery/door/window/left/directional/north{ + name = "Chemistry Desk"; + req_access = list("plumbing") + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"xCS" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/tcomms, +/obj/item/folder/blue, +/obj/item/pen, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) +"xCT" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Chapel Office - Backroom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) +"xDa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) +"xDu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"xDw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"xDz" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"xDD" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/science/cytology) +"xEe" = ( +/obj/item/storage/box/syringes, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xEf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/lobby) +"xEg" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"xEr" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) +"xEt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/courtroom) +"xEz" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/virology) +"xEC" = ( +/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, +/turf/open/floor/iron/white, +/area/station/science/lab) +"xEJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"xEN" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xER" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock/external{ name = "Arrival Airlock"; space_dir = 2 @@ -67353,6 +113760,7 @@ /area/station/engineering/supermatter/room) "xGD" = ( /obj/structure/cable, +<<<<<<< HEAD /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -67439,6 +113847,97 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron, /area/station/service/hydroponics) +======= +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron, +/area/station/science/research) +"xGF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"xGT" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/cargo/warehouse) +"xGX" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"xHC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xIp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) +"xIx" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"xID" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line, +/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/engineering/gravity_generator) +"xIG" = ( +/obj/structure/sign/departments/medbay/alt, +/turf/closed/wall, +/area/station/medical/medbay/lobby) +"xII" = ( +/obj/machinery/vending/wardrobe/hydro_wardrobe, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/official/random/directional/east, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/station/service/hydroponics) +"xIK" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -7; + pixel_y = 13 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xIM" = ( /obj/machinery/computer/operating{ dir = 8 @@ -67456,6 +113955,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD "xJg" = ( /obj/structure/cable, /obj/structure/sign/warning/secure_area/directional/north, @@ -67465,6 +113965,8 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xJv" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron/recharge_floor, @@ -67473,6 +113975,29 @@ /obj/structure/sign/warning/docking, /turf/closed/wall, /area/station/hallway/primary/port) +<<<<<<< HEAD +======= +"xJI" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 10 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xJK" = ( /obj/structure/table, /obj/item/stack/sheet/plasteel/fifty, @@ -67523,6 +114048,18 @@ }, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +<<<<<<< HEAD +======= +"xLA" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xLR" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -67534,6 +114071,7 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +<<<<<<< HEAD "xLV" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -67545,6 +114083,8 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xMl" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=15-Court"; @@ -67603,11 +114143,14 @@ /obj/structure/cable, /turf/open/floor/grass, /area/station/medical/virology) +<<<<<<< HEAD "xNl" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/supply) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xNo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67726,6 +114269,7 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "xPe" = ( /obj/structure/flora/bush/flowers_yw, /turf/open/floor/grass, @@ -69010,11 +115554,35 @@ /turf/open/floor/iron/dark, /area/station/service/cafeteria) "ykS" = ( +======= +"xPm" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Research Director's Office"; + name = "Research Director's Fax Machine" + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"xPy" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - Hypertorus Fusion Reactor Chamber Fore" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"xPN" = ( +/obj/structure/cable, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, +<<<<<<< HEAD /obj/effect/turf_decal/tile/bar{ dir = 1 }, @@ -69090,6 +115658,1248 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +======= +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"xQh" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xQx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/research) +"xQC" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +"xQI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Entrance" + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"xQJ" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"xQO" = ( +/obj/machinery/exodrone_launcher, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) +"xQT" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/security/office) +"xQY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/lobby) +"xRc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"xRf" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"xRh" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"xRR" = ( +/obj/structure/bodycontainer/morgue/beeper_off, +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/dark/smooth_half{ + dir = 4 + }, +/area/station/medical/morgue) +"xRY" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"xRZ" = ( +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"xSO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/wood/large, +/area/station/service/theater) +"xSQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xST" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xTe" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "qmroom" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/qm) +"xTg" = ( +/obj/structure/chair/comfy{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Science Break Room"; + network = list("ss13","rd") + }, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron, +/area/station/science/research) +"xTw" = ( +/turf/closed/wall/r_wall, +/area/station/medical/medbay/central) +"xTO" = ( +/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/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"xTT" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"xUb" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xUh" = ( +/obj/structure/closet/wardrobe/pjs, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/dorms) +"xUm" = ( +/obj/machinery/computer/operating{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/clock/directional/west, +/obj/item/radio/intercom/directional/north, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) +"xUu" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"xUx" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/dresser, +/obj/structure/secure_safe/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) +"xUB" = ( +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/obj/structure/sign/directions/command{ + pixel_y = -8 + }, +/turf/closed/wall/r_wall, +/area/station/hallway/primary/fore) +"xUE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, +/obj/effect/turf_decal/tile/green/half/contrasted, +/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, +/area/station/commons/storage/primary) +"xUX" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"xUY" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line, +/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/engineering/main) +"xVq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) +"xVu" = ( +/turf/closed/wall, +/area/station/science/xenobiology) +"xVx" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Supermatter Fore"; + network = list("ss13","engine") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xVA" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Distro Staging to Distro" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) +"xVD" = ( +/obj/effect/turf_decal/trimline/purple/corner, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/research) +"xWm" = ( +/obj/structure/rack, +/obj/item/restraints/handcuffs{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/office) +"xWn" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"xWr" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/machinery/light/directional/east, +/obj/machinery/computer/security/telescreen/interrogation/directional/east, +/turf/open/floor/iron, +/area/station/security/brig) +"xWE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) +"xWF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"xWJ" = ( +/obj/machinery/drone_dispenser, +/turf/open/floor/plating, +/area/station/maintenance/department/science/central) +"xWY" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) +"xXh" = ( +/obj/machinery/photocopier{ + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) +"xXi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"xXm" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"xXp" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) +"xXv" = ( +/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/stripes/line, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) +"xXw" = ( +/obj/machinery/bluespace_beacon, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/teleporter) +"xXC" = ( +/obj/effect/landmark/blobstart, +/obj/structure/closet/secure_closet/detective, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) +"xXG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"xXK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) +"xXM" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/chair, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"xXN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/captain, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/captain/private) +"xXR" = ( +/obj/effect/decal/cleanable/oil, +/obj/structure/railing/corner/end{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xXW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/closed/wall, +/area/station/service/theater) +"xYq" = ( +/obj/structure/rack, +/obj/item/stack/sheet/cardboard, +/obj/item/radio/off, +/obj/structure/light_construct/directional/north, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"xYu" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xYy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"xYD" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"xYH" = ( +/obj/item/kirbyplants/random/dead, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"xYM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/cryo_cell, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) +"xYQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"xYT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xYV" = ( +/obj/structure/table/glass, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) +"xYW" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) +"xYZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"xZb" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"xZd" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/security/courtroom) +"xZu" = ( +/obj/structure/sink/kitchen/directional/east{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/structure/mirror/directional/west, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) +"xZv" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/camera/directional/north, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"xZx" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"xZB" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"xZW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Starboard Primary Hallway" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"yaf" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"yag" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/machinery/monkey_recycler, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"yaD" = ( +/obj/structure/table, +/obj/item/stack/rods/fifty, +/obj/item/wrench, +/obj/item/storage/box/lights/mixed, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"yaE" = ( +/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/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"yaF" = ( +/obj/structure/table, +/obj/effect/turf_decal/delivery, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, +/turf/open/floor/iron, +/area/station/engineering/main) +"yaO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/theater) +"ybl" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/delivery, +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) +"ybn" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"ybu" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"yby" = ( +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) +"ybN" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"yce" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"ycf" = ( +/obj/structure/disposalpipe/segment, +/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/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"ych" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Lab - Pen #5"; + network = list("ss13","rd","xeno") + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) +"yci" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"ycj" = ( +/obj/machinery/door/airlock/hatch{ + name = "Telecomms Server Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/turf/open/floor/iron/dark, +/area/station/tcommsat/server) +"yco" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"ycr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ycv" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) +"ycw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"ycz" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tcomms) +"ycM" = ( +/turf/closed/wall/r_wall, +/area/station/security/warden) +"ycN" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/locker) +"ydb" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Port to Filter" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"ydj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/components/trinary/filter/flipped/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"ydp" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +"ydq" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) +"ydv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) +"ydG" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"ydM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer5, +/obj/structure/sign/poster/official/wtf_is_co2/directional/south, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"yec" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator" + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"yeq" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) +"yeu" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/computer/gateway_control{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/gateway) +"yey" = ( +/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) +"yeA" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +"yeI" = ( +/obj/structure/mop_bucket, +/obj/item/mop, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) +"yeV" = ( +/obj/structure/closet/secure_closet/hos, +/obj/item/clothing/shoes/cowboy/black, +/obj/machinery/camera/directional/north{ + c_tag = "Head of Security's Office" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) +"yfg" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "chem_lockdown"; + name = "Chemistry Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/chemistry) +"yfm" = ( +/obj/effect/turf_decal/trimline/dark_red/mid_joiner, +/obj/effect/turf_decal/trimline/dark_red/line, +/turf/open/floor/iron/white/smooth_half, +/area/station/commons/fitness) +"yfq" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"yfw" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/effect/spawner/random/trash/soap{ + spawn_scatter_radius = 1 + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) +"yfx" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ + dir = 1 + }, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) +"yfL" = ( +/turf/closed/wall, +/area/station/ai_monitored/command/storage/eva) +"yfT" = ( +/obj/structure/table/wood, +/obj/item/pen/red, +/obj/item/pen/blue{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/station/service/library) +"ygb" = ( +/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/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) +"ygp" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/structure/cable, +/obj/structure/transit_tube/horizontal, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) +"ygt" = ( +/obj/structure/table/wood, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "corporate_privacy"; + name = "corporate showroom shutters control"; + req_access = list("command") + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) +"ygR" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"ygS" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"yhm" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/disposaloutlet{ + dir = 4; + name = "Cargo Deliveries" + }, +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/trimline/brown/warning, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/medical/medbay/lobby) +"yhu" = ( +/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/holopad, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/science/research) +"yhK" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"yhL" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageSort2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/window/left/directional/east{ + name = "Crate Security Door"; + req_access = list("shipping") + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) +"yhO" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) +"yia" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/explab) +"yib" = ( +/obj/structure/lattice/catwalk, +/obj/item/toy/plush/lizard_plushie/space/green{ + desc = "He stared into the void and listened. He didn't expect an answer..."; + name = "Void-Stares-Back" + }, +/obj/structure/marker_beacon/purple, +/turf/open/space/basic, +/area/space/nearstation) +"yij" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry) +"yim" = ( +/obj/structure/table, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Paramedic Dispatch"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/machinery/fax{ + fax_name = "Medical"; + name = "Medical Fax Machine" + }, +/obj/structure/noticeboard/directional/north, +/obj/structure/sign/clock/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/office) +"yiJ" = ( +/obj/structure/chair/sofa/right/brown, +/obj/item/toy/plush/moth{ + name = "Mender Moff" + }, +/turf/open/floor/carpet, +/area/station/medical/psychology) +"yjc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) +"yjd" = ( +/turf/closed/wall, +/area/station/command/gateway) +"yje" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/cup/glass/bottle/vodka, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) +"yjw" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/table/wood, +/obj/effect/spawner/random/bureaucracy/stamp, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) +"ykb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining{ + name = "Deliveries" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/shipping, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"ykn" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Arrival Airlock" + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) +"yko" = ( +/obj/structure/table, +/obj/item/paper_bin/construction, +/obj/item/airlock_painter, +/obj/item/rcl/pre_loaded, +/turf/open/floor/iron, +/area/station/commons/storage/tools) +"yks" = ( +/obj/structure/window/spawner/directional/west, +/turf/open/floor/carpet, +/area/station/service/theater) +"ykI" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/engine{ + name = "Holodeck Projector Floor" + }, +/area/station/holodeck/rec_center) +"ykK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"ykL" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"ykR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/window/right/directional/west{ + name = "Jim Norton's Quebecois Coffee"; + req_one_access = list("service","maint_tunnels") + }, +/obj/effect/turf_decal/trimline/green/line, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +"ykS" = ( +/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/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ylf" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/west{ + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/clothing/glasses/blindfold{ + pixel_y = 3 + }, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 3 + }, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/eyepatch, +/obj/item/clothing/suit/jacket/straight_jacket, +/turf/open/floor/iron/dark, +/area/station/medical/office) +"ylt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) +"ylI" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +"ylM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/commons/dorms) +"ylO" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"ylQ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ylU" = ( +/obj/structure/filingcabinet/employment, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"ylZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/security/brig) "yme" = ( @@ -79474,10 +127284,17 @@ lMJ aaa aaa aaa +<<<<<<< HEAD jkA aaa aaa jkA +======= +mWd +aaa +aaa +mWd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -81284,7 +129101,11 @@ aDa aDa iYU oSc +<<<<<<< HEAD wBx +======= +xtY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aDb rew lGL @@ -81351,7 +129172,11 @@ aaa aaa aaa aaa +<<<<<<< HEAD mrj +======= +nLZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -81839,7 +129664,11 @@ aaa aaa aaa aaa +<<<<<<< HEAD jkA +======= +mWd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -82335,7 +130164,11 @@ cUd sCz oHw xOO +<<<<<<< HEAD cUL +======= +bqg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ahe slD nyF @@ -82352,7 +130185,11 @@ jUb lvY sZK heE +<<<<<<< HEAD mmw +======= +kzZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xZu dMk nBy @@ -82547,7 +130384,11 @@ lMJ lMJ lMJ jXu +<<<<<<< HEAD myS +======= +pHK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mXz oFR ycr @@ -82627,19 +130468,31 @@ aox lMJ aaa aaa +<<<<<<< HEAD vnP +======= +qWg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa aaa aaa +<<<<<<< HEAD jhN +======= +bxr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa lZV aaa aaa +<<<<<<< HEAD vnP +======= +qWg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -82804,8 +130657,13 @@ aaa lMJ aaa nmg +<<<<<<< HEAD wFI btD +======= +cHR +jEa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu jXu jXu @@ -82817,7 +130675,11 @@ nmg jXu kBS rOz +<<<<<<< HEAD alG +======= +mlH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sHu cVL jZW @@ -82828,7 +130690,11 @@ twr sHu aPk jXu +<<<<<<< HEAD uEM +======= +vzG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qDD crk slD @@ -83318,7 +131184,11 @@ aaa aaa lMJ qGV +<<<<<<< HEAD nZs +======= +kHO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tvR aaa aaa @@ -83669,7 +131539,11 @@ qPC rKQ xjH xjH +<<<<<<< HEAD uUK +======= +fIR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa lMJ @@ -83861,7 +131735,11 @@ aaa fcq uEw fcq +<<<<<<< HEAD wGP +======= +duW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uhI vrP hve @@ -83902,7 +131780,11 @@ uxS uxS uxS uxS +<<<<<<< HEAD tgz +======= +jBO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jUb jUb jUb @@ -84132,26 +132014,42 @@ kOK kOK htE xxg +<<<<<<< HEAD jSh +======= +nMY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jzp dGQ kEm ifF olq njE +<<<<<<< HEAD uYU +======= +onN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pOa lEu uOH pOa sXI +<<<<<<< HEAD mmN +======= +cYY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tYZ jUb hWj coJ uxS +<<<<<<< HEAD oDV +======= +fNI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uxS bCE wGz @@ -84406,7 +132304,11 @@ pOa pOa jUb aaD +<<<<<<< HEAD dtD +======= +hWD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 etv jUb fYq @@ -84415,7 +132317,11 @@ jUb dyd jXO jUb +<<<<<<< HEAD exz +======= +wgl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jUb kXU jUb @@ -84429,7 +132335,11 @@ aaa xjH ocN ark +<<<<<<< HEAD juY +======= +uGq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iam kHk gqI @@ -84697,7 +132607,11 @@ rKQ rKQ xjH xjH +<<<<<<< HEAD sYw +======= +ktw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa lMJ @@ -84839,7 +132753,11 @@ aaa aaa aaa aaa +<<<<<<< HEAD cNX +======= +xtw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa fcJ aaa @@ -84860,7 +132778,11 @@ aaa aaa lMJ rqa +<<<<<<< HEAD oJi +======= +fiX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iQd aaa aaa @@ -84921,9 +132843,15 @@ pSw pAe aZL jgk +<<<<<<< HEAD pge pAe oPW +======= +qnr +pAe +rzB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pAe jUb cBc @@ -85117,13 +133045,21 @@ aox aox jXu jXu +<<<<<<< HEAD imF +======= +ojz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu lMJ lMJ lMJ pnI +<<<<<<< HEAD eYC +======= +vuz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xDu pcS pnI @@ -85145,12 +133081,21 @@ aaa fcq fcq pck +<<<<<<< HEAD vTO uEw nJG wSb iez ctu +======= +lku +uEw +nJG +jjn +jQr +kKd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mjg dHc dHc @@ -85367,14 +133312,22 @@ aaa aaa aaa aaa +<<<<<<< HEAD jkA +======= +mWd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa lMJ lMJ nmg vEV +<<<<<<< HEAD mrU +======= +rnf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu paD paD @@ -85388,7 +133341,11 @@ lMJ lMJ lMJ aox +<<<<<<< HEAD ugZ +======= +uNZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hxo aSZ lXG @@ -85396,6 +133353,7 @@ hxo lXG deU hxo +<<<<<<< HEAD ahb msn lMJ @@ -85409,6 +133367,21 @@ wUt fcq oyu pQX +======= +iNH +kyu +lMJ +fcq +fur +fur +wEz +aaq +aOA +wUt +fcq +jPE +auh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 crr crr crr @@ -85429,7 +133402,11 @@ pOa pOa uOH jUb +<<<<<<< HEAD gRS +======= +xIK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bar nBp dqN @@ -85456,7 +133433,11 @@ jUb aaa aaa rKQ +<<<<<<< HEAD iJT +======= +iyC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rKQ aaa aaa @@ -85598,6 +133579,7 @@ aaa aaa aaa aaa +<<<<<<< HEAD aaa aaa aaa @@ -85744,6 +133726,154 @@ lMJ rrt aaa aaa +======= +aaa +aaa +aaa +aaa +aaa +rrt +aaa +lMJ +lMJ +lMJ +lMJ +xuK +xuK +xuK +eqf +eqf +raz +raz +eqf +xuK +xuK +xuK +lMJ +lMJ +jfG +kmW +jfG +qvJ +jfG +jfG +jfG +jXu +kXA +mwo +jXu +qRU +kqh +com +hKg +hKg +fQW +kat +hKg +pnI +hKg +aaa +aaa +aaa +hxo +bnA +riU +oDJ +lAa +fyz +hxo +aaa +aaa +cbz +cbz +dBE +vQs +vQs +vQs +hor +vQs +vQs +iSk +nzD +uxa +uxa +bNQ +aal +sEk +aal +dPQ +xYy +vJB +fjD +pUl +lMY +pOa +mrN +gXe +vwi +tql +pOa +aDl +jUb +tWr +qKs +dPJ +hBC +jUb +nYy +jUb +ifh +jUb +pSw +jUb +sQy +dqN +dqN +dqN +cNS +eNV +dqN +eNV +jUb +jUb +gkU +shK +jUb +jUb +xjH +xjH +bVK +xjH +xjH +lMJ +xjH +xjH +rKQ +rKQ +rKQ +rKQ +xjH +xjH +fIR +aaa +aaa +aaa +lzJ +cqk +lzJ +lzJ +lzJ +lzJ +lzJ +lzJ +lMJ +lMJ +lMJ +lMJ +rrt +aaa +aaa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -85885,6 +134015,7 @@ dqo eXy wCf wVa +<<<<<<< HEAD pQw jXu jXu @@ -85893,6 +134024,16 @@ jXu pJp agk wWg +======= +jTl +jXu +jXu +qTL +jXu +pJp +rud +emU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bZz qvY kRe @@ -85912,6 +134053,7 @@ dZB hxo hxo hxo +<<<<<<< HEAD cJp hbW nhe @@ -85920,6 +134062,16 @@ hxg qMp dKY dTe +======= +pYM +eOb +gvA +vQs +ePj +tnF +dKY +kif +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vQs dHc dHc @@ -85969,7 +134121,11 @@ shK jUb tzt xjH +<<<<<<< HEAD rIm +======= +sMo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sOM lDj xjH @@ -86143,6 +134299,7 @@ jfG jfG gYE lBm +<<<<<<< HEAD pSq ybN hsL @@ -86150,6 +134307,15 @@ jXu qrL njh wmv +======= +ecm +ybN +tJB +jXu +qrL +iLT +vdg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bZz pPh aFd @@ -86161,6 +134327,7 @@ uvw yeq yeq yeq +<<<<<<< HEAD nbM ykO rAi @@ -86182,11 +134349,38 @@ vQs gxk hyW qUN +======= +cvv +wcy +kkk +fXZ +sUc +vsO +vsO +uAu +rmS +dme +exQ +vQs +cna +hjt +gEx +bGu +slZ +vQs +puW +hyW +pTf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iOc qwG fjD rEj +<<<<<<< HEAD vTL +======= +vCu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cwc kXa fjD @@ -86232,6 +134426,10 @@ vYJ xjH aaa aaa +<<<<<<< HEAD +======= +lMJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lMJ lMJ mDi @@ -86396,6 +134594,7 @@ aaa qvJ nxi bWw +<<<<<<< HEAD ndv cfX iPE @@ -86406,11 +134605,24 @@ smy jXu iGB hlW +======= +mqn +dwI +iPE +vfv +wXv +qCm +tXO +jXu +iGB +duc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 paD paD jpG kRe nVG +<<<<<<< HEAD sbo hKg hKg @@ -86437,6 +134649,34 @@ doN oyC vQs spy +======= +qOZ +hKg +hKg +ouu +jKc +sCs +nxG +xop +hhR +aok +coz +xXR +cmX +nxG +nxG +bPc +aok +wbp +vQs +lPn +tnk +eED +sTU +cJT +vQs +qlz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hyW rEO iOc @@ -86448,7 +134688,11 @@ vsr fRG vsr wfZ +<<<<<<< HEAD ezu +======= +soa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pOa myZ sXI @@ -86470,7 +134714,11 @@ liC jUb aRz uSz +<<<<<<< HEAD iCD +======= +oWQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vJy njc ctq @@ -86484,8 +134732,13 @@ jUb fRg xjH tAc +<<<<<<< HEAD vAm jEf +======= +wqJ +prx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xjH aaa aaa @@ -86653,12 +134906,17 @@ aaa qvJ nIj gYC +<<<<<<< HEAD tro +======= +ggZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 isO gYE uEC wgw twr +<<<<<<< HEAD idT jXu bZz @@ -86692,6 +134950,41 @@ eGO cua mmt jDa +======= +fpn +jXu +bZz +vRr +paD +hZg +dSG +apC +sUD +sWU +mUz +jIl +hWC +cEY +tqo +cEY +cEY +aok +xrv +aok +xHC +aok +xgb +aok +xHC +aok +vlk +fqe +iWZ +ojW +hpj +uSO +pSY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vQs tiD hyW @@ -86699,7 +134992,11 @@ rEO iOc rcW fjD +<<<<<<< HEAD cUF +======= +nhS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fjD cdv fjD @@ -86754,7 +135051,11 @@ gAf tSw tSw aaa +<<<<<<< HEAD ieS +======= +gda +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa sGL @@ -86910,12 +135211,17 @@ aaa qvJ kVR jCM +<<<<<<< HEAD unb +======= +lWL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wvR pQu vEH jXu vVp +<<<<<<< HEAD mrZ npy oHn @@ -86949,6 +135255,41 @@ lYm mzY fsS qcD +======= +wgQ +fmG +jmU +jBl +ycf +unc +xyz +jGb +uMj +poj +hnV +tPt +gUH +dAk +dAk +rhn +qnj +iqt +lUx +iqt +jNR +iqt +rlr +iqt +ckB +iqt +lvh +ubj +xbZ +kZI +nbd +vKn +fNz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vQs vQs hyW @@ -86987,7 +135328,11 @@ xUu mue xUu kIR +<<<<<<< HEAD stq +======= +tMS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xUu gjk kIR @@ -86997,7 +135342,11 @@ xUu nCL iCX oGf +<<<<<<< HEAD kRa +======= +sPq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rab iTH bhS @@ -87167,6 +135516,7 @@ aaa qvJ adD eks +<<<<<<< HEAD cXD eqi whc @@ -87174,6 +135524,15 @@ ujS jXu gQl vms +======= +jox +cVC +eZo +qmE +jXu +whs +xkj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu beo sLU @@ -87186,6 +135545,7 @@ qTf oor oor hDX +<<<<<<< HEAD xNl sqN hNT @@ -87209,6 +135569,31 @@ dHa xwB vQs wEm +======= +hrC +kuS +muq +oRO +bgx +uYB +aok +mml +aok +uEP +aok +cfH +mmR +vlk +fqe +vHa +nNB +qoY +rPp +rPp +ljH +vQs +mQa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rEO mux pOa @@ -87264,7 +135649,11 @@ rKf tSw laL tSw +<<<<<<< HEAD xJg +======= +aBQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qEf qEf aIl @@ -87424,13 +135813,22 @@ pma pma pma hZQ +<<<<<<< HEAD mwi kRW +======= +ntm +kHV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu jXu jXu jXu +<<<<<<< HEAD wXs +======= +tCF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu jXu jXu @@ -87442,6 +135840,7 @@ cBZ wyP oor jqr +<<<<<<< HEAD rrw xNl xNl @@ -87467,6 +135866,33 @@ fkH vQs hyW ffJ +======= +xLA +hrC +hrC +mmR +kwh +iqt +nut +aok +pkM +aok +jBu +aok +hKQ +mmR +gxu +vQs +vde +tGU +hYl +caV +eMK +eIc +vQs +hyW +qzC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kOQ lxM kDS @@ -87532,7 +135958,11 @@ gnL ckz dWA ecz +<<<<<<< HEAD uUK +======= +fIR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa lMJ aaa @@ -87665,9 +136095,15 @@ lMJ aaa aaa cmB +<<<<<<< HEAD ryn bHI lHy +======= +wsG +opF +sbX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jTi wyn iOr @@ -87679,14 +136115,21 @@ tOm tOm ntM pgJ +<<<<<<< HEAD oDd hZQ iMK +======= +pyR +hZQ +uQL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 twr gQg pCk twr xgB +<<<<<<< HEAD mkB lml jLp @@ -87717,13 +136160,50 @@ aYy juq juq nLA +======= +hJO +duG +omV +fhn +cuh +jBp +wsk +qHt +dxo +hlE +oor +aKN +uha +tMY +hDX +aok +sbP +bgx +aok +aok +xtH +qDW +qDW +qDW +ocS +eaA +vAT +xGT +xGT +bHv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vQs vQs vQs vQs vQs +<<<<<<< HEAD umw rsa +======= +upM +pqc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rkM pOa hKp @@ -87922,8 +136402,13 @@ lMJ aaa aaa cmB +<<<<<<< HEAD ihJ ovq +======= +nNo +tCC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qDS tVo ese @@ -87931,6 +136416,7 @@ iOr aaa raz raz +<<<<<<< HEAD rIR mEJ bWs @@ -87940,10 +136426,22 @@ ktG lsG kLT oZa +======= +pQh +uEs +qCM +uEs +aFZ +ktG +hQy +hYG +dwH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fUr fUr fUr fUr +<<<<<<< HEAD mlY mtV ceY @@ -87951,11 +136449,21 @@ jTL jXu fit otF +======= +bkJ +iIE +cAf +dve +jXu +pVV +qqr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iId tkf wZo oor hvo +<<<<<<< HEAD bqP okS oor @@ -87978,6 +136486,30 @@ pZK oMX fYU iCM +======= +uwM +uwf +oor +ylO +tYU +hLL +dfk +dfk +rQD +nsh +vWD +sCc +liU +nrB +smB +tik +sxk +xwa +fjw +cwY +sbF +flG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bzH hyW rEO @@ -88006,7 +136538,11 @@ kRA jUb xYq dqN +<<<<<<< HEAD rhs +======= +baG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jUb rvI jUb @@ -88019,7 +136555,11 @@ oZO bMS jUb dqN +<<<<<<< HEAD bdE +======= +vCC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jUb jdH oBv @@ -88191,6 +136731,7 @@ aaa tOm tOm tOm +<<<<<<< HEAD xxE aqW ueS @@ -88208,11 +136749,31 @@ twr jXu hKg lJQ +======= +tsi +hTG +gJM +srk +qGP +cLN +pkT +sHu +eMY +cVL +jXu +kIJ +sPO +twr +jXu +hKg +oMx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hKg hKg hKg oor jmR +<<<<<<< HEAD nwA pvZ mKj @@ -88238,6 +136799,33 @@ xau iev mor mJf +======= +hWK +fea +iHS +cqy +ebg +ebg +fwb +kQO +qvV +tMn +sFi +cHG +snZ +xgx +dfk +uyf +edN +uya +yhL +nQR +hYx +eMf +iev +sus +sly +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nxF sVY cyk @@ -88437,7 +137025,11 @@ aaa aaa iOr sQq +<<<<<<< HEAD sFk +======= +rVb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 viQ dTQ rOP @@ -88454,25 +137046,38 @@ pma hZQ jXu jXu +<<<<<<< HEAD aHW +======= +hsx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu jXu jXu jXu +<<<<<<< HEAD oTW +======= +alA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lpS lpS lpS ykL lpS lpS +<<<<<<< HEAD pFF +======= +xoj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lls jXu jXu jXu jXu cbz +<<<<<<< HEAD xyd gOC gYY @@ -88495,6 +137100,30 @@ iev iev lkv flY +======= +bLY +gQa +dit +uBj +uBj +bDn +xzx +hIp +qCS +bJX +xgx +rzo +quT +iev +gPN +ebd +ebd +jBy +iev +iev +bBy +qZO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pYn sVY psr @@ -88557,7 +137186,11 @@ tSw gOp bCM vKd +<<<<<<< HEAD cPa +======= +ikY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tSw lMJ aaa @@ -88711,12 +137344,20 @@ tdg hkj sQp kuW +<<<<<<< HEAD pDw +======= +qHa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ujT dYi iDG jXu +<<<<<<< HEAD idT +======= +fpn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 knQ bPM sHu @@ -88725,11 +137366,16 @@ jXu bPM rNP mgv +<<<<<<< HEAD xmh +======= +qgl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lpS lpS bkF cbz +<<<<<<< HEAD sxN vWA srr @@ -88751,6 +137397,29 @@ hvB sqt iev hUV +======= +jMb +kKO +vQT +hBo +gWz +kQv +cgZ +hIp +ksM +lQf +vKC +fwd +mwP +oTw +nLx +sHX +uyh +hvB +sqt +iev +djn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iVs fLd fpy @@ -88968,12 +137637,21 @@ tdg hkj hkj kuW +<<<<<<< HEAD lBj wkG mUF peu jXu idT +======= +uth +xBq +mUF +obF +jXu +fpn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu jXu jXu @@ -88985,6 +137663,7 @@ jXu jXu jXu kAI +<<<<<<< HEAD hwD ufm qtu @@ -89008,6 +137687,31 @@ hOh lAi bzH nlK +======= +gfa +eOl +vjg +mLp +tvv +xTe +xTe +tvv +kQP +wdM +asT +dHi +kkB +lVp +bzH +bzH +mzj +sml +rmL +hOh +lAi +bzH +azz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uxa mmm vjv @@ -89230,7 +137934,11 @@ qST xMx qrF jXu +<<<<<<< HEAD tgE +======= +vxO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu aaa aaa @@ -89242,6 +137950,7 @@ aaa aaa jXu twr +<<<<<<< HEAD hfB tCN kQP @@ -89261,6 +137970,27 @@ nEt bUb kas nlY +======= +nsT +heR +kQP +hqD +kQP +eTt +nwm +izI +kQP +eRd +vlP +qxJ +vNp +hvk +bzH +dGC +uud +wbW +fWn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jHW vjU bzH @@ -89460,7 +138190,11 @@ tGX aXa aKl lds +<<<<<<< HEAD tmy +======= +mzm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hXQ bVF fGP @@ -89482,12 +138216,20 @@ tdg tdg tdg fru +<<<<<<< HEAD lXd +======= +elz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uzb phP rgL jXu +<<<<<<< HEAD nut +======= +paU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu aaf rlU @@ -89499,6 +138241,7 @@ rlU aaf jXu sxn +<<<<<<< HEAD qks rdq xBj @@ -89518,6 +138261,27 @@ tJQ bsv qat kas +======= +ciE +dUd +rtz +fpV +tQp +bEK +ydp +cNb +mXO +kUG +rVn +qxJ +sik +ryV +paQ +wyS +ekb +wpO +wbW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ubn hld iev @@ -89537,7 +138301,11 @@ mjr nxz ueD sVY +<<<<<<< HEAD wRM +======= +wDH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rSx pEH pEH @@ -89545,7 +138313,11 @@ pOa shl cIW pOa +<<<<<<< HEAD kNJ +======= +jwp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qCL uIM ahg @@ -89744,7 +138516,11 @@ jXu jXu jXu jXu +<<<<<<< HEAD cHr +======= +otQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu aaa rlU @@ -89756,6 +138532,7 @@ rlU aaa jXu jXu +<<<<<<< HEAD xLV kQP sgU @@ -89779,6 +138556,31 @@ bLj rnh iev bah +======= +ken +kQP +hQc +dFg +wyV +iqo +wyV +cJt +mXO +alu +aUm +jvv +bNN +rod +mhM +dfK +wuo +tPW +ayz +bLj +rnh +iev +nJJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nqo qsX sVY @@ -89806,7 +138608,11 @@ xYM aez ajK aSe +<<<<<<< HEAD kdl +======= +jeL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jxc tuC iMv @@ -89832,7 +138638,11 @@ abX xTO lEP lEP +<<<<<<< HEAD wab +======= +chn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tBJ tBJ tBJ @@ -90001,13 +138811,18 @@ sOP twr fnJ jXu +<<<<<<< HEAD mKh +======= +wgm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fsQ aaa rlU qrg cpi cpi +<<<<<<< HEAD pNa qpD hvf @@ -90036,6 +138851,36 @@ blt bzH bzH mMI +======= +nSn +qpD +qYC +pNC +uqX +loR +kQP +ewc +dFg +wyV +wyV +wyV +oxX +mXO +vdW +oac +fhB +hxd +dHz +aqG +geR +ekb +lsU +bQl +pCs +bzH +bzH +pNk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ivB qaw sVY @@ -90059,7 +138904,11 @@ pOa sQY nPt qSk +<<<<<<< HEAD uAw +======= +pBs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lgC avb uPi @@ -90258,12 +139107,17 @@ dEH pOi bMu jXu +<<<<<<< HEAD sga +======= +agi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fsQ aaa rlU trx uWn +<<<<<<< HEAD tND fqF eUz @@ -90293,6 +139147,37 @@ oQV exw bzH iHZ +======= +spf +czD +lBg +tWU +wWe +aTU +jzE +kQP +ezw +aSv +aLW +jle +ukm +dLh +kQP +pUk +upN +qxJ +ajq +eml +bzH +bvl +nKu +gxM +jRo +qCx +roG +bzH +mnP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tEr iOc sVY @@ -90511,6 +139396,7 @@ sjP aaa nmg hwo +<<<<<<< HEAD jdQ knQ dLM @@ -90532,10 +139418,34 @@ kQP kQP aoh aoh +======= +rBY +knQ +cDV +sLf +uEA +fsQ +aaa +rlU +vbF +wHW +wHW +okj +rlU +qYC +pNC +lpt +cNg +kQP +kQP +mXO +mXO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kQP kQP kQP kQP +<<<<<<< HEAD aEp clf iRR @@ -90550,6 +139460,22 @@ nLV wwv wAm gsl +======= +rcR +hIu +liX +jUs +nDG +bzH +bzH +usJ +kFa +lak +rUd +cXE +ykb +cJS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ybn fLp sVY @@ -90573,7 +139499,11 @@ clp etn ayH pOa +<<<<<<< HEAD hap +======= +bjK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jqQ mbV hEA @@ -90617,7 +139547,11 @@ gwS oxT sEE hrG +<<<<<<< HEAD xBl +======= +lPB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vQg gYU pIs @@ -90772,18 +139706,28 @@ wQj jXu jXu jXu +<<<<<<< HEAD vVm jXu aaa rlU dro lXs +======= +fOB +jXu +aaa +rlU +vis +dhz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ixT oXK rlU aaa aEH aHt +<<<<<<< HEAD rQe uSb aHt @@ -90807,6 +139751,31 @@ plu xwv aqG iHZ +======= +loR +hTM +aHt +aHt +aHt +eaQ +aHt +qlW +jfg +lay +udU +isA +eKG +iit +pWb +bzH +wTv +sul +pkF +dtE +dSH +aqG +mnP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xOw iOc sVY @@ -90879,7 +139848,11 @@ wZe jsr wyC gYU +<<<<<<< HEAD sEO +======= +rbF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rxY ulE aaa @@ -91028,8 +140001,13 @@ jXu jXu jXu sHu +<<<<<<< HEAD iuX gxU +======= +lRA +lFF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu aaf rlU @@ -91041,9 +140019,15 @@ rlU lMJ aEH rhW +<<<<<<< HEAD liA gJb iwD +======= +oRR +lug +cGq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wcs hMn ygR @@ -91053,6 +140037,7 @@ mPK lgg kWP lgg +<<<<<<< HEAD iVQ lnf oEn @@ -91064,6 +140049,19 @@ aqG aqG aqG fOc +======= +uLE +cSu +nPN +bzH +aqG +aqG +mxx +aqG +aqG +aqG +uGU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mFo npY qwR @@ -91086,7 +140084,11 @@ sVY xxk ahr bMY +<<<<<<< HEAD pmw +======= +yim +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rvq fFi iWD @@ -91304,6 +140306,7 @@ cFp vvH cFp guX +<<<<<<< HEAD vVg ykR ipL @@ -91321,6 +140324,25 @@ xDL xDL xDL xWI +======= +saD +ykR +bLh +pPH +hSg +uTN +uVm +sSV +alw +anX +nyb +nyb +xYT +nyb +nyb +nyb +qjH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vhB guR lsf @@ -91343,7 +140365,11 @@ bBA txz wYe bMY +<<<<<<< HEAD aaL +======= +pUM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mna gVn cXz @@ -91538,7 +140564,11 @@ eWA sjP aaa aaa +<<<<<<< HEAD jhN +======= +bxr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXu rOz sHu @@ -91560,6 +140590,7 @@ nZh hSf pID qSp +<<<<<<< HEAD bYF jWM jfX @@ -91567,6 +140598,15 @@ xTS iFC iBt koU +======= +cOj +tcr +jfX +aUC +iFC +iBt +nrM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yaE tmK htd @@ -91818,9 +140858,15 @@ xnt ifn uOi guX +<<<<<<< HEAD aQP kSN iXv +======= +ocB +kSN +qTF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 euo xML gWL @@ -92073,6 +141119,7 @@ kkX ddP bVk bNP +<<<<<<< HEAD rRz guX kSH @@ -92080,6 +141127,15 @@ mLD tEA jWR uUB +======= +asi +guX +qIp +mLD +sEM +jWR +fbE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pAk ykS hPM @@ -92349,7 +141405,11 @@ oIa pJR uJx sRT +<<<<<<< HEAD oWD +======= +vsU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gaU flu jbd @@ -92361,9 +141421,15 @@ nIR tOh lTM dYb +<<<<<<< HEAD vJs sCt kPk +======= +psv +mZz +cCN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dYb dYb tOh @@ -92374,9 +141440,15 @@ nvI oNP ehE rlw +<<<<<<< HEAD gcR oVs cbK +======= +bTm +ylf +tzI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bMY uET iZF @@ -92602,14 +141674,24 @@ oIa gja wvo xCl +<<<<<<< HEAD pgd pJR iFl +======= +nMz +pJR +egp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kfA rWH oOE aVd +<<<<<<< HEAD geh +======= +cKN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mig wMx cMQ @@ -92639,12 +141721,21 @@ ePX svQ duu pKP +<<<<<<< HEAD tgG rQd cJm pSB bJG eYM +======= +cQz +rQd +cJm +jGw +bJG +gbn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bqX ulR qXL @@ -92657,7 +141748,11 @@ qXL oqk xZB hIJ +<<<<<<< HEAD qJt +======= +vhb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lrZ kiz nmQ @@ -92852,16 +141947,28 @@ iBq mFi iBq iBq +<<<<<<< HEAD jEC kON fDc oIa erw +======= +vxE +kON +fDc +oIa +cpn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 koa srP nuB pJR +<<<<<<< HEAD liS +======= +gAk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qAA uFQ eIy @@ -92873,12 +141980,21 @@ qRI urA nIR hyN +<<<<<<< HEAD sQh kwB dTr rIL bwN kmn +======= +uaN +jIg +dTr +rIL +bwN +omd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ukk rGm gqX @@ -92888,18 +142004,30 @@ qPJ luN wde jJd +<<<<<<< HEAD ueI nsg +======= +dQL +umS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qPJ bgS taO dlH jsP cOR +<<<<<<< HEAD urO xbY scB cpF +======= +jvr +xbY +scB +rHk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sXT sTK bqX @@ -92915,7 +142043,11 @@ dVN iqz iqz vZF +<<<<<<< HEAD jnR +======= +xCR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kiz svp fxW @@ -93113,7 +142245,11 @@ hZZ htd uoe oIa +<<<<<<< HEAD nOx +======= +nnq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vnE pzT jOv @@ -93121,11 +142257,19 @@ pJR pJR pJR pJR +<<<<<<< HEAD naI rGj odd pJR uDf +======= +iiE +rGj +rJr +pJR +oUB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qRI urA nIR @@ -93142,21 +142286,36 @@ gqX htd oGK qPJ +<<<<<<< HEAD cEe +======= +rQk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 waH vbV ixr gzW +<<<<<<< HEAD ijf +======= +rxa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eqc kyQ kHg jhk cOR +<<<<<<< HEAD baB ijZ tYt jBX +======= +vgZ +ijZ +tYt +qLk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pXM iNc bqX @@ -93382,7 +142541,11 @@ kEp aVd kfC pJR +<<<<<<< HEAD nSa +======= +aHN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qRI urA tYW @@ -93399,12 +142562,20 @@ rym htd oGK qPJ +<<<<<<< HEAD rha +======= +bKv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nsb izD evY sli +<<<<<<< HEAD aig +======= +oFG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lsJ gQG tFr @@ -93428,7 +142599,11 @@ dVN iqz iqz iqz +<<<<<<< HEAD tpY +======= +ubF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hZV skW mXn @@ -93615,10 +142790,17 @@ qWF aaa aJS aJS +<<<<<<< HEAD kRE pQG wtB bjf +======= +akF +pQG +wtB +vyv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aJS aaa ihq @@ -93634,7 +142816,11 @@ siL grl noA pJR +<<<<<<< HEAD hSb +======= +fGs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mIl fJp bSj @@ -93662,10 +142848,17 @@ qbE qbE qbE qPJ +<<<<<<< HEAD gSk gQG oBO skj +======= +klj +gQG +oBO +jNl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pKP xpL eWp @@ -93685,7 +142878,11 @@ bjy iqz tqd pbz +<<<<<<< HEAD tTZ +======= +dpl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hZV bAI idL @@ -93834,7 +143031,11 @@ sjP sjP sjP sjP +<<<<<<< HEAD gIj +======= +dkX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yey jTZ aBL @@ -93891,18 +143092,30 @@ tUH vPW lDo pJR +<<<<<<< HEAD lwL hip fJp iXu +======= +gvl +hip +fJp +wBu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jLQ fgS jrk dhX nIR gBD +<<<<<<< HEAD cIH mvm +======= +twl +bcx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rhK rKJ wFe @@ -93915,7 +143128,11 @@ ebM uRA mTk yhm +<<<<<<< HEAD gxo +======= +rbs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jHA lln nBB @@ -94130,12 +143347,20 @@ aaa aJS oOl rxx +<<<<<<< HEAD eOu +======= +viF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aPv oWF eQg aJS +<<<<<<< HEAD gTO +======= +mSI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aUx qhF htd @@ -94149,16 +143374,26 @@ aKb pUd pJR lJn +<<<<<<< HEAD eRC htG oDC +======= +psy +htG +bIq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pJR mQq ndS urA pFG gBD +<<<<<<< HEAD kCA +======= +dzX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fRu hVE xXw @@ -94199,7 +143434,11 @@ uYI iqz bxE hZV +<<<<<<< HEAD yem +======= +xUm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gPl nZm wvB @@ -94211,7 +143450,11 @@ isk iUm bVx fWc +<<<<<<< HEAD rRd +======= +muZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jay mRy wBW @@ -94385,7 +143628,11 @@ ixP qWF aaa aJS +<<<<<<< HEAD oDB +======= +dWf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nhP aOc aPw @@ -94432,7 +143679,11 @@ asm kqm vLf kXD +<<<<<<< HEAD sbD +======= +kWO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rvE whx cIK @@ -94456,7 +143707,11 @@ uYI iqz iaK hZV +<<<<<<< HEAD ayG +======= +vzt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jBU kgx kgx @@ -94644,7 +143899,11 @@ aaa aJS bpu wzH +<<<<<<< HEAD eKl +======= +nwL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aPv iIQ aRV @@ -94662,7 +143921,11 @@ dsQ sVz aNe jiI +<<<<<<< HEAD cMJ +======= +kvr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jnl dNz dNz @@ -94671,8 +143934,13 @@ tNg vpg ebx aks +<<<<<<< HEAD fnj wxE +======= +hux +bbT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ilq kAp jnI @@ -94689,6 +143957,7 @@ xEX hYr qAf lrR +<<<<<<< HEAD oxy nFM tIx @@ -94702,6 +143971,21 @@ eIO sGn fvE dBv +======= +qwI +xJI +tIx +wmT +hCt +uUb +rXW +bSs +rla +eIO +sGn +fvE +dYG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iqz iqz iqz @@ -94713,7 +143997,11 @@ hbO iqz ogk hZV +<<<<<<< HEAD dYW +======= +daa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uiw kys kWE @@ -94876,7 +144164,11 @@ lAM aaa aaa rJB +<<<<<<< HEAD qYb +======= +kaU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nqD sfK rTw @@ -95157,10 +144449,17 @@ qWF aaa aJS aJS +<<<<<<< HEAD iOQ vrJ fEO hsu +======= +hlB +vrJ +fEO +cFr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aJS aaa ihq @@ -95172,8 +144471,13 @@ tKN aaf dsQ mZL +<<<<<<< HEAD aSB yhz +======= +usQ +aGQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 acf hmq dJX @@ -95191,8 +144495,13 @@ aaf inX pRh uCH +<<<<<<< HEAD jeV jMT +======= +mWY +mtb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSo nNY htd @@ -95209,7 +144518,11 @@ oHG slC dHN fVY +<<<<<<< HEAD pCI +======= +mVf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fhe ocQ eIO @@ -95233,7 +144546,11 @@ jLy kgx hKB vLo +<<<<<<< HEAD gxj +======= +aAb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tSw dbX iUm @@ -95433,10 +144750,17 @@ nxO qXF qXF aMB +<<<<<<< HEAD jAJ duI jnt usV +======= +tVk +duI +jnt +cdC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kcn qsL dho @@ -95446,29 +144770,51 @@ ndS qRI qRI jzN +<<<<<<< HEAD hGm qeZ nBs cvU tGQ +======= +sYh +qeZ +nBs +eLa +vyi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nNY htd tHR sTz xIG +<<<<<<< HEAD gRV eAL xQY kcF jih +======= +bKB +eAL +xQY +kcF +cYJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oar keK lXA mVE hxq +<<<<<<< HEAD cUm nqB uHh +======= +nJn +nqB +kxa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eIO hKG fvE @@ -95480,7 +144826,11 @@ iqz iqz sTW cYx +<<<<<<< HEAD sPh +======= +cXH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 joj dWI hZV @@ -95652,7 +145002,11 @@ aeq aeq aeq aeq +<<<<<<< HEAD pce +======= +dRX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 riY aeq vDh @@ -95690,6 +145044,7 @@ dUj gGy hmq fUj +<<<<<<< HEAD rgV duI duI @@ -95697,6 +145052,15 @@ aif ddm vKL sGV +======= +qcD +duI +duI +lwt +ddm +vKL +gmH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lSz aks qzz @@ -95713,11 +145077,16 @@ sNl aZR lYL pBa +<<<<<<< HEAD vzJ +======= +aNQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nxy nxy aYJ hEc +<<<<<<< HEAD mPX gSV vuf @@ -95725,16 +145094,34 @@ lsg rvE tZJ uRd +======= +bFN +qJn +hYA +jsh +rvE +tZJ +vjX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tZJ eIO wKC fvE +<<<<<<< HEAD pKr usr hxk hOs hgB wpN +======= +kKT +kMk +wPH +xyA +hgB +jxm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unt bqX bqX @@ -95905,7 +145292,11 @@ aaa aaa aeq xCo +<<<<<<< HEAD jHp +======= +loY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tTP fdQ uou @@ -95917,7 +145308,11 @@ fYJ ycM tYQ dsk +<<<<<<< HEAD feZ +======= +ewC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iAN xnT ycM @@ -95942,12 +145337,21 @@ uoe tKN aaf dho +<<<<<<< HEAD uak gGy qVc dMY lnO ggs +======= +wss +gGy +qVc +dMY +jYL +tpA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aAt duI pCO @@ -95960,10 +145364,17 @@ fix yeA tnm jzN +<<<<<<< HEAD jSp dkL uOd fOT +======= +sUy +dkL +uOd +bRp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jzN qyI qaP @@ -95980,12 +145391,20 @@ rvE sIG rvE rvE +<<<<<<< HEAD vqN +======= +sgc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lLq lLq eIO qbZ +<<<<<<< HEAD iou +======= +lRT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bqX bqX bqX @@ -95993,7 +145412,11 @@ pJV bqX bqX bqX +<<<<<<< HEAD iRU +======= +cJL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fjq wvh iEv @@ -96159,7 +145582,11 @@ aaa jLw aaa aaa +<<<<<<< HEAD vRJ +======= +cTk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aeq dXs tJE @@ -96205,11 +145632,19 @@ gGy cwX gGy nEC +<<<<<<< HEAD hnx duI gGy oLD eNQ +======= +pJY +duI +gGy +oLD +klI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lPZ lyN piz @@ -96217,10 +145652,17 @@ lLk fix haP jzN +<<<<<<< HEAD lvn eQe koi sZL +======= +fEC +eQe +qtq +iAA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSo cgF koW @@ -96431,7 +145873,11 @@ mbk ntP bfj hMy +<<<<<<< HEAD heM +======= +aZr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rbw gnm eVa @@ -96466,7 +145912,11 @@ qNV iOp wOR ljL +<<<<<<< HEAD ovE +======= +mrG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lPZ mJE tWV @@ -96688,7 +146138,11 @@ ewj bkl wZU pMy +<<<<<<< HEAD jRd +======= +oGH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 orx eeq sDS @@ -96717,6 +146171,7 @@ owv dUj gGy dMY +<<<<<<< HEAD cIg nEC jts @@ -96724,6 +146179,15 @@ duI gGy bIH cmA +======= +raJ +nEC +qMf +duI +gGy +bIH +iMi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lPZ lyN wXP @@ -96731,10 +146195,17 @@ eGV fix rwi jzN +<<<<<<< HEAD gJx gzi wOO nwx +======= +wyp +gzi +cyU +wpo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSo iXb kdx @@ -96926,7 +146397,11 @@ aaa aaa aaa aaa +<<<<<<< HEAD aFb +======= +tLb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iTZ ahj ahj @@ -96970,7 +146445,11 @@ tGL tKN aaf dho +<<<<<<< HEAD gcN +======= +vSh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gGy gGy dMY @@ -96988,10 +146467,17 @@ fix mIu haP jzN +<<<<<<< HEAD akQ nvc nBs hsG +======= +tNC +nvc +nBs +mun +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jzN bcq sRf @@ -97021,9 +146507,15 @@ fma fma kor aQS +<<<<<<< HEAD kED kQe adC +======= +qCY +kQe +qYt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qDa oIg oIg @@ -97202,10 +146694,17 @@ ayV gFR khm uok +<<<<<<< HEAD vre ezg uVv vwL +======= +bzV +ezg +uVv +pdI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pjh gpc gGo @@ -97232,6 +146731,7 @@ dUj qVc wNh veO +<<<<<<< HEAD pbR duI duI @@ -97239,6 +146739,15 @@ lxB ppB nEC sGV +======= +iAj +duI +duI +wtX +ppB +nEC +gmH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ebx vQe kHn @@ -97260,17 +146769,29 @@ rgZ suW hJF cZK +<<<<<<< HEAD pds cXg nyy gVl nsj +======= +euw +cXg +nyy +gVl +usg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fma ebV dZb ebV fma +<<<<<<< HEAD dOj +======= +xgi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sck iwA puP @@ -97281,9 +146802,15 @@ dPY xWJ oIg cId +<<<<<<< HEAD aGW oIg odg +======= +rQl +oIg +wBq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bEC lsV aXW @@ -97296,7 +146823,11 @@ jjs dKC xLu dKC +<<<<<<< HEAD aRx +======= +cbp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ctL oPD iUm @@ -97489,10 +147020,17 @@ lNH qXF qXF aMB +<<<<<<< HEAD pvl duI jnt tqb +======= +mvZ +duI +jnt +pOK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sLd mRn dho @@ -97505,8 +147043,13 @@ jzN aAI gzi krL +<<<<<<< HEAD ukP tGQ +======= +cqm +vyi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wpx htd tHR @@ -97537,10 +147080,17 @@ ujJ ujJ ujJ oIg +<<<<<<< HEAD dSd poS byf eeD +======= +cDM +poS +byf +kBu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oir wal tzg @@ -97716,10 +147266,17 @@ duF cJj erx lsP +<<<<<<< HEAD phd eaP lTj nOg +======= +vYF +eaP +lTj +jau +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 afj qGs gCD @@ -97742,8 +147299,13 @@ tKN aaf dsQ kGc +<<<<<<< HEAD bYU viN +======= +dTV +gkD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nXm wNh veO @@ -97761,8 +147323,13 @@ aaf inX sxA cPU +<<<<<<< HEAD sDY jGp +======= +ygt +dqu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oSo wpx htd @@ -98000,7 +147567,11 @@ aaf dsQ dsQ dho +<<<<<<< HEAD szD +======= +rhL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sLd qXF aMB @@ -98037,7 +147608,11 @@ iug nZf uTP eut +<<<<<<< HEAD ygj +======= +vlY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uwK wmg jAt @@ -98270,7 +147845,11 @@ bcT xPN vQe kmZ +<<<<<<< HEAD lSV +======= +buL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pha sdp vxB @@ -98286,7 +147865,11 @@ xdX pZc fak jUh +<<<<<<< HEAD ycQ +======= +vsI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cZK wfA cBV @@ -98294,16 +147877,26 @@ wsD cBV xlv eut +<<<<<<< HEAD mvr tjz nhQ +======= +bUo +tjc +jtS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bFH mMl lhT cqT lhT iMG +<<<<<<< HEAD okn +======= +dpg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bBo gwf gfZ @@ -98311,7 +147904,11 @@ gqm jZP aIO jrb +<<<<<<< HEAD iAy +======= +vEC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eOo rRJ edH @@ -98516,8 +148113,13 @@ aaf dho dho dho +<<<<<<< HEAD oHD cBO +======= +iNB +wfD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dho syo syo @@ -98533,7 +148135,11 @@ qKg qKg qKg lVl +<<<<<<< HEAD lip +======= +pic +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tvE psp wBF @@ -98790,7 +148396,11 @@ nse bmb lwg aAK +<<<<<<< HEAD kAg +======= +xbg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tvE qJU hPM @@ -98808,7 +148418,11 @@ eKA azF eKA uqp +<<<<<<< HEAD hIL +======= +kaF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bse eIV gcU @@ -98816,7 +148430,11 @@ noN bCc bCc eER +<<<<<<< HEAD toH +======= +kPy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eut dEV gwf @@ -98832,7 +148450,11 @@ aHi hrh txG eKP +<<<<<<< HEAD inp +======= +uBG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kXG svS ove @@ -99024,6 +148646,7 @@ sey hPM hvr syo +<<<<<<< HEAD nSj vNG ybC @@ -99033,6 +148656,17 @@ tyY aPs ttT kAv +======= +bUt +vNG +tIR +tyY +ogL +tyY +aPs +cUX +guO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nOq xDa vwP @@ -99042,7 +148676,11 @@ lSz wxk tvE uHa +<<<<<<< HEAD mxk +======= +aqt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yeu vNf cGj @@ -99069,11 +148707,19 @@ obN gwf dMz tga +<<<<<<< HEAD lMA nJH gso nQX grU +======= +btG +nJH +gso +nQX +iYO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tga kzQ gwf @@ -99283,7 +148929,11 @@ kGq syo oOz tLi +<<<<<<< HEAD jCv +======= +nnh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tyY vFx tyY @@ -99311,10 +148961,17 @@ kON ylQ bGC wHu +<<<<<<< HEAD cBv ibw ibw azo +======= +gVE +ibw +ibw +nIP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gFQ aDm non @@ -99326,11 +148983,19 @@ gVO gwf hCK eut +<<<<<<< HEAD brN hca lqW xIM bfy +======= +fZw +wRD +lqW +xIM +qTU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eut beZ gwf @@ -99509,7 +149174,11 @@ wVt jzD wxj kZG +<<<<<<< HEAD oMa +======= +ihN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kYg kYg ylZ @@ -99520,7 +149189,11 @@ sWV sWV sWV qJb +<<<<<<< HEAD fEn +======= +rJh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hME olw olw @@ -99546,11 +149219,19 @@ eCB tyY xFx sxR +<<<<<<< HEAD qpK sqJ gPA tFv jVu +======= +jxv +sqJ +gPA +lZM +qrw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 syo lSz vQe @@ -99604,7 +149285,11 @@ dIW iTc qfQ cLk +<<<<<<< HEAD wqr +======= +oxR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 svS dKC qkX @@ -99780,7 +149465,11 @@ xNo woV bkZ xNU +<<<<<<< HEAD bHT +======= +uZL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nVy tGI daC @@ -99798,12 +149487,20 @@ syo mIH iFX ifM +<<<<<<< HEAD oeF +======= +hiZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rDT syL rDT tZD +<<<<<<< HEAD rrP +======= +snu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ifM pdY pXA @@ -99825,7 +149522,11 @@ htd saU tgI mvR +<<<<<<< HEAD cuh +======= +jRO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bPi gpB sky @@ -99861,7 +149562,11 @@ fhi fhi fhi bft +<<<<<<< HEAD sZJ +======= +jws +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gyQ iVt iNi @@ -100037,8 +149742,13 @@ jAP fEn xXC xNU +<<<<<<< HEAD kbW hPm +======= +eJd +xlf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lWg byw glv @@ -100058,9 +149768,15 @@ alg rEg uGj tyY +<<<<<<< HEAD wYw nCB pVR +======= +iDh +nCB +wll +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gpS xuH jdv @@ -100082,7 +149798,11 @@ htd saU ooP mvR +<<<<<<< HEAD inT +======= +rVT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iQi fGv knY @@ -100113,7 +149833,11 @@ fMn gal fgH gyQ +<<<<<<< HEAD sol +======= +hSl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fhi fhi fhi @@ -100262,7 +149986,11 @@ aaa aaa aaa aaa +<<<<<<< HEAD aFb +======= +tLb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gdb ikZ gdb @@ -100339,14 +150067,24 @@ htd dhU dkW mvR +<<<<<<< HEAD cOk aSf qqp +======= +bXc +tLH +lnu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 otB bdv jXK sQB +<<<<<<< HEAD xzB +======= +gLU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 buT oOB kZx @@ -100376,12 +150114,21 @@ fhi fhi uEo fiS +<<<<<<< HEAD yaU hNu yaU yaU yaU yaU +======= +rXT +eRn +rXT +rXT +rXT +rXT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lMJ uGg nFa @@ -100540,11 +150287,19 @@ pyY sNB xWm mLL +<<<<<<< HEAD nXB vkb cLl sWV kCU +======= +xWr +vkb +cLl +sWV +unK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mOt clq aKa @@ -100568,7 +150323,11 @@ qBC syo xUx cRU +<<<<<<< HEAD kqj +======= +oRn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sjS xNd tyY @@ -100587,7 +150346,11 @@ icj hda mdy naw +<<<<<<< HEAD fCP +======= +pQO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bwr srp eEH @@ -100605,7 +150368,11 @@ dlG ipM rsD qos +<<<<<<< HEAD aaj +======= +sLF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kZx oBz gTo @@ -100633,12 +150400,21 @@ huj fhi xEU iqx +<<<<<<< HEAD aJh hAv aJh qvi vsD cxT +======= +xYZ +gil +xYZ +oet +dXU +kgC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lMJ uGg nFa @@ -100853,7 +150629,11 @@ htd mrJ lvs xJa +<<<<<<< HEAD est +======= +kxW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gWH ivR mxI @@ -100890,12 +150670,21 @@ fhi fhi fhi twy +<<<<<<< HEAD wtY gYG clD eIv snj cxT +======= +nJA +nZL +bEv +cgP +rtj +kgC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lMJ uGg nFa @@ -101040,7 +150829,11 @@ aaa rrt lMJ mxn +<<<<<<< HEAD ulk +======= +mwj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 psw asM mxn @@ -101092,7 +150885,11 @@ vLb jmT jZR mJN +<<<<<<< HEAD bBC +======= +cwP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sqM hBr jef @@ -101125,9 +150922,15 @@ hNz iTO aEW mzg +<<<<<<< HEAD dAf tEt nxQ +======= +rHh +tEt +tKR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fjb prU aJd @@ -101139,6 +150942,7 @@ jVy jTN vAH kIY +<<<<<<< HEAD iaF gyQ yfh @@ -101153,6 +150957,22 @@ ghS hLV vsD cxT +======= +rbd +gyQ +rbD +jwj +ujk +jvo +aHH +iYE +dTN +dEF +dTN +cOT +dXU +kgC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lMJ uGg wpn @@ -101309,7 +151129,11 @@ gMZ cju gMZ mFf +<<<<<<< HEAD wdp +======= +mYb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sHt qrn qRg @@ -101366,7 +151190,11 @@ htd cfe ddO sLE +<<<<<<< HEAD mXK +======= +cEv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iQO eeT tUn @@ -101382,7 +151210,11 @@ myB vWz hkE pke +<<<<<<< HEAD iNX +======= +msJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xKK xKK rJA @@ -101608,12 +151440,20 @@ xCD xCD xCD xCD +<<<<<<< HEAD nzg +======= +byQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hio vtu cWT xBx +<<<<<<< HEAD nPo +======= +bdb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 smG smG gtU @@ -101639,13 +151479,20 @@ olG ohH dTS gtV +<<<<<<< HEAD fqh tEt jtg +======= +enF +tEt +rMr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xff eSl gTU kYU +<<<<<<< HEAD gzZ vEo biz @@ -101657,6 +151504,19 @@ ove iHv gIK oWG +======= +ote +vEo +iXp +svS +kMd +hxe +cuO +ove +iHv +gIK +buv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xLu ktz svS @@ -101856,7 +151716,11 @@ uZj ghl xZW uOX +<<<<<<< HEAD aBV +======= +myG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rac bvJ bvJ @@ -101880,7 +151744,11 @@ fCt uDr uDr sLE +<<<<<<< HEAD mVo +======= +teq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vIB qOM tUn @@ -101888,8 +151756,13 @@ ftj wXF doM tZo +<<<<<<< HEAD viy dyz +======= +bXg +oFT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gvS oYZ oYZ @@ -101921,8 +151794,13 @@ dpN dpN egk mwY +<<<<<<< HEAD uVs kCm +======= +bIa +vYl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nFa nFa rDB @@ -102068,7 +151946,11 @@ aaa rrt lMJ mxn +<<<<<<< HEAD aml +======= +osH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gTt sdu fad @@ -102113,8 +151995,13 @@ dZm vFB fRS twN +<<<<<<< HEAD sGX uoS +======= +lkc +hhN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pBi hkG xEJ @@ -102125,6 +152012,7 @@ uWU oyY dfp tRL +<<<<<<< HEAD hNh eQE bNf @@ -102136,6 +152024,19 @@ wYB kMG sWq xIH +======= +hrM +eQE +bNf +vZM +eQE +hcm +fEg +wYB +kMG +wSI +oBM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kCZ kMG tlK @@ -102150,7 +152051,11 @@ nBj gYe vQb mdu +<<<<<<< HEAD xmG +======= +xPm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ohZ sac huq @@ -102170,7 +152075,11 @@ nFa svS mHy mHy +<<<<<<< HEAD kJc +======= +kVq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pdi kRV svS @@ -102325,7 +152234,11 @@ aaa aaa aaa mxn +<<<<<<< HEAD oRk +======= +yeV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hUB qmf jTH @@ -102347,7 +152260,11 @@ fRW qnS uxb hAk +<<<<<<< HEAD tFm +======= +gzO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eqn jSb kAF @@ -102385,7 +152302,11 @@ lYR loh nxH mVY +<<<<<<< HEAD tmx +======= +pQC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eQE reJ pcc @@ -102419,7 +152340,11 @@ fnh mMX moF klT +<<<<<<< HEAD uhd +======= +iWT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 svS dKC lMW @@ -102630,22 +152555,36 @@ twN rac ekR wCL +<<<<<<< HEAD kIb +======= +gPh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hkG wPE fGH gwc aLk pAr +<<<<<<< HEAD cPP cqI wSU +======= +wjK +cqI +vtK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eQE oWH nBf eQE rVG +<<<<<<< HEAD tou +======= +kqZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wYB iji cAG @@ -102686,9 +152625,15 @@ ouX bHt snE fFo +<<<<<<< HEAD jTe wcO rMH +======= +pOk +hBI +krN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kYD lMJ lMJ @@ -102892,6 +152837,7 @@ gvm uhP cXQ gwc +<<<<<<< HEAD mzc owi cUy @@ -102899,6 +152845,15 @@ hyX fQh eQE dmn +======= +pof +owi +nxA +hyX +rrz +eQE +eEf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rOM eQE qrQ @@ -102914,9 +152869,15 @@ bWM tUn jGv wXF +<<<<<<< HEAD pkz sBz ipl +======= +uqO +enS +jwP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cbg bix vQb @@ -102924,8 +152885,13 @@ ekQ uhT wtP bDm +<<<<<<< HEAD qBL hXg +======= +lpR +obQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vQb jbg gwf @@ -102945,7 +152911,11 @@ guG unP gKK otj +<<<<<<< HEAD pXy +======= +fvK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kYD lMJ aaa @@ -103149,11 +153119,19 @@ uFf qVt wxG gwc +<<<<<<< HEAD fDl oCn gWl epO gVa +======= +jjF +oCn +gWl +epO +qrO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eQE nnl qfB @@ -103161,7 +153139,11 @@ dDH pkK ocC nmf +<<<<<<< HEAD kep +======= +lHe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gFL xlF xlF @@ -103177,8 +153159,13 @@ jvL vfh kHN tAg +<<<<<<< HEAD gpb psu +======= +tcx +nhr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vYE wnY nfs @@ -103202,7 +153189,11 @@ guG iAs coe tfV +<<<<<<< HEAD gwA +======= +nRQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oLS lMJ aaa @@ -103376,7 +153367,11 @@ eek wst mPE knf +<<<<<<< HEAD kxZ +======= +gGf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dIO dIO dIO @@ -103406,7 +153401,11 @@ nGK rPN bIi bTl +<<<<<<< HEAD rtG +======= +lIB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dDq dUo utS @@ -103415,9 +153414,15 @@ eQE mFC wHL eQE +<<<<<<< HEAD ahu eLI qqT +======= +rem +eLI +ltW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jyF gFL byW @@ -103434,7 +153439,11 @@ sIW bRb cKm tAg +<<<<<<< HEAD yle +======= +byE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 poq vYE lAH @@ -103459,7 +153468,11 @@ guG gYl nrm egF +<<<<<<< HEAD xxs +======= +stI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kYD lMJ aaa @@ -103658,9 +153671,15 @@ twN qFo lWm gvm +<<<<<<< HEAD nlS jgw kSR +======= +vLM +wSs +rRm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fGH lBA uky @@ -103675,13 +153694,21 @@ eQE tIb ndk cve +<<<<<<< HEAD agP +======= +xEe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xoK oxd xlF xlF aWg +<<<<<<< HEAD cia +======= +jgK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tUn dQT wXF @@ -103691,7 +153718,11 @@ sIW jSk rkT tAg +<<<<<<< HEAD cci +======= +vEv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pkx hBB wnY @@ -103715,7 +153746,11 @@ sEZ evE xsn ucm +<<<<<<< HEAD wor +======= +tUc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gkc kYD lMJ @@ -103763,13 +153798,21 @@ lMJ dxK aaf aaf +<<<<<<< HEAD axS +======= +weq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kJi pgU qRS pnk kJi +<<<<<<< HEAD axS +======= +weq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -103915,9 +153958,15 @@ aeb bvJ lWm kdN +<<<<<<< HEAD jgw jGA kiK +======= +wSs +jGA +mgo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fGH fhQ sFB @@ -104129,7 +154178,11 @@ peF liO sSs gkM +<<<<<<< HEAD fMU +======= +bcw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uKL uKL mKu @@ -104210,7 +154263,11 @@ gSH tBp wCq dQA +<<<<<<< HEAD sKj +======= +ewh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 elJ qNA gwf @@ -104434,11 +154491,19 @@ qpM qVt fGH eHS +<<<<<<< HEAD sln mal gMy hPK pxM +======= +bpq +mal +gMy +hPK +xqv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rmj fWW rTQ @@ -104482,7 +154547,11 @@ jJm bLd bLd oWk +<<<<<<< HEAD jMW +======= +csz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 guG fJc dVX @@ -104648,7 +154717,11 @@ rwE tgo tgo lOU +<<<<<<< HEAD hJe +======= +nmI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lnc sBa obw @@ -104691,16 +154764,28 @@ qcQ nsk fVC fZV +<<<<<<< HEAD aoc +======= +dWg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mal cfA hPK pgK +<<<<<<< HEAD rKF dVm hFq uIs pWp +======= +idR +dVm +xWY +uIs +rwa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aJI iJK wYB @@ -104726,7 +154811,11 @@ sbK ejL aPX elJ +<<<<<<< HEAD cza +======= +wGH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 emh fQo oWk @@ -104744,8 +154833,13 @@ qBF nCG tqx bOm +<<<<<<< HEAD ati bNv +======= +fhU +cdS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kYD aaa aaa @@ -104791,13 +154885,21 @@ lMJ dxK aaf aaf +<<<<<<< HEAD axS +======= +weq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kJi vpl cDb xOI kJi +<<<<<<< HEAD axS +======= +weq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -104948,6 +155050,7 @@ qcQ kZn fGH gwc +<<<<<<< HEAD kYX mal mEI @@ -104960,13 +155063,31 @@ uIs fLu oLF cTR +======= +bUk +mal +eVy +hPK +cFl +msT +lPi +cuM +uIs +ffL +oLF +nGE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wYB kCZ soU gkx gkx nbJ +<<<<<<< HEAD cia +======= +jgK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tUn eLh lQI @@ -105176,9 +155297,15 @@ hJv iEE ejl pFd +<<<<<<< HEAD htX lqQ sdt +======= +nwa +lqQ +nYO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 geV hvO ued @@ -105205,14 +155332,22 @@ wKu jIk hZn cgl +<<<<<<< HEAD mNw +======= +uZu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mal cfA mqu mJk itg tEy +<<<<<<< HEAD ilw +======= +nEB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uIs bjl vqp @@ -105441,7 +155576,11 @@ jBY aKk lXl nzS +<<<<<<< HEAD gnJ +======= +gpk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qXB kbo tbd @@ -105467,7 +155606,11 @@ mal bDK oRs pem +<<<<<<< HEAD rWF +======= +eEa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 huG huG huG @@ -105480,7 +155623,11 @@ uHo beO lXr cZm +<<<<<<< HEAD uZh +======= +cXc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tUn kmN bGL @@ -105497,7 +155644,11 @@ wXF mOD fAI tUn +<<<<<<< HEAD cHN +======= +tId +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 okQ hEV bLd @@ -105510,7 +155661,11 @@ eWy bLd lpD wYl +<<<<<<< HEAD cRZ +======= +tit +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fPD eQY hpv @@ -105712,6 +155867,7 @@ aSk tlZ lje klZ +<<<<<<< HEAD oCq fqD jgw @@ -105720,6 +155876,16 @@ oEu gZV jTs oMC +======= +bqC +fqD +wSs +pur +oEu +gZV +jTs +xsV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jXE klS tpF @@ -105736,8 +155902,13 @@ kCZ nKI bZq vrn +<<<<<<< HEAD vDO haS +======= +tUt +gOa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unL unL ouR @@ -105754,9 +155925,15 @@ wXF wXF wXF wXF +<<<<<<< HEAD czN gMQ czN +======= +bcb +gMQ +bcb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oWk clj fwP @@ -105975,7 +156152,11 @@ okX tZX ogb uhW +<<<<<<< HEAD kIw +======= +eSC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 obG jqd jzT @@ -106206,6 +156387,7 @@ lnc obw rUo lqQ +<<<<<<< HEAD fik iCJ qgy @@ -106213,6 +156395,15 @@ jPA miq miq yaC +======= +fzr +iCJ +qgy +ldg +bYN +bYN +krt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qXB psZ qXB @@ -106232,12 +156423,20 @@ gpf ouk jTM wBT +<<<<<<< HEAD vab +======= +sxX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 obG sEx gIm sbM +<<<<<<< HEAD lhu +======= +qKD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aNN huG rzk @@ -106248,7 +156447,11 @@ bJp wYB foB siz +<<<<<<< HEAD lnV +======= +pCL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unL laf aJn @@ -106270,7 +156473,11 @@ gcV nNe dBb aHM +<<<<<<< HEAD lRv +======= +xxQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oWk ddu fwP @@ -106463,6 +156670,7 @@ lnc fDC qdy lqQ +<<<<<<< HEAD jNX jzC tZV @@ -106470,6 +156678,15 @@ kld aOt uHw fpG +======= +wRF +jzC +oCO +xUE +jYu +vmU +xyI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qXB kbo qXB @@ -106501,11 +156718,19 @@ obG wPU gKS huG +<<<<<<< HEAD lfV wYB wjm siz qek +======= +olP +wYB +gAx +siz +hxz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unL uNd unL @@ -106720,6 +156945,7 @@ lnc cUP mil lqQ +<<<<<<< HEAD ozg xPe ehy @@ -106727,6 +156953,15 @@ vZR gif dsa sLJ +======= +lbH +mie +pRM +ivb +otG +ftQ +xwB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qXB psZ qXB @@ -106750,10 +156985,17 @@ iEZ uWK gFO rHz +<<<<<<< HEAD tjR ejx xSI mvG +======= +aFW +dqX +qLp +bpY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 obG izZ tNQ @@ -106997,6 +157239,7 @@ vFB fRS sGH obG +<<<<<<< HEAD eBp vCu suK @@ -107004,6 +157247,15 @@ dLT oqN fEy mFq +======= +aEA +mZc +iUe +dLT +qiY +wAt +utE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xXW nst lih @@ -107017,6 +157269,7 @@ cCR unL aLu unL +<<<<<<< HEAD piR ltX epk @@ -107024,6 +157277,15 @@ vOK pnx unL aqq +======= +xII +ltX +kbR +vOK +pnx +unL +kbN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gXd szJ heS @@ -107041,7 +157303,11 @@ wZg ojo xfV sBS +<<<<<<< HEAD oXv +======= +wCb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oWk bLd bLd @@ -107264,7 +157530,11 @@ unL unL unL unL +<<<<<<< HEAD csy +======= +cEx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vRU iks cwb @@ -107280,7 +157550,11 @@ unL unL fGW unL +<<<<<<< HEAD agf +======= +vtI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mma iMQ rAo @@ -107298,7 +157572,11 @@ pOw gqa cln sgB +<<<<<<< HEAD ltV +======= +pbb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gFQ aaa aaa @@ -107490,7 +157768,11 @@ psZ bSY kbo kbo +<<<<<<< HEAD rKX +======= +eqt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 psZ psZ psZ @@ -107502,10 +157784,17 @@ psZ psZ qXB gAU +<<<<<<< HEAD dqR oUK eRR tjV +======= +cDO +oUK +eRR +fAA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cdX sDE hjS @@ -107516,14 +157805,24 @@ ggM ggM dLq lzL +<<<<<<< HEAD nGZ +======= +vag +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lzL lzL scG unL +<<<<<<< HEAD tSy vQA fjm +======= +xAi +vQA +glP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 deX rJk ofe @@ -107553,9 +157852,15 @@ tUn gFQ gFQ gFQ +<<<<<<< HEAD seE ejH seE +======= +aHR +ejH +aHR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gFQ aaa aaa @@ -107806,7 +158111,11 @@ lMJ lMJ lMJ lMJ +<<<<<<< HEAD fGB +======= +uzl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -108015,7 +158324,11 @@ gLo ofk uXd fDL +<<<<<<< HEAD hdx +======= +hSt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qhw naN fMN @@ -108042,7 +158355,11 @@ gIS xNG gYV lFo +<<<<<<< HEAD iiC +======= +dQy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pDR unL hLs @@ -108053,7 +158370,11 @@ hum jCx cZF uaG +<<<<<<< HEAD qcH +======= +vPu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pQy ovX xYQ @@ -108259,7 +158580,11 @@ rpx dPy loA poc +<<<<<<< HEAD dgy +======= +oDH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uXd tfg tfg @@ -108312,7 +158637,11 @@ lWq lWq lWq qIq +<<<<<<< HEAD sDB +======= +iCj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rDm smg crg @@ -108516,12 +158845,20 @@ oKx gLK joo sHT +<<<<<<< HEAD jvE +======= +rkx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uXd dVc bYp gXu +<<<<<<< HEAD rnD +======= +hSi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uXd gMG dWG @@ -108533,7 +158870,11 @@ nLz fEL rSi pCt +<<<<<<< HEAD jkr +======= +qHm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sqE mEO gnS @@ -108568,7 +158909,11 @@ dRj lWq lWq lWq +<<<<<<< HEAD mUM +======= +tLg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pnH jUi pnH @@ -108800,7 +159145,11 @@ mbJ ncd gYO flE +<<<<<<< HEAD yer +======= +fcA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cVj uKz fnT @@ -108826,7 +159175,11 @@ nmR dQO fIZ ydj +<<<<<<< HEAD mit +======= +aBW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vQh pnH lZk @@ -109044,7 +159397,11 @@ woL jLo nwC nLz +<<<<<<< HEAD kyG +======= +iSU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hYE rEd sby @@ -109292,7 +159649,11 @@ cnK jPe dPy poc +<<<<<<< HEAD omp +======= +afM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cnK giH aJj @@ -109302,11 +159663,19 @@ fbf nie qtm fyJ +<<<<<<< HEAD hkF cuc adz tUw lUl +======= +oWm +cuc +adz +tUw +rHq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 peX kRi klw @@ -109335,11 +159704,19 @@ sfz wao hum rMT +<<<<<<< HEAD xtX yec xhb uQk vJo +======= +svK +yec +xhb +uQk +waf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vzc gUY pnH @@ -109871,7 +160248,11 @@ aaa aaa aaa aaa +<<<<<<< HEAD ewD +======= +oCX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wmL kLC wmL @@ -110129,7 +160510,11 @@ lKu aaa aaa wmL +<<<<<<< HEAD nRq +======= +apS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qkq ooz wmL @@ -110354,7 +160739,11 @@ dkC dwz dwz frE +<<<<<<< HEAD aQr +======= +cyE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uwQ siy lgL @@ -110389,7 +160778,11 @@ wmL cvO uNO hUd +<<<<<<< HEAD rpr +======= +uWk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -111098,7 +161491,11 @@ qLw tdf mdk kYG +<<<<<<< HEAD jGS +======= +dqE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oFH oFH sSz @@ -111158,7 +161555,11 @@ oMA eYu agN bXs +<<<<<<< HEAD kzw +======= +tLc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 juH pJA hLJ @@ -111408,7 +161809,11 @@ lMJ aaa aaa uaR +<<<<<<< HEAD sxt +======= +btC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wRL tyj myr @@ -111612,10 +162017,17 @@ hko uLp qTX kYG +<<<<<<< HEAD hts iHy vSC gdy +======= +uJz +iHy +vSC +eKw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vPV qsv aYk @@ -111665,10 +162077,17 @@ dxK aaa aaa oMA +<<<<<<< HEAD cpw jjD mYa lme +======= +enG +fpD +qmi +vOz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tsy sRa ppC @@ -111881,8 +162300,13 @@ dRA wCe khu hUu +<<<<<<< HEAD xVE ops +======= +kxC +oMh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mEG nRp dtY @@ -111925,7 +162349,11 @@ uaR jHX oQk toR +<<<<<<< HEAD nHl +======= +ePT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 syV jsi eoZ @@ -112395,9 +162823,15 @@ wsI fia sRW hKi +<<<<<<< HEAD efX lLB kDv +======= +apO +lLB +qRq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rzT cWy xRZ @@ -112646,7 +163080,11 @@ gHI svo jXz fJy +<<<<<<< HEAD ggG +======= +bJQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mRv kyZ bDq @@ -112905,7 +163343,11 @@ fJy fJy fJy pnJ +<<<<<<< HEAD uAo +======= +dKl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fJy byR iFh @@ -113166,9 +163608,15 @@ rLZ fJy ygp tyE +<<<<<<< HEAD xuu bDq bMW +======= +qNO +bDq +rRR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 laE eQJ uBp @@ -113210,7 +163658,11 @@ kWc xiL bus hMv +<<<<<<< HEAD lVT +======= +iTQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vGq avx vBf @@ -113220,7 +163672,11 @@ qQJ vGq bjs gyI +<<<<<<< HEAD rWp +======= +lPS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xiL kvO bPB @@ -113435,7 +163891,11 @@ efd nwK fFC uVf +<<<<<<< HEAD mHH +======= +qqs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gDq ich jnQ @@ -114751,7 +165211,11 @@ oyj xiL mtu lHh +<<<<<<< HEAD glW +======= +iNK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 faD iWc cXP @@ -114761,7 +165225,11 @@ vvD cXP lVB iWc +<<<<<<< HEAD wQS +======= +gkC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xlH mtu xiL @@ -115521,19 +165989,31 @@ hbK hbK oyj xiL +<<<<<<< HEAD eqo +======= +rMe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rwx vFh dac evD pJf +<<<<<<< HEAD eMC +======= +ycv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tIe min min wFy ohD +<<<<<<< HEAD rOZ +======= +bZb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xiL lmn hbK @@ -115781,13 +166261,21 @@ xiL hWa imw iHH +<<<<<<< HEAD aJw +======= +mcF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rrL rSW min ckI sCv +<<<<<<< HEAD nfC +======= +mDC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 toM eOP hWa @@ -116810,7 +167298,11 @@ goW msN xiL jlU +<<<<<<< HEAD uVj +======= +kGR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lyL mao mCu @@ -117067,7 +167559,11 @@ rDf uhs fjd jlU +<<<<<<< HEAD fHZ +======= +oGj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZN msR xkv @@ -117581,11 +168077,19 @@ hbK mgS hbK jlU +<<<<<<< HEAD jDN jDN wIE jDN jDN +======= +kcu +kcu +gyK +kcu +kcu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jlU hbK mTg @@ -117838,11 +168342,19 @@ tmU fGy wyo jlU +<<<<<<< HEAD orl jDN wIE jDN jDN +======= +dLm +kcu +gyK +kcu +kcu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jlU qgn mCV @@ -118095,11 +168607,19 @@ pWT rDf uLa jlU +<<<<<<< HEAD jDN jDN lLV fpR jDN +======= +kcu +kcu +jQz +nJr +kcu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jlU lUS pHt @@ -118352,11 +168872,19 @@ hbK wrc wrc jlU +<<<<<<< HEAD jDN jDN jDN jDN jDN +======= +kcu +kcu +kcu +kcu +kcu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jlU wrc wrc @@ -118610,9 +169138,15 @@ aaa lMJ jlU jlU +<<<<<<< HEAD jDN aOV jDN +======= +kcu +aYl +kcu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jlU jlU lMJ @@ -122929,7 +173463,11 @@ aTV aTV bjP tri +<<<<<<< HEAD aQw +======= +bny +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pfe brY giA @@ -123442,7 +173980,11 @@ uUX azv dKG bjQ +<<<<<<< HEAD vMI +======= +nhU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pQv tSP qiH @@ -123692,7 +174234,11 @@ aVn tIa aWN aTV +<<<<<<< HEAD tms +======= +qeQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aTV aTV aWN @@ -124470,7 +175016,11 @@ iCV mCL pIE bjQ +<<<<<<< HEAD fMa +======= +dqy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rNs tSP mZW @@ -124733,7 +175283,11 @@ txh bjQ giA hSe +<<<<<<< HEAD okp +======= +lBN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pDe ueE jGr @@ -125244,7 +175798,11 @@ ldP xgE uFw tXz +<<<<<<< HEAD wkA +======= +jGN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gfU gfU gfU diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index e761aa5f42d..90a0c56273c 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -3894,6 +3894,16 @@ dir = 4 }, /area/mine/lounge) +<<<<<<< HEAD +======= +"uT" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/mine/maintenance/service) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uU" = ( /turf/closed/mineral/random/labormineral/volcanic, /area/lavaland/surface/outdoors) @@ -6737,6 +6747,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_edge, /area/mine/laborcamp) +<<<<<<< HEAD "LZ" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/outlet_injector/layer2{ @@ -6744,6 +6755,8 @@ }, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/mine/maintenance/service) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ma" = ( /obj/structure/stone_tile/block/cracked, /obj/structure/stone_tile{ @@ -41493,7 +41506,11 @@ pU pU pU uj +<<<<<<< HEAD LZ +======= +uT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pU pU pU diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index b949209410e..0e1f8b4ea9a 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -833,6 +833,20 @@ /obj/structure/disposalpipe/trunk, /turf/open/space/basic, /area/space/nearstation) +<<<<<<< HEAD +======= +"akr" = ( +/obj/machinery/button/door/directional/south{ + id = "captain_privacy"; + name = "Privacy Shutters" + }, +/obj/machinery/keycard_auth/wall_mounted/directional/east, +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/hand_tele, +/turf/open/floor/wood/tile, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "akt" = ( /obj/effect/turf_decal/tile/red/diagonal_edge, /obj/structure/closet/secure_closet/brig{ @@ -1553,6 +1567,29 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/wood/large, /area/station/service/library/artgallery) +<<<<<<< HEAD +======= +"atP" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance-aft" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig Aft Entrance" + }, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Lockdown" + }, +/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/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "atT" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/flowers_br/style_random, @@ -7931,6 +7968,7 @@ dir = 1 }, /area/station/hallway/floor2/aft) +<<<<<<< HEAD "bYk" = ( /obj/structure/closet/secure_closet/hos, /obj/machinery/button/door/directional/west{ @@ -7943,6 +7981,8 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bYp" = ( /obj/structure/rack, /obj/effect/spawner/random/engineering/material, @@ -10202,6 +10242,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/side, /area/station/hallway/floor1/fore) +<<<<<<< HEAD "cBl" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Fore Entrance" @@ -10214,6 +10255,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/checkpoint) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cBq" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, @@ -10998,6 +11041,7 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white, /area/station/science/cytology) +<<<<<<< HEAD "cLJ" = ( /obj/machinery/keycard_auth/wall_mounted/directional/north{ pixel_x = 9 @@ -11011,6 +11055,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cLQ" = ( /obj/machinery/door/airlock{ name = "Locker Room" @@ -13524,6 +13570,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +<<<<<<< HEAD +======= +"dvB" = ( +/obj/machinery/light/directional/east, +/obj/machinery/smartfridge/drying, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dvC" = ( /obj/machinery/door/airlock/public/glass{ name = "Garden" @@ -14993,6 +15047,21 @@ "dPH" = ( /turf/closed/wall/r_wall, /area/station/security/brig) +<<<<<<< HEAD +======= +"dPS" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Fore Entrance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dPT" = ( /obj/machinery/light/small/red/directional/east, /obj/effect/spawner/random/trash/mess, @@ -20398,6 +20467,7 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) +<<<<<<< HEAD "foi" = ( /obj/structure/chair/wood{ dir = 4 @@ -20405,6 +20475,8 @@ /obj/machinery/keycard_auth/wall_mounted/directional/north, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fok" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -20904,6 +20976,27 @@ name = "boxing ring" }, /area/station/commons/fitness) +<<<<<<< HEAD +======= +"fvA" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance-aft" + }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig Aft Entrance" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Lockdown" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fvD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24843,12 +24936,15 @@ dir = 1 }, /area/station/hallway/floor4/fore) +<<<<<<< HEAD "gxo" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gxr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26899,6 +26995,21 @@ dir = 4 }, /area/station/cargo/miningdock) +<<<<<<< HEAD +======= +"hai" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/stack/sheet/iron/ten, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/corner, +/area/station/cargo/drone_bay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "haj" = ( /obj/effect/landmark/start/psychologist, /turf/open/floor/iron/white/small{ @@ -29606,6 +29717,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard/aft) +<<<<<<< HEAD +======= +"hJJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hJK" = ( /obj/structure/chair{ dir = 8 @@ -29795,6 +29920,7 @@ dir = 1 }, /area/station/hallway/floor4/fore) +<<<<<<< HEAD "hLN" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance-aft" @@ -29813,6 +29939,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hLP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30227,6 +30355,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD +======= +"hSD" = ( +/obj/structure/closet/secure_closet/hos, +/obj/machinery/button/door/directional/west{ + id = "hosprivacy"; + name = "Privacy Shutters Control"; + pixel_y = 6 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/west{ + pixel_y = -8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hSH" = ( /obj/machinery/door/airlock{ id_tag = "CabinS"; @@ -30649,6 +30792,7 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/pod/light, /area/station/maintenance/floor1/port/aft) +<<<<<<< HEAD "hXH" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2{ dir = 1 @@ -30656,6 +30800,8 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hXI" = ( /obj/structure/chair/wood{ dir = 1 @@ -30899,6 +31045,20 @@ /obj/machinery/light/cold/no_nightlight/directional/north, /turf/open/floor/iron, /area/station/hallway/floor2/aft) +<<<<<<< HEAD +======= +"ibK" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 13; + name = "port bay 2"; + shuttle_id = "ferry_home"; + width = 5 + }, +/turf/open/space/openspace, +/area/space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ibL" = ( /obj/structure/cable, /obj/machinery/power/smes/engineering, @@ -34407,6 +34567,10 @@ dir = 8 }, /obj/item/radio/intercom/directional/north, +<<<<<<< HEAD +======= +/obj/structure/detectiveboard/directional/east, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/carpet, /area/station/security/detectives_office) "iWW" = ( @@ -35048,6 +35212,7 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) +<<<<<<< HEAD "jfr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance-aft" @@ -35068,6 +35233,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jfs" = ( /obj/docking_port/stationary/laborcamp_home/kilo{ dir = 2 @@ -37825,6 +37992,7 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor3/port) +<<<<<<< HEAD "jQN" = ( /obj/machinery/keycard_auth/wall_mounted/directional/north{ pixel_x = -22 @@ -37833,6 +38001,8 @@ /obj/machinery/incident_display/bridge/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jQS" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow, @@ -38758,6 +38928,23 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) +<<<<<<< HEAD +======= +"kcT" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/sign/departments/exodrone/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kcZ" = ( /obj/effect/turf_decal/delivery, /obj/structure/table/reinforced, @@ -39005,6 +39192,16 @@ dir = 1 }, /area/station/hallway/floor1/aft) +<<<<<<< HEAD +======= +"kfg" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kfm" = ( /obj/effect/turf_decal/trimline/purple, /obj/machinery/airalarm/directional/south, @@ -39390,10 +39587,13 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/smooth_large, /area/station/medical/psychology) +<<<<<<< HEAD "kkT" = ( /obj/effect/spawner/random/structure/twelve_percent_spirit_board, /turf/open/floor/iron/white/textured_large, /area/station/service/chapel/office) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "klc" = ( /obj/structure/railing{ dir = 4 @@ -42262,6 +42462,17 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +<<<<<<< HEAD +======= +"kWD" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/north{ + pixel_x = -22 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/incident_display/bridge/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kWJ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -45051,6 +45262,29 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/starboard/fore) +<<<<<<< HEAD +======= +"lIh" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 8 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/east{ + pixel_x = 25; + pixel_y = 16 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Command - Research Director's Office" + }, +/obj/machinery/requests_console/directional/east{ + department = "Research Director's Desk"; + name = "Research Director's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lIm" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/white/corner, @@ -46495,6 +46729,7 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/maintenance/floor1/port/aft) +<<<<<<< HEAD "lZz" = ( /obj/machinery/computer/security/qm{ dir = 8 @@ -46502,6 +46737,8 @@ /obj/machinery/keycard_auth/wall_mounted/directional/north, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lZA" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/experi_scanner, @@ -50923,6 +51160,7 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +<<<<<<< HEAD "nfi" = ( /obj/machinery/camera/directional/north{ c_tag = "Medbay - Treatment Center"; @@ -50933,6 +51171,8 @@ /obj/structure/fluff/shower_drain, /turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nfm" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -51110,6 +51350,7 @@ /obj/structure/dresser, /turf/open/floor/wood/tile, /area/station/service/chapel/office) +<<<<<<< HEAD "ngU" = ( /obj/machinery/button/door/directional/south{ id = "captain_privacy"; @@ -51121,6 +51362,8 @@ /obj/item/hand_tele, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ngX" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/button/door/directional/south{ @@ -52421,6 +52664,10 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, +<<<<<<< HEAD +======= +/obj/machinery/vending/cytopro, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/science/cytology) "nxm" = ( @@ -53368,6 +53615,15 @@ dir = 4 }, /area/station/hallway/floor3/aft) +<<<<<<< HEAD +======= +"nJb" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nJk" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 1 @@ -53924,6 +54180,24 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/hallway/floor4/aft) +<<<<<<< HEAD +======= +"nQY" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Fore Entrance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/firedoor, +/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/fourcorners, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/disposalpipe/segment, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nQZ" = ( /obj/effect/turf_decal/trimline/yellow/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55300,6 +55574,7 @@ }, /turf/open/floor/iron/dark, /area/station/service/library/lounge) +<<<<<<< HEAD "ojB" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Fore Entrance" @@ -55315,6 +55590,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/checkpoint) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ojM" = ( /obj/structure/chair/comfy{ dir = 4 @@ -57476,6 +57753,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/aft) +<<<<<<< HEAD "oNi" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4{ dir = 1 @@ -57483,6 +57761,8 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oNn" = ( /obj/structure/bed/double, /obj/item/bedsheet/cosmos/double, @@ -60708,6 +60988,7 @@ /obj/structure/closet/crate/trashcart, /turf/open/floor/pod/light, /area/station/maintenance/floor3/starboard/aft) +<<<<<<< HEAD "pFM" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -60719,6 +61000,8 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood/large, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pFT" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/quantumpad, @@ -62326,6 +62609,7 @@ dir = 1 }, /area/station/science/auxlab) +<<<<<<< HEAD "qaX" = ( /obj/docking_port/stationary{ dir = 8; @@ -62337,6 +62621,8 @@ }, /turf/open/space/openspace, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qaY" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/structure/cable, @@ -63329,6 +63615,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured_large, /area/station/engineering/lobby) +<<<<<<< HEAD +======= +"qoI" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/north, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qoJ" = ( /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms, @@ -64972,6 +65268,27 @@ "qHW" = ( /turf/closed/wall/r_wall, /area/station/medical/pharmacy) +<<<<<<< HEAD +======= +"qIf" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/keycard_auth/wall_mounted/directional/south{ + pixel_x = 6 + }, +/obj/effect/landmark/start/chief_engineer, +/obj/machinery/button/door/directional/south{ + id = "ceprivacy"; + name = "Privacy Shutters Control"; + pixel_x = -6 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qIv" = ( /obj/effect/turf_decal/trimline/purple/warning, /turf/open/floor/pod/dark, @@ -65163,11 +65480,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4, /turf/open/floor/plating, /area/station/hallway/floor1/aft) +<<<<<<< HEAD "qMO" = ( /obj/machinery/light/directional/east, /obj/machinery/smartfridge/drying, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qMV" = ( /obj/machinery/atmospherics/components/unary/portables_connector, /obj/effect/turf_decal/bot, @@ -66644,6 +66964,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/hallway/floor4/aft) +<<<<<<< HEAD "rez" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -66664,6 +66985,8 @@ dir = 1 }, /area/station/cargo/drone_bay) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "reD" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 @@ -67453,6 +67776,7 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +<<<<<<< HEAD "rqd" = ( /obj/structure/railing{ dir = 4 @@ -67467,6 +67791,8 @@ /obj/structure/sign/departments/exodrone/directional/west, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rqf" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -69933,6 +70259,29 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/service/hydroponics) +<<<<<<< HEAD +======= +"sbB" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south, +/obj/item/fuel_pellet{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/fuel_pellet, +/obj/item/fuel_pellet{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/structure/rack, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/corner{ + dir = 1 + }, +/area/station/cargo/drone_bay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sbI" = ( /obj/structure/flora/bush/snow/style_random, /turf/open/misc/snow/actually_safe{ @@ -71010,12 +71359,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/textured_large, /area/station/cargo/storage) +<<<<<<< HEAD "ssc" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2{ dir = 1 }, /turf/open/floor/iron, /area/station/engineering/atmos) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ssi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -75272,6 +75624,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/gateway) +<<<<<<< HEAD +======= +"tud" = ( +/obj/machinery/computer/security/qm{ + dir = 8 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/north, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tun" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -78120,6 +78482,16 @@ }, /turf/open/floor/iron/checker, /area/station/commons/vacant_room/commissary) +<<<<<<< HEAD +======= +"uhC" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uhF" = ( /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -78256,6 +78628,16 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/surgery/fore) +<<<<<<< HEAD +======= +"ujl" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ujr" = ( /obj/effect/turf_decal/trimline/green/warning{ dir = 8 @@ -78575,6 +78957,15 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/science/breakroom) +<<<<<<< HEAD +======= +"unQ" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "unV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/siding/wideplating, @@ -79042,6 +79433,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/floor4/starboard/aft) +<<<<<<< HEAD "uvN" = ( /obj/structure/chair/office{ dir = 1 @@ -79060,6 +79452,8 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uvQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/heavy, @@ -79687,6 +80081,7 @@ }, /turf/open/floor/engine/airless, /area/station/engineering/supermatter/waste) +<<<<<<< HEAD "uEv" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -79699,6 +80094,8 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/corner, /area/station/cargo/drone_bay) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uED" = ( /obj/effect/turf_decal/tile/yellow/half, /obj/machinery/light/small/directional/east, @@ -85488,6 +85885,7 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/floor4/port/fore) +<<<<<<< HEAD "vZY" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ dir = 1 @@ -85495,6 +85893,8 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wat" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 8 @@ -87563,6 +87963,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/holding_cell) +<<<<<<< HEAD +======= +"wzt" = ( +/obj/effect/spawner/random/structure/twelve_percent_spirit_board, +/turf/open/floor/iron/white/textured_large, +/area/station/service/chapel/office) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wzB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/red/dim/directional/south, @@ -90800,6 +91207,19 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/security/lockers) +<<<<<<< HEAD +======= +"xqZ" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Treatment Center"; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/obj/machinery/shower/directional/south, +/obj/structure/fluff/shower_drain, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xrh" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -91563,6 +91983,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/dorms/apartment1) +<<<<<<< HEAD "xBq" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 8 @@ -91583,6 +92004,8 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xBt" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/trimline/neutral/warning{ @@ -91873,6 +92296,22 @@ /obj/effect/turf_decal/siding/thinplating_new/corner, /turf/open/floor/iron/smooth, /area/station/cargo/sorting) +<<<<<<< HEAD +======= +"xEv" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/north{ + pixel_x = 9 + }, +/obj/machinery/button/door/directional/north{ + name = "CMO Privacy Shutters"; + id = "cmoshutter"; + req_access = list("cmo"); + pixel_y = 25; + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xEw" = ( /obj/machinery/computer/camera_advanced/base_construction/aux{ dir = 4 @@ -118564,7 +119003,11 @@ lyB yef wZu vTt +<<<<<<< HEAD uEv +======= +hai +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aQK uhw rhs @@ -118821,7 +119264,11 @@ gHw hDa fyg xxQ +<<<<<<< HEAD rez +======= +sbB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aQK jUP prt @@ -119335,7 +119782,11 @@ oKT xsL vDw dty +<<<<<<< HEAD rqd +======= +kcT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eOz eOz onX @@ -124217,7 +124668,11 @@ lWH aaI fFI lWH +<<<<<<< HEAD lZz +======= +tud +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kHP skM jdT @@ -137101,7 +137556,11 @@ wSm kSF cpE lTo +<<<<<<< HEAD uvN +======= +qIf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xGI kzE kzE @@ -138104,7 +138563,11 @@ kIe fxo uvD ocv +<<<<<<< HEAD hXH +======= +kfg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rBP iTu iko @@ -138361,7 +138824,11 @@ blI gkx xeO vsL +<<<<<<< HEAD ssc +======= +nJb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rBP fxd haK @@ -142736,7 +143203,11 @@ vxz csf buQ nPZ +<<<<<<< HEAD vZY +======= +uhC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oIy tyQ iPN @@ -142993,7 +143464,11 @@ eNk qNf jaK aLh +<<<<<<< HEAD oNi +======= +ujl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oIy yli jCD @@ -188731,7 +189206,11 @@ rhC hge oiO afz +<<<<<<< HEAD xBq +======= +lIh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mis txR dDk @@ -191588,7 +192067,11 @@ tam oKR xKq nCG +<<<<<<< HEAD cLJ +======= +xEv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rBt aDp xug @@ -197493,7 +197976,11 @@ voB pZZ gBz sRR +<<<<<<< HEAD nfi +======= +xqZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jTK dzM dzM @@ -241432,10 +241919,17 @@ ucA ucA ucA ucA +<<<<<<< HEAD xIV xIV xIV xIV +======= +ucA +ucA +ucA +ucA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ucA ucA ucA @@ -241689,10 +242183,17 @@ ucA ucA ucA ucA +<<<<<<< HEAD xIV xIV qaX xIV +======= +ucA +ucA +ibK +ucA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ucA ucA ucA @@ -241946,7 +242447,11 @@ ucA ucA ucA ucA +<<<<<<< HEAD xIV +======= +ucA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 atB tgX rIc @@ -251987,7 +252492,11 @@ vhd fAz gyr gyr +<<<<<<< HEAD qMO +======= +dvB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sFt sxt sal @@ -309278,7 +309787,11 @@ xJp uxw xjX aNs +<<<<<<< HEAD jQN +======= +kWD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sZO rlJ nKL @@ -311586,7 +312099,11 @@ aNs aNs rNN vLW +<<<<<<< HEAD foi +======= +qoI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rbK wnO keg @@ -313647,7 +314164,11 @@ dOa qLW nEa gaB +<<<<<<< HEAD ngU +======= +akr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oKq cWf vlD @@ -315685,7 +316206,11 @@ crp crp dWz lYx +<<<<<<< HEAD gxo +======= +unQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wMU aaN pGz @@ -317010,7 +317535,11 @@ xqY mau mau mau +<<<<<<< HEAD bYk +======= +hSD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 raE pke fmG @@ -318023,7 +318552,11 @@ gYS gir tnj tEv +<<<<<<< HEAD cBl +======= +dPS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xFp dGF kHR @@ -318280,7 +318813,11 @@ aBV kyj dfm xnY +<<<<<<< HEAD ojB +======= +nQY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xyw xyw tnR @@ -319816,7 +320353,11 @@ ipn oJR gjq gYO +<<<<<<< HEAD pFM +======= +hJJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 liQ liQ xUQ @@ -322392,7 +322933,11 @@ txa mlH vOE nYZ +<<<<<<< HEAD jfr +======= +atP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hxz vES uyX @@ -322906,7 +323451,11 @@ cmM bVy tnV daD +<<<<<<< HEAD hLN +======= +fvA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kkK fDA emk @@ -327766,7 +328315,11 @@ kTV wlX sxo vyW +<<<<<<< HEAD kkT +======= +wzt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mcD rNo tKY diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 2c544716475..91a0dbac44f 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -9,11 +9,23 @@ "ac" = ( /turf/open/space, /area/space/nearstation) +"ad" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/transit_tube/horizontal, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "ae" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space, /area/space/nearstation) +"af" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/transit_tube/crossing/horizontal, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "ag" = ( /turf/closed/wall/r_wall, /area/station/security/brig) @@ -55,17 +67,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"ar" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"at" = ( -/obj/structure/table, -/obj/item/storage/box/prisoner, -/obj/item/paper/guides/jobs/security/labor_camp, -/turf/open/floor/iron, -/area/station/security/brig) "av" = ( /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) @@ -92,13 +93,6 @@ "aD" = ( /turf/open/floor/iron, /area/station/security/brig) -"aG" = ( -/obj/machinery/gulag_item_reclaimer{ - dir = 8; - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/station/security/brig) "aH" = ( /obj/machinery/light/directional/east, /obj/machinery/recharge_station, @@ -108,6 +102,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/gravity_generator) +"aK" = ( +/obj/structure/table, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/construction/rcd/combat, +/obj/item/construction/plumbing, +/turf/open/floor/iron, +/area/station/command/bridge) "aN" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -122,6 +125,18 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"aS" = ( +/obj/structure/table, +/obj/item/flashlight{ + pixel_y = 5 + }, +/obj/item/storage/toolbox/syndicate, +/obj/item/stock_parts/power_store/cell/infinite, +/turf/open/floor/iron, +/area/station/engineering/main) +"aX" = ( +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "aY" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, @@ -140,6 +155,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"bd" = ( +/obj/structure/table, +/obj/item/weldingtool/experimental, +/obj/item/inducer, +/obj/item/storage/belt/utility/chief/full, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) "bf" = ( /obj/machinery/suit_storage_unit/captain, /turf/open/floor/iron, @@ -164,6 +188,12 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) +"bo" = ( +/obj/structure/table, +/obj/item/screwdriver/power, +/obj/item/crowbar/power, +/turf/open/floor/iron, +/area/station/engineering/main) "bp" = ( /obj/machinery/light/directional/south, /obj/structure/tank_dispenser, @@ -219,9 +249,48 @@ "bE" = ( /turf/open/floor/iron, /area/station/hallway/primary/central) +"bF" = ( +/obj/machinery/computer/rdconsole, +/turf/open/floor/iron, +/area/station/science) +"bI" = ( +/obj/structure/table, +/obj/item/card/emag, +/obj/item/flashlight/emp/debug, +/turf/open/floor/iron, +/area/station/command/bridge) +"bJ" = ( +/obj/structure/table, +/obj/item/card/id/advanced/centcom/ert{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/card/id/advanced/chameleon, +/obj/item/card/id/advanced/gold/captains_spare{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +"bK" = ( +/obj/structure/table, +/obj/item/storage/backpack/holding, +/obj/item/storage/part_replacer/bluespace/tier4, +/turf/open/floor/iron, +/area/station/command/bridge) "bL" = ( /turf/closed/wall/r_wall, /area/station/maintenance/aft) +"bM" = ( +/obj/machinery/camera/directional/north, +/obj/structure/table, +/obj/item/construction/rld, +/obj/item/construction/rcd/arcd, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "bO" = ( /obj/machinery/door/poddoor, /turf/open/floor/engine, @@ -241,6 +310,17 @@ /obj/machinery/chem_dispenser/fullupgrade, /turf/open/floor/iron/dark, /area/station/medical/chemistry) +"bT" = ( +/obj/machinery/gulag_item_reclaimer{ + dir = 8; + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/station/security/brig) +"bY" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "bZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -272,13 +352,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"ci" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=4-Southeast"; - location = "3-Northeast" - }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "cj" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -326,10 +399,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/medical/chemistry) -"cy" = ( -/obj/machinery/door/airlock, -/turf/open/floor/iron, -/area/station/construction) "cI" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -354,12 +423,6 @@ /obj/machinery/door/airlock/public/glass, /turf/open/floor/iron, /area/station/commons/storage/primary) -"cX" = ( -/obj/machinery/door/airlock/external/glass/ruin, -/obj/effect/turf_decal/stripes/full, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/cargo/storage) "cY" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -373,6 +436,13 @@ "db" = ( /turf/closed/wall/mineral/plastitanium, /area/station/hallway/secondary/entry) +"dc" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "de" = ( /obj/machinery/gulag_teleporter, /turf/open/floor/iron, @@ -416,12 +486,11 @@ /turf/open/floor/plating, /area/station/commons/storage/primary) "dq" = ( -/obj/machinery/light/directional/north, -/obj/machinery/rnd/production/circuit_imprinter/department, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, +/obj/effect/turf_decal/plaque{ + icon_state = "L2" + }, /turf/open/floor/iron, -/area/station/science) +/area/station/commons/storage/primary) "dr" = ( /obj/effect/turf_decal/plaque{ icon_state = "L4" @@ -524,12 +593,25 @@ }, /turf/open/floor/iron, /area/station/construction) +"dN" = ( +/obj/machinery/navbeacon{ + location = "1-Southwest"; + codes_txt = "patrol;next_patrol=2-Northwest" + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "dP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"dQ" = ( +/obj/structure/table, +/obj/machinery/light/directional/south, +/obj/item/debug/human_spawner, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "dR" = ( /obj/machinery/light/directional/west, /turf/open/floor/iron, @@ -546,6 +628,11 @@ "dV" = ( /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"dW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron, +/area/station/construction) "dX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -564,6 +651,12 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/station/construction) +"ea" = ( +/obj/structure/table, +/obj/machinery/camera/autoname/directional/south, +/obj/item/gun/magic/wand/resurrection/debug, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "ec" = ( /obj/docking_port/stationary{ dir = 8; @@ -576,6 +669,14 @@ }, /turf/open/floor/engine, /area/station/hallway/secondary/entry) +"ed" = ( +/obj/structure/sign/warning/pods, +/turf/closed/wall/r_wall, +/area/station/hallway/secondary/entry) +"ef" = ( +/obj/machinery/door/airlock, +/turf/open/floor/iron, +/area/station/construction) "eh" = ( /turf/open/floor/iron, /area/station/hallway/secondary/entry) @@ -645,6 +746,14 @@ /obj/effect/turf_decal/stripes/full, /turf/open/floor/iron, /area/station/engineering/main) +"eC" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "cargounload" + }, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/cargo/storage) "eE" = ( /obj/docking_port/stationary{ dir = 8; @@ -656,6 +765,11 @@ }, /turf/open/space/basic, /area/space) +"eF" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "eJ" = ( /obj/docking_port/stationary{ dir = 4; @@ -703,6 +817,17 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) +"eY" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "cargounload" + }, +/obj/machinery/door/poddoor{ + id = "cargounload"; + name = "Supply Dock Unloading Door" + }, +/turf/open/floor/plating, +/area/station/cargo/storage) "fb" = ( /obj/machinery/door/airlock/external/ruin{ name = "Departure Lounge Airlock" @@ -711,6 +836,17 @@ /obj/structure/fans/tiny, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"fc" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "cargoload" + }, +/obj/machinery/door/poddoor{ + id = "cargoload"; + name = "Supply Dock Loading Door" + }, +/turf/open/floor/plating, +/area/station/cargo/storage) "ff" = ( /obj/docking_port/stationary{ dir = 2; @@ -733,6 +869,18 @@ /obj/docking_port/stationary/escape_pod, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"fj" = ( +/obj/structure/sign/warning/docking, +/turf/closed/wall/r_wall, +/area/station/hallway/secondary/entry) +"fl" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "cargoload" + }, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/cargo/storage) "fm" = ( /obj/machinery/conveyor{ dir = 1; @@ -740,6 +888,11 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"fn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/vacuum/external, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) "fo" = ( /obj/machinery/conveyor_switch/oneway{ id = "cargoload" @@ -775,6 +928,10 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"fB" = ( +/obj/machinery/status_display/supply, +/turf/closed/wall/r_wall, +/area/station/cargo/storage) "fI" = ( /obj/machinery/door/airlock, /turf/open/floor/plating, @@ -810,6 +967,13 @@ /obj/machinery/keycard_auth/wall_mounted/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"fQ" = ( +/obj/machinery/computer/communications, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "fS" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -870,15 +1034,20 @@ }, /turf/open/floor/plating, /area/station/commons/storage/primary) +"gi" = ( +/obj/structure/table, +/obj/item/storage/toolbox/syndicate, +/obj/item/debug/omnitool, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"gk" = ( +/obj/structure/sign/departments/evac, +/turf/closed/wall/r_wall, +/area/station/hallway/secondary/exit/departure_lounge) "gn" = ( /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/station/security/brig) -"gt" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gv" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -890,6 +1059,12 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/construction) +"gz" = ( +/obj/structure/table, +/obj/item/card/id/advanced/gold/captains_spare, +/obj/machinery/keycard_auth/wall_mounted/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "gE" = ( /obj/machinery/camera/directional/north, /turf/open/floor/iron, @@ -914,12 +1089,16 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"gP" = ( +"gJ" = ( /obj/structure/table, -/obj/item/ammo_box/c10mm, -/obj/item/gun/ballistic/automatic/pistol, +/obj/item/storage/box/prisoner, +/obj/item/paper/guides/jobs/security/labor_camp, /turf/open/floor/iron, -/area/station/command/bridge) +/area/station/security/brig) +"gW" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/closed/wall/r_wall, +/area/station/engineering/gravity_generator) "hm" = ( /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/unlocked, @@ -943,13 +1122,13 @@ }, /turf/open/floor/iron, /area/station/medical/chemistry) -"ia" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=3-Northeast"; - location = "2-Northwest" +"hS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/obj/structure/transit_tube/station, /turf/open/floor/iron, -/area/station/commons/storage/primary) +/area/station/engineering/gravity_generator) "ii" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -962,10 +1141,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/command/bridge) -"iS" = ( -/obj/structure/sign/warning/docking, -/turf/closed/wall/r_wall, -/area/station/hallway/secondary/entry) "jg" = ( /obj/effect/turf_decal/plaque{ icon_state = "L1" @@ -979,18 +1154,36 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) +"jz" = ( +/obj/structure/table/glass, +/obj/item/disk/surgery/debug, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/disk/data/debug{ + pixel_y = 9; + pixel_x = 7 + }, +/turf/open/floor/iron/white/corner, +/area/station/medical/medbay) "jL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"jV" = ( -/obj/machinery/computer/communications, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, +"jU" = ( +/obj/structure/table, +/obj/item/melee/energy/axe, /turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) +/area/station/commons/storage/primary) "jZ" = ( /obj/machinery/sleeper/syndie/fullupgrade, /obj/effect/turf_decal/tile/blue{ @@ -1014,26 +1207,6 @@ /obj/structure/server, /turf/open/floor/iron/dark, /area/station/science/explab) -"kF" = ( -/obj/structure/table/glass, -/obj/item/disk/surgery/debug, -/obj/item/storage/box/monkeycubes{ - pixel_x = 6; - pixel_y = 1 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/disk/data/debug{ - pixel_y = 9; - pixel_x = 7 - }, -/turf/open/floor/iron/white/corner, -/area/station/medical/medbay) "kS" = ( /turf/closed/wall/r_wall, /area/station/medical/chemistry) @@ -1047,24 +1220,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central) -"lA" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=2-Northwest"; - location = "1-Southwest" - }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"lK" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Gravity Generator" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "mb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -1086,6 +1241,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/gravity_generator) @@ -1100,10 +1256,12 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) -"nP" = ( +"nT" = ( /obj/structure/table, /obj/machinery/light/directional/south, -/obj/item/debug/human_spawner, +/obj/item/storage/medkit/regular, +/obj/item/healthanalyzer/advanced, +/obj/item/debug/omnitool/item_spawner, /turf/open/floor/iron, /area/station/commons/storage/primary) "od" = ( @@ -1132,6 +1290,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/main) +"pe" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/commons/storage/primary) "pr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -1150,12 +1314,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) -"pA" = ( -/obj/machinery/door/airlock/external/glass/ruin, -/obj/effect/turf_decal/stripes/full, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/storage) "pL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/caution/stand_clear{ @@ -1163,6 +1321,13 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"pY" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=1-Southwest"; + location = "4-Southeast" + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "pZ" = ( /obj/machinery/light/directional/north, /obj/machinery/camera/directional/north, @@ -1178,14 +1343,18 @@ /obj/machinery/door/airlock, /turf/open/floor/plating, /area/station/engineering/atmos) -"qe" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "cargounload" - }, -/obj/structure/plasticflaps, -/turf/open/floor/plating, +"qg" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/iron/dark, /area/station/cargo/storage) +"qq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/transit_tube/station/reverse, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "qv" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -1210,6 +1379,14 @@ "qQ" = ( /turf/open/floor/engine, /area/station/cargo/miningoffice) +"qR" = ( +/obj/effect/landmark/start, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + location = "Center" + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "rh" = ( /obj/machinery/door/airlock, /obj/structure/cable, @@ -1238,25 +1415,9 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"rQ" = ( -/obj/machinery/door/airlock/external/glass/ruin, -/obj/effect/turf_decal/stripes/full, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "rT" = ( /turf/open/floor/circuit/green, /area/station/cargo/bitrunning/den) -"rZ" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "cargounload" - }, -/obj/machinery/door/poddoor{ - id = "cargounload"; - name = "Supply Dock Unloading Door" - }, -/turf/open/floor/plating, -/area/station/cargo/storage) "sr" = ( /obj/machinery/door/airlock/shell, /turf/open/floor/iron/dark, @@ -1267,12 +1428,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) -"sO" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L2" - }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "sT" = ( /obj/machinery/door/airlock, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1280,16 +1435,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/main) -"sU" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) "tn" = ( /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, /area/station/medical/chemistry) +"tz" = ( +/obj/machinery/status_display/supply, +/turf/closed/wall/r_wall, +/area/station/commons/storage/primary) "tE" = ( /obj/machinery/door/airlock/research, /turf/open/floor/iron/dark, @@ -1301,14 +1456,6 @@ }, /turf/open/space/basic, /area/space) -"tI" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "cargoload" - }, -/obj/structure/plasticflaps, -/turf/open/floor/plating, -/area/station/cargo/storage) "tQ" = ( /obj/machinery/door/airlock/public/glass, /obj/structure/cable, @@ -1320,13 +1467,6 @@ /obj/structure/bot, /turf/open/floor/iron/dark, /area/station/science/explab) -"ub" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=1-Southwest"; - location = "4-Southeast" - }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "uf" = ( /obj/structure/fans/tiny/invisible, /obj/effect/turf_decal/stripes/line{ @@ -1382,6 +1522,12 @@ /obj/machinery/door/airlock, /turf/open/floor/plating, /area/station/commons/storage/primary) +"vw" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Gravity Generator" + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "vy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -1408,17 +1554,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"vV" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/vacuum/external, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) -"vX" = ( -/obj/structure/table, -/obj/item/card/emag, -/obj/item/flashlight/emp/debug, -/turf/open/floor/iron, -/area/station/command/bridge) "wa" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -1469,28 +1604,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"wT" = ( -/obj/structure/table, -/obj/item/card/id/advanced/centcom/ert{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/card/id/advanced/chameleon, -/obj/item/card/id/advanced/gold/captains_spare{ - pixel_x = -6; - pixel_y = 6 +"wR" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=3-Northeast"; + location = "2-Northwest" }, /turf/open/floor/iron, -/area/station/command/bridge) +/area/station/commons/storage/primary) "wU" = ( /turf/closed/wall/r_wall, /area/station/science/explab) -"wV" = ( -/obj/structure/table/reinforced, -/obj/machinery/light/directional/south, -/obj/item/bitrunning_debug, +"xq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/transit_tube/station/dispenser/reverse/flipped, /turf/open/floor/iron, -/area/station/cargo/bitrunning/den) +/area/station/engineering/gravity_generator) "xD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -1557,6 +1687,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) +"zo" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "zS" = ( /obj/machinery/rnd/destructive_analyzer, /obj/machinery/airalarm/directional/north, @@ -1588,9 +1723,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"AM" = ( -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) "Bp" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -1623,21 +1755,16 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/command/bridge) +"BG" = ( +/obj/structure/table, +/obj/item/ammo_box/c10mm, +/obj/item/gun/ballistic/automatic/pistol, +/turf/open/floor/iron, +/area/station/command/bridge) "BM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"Cb" = ( -/obj/structure/table, -/obj/item/storage/toolbox/electrical, -/obj/item/multitool/circuit{ - pixel_x = -4 - }, -/obj/item/multitool{ - pixel_x = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/explab) "Ce" = ( /turf/open/floor/iron, /area/station/medical/chemistry) @@ -1672,12 +1799,6 @@ /obj/effect/turf_decal/stripes/full, /turf/open/floor/iron/dark, /area/station/medical/medbay) -"CO" = ( -/obj/machinery/door/airlock, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/construction) "CQ" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line{ @@ -1685,15 +1806,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"CS" = ( -/obj/structure/table, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/construction/rcd/combat, -/obj/item/construction/plumbing, -/turf/open/floor/iron, -/area/station/command/bridge) "CT" = ( /obj/machinery/component_printer, /turf/open/floor/iron/dark, @@ -1705,12 +1817,6 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/station/science/explab) -"Dk" = ( -/obj/structure/table, -/obj/item/card/id/advanced/gold/captains_spare, -/obj/machinery/keycard_auth/wall_mounted/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "DC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/corner, @@ -1734,6 +1840,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"DT" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/turf_decal/stripes/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) "DW" = ( /obj/machinery/computer/scan_consolenew{ dir = 1 @@ -1743,10 +1855,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/medical/medbay) -"DX" = ( -/obj/structure/sign/departments/evac, -/turf/closed/wall/r_wall, -/area/station/hallway/secondary/exit/departure_lounge) "Ef" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/blue{ @@ -1754,10 +1862,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"Er" = ( -/obj/machinery/computer/rdconsole, -/turf/open/floor/iron, -/area/station/science) "Es" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -1791,14 +1895,6 @@ /obj/machinery/meter/layer4, /turf/open/floor/plating, /area/station/engineering/atmos) -"EQ" = ( -/obj/structure/table, -/obj/machinery/light/directional/south, -/obj/item/storage/medkit/regular, -/obj/item/healthanalyzer/advanced, -/obj/item/debug/omnitool/item_spawner, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "ER" = ( /mob/living/carbon/human, /obj/effect/turf_decal/tile/blue{ @@ -1816,23 +1912,22 @@ }, /turf/open/floor/iron, /area/station/medical/chemistry) -"Fm" = ( +"Fd" = ( +/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/table, -/obj/item/gun/magic/wand/resurrection/debug, -/obj/item/gun/magic/wand/death/debug{ - pixel_y = 10 +/obj/item/uplink/debug{ + pixel_x = -4; + pixel_y = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/item/uplink/nuclear/debug, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/item/debug/human_spawner{ - pixel_x = 6; - pixel_y = -4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/medical/medbay) +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/unlocked, +/turf/open/floor/iron, +/area/station/command/bridge) "Fy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -1850,25 +1945,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/station/engineering/atmos) -"Ge" = ( -/obj/structure/table, -/obj/item/weldingtool/experimental, -/obj/item/inducer, -/obj/item/storage/belt/utility/chief/full, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) -"Gp" = ( -/obj/machinery/camera/directional/north, -/obj/structure/table, -/obj/item/construction/rld, -/obj/item/construction/rcd/arcd, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "GC" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -1896,6 +1972,12 @@ /obj/machinery/chem_mass_spec, /turf/open/floor/iron, /area/station/medical/chemistry) +"Hb" = ( +/obj/machinery/door/airlock, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/construction) "Hc" = ( /obj/machinery/camera/directional/north, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -1923,12 +2005,6 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"In" = ( -/obj/structure/table, -/obj/item/storage/backpack/holding, -/obj/item/storage/part_replacer/bluespace/tier4, -/turf/open/floor/iron, -/area/station/command/bridge) "Ir" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -1938,19 +2014,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/commons/storage/primary) -"Iv" = ( -/obj/structure/table, -/obj/item/organ/internal/cyberimp/bci{ - pixel_y = 5 - }, -/obj/item/organ/internal/cyberimp/bci{ - pixel_y = 5 - }, -/obj/item/organ/internal/cyberimp/bci{ - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/station/science/explab) "Iy" = ( /obj/structure/closet/secure_closet/research_director{ locked = 0 @@ -1965,11 +2028,6 @@ /obj/machinery/computer/quantum_console, /turf/open/floor/iron, /area/station/cargo/bitrunning/den) -"IG" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron, -/area/station/construction) "IH" = ( /obj/structure/closet/secure_closet/engineering_welding{ locked = 0 @@ -1990,24 +2048,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/medical/chemistry) -"Jd" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/commons/storage/primary) -"Jk" = ( -/obj/structure/table, -/obj/item/screwdriver/power, -/obj/item/crowbar/power, -/turf/open/floor/iron, -/area/station/engineering/main) -"Jp" = ( -/obj/machinery/gravity_generator/main, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) -"JK" = ( +"IX" = ( /obj/machinery/conveyor{ dir = 1; id = "cargounload" @@ -2015,17 +2056,24 @@ /obj/structure/sign/warning/vacuum/directional/east, /turf/open/floor/iron, /area/station/cargo/storage) -"JL" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "cargoload" - }, -/obj/machinery/door/poddoor{ - id = "cargoload"; - name = "Supply Dock Loading Door" - }, +"Jd" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/cargo/storage) +/area/station/commons/storage/primary) +"Jp" = ( +/obj/machinery/gravity_generator/main, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) +"JJ" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=4-Southeast"; + location = "3-Northeast" + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "JV" = ( /obj/machinery/camera/autoname/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -2040,13 +2088,6 @@ /obj/effect/turf_decal/stripes/full, /turf/open/floor/iron, /area/station/engineering/main) -"Kp" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/unlocked, -/turf/open/floor/iron/dark, -/area/station/medical/chemistry) "Ks" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock, @@ -2054,18 +2095,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/atmos) -"Kw" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=4"; - location = "Center" +"Kx" = ( +/obj/structure/table, +/obj/item/analyzer, +/obj/item/wrench, +/obj/machinery/light/directional/south, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"Lb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/transit_tube/station/reverse/flipped{ + dir = 1 + }, +/obj/structure/transit_tube_pod{ + dir = 4 }, /turf/open/floor/iron, -/area/station/commons/storage/primary) -"KF" = ( -/obj/structure/table, -/obj/item/melee/energy/axe, -/turf/open/floor/iron, -/area/station/commons/storage/primary) +/area/station/engineering/gravity_generator) "Lq" = ( /obj/effect/turf_decal/stripes/full, /obj/machinery/door/airlock/external/glass/ruin{ @@ -2077,10 +2125,15 @@ /obj/machinery/chem_dispenser/chem_synthesizer, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"LP" = ( -/obj/machinery/status_display/supply, -/turf/closed/wall/r_wall, -/area/station/cargo/storage) +"LD" = ( +/obj/item/surgery_tray/full/advanced, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/medical/medbay) "LS" = ( /obj/machinery/quantum_server, /turf/open/floor/iron, @@ -2138,15 +2191,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"MQ" = ( -/obj/structure/table, -/obj/item/flashlight{ - pixel_y = 5 - }, -/obj/item/storage/toolbox/syndicate, -/obj/item/stock_parts/power_store/cell/infinite, -/turf/open/floor/iron, -/area/station/engineering/main) "Nb" = ( /obj/machinery/bci_implanter, /turf/open/floor/iron/dark, @@ -2155,12 +2199,6 @@ /obj/machinery/chem_recipe_debug, /turf/open/floor/iron, /area/station/medical/chemistry) -"Nf" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/commons/storage/primary) "Ni" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -2181,10 +2219,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) -"NW" = ( -/obj/structure/sign/warning/pods, -/turf/closed/wall/r_wall, -/area/station/hallway/secondary/entry) "NZ" = ( /obj/machinery/rnd/production/protolathe/department, /turf/open/floor/iron, @@ -2202,22 +2236,14 @@ dir = 1 }, /area/station/medical/medbay) -"OC" = ( -/obj/machinery/power/apc/auto_name/directional/west, +"Ov" = ( /obj/structure/table, -/obj/item/uplink/debug{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/uplink/nuclear/debug, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/unlocked, -/turf/open/floor/iron, -/area/station/command/bridge) +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/bluespace, +/obj/item/stock_parts/power_store/cell/bluespace, +/obj/item/stock_parts/power_store/cell/bluespace, +/turf/open/floor/iron/dark, +/area/station/science/explab) "OF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2229,15 +2255,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"OJ" = ( -/obj/machinery/door/airlock, -/turf/open/floor/plating, -/area/station/medical/medbay) -"OL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/turf/open/floor/plating, -/area/station/engineering/gravity_generator) "OO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -2253,15 +2270,6 @@ /obj/item/disk/tech_disk/debug, /turf/open/floor/iron, /area/station/science) -"OY" = ( -/turf/closed/wall/r_wall, -/area/station/maintenance/department/bridge) -"OZ" = ( -/obj/structure/table, -/obj/item/storage/box/shipping, -/obj/item/boulder_beacon, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "Pc" = ( /obj/effect/turf_decal/plaque{ icon_state = "L13" @@ -2271,12 +2279,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) -"Pi" = ( -/obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/debug/omnitool, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "Pk" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/unlocked, @@ -2294,6 +2296,13 @@ /obj/machinery/meter/layer2, /turf/open/floor/plating, /area/station/engineering/atmos) +"Px" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/unlocked, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) "PJ" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/unlocked, @@ -2305,14 +2314,13 @@ }, /turf/open/floor/iron/white/corner, /area/station/medical/medbay) -"Qa" = ( -/obj/machinery/power/apc/auto_name/directional/west, +"Qi" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/structure/transit_tube/station/dispenser/reverse{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/commons/storage/primary) +/area/station/engineering/gravity_generator) "Qu" = ( /obj/docking_port/stationary/mining_home{ dir = 8 @@ -2370,6 +2378,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/atmos) +"Rx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/closet/radiation, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "RD" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue{ @@ -2388,6 +2404,12 @@ dir = 1 }, /area/station/medical/medbay) +"RE" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/turf_decal/stripes/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/storage) "RM" = ( /obj/structure/closet/secure_closet/hop{ locked = 0 @@ -2410,6 +2432,12 @@ }, /turf/open/floor/iron/white/corner, /area/station/medical/medbay) +"SC" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/directional/south, +/obj/item/bitrunning_debug, +/turf/open/floor/iron, +/area/station/cargo/bitrunning/den) "SU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -2429,6 +2457,14 @@ /obj/machinery/door/poddoor, /turf/open/floor/engine, /area/station/hallway/secondary/entry) +"Ts" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Gravity Generator" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "Tt" = ( /turf/open/floor/plating, /area/station/maintenance/aft) @@ -2437,13 +2473,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/atmos) -"TK" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "TR" = ( /obj/machinery/netpod, /turf/open/floor/iron, @@ -2469,21 +2498,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"UO" = ( -/obj/structure/table, -/obj/machinery/camera/autoname/directional/south, -/obj/item/gun/magic/wand/resurrection/debug, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"US" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Gravity Generator" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) "Va" = ( /obj/machinery/power/smes/full, /obj/effect/turf_decal/stripes/line{ @@ -2503,14 +2517,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"VE" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/bluespace, -/obj/item/stock_parts/power_store/cell/bluespace, -/obj/item/stock_parts/power_store/cell/bluespace, -/turf/open/floor/iron/dark, -/area/station/science/explab) "We" = ( /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, @@ -2519,19 +2525,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) -"Ws" = ( -/obj/machinery/status_display/supply, -/turf/closed/wall/r_wall, -/area/station/commons/storage/primary) -"Wu" = ( -/obj/item/surgery_tray/full/advanced, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white/corner, -/area/station/medical/medbay) "WK" = ( /obj/structure/money_bot, /turf/open/floor/iron/dark, @@ -2561,14 +2554,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"Xs" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "cargoload" - }, -/obj/structure/sign/warning/vacuum/directional/east, -/turf/open/floor/iron, -/area/station/cargo/storage) "Xy" = ( /obj/machinery/door/airlock, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2588,6 +2573,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science) +"XF" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "cargoload" + }, +/obj/structure/sign/warning/vacuum/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) "XG" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -2599,6 +2592,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"XN" = ( +/obj/structure/table, +/obj/item/organ/internal/cyberimp/bci{ + pixel_y = 5 + }, +/obj/item/organ/internal/cyberimp/bci{ + pixel_y = 5 + }, +/obj/item/organ/internal/cyberimp/bci{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) "XU" = ( /obj/machinery/atmospherics/components/tank/air, /obj/machinery/light/directional/north, @@ -2611,18 +2617,29 @@ "Yd" = ( /turf/open/floor/iron, /area/station/cargo/bitrunning/den) -"Yo" = ( +"Ym" = ( /obj/structure/table, -/obj/item/analyzer, -/obj/item/wrench, -/obj/machinery/light/directional/south, -/turf/open/floor/plating, -/area/station/engineering/atmos) +/obj/item/storage/toolbox/electrical, +/obj/item/multitool/circuit{ + pixel_x = -4 + }, +/obj/item/multitool{ + pixel_x = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) "Yt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/meter, /turf/open/floor/plating, /area/station/engineering/atmos) +"Yy" = ( +/obj/machinery/light/directional/north, +/obj/machinery/rnd/production/circuit_imprinter/department, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science) "Yz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2635,13 +2652,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"YQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/closet/radiation, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "Zd" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/unlocked, @@ -2652,6 +2662,31 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/engineering/main) +"Zo" = ( +/obj/structure/table, +/obj/item/gun/magic/wand/resurrection/debug, +/obj/item/gun/magic/wand/death/debug{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/debug/human_spawner{ + pixel_x = 6; + pixel_y = -4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay) +"Zz" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/unlocked, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "ZB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -2662,6 +2697,12 @@ /obj/machinery/suit_storage_unit/ce, /turf/open/floor/iron, /area/station/engineering/atmos) +"ZK" = ( +/obj/structure/table, +/obj/item/storage/box/shipping, +/obj/item/boulder_beacon, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "ZP" = ( /turf/open/floor/iron/dark, /area/station/science/explab) @@ -3519,7 +3560,7 @@ Ue IF Aj uL -wV +SC Ue aa aa @@ -5826,7 +5867,7 @@ eh eh eh eh -ar +eF HW fM eh @@ -5997,7 +6038,7 @@ aw hm aw hr -Yo +Kx ah zS bB @@ -6024,7 +6065,7 @@ cN Ni vm uQ -VE +Ov Ir aa aa @@ -6181,9 +6222,9 @@ GC aN bb Ru -gt +zo ah -dq +Yy bD QM QM @@ -6191,7 +6232,7 @@ rh ZB QV FA -CO +Hb Es dn dn @@ -6207,8 +6248,8 @@ dL cN Pk kp -Iv -Cb +XN +Ym Ir aa aa @@ -6552,7 +6593,7 @@ TT ab ab bu -OC +Fd ce cp bu @@ -6828,14 +6869,14 @@ an yN ab bv -wT +bJ cf xD io lu QV bE -cy +ef cY dn dn @@ -6927,7 +6968,7 @@ bu XG QV bE -cy +ef cY dn dn @@ -7012,7 +7053,7 @@ aj ac ac bv -CS +aK cf RM bv @@ -7204,7 +7245,7 @@ kS QV bE cS -Qa +Zz dp dl dl @@ -7284,9 +7325,9 @@ ap aA We Ma -MQ -Ge -Jk +aS +bd +bo aj hD cj @@ -7390,14 +7431,15 @@ bE cS qv dJ -ia +wR dJ dJ Kw dJ dJ dJ -lA +dJ +dN dJ dJ cS @@ -7472,7 +7514,7 @@ mk bf bp aj -Kp +Px tn Ce GZ @@ -7481,7 +7523,7 @@ QV bE cS jg -sO +dq dJ dJ dJ @@ -7491,7 +7533,7 @@ dJ dJ dJ dJ -Pi +gi cS fI ga @@ -7555,12 +7597,12 @@ aa aa aa aa -OY -OY ak ak ak -lK +ak +ak +Ts ak ak ak @@ -7583,7 +7625,7 @@ dJ dJ dJ dJ -EQ +nT cS fO fO @@ -7647,8 +7689,8 @@ aa aa aa aa -OY -AM +aa +aa ak Va Bp @@ -7739,13 +7781,13 @@ aa aa aa aa -sU -AM +aa +aa ak -YQ -bh -bh -bh +Rx +aX +aX +aX br ak bS @@ -7761,12 +7803,11 @@ dt dJ dD dJ -dI +qR dJ XZ dJ dJ -dJ UO cS fO @@ -7831,14 +7872,14 @@ aa aa aa aa -OY -AM +aa +aa +ak +gW +Lb +aX +Qi ak -OL -aI -US -aI -aI ak Ly EX @@ -7859,7 +7900,7 @@ dJ dJ dJ dJ -OZ +ZK cS fP fO @@ -7923,14 +7964,14 @@ aa aa aa aa -OY -AM -ak -av -av -av -av -av +aa +aa +aa +aI +af +aX +ad +aI by by ck @@ -7953,7 +7994,7 @@ dJ dJ nP cS -Dk +gz fO fO fO @@ -8015,20 +8056,20 @@ aa aa aa aa -OY -AM -ak -av -MN -MN -MN -av +aa +aa +aa +aI +af +aX +ad +aI by Ot cl RD cl -Fm +Zo wa cJ by @@ -8043,9 +8084,10 @@ dJ dJ ub dJ +dJ kf cS -jV +fQ fO fO fO @@ -8107,14 +8149,14 @@ aa aa aa aa -OY -AM -ak -dT -MN -av -Jp -av +aa +aa +aa +aI +af +aX +ad +aI by DD cm @@ -8126,14 +8168,14 @@ Sj by jk dJ -dJ +JJ dJ dJ yl dJ dJ dJ -dJ +pY dJ dJ cS @@ -8141,7 +8183,7 @@ fS fO AD fO -DX +gk aa aa aa @@ -8199,14 +8241,14 @@ aa aa aa aa -OY -AM -ak -av -MN -MN -MN -av +aa +aa +aa +aI +af +aX +ad +aI by ER cm @@ -8214,7 +8256,7 @@ cm cm Un WL -Wu +LD by DC Bz @@ -8228,7 +8270,7 @@ MM MM MM qw -Nf +pe pr Fy Fy @@ -8291,14 +8333,14 @@ aa aa aa aa -OY -AM -ak -av -av -aY -av -av +aa +aa +aa +aI +af +bY +ad +aI by jZ cm @@ -8306,7 +8348,7 @@ cm cm cm WL -kF +jz by dB dx @@ -8383,14 +8425,14 @@ aa aa aa aa -OY -AM -ak -ak -ak -ak -ak -ak +aa +aa +aa +aI +af +aX +ad +aI by er cm @@ -8407,7 +8449,7 @@ cS cS Is Jd -Ws +tz cS cS cS @@ -8475,15 +8517,15 @@ aa aa aa aa -OY -AM -AM -AM -AM -AM -AM -AM -OJ +aa +aa +aa +aI +af +aX +ad +aI +by wk PK PK @@ -8567,14 +8609,14 @@ aa aa aa aa -OY -OY -OY -OY -OY -OY -OY -OY +aa +aa +aa +aI +af +aX +ad +aI by by by @@ -8662,11 +8704,11 @@ aa fg fg fg -fg -fg -fg -fg -fg +aI +af +aX +ad +aI aa aa ck @@ -8679,13 +8721,13 @@ by ev eA eA -JK +IX eN Ao QP pL eT -Xs +XF fm ev et @@ -8754,11 +8796,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +hS +bY +ad +aI aa aa ck @@ -8772,11 +8814,11 @@ et fh fh et -rZ -cX +eY +DT et -pA -JL +RE +fc et fh fh @@ -8846,11 +8888,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa by @@ -8864,11 +8906,11 @@ aa aa aa fh -qe +eC gH ng GV -tI +fl fh aa aa @@ -8938,11 +8980,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa aa @@ -8956,11 +8998,11 @@ aa aa aa fh -qe +eC An ya An -tI +fl fh aa aa @@ -9030,11 +9072,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa aa @@ -9048,11 +9090,11 @@ aa aa aa et -rZ -rQ -LP -rQ -JL +eY +qg +fB +qg +fc et aa aa @@ -9122,11 +9164,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa aa @@ -9214,11 +9256,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +bY +ad +aI aa aa aa @@ -9306,11 +9348,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa aa @@ -9398,11 +9440,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa aa @@ -9490,11 +9532,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa aa @@ -9582,11 +9624,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +aI +af +aX +ad +aI aa aa aa @@ -9674,11 +9716,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +ak +qq +bh +xq +ak aa aa aa @@ -9765,13 +9807,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +ak +ak +aI +vw +aI +ak +ak aa aa aa @@ -9857,13 +9899,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +ak +av +av +av +av +av +ak aa aa aa @@ -9949,13 +9991,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +ak +av +MN +MN +MN +av +ak aa aa aa @@ -10041,13 +10083,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +ak +dT +MN +av +Jp +av +ak aa aa aa @@ -10133,13 +10175,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +ak +av +MN +MN +MN +av +ak aa aa aa @@ -10225,13 +10267,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +ak +av +av +aY +av +av +ak aa aa aa @@ -10317,13 +10359,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +ak +ak +ak +ak +ak +ak +ak aa aa aa diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 9f5cd41becb..f4647bfec47 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -196,6 +196,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +<<<<<<< HEAD "aV" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -203,6 +204,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aW" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -712,10 +715,28 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) +<<<<<<< HEAD "de" = ( /obj/effect/landmark/start/new_player, /turf/cordon, /area/misc/start) +======= +"df" = ( +/obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/stamp{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stamp/centcom, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dh" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -785,6 +806,23 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +<<<<<<< HEAD +======= +"ds" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dv" = ( /obj/structure/railing/corner{ dir = 8 @@ -848,6 +886,7 @@ /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks{ dir = 8 +<<<<<<< HEAD }, /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -1327,6 +1366,475 @@ name = "Thunderdome Admin" }, /area/centcom/tdome/administration) +======= + }, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"dJ" = ( +/obj/machinery/button/door/indestructible{ + id = "thunderdomehea"; + name = "Heavy Supply Control"; + req_access = list("cent_thunder") + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"dK" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/highsecurity, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"dL" = ( +/obj/effect/turf_decal/loading_area, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"dU" = ( +/obj/structure/bookcase/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"dV" = ( +/obj/structure/table/wood, +/obj/item/storage/box/beanbag, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"dW" = ( +/obj/item/radio{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/radio{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/radio, +/obj/structure/table/wood, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"ea" = ( +/obj/item/flashlight/lamp, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"ec" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"eg" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"em" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"en" = ( +/obj/item/storage/box/ids{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/silver_ids, +/obj/structure/table/reinforced, +/obj/machinery/newscaster/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"ep" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"eq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/bot, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"et" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: BLAST DOORS" + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/courtroom) +"eu" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"ev" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"ey" = ( +/obj/structure/flora/bush/leavy, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation/ship) +"eA" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/item/kirbyplants/organic/plant15{ + pixel_x = -6; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"eB" = ( +/obj/structure/bookcase/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"eD" = ( +/obj/machinery/door/airlock/centcom{ + name = "Administrative Office" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) +"eE" = ( +/obj/structure/table/reinforced, +/obj/item/toy/figure/dsquad{ + pixel_x = -3; + pixel_y = 11 + }, +/obj/item/flashlight/seclite, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"eF" = ( +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/briefing) +"eH" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/iron{ + icon_state = "asteroid5"; + name = "plating" + }, +/area/centcom/tdome/administration) +"eI" = ( +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"eK" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, +/obj/machinery/light/directional/south, +/turf/open/misc/asteroid, +/area/centcom/central_command_areas/evacuation) +"eM" = ( +/obj/machinery/vending/cola, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"eN" = ( +/obj/structure/table/wood, +/obj/structure/plaque/static_plaque/golden{ + pixel_y = 32 + }, +/obj/item/clothing/accessory/lawyers_badge{ + desc = "A badge of upmost glory."; + name = "thunderdome badge" + }, +/turf/open/floor/iron/grimy, +/area/centcom/tdome/observation) +"eP" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/mob_spawn/corpse/human/intern, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"eR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, +/area/centcom/central_command_areas/evacuation/ship) +"eS" = ( +/obj/structure/table/wood, +/obj/item/folder, +/obj/item/pen/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"eV" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/taperecorder, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/briefing) +"eX" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/evacuation/ship) +"eY" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) +"fa" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"fb" = ( +/obj/machinery/flasher{ + id = "tdomeflash"; + name = "Thunderdome Flash" + }, +/turf/open/floor/circuit/green, +/area/centcom/tdome/arena) +"fc" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"fe" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/item/kirbyplants/organic/plant21, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/courtroom) +"ff" = ( +/obj/structure/rack, +/obj/item/clothing/under/color/green, +/obj/item/clothing/shoes/sneakers/brown, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/head/helmet/swat, +/obj/item/gun/energy/laser, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"fh" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"fi" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/ert_spawn, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"fj" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/armory) +"fk" = ( +/obj/machinery/vending/cigarette, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"fl" = ( +/obj/effect/landmark/thunderdome/two, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"fm" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/centcom/central_command_areas/evacuation) +"fw" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"fA" = ( +/obj/machinery/vending/cola, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/fore) +"fC" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"fE" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"fF" = ( +/obj/machinery/door/airlock/external/ruin{ + name = "Backup Emergency Escape Shuttle" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"fG" = ( +/obj/machinery/door/airlock/silver{ + name = "Bathroom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/admin) +"fI" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"fM" = ( +/obj/structure/filingcabinet/medical, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"fN" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"fP" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/admin) +"fQ" = ( +/obj/machinery/power/smes/magical, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/iron/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"fR" = ( +/obj/item/food/egg/rainbow{ + desc = "I bet you think you're pretty clever... well you are."; + name = "easter egg" + }, +/turf/open/space/basic, +/area/space) +"fT" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/basic, +/area/space/nearstation) +"fV" = ( +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/evacuation/ship) +"fW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"fZ" = ( +/obj/effect/landmark/ctf, +/turf/open/space/basic, +/area/space) +"ga" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, +/obj/machinery/light/directional/south, +/turf/open/floor/grass, +/area/centcom/tdome/administration) +"gd" = ( +/obj/machinery/door/airlock/highsecurity, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"ge" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"gf" = ( +/obj/machinery/vending/security, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gi" = ( /obj/docking_port/stationary{ dir = 4; @@ -1480,6 +1988,22 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +<<<<<<< HEAD +======= +"gY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -1663,6 +2187,16 @@ /obj/item/soap/nanotrasen, /turf/open/floor/iron/white, /area/centcom/tdome/observation) +<<<<<<< HEAD +======= +"ig" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/taperecorder, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ih" = ( /obj/structure/bookcase/random, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -1778,11 +2312,14 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +<<<<<<< HEAD "iB" = ( /turf/closed/indestructible/fakedoor{ name = "CentCom Cell" }, /area/centcom/central_command_areas/prison/cells) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iC" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer{ @@ -2412,10 +2949,14 @@ "lb" = ( /obj/structure/table/wood, /obj/machinery/door/window/left/directional/south, +<<<<<<< HEAD /obj/item/radio/intercom{ desc = "Talk smack through this."; syndie = 1 }, +======= +/obj/item/radio/intercom/syndicate, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "lc" = ( @@ -2428,10 +2969,14 @@ /area/centcom/central_command_areas/courtroom) "ld" = ( /obj/structure/table/wood, +<<<<<<< HEAD /obj/item/radio/intercom{ desc = "Talk smack through this."; syndie = 1 }, +======= +/obj/item/radio/intercom/syndicate, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/window/brigdoor/right/directional/south{ name = "CentCom Stand"; req_access = list("cent_captain") @@ -2600,10 +3145,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/item/radio/intercom{ - desc = "Talk smack through this."; - pixel_x = -32; - syndie = 1 +/obj/item/radio/intercom/syndicate{ + pixel_x = -32 }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) @@ -2669,10 +3212,14 @@ /area/centcom/central_command_areas/courtroom) "mn" = ( /obj/structure/table/wood, +<<<<<<< HEAD /obj/item/radio/intercom{ desc = "Talk smack through this."; syndie = 1 }, +======= +/obj/item/radio/intercom/syndicate, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "mo" = ( @@ -2905,6 +3452,14 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/fore) +<<<<<<< HEAD +======= +"nz" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/admin, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/briefing) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -3675,6 +4230,7 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +<<<<<<< HEAD "qM" = ( /obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/structure/table/reinforced, @@ -3687,6 +4243,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qO" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -3755,27 +4313,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/prison) +<<<<<<< HEAD "rh" = ( /obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/structure/table/reinforced, /obj/item/stack/package_wrap{ pixel_y = 11; pixel_x = -16 - }, -/obj/item/stack/cable_coil{ - pixel_y = 4; - pixel_x = -10 - }, -/obj/item/hand_labeler{ - pixel_y = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/hand_labeler_refill{ - pixel_x = 8; - pixel_y = 12 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) +======= "rk" = ( /turf/open/floor/wood, /area/centcom/central_command_areas/courtroom) @@ -3799,6 +4344,13 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"rr" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/clipboard, +/obj/item/radio/headset/headset_cent, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) "rs" = ( /obj/effect/landmark/prisonwarp, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -3844,6 +4396,10 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) +"rA" = ( +/obj/effect/landmark/start/new_player, +/turf/cordon, +/area/misc/start) "rB" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -4403,20 +4959,6 @@ /obj/structure/sign/poster/contraband/syndicate_recruitment/directional/north, /turf/open/indestructible/dark, /area/centcom/central_command_areas/admin) -"ub" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) "uc" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -4450,6 +4992,706 @@ /obj/structure/flora/bush/generic/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/prison) +"uk" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + }, +/obj/item/stack/cable_coil{ + pixel_y = 4; + pixel_x = -10 + }, +/obj/item/hand_labeler{ + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/hand_labeler_refill{ + pixel_x = 8; + pixel_y = 12 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"rk" = ( +/turf/open/floor/wood, +/area/centcom/central_command_areas/courtroom) +"rm" = ( +/obj/machinery/computer/shuttle/labor, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"rn" = ( +/obj/machinery/computer/shuttle/mining, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"rq" = ( +/obj/machinery/light/floor, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"rs" = ( +/obj/effect/landmark/prisonwarp, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/indestructible/dark, +/area/centcom/central_command_areas/prison/cells) +"rt" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"ru" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"rv" = ( +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"rw" = ( +/obj/machinery/vending/snack, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"ry" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/admin) +"rz" = ( +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/evacuation/ship) +"rB" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"rF" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/iron{ + dir = 6; + icon_state = "asteroid8"; + name = "sand" + }, +/area/centcom/central_command_areas/supply) +"rH" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/machinery/light/directional/east, +/turf/open/floor/iron{ + icon_state = "asteroid5"; + name = "plating" + }, +/area/centcom/central_command_areas/fore) +"rI" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec3"; + name = "XCC Checkpoint 3 Shutters" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/fore) +"rJ" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, +/obj/machinery/light/directional/west, +/turf/open/floor/grass, +/area/centcom/central_command_areas/fore) +"rK" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, +/turf/open/floor/grass, +/area/centcom/central_command_areas/control) +"rL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +<<<<<<< HEAD +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"rM" = ( +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/courtroom) +"rN" = ( +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"rQ" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation/ship) +"rS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"rT" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation) +"rU" = ( +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation) +"rV" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation) +"rY" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/armory) +"rZ" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"sa" = ( +/obj/structure/table/wood, +/obj/item/lighter{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/crowbar/power{ + pixel_y = 15 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"sb" = ( +/obj/machinery/vending/snack, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"sc" = ( +/obj/structure/table/wood, +/obj/structure/plaque/static_plaque/golden{ + pixel_y = 32 + }, +/obj/item/clothing/accessory/medal/silver{ + pixel_y = 5 + }, +/turf/open/floor/iron/grimy, +/area/centcom/tdome/observation) +"sd" = ( +/obj/machinery/door/airlock/centcom{ + name = "Orbital Drop Pod Loading" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"sk" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 5 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"sn" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/medical, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"so" = ( +/obj/effect/landmark/thunderdome/one, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"sq" = ( +/obj/machinery/computer/shuttle/white_ship{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"sr" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"ss" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"st" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"su" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"sv" = ( +/obj/structure/noticeboard/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"sw" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"sz" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"sA" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation/ship) +"sC" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"sE" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/armory) +"sF" = ( +/obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"sH" = ( +/obj/machinery/computer/security/telescreen, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"sI" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"sJ" = ( +/obj/machinery/vending/coffee, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"sK" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"sL" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sP" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = -4 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sQ" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sR" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sS" = ( +/obj/structure/table, +/obj/item/toy/katana{ + pixel_y = 8 + }, +/obj/item/toy/plush/carpplushie, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sV" = ( +/obj/machinery/door/poddoor/shuttledock, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"sY" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Supplypod Loading" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"sZ" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Supplypod Loading" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"tb" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"td" = ( +/obj/structure/sign/departments/drop, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/ferry) +"tg" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"tl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"tn" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/structure/sign/warning/secure_area/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"to" = ( +/obj/machinery/computer/shuttle/ferry{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"tp" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"tq" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"tr" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"ts" = ( +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"tt" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"tu" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Supply" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"ty" = ( +/obj/structure/filingcabinet/security, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"tF" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Locker Room" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"tG" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"tH" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Administration" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"tI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: BLAST DOORS" + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/fore) +"tK" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"tL" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"tM" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"tN" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"tQ" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"tR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"tT" = ( +/obj/effect/turf_decal/siding/dark_blue, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"tU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"tV" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"tW" = ( +/obj/structure/sign/poster/contraband/syndicate_recruitment/directional/north, +/turf/open/indestructible/dark, +/area/centcom/central_command_areas/admin) +"ub" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +<<<<<<< HEAD +"uc" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"ud" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, +/area/centcom/central_command_areas/evacuation/ship) +"uf" = ( +/turf/closed/indestructible/riveted, +/area/centcom/tdome/administration) +"ug" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"uh" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"uj" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, +/turf/open/floor/grass, +/area/centcom/central_command_areas/prison) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ul" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/yellow/corner{ @@ -4981,6 +6223,7 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +<<<<<<< HEAD "wu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -4995,6 +6238,8 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wv" = ( /obj/machinery/door/poddoor/shutters{ id = "XCCFerry"; @@ -5071,6 +6316,7 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +<<<<<<< HEAD "wJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -5084,6 +6330,8 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5480,6 +6728,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 +<<<<<<< HEAD }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) @@ -5600,6 +6849,130 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; planetary_atmos = 0 }, +======= + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"yL" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"yO" = ( +/obj/machinery/computer/communications, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"yP" = ( +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/machinery/computer/cargo{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"yR" = ( +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/stamp{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/table/reinforced, +/obj/item/stamp/centcom, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/briefing) +"yS" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/emps, +/obj/item/gun/energy/ionrifle, +/obj/structure/sign/departments/medbay/alt/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"yV" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 8; + height = 7; + json_key = "cargo"; + name = "CentCom"; + shuttle_id = "cargo_away"; + width = 20 + }, +/turf/open/space, +/area/space) +"yW" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"yX" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white/textured, +/area/centcom/central_command_areas/evacuation/ship) +"yY" = ( +/obj/structure/chair, +/obj/effect/landmark/thunderdome/observe, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"za" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/iron/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"zb" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"zc" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"zf" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/taperecorder, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"zh" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"zi" = ( +/obj/item/rupee, +/turf/open/misc/ashplanet/wateryrock{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; + planetary_atmos = 0 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/errorroom) "zk" = ( /obj/machinery/door/airlock/medical/glass{ @@ -5788,6 +7161,22 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) +<<<<<<< HEAD +======= +"zO" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Red Team"; + network = list("thunder"); + pixel_x = 11; + pixel_y = -9; + resistance_flags = 64 + }, +/obj/effect/landmark/thunderdome/two, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zR" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -6655,6 +8044,7 @@ /area/centcom/central_command_areas/control) "DJ" = ( /obj/structure/chair/office{ +<<<<<<< HEAD dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -6752,6 +8142,92 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +======= + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"DL" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"DN" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"DU" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"Eb" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"Ee" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Ef" = ( +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Eg" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Booth" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"Ej" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Em" = ( +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/structure/table/reinforced, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"En" = ( +/obj/structure/chair/comfy/black, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"Eq" = ( +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/evacuation/ship) +"Er" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/neutral/full, /obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants, @@ -6784,6 +8260,22 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +<<<<<<< HEAD +======= +"EA" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "EB" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -6841,6 +8333,7 @@ /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 }, +<<<<<<< HEAD /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7024,6 +8517,201 @@ /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8 }, +======= +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/obey/directional/west, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"EM" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter/podbay, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/one) +"EV" = ( +/obj/structure/table/wood, +/obj/machinery/microwave{ + pixel_y = 7 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/item/storage/box/donkpockets/donkpocketspicy{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/evacuation/ship) +"EZ" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/three) +"Fe" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"Ff" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/evacuation/ship) +"Fg" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"Fh" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"Fi" = ( +/obj/effect/landmark/basketball/game_area, +/turf/open/space/basic, +/area/space) +"Fj" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Administration" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"Fk" = ( +/obj/machinery/vending/cola, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Fo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: BLAST DOORS" + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/prison) +"Fq" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/control) +"Fu" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"Fv" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/iron, +/area/centcom/central_command_areas/fore) +"Fw" = ( +/obj/machinery/door/window/brigdoor/right/directional/south{ + name = "CentCom Stand"; + req_access = list("cent_captain") + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/courtroom) +"Fz" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"FB" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe/rapidsyringe, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"FI" = ( +/obj/effect/landmark/thunderdome/two, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"FM" = ( +/obj/structure/signpost/salvation{ + icon = 'icons/obj/structures.dmi'; + icon_state = "ladder10"; + invisibility = 100 + }, +/turf/open/misc/ashplanet/wateryrock{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; + planetary_atmos = 0 + }, +/area/awaymission/errorroom) +"FO" = ( +/obj/structure/table/reinforced, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/gps/mining, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"FR" = ( +/obj/effect/light_emitter/podbay, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/pod_storage) +"FU" = ( +/turf/closed/indestructible/fakedoor{ + name = "Thunderdome Admin" + }, +/area/centcom/tdome/administration) +"FX" = ( +/obj/machinery/computer/auxiliary_base/directional/north, +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/radio/headset/headset_cent, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) +"FZ" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Gb" = ( +/obj/effect/light_emitter/thunderdome, +/turf/closed/indestructible/fakeglass, +/area/centcom/tdome/observation) +"Gf" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) "Gi" = ( @@ -7102,6 +8790,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) "GC" = ( +<<<<<<< HEAD /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom" @@ -10269,6 +11958,11 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom Security" +======= +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10276,6 +11970,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +<<<<<<< HEAD /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) @@ -10381,6 +12076,3285 @@ }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) +======= +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"GD" = ( +/obj/effect/turf_decal/siding/dark_blue{ + dir = 10 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"GI" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"GJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: BLAST DOORS" + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/evacuation) +"GL" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/item/clothing/head/costume/festive{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"GN" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"GT" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"GX" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Ha" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Hb" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/smooth_edge, +/area/centcom/central_command_areas/evacuation/ship) +"Hi" = ( +/obj/effect/turf_decal/tile/green, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"Hj" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Hl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/evacuation/ship) +"Hm" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/iron{ + icon_state = "asteroid5"; + name = "plating" + }, +/area/centcom/tdome/observation) +"Ho" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"Hs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"Hv" = ( +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/courtroom) +"Hw" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Hz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"HE" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, +/turf/open/misc/asteroid, +/area/centcom/tdome/observation) +"HF" = ( +/obj/machinery/igniter/on, +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"HG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"HH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"HI" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/effect/landmark/thunderdome/one, +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"HJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, +/area/centcom/central_command_areas/evacuation/ship) +"HK" = ( +/obj/effect/landmark/thunderdome/two, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"HL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/turf/open/floor/stone, +/area/centcom/central_command_areas/evacuation/ship) +"HM" = ( +/obj/structure/bookcase/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"HR" = ( +/obj/structure/bed/medical/emergency, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/evacuation/ship) +"HV" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/closet/secure_closet/quartermaster, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"HY" = ( +/obj/machinery/photocopier, +/obj/machinery/button/door/indestructible{ + id = "XCCFerry"; + name = "Hanger Bay Shutters"; + pixel_x = -8; + pixel_y = 24 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCsec3"; + name = "CC Main Access Control"; + pixel_x = 8; + pixel_y = 24 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCsec1"; + name = "CC Shutter 1 Control"; + pixel_x = 8; + pixel_y = 38 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCsec3"; + name = "XCC Shutter 3 Control"; + pixel_x = -8; + pixel_y = 38 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"HZ" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"Ic" = ( +/obj/machinery/door/poddoor{ + id = "thunderdomehea"; + name = "Heavy Supply" + }, +/obj/effect/turf_decal/loading_area, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Id" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/glass/mug/britcup, +/obj/effect/turf_decal/bot, +/obj/item/clothing/head/utility/chefhat{ + pixel_y = 11; + pixel_x = 5 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Ie" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"If" = ( +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"Im" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"Io" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 10; + height = 30; + json_key = "ferry"; + name = "CentCom Ferry Dock"; + shuttle_id = "ferry_away"; + width = 21 + }, +/turf/open/space, +/area/space) +"Ip" = ( +/obj/structure/chair/stool/bar/directional/east, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/evacuation/ship) +"Ir" = ( +/obj/machinery/computer/emergency_shuttle{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"Iv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/stone, +/area/centcom/central_command_areas/evacuation/ship) +"Iw" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"IF" = ( +/turf/closed/indestructible/fakedoor{ + name = "CentCom Cell" + }, +/area/centcom/central_command_areas/prison/cells) +"IK" = ( +/obj/structure/closet/secure_closet/ert_sec, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"IO" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"IR" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/generic/style_random, +/obj/machinery/light/directional/south, +/turf/open/floor/grass, +/area/centcom/tdome/administration) +"IX" = ( +/obj/effect/turf_decal/siding/dark_blue{ + dir = 6 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"Jb" = ( +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/prison/cells) +"Jg" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/centcom/central_command_areas/fore) +"Ji" = ( +/turf/open/floor/circuit/green, +/area/centcom/tdome/arena) +"Jl" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Jq" = ( +/obj/machinery/camera/motion/thunderdome{ + pixel_x = 10 + }, +/turf/open/floor/circuit/green, +/area/centcom/tdome/arena) +"JC" = ( +/obj/machinery/modular_computer/preset/command{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"JE" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"JJ" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"JO" = ( +/obj/machinery/modular_computer/preset/id/centcom, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"JU" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"JV" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"JW" = ( +/obj/structure/table/reinforced, +/obj/item/storage/briefcase/secure, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"Kd" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Kf" = ( +/obj/machinery/door/airlock/centcom{ + name = "Administrative Storage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) +"Ko" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"Kv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"KA" = ( +/obj/effect/landmark/thunderdome/two, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"KC" = ( +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/wood, +/area/centcom/central_command_areas/courtroom) +"KD" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/courtroom) +"KF" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/one) +"KH" = ( +/turf/closed/wall/mineral/titanium, +/area/centcom/central_command_areas/evacuation/ship) +"KK" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"KL" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/effect/landmark/thunderdome/two, +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"KN" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/machinery/light/directional/north, +/turf/open/floor/iron{ + icon_state = "asteroid5"; + name = "plating" + }, +/area/centcom/tdome/observation) +"KO" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/vending/cigarette, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"KQ" = ( +/turf/open/floor/plating, +/area/centcom/central_command_areas/evacuation/ship) +"KS" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 1; + height = 5; + name = "recovery ship"; + shuttle_id = "pod_2_away"; + width = 3 + }, +/turf/open/space/basic, +/area/space) +"KV" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"KW" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/machinery/button/door/indestructible{ + id = "XCCFerry"; + name = "Hanger Bay Shutters"; + pixel_y = -38 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) +"KZ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"Lb" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation/ship) +"Lc" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/structure/closet/emcloset, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"Ld" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"Lf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"Li" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation/ship) +"Lj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"Lk" = ( +/obj/machinery/power/shuttle_engine/heater, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"Ll" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation/ship) +"Lm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/door/airlock/titanium/glass, +/turf/open/floor/stone, +/area/centcom/central_command_areas/evacuation/ship) +"Ln" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/chair/comfy/shuttle/tactical{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"Lo" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"Lp" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"Lt" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/centcom/central_command_areas/evacuation/ship) +"Lu" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/nanotrasen_logo/directional/west, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"Lv" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"Lw" = ( +/obj/effect/spawner/structure/window/reinforced/shuttle, +/turf/open/floor/plating, +/area/centcom/central_command_areas/evacuation/ship) +"Lx" = ( +/obj/effect/turf_decal/siding/dark_blue/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"Lz" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"LA" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"LB" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"LC" = ( +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/door/airlock/titanium, +/obj/structure/fans/tiny, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"LD" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"LF" = ( +/obj/structure/flora/grass/jungle/b/style_3, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation/ship) +"LG" = ( +/obj/structure/flora/bush/sparsegrass, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation/ship) +"LI" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/textured, +/area/centcom/central_command_areas/evacuation/ship) +"LJ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"LK" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/kirbyplants/organic/plant21, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/courtroom) +"LM" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 1; + height = 5; + name = "recovery ship"; + shuttle_id = "pod_6_away"; + width = 3 + }, +/turf/open/space/basic, +/area/space) +"LN" = ( +/obj/structure/table/optable, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 28 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/evacuation/ship) +"LP" = ( +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/door/airlock/titanium, +/obj/structure/fans/tiny, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"LQ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"LR" = ( +/obj/structure/sign/poster/official/tactical_game_cards/directional/north, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/evacuation/ship) +"LU" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"LV" = ( +/turf/closed/indestructible/riveted, +/area/awaymission/errorroom) +"LW" = ( +/turf/closed/mineral/ash_rock, +/area/awaymission/errorroom) +"LX" = ( +/obj/structure/speaking_tile, +/turf/closed/mineral/ash_rock, +/area/awaymission/errorroom) +"Mf" = ( +/obj/effect/landmark/thunderdome/one, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Mn" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Mo" = ( +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Mp" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"Mr" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Ms" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Mt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"Mu" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Mv" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"Mw" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"My" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"Mz" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/centcom/central_command_areas/prison) +"MC" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/decal/cleanable/garbage{ + pixel_x = -15; + pixel_y = -6 + }, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation/ship) +"ME" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"MF" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"MH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/evacuation/ship) +"MI" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg{ + pixel_y = 6; + pixel_x = 5 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"MJ" = ( +/obj/structure/chair/office, +/obj/effect/landmark/ert_spawn, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"MK" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"ML" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"MM" = ( +/obj/machinery/power/shuttle_engine/large, +/turf/open/floor/plating, +/area/centcom/central_command_areas/evacuation/ship) +"MP" = ( +/obj/effect/light_emitter/podbay, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/two) +"MQ" = ( +/obj/structure/closet/secure_closet/courtroom, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"MS" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"MU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"MV" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"MX" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_edge, +/area/centcom/central_command_areas/evacuation/ship) +"MY" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/briefing) +"Ne" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup, +/turf/open/floor/iron/grimy, +/area/centcom/tdome/observation) +"Ng" = ( +/obj/item/storage/box/ids{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/silver_ids, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Nh" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses{ + pixel_y = 14; + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_y = -8; + pixel_x = -10 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"Nk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"Nm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/textured, +/area/centcom/central_command_areas/evacuation/ship) +"Nn" = ( +/obj/structure/table/reinforced, +/obj/item/storage/lockbox/loyalty, +/obj/item/gun/ballistic/automatic/ar, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) +"Np" = ( +/obj/structure/bookcase/random, +/obj/structure/noticeboard/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Nq" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"Nr" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Nw" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"Nx" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"Ny" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"NC" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"NE" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/pod_storage) +"NG" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"NH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/oven/range, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"NI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/centcom/central_command_areas/evacuation/ship) +"NJ" = ( +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"NM" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/light/directional/south, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"NN" = ( +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/obj/structure/table/reinforced, +/obj/item/stack/package_wrap{ + pixel_y = 11; + pixel_x = -16 + }, +/obj/item/stack/cable_coil{ + pixel_y = 4; + pixel_x = -10 + }, +/obj/item/hand_labeler{ + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/hand_labeler_refill{ + pixel_x = 8; + pixel_y = 12 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"NO" = ( +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"NP" = ( +/obj/machinery/door/airlock/silver{ + name = "Shower" + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"NR" = ( +/obj/machinery/door/poddoor{ + id = "thunderdome"; + name = "Thunderdome Blast Door" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"NU" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"NW" = ( +/obj/structure/bookcase/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"NY" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"NZ" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Oc" = ( +/obj/machinery/door/airlock/centcom{ + name = "Administrative Office" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Od" = ( +/obj/structure/cable, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"Of" = ( +/obj/item/clipboard, +/obj/item/stamp/denied{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stamp, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Oh" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Oi" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"Om" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen/blue, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"On" = ( +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/admin) +"Oq" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/two) +"Or" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin/storage) +"Ot" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Ou" = ( +/obj/effect/landmark/thunderdome/one, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Ow" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin/storage) +"Ox" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/centcom/central_command_areas/fore) +"Oz" = ( +/obj/machinery/door/airlock/external/ruin, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"OA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"OB" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"OC" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/lizard_plushie/space/green{ + name = "Escapes-on-Pods" + }, +/turf/open/floor/iron/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"OD" = ( +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -3; + pixel_y = 5 + }, +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"OE" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/iron{ + dir = 6; + icon_state = "asteroid8"; + name = "sand" + }, +/area/centcom/tdome/observation) +"OF" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_y = 12; + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/glass/mug/tea{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/item/trash/semki{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"OH" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"OI" = ( +/obj/item/kirbyplants/organic/plant21, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/evacuation/ship) +"OM" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/papercutter{ + pixel_y = 6; + pixel_x = 2 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"OO" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + desc = "Used to grind things up into raw materials and liquids."; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -8 + }, +/obj/item/knife/kitchen{ + pixel_x = 11; + pixel_y = -12 + }, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"OP" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/one) +"OQ" = ( +/obj/machinery/door/airlock/centcom{ + name = "Briefing Room" + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"OR" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"OS" = ( +/obj/structure/bookcase/random, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"OV" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"OW" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/textured, +/area/centcom/central_command_areas/evacuation/ship) +"OX" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/ert_spawn, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"OY" = ( +/obj/item/storage/fancy/donut_box, +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"OZ" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, +/obj/machinery/light/directional/north, +/turf/open/misc/asteroid, +/area/centcom/tdome/observation) +"Pc" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Pd" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"Pe" = ( +/obj/structure/table/wood, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Pg" = ( +/obj/machinery/computer/auxiliary_base/directional/north, +/obj/structure/table/reinforced, +/obj/item/clipboard{ + pixel_y = 4; + pixel_x = 2 + }, +/obj/item/folder/yellow{ + pixel_y = 7; + pixel_x = 5 + }, +/obj/item/pen/red{ + pixel_y = 2; + pixel_x = 3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/paper_bin{ + pixel_x = -15; + pixel_y = 7 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"Pk" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Pl" = ( +/obj/machinery/button/flasher/indestructible{ + id = "tdomeflash" + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"Pm" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/four) +"Pn" = ( +/obj/item/storage/box/matches{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/structure/table/wood, +/obj/machinery/barsign/all_access/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Po" = ( +/obj/machinery/vending/boozeomat, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/evacuation/ship) +"Pq" = ( +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/prison) +"Pr" = ( +/obj/effect/landmark/thunderdome/admin, +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/iron/grimy, +/area/centcom/tdome/administration) +"Ps" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin/storage) +"Pt" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"Pv" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/four) +"Pw" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 1; + height = 5; + name = "recovery ship"; + shuttle_id = "pod_7_away"; + width = 3 + }, +/turf/open/space/basic, +/area/space) +"Pz" = ( +/obj/structure/table/reinforced, +/obj/item/paper/pamphlet/centcom/visitor_info, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"PD" = ( +/obj/item/kirbyplants/organic/plant21{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/fore) +"PE" = ( +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/armory) +"PF" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/admin) +"PG" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"PH" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/closet/crate/bin, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) +"PJ" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/textured, +/area/centcom/central_command_areas/evacuation/ship) +"PK" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/one) +"PL" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, +/turf/open/misc/asteroid, +/area/centcom/central_command_areas/evacuation) +"PM" = ( +/obj/structure/chair/office, +/obj/effect/landmark/ert_spawn, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"PR" = ( +/obj/structure/table/wood, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"PT" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"PU" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"PV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"PW" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/three) +"PY" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"PZ" = ( +/obj/structure/flora/tree/palm{ + icon_state = "palm2" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation/ship) +"Qb" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Qd" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_y = 9; + pixel_x = 3 + }, +/obj/item/paper/pamphlet/violent_video_games{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/evacuation/ship) +"Qe" = ( +/turf/open/ai_visible, +/area/centcom/ai_multicam_room) +"Qf" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Qi" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Qk" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/door/indestructible{ + id = "XCCsec3"; + name = "CC Main Access Control" + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Qm" = ( +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stamp, +/obj/structure/table/reinforced, +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Qo" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"Qp" = ( +/obj/effect/light_emitter/podbay, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/one) +"Qt" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical{ + pixel_y = 8; + pixel_x = 4 + }, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/iron/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"Qv" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Qx" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"Qy" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"Qz" = ( +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"QB" = ( +/obj/structure/table/reinforced, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/item/paper_bin{ + pixel_y = 3; + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/clipboard{ + pixel_x = 5 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"QC" = ( +/turf/closed/indestructible/riveted, +/area/centcom/tdome/observation) +"QH" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"QM" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/three) +"QO" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"QR" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"QT" = ( +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"QU" = ( +/obj/structure/table/wood, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"QV" = ( +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"QX" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"QY" = ( +/obj/item/storage/box/handcuffs, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/gun/ballistic/revolver/mateba, +/obj/structure/table/reinforced, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) +"Ra" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"Rb" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"Rc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"Rd" = ( +/obj/structure/bookcase/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"Rf" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"Rh" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Ri" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/taperecorder, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Rj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/vault{ + req_access = list("cent_captain") + }, +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "XCCadminstore" + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) +"Rk" = ( +/obj/structure/cable, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/evacuation/ship) +"Rl" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"Rn" = ( +/obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/melee/chainofcommand, +/obj/item/stamp/head/captain, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Ro" = ( +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets{ + pixel_y = 19; + pixel_x = 5 + }, +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"Rp" = ( +/obj/machinery/computer/communications, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/evacuation/ship) +"Rq" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Rs" = ( +/obj/structure/closet/secure_closet/security, +/obj/item/storage/belt/security/full, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/clothing/head/helmet/swat/nanotrasen, +/obj/item/crowbar/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"Rw" = ( +/obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/radio/headset/headset_cent, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"Rx" = ( +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/icecream_vat, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Ry" = ( +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/regular{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/control) +"RB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"RF" = ( +/obj/structure/table/reinforced, +/obj/item/crowbar/red, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"RG" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"RH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"RI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/centcom/central_command_areas/courtroom) +"RJ" = ( +/obj/effect/decal/cleanable/fuel_pool, +/turf/open/floor/grass, +/area/centcom/central_command_areas/evacuation/ship) +"RL" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter/podbay, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/two) +"RM" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/armory) +"RP" = ( +/obj/structure/bookcase/random, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"RQ" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Green Team"; + network = list("thunder"); + pixel_x = 12; + pixel_y = -10; + resistance_flags = 64 + }, +/obj/effect/landmark/thunderdome/one, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"RR" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"RV" = ( +/obj/structure/table/reinforced, +/obj/item/restraints/handcuffs, +/obj/item/radio, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"RW" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"RX" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"Sd" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"Se" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/two) +"Sg" = ( +/obj/item/storage/briefcase{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/briefcase/secure, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"Sh" = ( +/obj/structure/table/reinforced, +/obj/item/mod/control/pre_equipped/corporate{ + pixel_y = 5 + }, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/mask/gas/sechailer/swat, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) +"Si" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/two) +"Sj" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark_blue/corner, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"Sk" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"Sl" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/centcom/tdome/observation) +"Sm" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"Sp" = ( +/obj/machinery/door/airlock/external/ruin, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Sq" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"Su" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"Sx" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/admin/storage) +"Sy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/evacuation/ship) +"Sz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"SB" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"SC" = ( +/obj/structure/tank_dispenser/oxygen, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/iron/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"SE" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter/podbay, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/three) +"SG" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"SH" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"SJ" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"SL" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) +"SO" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"SP" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"SQ" = ( +/obj/structure/filingcabinet/medical, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"SR" = ( +/turf/open/floor/circuit/green, +/area/centcom/central_command_areas/briefing) +"SS" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/one) +"ST" = ( +/obj/machinery/door/poddoor/ert{ + id = "XCCertstore" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"SX" = ( +/obj/machinery/computer/shuttle, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/evacuation/ship) +"Tb" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"Tc" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/two) +"Te" = ( +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/mineral/plasma{ + amount = 10 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 10 + }, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/iron/smooth_edge, +/area/centcom/central_command_areas/evacuation/ship) +"Tf" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Tg" = ( +/obj/item/storage/briefcase{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/briefcase/secure, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Tj" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 19; + pixel_x = 7 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"Tl" = ( +/obj/structure/table/wood, +/obj/structure/plaque/static_plaque/thunderdome{ + pixel_y = -32 + }, +/obj/item/clothing/accessory/medal/gold{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/clothing/accessory/medal/gold, +/turf/open/floor/iron/grimy, +/area/centcom/tdome/observation) +"Tm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/evacuation/ship) +"To" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"Tp" = ( +/obj/structure/table/reinforced, +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/clothing/suit/apron/chef, +/obj/item/kitchen/rollingpin{ + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 15; + pixel_x = -7 + }, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Tq" = ( +/obj/structure/filingcabinet/filingcabinet, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"Ts" = ( +/obj/structure/table/reinforced, +/obj/item/restraints/handcuffs/cable/zipties, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Tt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"Tv" = ( +/obj/structure/table/wood, +/obj/structure/window/spawner/directional/south, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/evacuation/ship) +"Tw" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/machinery/light/floor, +/turf/open/floor/iron{ + icon_state = "asteroid5"; + name = "plating" + }, +/area/centcom/central_command_areas/control) +"Ty" = ( +/obj/structure/table/reinforced, +/obj/item/camera, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"Tz" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/three) +"TB" = ( +/obj/structure/closet/secure_closet/personal, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"TE" = ( +/obj/structure/chair/comfy/brown{ + color = "#596479"; + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/briefing) +"TG" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"TI" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"TJ" = ( +/turf/cordon, +/area/misc/start) +"TK" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) +"TL" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"TS" = ( +/obj/structure/table/wood, +/obj/item/dice/d20{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/dice/d10{ + pixel_x = -3 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"TT" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box{ + pixel_y = 13 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"TU" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"TV" = ( +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_y = 3 + }, +/obj/item/storage/fancy/cigarettes/cigars/havana, +/obj/structure/table/wood, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"TW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/admin) +"Ub" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ + dir = 1 + }, +/obj/machinery/meter, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin/storage) +"Uf" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"Uh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) +"Ui" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv, +/obj/structure/secure_safe{ + pixel_x = 32; + pixel_y = 24 + }, +/obj/machinery/status_display/ai/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Ul" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, +/turf/open/misc/asteroid, +/area/centcom/central_command_areas/fore) +"Um" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/iron{ + dir = 6; + icon_state = "asteroid8"; + name = "sand" + }, +/area/centcom/tdome/administration) +"Un" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Ur" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/under/rank/civilian/curator/treasure_hunter, +/obj/item/clothing/under/dress/skirt, +/obj/item/clothing/under/shorts/black, +/obj/item/clothing/under/pants/track, +/obj/item/clothing/accessory/armband/deputy, +/obj/item/clothing/accessory/waistcoat, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/neck/large_scarf/red, +/obj/item/clothing/neck/tie/red, +/obj/item/clothing/head/helmet/space/beret, +/obj/item/clothing/suit/jacket/curator, +/obj/item/clothing/suit/space/officer, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/eyepatch, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"Us" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/light_emitter/thunderdome, +/turf/open/floor/iron, +/area/centcom/tdome/arena) +"Uv" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -4 + }, +/obj/item/reagent_containers/hypospray/medipen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Uw" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"Ux" = ( +/turf/open/indestructible/dark, +/area/centcom/central_command_areas/admin) +"Uz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/iron/dark/smooth_large, +/area/centcom/central_command_areas/evacuation/ship) +"UA" = ( +/obj/item/cardboard_cutout{ + starting_cutout = "Private Security Officer" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"UC" = ( +/obj/structure/closet/secure_closet/personal, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"UH" = ( +/obj/machinery/light/directional/west, +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) +"UI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/tank/air{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) +"UM" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) +"UO" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"UR" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"UV" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/lighter, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) +"UW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/centcom/tdome/administration) +"UX" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"Vc" = ( +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Vd" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/centcom/central_command_areas/evacuation) +"Vf" = ( +/obj/item/kirbyplants/organic/plant21{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/fore) +"Vg" = ( +/obj/structure/rack, +/obj/item/gun/energy/e_gun{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/energy/e_gun, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"Vh" = ( +/obj/structure/table/reinforced, +/obj/item/surgery_tray/full{ + pixel_y = 10; + pixel_x = 2 + }, +/obj/item/storage/box/masks{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/evacuation/ship) +"Vi" = ( +/obj/item/book/manual/wiki/security_space_law, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Vk" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/two) +"Vl" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/pale/style_random, +/turf/open/misc/asteroid, +/area/centcom/tdome/administration) +"Vn" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/three) +"Vp" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"Vq" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"Vr" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Vs" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Vu" = ( +/obj/structure/closet/secure_closet/ert_med, +/obj/machinery/vending/wallmed/directional/south{ + use_power = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"Vv" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/central_command_areas/evacuation/ship) +"Vw" = ( +/obj/machinery/light/directional/south, +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"Vx" = ( +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/fore) +"Vy" = ( +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"Vz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"VB" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen/blue, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"VF" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"VG" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"VK" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"VM" = ( +/obj/structure/closet/secure_closet/ert_sec, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"VO" = ( +/obj/machinery/door/poddoor/ert{ + id = "XCCertstore" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"VP" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/four) +"VT" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"VY" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCcustoms1"; + name = "CC Emergency Docks Control"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"VZ" = ( +/obj/structure/closet/secure_closet/ert_med, +/obj/structure/sign/directions/medical{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"Wa" = ( +/obj/item/kirbyplants/organic/plant22, +/obj/structure/noticeboard/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"Wc" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) +"Wd" = ( +/obj/structure/table/reinforced, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/flashlight/seclite, +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"Wf" = ( +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"Wl" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Wn" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/centcom/tdome/administration) +"Wp" = ( +/obj/item/storage/briefcase{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/briefcase/secure, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Ws" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) +"Wt" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/four) +"Wv" = ( +/obj/structure/chair, +/obj/effect/landmark/thunderdome/observe, +/obj/machinery/barsign/all_access/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Wy" = ( +/obj/structure/chair/office, +/obj/effect/landmark/ert_spawn, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"WE" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation/ship) +"WF" = ( +/obj/item/storage/box/ids{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/silver_ids, +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"WG" = ( +/obj/structure/closet/secure_closet/ert_engi, +/obj/structure/sign/directions/engineering{ + pixel_y = 24 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) +"WK" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"WL" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) +"WN" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"WO" = ( +/obj/structure/table/wood, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"WP" = ( +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/obj/item/radio/intercom/syndicate{ + pixel_x = 28 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) +"WR" = ( +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) +"WS" = ( +/obj/machinery/button/door/indestructible{ + id = "XCCsec3"; + name = "XCC Shutter 3 Control"; + pixel_x = 24; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) +"WU" = ( +/obj/machinery/door/airlock/centcom{ + name = "Administrative Office" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) +"WX" = ( +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"WY" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/reinforced, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) +"Xa" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/cup/glass/mug/britcup, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) +"Xb" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"Xc" = ( +/obj/structure/noticeboard/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/courtroom) +"Xd" = ( +/obj/item/lighter{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/lighter, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Xf" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pointy/style_random, +/turf/open/floor/grass, +/area/centcom/tdome/observation) +"Xh" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod/loading/four) +"Xj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation/ship) +"Xk" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/handcuffs, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/evacuation) +"Xl" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Xn" = ( /obj/machinery/computer/security/telescreen, /obj/structure/table/reinforced, @@ -10503,6 +15477,7 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/centcom/central_command_areas/supplypod) +<<<<<<< HEAD "XV" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -10514,6 +15489,8 @@ /obj/item/stamp, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ya" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/armory) @@ -10925,6 +15902,7 @@ /area/centcom/central_command_areas/supply) (1,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -10939,6 +15917,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gu aa aa @@ -11182,6 +16176,7 @@ aa aa "} (2,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -11197,6 +16192,97 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -11439,6 +16525,7 @@ LV aa "} (3,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -11454,6 +16541,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -11548,6 +16651,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -11680,6 +16784,103 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa LV @@ -11696,6 +16897,7 @@ LV aa "} (4,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -11711,6 +16913,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -11813,6 +17031,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -11875,6 +17094,8 @@ aa aa aa aa +<<<<<<< HEAD +======= aa aa aa @@ -11895,6 +17116,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -11938,6 +17160,131 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -11953,6 +17300,7 @@ LV aa "} (5,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -11968,6 +17316,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -12070,6 +17434,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12132,6 +17497,8 @@ aa aa aa aa +<<<<<<< HEAD +======= aa aa aa @@ -12152,6 +17519,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12195,6 +17563,131 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -12210,6 +17703,7 @@ LV aa "} (6,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -12225,6 +17719,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -12327,6 +17837,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12389,6 +17900,8 @@ aa aa aa aa +<<<<<<< HEAD +======= aa aa aa @@ -12409,6 +17922,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12452,6 +17966,131 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -12467,6 +18106,7 @@ LV aa "} (7,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -12482,6 +18122,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -12584,6 +18240,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12646,6 +18303,8 @@ aa aa aa aa +<<<<<<< HEAD +======= aa aa aa @@ -12666,6 +18325,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12709,6 +18369,131 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -12724,6 +18509,7 @@ LV aa "} (8,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -12739,6 +18525,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +rA +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -12841,6 +18643,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12903,6 +18706,8 @@ aa aa aa aa +<<<<<<< HEAD +======= aa aa aa @@ -12923,6 +18728,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -12966,6 +18772,131 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -12981,6 +18912,7 @@ LV aa "} (9,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -12996,6 +18928,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -13090,6 +19038,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -13222,6 +19171,103 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa LV @@ -13232,12 +19278,17 @@ zi ik ik ZE +<<<<<<< HEAD fy +======= +FM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LW LV aa "} (10,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -13253,6 +19304,97 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -13495,6 +19637,7 @@ LV aa "} (11,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -13510,6 +19653,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -13628,6 +19787,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -13693,6 +19853,127 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -13752,6 +20033,7 @@ LV aa "} (12,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -13767,6 +20049,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -13885,6 +20183,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -13950,6 +20249,127 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -14009,6 +20429,7 @@ LV aa "} (13,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -14024,6 +20445,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -14142,6 +20579,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -14207,6 +20645,127 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -14266,6 +20825,7 @@ LV aa "} (14,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -14281,6 +20841,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -14399,6 +20975,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -14464,6 +21041,127 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -14523,6 +21221,7 @@ LV aa "} (15,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -14538,6 +21237,22 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ aa aa aa @@ -14656,6 +21371,7 @@ aa aa aa aa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -14721,6 +21437,127 @@ aa aa aa aa +<<<<<<< HEAD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -14780,6 +21617,7 @@ LV aa "} (16,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -14795,6 +21633,23 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -15037,6 +21892,7 @@ LV aa "} (17,1,1) = {" +<<<<<<< HEAD fX fX fX @@ -15052,6 +21908,23 @@ fX fX fX fX +======= +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -45272,7 +52145,11 @@ aa aa aa oe +<<<<<<< HEAD Ga +======= +ig +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sq to ZN @@ -45532,7 +52409,11 @@ mD FX sr tp +<<<<<<< HEAD qM +======= +KW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD aa oe @@ -47077,9 +53958,13 @@ tu mD mD mD -wu +ds xh +<<<<<<< HEAD wu +======= +ds +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD gO cn @@ -47343,7 +54228,11 @@ WN cb Bu tb +<<<<<<< HEAD aV +======= +rr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ho gO aa @@ -47591,9 +54480,15 @@ dx Hz dd mD +<<<<<<< HEAD WQ xh WQ +======= +Kv +xh +Kv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD WO eF @@ -48111,8 +55006,13 @@ fa mD PU eF +<<<<<<< HEAD PX Ke +======= +nz +yR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eV eF xU @@ -49122,7 +56022,11 @@ vo fP On Zw +<<<<<<< HEAD XV +======= +df +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hd To BT @@ -49945,7 +56849,11 @@ Bp Sz Sz uf +<<<<<<< HEAD gh +======= +FU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uf aa aa @@ -50661,7 +57569,11 @@ iF Pg mH nm +<<<<<<< HEAD rh +======= +NN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 On Ui JC @@ -51479,7 +58391,11 @@ BY QC bR HK +<<<<<<< HEAD UE +======= +zO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HK HK pb @@ -51960,9 +58876,15 @@ YU YU mD mD +<<<<<<< HEAD wu xh wu +======= +ds +xh +ds +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD Ya rY @@ -52474,9 +59396,15 @@ iu iu io io +<<<<<<< HEAD ub mk ub +======= +uk +mk +uk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 io io iu @@ -54306,7 +61234,11 @@ Gb Ef NY NY +<<<<<<< HEAD Jj +======= +fb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jq NY NY @@ -55782,6 +62714,7 @@ aa aa Jb ir +<<<<<<< HEAD iB YX ir @@ -55798,6 +62731,24 @@ iB YX ir iB +======= +IF +YX +ir +IF +Jb +ir +IF +Jb +ir +IF +Jb +ir +IF +YX +ir +IF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jb iH il @@ -56072,9 +63023,15 @@ Fq UO io io +<<<<<<< HEAD yU mk yU +======= +gY +mk +gY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 io io iu @@ -56586,9 +63543,15 @@ io yj io io +<<<<<<< HEAD Oj mk Oj +======= +Im +mk +Im +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 io io iu @@ -57133,7 +64096,11 @@ Tf QC dj Mf +<<<<<<< HEAD DT +======= +RQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Mf Mf Zi @@ -58352,6 +65319,7 @@ aa aa Jb ir +<<<<<<< HEAD iB YX ir @@ -58368,6 +65336,24 @@ iB YX ir iB +======= +IF +YX +ir +IF +Jb +ir +IF +Jb +ir +IF +Jb +ir +IF +YX +ir +IF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jb pc Hv @@ -58642,9 +65628,15 @@ cg cg cg cg +<<<<<<< HEAD yU GJ yU +======= +gY +GJ +gY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cg cg cg @@ -58683,7 +65675,11 @@ Bp Sz Sz uf +<<<<<<< HEAD gh +======= +FU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uf aa aa @@ -59156,9 +66152,15 @@ cg cg cg cg +<<<<<<< HEAD wJ GJ wJ +======= +EA +GJ +EA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cg cg cg diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index eb3032f5f44..aeeb1d8566e 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -5309,6 +5309,19 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD +======= +"aML" = ( +/obj/machinery/camera/directional/north{ + network = list("ss13","rd"); + c_tag = "Science - Monkey Pit" + }, +/obj/machinery/light/warm/directional/north, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aMM" = ( /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/scrubber, @@ -6777,6 +6790,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD +======= +"bpn" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bpu" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -7160,6 +7180,14 @@ }, /turf/open/space/openspace, /area/station/solars/starboard/fore) +<<<<<<< HEAD +======= +"bwU" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bxd" = ( /obj/structure/table, /obj/item/radio/intercom/directional/east{ @@ -8195,6 +8223,18 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood, /area/station/command/meeting_room) +<<<<<<< HEAD +======= +"bNG" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/vending/modularpc, +/obj/structure/table, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bNI" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -8584,6 +8624,14 @@ "bVW" = ( /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +<<<<<<< HEAD +======= +"bWb" = ( +/obj/machinery/suit_storage_unit/hos, +/obj/machinery/keycard_auth/wall_mounted/directional/east, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bWi" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -8716,6 +8764,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) +<<<<<<< HEAD +======= +"bXv" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/button/door/directional/east{ + name = "Privacy Shutters Toggle"; + pixel_y = -11; + id = "greedygrinnersden" + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bXG" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/door/airlock/external{ @@ -9697,6 +9762,21 @@ }, /turf/open/floor/wood, /area/station/service/library) +<<<<<<< HEAD +======= +"coV" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/screwdriver{ + pixel_x = 2; + pixel_y = 11 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cpl" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -10019,10 +10099,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningdock) +<<<<<<< HEAD "cuj" = ( /obj/structure/flora/bush/sunny/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cuM" = ( /obj/structure/table, /obj/item/radio/intercom/prison/directional/north, @@ -10138,6 +10221,16 @@ "cwG" = ( /turf/open/floor/iron, /area/station/cargo/office) +<<<<<<< HEAD +======= +"cwU" = ( +/obj/machinery/door/window/right/directional/north{ + name = "The Monkey Pit"; + req_access = list("science") + }, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cxc" = ( /obj/structure/chair, /turf/open/floor/iron/checker, @@ -12876,6 +12969,23 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +<<<<<<< HEAD +======= +"dsw" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 8 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/north, +/obj/machinery/button/door/directional/north{ + name = "CMO Privacy Shutters"; + pixel_y = 38; + id = "cmoshutter"; + req_access = list("cmo") + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dsF" = ( /turf/open/floor/iron/smooth, /area/station/command/gateway) @@ -13958,6 +14068,7 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +<<<<<<< HEAD "dNy" = ( /obj/machinery/computer/communications{ dir = 8 @@ -13969,6 +14080,8 @@ /obj/item/radio/intercom/command/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dNB" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -16353,6 +16466,18 @@ }, /turf/open/openspace, /area/station/asteroid) +<<<<<<< HEAD +======= +"eHj" = ( +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/structure/sign/clock/directional/east, +/obj/effect/landmark/event_spawn, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/smooth, +/area/station/commons/storage/primary) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eHr" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -18777,6 +18902,13 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +<<<<<<< HEAD +======= +"fEM" = ( +/obj/machinery/light/warm/directional/south, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fEQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -18904,6 +19036,14 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"fGK" = ( +/mob/living/carbon/human/species/monkey, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fHg" = ( /obj/structure/chair{ name = "Prosecution"; @@ -19837,6 +19977,7 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) +<<<<<<< HEAD "fYF" = ( /obj/machinery/door/window/left/directional/north{ name = "The Monkey Pit"; @@ -19844,6 +19985,8 @@ }, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fYW" = ( /obj/structure/grille, /obj/structure/lattice, @@ -20463,6 +20606,16 @@ "gkD" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +<<<<<<< HEAD +======= +"gkF" = ( +/obj/machinery/door/window/left/directional/north{ + name = "The Monkey Pit"; + req_access = list("science") + }, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gkQ" = ( /obj/machinery/computer/atmos_control/mix_tank{ dir = 8 @@ -22063,6 +22216,7 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) +<<<<<<< HEAD "gOr" = ( /obj/machinery/door/window/right/directional/north{ name = "The Monkey Pit"; @@ -22070,6 +22224,8 @@ }, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gOA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -22494,6 +22650,13 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +<<<<<<< HEAD +======= +"gXo" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gXA" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -22980,12 +23143,15 @@ /obj/machinery/coffeemaker, /turf/open/floor/iron, /area/station/security/brig) +<<<<<<< HEAD "hhP" = ( /obj/structure/flora/bush/jungle/c/style_random, /turf/open/misc/dirt/jungle{ baseturfs = /turf/open/misc/dirt/station }, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hic" = ( /obj/structure/railing{ dir = 4 @@ -23253,10 +23419,13 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD "hlu" = ( /obj/structure/flora/bush/jungle/c/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hlB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -23382,10 +23551,13 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD "hoj" = ( /obj/structure/flora/tree/palm/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hou" = ( /obj/machinery/duct, /obj/structure/cable, @@ -25112,6 +25284,28 @@ /obj/machinery/light/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"hZq" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/door/airlock/security/glass{ + name = "Brig"; + id_tag = "outerbrigleft" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig_left" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hZr" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos) @@ -25355,12 +25549,15 @@ /obj/machinery/light/directional/east, /turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/right) +<<<<<<< HEAD "idP" = ( /mob/living/carbon/human/species/monkey, /turf/open/misc/dirt/jungle{ baseturfs = /turf/open/misc/dirt/station }, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "idW" = ( /obj/structure/railing/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -25924,11 +26121,14 @@ /obj/effect/turf_decal/sand/plating, /turf/open/misc/asteroid/airless, /area/station/asteroid) +<<<<<<< HEAD "ipa" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/jungle/c/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ipe" = ( /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 @@ -25944,11 +26144,14 @@ /obj/effect/turf_decal/tile/brown/fourcorners, /turf/open/floor/iron, /area/station/cargo/sorting) +<<<<<<< HEAD "ipu" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ipC" = ( /obj/effect/turf_decal/stripes/white/line, /obj/machinery/transport/crossing_signal/northwest, @@ -27539,12 +27742,15 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +<<<<<<< HEAD "iTW" = ( /obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/dirt/jungle{ baseturfs = /turf/open/misc/dirt/station }, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iUf" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue" @@ -31843,11 +32049,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD "knU" = ( /turf/open/misc/dirt/jungle{ baseturfs = /turf/open/misc/dirt/station }, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "koo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, @@ -32223,6 +32432,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +<<<<<<< HEAD "ktX" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -32242,6 +32452,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kul" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/south, @@ -32310,6 +32522,7 @@ "kvt" = ( /turf/closed/wall, /area/station/science/genetics) +<<<<<<< HEAD "kvD" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/table, @@ -32322,6 +32535,8 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/commons/storage/primary) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kvO" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33000,11 +33215,14 @@ "kHB" = ( /turf/open/floor/grass, /area/station/medical/virology) +<<<<<<< HEAD "kHQ" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kHR" = ( /mob/living/basic/parrot/poly, /obj/structure/filingcabinet/chestdrawer, @@ -33407,9 +33625,12 @@ "kNT" = ( /turf/open/floor/glass/reinforced/tram, /area/station/hallway/primary/tram/center) +<<<<<<< HEAD "kOc" = ( /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kOf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -33547,6 +33768,17 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD +======= +"kQR" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/item/food/grown/banana/bunch{ + pixel_x = 5; + pixel_y = 16 + }, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kQX" = ( /obj/machinery/computer/security{ dir = 1 @@ -33593,6 +33825,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/bar/backroom) +<<<<<<< HEAD +======= +"kRR" = ( +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kRW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -35592,6 +35830,28 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD +======= +"lAx" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig"; + id_tag = "outerbrigright" + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig_right" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lAA" = ( /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/iron, @@ -36158,6 +36418,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/courtroom) +<<<<<<< HEAD "lJV" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -36172,6 +36433,8 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lKc" = ( /obj/structure/table/wood, /obj/machinery/light/small/dim/directional/west, @@ -37618,6 +37881,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "mhD" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 @@ -37627,6 +37891,8 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/smooth, /area/station/commons/storage/primary) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mhE" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/door/airlock/external{ @@ -37874,6 +38140,13 @@ }, /turf/open/floor/glass, /area/station/command/meeting_room) +<<<<<<< HEAD +======= +"mmy" = ( +/obj/structure/flora/bush/jungle/c/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mmH" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -38294,6 +38567,7 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD "mwa" = ( /obj/structure/table/reinforced, /obj/machinery/keycard_auth/wall_mounted/directional/south, @@ -38306,6 +38580,8 @@ /obj/item/paper/monitorkey, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mwd" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -40556,11 +40832,14 @@ /obj/machinery/barsign/directional/south, /turf/open/floor/iron/checker, /area/station/commons/lounge) +<<<<<<< HEAD "nmj" = ( /mob/living/carbon/human/species/monkey, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nmk" = ( /obj/structure/toilet{ pixel_y = 8 @@ -41333,6 +41612,15 @@ /obj/structure/cable/layer1, /turf/open/floor/plating/airless, /area/station/solars/port) +<<<<<<< HEAD +======= +"nzO" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nzR" = ( /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) @@ -41993,6 +42281,13 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"nNh" = ( +/obj/structure/flora/bush/sunny/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nNi" = ( /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/directional/north{ @@ -42218,6 +42513,14 @@ }, /turf/open/floor/tram, /area/station/hallway/primary/tram/right) +<<<<<<< HEAD +======= +"nRd" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nRw" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -42995,6 +43298,56 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) +<<<<<<< HEAD +======= +"ofA" = ( +/obj/structure/chair/office, +/obj/machinery/button/door/directional/south{ + name = "Privacy Shutters Control"; + pixel_x = 24; + pixel_y = -1; + id = "hop"; + req_access = list("kitchen") + }, +/obj/machinery/button/door/directional/south{ + name = "Arrival Checkpoint Enforcement Procedure"; + pixel_x = 35; + pixel_y = -10; + id = "papersplease"; + req_access = list("kitchen") + }, +/obj/machinery/button/ticket_machine{ + pixel_x = 24; + pixel_y = -10 + }, +/obj/machinery/button/door/directional/south{ + name = "Queue Shutters Entry Control"; + pixel_x = 24; + pixel_y = 8; + id = "hopqueuestart"; + req_access = list("kitchen") + }, +/obj/machinery/keycard_auth/wall_mounted/directional/south{ + pixel_x = 26 + }, +/obj/machinery/button/door/directional/south{ + name = "Queue Shutters Upper Exit Control"; + pixel_x = 35; + pixel_y = 8; + id = "hopqueueend"; + req_access = list("kitchen") + }, +/obj/machinery/button/door/directional/south{ + name = "Queue Shutters Lower Exit Control"; + pixel_x = 35; + pixel_y = -1; + id = "hopqueueendbottom"; + req_access = list("kitchen") + }, +/obj/effect/landmark/start/head_of_personnel, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ofT" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -43015,6 +43368,7 @@ }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +<<<<<<< HEAD "ogb" = ( /obj/machinery/modular_computer/preset/id{ dir = 8 @@ -43033,6 +43387,8 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ogt" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs{ @@ -43367,10 +43723,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +<<<<<<< HEAD "omj" = ( /obj/machinery/light/warm/directional/south, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "omm" = ( /turf/closed/wall, /area/station/maintenance/department/security) @@ -44421,8 +44780,13 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter) "oMh" = ( +<<<<<<< HEAD /obj/structure/secure_safe/directional/east, /obj/machinery/airalarm/directional/north, +======= +/obj/machinery/airalarm/directional/north, +/obj/structure/detectiveboard/directional/east, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/carpet, /area/station/security/detectives_office) "oMz" = ( @@ -44667,6 +45031,13 @@ /obj/machinery/light/dim/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +<<<<<<< HEAD +======= +"oQU" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oQW" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -45463,6 +45834,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/cargo/drone_bay) +<<<<<<< HEAD "pge" = ( /obj/structure/chair/office, /obj/machinery/button/door/directional/south{ @@ -45510,6 +45882,8 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pgm" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -46638,12 +47012,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +<<<<<<< HEAD "pyI" = ( /obj/machinery/smartfridge/drying, /turf/open/floor/iron/white/side{ dir = 8 }, /area/station/service/kitchen) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pyQ" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -47379,6 +47756,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel) +<<<<<<< HEAD "pLg" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -47402,6 +47780,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pLs" = ( /obj/structure/transport/linear/tram, /obj/structure/tram/split, @@ -47811,6 +48191,15 @@ "pSV" = ( /turf/closed/wall, /area/station/security/checkpoint/escape) +<<<<<<< HEAD +======= +"pTj" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pTl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -47970,6 +48359,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, +<<<<<<< HEAD +======= +/obj/machinery/vending/cytopro, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/white, /area/station/science/xenobiology) "pWC" = ( @@ -48381,6 +48774,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD "qdq" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/item/food/grown/banana/bunch{ @@ -48389,6 +48783,8 @@ }, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qdy" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -50274,6 +50670,21 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/server) +<<<<<<< HEAD +======= +"qKW" = ( +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth/wall_mounted/directional/south, +/obj/item/rcl/pre_loaded, +/obj/machinery/computer/security/telescreen/ce/directional/west, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/item/clipboard, +/obj/item/paper/monitorkey, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qLD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50553,10 +50964,13 @@ /obj/item/paper_bin, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD "qQi" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qQq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -52245,11 +52659,14 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD "rus" = ( /obj/machinery/suit_storage_unit/hos, /obj/machinery/keycard_auth/wall_mounted/directional/east, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ruy" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -53601,6 +54018,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/science/xenobiology) +<<<<<<< HEAD "rUd" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig"; @@ -53620,6 +54038,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rUe" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -53648,6 +54068,7 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/science/explab) +<<<<<<< HEAD "rUE" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/effect/landmark/event_spawn, @@ -53655,6 +54076,8 @@ baseturfs = /turf/open/misc/dirt/station }, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rUQ" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, @@ -54238,6 +54661,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "sgP" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -54247,6 +54671,8 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/commons/storage/primary) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sgT" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -55695,6 +56121,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/cargo/miningdock) +<<<<<<< HEAD +======= +"sGF" = ( +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sGG" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -55921,6 +56355,15 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD +======= +"sKD" = ( +/obj/machinery/smartfridge/drying, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/service/kitchen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sKN" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -56262,6 +56705,7 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +<<<<<<< HEAD "sQD" = ( /obj/machinery/camera/directional/north{ network = list("ss13","rd"); @@ -56272,6 +56716,8 @@ baseturfs = /turf/open/misc/dirt/station }, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sQJ" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -56613,6 +57059,20 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD +======= +"sWY" = ( +/obj/machinery/computer/communications{ + dir = 8 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/north{ + pixel_x = 26 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/item/radio/intercom/command/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sXa" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -56817,6 +57277,32 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) +<<<<<<< HEAD +======= +"taL" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/door/airlock/security/glass{ + name = "Brig"; + id_tag = "outerbrigright" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig_right" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/sec, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "taP" = ( /obj/structure/lattice, /turf/open/openspace, @@ -56974,6 +57460,15 @@ }, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) +<<<<<<< HEAD +======= +"tdY" = ( +/obj/structure/flora/bush/jungle/c/style_random, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tdZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -59849,6 +60344,10 @@ pixel_x = -23; pixel_y = 8 }, +<<<<<<< HEAD +======= +/obj/structure/secure_safe/directional/south, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/grimy, /area/station/security/detectives_office) "udZ" = ( @@ -62549,6 +63048,14 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"uVa" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/jungle/c/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uVb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -63019,12 +63526,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +<<<<<<< HEAD "vcV" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/tree/palm/style_random, /obj/structure/flora/coconuts, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vde" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64505,6 +65015,13 @@ "vCS" = ( /turf/closed/mineral/random/stationside/asteroid/porus, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"vCY" = ( +/obj/structure/flora/tree/palm/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vCZ" = ( /turf/closed/wall, /area/station/service/chapel/monastery) @@ -64539,6 +65056,16 @@ /obj/machinery/light/small/dim/directional/south, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) +<<<<<<< HEAD +======= +"vDg" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/effect/landmark/event_spawn, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vDu" = ( /obj/machinery/computer/robotics{ dir = 1 @@ -64584,6 +65111,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) +<<<<<<< HEAD +======= +"vEl" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vEq" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8 @@ -64813,6 +65347,29 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"vHT" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig"; + id_tag = "outerbrigleft" + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig_left" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/structure/disposalpipe/segment, +/obj/machinery/scanner_gate/preset_guns, +/turf/open/floor/iron, +/area/station/security/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vIa" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -66144,6 +66701,7 @@ /obj/effect/turf_decal/trimline/white/warning, /turf/open/floor/iron, /area/station/maintenance/tram/right) +<<<<<<< HEAD "wiI" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig"; @@ -66164,6 +66722,8 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron, /area/station/security/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wiU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66690,6 +67250,15 @@ }, /turf/open/floor/iron, /area/station/security/processing) +<<<<<<< HEAD +======= +"wtR" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/tree/palm/style_random, +/obj/structure/flora/coconuts, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wtS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -67900,10 +68469,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +<<<<<<< HEAD "wQf" = ( /obj/structure/flora/bush/jungle/b/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wQm" = ( /turf/open/floor/iron, /area/station/engineering/atmos) @@ -67995,6 +68567,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/carpet, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"wSp" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wSx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -68650,10 +69229,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +<<<<<<< HEAD "xgT" = ( /obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xgZ" = ( /obj/structure/table/reinforced, /obj/machinery/light/cold/directional/west, @@ -68681,10 +69263,13 @@ "xhX" = ( /turf/open/misc/asteroid, /area/station/maintenance/starboard/lesser) +<<<<<<< HEAD "xic" = ( /mob/living/carbon/human/species/monkey, /turf/open/misc/grass/jungle/station, /area/station/science/explab) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xir" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -103117,7 +103702,11 @@ kHR tga rnf xBD +<<<<<<< HEAD mwa +======= +qKW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sHH sHH sHH @@ -106133,7 +106722,11 @@ aaa aaa aaa sNs +<<<<<<< HEAD sgP +======= +bNG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eJZ bNm ruo @@ -106141,7 +106734,11 @@ pCM kzx oSl ive +<<<<<<< HEAD kvD +======= +coV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alg aes khE @@ -106908,7 +107505,11 @@ sNs sNs eaZ pFw +<<<<<<< HEAD mhD +======= +eHj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wXB gms sNs @@ -119805,12 +120406,21 @@ aaa aaa sQZ mtI +<<<<<<< HEAD nmj kHQ qQi vcV ipa ogn +======= +fGK +bwU +vEl +wtR +uVa +oQU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ojU gzw gzw @@ -120061,6 +120671,7 @@ aaa aaa aaa sQZ +<<<<<<< HEAD wQf cuj xgT @@ -120070,6 +120681,17 @@ knU fYF kOc cuj +======= +wSp +nNh +gXo +sGF +gXo +sGF +gkF +kRR +nNh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gzw gGi xBC @@ -120318,6 +120940,7 @@ aaa aaa aaa sQZ +<<<<<<< HEAD kOc hoj qdq @@ -120327,6 +120950,17 @@ wQf gOr kOc xgT +======= +kRR +vCY +kQR +bpn +kRR +wSp +cwU +kRR +gXo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gzw dNH lrt @@ -120576,12 +121210,21 @@ aaa oyR sQZ sQZ +<<<<<<< HEAD sQD kOc hlu cuj hoj ipu +======= +aML +kRR +mmy +nNh +vCY +nRd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ojU gzw gzw @@ -120832,12 +121475,21 @@ aaa aaa oyR vUz +<<<<<<< HEAD hhP iTW kOc rUE pQx omj +======= +tdY +pTj +kRR +vDg +pQx +fEM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sQZ sQZ gzw @@ -121090,9 +121742,15 @@ aaa oyR pQx vUz +<<<<<<< HEAD idP iTW iTW +======= +nzO +pTj +pTj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hgN mRD asu @@ -152940,7 +153598,11 @@ vBn tRV sik iOm +<<<<<<< HEAD pge +======= +ofA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lcS vhG jSd @@ -153432,7 +154094,11 @@ jGL jed oIz gnW +<<<<<<< HEAD wiI +======= +vHT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mcD pDy tWn @@ -153946,7 +154612,11 @@ iUE rxE jyR lMR +<<<<<<< HEAD ktX +======= +hZq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pqd kdV acr @@ -157030,7 +157700,11 @@ fph sHw kil axp +<<<<<<< HEAD rUd +======= +lAx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 njR joB lTV @@ -157544,7 +158218,11 @@ aBN sDO jFh msW +<<<<<<< HEAD pLg +======= +taL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nSV aPk sGG @@ -158033,7 +158711,11 @@ aaa aaa rmB pxf +<<<<<<< HEAD rus +======= +bWb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 toY wpM auP @@ -159352,7 +160034,11 @@ ltw tKH tgh ltw +<<<<<<< HEAD dNy +======= +sWY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hhJ wKk phl @@ -166851,7 +167537,11 @@ lBQ apC kZC mBq +<<<<<<< HEAD ogb +======= +dsw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aOJ aPm wWa @@ -170395,7 +171085,11 @@ eSx llj whs fEG +<<<<<<< HEAD pyI +======= +sKD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mkl fxS eSx @@ -181455,7 +182149,11 @@ ufh tEF qza aIU +<<<<<<< HEAD lJV +======= +bXv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kOl jAU psU diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index afb613a9e91..760880ab79e 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -130,6 +130,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD "abH" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -149,6 +150,8 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "abK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -359,6 +362,18 @@ }, /turf/open/floor/iron/white, /area/station/security/checkpoint/medical) +<<<<<<< HEAD +======= +"aeJ" = ( +/obj/structure/table/reinforced, +/obj/item/phone, +/obj/structure/cable, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afe" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -615,6 +630,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) +<<<<<<< HEAD "ajy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -626,6 +642,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ajK" = ( /obj/machinery/door/firedoor, /obj/effect/landmark/navigate_destination/bar, @@ -892,6 +910,19 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"anX" = ( +/mob/living/basic/parrot/poly, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/item/paper/monitorkey, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "anZ" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/siding/wood{ @@ -1250,6 +1281,42 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) +<<<<<<< HEAD +======= +"ava" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/button/door{ + normaldoorcontrol = 1; + specialfunctions = 4; + id = "secentrylock2"; + req_access = list("security"); + name = "Security Exit Lock"; + pixel_x = -7 + }, +/obj/machinery/button/door{ + normaldoorcontrol = 1; + specialfunctions = 4; + id = "secentrylock"; + pixel_y = 7; + req_access = list("security"); + name = "Security Entrance Lock"; + pixel_x = -7 + }, +/obj/machinery/button/flasher{ + pixel_x = 2; + id = "secentry" + }, +/obj/machinery/button/door{ + pixel_x = 2; + pixel_y = 7; + name = "Security Entrance Doors"; + id = "secentrylock"; + normaldoorcontrol = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/entrance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "avu" = ( /obj/effect/turf_decal/siding/white/corner{ dir = 8 @@ -1445,6 +1512,7 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "axP" = ( /obj/structure/sign/warning/vacuum/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -1454,6 +1522,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "axQ" = ( /obj/effect/turf_decal/stripes, /obj/machinery/atmospherics/components/binary/valve/digital/on{ @@ -1467,6 +1537,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/science) +<<<<<<< HEAD "ayb" = ( /obj/effect/turf_decal/stripes, /obj/effect/turf_decal/stripes{ @@ -1475,6 +1546,8 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ayf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron, @@ -1657,6 +1730,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD "aAK" = ( /obj/effect/landmark/start/cyborg, /obj/structure/window/reinforced/spawner/directional/east, @@ -1664,6 +1738,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/recharge_floor, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aBb" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -2032,6 +2108,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "aHq" = ( /obj/machinery/modular_computer/preset/id{ dir = 1 @@ -2050,6 +2127,8 @@ /obj/effect/mapping_helpers/requests_console/announcement, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aHs" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/spawner/random/vending/snackvend, @@ -2258,6 +2337,25 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +<<<<<<< HEAD +======= +"aKJ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/directions/engineering/directional/east{ + pixel_y = -8 + }, +/obj/structure/sign/directions/security/directional/east{ + pixel_y = 8; + dir = 1 + }, +/obj/structure/sign/directions/supply/directional/east{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aKP" = ( /obj/structure/cable, /turf/open/floor/iron/half, @@ -2750,6 +2848,7 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/textured, /area/station/science/lobby) +<<<<<<< HEAD "aTW" = ( /obj/machinery/fax{ fax_name = "Chief Engineer's Office"; @@ -2763,6 +2862,8 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aUf" = ( /turf/closed/wall/r_wall/rust, /area/station/medical/chemistry/minisat) @@ -2771,11 +2872,14 @@ /obj/effect/spawner/random/decoration/paint, /turf/open/floor/wood/parquet, /area/station/cargo/boutique) +<<<<<<< HEAD "aUm" = ( /obj/effect/spawner/random/maintenance, /obj/structure/closet, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aUo" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -3020,6 +3124,7 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +<<<<<<< HEAD "bao" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -3031,6 +3136,8 @@ }, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bay" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -3081,6 +3188,29 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/engine, /area/station/science/auxlab/firing_range) +<<<<<<< HEAD +======= +"bbf" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "hopdesk" + }, +/obj/effect/landmark/navigate_destination/hop, +/obj/machinery/door/firedoor, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/window/brigdoor/left/directional/west{ + req_access = list("hop") + }, +/obj/machinery/door/window/left/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bbh" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/disposal/bin, @@ -3215,11 +3345,14 @@ /obj/effect/spawner/random/techstorage/rnd_secure_all, /turf/open/floor/circuit, /area/station/engineering/storage/tech) +<<<<<<< HEAD "bdY" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bef" = ( /obj/structure/railing/corner{ dir = 8 @@ -3278,6 +3411,22 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +<<<<<<< HEAD +======= +"beS" = ( +/obj/machinery/button/elevator/directional/east{ + id = "cargo" + }, +/obj/machinery/lift_indicator/directional/east{ + linked_elevator_id = "cargo" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/rnd/production/techfab/department/cargo, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "beW" = ( /turf/open/floor/engine/o2, /area/station/engineering/atmos) @@ -3461,6 +3610,16 @@ /obj/machinery/telecomms/broadcaster/preset_left, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +<<<<<<< HEAD +======= +"biG" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "biS" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/ai_upload) @@ -5116,6 +5275,7 @@ }, /turf/open/floor/plating, /area/station/medical/pharmacy) +<<<<<<< HEAD "bPo" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -5125,6 +5285,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +======= +"bPc" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bPu" = ( /obj/effect/decal/cleanable/rubble, /obj/effect/turf_decal/stripes/line{ @@ -5178,6 +5346,16 @@ /obj/item/cigbutt/cigarbutt, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD +======= +"bQc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/stairs/left{ + dir = 1 + }, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bQf" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -5444,6 +5622,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +<<<<<<< HEAD +======= +"bVA" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/directions/evac/directional/east{ + dir = 8 + }, +/obj/structure/sign/directions/science/directional/east{ + pixel_y = -8; + dir = 1 + }, +/obj/structure/sign/directions/medical/directional/east{ + pixel_y = 8; + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bVY" = ( /obj/machinery/holopad{ pixel_x = 1 @@ -5832,6 +6030,24 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/science/cytology) +<<<<<<< HEAD +======= +"cdo" = ( +/obj/machinery/elevator_control_panel/directional/south{ + linked_elevator_id = "aisat"; + pixel_x = 8; + pixel_y = -34 + }, +/obj/machinery/lift_indicator/directional/south{ + pixel_x = -6; + pixel_y = -40; + linked_elevator_id = "aisat" + }, +/obj/machinery/light/small/dim/directional/north, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cdI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6103,6 +6319,7 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/station/security) +<<<<<<< HEAD "ciC" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; @@ -6114,6 +6331,8 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/uppernorth) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ciE" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/cable, @@ -6160,6 +6379,7 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/central/greater) +<<<<<<< HEAD "cjG" = ( /obj/machinery/atmospherics/components/tank/air/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -6167,6 +6387,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cjV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/delivery, @@ -6322,6 +6544,7 @@ /obj/effect/mapping_helpers/requests_console/ore_update, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +<<<<<<< HEAD "cnA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /obj/structure/cable, @@ -6330,6 +6553,8 @@ /obj/structure/cable/layer1, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cnS" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 8 @@ -6372,12 +6597,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/engine, /area/station/medical/chemistry) +<<<<<<< HEAD "coD" = ( /obj/structure/chair/stool/directional/east{ name = "Quartermaster" }, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "coQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -6411,12 +6639,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) +<<<<<<< HEAD "cpR" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset/civilian, /obj/structure/cable, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cpZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -6485,6 +6716,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +<<<<<<< HEAD "crm" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; @@ -6501,6 +6733,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cro" = ( /obj/structure/girder/reinforced, /obj/structure/grille, @@ -6762,6 +6996,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison/mess) +<<<<<<< HEAD "cwi" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -6770,6 +7005,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/holofloor/dark, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cwk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6986,6 +7223,21 @@ }, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +<<<<<<< HEAD +======= +"cAG" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","rd") + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cAQ" = ( /obj/vehicle/sealed/mecha/ripley/cargo, /obj/effect/decal/cleanable/dirt, @@ -7339,6 +7591,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"cIa" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cIh" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -7378,6 +7638,7 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/textured, /area/station/security/processing) +<<<<<<< HEAD "cJb" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -7397,6 +7658,8 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cJh" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -7471,12 +7734,15 @@ /mob/living/basic/mining/basilisk, /turf/open/misc/asteroid/airless, /area/space/nearstation) +<<<<<<< HEAD "cKS" = ( /obj/structure/table, /obj/item/ai_module/core/full/dungeon_master, /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cLd" = ( /obj/machinery/oven/range, /obj/machinery/light/directional/north, @@ -7607,6 +7873,28 @@ dir = 4 }, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"cNk" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door_buttons/airlock_controller{ + idExterior = "virology_airlock_exterior"; + idInterior = "virology_airlock_interior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Console"; + pixel_x = -26; + pixel_y = 28; + req_access = list("virology") + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cNr" = ( /obj/structure/sink/directional/south, /obj/structure/mirror/directional/north{ @@ -7636,6 +7924,7 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD "cNW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -7652,6 +7941,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cNX" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/wood{ @@ -7907,6 +8198,15 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD +======= +"cSa" = ( +/obj/machinery/power/smes/full, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cSb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7933,6 +8233,16 @@ }, /turf/open/floor/wood, /area/station/service/theater) +<<<<<<< HEAD +======= +"cSC" = ( +/obj/machinery/pdapainter/engineering, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cSJ" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/snack, @@ -7951,10 +8261,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +<<<<<<< HEAD +======= +"cTc" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "hopdesk" + }, +/obj/machinery/door/firedoor, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cTm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "cTu" = ( /obj/machinery/button/elevator/directional/east{ id = "cargo" @@ -7968,6 +8294,8 @@ /obj/machinery/rnd/production/techfab/department/cargo, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cTH" = ( /obj/structure/table/wood, /obj/item/storage/box/evidence, @@ -8017,6 +8345,16 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"cUD" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/sign/warning/engine_safety/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cUN" = ( /obj/machinery/computer/libraryconsole/bookmanagement{ dir = 1 @@ -8056,6 +8394,18 @@ /obj/effect/spawner/random/structure/chair_flipped, /turf/open/floor/iron, /area/station/maintenance/department/cargo) +<<<<<<< HEAD +======= +"cVn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cVs" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Xenobiology Maintenance" @@ -8140,6 +8490,7 @@ dir = 1 }, /area/station/science/xenobiology) +<<<<<<< HEAD "cWW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8148,6 +8499,8 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cWX" = ( /obj/effect/turf_decal/arrows, /obj/machinery/firealarm/directional/west, @@ -8204,6 +8557,20 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) +<<<<<<< HEAD +======= +"cXy" = ( +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cXL" = ( /obj/machinery/duct, /obj/structure/cable, @@ -8235,6 +8602,17 @@ /obj/machinery/light/directional/south, /turf/open/openspace, /area/station/engineering/main) +<<<<<<< HEAD +======= +"cYB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cYC" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -8316,6 +8694,16 @@ /obj/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/station/maintenance/department/engine) +<<<<<<< HEAD +======= +"daz" = ( +/obj/structure/table, +/obj/item/ai_module/core/full/paladin_devotion, +/obj/structure/cable, +/obj/machinery/flasher/directional/south, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "daK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8655,6 +9043,7 @@ }, /turf/open/floor/plating, /area/station/medical/storage) +<<<<<<< HEAD "dgP" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -8663,6 +9052,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/uppernorth) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dgS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8823,6 +9214,10 @@ "diI" = ( /obj/machinery/light/small/directional/north, /obj/machinery/computer/security, +<<<<<<< HEAD +======= +/obj/structure/detectiveboard/directional/north, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/carpet, /area/station/security/detectives_office) "diM" = ( @@ -8894,6 +9289,47 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD +======= +"dkq" = ( +/obj/structure/table/reinforced/rglass, +/obj/machinery/button/door{ + normaldoorcontrol = 1; + specialfunctions = 4; + id = "secentrylock2"; + req_access = list("security"); + name = "Security Exit Lock"; + pixel_x = -4; + pixel_y = -1 + }, +/obj/machinery/button/door{ + normaldoorcontrol = 1; + specialfunctions = 4; + id = "secentrylock"; + pixel_y = 6; + req_access = list("security"); + name = "Security Entrance Lock"; + pixel_x = -4 + }, +/obj/machinery/button/flasher{ + pixel_x = 5; + id = "secentry"; + pixel_y = -1; + name = "entrance flasher button" + }, +/obj/machinery/button/door{ + pixel_x = 5; + pixel_y = 6; + name = "Security Entrance Doors"; + id = "secentrylock"; + normaldoorcontrol = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/textured, +/area/station/security/warden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dkr" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/light/directional/north, @@ -9291,6 +9727,21 @@ "drj" = ( /turf/closed/wall/rock, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"drl" = ( +/obj/structure/chair/sofa/corp/right{ + desc = "Looks like someone threw it out. Covered in donut crumbs."; + name = "couch"; + dir = 1 + }, +/obj/structure/sign/poster/contraband/blood_geometer/directional/east, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/half, +/area/station/security/breakroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dro" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -9461,6 +9912,14 @@ /obj/structure/cable, /turf/open/misc/asteroid, /area/station/asteroid) +<<<<<<< HEAD +======= +"dtY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dum" = ( /obj/structure/table/wood, /obj/item/clothing/head/helmet/toggleable/justice/escape{ @@ -9508,6 +9967,23 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/station/asteroid) +<<<<<<< HEAD +======= +"dvz" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/directions/medical/directional/east{ + pixel_y = 8; + dir = 8 + }, +/obj/structure/sign/directions/evac/directional/east{ + pixel_y = -8 + }, +/obj/structure/sign/directions/engineering/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dvC" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/grille, @@ -9522,6 +9998,7 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "dwt" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -9531,6 +10008,8 @@ /obj/structure/cable/layer1, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dwv" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/dark_blue{ @@ -9628,6 +10107,32 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD +======= +"dyS" = ( +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{ + name = "Burn Chamber Interior Airlock"; + id_tag = "ordmix_airlock_interior" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/airlock_controller/incinerator_ordmix{ + pixel_y = -26 + }, +/obj/machinery/button/ignition/incinerator/ordmix{ + pixel_x = -6; + pixel_y = 24 + }, +/obj/machinery/button/door/incinerator_vent_ordmix{ + pixel_x = 8; + pixel_y = 24 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/burnchamber) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dyV" = ( /obj/structure/railing{ dir = 1 @@ -10133,6 +10638,13 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/engineering/main) +<<<<<<< HEAD +======= +"dFM" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/maintenance/department/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dFY" = ( /obj/machinery/duct, /turf/open/floor/plating, @@ -10420,6 +10932,7 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/xenobio, /area/station/science/xenobiology) +<<<<<<< HEAD "dJY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -10437,6 +10950,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dKp" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10463,6 +10978,7 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/textured, /area/station/engineering/atmos/upper) +<<<<<<< HEAD "dKM" = ( /obj/structure/sign/poster/official/cleanliness/directional/north, /obj/effect/turf_decal/bot, @@ -10482,6 +10998,8 @@ /obj/machinery/light/small/dim/directional/west, /turf/open/floor/iron/dark, /area/station/service/cafeteria) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dLf" = ( /obj/machinery/camera/directional/west{ c_tag = "Atmospherics Tank - Plasma" @@ -10492,12 +11010,15 @@ /obj/machinery/telecomms/server/presets/common, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +<<<<<<< HEAD "dLp" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table/reinforced, /obj/item/circuitboard/machine/cyborgrecharger, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dLx" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -10692,6 +11213,23 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +<<<<<<< HEAD +======= +"dPk" = ( +/obj/machinery/button/elevator/directional/east{ + id = "cargo" + }, +/obj/machinery/lift_indicator/directional/east{ + linked_elevator_id = "cargo" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + 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/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dPq" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/floor/grass, @@ -10750,6 +11288,7 @@ /obj/machinery/door/firedoor, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "dQa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes{ @@ -10758,6 +11297,8 @@ /obj/machinery/light/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dQr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark/textured, @@ -10836,11 +11377,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "dRF" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dRM" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -11304,6 +11848,7 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/robotics/lab) +<<<<<<< HEAD "dZr" = ( /obj/machinery/vending/wardrobe/viro_wardrobe, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -11311,6 +11856,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dZy" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/storage/satellite) @@ -11362,6 +11909,20 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"eaW" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; + name = "AI Antechamber turret control"; + pixel_y = -27 + }, +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/uppernorth) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eaX" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -11597,12 +12158,15 @@ /obj/item/storage/dice, /turf/open/floor/wood, /area/station/commons/lounge) +<<<<<<< HEAD "efj" = ( /obj/machinery/power/smes/full, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "efm" = ( /obj/machinery/conveyor{ dir = 4; @@ -11679,6 +12243,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +<<<<<<< HEAD +======= +"egN" = ( +/obj/structure/table, +/obj/effect/spawner/random/engineering/flashlight, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/command/gateway) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "egV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -12088,6 +12661,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +<<<<<<< HEAD +======= +"eoO" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eoQ" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Air to Distro Staging"; @@ -12427,6 +13011,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +<<<<<<< HEAD "euC" = ( /obj/machinery/pdapainter/medbay, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -12434,6 +13019,8 @@ }, /turf/open/floor/holofloor/dark, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "euF" = ( /obj/structure/closet/wardrobe/white, /obj/effect/landmark/start/hangover/closet, @@ -12460,6 +13047,24 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) +<<<<<<< HEAD +======= +"evg" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 6 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/east, +/obj/machinery/button/door/directional/east{ + pixel_y = 12; + name = "privacy shutter control"; + id = "cmoprivacy" + }, +/turf/open/floor/holofloor/dark, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "evr" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -12475,6 +13080,15 @@ }, /turf/open/floor/circuit/telecomms/server, /area/station/science/server) +<<<<<<< HEAD +======= +"evO" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "evQ" = ( /turf/open/openspace, /area/station/medical/medbay/central) @@ -12485,6 +13099,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"ewa" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/table, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_y = 6 + }, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_y = 3 + }, +/obj/item/stock_parts/power_store/cell/emproof, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ewr" = ( /obj/effect/spawner/random/trash/botanical_waste, /obj/effect/mapping_helpers/burnt_floor, @@ -13131,6 +13760,28 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD +======= +"eGz" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/directions/security/directional/north{ + pixel_y = 40 + }, +/obj/structure/sign/directions/medical/directional/north{ + dir = 2 + }, +/obj/structure/sign/directions/evac/directional/north{ + pixel_y = 24; + dir = 2 + }, +/turf/open/floor/wood, +/area/station/service/cafeteria) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eGJ" = ( /obj/effect/turf_decal/siding/green, /obj/structure/cable, @@ -13148,6 +13799,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"eHa" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eHc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -13300,6 +13961,13 @@ /obj/effect/turf_decal/tile/red/diagonal_edge, /turf/open/floor/iron/dark, /area/station/security/warden) +<<<<<<< HEAD +======= +"eLk" = ( +/obj/effect/spawner/random/trash/hobo_squat, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/engine) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eLm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13332,6 +14000,7 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) +<<<<<<< HEAD "eMi" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -13349,6 +14018,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eMj" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Access" @@ -13443,6 +14114,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) +<<<<<<< HEAD +======= +"eOI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eOY" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -13639,6 +14317,7 @@ }, /turf/open/openspace, /area/station/security/prison/garden) +<<<<<<< HEAD "eTf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/west, @@ -13648,6 +14327,8 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eTg" = ( /obj/effect/turf_decal/stripes{ dir = 9 @@ -13665,7 +14346,10 @@ "eTu" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/table, +<<<<<<< HEAD /obj/item/trash/waffles, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/hallway/primary/central) "eTZ" = ( @@ -13765,6 +14449,7 @@ /obj/structure/cable/layer3, /turf/open/floor/catwalk_floor/iron_dark/telecomms, /area/station/ai_monitored/turret_protected/ai) +<<<<<<< HEAD "eWE" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table/reinforced, @@ -13779,6 +14464,8 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eWJ" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -13884,6 +14571,18 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"eYO" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/obj/structure/secure_safe/caps_spare, +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eYP" = ( /turf/closed/wall/rust, /area/station/medical/chemistry/minisat) @@ -14129,6 +14828,7 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/iron/grimy, /area/station/maintenance/central/greater) +<<<<<<< HEAD "fdZ" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room" @@ -14138,12 +14838,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fee" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, /turf/open/floor/iron/textured, /area/station/security/processing) +<<<<<<< HEAD "fer" = ( /obj/machinery/modular_computer/preset/id{ dir = 1 @@ -14159,6 +14862,8 @@ }, /turf/open/floor/holofloor/dark, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "feu" = ( /obj/effect/landmark/start/janitor, /obj/effect/decal/cleanable/dirt, @@ -14293,6 +14998,7 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +<<<<<<< HEAD "fgY" = ( /obj/machinery/light/warm/dim/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -14304,6 +15010,8 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/chemistry/minisat) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fhs" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -14424,6 +15132,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "fjo" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, @@ -14438,6 +15147,8 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fjp" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 @@ -14487,6 +15198,7 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/service/theater) +<<<<<<< HEAD "fks" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -14496,6 +15208,8 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fkF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/north, @@ -14529,10 +15243,13 @@ dir = 8 }, /area/station/command/corporate_dock) +<<<<<<< HEAD "fln" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fls" = ( /obj/structure/broken_flooring/pile{ dir = 1 @@ -14566,6 +15283,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "flW" = ( /obj/machinery/computer/crew{ dir = 8 @@ -14573,6 +15291,8 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/textured, /area/station/security/warden) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "flZ" = ( /obj/structure/cable, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -14775,6 +15495,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "fpT" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14791,6 +15512,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fpY" = ( /turf/open/openspace, /area/station/science/ordnance) @@ -14811,6 +15534,7 @@ /obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/aisat_interior) +<<<<<<< HEAD "fqq" = ( /obj/structure/table/reinforced, /obj/item/stamp/head/ce, @@ -14826,6 +15550,8 @@ /obj/item/stamp/head/ce, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fqs" = ( /obj/structure/cable, /obj/structure/railing{ @@ -15186,6 +15912,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint/medical) +<<<<<<< HEAD +======= +"fvq" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fvF" = ( /obj/effect/spawner/random/structure/grille, /obj/structure/cable, @@ -15406,6 +16142,20 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/cafeteria) +<<<<<<< HEAD +======= +"fzx" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/item/stamp/head/captain{ + pixel_x = -12 + }, +/obj/item/hand_tele{ + pixel_x = 8 + }, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fzK" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -15569,6 +16319,7 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/wood/tile, /area/station/service/bar) +<<<<<<< HEAD "fCo" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 1 @@ -15578,6 +16329,8 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fCy" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -15697,6 +16450,17 @@ /obj/structure/sign/poster/random/directional/east, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD +======= +"fEm" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Cooling Loop to Gas" + }, +/obj/effect/turf_decal/stripes, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fEu" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -15745,6 +16509,19 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/command/corporate_showroom) +<<<<<<< HEAD +======= +"fFb" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fFg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16116,12 +16893,15 @@ }, /turf/open/floor/iron/half, /area/station/security/breakroom) +<<<<<<< HEAD "fLF" = ( /obj/structure/table, /obj/effect/spawner/random/engineering/flashlight, /obj/machinery/light_switch/directional/east, /turf/open/floor/iron, /area/station/command/gateway) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fLM" = ( /obj/structure/transport/linear/public, /obj/machinery/light/floor/transport, @@ -16445,6 +17225,30 @@ /obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD +======= +"fQG" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Virology Lab"; + id_tag = "virology_airlock_exterior" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/structure/cable, +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/door_buttons/access_button{ + dir = 1; + idDoor = "virology_airlock_exterior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Button"; + pixel_y = -24; + req_access = list("virology") + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fQO" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -16455,6 +17259,7 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +<<<<<<< HEAD "fQS" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -16462,6 +17267,8 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fRv" = ( /obj/machinery/door/window/right/directional/east, /turf/open/floor/grass, @@ -16500,6 +17307,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +<<<<<<< HEAD "fRP" = ( /obj/structure/chair{ dir = 4 @@ -16514,6 +17322,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fSb" = ( /obj/structure/tank_dispenser/oxygen, /obj/machinery/light/directional/north, @@ -16939,6 +17749,7 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/solars/port) +<<<<<<< HEAD "fZA" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; @@ -16950,6 +17761,8 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fZF" = ( /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) @@ -17016,6 +17829,7 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating/reinforced/airless, /area/station/asteroid) +<<<<<<< HEAD "gbw" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8 @@ -17026,6 +17840,8 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gbF" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -17269,6 +18085,19 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD +======= +"gft" = ( +/obj/structure/transport/linear/public, +/obj/effect/landmark/transport/transport_id{ + specific_transport_id = "medbay1" + }, +/obj/machinery/elevator_control_panel/directional/south{ + linked_elevator_id = "medbay1" + }, +/turf/open/floor/plating/elevatorshaft, +/area/station/medical/treatment_center) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gfF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17368,6 +18197,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/carpet, /area/station/commons/dorms) +<<<<<<< HEAD "ghN" = ( /obj/machinery/computer/pod/old/mass_driver_controller/trash{ pixel_x = -24; @@ -17385,6 +18215,8 @@ }, /turf/open/floor/engine, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ghQ" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/machinery/chem_master/condimaster{ @@ -17468,6 +18300,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/drone_bay) +<<<<<<< HEAD +======= +"gjt" = ( +/obj/machinery/pdapainter/medbay, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 + }, +/turf/open/floor/holofloor/dark, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gjw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17601,10 +18443,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "glu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "glA" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /turf/open/floor/iron, @@ -17615,6 +18460,18 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/upper) +<<<<<<< HEAD +======= +"glH" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/directions/dorms/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "glL" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -18059,6 +18916,7 @@ /obj/structure/broken_flooring/side/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/medical) +<<<<<<< HEAD "guS" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/hollow/reinforced/end{ @@ -18067,6 +18925,8 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/hallway/secondary/command) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "guV" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/freezer, @@ -18213,6 +19073,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "gxd" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -18220,6 +19081,8 @@ /obj/structure/sign/warning/engine_safety/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gxt" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ @@ -18681,6 +19544,7 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +<<<<<<< HEAD "gEL" = ( /obj/structure/filingcabinet, /obj/machinery/button/ticket_machine{ @@ -18697,6 +19561,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gEP" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -18759,6 +19625,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, /area/space/nearstation) +<<<<<<< HEAD +======= +"gGh" = ( +/obj/effect/landmark/start/cyborg, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/recharge_floor, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gGm" = ( /obj/effect/spawner/random/engineering/tank, /turf/open/floor/plating, @@ -18813,6 +19689,7 @@ /obj/effect/mapping_helpers/trapdoor_placer, /turf/open/floor/glass/reinforced/plasma, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "gHh" = ( /obj/machinery/lift_indicator/directional/west{ linked_elevator_id = "medbay1" @@ -18825,6 +19702,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gHk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19277,6 +20156,17 @@ "gQq" = ( /turf/open/openspace, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"gQs" = ( +/obj/structure/transport/linear/public, +/obj/effect/landmark/transport/transport_id{ + specific_transport_id = "aisat" + }, +/obj/machinery/holopad, +/turf/open/openspace, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gQt" = ( /obj/machinery/door/airlock{ id_tag = "Cabin6"; @@ -19367,6 +20257,19 @@ /obj/item/target/syndicate, /turf/open/floor/engine, /area/station/science/explab) +<<<<<<< HEAD +======= +"gTe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gTf" = ( /obj/structure/table, /obj/machinery/reagentgrinder{ @@ -20305,6 +21208,7 @@ dir = 5 }, /area/station/command/meeting_room) +<<<<<<< HEAD "hhG" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/regular, @@ -20313,6 +21217,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hhH" = ( /obj/structure/table/reinforced/rglass, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -20598,6 +21504,7 @@ /obj/machinery/research/anomaly_refinery, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +<<<<<<< HEAD "hmJ" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/sign/directions/supply/directional/east{ @@ -20605,6 +21512,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hna" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -20736,6 +21645,28 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/tile, /area/station/service/bar) +<<<<<<< HEAD +======= +"hpB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/directions/security/directional/west{ + dir = 1 + }, +/obj/structure/sign/directions/supply/directional/west{ + pixel_y = 8; + dir = 1 + }, +/obj/structure/sign/directions/science/directional/west{ + pixel_y = -8; + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hpT" = ( /obj/machinery/door/airlock/command{ name = "Quartermaster's Office" @@ -20868,6 +21799,21 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +<<<<<<< HEAD +======= +"hro" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/firealarm/directional/south, +/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/medical/chemistry/minisat) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hrp" = ( /obj/structure/closet/crate{ name = "Surplus Communications Parts" @@ -20953,11 +21899,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/executive, /area/station/command/corporate_showroom) +<<<<<<< HEAD "hsm" = ( /obj/structure/chair/sofa/right/maroon, /obj/effect/landmark/start/psychologist, /turf/open/floor/carpet, /area/station/medical/psychology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hso" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/structure/cable, @@ -20994,12 +21943,15 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/virology) +<<<<<<< HEAD "hsI" = ( /obj/effect/landmark/start/cyborg, /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/recharge_floor, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hsW" = ( /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) @@ -21091,6 +22043,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"hux" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "huK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/parquet, @@ -21132,6 +22094,18 @@ /obj/structure/railing/corner, /turf/open/openspace, /area/station/engineering/supermatter/room) +<<<<<<< HEAD +======= +"hvt" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hvw" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/trunk/multiz/down, @@ -21146,12 +22120,15 @@ /obj/effect/spawner/random/structure/closet_empty/crate, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/storage) +<<<<<<< HEAD "hvB" = ( /obj/structure/table/reinforced, /obj/item/pinpointer/nuke, /obj/item/disk/nuclear, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hvD" = ( /obj/structure/broken_flooring/pile{ dir = 8 @@ -21385,6 +22362,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"hAS" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/decal/cleanable/dirt, +/obj/item/cultivator/rake, +/turf/open/floor/grass, +/area/station/security/prison/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hAV" = ( /obj/structure/table/wood, /obj/item/flashlight/flare/candle{ @@ -21454,6 +22440,7 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/hallway/primary/central) +<<<<<<< HEAD "hCC" = ( /obj/machinery/pdapainter/engineering, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -21461,6 +22448,8 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hCJ" = ( /obj/structure/railing{ dir = 8 @@ -21704,6 +22693,7 @@ /obj/structure/railing, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "hGX" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 4; @@ -21714,6 +22704,8 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hGZ" = ( /obj/structure/cable/multilayer/multiz, /obj/machinery/light/small/dim/directional/west, @@ -21884,6 +22876,17 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"hLq" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hLw" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22110,6 +23113,7 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/security/prison/safe) +<<<<<<< HEAD "hPG" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -22120,6 +23124,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hPH" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, @@ -22577,10 +23583,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/tile, /area/station/service/bar) +<<<<<<< HEAD "hWR" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hWW" = ( /obj/structure/cable, /obj/effect/landmark/start/atmospheric_technician, @@ -22694,6 +23703,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +<<<<<<< HEAD "hYT" = ( /obj/structure/cable, /obj/machinery/light/small/directional/east, @@ -22706,6 +23716,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hYU" = ( /obj/structure/lattice, /obj/structure/cable, @@ -22765,12 +23777,15 @@ "iaN" = ( /turf/closed/wall, /area/station/cargo/miningoffice) +<<<<<<< HEAD "ibe" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ibi" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue{ @@ -22998,6 +24013,7 @@ /obj/structure/flora/rock/style_random, /turf/open/misc/asteroid, /area/station/maintenance/department/science) +<<<<<<< HEAD "ieG" = ( /obj/machinery/elevator_control_panel/directional/south{ linked_elevator_id = "aisat"; @@ -23013,6 +24029,8 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ieI" = ( /obj/structure/cable/layer3, /turf/open/floor/circuit/telecomms/mainframe, @@ -23161,6 +24179,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +<<<<<<< HEAD "ihJ" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/neutral, @@ -23179,6 +24198,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ihK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23322,6 +24343,7 @@ /obj/effect/spawner/random/structure/closet_empty/crate/with_loot, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "ill" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -23333,6 +24355,8 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ilp" = ( /turf/closed/mineral/random/stationside/asteroid/porus{ mineralChance = 20 @@ -23367,6 +24391,7 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/glass/reinforced, /area/station/service/bar) +<<<<<<< HEAD "imh" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -23381,6 +24406,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iml" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/broken_floor, @@ -23937,6 +24964,22 @@ /obj/effect/mapping_helpers/mail_sorting/engineering/ce_office, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"iwm" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iwu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -23944,12 +24987,15 @@ /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/aft/upper) +<<<<<<< HEAD "iwA" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2{ dir = 10 }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iwQ" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -24315,6 +25361,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +<<<<<<< HEAD +======= +"iDJ" = ( +/obj/structure/table/reinforced, +/obj/item/modular_computer/laptop/preset/civilian, +/obj/structure/cable, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iEj" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -24586,6 +25641,19 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"iIT" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/window/brigdoor/left/directional/north, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iIY" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -24814,6 +25882,10 @@ /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +<<<<<<< HEAD +======= +/obj/item/plant_analyzer, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/grass, /area/station/security/prison/garden) "iNv" = ( @@ -24850,6 +25922,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/tile, /area/station/service/chapel) +<<<<<<< HEAD +======= +"iOc" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iOE" = ( /obj/item/pickaxe/mini, /turf/open/misc/asteroid, @@ -25322,6 +26402,24 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/iron/white/smooth_large, /area/station/science/research) +<<<<<<< HEAD +======= +"jaa" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/directions/command/directional/north, +/obj/structure/sign/directions/engineering/directional/north{ + pixel_y = 40; + dir = 4 + }, +/obj/structure/sign/directions/security/directional/north{ + pixel_y = 24; + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jac" = ( /obj/structure/cable, /obj/effect/spawner/random/trash/garbage{ @@ -25397,6 +26495,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +<<<<<<< HEAD "jbI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25405,11 +26504,29 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jbL" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD +======= +"jbM" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/item/ai_module/toy_ai{ + pixel_x = 16; + pixel_y = 8 + }, +/obj/item/paper_bin/construction{ + pixel_y = 6 + }, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jbP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/west, @@ -25691,6 +26808,7 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/patients_rooms/room_a) +<<<<<<< HEAD "jgO" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/structure/table, @@ -25703,6 +26821,8 @@ /obj/item/stock_parts/power_store/cell/emproof, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jgZ" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -26061,6 +27181,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"jmP" = ( +/obj/machinery/computer/pod/old/mass_driver_controller/trash{ + pixel_x = -24; + id = "captaindriver" + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jmU" = ( /obj/effect/landmark/start/head_of_security, /obj/machinery/light/small/directional/east, @@ -26133,6 +27273,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) +<<<<<<< HEAD "jop" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table/reinforced, @@ -26140,6 +27281,8 @@ /obj/item/coin/titanium, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "joB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26291,6 +27434,15 @@ /obj/effect/turf_decal/trimline/yellow/filled/warning, /turf/open/floor/iron/white, /area/station/medical/chemistry) +<<<<<<< HEAD +======= +"jqu" = ( +/obj/structure/table/reinforced, +/obj/item/pinpointer/nuke, +/obj/item/disk/nuclear, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jqz" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -26308,6 +27460,23 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/teleporter) +<<<<<<< HEAD +======= +"jqT" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/head_of_personnel, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jqY" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/white/smooth_large, @@ -26407,6 +27576,17 @@ /obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"jtS" = ( +/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/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "juf" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/spawner/random/structure/table, @@ -26449,6 +27629,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/corporate_showroom) +<<<<<<< HEAD +======= +"juV" = ( +/obj/structure/railing, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "juZ" = ( /obj/structure/table/wood, /obj/structure/disposalpipe/segment{ @@ -26533,6 +27724,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/engineering/atmos/upper) +<<<<<<< HEAD +======= +"jww" = ( +/obj/effect/turf_decal/tile/dark_blue, +/obj/effect/mapping_helpers/mail_sorting/service/hop_office, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jwI" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -26686,6 +27888,17 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) +<<<<<<< HEAD +======= +"jzC" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jzI" = ( /obj/structure/railing{ dir = 1 @@ -26800,6 +28013,23 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"jBg" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/machinery/light/small/dim/directional/east, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/assembly/igniter/condenser, +/obj/machinery/camera/autoname/directional/east{ + network = list("minisat") + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jBh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26929,6 +28159,46 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/textured, /area/station/science/genetics) +<<<<<<< HEAD +======= +"jCU" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/o_plus{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/b_plus, +/obj/item/reagent_containers/blood/b_minus, +/obj/item/reagent_containers/blood/a_plus, +/obj/item/reagent_containers/blood/a_minus, +/obj/item/reagent_containers/blood/lizard, +/obj/item/reagent_containers/blood/ethereal, +/obj/item/reagent_containers/blood{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/reagent_containers/blood{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/reagent_containers/blood{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jCX" = ( /obj/structure/transport/linear/public, /turf/open/floor/plating/elevatorshaft, @@ -27000,6 +28270,17 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/chemistry/minisat) +<<<<<<< HEAD +======= +"jEf" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/holofloor/dark, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jEr" = ( /obj/structure/chair/stool/directional/west, /obj/effect/landmark/start/assistant, @@ -27171,6 +28452,16 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/patients_rooms/room_a) +<<<<<<< HEAD +======= +"jHz" = ( +/obj/effect/turf_decal/stripes, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jHD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/firealarm/directional/west, @@ -27184,6 +28475,7 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +<<<<<<< HEAD "jHO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes{ @@ -27194,6 +28486,8 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jHQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27431,6 +28725,7 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos) +<<<<<<< HEAD "jLd" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -27438,6 +28733,8 @@ /obj/structure/sign/poster/official/report_crimes/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jLp" = ( /obj/machinery/photocopier, /turf/open/floor/carpet/purple, @@ -27725,6 +29022,17 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"jQs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jQt" = ( /obj/structure/cable, /obj/effect/spawner/random/maintenance, @@ -27922,6 +29230,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/central/greater) +<<<<<<< HEAD "jVn" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -27942,6 +29251,8 @@ }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jVq" = ( /obj/effect/spawner/random/structure/billboard/nanotrasen, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -27988,6 +29299,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "jVT" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -27998,6 +29310,8 @@ /obj/structure/cable/layer1, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jVV" = ( /obj/structure/lattice, /turf/open/space/openspace, @@ -28050,6 +29364,7 @@ /obj/machinery/firealarm/directional/south, /turf/open/openspace, /area/station/security/prison/shower) +<<<<<<< HEAD "jWv" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -28057,6 +29372,8 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jWE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, @@ -28147,6 +29464,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/central/greater) +<<<<<<< HEAD "jYw" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -28157,6 +29475,8 @@ }, /turf/open/floor/holofloor/dark, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jYy" = ( /obj/effect/turf_decal/tile/neutral/diagonal_centre, /turf/open/floor/iron/dark, @@ -28292,6 +29612,7 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/greater) +<<<<<<< HEAD "kat" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 4; @@ -28304,6 +29625,8 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kaz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28326,6 +29649,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/miningoffice) +<<<<<<< HEAD +======= +"kbv" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; + name = "AI Antechamber turret control"; + pixel_x = 27 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kbD" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/siding/purple, @@ -28375,6 +29712,20 @@ }, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) +<<<<<<< HEAD +======= +"kcr" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/digital_clock/directional/south, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","medbay") + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kcz" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -28556,6 +29907,21 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +<<<<<<< HEAD +======= +"keg" = ( +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "keo" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad2"; @@ -28578,6 +29944,7 @@ }, /turf/open/floor/carpet/red, /area/station/security/warden) +<<<<<<< HEAD "keE" = ( /obj/structure/table/optable, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -28589,6 +29956,8 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "keJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, @@ -28833,6 +30202,23 @@ /obj/structure/broken_flooring/singular, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"kjR" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/rack, +/obj/item/clothing/glasses/meson/engine, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/item/trapdoor_remote/preloaded, +/obj/machinery/light_switch/directional/north{ + pixel_x = 26 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kjU" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -28917,6 +30303,7 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD "kkW" = ( /obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{ name = "Burn Chamber Interior Airlock"; @@ -28940,6 +30327,8 @@ }, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kld" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -29149,6 +30538,7 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +<<<<<<< HEAD "kot" = ( /obj/machinery/door/airlock/research/glass{ name = "Ordnance Lab" @@ -29160,6 +30550,8 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "koz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29534,6 +30926,7 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +<<<<<<< HEAD "ktk" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -29548,6 +30941,8 @@ /obj/structure/sign/directions/engineering/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ktr" = ( /obj/machinery/door/airlock/grunge{ name = "Radiation Shelter" @@ -29603,6 +30998,14 @@ /obj/structure/cable, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +<<<<<<< HEAD +======= +"kuI" = ( +/obj/structure/chair/sofa/right/maroon, +/obj/effect/landmark/start/psychologist, +/turf/open/floor/carpet, +/area/station/medical/psychology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kuP" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -29623,6 +31026,7 @@ /obj/structure/lattice/catwalk, /turf/open/openspace/xenobio, /area/station/science/xenobiology) +<<<<<<< HEAD "kvf" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ @@ -29634,6 +31038,8 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kvj" = ( /obj/machinery/light/directional/north, /obj/structure/table, @@ -29657,6 +31063,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/chemistry/minisat) +<<<<<<< HEAD "kvA" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4 @@ -29669,6 +31076,8 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kvU" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/rack, @@ -29700,6 +31109,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +<<<<<<< HEAD "kwi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table/reinforced, @@ -29713,6 +31123,8 @@ /obj/item/pen, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kwp" = ( /obj/item/storage/box/bodybags, /obj/item/healthanalyzer, @@ -29759,6 +31171,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) +<<<<<<< HEAD "kxh" = ( /obj/structure/chair/sofa/corp/right{ desc = "Looks like someone threw it out. Covered in donut crumbs."; @@ -29771,6 +31184,8 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/half, /area/station/security/breakroom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kxk" = ( /obj/effect/turf_decal/tile/neutral/diagonal_centre, /obj/machinery/camera/autoname/directional/north, @@ -29938,6 +31353,31 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +<<<<<<< HEAD +======= +"kzI" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Virology Lab"; + id_tag = "virology_airlock_interior" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/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/green/fourcorners, +/obj/machinery/door_buttons/access_button{ + idDoor = "virology_airlock_interior"; + idSelf = "virology_airlock_control"; + name = "Virology Access Button"; + pixel_x = -24; + pixel_y = 8; + req_access = list("virology") + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kzK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29962,6 +31402,17 @@ "kAg" = ( /turf/closed/wall, /area/station/service/hydroponics/garden) +<<<<<<< HEAD +======= +"kAh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes{ + dir = 5 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kAw" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction/flip{ @@ -30087,6 +31538,14 @@ dir = 1 }, /area/station/medical/pharmacy) +<<<<<<< HEAD +======= +"kCr" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/engine) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kCs" = ( /obj/structure/railing{ dir = 9 @@ -30258,6 +31717,17 @@ }, /turf/open/floor/wood/tile, /area/station/security/courtroom) +<<<<<<< HEAD +======= +"kFO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kFP" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 @@ -30799,6 +32269,19 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD +======= +"kQV" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/holofloor/dark, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kRl" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31137,6 +32620,19 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/science/robotics/lab) +<<<<<<< HEAD +======= +"kWI" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kWK" = ( /obj/effect/spawner/random/structure/grille, /obj/structure/cable, @@ -31458,6 +32954,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD "lct" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31466,6 +32963,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lcv" = ( /obj/machinery/camera/autoname/directional/south, /turf/open/floor/glass/reinforced, @@ -31990,6 +33489,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/patients_rooms/room_b) +<<<<<<< HEAD "lnQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/siding/blue{ @@ -31998,6 +33498,8 @@ /obj/machinery/vending/wallmed/directional/south, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lnZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table, @@ -32025,6 +33527,21 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +<<<<<<< HEAD +======= +"lop" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/paper/pamphlet/gateway, +/obj/structure/table, +/obj/item/flashlight/flare{ + pixel_x = 12 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/command/gateway) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "loq" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -32262,6 +33779,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"luq" = ( +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lut" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -32378,6 +33905,20 @@ "lwu" = ( /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) +<<<<<<< HEAD +======= +"lwv" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/structure/rack, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lww" = ( /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt/dust, @@ -32406,6 +33947,21 @@ /obj/item/kirbyplants/organic/plant11, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +<<<<<<< HEAD +======= +"lwW" = ( +/obj/machinery/lift_indicator/directional/north{ + linked_elevator_id = "cargo" + }, +/obj/machinery/button/elevator/directional/north{ + id = "cargo" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lwZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/nocontrol/incinerator{ @@ -32457,6 +34013,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured, /area/station/construction/mining/aux_base) +<<<<<<< HEAD "lym" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes{ @@ -32465,6 +34022,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lyr" = ( /obj/structure/table/reinforced/rglass, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -32500,6 +34059,16 @@ dir = 4 }, /area/station/medical/exam_room) +<<<<<<< HEAD +======= +"lyJ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/poster/official/report_crimes/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lyN" = ( /turf/open/openspace, /area/station/engineering/lobby) @@ -32588,6 +34157,7 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +<<<<<<< HEAD "lzX" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -32607,6 +34177,8 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/hallway/secondary/command) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lAc" = ( /turf/closed/wall/r_wall, /area/station/science/genetics) @@ -32835,6 +34407,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/disposal) +<<<<<<< HEAD +======= +"lEa" = ( +/obj/machinery/button/elevator/directional/east{ + id = "aisat" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lED" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32993,6 +34577,7 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) +<<<<<<< HEAD "lGQ" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -33000,6 +34585,8 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lGR" = ( /obj/effect/spawner/structure/window/hollow/end{ dir = 8 @@ -33108,6 +34695,20 @@ /obj/machinery/vending/boozeomat/all_access, /turf/open/floor/plating, /area/station/maintenance/central/greater) +<<<<<<< HEAD +======= +"lJo" = ( +/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, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lJq" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -33214,6 +34815,15 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/cargo/storage) +<<<<<<< HEAD +======= +"lLC" = ( +/obj/structure/chair/stool/directional/east{ + name = "Quartermaster" + }, +/turf/open/floor/carpet/executive, +/area/station/command/meeting_room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lLF" = ( /obj/structure/broken_flooring/side/directional/north, /obj/effect/decal/cleanable/dirt/dust, @@ -33245,10 +34855,13 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +<<<<<<< HEAD "lMd" = ( /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lMj" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 9 @@ -33440,6 +35053,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/chemistry/minisat) +<<<<<<< HEAD "lPL" = ( /obj/effect/landmark/start/ai, /obj/machinery/power/apc/auto_name/directional/south, @@ -33469,6 +35083,8 @@ /obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lPV" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -33484,16 +35100,30 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/satellite) +<<<<<<< HEAD +======= +"lQl" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/hallway/secondary/command) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lQD" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/command/bridge) +<<<<<<< HEAD "lQJ" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lQL" = ( /turf/open/openspace, /area/station/hallway/primary/starboard) @@ -33702,6 +35332,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +<<<<<<< HEAD +======= +"lUF" = ( +/obj/structure/transport/linear/public, +/obj/machinery/elevator_control_panel{ + preset_destination_names = list(2 = "Telecomms", 3 = "AI Core"); + linked_elevator_id = "aisat"; + pixel_x = 32 + }, +/turf/open/openspace, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lUM" = ( /obj/structure/toilet/greyscale{ dir = 4 @@ -33753,6 +35395,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/medical/morgue) +<<<<<<< HEAD "lVE" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/east, @@ -33786,6 +35429,8 @@ }, /turf/open/floor/iron, /area/station/security/brig/entrance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lVF" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/disposalpipe/segment{ @@ -34142,6 +35787,14 @@ }, /turf/open/floor/catwalk_floor/iron_white, /area/station/science/ordnance/testlab) +<<<<<<< HEAD +======= +"mcw" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mcA" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -34276,6 +35929,16 @@ /obj/effect/baseturf_helper/reinforced_plating/ceiling, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD +======= +"mfP" = ( +/obj/machinery/atmospherics/components/tank/air/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mgn" = ( /obj/docking_port/stationary{ dir = 8; @@ -34337,6 +36000,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +<<<<<<< HEAD "mhx" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 @@ -34344,6 +36008,8 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mhz" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -34672,6 +36338,20 @@ }, /turf/open/floor/carpet/black, /area/station/command/heads_quarters/hos) +<<<<<<< HEAD +======= +"mlG" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 3 + }, +/obj/item/restraints/handcuffs, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mlK" = ( /turf/open/floor/fakepit, /area/station/maintenance/department/medical) @@ -34700,6 +36380,7 @@ /obj/machinery/photobooth/security, /turf/open/floor/iron/dark/textured, /area/station/security/execution/transfer) +<<<<<<< HEAD "mmG" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -34708,6 +36389,8 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mmU" = ( /obj/machinery/computer/mecha{ dir = 8 @@ -34805,6 +36488,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD +======= +"mnI" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mnP" = ( /turf/open/floor/iron, /area/station/service/hydroponics) @@ -34944,6 +36639,7 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +<<<<<<< HEAD "mqI" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -34965,6 +36661,21 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +======= +"mra" = ( +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_y = 24 + }, +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_y = 40 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mrq" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -35096,6 +36807,7 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine, /area/station/command/corporate_dock) +<<<<<<< HEAD "mte" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -35104,6 +36816,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mtB" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 @@ -35154,6 +36868,7 @@ /obj/structure/cable, /turf/open/floor/iron/chapel, /area/station/service/chapel) +<<<<<<< HEAD "muq" = ( /obj/structure/table, /obj/item/ai_module/core/full/paladin_devotion, @@ -35161,6 +36876,8 @@ /obj/machinery/flasher/directional/south, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mut" = ( /obj/machinery/shower/directional/south, /obj/structure/cable, @@ -35193,6 +36910,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/tile, /area/station/service/chapel) +<<<<<<< HEAD "muW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -35210,6 +36928,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mvb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/start/assistant, @@ -35292,6 +37012,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/service/cafeteria) +<<<<<<< HEAD "mvT" = ( /obj/machinery/pdapainter{ pixel_y = 2 @@ -35305,6 +37026,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mvU" = ( /obj/item/radio/intercom/prison/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35629,6 +37352,17 @@ }, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) +<<<<<<< HEAD +======= +"mCb" = ( +/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/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mCm" = ( /obj/effect/turf_decal/stripes, /obj/item/radio/intercom/directional/south, @@ -35730,6 +37464,25 @@ dir = 8 }, /area/station/science/lab) +<<<<<<< HEAD +======= +"mDP" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "antesat" + }, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Antechamber" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/structure/cable/layer3, +/obj/machinery/elevator_control_panel/directional/south{ + linked_elevator_id = "aisat"; + pixel_x = 8; + pixel_y = -29 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mDT" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -36237,6 +37990,7 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +<<<<<<< HEAD "mNa" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/random, @@ -36274,6 +38028,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mNl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -36513,6 +38269,7 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +<<<<<<< HEAD "mST" = ( /obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -36522,6 +38279,8 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mSY" = ( /obj/machinery/camera/autoname/directional/east{ network = list("ss13","rd") @@ -36691,6 +38450,17 @@ }, /turf/open/floor/plating, /area/station/service/hydroponics/garden) +<<<<<<< HEAD +======= +"mWh" = ( +/obj/effect/turf_decal/stripes{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mWB" = ( /obj/machinery/requests_console/auto_name/directional/south, /obj/effect/mapping_helpers/requests_console/supplies, @@ -36721,6 +38491,7 @@ /obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid, /area/station/asteroid) +<<<<<<< HEAD "mWV" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -36729,6 +38500,8 @@ /obj/machinery/light/cold/dim/directional/west, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mWX" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -36871,6 +38644,30 @@ }, /turf/open/floor/iron/dark/telecomms, /area/station/science/server) +<<<<<<< HEAD +======= +"mZr" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/carbon{ + pixel_x = 6 + }, +/obj/item/folder/white{ + pixel_x = -7; + pixel_y = -3 + }, +/obj/item/pen{ + pixel_x = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/button/door/directional/east{ + id = "psychshutter"; + name = "privacy shutter control" + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mZs" = ( /obj/effect/spawner/random/structure/crate, /turf/open/misc/asteroid, @@ -37214,6 +39011,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, /area/station/engineering/atmos/upper) +<<<<<<< HEAD "ner" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -37229,6 +39027,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nes" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -37393,6 +39193,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/station/engineering/main) +<<<<<<< HEAD "nfR" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -37402,6 +39203,8 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nfS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/broken/directional/west, @@ -37758,6 +39561,7 @@ /obj/item/clothing/glasses/hud/health, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD "nnw" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -37768,6 +39572,8 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nny" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/disposalpipe/segment{ @@ -37889,6 +39695,7 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +<<<<<<< HEAD "npq" = ( /mob/living/basic/parrot/poly, /obj/structure/filingcabinet/chestdrawer, @@ -37899,6 +39706,8 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "npw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -38018,6 +39827,7 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD "nrU" = ( /obj/machinery/button/elevator/directional/east{ id = "aisat" @@ -38027,6 +39837,8 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nrW" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/camera/autoname/directional/south{ @@ -38363,6 +40175,38 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"nzT" = ( +/obj/effect/landmark/start/ai, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/item/radio/intercom/directional/west{ + freerange = 1; + listening = 0; + name = "Common Channel"; + pixel_y = -8 + }, +/obj/item/radio/intercom/directional/west{ + listening = 0; + frequency = 1447; + freerange = 1; + pixel_y = 6 + }, +/obj/machinery/button/door/directional/south{ + id = "AI Core shutters"; + name = "AI Core Shutters Control"; + pixel_x = -24; + req_access = list("ai_upload") + }, +/obj/machinery/camera/directional/north{ + c_tag = "AI Chamber - Core"; + network = list("aicore") + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_5k, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nAa" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38414,6 +40258,7 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/command) +<<<<<<< HEAD "nAD" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -38425,6 +40270,8 @@ /obj/item/clothing/glasses/meson/engine, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nAG" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 @@ -38449,6 +40296,28 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/textured, /area/station/security/processing) +<<<<<<< HEAD +======= +"nBA" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/neutral, +/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/structure/sign/directions/evac/directional/south, +/obj/structure/sign/directions/medical/directional/south{ + pixel_y = -24; + dir = 8 + }, +/obj/structure/sign/directions/science/directional/south{ + pixel_y = -40; + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nBV" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -38634,12 +40503,15 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry/minisat) +<<<<<<< HEAD "nFk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nFl" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -38653,6 +40525,7 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +<<<<<<< HEAD "nFO" = ( /obj/structure/transport/linear/public, /obj/effect/landmark/transport/transport_id{ @@ -38661,6 +40534,8 @@ /obj/machinery/holopad, /turf/open/openspace, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nFS" = ( /obj/structure/closet/wardrobe/white, /obj/item/restraints/handcuffs/cable/zipties, @@ -39106,6 +40981,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) +<<<<<<< HEAD +======= +"nNN" = ( +/obj/effect/turf_decal/stripes, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nNP" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, @@ -39149,6 +41032,10 @@ /area/station/command/bridge) "nPw" = ( /obj/structure/water_source/puddle, +<<<<<<< HEAD +======= +/obj/item/reagent_containers/cup/watering_can, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/grass, /area/station/security/prison/garden) "nPM" = ( @@ -39413,6 +41300,7 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/cargo/warehouse/upper) +<<<<<<< HEAD "nXf" = ( /obj/structure/table/reinforced, /obj/item/phone, @@ -39422,6 +41310,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nXw" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/green/fourcorners, @@ -39494,6 +41384,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"nZb" = ( +/obj/structure/closet/l3closet/virology, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nZo" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -39805,6 +41707,26 @@ }, /turf/open/floor/iron, /area/station/cargo/drone_bay) +<<<<<<< HEAD +======= +"oez" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/directions/science/directional/north{ + dir = 4 + }, +/obj/structure/sign/directions/engineering/directional/north{ + pixel_y = 40; + dir = 4 + }, +/obj/structure/sign/directions/command/directional/north{ + pixel_y = 24; + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oeL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39843,6 +41765,20 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/glass, /area/station/command/meeting_room) +<<<<<<< HEAD +======= +"ofG" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/box/red, +/obj/machinery/light/directional/south, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","rd") + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ofL" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/turf_decal/stripes/line, @@ -40529,6 +42465,7 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/commons/storage/tools) +<<<<<<< HEAD "ous" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40548,6 +42485,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ouA" = ( /obj/effect/landmark/blobstart, /turf/open/misc/asteroid, @@ -40933,6 +42872,7 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/execution/education) +<<<<<<< HEAD "oBv" = ( /obj/structure/transport/linear/public, /obj/machinery/elevator_control_panel{ @@ -40942,6 +42882,8 @@ }, /turf/open/openspace, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oBE" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment{ @@ -41317,6 +43259,17 @@ /obj/effect/spawner/random/structure/grille, /turf/open/space/openspace, /area/space/nearstation) +<<<<<<< HEAD +======= +"oIV" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/cold/dim/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oJt" = ( /obj/structure/lattice, /obj/structure/disposaloutlet{ @@ -41540,6 +43493,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/science/explab) +<<<<<<< HEAD "oMQ" = ( /obj/structure/chair/comfy/brown{ dir = 4; @@ -41547,6 +43501,8 @@ }, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oNo" = ( /obj/machinery/camera/autoname/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -41565,6 +43521,31 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/iron/dark/telecomms, /area/station/science/server) +<<<<<<< HEAD +======= +"oNM" = ( +/obj/machinery/door/window/brigdoor/right/directional/east{ + name = "Primary AI Core Access"; + req_access = list("ai_upload") + }, +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 3; + pixel_y = -23 + }, +/obj/machinery/flasher/directional/north{ + id = "AI" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "AI Core shutters"; + name = "AI Core Shutters" + }, +/obj/structure/cable, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oOb" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -41803,6 +43784,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +<<<<<<< HEAD +======= +"oRR" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oSa" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/bluespace_beacon, @@ -41888,6 +43881,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD +======= +"oUb" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oUd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42381,6 +44386,18 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) +<<<<<<< HEAD +======= +"pbD" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/ladder{ + icon_state = "ladder10" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pbO" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -42880,6 +44897,15 @@ }, /turf/open/floor/iron, /area/station/security/warden) +<<<<<<< HEAD +======= +"pla" = ( +/obj/effect/landmark/start/cyborg, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/recharge_floor, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pld" = ( /obj/effect/turf_decal/siding/purple{ dir = 10 @@ -42975,6 +45001,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "pnw" = ( /obj/structure/cable, /obj/machinery/turretid{ @@ -42985,6 +45012,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/aisat/uppersouth) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pny" = ( /obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, @@ -43226,7 +45255,11 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +<<<<<<< HEAD "prL" = ( +======= +"prS" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/sign/departments/psychology/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -43574,10 +45607,18 @@ }, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"pxu" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pxM" = ( /obj/machinery/shower/directional/south, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +<<<<<<< HEAD "pxO" = ( /obj/structure/cable, /obj/machinery/light/warm/dim/directional/south, @@ -43589,6 +45630,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/chemistry/minisat) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pxR" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -43610,6 +45653,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +<<<<<<< HEAD "pyn" = ( /obj/machinery/door/airlock/virology/glass{ name = "Virology Lab"; @@ -43631,6 +45675,8 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pyo" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction{ @@ -43689,11 +45735,21 @@ }, /turf/open/floor/iron, /area/station/security/interrogation) +<<<<<<< HEAD +======= +"pyH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/item/circuitboard/machine/cyborgrecharger, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pyK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine) +<<<<<<< HEAD "pyN" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -43702,6 +45758,8 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pyO" = ( /turf/open/openspace, /area/station/maintenance/port/greater) @@ -43799,6 +45857,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +<<<<<<< HEAD "pBh" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "antesat" @@ -43815,6 +45874,8 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pBk" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -44171,6 +46232,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/security/detectives_office) +<<<<<<< HEAD "pGE" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -44183,6 +46245,8 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/command/gateway) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pGH" = ( /obj/machinery/door/airlock/external{ name = "Server Room" @@ -44583,10 +46647,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/interrogation) +<<<<<<< HEAD "pOj" = ( /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pOv" = ( /obj/structure/chair/pew{ dir = 4 @@ -44653,6 +46720,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/textured_large, /area/station/engineering/storage/tech) +<<<<<<< HEAD "pQd" = ( /obj/structure/transport/linear/public, /obj/effect/landmark/transport/transport_id{ @@ -44663,6 +46731,8 @@ }, /turf/open/floor/plating/elevatorshaft, /area/station/medical/treatment_center) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pQl" = ( /obj/effect/spawner/random/structure/closet_private, /obj/machinery/airalarm/directional/west, @@ -44741,6 +46811,26 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/warden) +<<<<<<< HEAD +======= +"pRm" = ( +/obj/structure/cable/layer3, +/obj/machinery/button/elevator/directional/south{ + pixel_y = -25; + id = "aisat"; + pixel_x = 8 + }, +/obj/machinery/lift_indicator/directional/south{ + pixel_x = -6; + pixel_y = -40; + linked_elevator_id = "aisat" + }, +/obj/machinery/camera/autoname/directional/south{ + network = list("aicore") + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/ai_monitored/turret_protected/ai) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pRq" = ( /obj/effect/turf_decal/trimline/yellow/arrow_cw{ dir = 9 @@ -45106,6 +47196,19 @@ /obj/structure/cable, /turf/open/floor/iron/textured, /area/station/engineering/storage/tech) +<<<<<<< HEAD +======= +"pWG" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pWL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/tracks{ @@ -45211,6 +47314,17 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) +<<<<<<< HEAD +======= +"pYw" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/uppernorth) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pYE" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -45275,6 +47389,26 @@ /obj/structure/railing, /turf/open/openspace, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"qaz" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/directions/science/directional/north{ + dir = 4 + }, +/obj/structure/sign/directions/command/directional/north{ + pixel_y = 40; + dir = 8 + }, +/obj/structure/sign/directions/evac/directional/north{ + pixel_y = 24; + dir = 2 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qaE" = ( /obj/effect/landmark/start/janitor, /obj/effect/decal/cleanable/dirt, @@ -45413,6 +47547,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/locker) +<<<<<<< HEAD "qdu" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -45420,6 +47555,8 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qdA" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -45448,12 +47585,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured, /area/station/cargo/miningoffice) +<<<<<<< HEAD "qea" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qeg" = ( /obj/machinery/pdapainter/security, /obj/machinery/camera/autoname/directional/north, @@ -45555,6 +47695,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +<<<<<<< HEAD +======= +"qgn" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/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, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qgy" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/railing/corner, @@ -45583,6 +47735,16 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/textured_large, /area/station/cargo/sorting) +<<<<<<< HEAD +======= +"qgD" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qgE" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -45909,6 +48071,17 @@ /obj/item/stamp/granted, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) +<<<<<<< HEAD +======= +"qms" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/hallway/secondary/command) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qmD" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage" @@ -45964,6 +48137,7 @@ }, /turf/open/floor/iron/white/smooth_half, /area/station/science/robotics/lab) +<<<<<<< HEAD "qnU" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -45973,6 +48147,8 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qob" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser{ @@ -46105,6 +48281,22 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +<<<<<<< HEAD +======= +"qqq" = ( +/obj/structure/table/reinforced, +/obj/machinery/coffeemaker{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/half, +/area/station/security/breakroom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qqy" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/tcomms_all, @@ -46134,6 +48326,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig/entrance) +<<<<<<< HEAD +======= +"qqL" = ( +/obj/item/kirbyplants/random, +/obj/structure/sign/directions/vault/directional/west, +/turf/open/floor/carpet/red, +/area/station/command/heads_quarters/qm) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qqQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -46391,6 +48591,18 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, /area/station/science/genetics) +<<<<<<< HEAD +======= +"qvV" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qvX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46407,11 +48619,14 @@ }, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) +<<<<<<< HEAD "qwf" = ( /obj/item/kirbyplants/random, /obj/structure/sign/directions/vault/directional/west, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qwu" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -46419,6 +48634,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +<<<<<<< HEAD +======= +"qwB" = ( +/obj/item/shovel/spade, +/turf/open/floor/grass, +/area/station/security/prison/garden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qwG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46561,6 +48783,25 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) +<<<<<<< HEAD +======= +"qAo" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/directions/security/directional/south{ + pixel_y = -24; + dir = 8 + }, +/obj/structure/sign/directions/supply/directional/south{ + dir = 8 + }, +/obj/structure/sign/directions/engineering/directional/south{ + pixel_y = -40 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qAp" = ( /mob/living/basic/mining/goliath/ancient, /turf/open/misc/asteroid/airless, @@ -46648,6 +48889,7 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/central/greater) +<<<<<<< HEAD "qCp" = ( /obj/machinery/button/elevator/directional/east{ id = "aisat" @@ -46657,6 +48899,8 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qCy" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -46914,6 +49158,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/upper) +<<<<<<< HEAD +======= +"qHp" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qHs" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -46967,6 +49220,7 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/maintenance/department/science) +<<<<<<< HEAD "qIp" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -46987,6 +49241,8 @@ /obj/machinery/door/window/left/directional/east, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qIr" = ( /obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt/dust, @@ -47013,6 +49269,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD "qJn" = ( /obj/machinery/button/elevator/directional/east{ id = "cargo" @@ -47027,6 +49284,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qJo" = ( /obj/structure/table/glass, /obj/effect/spawner/random/medical/medkit, @@ -47344,6 +49603,7 @@ /obj/machinery/coffeemaker, /turf/open/floor/iron/white/herringbone, /area/station/science/breakroom) +<<<<<<< HEAD "qPJ" = ( /obj/item/radio/intercom/directional/north, /obj/structure/rack, @@ -47358,6 +49618,8 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qPN" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -47682,6 +49944,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +<<<<<<< HEAD +======= +"qWs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qWt" = ( /obj/machinery/smartfridge/extract/preloaded, /obj/structure/sign/poster/random/directional/north, @@ -47959,6 +50231,19 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD +======= +"raX" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "hopdesk" + }, +/obj/machinery/door/firedoor, +/obj/effect/spawner/structure/window/hollow/reinforced/end, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "raZ" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -47982,6 +50267,25 @@ dir = 1 }, /area/station/command/bridge) +<<<<<<< HEAD +======= +"rbs" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; + icon_state = "control_stun"; + name = "AI Upload Turret Control"; + pixel_x = -28 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/window/brigdoor/left/directional/south, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rbw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, @@ -48056,6 +50360,19 @@ }, /turf/open/floor/iron/checker, /area/station/maintenance/department/medical) +<<<<<<< HEAD +======= +"rcz" = ( +/obj/machinery/computer/security{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/west, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rcG" = ( /obj/machinery/mech_bay_recharge_port{ dir = 1 @@ -48434,6 +50751,17 @@ /obj/structure/sign/warning/vacuum/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/science) +<<<<<<< HEAD +======= +"rix" = ( +/obj/structure/closet/secure_closet/medical1, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "riE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -48658,6 +50986,15 @@ /obj/item/pen/red, /turf/open/floor/carpet, /area/station/service/lawoffice) +<<<<<<< HEAD +======= +"rkI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rkL" = ( /obj/structure/table, /obj/structure/window/spawner/directional/east, @@ -49631,6 +51968,19 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark/small, /area/station/engineering/transit_tube) +<<<<<<< HEAD +======= +"rBZ" = ( +/obj/structure/cable, +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; + name = "AI Antechamber turret control"; + pixel_y = 27 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/ai_monitored/turret_protected/aisat/uppersouth) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rCd" = ( /obj/machinery/door/window/brigdoor/left/directional/east{ name = "Command Desk"; @@ -49758,6 +52108,16 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +<<<<<<< HEAD +======= +"rDx" = ( +/obj/machinery/vending/wardrobe/viro_wardrobe, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rDD" = ( /obj/structure/stairs/west, /turf/open/floor/iron/stairs/left{ @@ -49886,6 +52246,7 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/command/corporate_showroom) +<<<<<<< HEAD "rFY" = ( /obj/structure/table/reinforced/rglass, /obj/machinery/button/door{ @@ -49924,6 +52285,8 @@ }, /turf/open/floor/iron/textured, /area/station/security/warden) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rFZ" = ( /obj/machinery/atmospherics/components/trinary/mixer{ dir = 8; @@ -50049,6 +52412,19 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) +<<<<<<< HEAD +======= +"rIf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/storage/medkit, +/obj/structure/table, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/command/gateway) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rIw" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/catwalk_floor/iron_dark, @@ -50153,6 +52529,18 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark/textured, /area/station/security/interrogation) +<<<<<<< HEAD +======= +"rKq" = ( +/obj/structure/sign/warning/vacuum/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rKW" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/bot_red, @@ -50179,6 +52567,20 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/maintenance/department/medical) +<<<<<<< HEAD +======= +"rLz" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rLJ" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/structure/girder, @@ -50449,6 +52851,7 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/service/hydroponics) +<<<<<<< HEAD "rRe" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, @@ -50468,6 +52871,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rRs" = ( /obj/structure/broken_flooring/corner/directional/north, /obj/effect/landmark/generic_maintenance_landmark, @@ -50726,16 +53131,56 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +<<<<<<< HEAD +======= +"rVD" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/structure/sign/directions/supply/directional/east{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rVL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/medical/chemistry) +<<<<<<< HEAD "rVR" = ( /obj/effect/turf_decal/tile/yellow, /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +======= +"rVT" = ( +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"rWf" = ( +/obj/structure/sign/poster/official/cleanliness/directional/north, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/condiment/sugar{ + pixel_y = 4 + }, +/obj/item/storage/pill_bottle/happinesspsych{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/storage/box/coffeepack, +/obj/item/storage/box/coffeepack/robusta, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/structure/closet/secure_closet/freezer/empty/open, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rWh" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50960,6 +53405,18 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/security/prison/garden) +<<<<<<< HEAD +======= +"rYe" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/obj/structure/window/spawner/directional/east, +/obj/effect/turf_decal/box/red, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rYg" = ( /obj/effect/landmark/event_spawn, /obj/machinery/holopad, @@ -51572,6 +54029,7 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/department/medical) +<<<<<<< HEAD "siO" = ( /obj/structure/stairs/north, /obj/structure/railing{ @@ -51582,6 +54040,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "siR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -51875,6 +54335,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/interrogation) +<<<<<<< HEAD "snc" = ( /obj/machinery/door/window/brigdoor/right/directional/east{ name = "Primary AI Core Access"; @@ -51897,6 +54358,8 @@ /obj/structure/cable, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "snj" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -51935,6 +54398,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +<<<<<<< HEAD "soc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51942,6 +54406,8 @@ dir = 1 }, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sok" = ( /obj/machinery/newscaster/directional/west, /obj/machinery/computer/records/medical/laptop, @@ -52334,6 +54800,27 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"sut" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/directions/supply/directional/south{ + dir = 8 + }, +/obj/structure/sign/directions/engineering/directional/south{ + pixel_y = -40; + dir = 4 + }, +/obj/structure/sign/directions/security/directional/south{ + pixel_y = -24; + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "suw" = ( /obj/machinery/chem_master, /turf/open/floor/iron/dark/small, @@ -52528,6 +55015,10 @@ /area/station/engineering/atmos) "syF" = ( /obj/effect/landmark/start/prisoner, +<<<<<<< HEAD +======= +/obj/item/plant_analyzer, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/grass, /area/station/security/prison/garden) "syL" = ( @@ -52843,10 +55334,13 @@ }, /turf/open/misc/asteroid, /area/station/asteroid) +<<<<<<< HEAD "sDQ" = ( /obj/structure/sign/poster/contraband/communist_state/directional/east, /turf/open/space/basic, /area/space/nearstation) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sEe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53258,6 +55752,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) +<<<<<<< HEAD +======= +"sLr" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/obj/machinery/airlock_sensor/incinerator_ordmix{ + pixel_y = -24 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sLt" = ( /obj/machinery/camera/autoname/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53589,6 +56096,17 @@ dir = 1 }, /area/station/command/bridge) +<<<<<<< HEAD +======= +"sRP" = ( +/obj/machinery/photocopier, +/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, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sRU" = ( /obj/machinery/light/small/dim/directional/south, /obj/item/paper_bin, @@ -53703,6 +56221,15 @@ }, /turf/open/floor/iron, /area/station/security/brig) +<<<<<<< HEAD +======= +"sUD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/central/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sUI" = ( /obj/machinery/door/airlock{ name = "Kitchen Cold Room" @@ -53732,6 +56259,7 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "sVG" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -53741,6 +56269,8 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sVM" = ( /obj/machinery/door/airlock/public/glass{ name = "Garden" @@ -53827,6 +56357,23 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningoffice) +<<<<<<< HEAD +======= +"sXf" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ + pixel_x = -2; + pixel_y = -3 + }, +/obj/item/multitool, +/obj/item/wrench, +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sXG" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54276,6 +56823,16 @@ }, /turf/open/space/basic, /area/space/nearstation) +<<<<<<< HEAD +======= +"tgv" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/textured, +/area/station/security/warden) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tgw" = ( /obj/machinery/power/smes/full, /obj/structure/cable, @@ -55047,6 +57604,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "tsV" = ( /obj/machinery/lift_indicator/directional/north{ linked_elevator_id = "cargo" @@ -55059,6 +57617,8 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tsX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/biohazard, @@ -55194,6 +57754,7 @@ }, /turf/open/floor/wood/parquet, /area/station/service/theater) +<<<<<<< HEAD "tvr" = ( /obj/structure/railing{ dir = 1 @@ -55204,6 +57765,8 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tvB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -55245,6 +57808,7 @@ /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/engine, /area/station/command/corporate_dock) +<<<<<<< HEAD "txp" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/green/fourcorners, @@ -55254,6 +57818,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +"txw" = ( +/obj/structure/table, +/obj/effect/spawner/round_default_module, +/obj/machinery/flasher/directional/north, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "txx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -55328,6 +57900,7 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/security/office) +<<<<<<< HEAD "tzq" = ( /obj/structure/table/reinforced, /obj/machinery/coffeemaker{ @@ -55341,6 +57914,8 @@ }, /turf/open/floor/iron/half, /area/station/security/breakroom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tzs" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -55543,6 +58118,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/engineering/lobby) +<<<<<<< HEAD "tCl" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/left/directional/east{ @@ -55552,6 +58128,8 @@ /obj/item/hand_labeler, /turf/open/floor/iron, /area/station/security/brig/entrance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tCm" = ( /obj/effect/landmark/event_spawn, /obj/structure/chair/wood{ @@ -55753,6 +58331,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/central/greater) +<<<<<<< HEAD "tFq" = ( /obj/structure/closet/secure_closet/medical1, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -55761,6 +58340,8 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tFD" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -56030,6 +58611,20 @@ }, /turf/open/floor/iron, /area/station/maintenance/solars/starboard/fore) +<<<<<<< HEAD +======= +"tKX" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tLa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56237,6 +58832,19 @@ "tNE" = ( /turf/open/floor/plating, /area/station/maintenance/aft/upper) +<<<<<<< HEAD +======= +"tNK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/hidden, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos, +/obj/machinery/airlock_sensor/incinerator_atmos{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tNN" = ( /obj/effect/decal/cleanable/blood/old{ icon_state = "floor6-old" @@ -57068,6 +59676,16 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/textured, /area/station/security/processing) +<<<<<<< HEAD +======= +"uca" = ( +/obj/machinery/modular_computer/preset/engineering, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ucb" = ( /obj/effect/spawner/random/structure/closet_empty/crate/with_loot, /turf/open/floor/plating, @@ -57154,6 +59772,17 @@ /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD +======= +"uei" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4; + name = "Cooling Loop Bypass" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uep" = ( /obj/item/cardboard_cutout/nuclear_operative, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57293,6 +59922,14 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/qm) +<<<<<<< HEAD +======= +"ugJ" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/closet, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/engine) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ugN" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage" @@ -57468,6 +60105,19 @@ /obj/structure/closet/crate/bin, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +<<<<<<< HEAD +======= +"ujv" = ( +/obj/structure/stairs/north, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/sign/directions/arrival/directional/west{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ujx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/plastic{ @@ -57507,6 +60157,21 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port) +<<<<<<< HEAD +======= +"ukv" = ( +/obj/machinery/lift_indicator/directional/west{ + linked_elevator_id = "medbay1" + }, +/obj/machinery/button/elevator/directional/west{ + id = "medbay1" + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ukw" = ( /obj/effect/turf_decal/siding/purple{ dir = 6 @@ -57697,6 +60362,18 @@ /obj/structure/chair/office, /turf/open/floor/iron, /area/station/cargo/storage) +<<<<<<< HEAD +======= +"unH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer5{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "unL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random/directional/south, @@ -57832,6 +60509,24 @@ /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"uqM" = ( +/obj/structure/table/reinforced, +/obj/item/stamp/head/ce, +/obj/item/folder/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/keycard_auth/wall_mounted/directional/west{ + pixel_y = -10 + }, +/obj/item/pen/screwdriver, +/obj/item/stamp/head/ce, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ura" = ( /obj/structure/closet/crate/science{ opened = 1; @@ -57961,6 +60656,17 @@ }, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +<<<<<<< HEAD +======= +"usL" = ( +/obj/machinery/lift_indicator{ + pixel_y = -3; + pixel_x = -6; + linked_elevator_id = "aisat" + }, +/turf/closed/wall/r_wall, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "usQ" = ( /obj/effect/turf_decal/tile/yellow, /obj/item/kirbyplants/random, @@ -58428,6 +61134,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) +<<<<<<< HEAD "uCd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/effect/turf_decal/stripes{ @@ -58436,6 +61143,8 @@ /obj/machinery/light/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uCj" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -58681,6 +61390,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +<<<<<<< HEAD "uGg" = ( /obj/machinery/modular_computer/preset/engineering, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -58688,6 +61398,8 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uGv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -59061,6 +61773,7 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/herringbone, /area/station/commons/fitness/recreation) +<<<<<<< HEAD "uNx" = ( /obj/machinery/airlock_controller/incinerator_atmos{ pixel_x = 32 @@ -59068,6 +61781,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uNy" = ( /obj/structure/table, /obj/item/assembly/igniter, @@ -59205,6 +61920,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/large, /area/station/service/hydroponics/garden) +<<<<<<< HEAD +======= +"uPg" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/lift_indicator/directional/south{ + linked_elevator_id = "medbay1"; + pixel_x = -32 + }, +/obj/machinery/button/elevator/directional/south{ + id = "medbay1"; + pixel_x = -32 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uPi" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/decal/cleanable/dirt, @@ -59295,6 +62027,7 @@ }, /turf/open/floor/wood, /area/station/service/theater) +<<<<<<< HEAD "uRn" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ dir = 1 @@ -59306,6 +62039,8 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uRG" = ( /turf/open/openspace, /area/station/security/prison/shower) @@ -59364,6 +62099,20 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/science/server) +<<<<<<< HEAD +======= +"uTk" = ( +/obj/machinery/light/warm/dim/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/chemistry/minisat) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uTy" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -59746,6 +62495,16 @@ }, /turf/open/floor/iron, /area/station/security) +<<<<<<< HEAD +======= +"vas" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vau" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -59758,6 +62517,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD +======= +"vay" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vaC" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/station/command/corporate_dock) @@ -59959,9 +62729,34 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +<<<<<<< HEAD "vfJ" = ( /turf/closed/wall, /area/station/maintenance/department/science) +======= +"vfG" = ( +/obj/structure/sign/warning/vacuum/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) +"vfJ" = ( +/turf/closed/wall, +/area/station/maintenance/department/science) +"vfL" = ( +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/sign/warning/vacuum/external/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vfM" = ( /obj/effect/landmark/start/depsec/science, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -60041,6 +62836,7 @@ /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD "vhq" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/binary/valve/digital/on{ @@ -60049,6 +62845,8 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vhz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -60066,6 +62864,7 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) +<<<<<<< HEAD "vhR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -60075,6 +62874,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vhT" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -60130,12 +62931,15 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/science/research) +<<<<<<< HEAD "vje" = ( /obj/effect/turf_decal/box/corners{ dir = 8 }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vji" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow{ @@ -60215,6 +63019,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/disposal) +<<<<<<< HEAD "vke" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60223,6 +63028,8 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vkn" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60394,6 +63201,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD +======= +"vno" = ( +/obj/machinery/fax{ + fax_name = "Chief Engineer's Office"; + name = "Chief Engineer's Fax Machine" + }, +/obj/structure/table/reinforced, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vnr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -60598,6 +63421,7 @@ /turf/open/floor/iron, /area/station/engineering/lobby) "vqN" = ( +<<<<<<< HEAD /turf/open/floor/iron/dark/small, /area/station/science/cytology) "vqW" = ( @@ -60607,6 +63431,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +======= +/obj/machinery/vending/cytopro, +/turf/open/floor/iron/dark/small, +/area/station/science/cytology) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vqY" = ( /obj/structure/table, /obj/item/clipboard, @@ -60697,6 +63526,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +<<<<<<< HEAD "vug" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -60706,6 +63536,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vuh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -60740,6 +63572,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/service/theater) +<<<<<<< HEAD +======= +"vvE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vvG" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -60922,6 +63761,7 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, /area/station/science/auxlab/firing_range) +<<<<<<< HEAD "vzl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/window/brigdoor/left/directional/north, @@ -60932,6 +63772,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60952,6 +63794,7 @@ }, /turf/open/floor/grass, /area/station/medical/chemistry) +<<<<<<< HEAD "vzJ" = ( /obj/structure/cable/layer3, /obj/machinery/button/elevator/directional/south{ @@ -60969,6 +63812,8 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/ai) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vzP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -61066,6 +63911,7 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/commons/locker) +<<<<<<< HEAD "vAX" = ( /obj/structure/sign/warning/vacuum/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -61075,6 +63921,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vAY" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral, @@ -61306,6 +64154,16 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +<<<<<<< HEAD +======= +"vFz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/machinery/light/small/dim/directional/east, +/obj/item/coin/titanium, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vFD" = ( /obj/machinery/door/window/brigdoor/security/cell/left/directional/west{ id = "Cell 4"; @@ -61460,6 +64318,7 @@ }, /turf/open/floor/wood/tile, /area/station/security/courtroom) +<<<<<<< HEAD "vHm" = ( /obj/machinery/door/airlock/virology/glass{ name = "Virology Lab"; @@ -61482,6 +64341,8 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vHA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61727,6 +64588,27 @@ /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +<<<<<<< HEAD +======= +"vNc" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 1 + }, +/obj/machinery/button/flasher{ + id = "hopflash"; + pixel_x = 24; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/requests_console/auto_name/directional/south, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/announcement, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vNd" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -62430,6 +65312,18 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/surgery/theatre) +<<<<<<< HEAD +======= +"vZP" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/left/directional/east{ + name = "Security Desk"; + req_access = list("security") + }, +/obj/item/hand_labeler, +/turf/open/floor/iron, +/area/station/security/brig/entrance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vZX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62603,6 +65497,7 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +<<<<<<< HEAD "wde" = ( /obj/structure/railing, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -62611,6 +65506,8 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/engineering/main) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wdm" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -62728,6 +65625,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/warden) +<<<<<<< HEAD +======= +"wfi" = ( +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wfl" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/closed/wall/r_wall, @@ -62871,6 +65780,7 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/white/smooth_large, /area/station/science/ordnance/storage) +<<<<<<< HEAD "wiX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62881,6 +65791,8 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/command/gateway) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wje" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/door/poddoor/preopen{ @@ -62994,6 +65906,7 @@ /obj/item/storage/crayons, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +<<<<<<< HEAD "wkV" = ( /obj/effect/turf_decal/tile/dark_blue, /obj/effect/mapping_helpers/mail_sorting/service/hop_office, @@ -63002,6 +65915,8 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wkX" = ( /mob/living/basic/mining/hivelord, /turf/open/misc/asteroid/airless, @@ -63150,6 +66065,7 @@ dir = 8 }, /area/station/science/xenobiology) +<<<<<<< HEAD "wnH" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -63161,6 +66077,8 @@ /obj/structure/cable/layer1, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wnL" = ( /turf/open/floor/plating, /area/station/medical/medbay/central) @@ -63676,6 +66594,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +<<<<<<< HEAD +======= +"wxH" = ( +/obj/structure/chair/comfy/brown{ + dir = 4; + name = "Captain" + }, +/turf/open/floor/carpet/executive, +/area/station/command/meeting_room) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wxQ" = ( /obj/machinery/computer/operating{ dir = 8 @@ -64410,6 +67338,13 @@ "wJy" = ( /turf/closed/wall, /area/station/medical/storage) +<<<<<<< HEAD +======= +"wJC" = ( +/obj/structure/sign/poster/contraband/communist_state/directional/east, +/turf/open/space/basic, +/area/space/nearstation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wJN" = ( /obj/machinery/space_heater/improvised_chem_heater, /turf/open/floor/plating, @@ -64666,6 +67601,20 @@ }, /turf/open/floor/iron/textured_large, /area/station/service/hydroponics/garden) +<<<<<<< HEAD +======= +"wOn" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Ordnance Lab" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wOo" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload) @@ -64816,6 +67765,7 @@ "wSf" = ( /turf/open/floor/iron/white, /area/station/medical/exam_room) +<<<<<<< HEAD "wSh" = ( /obj/machinery/photocopier, /obj/machinery/light/directional/north, @@ -64824,6 +67774,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wSi" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -65265,6 +68217,17 @@ }, /turf/open/floor/catwalk_floor/iron_white, /area/station/science/lobby) +<<<<<<< HEAD +======= +"xas" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/machinery/vending/wallmed/directional/south, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xay" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65287,6 +68250,25 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +<<<<<<< HEAD +======= +"xaH" = ( +/obj/structure/filingcabinet, +/obj/machinery/button/ticket_machine{ + pixel_x = 24; + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "hopdesk"; + name = "desk shutter control"; + pixel_y = -6 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xaI" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/dark_blue{ @@ -65502,6 +68484,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/hallway/secondary/command) +<<<<<<< HEAD "xet" = ( /obj/structure/chair{ dir = 8 @@ -65515,6 +68498,8 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xey" = ( /obj/machinery/camera/autoname/directional/west, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -65535,11 +68520,14 @@ dir = 9 }, /area/station/command/corporate_dock) +<<<<<<< HEAD "xeI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xeJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65631,6 +68619,7 @@ }, /turf/open/openspace, /area/station/science/xenobiology) +<<<<<<< HEAD "xgw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -65643,6 +68632,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/chemistry/minisat) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xgG" = ( /turf/closed/wall/rust, /area/station/maintenance/department/medical/central) @@ -65730,6 +68721,7 @@ }, /turf/open/floor/iron/herringbone, /area/station/commons/fitness/recreation) +<<<<<<< HEAD "xiz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes/corner{ @@ -65737,6 +68729,8 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xiC" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/light/small/dim/directional/east, @@ -65883,6 +68877,15 @@ }, /turf/open/floor/engine, /area/station/hallway/secondary/entry) +<<<<<<< HEAD +======= +"xla" = ( +/obj/structure/table, +/obj/item/ai_module/core/full/dungeon_master, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xlm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/frame/machine, @@ -65936,11 +68939,14 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD "xlO" = ( /obj/effect/turf_decal/stripes, /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xlX" = ( /obj/machinery/duct, /obj/structure/cable, @@ -66178,6 +69184,7 @@ /obj/item/stack/rods/ten, /turf/open/floor/plating, /area/station/maintenance/central/greater) +<<<<<<< HEAD "xqZ" = ( /obj/machinery/computer/security{ dir = 4 @@ -66188,6 +69195,8 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xrb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -66469,10 +69478,13 @@ /obj/structure/cable, /turf/open/floor/carpet/black, /area/station/command/heads_quarters/hos) +<<<<<<< HEAD "xvz" = ( /obj/machinery/button/ignition/incinerator/atmos, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xvH" = ( /obj/machinery/door/airlock/grunge{ name = "Quiet Room" @@ -66701,6 +69713,7 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +<<<<<<< HEAD "xzO" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/neutral, @@ -66720,6 +69733,8 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xzP" = ( /mob/living/carbon/human/species/monkey, /obj/structure/flora/bush/sparsegrass/style_random, @@ -66793,6 +69808,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/command) +<<<<<<< HEAD +======= +"xAR" = ( +/obj/machinery/button/elevator/directional/east{ + id = "aisat" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/turret_protected/aisat_interior) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xAV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -66900,6 +69927,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/parquet, /area/station/cargo/boutique) +<<<<<<< HEAD "xCH" = ( /obj/effect/turf_decal/stripes, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -66907,6 +69935,8 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xCI" = ( /obj/structure/broken_flooring/side/directional/east, /obj/effect/decal/cleanable/dirt/dust, @@ -67051,6 +70081,15 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +<<<<<<< HEAD +======= +"xFh" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xFt" = ( /obj/structure/railing/corner{ dir = 4 @@ -67117,6 +70156,22 @@ /obj/item/storage/box/monkeycubes, /turf/open/floor/iron/white/textured_large, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"xGX" = ( +/obj/machinery/pdapainter{ + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/obj/item/storage/box/stickers{ + pixel_y = 16 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xGY" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/engine, @@ -67140,6 +70195,20 @@ /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, /turf/open/floor/plating, /area/station/command/corporate_showroom) +<<<<<<< HEAD +======= +"xHT" = ( +/obj/structure/cable, +/obj/machinery/light/warm/dim/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/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/medical/chemistry/minisat) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xHY" = ( /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) @@ -67252,6 +70321,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +<<<<<<< HEAD "xKd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/hidden, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos, @@ -67262,6 +70332,8 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xKh" = ( /obj/structure/closet/wardrobe/miner, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -67370,6 +70442,29 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/morgue) +<<<<<<< HEAD +======= +"xNb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "capshut"; + pixel_x = -8; + name = "shutter control" + }, +/obj/machinery/fax{ + fax_name = "Captain's Office"; + name = "Captain's Fax Machine" + }, +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth/wall_mounted/directional/south{ + pixel_y = -24; + pixel_x = 8 + }, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/captain/private) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xNh" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -67753,12 +70848,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/smooth_large, /area/station/science/research) +<<<<<<< HEAD "xVi" = ( /obj/structure/table, /obj/effect/spawner/round_default_module, /obj/machinery/flasher/directional/north, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai_upload) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xVk" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -68351,6 +71449,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) +<<<<<<< HEAD "yfp" = ( /obj/machinery/lift_indicator{ pixel_y = -3; @@ -68359,6 +71458,8 @@ }, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat_interior) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yfw" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/spawner/random/entertainment/lighter, @@ -68645,6 +71746,7 @@ "ylj" = ( /turf/open/floor/circuit, /area/station/science/robotics/lab) +<<<<<<< HEAD "ylk" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -68654,6 +71756,8 @@ /obj/structure/sign/directions/dorms/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ylm" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -68713,6 +71817,13 @@ /obj/item/stamp/head/rd, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +<<<<<<< HEAD +======= +"ylS" = ( +/obj/machinery/button/ignition/incinerator/atmos, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ylV" = ( /turf/closed/wall, /area/station/security/checkpoint/supply) @@ -80497,7 +83608,11 @@ nvp tZO lGJ dGG +<<<<<<< HEAD keE +======= +kcr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tUo sye hgN @@ -82473,7 +85588,11 @@ dUc xrb xrb nPw +<<<<<<< HEAD dEG +======= +qwB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iqf cKn pjt @@ -82810,7 +85929,11 @@ pwn isy hSB cnd +<<<<<<< HEAD imh +======= +uPg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bui yit dpf @@ -82985,7 +86108,11 @@ cLf dUc cLf xrb +<<<<<<< HEAD nEx +======= +hAS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 syF ckc sqk @@ -83066,12 +86193,20 @@ fvo lcM isy isy +<<<<<<< HEAD ajy +======= +lJo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 crz bui yit yit +<<<<<<< HEAD pQd +======= +gft +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cBb cBb cBb @@ -83288,7 +86423,11 @@ tnO gtj gli gli +<<<<<<< HEAD cTu +======= +beS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bGq ehP uyL @@ -83756,7 +86895,11 @@ cLf iUF cLf sNu +<<<<<<< HEAD nEx +======= +hAS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rXZ vjm hbw @@ -84061,7 +87204,11 @@ rzg xrH jCX sdc +<<<<<<< HEAD tsV +======= +lwW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uyL esN fXZ @@ -86600,7 +89747,11 @@ fAR keQ ftK jza +<<<<<<< HEAD tzq +======= +qqq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pWB jiy mJx @@ -87117,7 +90268,11 @@ jza vEX hEI gHS +<<<<<<< HEAD kxh +======= +drl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mGG gkt kcA @@ -87134,7 +90289,11 @@ xNq tqN bPZ aSZ +<<<<<<< HEAD dKM +======= +rWf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lsJ nVT koA @@ -87942,7 +91101,11 @@ bGD nxG nxG nxG +<<<<<<< HEAD ous +======= +hpB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nxG nxG tuA @@ -88409,8 +91572,13 @@ uJO azb rRK rRK +<<<<<<< HEAD lVE tCl +======= +ava +vZP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qvK rRK rRK @@ -88430,7 +91598,11 @@ kmu dxT tCE xMk +<<<<<<< HEAD hmJ +======= +rVD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 deY aQS vTx @@ -88459,7 +91631,11 @@ prW prW prW prW +<<<<<<< HEAD ktk +======= +dvz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 prW tOm hDK @@ -88681,7 +91857,11 @@ aSZ rjs fNp aSZ +<<<<<<< HEAD abH +======= +eGz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qRr kmu dxT @@ -89207,7 +92387,11 @@ bSC pSk hUI noF +<<<<<<< HEAD pGE +======= +lop +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bAw xEW hDV @@ -89239,7 +92423,11 @@ jNJ pUY kJT hgV +<<<<<<< HEAD sDQ +======= +wJC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dUc uuN gJE @@ -89464,7 +92652,11 @@ cOR ufV jVI noF +<<<<<<< HEAD wiX +======= +rIf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bAw ign iIB @@ -89711,7 +92903,11 @@ rjX rjX iXj rjX +<<<<<<< HEAD eMi +======= +oez +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tHF hqz bAw @@ -89968,7 +93164,11 @@ oGB qyz ahI rjX +<<<<<<< HEAD jLd +======= +lyJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tHF tCE bAw @@ -90486,7 +93686,11 @@ kmu qbA mMC bAw +<<<<<<< HEAD fLF +======= +egN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 joL ttT koG @@ -91282,7 +94486,11 @@ isH agu lpE kAg +<<<<<<< HEAD siO +======= +ujv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kmu hGE nxG @@ -92765,7 +95973,11 @@ cLf fZF mGX clb +<<<<<<< HEAD ghN +======= +jmP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mSf axD fYe @@ -93538,7 +96750,11 @@ csW wMy toJ dGh +<<<<<<< HEAD hvB +======= +jqu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hrM cLf dUc @@ -93572,7 +96788,11 @@ dTU pMD acc kYl +<<<<<<< HEAD nFk +======= +sUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dGc fDN enu @@ -93610,7 +96830,11 @@ hUS hUS hUS qtP +<<<<<<< HEAD vAX +======= +vfG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vew buI pSK @@ -93795,7 +97019,11 @@ uMA pGf qtg nbm +<<<<<<< HEAD cpR +======= +iDJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hrM cLf dUc @@ -94052,7 +97280,11 @@ sqo gHX hAg csW +<<<<<<< HEAD bao +======= +fzx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hrM cLf sgz @@ -94309,7 +97541,11 @@ jpd jRc ruc jcW +<<<<<<< HEAD jVn +======= +xNb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 axD eKR sgz @@ -94324,7 +97560,11 @@ sSX agw bUj sgz +<<<<<<< HEAD bdY +======= +cIa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lDn uZx aFJ @@ -94369,7 +97609,11 @@ rjn kmu rFV tOm +<<<<<<< HEAD ihJ +======= +sut +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hzF hzF hjo @@ -94575,8 +97819,13 @@ puT tsP wNa jSs +<<<<<<< HEAD lct dRF +======= +jzC +mcw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aKg pmC qka @@ -94818,11 +98067,19 @@ cLf bqX bqX bhY +<<<<<<< HEAD xqZ fks mrq eBK soc +======= +rcz +eYO +mrq +eBK +bQc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 neH nZB fCY @@ -94832,6 +98089,7 @@ fZr bUM vGz sgz +<<<<<<< HEAD wSh vhR wsS @@ -94839,6 +98097,15 @@ eXM mvT sgz hWR +======= +sRP +qgn +wsS +eXM +xGX +sgz +dFM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lUp uZx rqj @@ -95074,7 +98341,11 @@ cLf cLf bqX ogH +<<<<<<< HEAD nXf +======= +aeJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xcs tYQ tYQ @@ -95089,11 +98360,19 @@ cdX pLO sFB sgz +<<<<<<< HEAD gEL vug fRP sKF aHq +======= +xaH +mnI +jqT +sKF +vNc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sgz mKD xeo @@ -95347,9 +98626,15 @@ vVr sgz sgz sgz +<<<<<<< HEAD hGX qIp kat +======= +raX +bbf +cTc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sgz sgz kJp @@ -95397,7 +98682,11 @@ oGX kmu aly dxT +<<<<<<< HEAD xzO +======= +nBA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hzF hzF eGn @@ -95594,18 +98883,32 @@ kXN klL raA eKR +<<<<<<< HEAD ill gkQ bRN fjo +======= +mlG +gkQ +bRN +sXf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eKR lkQ dhl fbC +<<<<<<< HEAD lAb auM bPo xet +======= +qms +auM +hvt +iwm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aBy mhG jDT @@ -95862,7 +99165,11 @@ kaz dbJ mMH sPS +<<<<<<< HEAD wkV +======= +jww +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 btw btw btw @@ -96180,7 +99487,11 @@ cSb cSb cSb qtP +<<<<<<< HEAD axP +======= +rKq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vew uIW hSg @@ -96365,7 +99676,11 @@ efb rCd kNX eKR +<<<<<<< HEAD kvf +======= +tKX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kZg nPm yjH @@ -96373,7 +99688,11 @@ eKR lkQ qrh kPv +<<<<<<< HEAD guS +======= +lQl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vFf ylz iFv @@ -96873,7 +100192,11 @@ cLf cLf bqX cQP +<<<<<<< HEAD hhG +======= +vay +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eon sZK sZK @@ -97136,7 +100459,11 @@ kYU jTd rkz lrc +<<<<<<< HEAD qdu +======= +eHa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ktI ita hOb @@ -97154,7 +100481,11 @@ juw pSO xYn pSO +<<<<<<< HEAD ner +======= +jaa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qbA tCE mJR @@ -97649,7 +100980,11 @@ cLf eKR iSE viK +<<<<<<< HEAD mWV +======= +oIV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 peL bkb juw @@ -100793,8 +104128,13 @@ prW anT prW sOA +<<<<<<< HEAD muW cNW +======= +bVA +aKJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jqj dxT aQS @@ -101523,9 +104863,15 @@ bDy irx gyl gvF +<<<<<<< HEAD dJY tHF fpT +======= +qaz +tHF +qAo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uZx fDa eMG @@ -101797,7 +105143,11 @@ nxG nxG hjJ nxG +<<<<<<< HEAD ylk +======= +glH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iAE xAm nMR @@ -101827,7 +105177,11 @@ dct hqk jFc jFc +<<<<<<< HEAD rVR +======= +iOc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 adV usQ ltS @@ -102010,11 +105364,19 @@ lPj cqm srs oyO +<<<<<<< HEAD dLp gHQ iJP kee kwi +======= +pyH +gHQ +iJP +kee +jbM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ncc srs sYI @@ -102267,11 +105629,19 @@ fxo vDK srs eJQ +<<<<<<< HEAD jop fZA xkc kee eWE +======= +vFz +kbv +xkc +kee +jBg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qjp srs iVK @@ -102526,8 +105896,13 @@ dZy wHJ wHJ wHJ +<<<<<<< HEAD pBh yfp +======= +mDP +usL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wHJ kTx kYu @@ -104325,7 +107700,11 @@ wze aby hGZ wZz +<<<<<<< HEAD ieG +======= +cdo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wZz ipR kYu @@ -106124,7 +109503,11 @@ fOM jTg ajU wZz +<<<<<<< HEAD efj +======= +cSa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wZz odg hwP @@ -106421,7 +109804,11 @@ rXT kNk bwQ mEs +<<<<<<< HEAD qea +======= +xFh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lPe lPe lPe @@ -108002,7 +111389,11 @@ apK bTt svK ulc +<<<<<<< HEAD lQJ +======= +kCr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uFb gLq lrk @@ -108257,9 +111648,15 @@ aWD aWD aWD aWD +<<<<<<< HEAD aUm mIY pOj +======= +ugJ +mIY +eLk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aWD aWD aWD @@ -109497,7 +112894,11 @@ jLY rSh xJR gOY +<<<<<<< HEAD kot +======= +wOn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gOY gOY cxg @@ -109537,7 +112938,11 @@ oAn aWD aWD cNM +<<<<<<< HEAD vke +======= +mCb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xCf urc xCf @@ -109753,9 +113158,15 @@ lCw fDz fDz fDz +<<<<<<< HEAD vje efJ uRn +======= +bPc +efJ +ofG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gOY cxg cxg @@ -109794,7 +113205,11 @@ cXn vNk oHA xfi +<<<<<<< HEAD cWW +======= +jtS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rhS rhS equ @@ -110011,8 +113426,13 @@ fDz xTs fDz fDz +<<<<<<< HEAD iwA fCo +======= +rkI +rYe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gOY gOY cxg @@ -110051,7 +113471,11 @@ eFM xCf xCf xCf +<<<<<<< HEAD jbI +======= +cYB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rhS rhS rhS @@ -110305,7 +113729,11 @@ vUr eus aWD qWG +<<<<<<< HEAD fQS +======= +vas +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fMW cfJ ybD @@ -110562,7 +113990,11 @@ vUb uMq aWD mkL +<<<<<<< HEAD ibe +======= +qHp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uFC uFC jnY @@ -110782,7 +114214,11 @@ tGW tGW nli pLk +<<<<<<< HEAD glu +======= +vvE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aWM vzP gOY @@ -110819,7 +114255,11 @@ vUb nZH uFC jnY +<<<<<<< HEAD fdZ +======= +oUb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uFC lNk sJG @@ -111039,7 +114479,11 @@ tvB tRZ nkM vxZ +<<<<<<< HEAD kkW +======= +dyS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lfq mDx gOY @@ -111295,9 +114739,15 @@ tTK oEP vBN xfQ +<<<<<<< HEAD kvA xXF gbw +======= +cAG +xXF +sLr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mDx cxg cxg @@ -111591,9 +115041,15 @@ xxi uFC eBZ kpn +<<<<<<< HEAD lMd lMd lMd +======= +pxu +pxu +pxu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oyV axQ yho @@ -111847,9 +115303,15 @@ tbk rkp uFC boT +<<<<<<< HEAD dQa wCm xiz +======= +kAh +wCm +qWs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 utV gea xaP @@ -112106,7 +115568,11 @@ uFC uFC uFC uFC +<<<<<<< HEAD nAD +======= +lwv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nPW oyV xaP @@ -112363,7 +115829,11 @@ kUX vxX vxX uFC +<<<<<<< HEAD gxd +======= +cUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nPW oyV xaP @@ -112620,7 +116090,11 @@ kUX vxX vxX uFC +<<<<<<< HEAD nfR +======= +pbD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nPW oyV kiT @@ -112877,7 +116351,11 @@ kUX vxX vxX uFC +<<<<<<< HEAD jWv +======= +biG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nPW oyV xaP @@ -113135,7 +116613,11 @@ vxX vxX uFC lCu +<<<<<<< HEAD lMd +======= +pxu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oyV xaP xIV @@ -113147,9 +116629,15 @@ xIV xIV xIV xIV +<<<<<<< HEAD wnH vhq xlO +======= +rLz +uei +nNN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jnY fnI mlk @@ -113396,7 +116884,11 @@ kQF bHH sBe ceu +<<<<<<< HEAD jHO +======= +gTe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wFG sji cjV @@ -113404,9 +116896,15 @@ sGE wFG wFG nxc +<<<<<<< HEAD jVT icr xCH +======= +pWG +icr +jHz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jnY xzT dqK @@ -113653,7 +117151,11 @@ nPW oVs oVs oVs +<<<<<<< HEAD xeI +======= +dtY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oVs mYD fXc @@ -113661,9 +117163,15 @@ gas oVs pUa acG +<<<<<<< HEAD cnA acG mmG +======= +kFO +acG +fEm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 anu auD dqK @@ -113907,6 +117415,7 @@ vxX uFC spr xcm +<<<<<<< HEAD uCd lGQ ddO @@ -113921,6 +117430,22 @@ dwt lzX hPG mte +======= +jQs +luq +ddO +xcm +xcm +rVT +hLq +kWI +xcm +sWN +wfi +cXy +vfL +mWh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jnY tgr mlk @@ -142420,8 +145945,13 @@ guN vYz vYz gHN +<<<<<<< HEAD fgY xgw +======= +uTk +hro +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eYP eYP rup @@ -143192,7 +146722,11 @@ vYz aUf eYP fkF +<<<<<<< HEAD pxO +======= +xHT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gHN hhX hhX @@ -147803,7 +151337,11 @@ oZQ oZQ oZQ rXd +<<<<<<< HEAD qwf +======= +qqL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mUi fpx rDE @@ -148338,7 +151876,11 @@ sZH pWr pNW ahq +<<<<<<< HEAD hsm +======= +kuI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sKt kSU uXQ @@ -148346,7 +151888,11 @@ bHc tBo jCN gbF +<<<<<<< HEAD gHh +======= +ukv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uOJ evQ evQ @@ -148597,12 +152143,20 @@ qml ahq qDH dzA +<<<<<<< HEAD mqI +======= +mZr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wWu jaf gey cDD +<<<<<<< HEAD prL +======= +prS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 asz uOJ evQ @@ -148824,7 +152378,11 @@ pic gli gBq gBq +<<<<<<< HEAD qJn +======= +dPk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gBq oAH uaN @@ -149597,7 +153155,11 @@ oZQ oZQ oZQ sdc +<<<<<<< HEAD tsV +======= +lwW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uyL uSA wDv @@ -149823,8 +153385,13 @@ tIr idB mQo kUG +<<<<<<< HEAD rFY flW +======= +dkq +tgv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 peD vjA pIF @@ -151430,7 +154997,11 @@ eCR xck ljZ xhJ +<<<<<<< HEAD txp +======= +qvV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aOm aOm aOm @@ -151687,7 +155258,11 @@ ezF xnq qJo xhJ +<<<<<<< HEAD hYT +======= +keg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unE oZt vZj @@ -151945,7 +155520,11 @@ xnq pTw xhJ oZt +<<<<<<< HEAD pyn +======= +fQG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oZt oZt oZt @@ -152205,7 +155784,11 @@ tHA hsE etg oZt +<<<<<<< HEAD dZr +======= +rDx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hPb fnU xzP @@ -152452,6 +156035,7 @@ xhJ kpP gvw gvw +<<<<<<< HEAD sVG nAs wYY @@ -152463,6 +156047,19 @@ xOF dgS vHm cJb +======= +oRR +nAs +wYY +tSn +xas +xhJ +mfP +xOF +dgS +kzI +cNk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gtO gcy aRN @@ -152709,7 +156306,11 @@ xhJ iDw plH gvw +<<<<<<< HEAD fln +======= +eOI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xYZ jlb whG @@ -152719,7 +156320,11 @@ cgB kHw teV oZt +<<<<<<< HEAD tFq +======= +rix +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ixR qro hOh @@ -152976,7 +156581,11 @@ oZt oZt oZt oZt +<<<<<<< HEAD mST +======= +nZb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fPi iHL rwq @@ -153223,17 +156832,29 @@ vxX vxX vxX gvw +<<<<<<< HEAD euC cwi jYw uKv fer +======= +gjt +jEf +kQV +uKv +evg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gvw vxX vxX vxX oZt +<<<<<<< HEAD mNa +======= +jCU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tkh cgw fMY @@ -161126,9 +164747,15 @@ uRI kCs rxW lFG +<<<<<<< HEAD oMQ tbZ coD +======= +wxH +tbZ +lLC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sBl eYF lYL @@ -165747,11 +169374,19 @@ pHA pHA pHA wOo +<<<<<<< HEAD xVi erY qHx eWO muq +======= +txw +erY +qHx +eWO +daz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wOo pHA pHA @@ -166008,7 +169643,11 @@ iJg ebs cWr oVG +<<<<<<< HEAD cKS +======= +xla +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wOo bFS bFS @@ -166775,11 +170414,19 @@ bFS bFS bFS mbL +<<<<<<< HEAD hsI vzl vJG crm aAK +======= +pla +iIT +vJG +rbs +gGh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mbL bFS bFS @@ -168571,12 +172218,20 @@ jVV mQE hPx fNk +<<<<<<< HEAD dgP +======= +pYw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wHJ hfH sIW hNC +<<<<<<< HEAD nFO +======= +gQs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hNC sIW gBx @@ -169085,7 +172740,11 @@ cxg mQE mQE gwF +<<<<<<< HEAD ciC +======= +eaW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wHJ dqA sIW @@ -169095,7 +172754,11 @@ ciR sIW dfd wHJ +<<<<<<< HEAD pnw +======= +rBZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lPi meH sJT @@ -169344,6 +173007,7 @@ imZ mQE fTj wHJ +<<<<<<< HEAD qCp lmo sIW @@ -169351,6 +173015,15 @@ sIW oBv lmo nrU +======= +lEa +lmo +sIW +sIW +lUF +lmo +xAR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wHJ tww ffT @@ -169861,7 +173534,11 @@ kWb lWW kBh upw +<<<<<<< HEAD vzJ +======= +pRm +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kWb lWW lWW @@ -171403,7 +175080,11 @@ qDl qDl kdR kWb +<<<<<<< HEAD lPL +======= +nzT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kWb mjq qDl @@ -171660,7 +175341,11 @@ vAB vAB qHi kWb +<<<<<<< HEAD snc +======= +oNM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kWb lwr vAB @@ -173021,7 +176706,11 @@ vHa aWD aWD aWD +<<<<<<< HEAD jgO +======= +ewa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gCT kgb gaI @@ -173276,8 +176965,13 @@ msm aWD aWD aWD +<<<<<<< HEAD mhx pyN +======= +hux +eoO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ugV ugV lke @@ -173532,7 +177226,11 @@ fqs tCb fjt gij +<<<<<<< HEAD qnU +======= +cVn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 thI pFF pFF @@ -174049,11 +177747,19 @@ vzC aWD mog mog +<<<<<<< HEAD tvr ybD cSd ybD wde +======= +fFb +ybD +cSd +ybD +juV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mog mog aWD @@ -174820,11 +178526,19 @@ sCp sCp sCp wje +<<<<<<< HEAD npq mGP jjI mee fqq +======= +anX +mGP +jjI +mee +uqM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wje sCp sCp @@ -175077,7 +178791,11 @@ mog mog sCp wje +<<<<<<< HEAD uGg +======= +uca +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eVA mYb oZC @@ -175334,7 +179052,11 @@ mog mog sCp wje +<<<<<<< HEAD hCC +======= +cSC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jPb iBH eVA @@ -175591,7 +179313,11 @@ mog mog sCp wje +<<<<<<< HEAD aTW +======= +vno +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lAE afp wsW @@ -175849,7 +179575,11 @@ mog sCp wje wtH +<<<<<<< HEAD qPJ +======= +kjR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 buk ygJ wtH @@ -176339,7 +180069,11 @@ awM eqX efQ drK +<<<<<<< HEAD eTf +======= +unH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sKn ovD btZ @@ -177108,7 +180842,11 @@ jMN qhG lwZ diZ +<<<<<<< HEAD uNx +======= +fvq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 psi smn nUS @@ -177366,7 +181104,11 @@ qhG stP ipu qhG +<<<<<<< HEAD rRe +======= +evO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sIQ usm qhG @@ -177621,9 +181363,15 @@ dsP vPt vPt stP +<<<<<<< HEAD xKd vkp vqW +======= +tNK +vkp +qgD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 smn rbw btj @@ -178651,8 +182399,13 @@ fYe qhG bjc qhG +<<<<<<< HEAD xvz rRj +======= +ylS +mra +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rhi bDk eju diff --git a/_maps/modular_generic/station_m_evidence.dmm b/_maps/modular_generic/station_m_evidence.dmm index 816bc42f052..be88bbc860e 100644 --- a/_maps/modular_generic/station_m_evidence.dmm +++ b/_maps/modular_generic/station_m_evidence.dmm @@ -2,6 +2,18 @@ "a" = ( /turf/template_noop, /area/template_noop) +<<<<<<< HEAD +======= +"d" = ( +/obj/effect/turf_decal/tile/dark_red/opposingcorners, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb, +/obj/item/storage/secure/safe/directional/north{ + name = "evidence safe" + }, +/turf/open/floor/iron/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "h" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/effect/turf_decal/siding/red{ @@ -26,6 +38,7 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/template_noop) +<<<<<<< HEAD "p" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/effect/decal/cleanable/dirt/dust, @@ -35,6 +48,8 @@ }, /turf/open/floor/iron/dark, /area/template_noop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "q" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/spawner/random/sakhno/ammo, @@ -76,6 +91,18 @@ }, /turf/open/floor/iron/dark/textured_large, /area/template_noop) +<<<<<<< HEAD +======= +"z" = ( +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Secure Evidence Lockup"; + req_one_access = list("armory","detective") + }, +/obj/effect/turf_decal/tile/dark_red/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "A" = ( /obj/machinery/door/airlock/security{ name = "Evidence Lockup" @@ -153,6 +180,7 @@ }, /turf/open/floor/iron/dark/textured_large, /area/template_noop) +<<<<<<< HEAD "W" = ( /obj/machinery/door/window/brigdoor/left/directional/south{ name = "Secure Evidence Lockup"; @@ -162,6 +190,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/template_noop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "X" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/effect/turf_decal/siding/red{ @@ -205,9 +235,15 @@ a (3,1,1) = {" a G +<<<<<<< HEAD p s W +======= +d +s +z +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 h K m diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm index 2f89b834530..5931c31825a 100644 --- a/_maps/shuttles/emergency_birdshot.dmm +++ b/_maps/shuttles/emergency_birdshot.dmm @@ -226,6 +226,20 @@ /obj/item/trash/cheesie, /turf/open/floor/mineral/titanium/tiled, /area/shuttle/escape) +<<<<<<< HEAD +======= +"ll" = ( +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Airlock" + }, +/obj/docking_port/mobile/emergency{ + dir = 8; + name = "birdshot emergency shuttle"; + port_direction = 4 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lp" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -528,6 +542,7 @@ /obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) +<<<<<<< HEAD "zL" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -539,6 +554,8 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zV" = ( /obj/structure/toilet{ dir = 4 @@ -1504,7 +1521,11 @@ nQ nQ nQ LX +<<<<<<< HEAD zL +======= +ll +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LX lp rZ diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 2f6b923cd43..add77a41c71 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -8,10 +8,13 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "af" = ( /obj/structure/window/reinforced/spawner/directional/east, /turf/open/space, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ap" = ( /obj/structure/chair/wood/wings{ dir = 1 @@ -25,10 +28,13 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) +<<<<<<< HEAD "as" = ( /obj/structure/window/reinforced/spawner/directional/south, /turf/open/space, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aF" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -40,6 +46,7 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/shuttle/escape) +<<<<<<< HEAD "aJ" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -49,6 +56,8 @@ /obj/item/pen, /turf/open/floor/carpet/black, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aO" = ( /obj/structure/sign/plaques/kiddie{ desc = "It reads: PRIVATE EXHIBIT - Please inquire with library staff for guided tours."; @@ -90,6 +99,14 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"bl" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space/basic, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bn" = ( /obj/machinery/light/small/directional/east, /obj/machinery/power/apc/auto_name/directional/east, @@ -135,6 +152,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"bC" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -153,6 +180,7 @@ /obj/structure/lattice, /turf/open/space, /area/shuttle/escape) +<<<<<<< HEAD "cb" = ( /obj/machinery/power/smes/full, /obj/structure/cable, @@ -176,6 +204,8 @@ /obj/item/storage/box/ingredients/wildcard, /turf/open/floor/iron, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cu" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -191,6 +221,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/shuttle/escape) +<<<<<<< HEAD +======= +"cH" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -232,10 +269,13 @@ /obj/structure/lattice, /turf/open/space, /area/shuttle/escape) +<<<<<<< HEAD "ds" = ( /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "du" = ( /obj/machinery/door/airlock/external/ruin, /turf/open/floor/plating, @@ -369,17 +409,21 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "fA" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/space, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fL" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/lattice, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/space, /area/shuttle/escape) +<<<<<<< HEAD "fP" = ( /obj/docking_port/mobile/emergency{ movement_force = list("KNOCKDOWN"=3,"THROW"=6); @@ -387,6 +431,8 @@ }, /turf/closed/mineral, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fT" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -418,12 +464,15 @@ /obj/structure/flora/bush/leavy/style_random, /turf/open/misc/asteroid, /area/shuttle/escape) +<<<<<<< HEAD "gU" = ( /obj/machinery/mass_driver/chapelgun, /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gW" = ( /obj/structure/closet/crate/bin, /turf/open/floor/iron, @@ -439,12 +488,15 @@ }, /turf/open/floor/plating, /area/shuttle/escape) +<<<<<<< HEAD "hJ" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hN" = ( /obj/machinery/door/airlock/external/ruin, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -466,6 +518,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"hV" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space/basic, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hW" = ( /obj/structure/flora/bush/leavy/style_random, /obj/structure/flora/bush/reed/style_random, @@ -486,6 +548,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"hZ" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ib" = ( /obj/effect/spawner/structure/window/reinforced, /turf/closed/mineral, @@ -615,6 +688,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"jt" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jx" = ( /turf/open/floor/iron/dark, /area/shuttle/escape) @@ -624,6 +706,7 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating, /area/shuttle/escape) +<<<<<<< HEAD "jM" = ( /obj/structure/window/reinforced/spawner/directional/north{ pixel_y = 1 @@ -631,6 +714,8 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/space/basic, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jR" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, @@ -739,14 +824,25 @@ /obj/machinery/door/airlock/external/ruin, /turf/open/floor/plating, /area/shuttle/escape) +<<<<<<< HEAD "lj" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lm" = ( /obj/machinery/meter, /turf/open/floor/plating, /area/shuttle/escape) +<<<<<<< HEAD +======= +"ln" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lB" = ( /turf/open/floor/iron/chapel{ dir = 8 @@ -774,6 +870,13 @@ }, /turf/open/floor/iron, /area/shuttle/escape) +<<<<<<< HEAD +======= +"ml" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mm" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -1047,6 +1150,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "pW" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, @@ -1054,6 +1158,16 @@ name = "Outlet Injector" }, /turf/open/floor/plating/airless, +======= +"qi" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/carpet/black, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/escape) "qj" = ( /obj/effect/turf_decal/sand, @@ -1183,6 +1297,14 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"rZ" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sa" = ( /obj/structure/chair/wood{ dir = 4 @@ -1281,6 +1403,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"ti" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tm" = ( /obj/structure/table/wood/fancy, /obj/item/storage/box/matches{ @@ -1346,6 +1475,13 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) +<<<<<<< HEAD +======= +"uP" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uX" = ( /obj/machinery/power/smes, /turf/open/floor/plating, @@ -1470,6 +1606,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "wB" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/stack/sheet/glass/fifty, @@ -1481,6 +1618,8 @@ }, /turf/open/floor/plating, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wS" = ( /obj/machinery/camera/directional/east{ c_tag = "Monastery Secondary Dock"; @@ -1508,11 +1647,14 @@ /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/showroomfloor, /area/shuttle/escape) +<<<<<<< HEAD "xs" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, /turf/open/space/basic, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xt" = ( /obj/item/kirbyplants/organic/plant22, /turf/open/floor/iron/dark, @@ -1615,6 +1757,21 @@ /obj/item/melee/flyswatter, /turf/open/floor/iron, /area/shuttle/escape) +<<<<<<< HEAD +======= +"yP" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yR" = ( /obj/machinery/door/airlock/grunge{ name = "Chapel" @@ -1633,6 +1790,20 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"zh" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron{ + amount = 20 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plating, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zp" = ( /obj/item/storage/bag/plants, /obj/structure/extinguisher_cabinet/directional/east, @@ -1763,6 +1934,7 @@ }, /turf/open/misc/asteroid, /area/shuttle/escape) +<<<<<<< HEAD "AL" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/east, @@ -1770,10 +1942,13 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "AM" = ( /obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/shuttle/escape) +<<<<<<< HEAD "AU" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -1783,6 +1958,8 @@ /obj/item/pen, /turf/open/floor/iron/dark, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "AW" = ( /obj/item/clothing/under/misc/burial, /obj/item/clothing/under/misc/burial, @@ -1875,12 +2052,15 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "BW" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -1895,12 +2075,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/shuttle/escape) +<<<<<<< HEAD "Cl" = ( /obj/machinery/power/shuttle_engine/propulsion, /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Cn" = ( /obj/item/reagent_containers/cup/bucket, /obj/item/reagent_containers/cup/bucket, @@ -2142,6 +2325,19 @@ /obj/machinery/reagentgrinder, /turf/open/floor/iron, /area/shuttle/escape) +<<<<<<< HEAD +======= +"Fx" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/storage/box/ingredients/wildcard, +/turf/open/floor/iron, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FA" = ( /obj/machinery/button/crematorium{ id = "foo"; @@ -2280,6 +2476,7 @@ "HD" = ( /turf/open/floor/iron/chapel, /area/shuttle/escape) +<<<<<<< HEAD "HE" = ( /obj/structure/table/wood, /obj/item/reagent_containers/condiment/saltshaker{ @@ -2292,6 +2489,8 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HL" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/poppy, @@ -2388,16 +2587,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"Jf" = ( +/obj/machinery/power/smes/full, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jg" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "Jl" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/space, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jp" = ( /obj/structure/table, /obj/item/crowbar, @@ -2412,6 +2622,18 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) +<<<<<<< HEAD +======= +"Ju" = ( +/obj/item/book/codex_gigas, +/obj/machinery/camera/directional/south{ + c_tag = "Monastery Archives Aft"; + network = list("ss13","monastery") + }, +/obj/structure/rack/skeletal, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jv" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -2476,6 +2698,16 @@ /obj/structure/sink/directional/west, /turf/open/floor/iron, /area/shuttle/escape) +<<<<<<< HEAD +======= +"JZ" = ( +/obj/docking_port/mobile/emergency{ + movement_force = list("KNOCKDOWN"=3,"THROW"=6); + name = "\proper a monastery with engines strapped to it" + }, +/turf/closed/mineral, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Kd" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -2520,11 +2752,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "KL" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "KV" = ( /obj/structure/toilet{ pixel_y = 8 @@ -2539,6 +2774,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "Le" = ( /obj/structure/window/reinforced/spawner/directional/north{ pixel_y = 1 @@ -2546,6 +2782,8 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/space/basic, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Lg" = ( /obj/machinery/camera/directional/west{ c_tag = "Monastery Asteroid Dock Port"; @@ -2641,10 +2879,13 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD "Mt" = ( /obj/structure/lattice, /turf/open/space, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "MC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2681,6 +2922,15 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) +<<<<<<< HEAD +======= +"Nb" = ( +/obj/machinery/power/shuttle_engine/propulsion, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Nf" = ( /obj/structure/table, /obj/item/reagent_containers/condiment/flour, @@ -2830,6 +3080,13 @@ /obj/effect/station_crash/devastating, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"OL" = ( +/obj/structure/lattice, +/turf/open/space, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OM" = ( /obj/item/cultivator, /turf/open/floor/grass, @@ -2844,6 +3101,15 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) +<<<<<<< HEAD +======= +"Pb" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Pe" = ( /obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, @@ -2924,6 +3190,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"Qj" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Qq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -3196,6 +3474,13 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"SU" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/escape/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "SV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -3205,11 +3490,14 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) +<<<<<<< HEAD "SW" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/lattice, /turf/open/space/basic, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "SX" = ( /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -3438,6 +3726,23 @@ /obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating, /area/shuttle/escape) +<<<<<<< HEAD +======= +"VF" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ + name = "Outlet Injector" + }, +/turf/open/floor/plating/airless, +/area/shuttle/escape) +"VM" = ( +/obj/machinery/mass_driver/chapelgun, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "VN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 6 @@ -3453,6 +3758,7 @@ }, /turf/open/floor/iron, /area/shuttle/escape) +<<<<<<< HEAD "Wd" = ( /obj/item/book/codex_gigas, /obj/machinery/camera/directional/south{ @@ -3462,6 +3768,8 @@ /obj/structure/rack/skeletal, /turf/open/floor/iron/dark, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "We" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -3532,6 +3840,7 @@ /obj/machinery/biogenerator, /turf/open/floor/iron, /area/shuttle/escape) +<<<<<<< HEAD "WT" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -3539,6 +3848,8 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Xb" = ( /obj/structure/table/wood, /obj/item/kirbyplants/organic/plant22{ @@ -3571,6 +3882,16 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"Xx" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "XF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3677,6 +3998,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/shuttle/escape) +<<<<<<< HEAD +======= +"YU" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space/basic, +/area/shuttle/escape) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "YZ" = ( /obj/structure/table/wood, /obj/item/storage/bag/books, @@ -3717,6 +4048,14 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark, /area/shuttle/escape) +<<<<<<< HEAD +======= +"Zn" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/escape/brig) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Zr" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -3796,7 +4135,11 @@ JG JG JG Ho +<<<<<<< HEAD fP +======= +JZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zE lc zE @@ -4030,7 +4373,11 @@ nr pv Kf Fm +<<<<<<< HEAD aJ +======= +qi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ux nr nr @@ -4295,7 +4642,11 @@ nr nr nr nr +<<<<<<< HEAD af +======= +uP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hq JG JG @@ -4368,7 +4719,11 @@ Ac CA Dr Ex +<<<<<<< HEAD cr +======= +Fx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nr nr nr @@ -4461,7 +4816,11 @@ jx YC Km zE +<<<<<<< HEAD Le +======= +YU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JG JG JG @@ -4705,8 +5064,13 @@ oa QY Sq Tp +<<<<<<< HEAD gU WT +======= +VM +Xx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jn JG JG @@ -4832,18 +5196,30 @@ JG JG JG PB +<<<<<<< HEAD lj +======= +ti +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iw iw iw iw gl zE +<<<<<<< HEAD ds Zh ds ds KL +======= +SU +Zh +SU +SU +Zn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jc jc Pe @@ -4871,7 +5247,11 @@ jx nl Km zE +<<<<<<< HEAD jM +======= +hV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JG JG JG @@ -4914,7 +5294,11 @@ JG JG JG PB +<<<<<<< HEAD lj +======= +ti +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iw JG JG @@ -4942,7 +5326,11 @@ zP CM BX Gv +<<<<<<< HEAD HE +======= +yP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nr nr nr @@ -4996,10 +5384,17 @@ JG JG JG PB +<<<<<<< HEAD lj Mt af fA +======= +ti +OL +uP +ln +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zE zE AJ @@ -5073,7 +5468,11 @@ JG JG JG iw +<<<<<<< HEAD Mt +======= +OL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iw iw iw @@ -5112,7 +5511,11 @@ JA yc yc yc +<<<<<<< HEAD cb +======= +Jf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sf nr VN @@ -5158,7 +5561,11 @@ iw JG JG dp +<<<<<<< HEAD af +======= +uP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zE Zf zE @@ -5194,7 +5601,11 @@ Tk bI vj yc +<<<<<<< HEAD cb +======= +Jf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sf Tt dn @@ -5224,8 +5635,13 @@ Ho Ho Ho Ho +<<<<<<< HEAD AL Cl +======= +bC +Nb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JG JG JG @@ -5237,7 +5653,11 @@ JG JG JG bd +<<<<<<< HEAD Mt +======= +OL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bT zE zE @@ -5319,7 +5739,11 @@ aH iw iw iw +<<<<<<< HEAD as +======= +cH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zE zE jc @@ -5396,12 +5820,21 @@ JG JG "} (21,1,1) = {" +<<<<<<< HEAD af af hq SW hq xs +======= +uP +uP +hq +rZ +hq +bl +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zE jc jc @@ -5686,7 +6119,11 @@ Kg oc ZM yc +<<<<<<< HEAD wB +======= +zh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SQ yh Wo @@ -5724,7 +6161,11 @@ JG JG "} (25,1,1) = {" +<<<<<<< HEAD pW +======= +VF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Sg ow WG @@ -5806,7 +6247,11 @@ JG JG "} (26,1,1) = {" +<<<<<<< HEAD as +======= +cH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zE ox bb @@ -6041,7 +6486,11 @@ ID fY pD Iw +<<<<<<< HEAD Wd +======= +Ju +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zE JG JG @@ -6130,7 +6579,11 @@ JG Ho Ho Ho +<<<<<<< HEAD hJ +======= +jt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bv "} (30,1,1) = {" @@ -6197,7 +6650,11 @@ Am WM jx cZ +<<<<<<< HEAD cc +======= +hZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vt YZ Xu @@ -6225,7 +6682,11 @@ LK zE LK dX +<<<<<<< HEAD Jl +======= +ml +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fm zE zE @@ -6294,7 +6755,11 @@ PB Ho Ho Ho +<<<<<<< HEAD BW +======= +Pb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ye "} (32,1,1) = {" @@ -6302,9 +6767,15 @@ JG JG IM IM +<<<<<<< HEAD Jl Jl Jl +======= +ml +ml +ml +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 IM JG JG @@ -6356,7 +6827,11 @@ JG JG JG nr +<<<<<<< HEAD AU +======= +Qj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Am WM jx @@ -6392,7 +6867,11 @@ JG JG JG JG +<<<<<<< HEAD Jl +======= +ml +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fm zE zE @@ -6643,8 +7122,13 @@ JG JG JG JG +<<<<<<< HEAD Jl Jl +======= +ml +ml +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jS zE ko @@ -6892,7 +7376,11 @@ JG JG JG JG +<<<<<<< HEAD Mt +======= +OL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mm kJ IM diff --git a/_maps/shuttles/emergency_shadow.dmm b/_maps/shuttles/emergency_shadow.dmm index 69c2e6bcb6d..5afa72919cb 100644 --- a/_maps/shuttles/emergency_shadow.dmm +++ b/_maps/shuttles/emergency_shadow.dmm @@ -63,6 +63,19 @@ /obj/effect/mob_spawn/corpse/human/clown, /turf/open/floor/engine/plasma, /area/shuttle/escape/engine) +"cv" = ( +/obj/structure/table, +/obj/machinery/cell_charger{ + pixel_y = 9 + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high{ + pixel_y = 9 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/escape) "cF" = ( /obj/structure/table, /obj/item/storage/fancy/coffee_cart_rack{ @@ -214,18 +227,6 @@ }, /turf/open/floor/eighties, /area/shuttle/escape) -"kv" = ( -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/line{ - dir = 4 - }, -/obj/item/kirbyplants/organic/plant21, -/obj/structure/sign/warning/hot_temp/directional/west, -/obj/item/cigarette/rollie/cannabis, -/turf/open/floor/iron/dark/textured_large, -/area/shuttle/escape) "kx" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -274,19 +275,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark/smooth_large, /area/shuttle/escape) -"lF" = ( -/obj/structure/table, -/obj/machinery/cell_charger{ - pixel_y = 9 - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high{ - pixel_y = 9 - }, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron/dark/smooth_large, -/area/shuttle/escape) "lS" = ( /obj/structure/chair/comfy/shuttle, /obj/structure/reagent_dispensers/wall/peppertank/directional/north, @@ -471,6 +459,18 @@ }, /turf/open/floor/iron/dark/small, /area/shuttle/escape/engine) +"xy" = ( +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 4 + }, +/obj/item/kirbyplants/organic/plant21, +/obj/structure/sign/warning/hot_temp/directional/west, +/obj/item/cigarette/rollie/cannabis, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/escape) "yg" = ( /obj/effect/turf_decal/trimline/red/corner{ dir = 1 @@ -1337,7 +1337,7 @@ cH "} (12,1,1) = {" US -kv +xy Dq cV ZM @@ -1512,7 +1512,7 @@ yQ yQ YL AS -lF +cv US "} (24,1,1) = {" diff --git a/_maps/shuttles/emergency_wawa.dmm b/_maps/shuttles/emergency_wawa.dmm index c4e1efa5146..458ffa8a179 100644 --- a/_maps/shuttles/emergency_wawa.dmm +++ b/_maps/shuttles/emergency_wawa.dmm @@ -107,6 +107,11 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/plating, /area/shuttle/escape) +"at" = ( +/obj/structure/lattice, +/obj/structure/marker_beacon/burgundy, +/turf/template_noop, +/area/shuttle/escape) "au" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -196,6 +201,19 @@ }, /turf/open/floor/plating, /area/shuttle/escape) +"aV" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dont close or i will kill you" + }, +/obj/machinery/conveyor/auto{ + dir = 4 + }, +/obj/structure/fans/tiny/shield{ + max_integrity = 400; + name = "recycling shield" + }, +/turf/open/floor/plating, +/area/shuttle/escape) "aW" = ( /obj/machinery/recycler{ dir = 8 @@ -334,19 +352,6 @@ /obj/structure/chair/comfy/shuttle, /turf/open/floor/engine, /area/shuttle/escape) -"ee" = ( -/obj/machinery/conveyor/auto{ - dir = 8 - }, -/obj/machinery/door/poddoor/preopen{ - id = "dont close or i will kill you" - }, -/obj/structure/fans/tiny/shield{ - max_integrity = 400; - name = "recycling shield" - }, -/turf/open/floor/plating, -/area/shuttle/escape) "ga" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 8 @@ -421,19 +426,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) -"lE" = ( -/obj/machinery/door/poddoor/preopen{ - id = "dont close or i will kill you" - }, -/obj/machinery/conveyor/auto{ - dir = 4 - }, -/obj/structure/fans/tiny/shield{ - max_integrity = 400; - name = "recycling shield" - }, -/turf/open/floor/plating, -/area/shuttle/escape) "lI" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 8 @@ -571,6 +563,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape) +"za" = ( +/obj/machinery/conveyor/auto{ + dir = 8 + }, +/obj/machinery/door/poddoor/preopen{ + id = "dont close or i will kill you" + }, +/obj/structure/fans/tiny/shield{ + max_integrity = 400; + name = "recycling shield" + }, +/turf/open/floor/plating, +/area/shuttle/escape) "zT" = ( /obj/effect/turf_decal/siding/dark_blue{ dir = 1 @@ -718,6 +723,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) +"Pw" = ( +/obj/structure/lattice, +/turf/template_noop, +/area/shuttle/escape) "QP" = ( /obj/machinery/conveyor/auto/inverted{ dir = 1 @@ -758,19 +767,10 @@ "XE" = ( /turf/open/floor/iron/grimy, /area/shuttle/escape) -"XI" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/shuttle/escape) "Yk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape) -"Zg" = ( -/obj/structure/lattice, -/obj/structure/marker_beacon/burgundy, -/turf/template_noop, -/area/shuttle/escape) (1,1,1) = {" aa @@ -789,9 +789,9 @@ aa aa aa bq -lE +aV bq -lE +aV bq aa aa @@ -799,8 +799,8 @@ aa "} (2,1,1) = {" aa -Zg -XI +at +Pw al al al @@ -924,7 +924,7 @@ bk "} (7,1,1) = {" aa -Zg +at al al ay @@ -1048,9 +1048,9 @@ bq bq "} (12,1,1) = {" -Zg -XI -XI +at +Pw +Pw bq bq bq @@ -1089,9 +1089,9 @@ aa aa aa bq -ee +za bq -ee +za bq aa aa diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 503f0bc3bf7..b6ce0c3405e 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -463,6 +463,26 @@ /obj/structure/sign/warning/vacuum/external/directional/east, /turf/open/floor/plating, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"br" = ( +/obj/structure/table/wood, +/obj/item/storage/box/matches, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + name = "Captain Pete's Private Reserve Cuban Spaced Rum"; + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/cigarette/cigar, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/wood, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bt" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -805,11 +825,29 @@ /obj/machinery/light/small/directional/east, /obj/machinery/computer/monitor{ dir = 8 +<<<<<<< HEAD }, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/south, /obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ +======= + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"vB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack{ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 8 }, /turf/open/floor/iron/dark, @@ -969,6 +1007,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, +<<<<<<< HEAD /area/shuttle/pirate) "UI" = ( /obj/structure/table/wood, @@ -986,6 +1025,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/pirate) (1,1,1) = {" diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index b599698bc6f..ccca83f6fab 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -487,8 +487,14 @@ "xA" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 1; +<<<<<<< HEAD x_offset = -4; y_offset = -8 +======= + x_offset = 7; + y_offset = -3; + view_range = 10 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /turf/open/floor/carpet/royalblack/airless, /area/shuttle/pirate/flying_dutchman) diff --git a/_maps/shuttles/pirate_ex_interdyne.dmm b/_maps/shuttles/pirate_ex_interdyne.dmm index e8ad6a0e2d2..ad384c545e4 100644 --- a/_maps/shuttles/pirate_ex_interdyne.dmm +++ b/_maps/shuttles/pirate_ex_interdyne.dmm @@ -62,6 +62,17 @@ "aj" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"ak" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/reagentgrinder, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "al" = ( /obj/machinery/loot_locator{ dir = 8 @@ -144,10 +155,31 @@ }, /turf/open/floor/iron/dark, /area/shuttle/pirate) +<<<<<<< HEAD "aF" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 4; x_offset = -3; +======= +"aD" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + cell_type = /obj/item/stock_parts/power_store/battery/bluespace; + start_charge = 100 + }, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/power/smes/magical, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"aF" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + dir = 4; + x_offset = 0; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 y_offset = 7 }, /turf/open/floor/iron/dark, @@ -269,7 +301,11 @@ /area/shuttle/pirate) "aS" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, +<<<<<<< HEAD /obj/structure/closet/crate/freezer/blood, +======= +/obj/structure/closet/crate/freezer/blood/interdyne, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/light/small/blacklight/directional/south, /obj/machinery/iv_drip, /turf/open/floor/iron/dark, @@ -558,6 +594,7 @@ }, /turf/open/floor/plating/airless, /area/shuttle/pirate) +<<<<<<< HEAD "rV" = ( /obj/machinery/power/apc/auto_name/directional/north{ cell_type = /obj/item/stock_parts/power_store/battery/bluespace; @@ -572,6 +609,8 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sP" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, /obj/structure/table/optable, @@ -609,6 +648,66 @@ /obj/item/surgical_drapes, /turf/open/floor/iron/dark, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"wf" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/machinery/reagentgrinder, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/item/reagent_containers/cup/bottle, +/obj/item/reagent_containers/cup/bottle, +/obj/item/reagent_containers/cup/bottle, +/obj/item/reagent_containers/cup/beaker/meta, +/obj/item/stack/sheet/mineral/plasma/thirty, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yi" = ( /obj/machinery/door/airlock/hatch{ id_tag = "piratebridgebolt"; @@ -701,6 +800,7 @@ }, /turf/open/floor/plating, /area/shuttle/pirate) +<<<<<<< HEAD "Lv" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -766,6 +866,8 @@ /obj/item/reagent_containers/condiment/milk, /turf/open/floor/iron/dark, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Oe" = ( /obj/effect/turf_decal/tile/dark_blue{ dir = 4 @@ -871,7 +973,11 @@ af aj ap aw +<<<<<<< HEAD Lv +======= +ak +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bF aj af @@ -983,7 +1089,11 @@ fY bX iD aj +<<<<<<< HEAD rV +======= +aD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aG ep aj @@ -1106,7 +1216,11 @@ aj Rq bu VF +<<<<<<< HEAD MH +======= +wf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aj af af diff --git a/_maps/shuttles/pirate_geode.dmm b/_maps/shuttles/pirate_geode.dmm index afb582e4322..0b7d92797fe 100644 --- a/_maps/shuttles/pirate_geode.dmm +++ b/_maps/shuttles/pirate_geode.dmm @@ -430,8 +430,12 @@ "vY" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 8; +<<<<<<< HEAD x_offset = 10; y_offset = 5 +======= + x_offset = -8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/turf_decal/weather/dirt{ dir = 3 @@ -487,7 +491,11 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, +<<<<<<< HEAD /turf/open/floor/plating, +======= +/turf/open/floor/plating/airless, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/pirate) "yz" = ( /obj/structure/flora/lunar_plant/style_3, @@ -838,7 +846,11 @@ /obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, +<<<<<<< HEAD /turf/open/floor/plating, +======= +/turf/open/floor/plating/airless, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/pirate) "Pr" = ( /obj/structure/table/wood, diff --git a/_maps/shuttles/pirate_grey.dmm b/_maps/shuttles/pirate_grey.dmm index edceba20545..7bc1186359a 100644 --- a/_maps/shuttles/pirate_grey.dmm +++ b/_maps/shuttles/pirate_grey.dmm @@ -353,8 +353,14 @@ /obj/machinery/light/small/directional/west, /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 4; +<<<<<<< HEAD x_offset = -3; y_offset = 7 +======= + x_offset = -5; + y_offset = 12; + view_range = 10 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm/directional/south, @@ -734,6 +740,7 @@ /obj/structure/chair/stool/bar/directional/south, /turf/open/floor/iron/dark, /area/shuttle/pirate) +<<<<<<< HEAD "yA" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -741,6 +748,8 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -861,11 +870,29 @@ }, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/docking_port/mobile/pirate{ +<<<<<<< HEAD dir = 4 +======= + dir = 8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/structure/fans/tiny, /turf/open/floor/pod/light, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"Bu" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + cell_type = /obj/item/stock_parts/power_store/battery/bluespace + }, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/turf/open/floor/plating, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -920,6 +947,16 @@ /obj/item/flashlight, /turf/open/floor/plating, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"De" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Dn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -1218,6 +1255,12 @@ }, /turf/open/floor/plating, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"Pn" = ( +/turf/closed/wall, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "PM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/grille_or_waste, @@ -1279,6 +1322,7 @@ }, /turf/open/floor/plating, /area/shuttle/pirate) +<<<<<<< HEAD "RY" = ( /obj/machinery/power/apc/auto_name/directional/north{ cell_type = /obj/item/stock_parts/power_store/battery/bluespace @@ -1290,6 +1334,8 @@ /obj/effect/mapping_helpers/apc/cut_AI_wire, /turf/open/floor/plating, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Sb" = ( /obj/structure/reagent_dispensers/plumbed, /turf/open/floor/plating, @@ -1491,9 +1537,12 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/shuttle/pirate) +<<<<<<< HEAD "ZU" = ( /turf/closed/wall, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 (1,1,1) = {" je @@ -1667,7 +1716,11 @@ qm Ti "} (10,1,1) = {" +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ut kw CH @@ -1682,7 +1735,11 @@ Yj rV Tq uE +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HD "} (11,1,1) = {" @@ -1701,7 +1758,11 @@ wX Oa Tq Lo +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ei "} (12,1,1) = {" @@ -1710,7 +1771,11 @@ sB GE Yj Nu +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 am Eq yN @@ -1727,7 +1792,11 @@ HD HD XX vJ +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SB Nm Vw @@ -1739,14 +1808,22 @@ Sh gQ dd xy +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HD "} (14,1,1) = {" pk pS pU +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QO Ac Wc @@ -1762,11 +1839,19 @@ Sh zB "} (15,1,1) = {" +<<<<<<< HEAD ZU dI Sv ZU RY +======= +Pn +dI +Sv +Pn +Bu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xO yf Lk @@ -1784,7 +1869,11 @@ zB zB vM lO +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tJ xO ax @@ -1835,7 +1924,11 @@ Bh Uf DP zB +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (19,1,1) = {" je @@ -1848,17 +1941,29 @@ sm CY fj DG +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ci Sh Gb xm +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 je "} (20,1,1) = {" je +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ia NI yU @@ -1867,23 +1972,37 @@ bv aD cJ tU +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xl Sh AR lO +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 je "} (21,1,1) = {" je +<<<<<<< HEAD ZU ZU +======= +Pn +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xm yU OG qo pT +<<<<<<< HEAD yA sh ZU @@ -1892,16 +2011,31 @@ ZU pB ZU ZU +======= +De +sh +Pn +Zc +Pn +pB +Pn +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 je "} (22,1,1) = {" je je +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 EA ll FI Hh +<<<<<<< HEAD ZU ZU Hh @@ -1910,6 +2044,16 @@ gz ZU RX ZU +======= +Pn +Pn +Hh +Pn +gz +Pn +RX +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 je je "} @@ -1926,8 +2070,13 @@ ti Yf FI aV +<<<<<<< HEAD ZU ZU +======= +Pn +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 je je je @@ -1945,7 +2094,11 @@ Am FT pk pk +<<<<<<< HEAD ZU +======= +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 je je je @@ -1958,8 +2111,13 @@ je je pk zB +<<<<<<< HEAD ZU ZU +======= +Pn +Pn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zB pk pk diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm index c315f70d3b0..2e595ba817e 100644 --- a/_maps/shuttles/pirate_irs.dmm +++ b/_maps/shuttles/pirate_irs.dmm @@ -380,6 +380,7 @@ /obj/machinery/loot_locator, /turf/open/floor/pod/dark, /area/shuttle/pirate) +<<<<<<< HEAD "nj" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -387,6 +388,8 @@ }, /turf/open/floor/iron, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nk" = ( /obj/effect/turf_decal/tile/dark_blue/half{ dir = 8 @@ -1026,6 +1029,22 @@ /obj/structure/curtain, /turf/open/floor/iron/dark, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"Dr" = ( +/obj/structure/sign/departments/vault/directional/north, +/obj/effect/turf_decal/trimline/dark_blue/filled/end{ + dir = 8 + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/shower/directional/south, +/obj/effect/turf_decal/box, +/obj/structure/fluff/shower_drain, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Dy" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/white, @@ -1052,6 +1071,7 @@ }, /turf/open/floor/pod/dark, /area/shuttle/pirate) +<<<<<<< HEAD "Ek" = ( /obj/structure/sign/departments/vault/directional/north, /obj/effect/turf_decal/trimline/dark_blue/filled/end{ @@ -1065,6 +1085,8 @@ /obj/structure/fluff/shower_drain, /turf/open/floor/iron/dark, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Eq" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/bot, @@ -1424,6 +1446,20 @@ dir = 4 }, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"LV" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + y_offset = 11; + x_offset = -4; + view_range = 10 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LX" = ( /turf/open/floor/plating/airless, /area/shuttle/pirate) @@ -2262,7 +2298,11 @@ WR "} (13,1,1) = {" Rh +<<<<<<< HEAD nj +======= +LV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ev mA pO @@ -2422,7 +2462,11 @@ OC Mu OC hK +<<<<<<< HEAD Ek +======= +Dr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 BG XX wM diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index f5a63f28e49..08b645fb11b 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -80,10 +80,13 @@ /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/plating/airless, /area/shuttle/pirate) +<<<<<<< HEAD "eK" = ( /obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eU" = ( /obj/structure/chair/comfy/shuttle, /turf/open/floor/carpet/royalblack, @@ -105,6 +108,7 @@ dir = 8 }, /area/shuttle/pirate) +<<<<<<< HEAD "fk" = ( /obj/structure/rack{ dir = 8 @@ -130,6 +134,8 @@ /obj/item/gun/ballistic/rifle/boltaction/prime, /turf/open/floor/pod/dark, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fN" = ( /obj/structure/dresser, /obj/machinery/light/small/directional/north, @@ -149,6 +155,17 @@ }, /turf/open/floor/iron/dark, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"gw" = ( +/mob/living/basic/bot/medbot/nukie{ + name = "Mortimer"; + faction = list("pirate"); + desc = "A lowly medibot serving as the Silverscales' live-in manservant/butler/coat rack. They recently discovered it can heal people as well." + }, +/turf/open/floor/carpet/royalblack, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ht" = ( /obj/machinery/door/airlock/silver, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -177,6 +194,7 @@ /obj/effect/turf_decal/trimline/blue, /turf/open/floor/pod/light, /area/shuttle/pirate) +<<<<<<< HEAD "iD" = ( /obj/structure/table/glass, /obj/item/reagent_containers/cup/glass/bottle/tequila{ @@ -205,6 +223,8 @@ }, /turf/open/floor/iron/dark/textured, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "je" = ( /turf/template_noop, /area/template_noop) @@ -224,6 +244,7 @@ }, /turf/open/floor/pod/dark, /area/shuttle/pirate) +<<<<<<< HEAD "kq" = ( /obj/machinery/porta_turret/syndicate/energy{ dir = 8; @@ -234,6 +255,8 @@ }, /turf/open/floor/plating/airless, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ky" = ( /obj/structure/toilet{ dir = 8 @@ -341,6 +364,7 @@ "rB" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pirate) +<<<<<<< HEAD "st" = ( /mob/living/basic/bot/medbot/nukie{ name = "Mortimer"; @@ -349,6 +373,8 @@ }, /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sB" = ( /turf/open/floor/iron/dark/textured, /area/shuttle/pirate) @@ -400,6 +426,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/pod/dark, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"wE" = ( +/obj/machinery/porta_turret/syndicate/energy{ + dir = 8; + faction = list("pirate") + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xj" = ( /obj/structure/table/glass, /obj/item/storage/medkit/brute, @@ -418,6 +457,26 @@ }, /turf/open/floor/plating/airless, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"xR" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/melee/energy/sword/saber/purple{ + pixel_y = 12 + }, +/obj/item/melee/energy/sword/saber/purple{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/melee/energy/sword/saber/purple{ + pixel_x = 17 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/meter, @@ -497,9 +556,12 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate) "Bl" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/external/glass/ruin{ id_tag = "piratestarboardexternal" }, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/docking_port/stationary{ dir = 4; dwidth = 13; @@ -509,7 +571,11 @@ width = 26 }, /obj/docking_port/mobile/pirate{ +<<<<<<< HEAD dir = 4; +======= + dir = 8; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 launch_status = 0; movement_force = list("KNOCKDOWN"=0,"THROW"=0); name = "Silverscale Cruiser"; @@ -519,6 +585,12 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/cutaiwire, +<<<<<<< HEAD +======= +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "piratestarboardexternal" + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/pod/light, /area/shuttle/pirate) "Ch" = ( @@ -595,6 +667,17 @@ }, /turf/open/floor/plating, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"Id" = ( +/obj/structure/guncase, +/obj/item/gun/energy/laser/luxurypaywall{ + projectile_damage_multiplier = 1.30; + desc = "A laser gun modified to cost 20 credits to fire. Someone on the station should have an ID that works with this thing." + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ig" = ( /obj/structure/table/glass, /obj/machinery/chem_dispenser/drinks{ @@ -648,6 +731,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) +<<<<<<< HEAD "KB" = ( /obj/structure/rack{ dir = 8 @@ -670,6 +754,8 @@ }, /turf/open/floor/pod/dark, /area/shuttle/pirate) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Lk" = ( /obj/machinery/power/terminal{ dir = 1 @@ -725,8 +811,14 @@ "Mo" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 8; +<<<<<<< HEAD x_offset = 10; y_offset = 5 +======= + x_offset = 12; + y_offset = 5; + view_range = 10 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /turf/open/floor/iron/dark/side{ dir = 8 @@ -761,6 +853,7 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/pod/light, /area/shuttle/pirate) +<<<<<<< HEAD "NL" = ( /obj/structure/guncase, /obj/item/gun/energy/laser/luxurypaywall{ @@ -768,6 +861,35 @@ desc = "A laser gun modified to cost 20 credits to fire. Someone on the station should have an ID that works with this thing." }, /turf/open/floor/pod/dark, +======= +"Oo" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/glass/bottle/tequila{ + pixel_x = 10; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/glass/bottle/hcider{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -15; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = 1; + pixel_y = 13 + }, +/obj/item/reagent_containers/cup/glass/bottle/gin{ + pixel_x = -10; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/bottle/wine{ + pixel_x = 3; + pixel_y = 5 + }, +/turf/open/floor/iron/dark/textured, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/pirate) "Ox" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -832,6 +954,34 @@ /obj/structure/fireplace, /turf/open/floor/iron/dark/textured, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"RO" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/item/ammo_box/strilka310/phasic{ + pixel_y = -5; + pixel_x = 5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = 5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = -5 + }, +/obj/item/gun/ballistic/rifle/boltaction/prime{ + pixel_y = 4 + }, +/obj/item/gun/ballistic/rifle/boltaction/prime, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "RU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -930,6 +1080,21 @@ /obj/machinery/recharger, /turf/open/floor/iron/dark, /area/shuttle/pirate) +<<<<<<< HEAD +======= +"Wd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "pirateportexternal"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ww" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 8 @@ -976,6 +1141,7 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/iron/dark/textured, /area/shuttle/pirate) +<<<<<<< HEAD "Yb" = ( /obj/structure/rack{ dir = 8 @@ -991,6 +1157,16 @@ pixel_x = 17 }, /obj/effect/turf_decal/bot, +======= +"Yj" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, +/obj/effect/turf_decal/bot, +/obj/item/gun/ballistic/shotgun/doublebarrel/slugs, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/pod/dark, /area/shuttle/pirate) "YD" = ( @@ -1064,7 +1240,11 @@ rB Ww Ww Ww +<<<<<<< HEAD eK +======= +Ww +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ww Ww Ww @@ -1097,15 +1277,25 @@ TV rB rB dQ +<<<<<<< HEAD Lf +======= +Wd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rB aZ aZ aZ Is +<<<<<<< HEAD KB fk Yb +======= +Yj +RO +xR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rB Fk QI @@ -1143,7 +1333,11 @@ fR Ox Qm wa +<<<<<<< HEAD NL +======= +Id +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rB UV wa @@ -1204,7 +1398,11 @@ dT xs Ai fT +<<<<<<< HEAD iD +======= +Oo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HD "} (11,1,1) = {" @@ -1235,7 +1433,11 @@ xs Ai am am +<<<<<<< HEAD st +======= +gw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 am am Ai @@ -1341,7 +1543,11 @@ rB rB "} (18,1,1) = {" +<<<<<<< HEAD kq +======= +wE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rB zm RU @@ -1357,7 +1563,11 @@ rB Uf ZY rB +<<<<<<< HEAD kq +======= +wE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (19,1,1) = {" je diff --git a/_maps/shuttles/ruin_cyborg_mothership.dmm b/_maps/shuttles/ruin_cyborg_mothership.dmm index 5172fad5942..d8e0d9cc67f 100644 --- a/_maps/shuttles/ruin_cyborg_mothership.dmm +++ b/_maps/shuttles/ruin_cyborg_mothership.dmm @@ -1,10 +1,13 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +<<<<<<< HEAD "ad" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /turf/template_noop, /area/shuttle/ruin/cyborg_mothership) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aB" = ( /obj/machinery/conveyor{ dir = 8; @@ -47,6 +50,14 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD +======= +"dI" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/template_noop, +/area/shuttle/ruin/cyborg_mothership) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/circuit/airless, @@ -143,12 +154,15 @@ }, /turf/open/floor/circuit/airless, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD "jm" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /turf/template_noop, /area/shuttle/ruin/cyborg_mothership) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jx" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -160,6 +174,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD "kn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/reinforced/spawner/directional/north, @@ -169,6 +184,8 @@ /obj/machinery/power/port_gen/pacman, /turf/open/floor/plating/airless, /area/shuttle/ruin/cyborg_mothership) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ks" = ( /obj/machinery/holopad/secure, /obj/structure/cable, @@ -190,6 +207,7 @@ /obj/item/stack/rods, /turf/template_noop, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD "lo" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/closet/crate/preopen, @@ -202,6 +220,8 @@ /obj/item/stack/rods/fifty, /turf/open/floor/plating/airless, /area/shuttle/ruin/cyborg_mothership) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lv" = ( /obj/structure/cable, /obj/machinery/conveyor{ @@ -257,6 +277,21 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD +======= +"nM" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/closet/crate/preopen, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/rods/fifty, +/turf/open/floor/plating/airless, +/area/shuttle/ruin/cyborg_mothership) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oe" = ( /obj/structure/spacevine, /obj/structure/cable, @@ -532,11 +567,14 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD "Bp" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/north, /turf/template_noop, /area/shuttle/ruin/cyborg_mothership) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BD" = ( /obj/structure/cable, /obj/machinery/power/solar, @@ -748,6 +786,15 @@ }, /turf/open/floor/plating/airless, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD +======= +"OY" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/template_noop, +/area/shuttle/ruin/cyborg_mothership) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Pf" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/closet/crate/solarpanel_small, @@ -803,11 +850,32 @@ /obj/machinery/light/floor, /turf/open/floor/iron/showroomfloor, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD +======= +"SV" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/template_noop, +/area/shuttle/ruin/cyborg_mothership) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ty" = ( /obj/structure/lattice, /obj/item/stack/sheet/mineral/titanium, /turf/template_noop, /area/shuttle/ruin/cyborg_mothership) +<<<<<<< HEAD +======= +"TH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/obj/machinery/power/port_gen/pacman, +/turf/open/floor/plating/airless, +/area/shuttle/ruin/cyborg_mothership) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TZ" = ( /obj/item/radio/intercom/directional/south, /obj/structure/ai_core, @@ -933,7 +1001,11 @@ hR hR kz kz +<<<<<<< HEAD jm +======= +SV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zn hR hR @@ -959,7 +1031,11 @@ kz zZ gG zZ +<<<<<<< HEAD jm +======= +SV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zn hR hR @@ -980,12 +1056,20 @@ hR hR hR hR +<<<<<<< HEAD kn +======= +TH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RD wA jx Pf +<<<<<<< HEAD jm +======= +SV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zn hR hR @@ -1141,7 +1225,11 @@ hR zF Ge dC +<<<<<<< HEAD Bp +======= +dI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb hR "} @@ -1166,7 +1254,11 @@ hR hR qc of +<<<<<<< HEAD jm +======= +SV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb hR "} @@ -1192,7 +1284,11 @@ so ss of dC +<<<<<<< HEAD jm +======= +SV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb "} (12,1,1) = {" @@ -1242,7 +1338,11 @@ so KN Hg qn +<<<<<<< HEAD ad +======= +OY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb "} (14,1,1) = {" @@ -1266,7 +1366,11 @@ hR hR mC of +<<<<<<< HEAD ad +======= +OY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb hR "} @@ -1291,7 +1395,11 @@ hR Yl Jj Ai +<<<<<<< HEAD Bp +======= +dI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb hR "} @@ -1430,12 +1538,20 @@ hR hR hR hR +<<<<<<< HEAD lo +======= +nM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 YC yd KR Rv +<<<<<<< HEAD ad +======= +OY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb hR hR @@ -1459,7 +1575,11 @@ kz zZ WO zZ +<<<<<<< HEAD ad +======= +OY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb hR hR @@ -1483,7 +1603,11 @@ hR hR kz kz +<<<<<<< HEAD ad +======= +OY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vb hR hR diff --git a/_maps/shuttles/starfury_corvette.dmm b/_maps/shuttles/starfury_corvette.dmm index b9e8ce992f6..2e9547bb085 100644 --- a/_maps/shuttles/starfury_corvette.dmm +++ b/_maps/shuttles/starfury_corvette.dmm @@ -56,6 +56,36 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_corvette) +<<<<<<< HEAD +======= +"ai" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/corvette{ + dir = 8; + y_offset = 0; + x_offset = -3 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/shuttle/sbc_corvette) +"aj" = ( +/obj/machinery/door/airlock/external{ + id_tag = "SBC_corvette_bolt"; + name = "Syndicate Corvette Airlock" + }, +/obj/docking_port/mobile/syndicate_corvette{ + preferred_direction = 1; + port_direction = 4 + }, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/sbc_corvette) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ak" = ( /obj/structure/chair/comfy/shuttle{ name = "tactical chair" @@ -266,6 +296,16 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_corvette) +<<<<<<< HEAD +======= +"aO" = ( +/obj/machinery/door/poddoor/preopen{ + id = "SBC_corvette_blast" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/shuttle/sbc_corvette) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aP" = ( /obj/machinery/door/airlock/hatch{ name = "Syndicate Corvette Cockpit" @@ -347,6 +387,7 @@ "aZ" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/sbc_corvette) +<<<<<<< HEAD "eV" = ( /obj/machinery/door/airlock/external{ id_tag = "SBC_corvette_bolt"; @@ -360,6 +401,8 @@ }, /turf/open/floor/plating, /area/shuttle/sbc_corvette) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qH" = ( /obj/structure/table, /obj/item/wrench, @@ -369,6 +412,7 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_corvette) +<<<<<<< HEAD "rQ" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/corvette{ dir = 8 @@ -378,6 +422,8 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_corvette) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uo" = ( /turf/open/floor/iron/dark/small, /area/shuttle/sbc_corvette) @@ -426,6 +472,7 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_corvette) +<<<<<<< HEAD "Zi" = ( /obj/machinery/door/poddoor/preopen{ id = "SBC_corvette_blast" @@ -433,6 +480,8 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/sbc_corvette) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 (1,1,1) = {" aa @@ -504,7 +553,11 @@ aT aZ aU as +<<<<<<< HEAD eV +======= +aj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (9,1,1) = {" aM @@ -534,12 +587,17 @@ ay aM "} (12,1,1) = {" +<<<<<<< HEAD Zi +======= +aO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qH ac aW ae aQ +<<<<<<< HEAD Zi "} (13,1,1) = {" @@ -558,5 +616,25 @@ Zi Zi Zi Zi +======= +aO +"} +(13,1,1) = {" +aO +aO +ai +ag +ap +aO +aO +"} +(14,1,1) = {" +aa +aO +aO +aO +aO +aO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa "} diff --git a/_maps/shuttles/whiteship_birdshot.dmm b/_maps/shuttles/whiteship_birdshot.dmm index a8d1a879aca..be2ae8e5ade 100644 --- a/_maps/shuttles/whiteship_birdshot.dmm +++ b/_maps/shuttles/whiteship_birdshot.dmm @@ -63,6 +63,7 @@ }, /turf/open/floor/iron/small, /area/shuttle/abandoned/crew) +<<<<<<< HEAD "cj" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/item/reagent_containers/condiment/enzyme, @@ -90,6 +91,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/shuttle/abandoned/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cB" = ( /obj/structure/chair/stool/directional/west, /obj/effect/decal/cleanable/dirt, @@ -386,6 +389,36 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/shuttle/abandoned/crew) +<<<<<<< HEAD +======= +"nz" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/food/meat/slab/synthmeat{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/food/meat/slab/synthmeat{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/food/meat/slab/synthmeat{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/condiment/milk, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria, +/area/shuttle/abandoned/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -1950,7 +1983,11 @@ fU Gg GS wY +<<<<<<< HEAD cj +======= +nz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JP Kf jv diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index 578f3dba14d..cba527e12d1 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -495,6 +495,19 @@ }, /turf/open/floor/wood, /area/shuttle/abandoned/bridge) +<<<<<<< HEAD +======= +"wM" = ( +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/abandoned/cargo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, @@ -665,6 +678,7 @@ /obj/effect/spawner/random/maintenance/six, /turf/open/floor/pod/dark, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD "Gu" = ( /obj/structure/cable, /obj/structure/cable/layer1, @@ -675,6 +689,8 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/abandoned/cargo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ha" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 4 @@ -682,6 +698,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD +======= +"Hw" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ + dir = 1; + x_offset = 0; + y_offset = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/shuttle/abandoned/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HI" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/cable, @@ -965,6 +994,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD "Xq" = ( /obj/machinery/light/small/directional/east, /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ @@ -975,6 +1005,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "XT" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/decal/cleanable/dirt, @@ -1145,7 +1177,11 @@ WF gK US gK +<<<<<<< HEAD Gu +======= +wM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aG oB DC @@ -1247,7 +1283,11 @@ kP EQ aQ Fj +<<<<<<< HEAD Xq +======= +Hw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 su "} (12,1,1) = {" diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index 4ce4153077d..fe7ca4db4d0 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -34,6 +34,14 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/plating/airless, /area/shuttle/abandoned) +<<<<<<< HEAD +======= +"aX" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "be" = ( /obj/machinery/power/shuttle_engine/propulsion/left, /turf/open/floor/plating/airless, @@ -202,11 +210,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/shuttle/abandoned) +<<<<<<< HEAD "uj" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating/airless, /area/shuttle/abandoned) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vu" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 3f2400cd69c..87ba6632b25 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -135,6 +135,7 @@ "hN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ +<<<<<<< HEAD dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -244,6 +245,97 @@ }, /turf/open/floor/pod/light, /area/shuttle/abandoned/bridge) +======= + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/greenglow, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/plating, +/area/shuttle/abandoned/bar) +"id" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/abandoned/crew) +"ie" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/belt/utility{ + pixel_y = 9 + }, +/obj/item/screwdriver, +/obj/effect/turf_decal/trimline/brown/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/turf/open/floor/pod/dark, +/area/shuttle/abandoned/engine) +"ig" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/blood/gibs/old, +/obj/structure/cable, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/shuttle/abandoned/bar) +"ik" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/external/ruin{ + id_tag = "ntms_exterior"; + name = "NTMS-037 Mining Airlock" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "exterior_whiteship" + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/abandoned/bar) +"iI" = ( +/obj/effect/spawner/structure/window/reinforced/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_bridge"; + name = "Cockpit Emergency Blast Door" + }, +/turf/open/floor/plating, +/area/shuttle/abandoned/bridge) +"jr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/shuttle_engine/propulsion/left{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned/engine) +"jM" = ( +/obj/structure/table, +/obj/machinery/microwave{ + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 6 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/cafeteria{ + dir = 1 + }, +/area/shuttle/abandoned/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kq" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -251,6 +343,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD +======= +"ku" = ( +/obj/machinery/door/airlock/external/ruin{ + name = "External Freight Airlock" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/docking_port/mobile{ + callTime = 250; + can_move_docking_ports = 1; + dir = 2; + shuttle_id = "whiteship"; + launch_status = 0; + movement_force = list("KNOCKDOWN"=0,"THROW"=0); + name = "Mining Shuttle"; + port_direction = 8; + preferred_direction = 4 + }, +/turf/open/floor/plating, +/area/shuttle/abandoned/cargo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -280,6 +398,7 @@ dir = 1 }, /area/shuttle/abandoned/bar) +<<<<<<< HEAD "lS" = ( /obj/machinery/door/airlock/external/ruin{ name = "External Freight Airlock" @@ -303,6 +422,8 @@ }, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -340,6 +461,7 @@ /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/bridge) +<<<<<<< HEAD "mI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -349,6 +471,17 @@ }, /turf/open/floor/plating/airless, /area/shuttle/abandoned/bar) +======= +"mX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned/engine) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nt" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -368,6 +501,7 @@ /obj/structure/cable, /turf/open/floor/mineral/titanium/tiled/white, /area/shuttle/abandoned/bridge) +<<<<<<< HEAD "pD" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 8 @@ -378,6 +512,17 @@ }, /turf/open/floor/plating/airless, /area/shuttle/abandoned/engine) +======= +"oQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/shuttle_engine/propulsion/right{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pI" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, @@ -430,6 +575,7 @@ }, /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned/bar) +<<<<<<< HEAD "rX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -438,6 +584,9 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bar) "sh" = ( +======= +"rC" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -446,6 +595,16 @@ }, /turf/open/floor/plating/airless, /area/shuttle/abandoned/engine) +<<<<<<< HEAD +======= +"rX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/shuttle/abandoned/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair{ @@ -498,6 +657,7 @@ /obj/item/gun/energy/laser/retro, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD "tR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -507,6 +667,8 @@ }, /turf/open/floor/plating/airless, /area/shuttle/abandoned/engine) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uf" = ( /obj/effect/turf_decal/trimline/white/corner{ dir = 8 @@ -564,6 +726,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/abandoned/engine) +<<<<<<< HEAD "zd" = ( /obj/machinery/cell_charger, /obj/structure/table, @@ -581,6 +744,12 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 8 }, +======= +"zl" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/trimline/white/filled/warning{ dir = 4 }, @@ -609,6 +778,7 @@ /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/pod/light, /area/shuttle/abandoned/bridge) +<<<<<<< HEAD "zJ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, @@ -678,6 +848,81 @@ }, /turf/open/floor/plating/airless, /area/shuttle/abandoned/engine) +======= +"zu" = ( +/obj/machinery/cell_charger, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/stock_parts/power_store/cell/emproof/empty{ + pixel_y = 7; + pixel_x = 5 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/shuttle/abandoned/cargo) +"zJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/blood/footprints{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/shuttle/abandoned/bar) +"Am" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/machinery/space_heater, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/abandoned/cargo) +"Bk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plating, +/area/shuttle/abandoned/cargo) +"BL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/plating, +/area/shuttle/abandoned/cargo) +"BS" = ( +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/abandoned/bar) +"CG" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/abandoned/engine) +"CQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plating, +/area/shuttle/abandoned/cargo) +"Fr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/blood/footprints{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron, +/area/shuttle/abandoned/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FW" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, /obj/machinery/door/poddoor{ @@ -876,6 +1121,7 @@ /obj/effect/decal/cleanable/blood/splatter/over_window, /turf/open/floor/plating, /area/shuttle/abandoned/bar) +<<<<<<< HEAD "Md" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 8 @@ -886,6 +1132,8 @@ }, /turf/open/floor/plating/airless, /area/shuttle/abandoned/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ml" = ( /obj/effect/turf_decal/delivery, /obj/machinery/suit_storage_unit/standard_unit{ @@ -909,6 +1157,19 @@ /obj/structure/cable, /turf/open/floor/mineral/titanium/tiled/yellow, /area/shuttle/abandoned/engine) +<<<<<<< HEAD +======= +"MI" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned/engine) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Nh" = ( /turf/closed/wall/mineral/plastitanium, /area/shuttle/abandoned/engine) @@ -940,6 +1201,19 @@ /obj/item/storage/box/donkpockets, /turf/open/floor/bamboo, /area/shuttle/abandoned/bar) +<<<<<<< HEAD +======= +"OZ" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Pe" = ( /obj/machinery/button/door/directional/north{ id = "whiteship_port"; @@ -953,6 +1227,18 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD +======= +"Pz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/shuttle_engine/propulsion/left{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned/bar) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "PR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -1000,6 +1286,7 @@ }, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD "Rw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1009,6 +1296,8 @@ }, /turf/open/floor/plating/airless, /area/shuttle/abandoned/bar) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "RF" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/shuttle{ @@ -1053,6 +1342,38 @@ }, /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD +======= +"Ta" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/effect/turf_decal/trimline/white/filled/warning{ + dir = 1 + }, +/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ + dir = 4; + view_range = 14; + y_offset = 5; + x_offset = 0 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door{ + id = "whiteship_windows"; + name = "NTMS-037 Windows Blast Door Control"; + pixel_x = -24; + pixel_y = 6 + }, +/obj/machinery/button/door{ + id = "whiteship_bridge"; + name = "NTMS-037 Bridge Blast Door Control"; + pixel_x = -24; + pixel_y = -6 + }, +/turf/open/floor/pod/light, +/area/shuttle/abandoned/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Tf" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/brown/filled/shrink_ccw{ @@ -1207,9 +1528,15 @@ (1,1,1) = {" Nh +<<<<<<< HEAD tR Fz sh +======= +jr +mX +rC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nh Gu Gu @@ -1222,6 +1549,7 @@ Gu "} (2,1,1) = {" Nh +<<<<<<< HEAD pD pD pD @@ -1229,6 +1557,15 @@ CG tR Fz sh +======= +MI +MI +MI +CG +jr +mX +rC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gL Gu Gu @@ -1241,9 +1578,15 @@ Ss bl eT CG +<<<<<<< HEAD pD pD pD +======= +MI +MI +MI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CG Gu Gu @@ -1320,8 +1663,13 @@ NV NV nN NV +<<<<<<< HEAD Rw mI +======= +Pz +oQ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 BS Gu "} @@ -1332,20 +1680,36 @@ bF eD Nt iI +<<<<<<< HEAD kk mH NV Md Md +======= +Ta +mH +NV +OZ +OZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Of Gu "} (10,1,1) = {" +<<<<<<< HEAD lS Bk vM Wj zd +======= +ku +Bk +vM +Wj +zu +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iI qu YV diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index 985a7133a94..413d5d19f5a 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -80,6 +80,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/shuttle/abandoned) +<<<<<<< HEAD +======= +"cE" = ( +/obj/effect/turf_decal/bot_white, +/obj/machinery/atmospherics/components/tank/air/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/shuttle/abandoned) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cS" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -452,6 +463,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/shuttle/abandoned) +<<<<<<< HEAD "rY" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/atmospherics/components/tank/air/layer4{ @@ -460,6 +472,8 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/abandoned) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sl" = ( /obj/machinery/door/poddoor{ id = "whiteship_bridge" @@ -1359,7 +1373,11 @@ CG Il pV Bu +<<<<<<< HEAD rY +======= +cE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Sc ot cx diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm index 82f32e910af..f542c1b02ff 100644 --- a/_maps/shuttles/whiteship_tram.dmm +++ b/_maps/shuttles/whiteship_tram.dmm @@ -496,6 +496,28 @@ }, /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) +<<<<<<< HEAD +======= +"ca" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/multitool{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/stack/cable_coil{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/smooth_large, +/area/shuttle/abandoned/engine) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cg" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1143,6 +1165,21 @@ /obj/structure/lattice, /turf/template_noop, /area/shuttle/abandoned/cargo) +<<<<<<< HEAD +======= +"Ft" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ + dir = 8; + x_offset = 0; + y_offset = 13 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 1 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/abandoned/bridge) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FQ" = ( /obj/item/shard/titanium, /obj/structure/grille/broken, @@ -1236,6 +1273,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) +<<<<<<< HEAD "NZ" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ dir = 8; @@ -1248,6 +1286,8 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/textured_large, /area/shuttle/abandoned/bridge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OL" = ( /obj/machinery/computer/shuttle/white_ship/bridge{ dir = 8 @@ -1257,6 +1297,7 @@ }, /turf/open/floor/iron/dark/textured_large, /area/shuttle/abandoned/bridge) +<<<<<<< HEAD "OV" = ( /obj/structure/cable, /obj/structure/table, @@ -1276,6 +1317,8 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "PI" = ( /obj/machinery/door/window/survival_pod/left/directional/east, /obj/effect/turf_decal/delivery/red, @@ -1569,7 +1612,11 @@ RK dn yd OL +<<<<<<< HEAD NZ +======= +Ft +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dx "} (5,1,1) = {" @@ -1605,7 +1652,11 @@ da cl Rs ad +<<<<<<< HEAD OV +======= +ca +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 NU bx ad diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index d6c0d2fec79..e88cd3dc383 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -19,6 +19,17 @@ "ac" = ( /turf/closed/wall/mineral/plastitanium, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"ad" = ( +/obj/machinery/door/poddoor/preopen{ + id = "syndie_battlecruier_bridge_blast" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ae" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/sbc_starfury) @@ -398,6 +409,17 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"bx" = ( +/obj/machinery/door/poddoor/preopen{ + id = "syndie_battlecruier_bridge_blast" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "by" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -627,6 +649,7 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "cy" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -635,6 +658,8 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cz" = ( /obj/machinery/newscaster/directional/south, /obj/structure/table/reinforced/plastitaniumglass, @@ -975,6 +1000,27 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"dO" = ( +/obj/structure/sign/warning/secure_area/directional/east{ + desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; + icon_state = "space"; + name = "KEEP CLEAR: SHUTTLE BAY" + }, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/iron/dark, +/area/shuttle/sbc_starfury) +"dS" = ( +/obj/structure/sign/warning/secure_area/directional/west{ + desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; + icon_state = "space"; + name = "KEEP CLEAR: SHUTTLE BAY" + }, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/iron/dark, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -1554,6 +1600,18 @@ /obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"fE" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fF" = ( /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/door/firedoor/heavy, @@ -1576,6 +1634,17 @@ /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/iron/showroomfloor, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"fR" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1599,6 +1668,20 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"gp" = ( +/obj/structure/sign/warning/secure_area/directional/east{ + desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; + icon_state = "space"; + name = "KEEP CLEAR: SHUTTLE BAY" + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gx" = ( /obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser{ dir = 8 @@ -1628,6 +1711,23 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"gC" = ( +/obj/structure/sign/warning/secure_area/directional/west{ + desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; + icon_state = "space"; + name = "KEEP CLEAR: SHUTTLE BAY" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gD" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -1667,6 +1767,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "gN" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -1680,6 +1781,8 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gO" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -2129,6 +2232,39 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"hZ" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/gun/ballistic/automatic/m90{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/ballistic/automatic/m90, +/obj/item/gun/ballistic/automatic/m90{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/pod/light, +/area/shuttle/sbc_starfury) +"ia" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/gun/ballistic/shotgun/bulldog{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/ballistic/shotgun/bulldog, +/obj/item/gun/ballistic/shotgun/bulldog{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/pod/light, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ib" = ( /obj/structure/closet/secure_closet{ anchored = 1; @@ -2275,6 +2411,23 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"io" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/gun/ballistic/revolver/syndicate{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/gun/ballistic/revolver/syndicate{ + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/pod/light, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iq" = ( /obj/machinery/microwave, /obj/structure/table/wood, @@ -2341,6 +2494,18 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"ix" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/storage/belt/military, +/obj/item/ammo_box/magazine/m7mm, +/obj/item/gun/ballistic/automatic/l6_saw, +/turf/open/floor/pod/light, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iy" = ( /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -2394,6 +2559,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/red, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"iG" = ( +/obj/structure/table/wood, +/obj/item/folder/syndicate/red{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/storage/box/matches, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/floor/carpet/red, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iI" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -2421,6 +2607,28 @@ }, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"iN" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/mod/control/pre_equipped/elite{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/clothing/mask/gas/syndicate{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/mod/control/pre_equipped/elite{ + pixel_x = -4 + }, +/obj/item/clothing/mask/gas/syndicate, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/pod/light, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iO" = ( /obj/structure/table, /obj/item/shield/energy{ @@ -3016,6 +3224,21 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"kN" = ( +/obj/structure/sign/warning/secure_area/directional/north{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + name = "EXTERNAL AIRLOCK" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/red/directional/north, +/turf/open/floor/plating, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kO" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow{ @@ -3075,6 +3298,7 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "lg" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -3083,6 +3307,19 @@ dir = 8 }, /turf/open/floor/iron, +======= +"lf" = ( +/obj/structure/sign/warning/secure_area/directional/north{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + name = "EXTERNAL AIRLOCK" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/red/directional/north, +/turf/open/floor/plating, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/sbc_starfury) "lh" = ( /obj/effect/turf_decal/tile/yellow{ @@ -3494,6 +3731,7 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/engine, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "nu" = ( /obj/machinery/door/poddoor/preopen{ id = "syndie_battlecruier_bridge_blast" @@ -3502,6 +3740,8 @@ /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nz" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, @@ -3698,6 +3938,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "qT" = ( /obj/structure/sign/warning/secure_area/directional/east{ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; @@ -3707,6 +3948,8 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -3765,6 +4008,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "rF" = ( /obj/structure/rack{ dir = 8 @@ -3776,6 +4020,8 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sh" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/dark_green/opposingcorners{ @@ -4044,6 +4290,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "xo" = ( /obj/structure/rack{ dir = 8 @@ -4068,6 +4315,8 @@ }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xp" = ( /obj/structure/dresser, /turf/open/floor/carpet, @@ -4337,6 +4586,7 @@ /obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "BG" = ( /obj/structure/sign/warning/secure_area/directional/west{ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; @@ -4346,6 +4596,8 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -4357,6 +4609,7 @@ /obj/effect/turf_decal/tile/dark_red, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "BK" = ( /obj/structure/sign/warning/secure_area/directional/west{ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; @@ -4371,6 +4624,8 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BN" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, @@ -4451,6 +4706,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"Dy" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Dz" = ( /obj/item/crowbar/red, /obj/structure/cable, @@ -4458,6 +4729,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "DM" = ( /obj/structure/rack{ dir = 8 @@ -4473,6 +4745,8 @@ }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DS" = ( /obj/structure/rack, /obj/item/stack/sheet/mineral/uranium{ @@ -4489,6 +4763,7 @@ /obj/structure/cable, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "Es" = ( /obj/structure/table/wood, /obj/item/folder/syndicate/red{ @@ -4507,6 +4782,8 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/carpet/red, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ex" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -4726,6 +5003,7 @@ temperature = 80 }, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "Hr" = ( /obj/structure/rack{ dir = 8 @@ -4735,6 +5013,8 @@ /obj/item/gun/ballistic/automatic/l6_saw, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HF" = ( /obj/machinery/suit_storage_unit/syndicate, /obj/machinery/light/small/directional/west, @@ -4816,6 +5096,20 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"Jl" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/item/storage/belt/military, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/floor/pod/light, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4845,6 +5139,33 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"JL" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/card/emag{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/card/emag, +/obj/item/card/emag{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/pod/light, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "JP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4866,6 +5187,7 @@ }, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "KH" = ( /obj/machinery/door/poddoor/preopen{ id = "syndie_battlecruier_bridge_blast" @@ -4874,6 +5196,8 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "KK" = ( /obj/structure/filingcabinet, /turf/open/floor/carpet/red, @@ -4902,6 +5226,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "KZ" = ( /obj/structure/rack{ dir = 8 @@ -4921,6 +5246,8 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Lb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -4932,6 +5259,7 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "Ly" = ( /obj/structure/sign/warning/secure_area/directional/north{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -4944,6 +5272,8 @@ /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LH" = ( /obj/structure/table, /obj/item/storage/medkit/regular{ @@ -4966,6 +5296,7 @@ }, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "Mq" = ( /obj/structure/sign/warning/secure_area/directional/north{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -4978,6 +5309,8 @@ /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Mt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5018,6 +5351,7 @@ /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "MQ" = ( /obj/structure/closet/crate, /obj/item/stock_parts/power_store/cell/high, @@ -5029,6 +5363,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "MR" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5134,6 +5470,7 @@ }, /turf/open/floor/iron, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "OZ" = ( /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/cup/glass/shaker{ @@ -5147,6 +5484,8 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Pa" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5314,6 +5653,22 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/engine, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"RX" = ( +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = 10 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/turf/open/floor/iron/dark, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Sb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -5384,6 +5739,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "Tl" = ( /obj/structure/sign/warning/secure_area/directional/east{ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; @@ -5395,6 +5751,8 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Tn" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/portable_atmospherics/canister/plasma, @@ -5585,6 +5943,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/side, /area/shuttle/sbc_starfury) +<<<<<<< HEAD +======= +"WI" = ( +/obj/structure/closet/crate, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/inducer/syndicate, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/shuttle/sbc_starfury) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "WV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -5704,6 +6076,7 @@ }, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "Ys" = ( /obj/structure/rack{ dir = 8 @@ -5718,6 +6091,8 @@ }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Yt" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot_red, @@ -5738,6 +6113,7 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) +<<<<<<< HEAD "Zh" = ( /obj/structure/rack{ dir = 8 @@ -5753,6 +6129,8 @@ }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Zl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -6049,7 +6427,11 @@ ce ae hd hD +<<<<<<< HEAD OZ +======= +RX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iq iy ae @@ -6078,7 +6460,11 @@ aa aa aa ac +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae ah cH @@ -6264,7 +6650,11 @@ aa aa aa ae +<<<<<<< HEAD Mq +======= +kN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae MP aH @@ -6350,7 +6740,11 @@ aa aa aa ae +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae xr aH @@ -6430,7 +6824,11 @@ ri ay ay XI +<<<<<<< HEAD qT +======= +dO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dV eR cO @@ -6469,7 +6867,11 @@ Jf ae kz kO +<<<<<<< HEAD lg +======= +fE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae ae Fc @@ -6490,7 +6892,11 @@ Ou Ou Ou vT +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dq vk ay @@ -6558,7 +6964,11 @@ aa aa Ou vT +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ne IM ae @@ -6621,10 +7031,17 @@ aa aa aa aa +<<<<<<< HEAD KH KH KH KH +======= +ad +ad +ad +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae by Sb @@ -6688,8 +7105,13 @@ aa (14,1,1) = {" aa aa +<<<<<<< HEAD KH KH +======= +ad +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aU bj eJ @@ -6703,7 +7125,11 @@ ay ag dY UB +<<<<<<< HEAD cy +======= +fR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ec eB aH @@ -6724,7 +7150,11 @@ hB ST ec dV +<<<<<<< HEAD Tl +======= +gp +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oA ay hm @@ -6756,7 +7186,11 @@ aa (15,1,1) = {" aa aa +<<<<<<< HEAD KH +======= +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ct aV aJ @@ -6824,7 +7258,11 @@ ac (16,1,1) = {" aa aa +<<<<<<< HEAD KH +======= +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 al Dd xi @@ -6891,8 +7329,13 @@ mO "} (17,1,1) = {" aa +<<<<<<< HEAD KH KH +======= +ad +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UU az aK @@ -6959,7 +7402,11 @@ ir "} (18,1,1) = {" aa +<<<<<<< HEAD KH +======= +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pm an aA @@ -7003,7 +7450,11 @@ hq hP ae iu +<<<<<<< HEAD Es +======= +iG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nz ae Qf @@ -7027,7 +7478,11 @@ ir "} (19,1,1) = {" aa +<<<<<<< HEAD KH +======= +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wo ao aB @@ -7095,7 +7550,11 @@ ae "} (20,1,1) = {" aa +<<<<<<< HEAD KH +======= +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bo ap aC @@ -7163,8 +7622,13 @@ mO "} (21,1,1) = {" aa +<<<<<<< HEAD KH KH +======= +ad +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aq aD aO @@ -7232,7 +7696,11 @@ ir (22,1,1) = {" aa aa +<<<<<<< HEAD KH +======= +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ar vr xO @@ -7269,7 +7737,11 @@ ST ae ae gB +<<<<<<< HEAD gN +======= +Dy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gY Fl hS @@ -7300,7 +7772,11 @@ ir (23,1,1) = {" aa aa +<<<<<<< HEAD KH +======= +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bC aE aP @@ -7368,8 +7844,13 @@ ac (24,1,1) = {" aa aa +<<<<<<< HEAD KH KH +======= +ad +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 be bt FC @@ -7404,7 +7885,11 @@ hB ST ec fF +<<<<<<< HEAD BK +======= +gC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hs gO hv @@ -7437,10 +7922,17 @@ aa aa aa aa +<<<<<<< HEAD KH KH KH KH +======= +ad +ad +ad +ad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae by po @@ -7510,7 +8002,11 @@ aa aa aa vT +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ck Zm ae @@ -7578,7 +8074,11 @@ Ou Ou Ou vT +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bV Wv ay @@ -7654,7 +8154,11 @@ xD ay ay PF +<<<<<<< HEAD BG +======= +dS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AJ dd ik @@ -7710,7 +8214,11 @@ aa aa aa ae +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae xr aH @@ -7748,14 +8256,23 @@ ae ae ae Yi +<<<<<<< HEAD DM DM +======= +hZ +hZ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ec mQ ae nR Xr +<<<<<<< HEAD MQ +======= +WI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae ko ae @@ -7819,7 +8336,11 @@ sB ec ec ec +<<<<<<< HEAD xo +======= +JL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae XN qf @@ -7884,10 +8405,17 @@ gF gR Ay sB +<<<<<<< HEAD Zh Ys ec KZ +======= +ia +io +ec +iN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae nR jB @@ -7896,7 +8424,11 @@ aa aa aa ae +<<<<<<< HEAD Ly +======= +lf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae fB aH @@ -7923,7 +8455,11 @@ ae ae Jm da +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -7982,7 +8518,11 @@ aa aa aa ac +<<<<<<< HEAD nu +======= +bx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae BN vk @@ -8021,8 +8561,13 @@ UH ae hC ib +<<<<<<< HEAD rF Hr +======= +Jl +ix +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fj ae ae diff --git a/_maps/templates/hilbertshotellore.dmm b/_maps/templates/hilbertshotellore.dmm index 716fa330de5..0b71a99174b 100644 --- a/_maps/templates/hilbertshotellore.dmm +++ b/_maps/templates/hilbertshotellore.dmm @@ -5,11 +5,14 @@ "ab" = ( /turf/closed/indestructible/hotelwall, /area/misc/hilbertshotel) +<<<<<<< HEAD "ac" = ( /obj/structure/table/wood/fancy, /obj/structure/mirror/broken/directional/north, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ad" = ( /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) @@ -147,11 +150,14 @@ /obj/structure/sink/directional/east, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) +<<<<<<< HEAD "aJ" = ( /obj/structure/window/reinforced/tinted/spawner/directional/west, /obj/structure/window/reinforced/tinted/spawner/directional/north, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aK" = ( /obj/machinery/shower/directional/west, /turf/open/indestructible/hoteltile, @@ -165,6 +171,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) +<<<<<<< HEAD "aN" = ( /obj/structure/toilet{ dir = 8 @@ -177,6 +184,8 @@ /obj/structure/window/reinforced/tinted/spawner/directional/west, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aP" = ( /obj/item/bikehorn/rubberducky, /obj/machinery/light/small/directional/east, @@ -191,11 +200,14 @@ /obj/machinery/smartfridge/food, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) +<<<<<<< HEAD "aS" = ( /obj/structure/window/reinforced/tinted/spawner/directional/west, /obj/structure/window/reinforced/tinted/spawner/directional/south, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aT" = ( /obj/structure/table/reinforced, /obj/structure/sink/kitchen/directional/north, @@ -293,11 +305,44 @@ /obj/item/paper/crumpled/ruins/hotel_note, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) +<<<<<<< HEAD +======= +"ej" = ( +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/turf/open/indestructible/hoteltile, +/area/misc/hilbertshotel) +"tf" = ( +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/structure/window/reinforced/tinted/spawner/directional/south, +/turf/open/indestructible/hoteltile, +/area/misc/hilbertshotel) +"Gk" = ( +/obj/structure/table/wood/fancy, +/obj/structure/mirror/broken/directional/north, +/turf/open/indestructible/hotelwood, +/area/misc/hilbertshotel) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Mn" = ( /obj/structure/table/wood/fancy, /obj/machinery/light/small/directional/north, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) +<<<<<<< HEAD +======= +"XX" = ( +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/structure/window/reinforced/tinted/spawner/directional/north, +/turf/open/indestructible/hoteltile, +/area/misc/hilbertshotel) +"Yw" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted/spawner/directional/north, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/turf/open/indestructible/hoteltile, +/area/misc/hilbertshotel) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 (1,1,1) = {" aa @@ -472,7 +517,7 @@ aa (11,1,1) = {" aa ab -ac +Gk ad ad aL @@ -480,7 +525,7 @@ av ap aD aC -aN +Yw bi aV ab @@ -496,9 +541,9 @@ ad aw ab aE -aJ -aO -aS +XX +ej +tf aE ab aa diff --git a/_maps/templates/holodeck_beach.dmm b/_maps/templates/holodeck_beach.dmm index d485a495db3..304e18fbf3b 100644 --- a/_maps/templates/holodeck_beach.dmm +++ b/_maps/templates/holodeck_beach.dmm @@ -22,6 +22,12 @@ "t" = ( /turf/open/floor/holofloor/carpet, /area/template_noop) +<<<<<<< HEAD +======= +"B" = ( +/turf/open/floor/holofloor/beach/water, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "H" = ( /obj/effect/holodeck_effect/mobspawner/monkey, /turf/open/floor/holofloor/beach, @@ -30,9 +36,12 @@ /obj/item/toy/seashell, /turf/open/floor/holofloor/beach, /area/template_noop) +<<<<<<< HEAD "N" = ( /turf/open/floor/holofloor/beach/water, /area/template_noop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Q" = ( /obj/effect/holodeck_effect/mobspawner/crab/jon, /turf/open/floor/holofloor/beach, @@ -68,7 +77,11 @@ R R R a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (2,1,1) = {" R @@ -80,7 +93,11 @@ S R Q a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (3,1,1) = {" X @@ -92,7 +109,11 @@ t t R a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (4,1,1) = {" R @@ -104,7 +125,11 @@ R R R a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (5,1,1) = {" R @@ -116,7 +141,11 @@ t t R a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (6,1,1) = {" R @@ -128,7 +157,11 @@ g R q a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (7,1,1) = {" R @@ -140,7 +173,11 @@ R R f a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (8,1,1) = {" W @@ -152,7 +189,11 @@ R M R a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (9,1,1) = {" R @@ -164,5 +205,9 @@ R R R a +<<<<<<< HEAD N +======= +B +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} diff --git a/_maps/templates/holodeck_chapelcourt.dmm b/_maps/templates/holodeck_chapelcourt.dmm index b3141fd42f5..a54c880e8a4 100644 --- a/_maps/templates/holodeck_chapelcourt.dmm +++ b/_maps/templates/holodeck_chapelcourt.dmm @@ -1,10 +1,58 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +<<<<<<< HEAD +======= +"aa" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/closet/secure_closet/courtroom, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"ab" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ac" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/holofloor/chapel/bottom_left, /area/template_noop) +<<<<<<< HEAD +======= +"ad" = ( +/obj/structure/table/wood/fancy, +/obj/item/clothing/suit/chaplainsuit/nun, +/obj/item/clothing/head/chaplain/nun_hood, +/obj/item/clothing/suit/chaplainsuit/holidaypriest, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ae" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -20,6 +68,24 @@ "ag" = ( /turf/open/floor/holofloor/chapel/top_left, /area/template_noop) +<<<<<<< HEAD +======= +"ah" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/food/grown/poppy, +/obj/item/food/grown/poppy, +/obj/item/food/grown/poppy, +/obj/item/food/grown/poppy, +/obj/item/food/grown/poppy, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ai" = ( /turf/open/floor/holofloor/chapel/bottom_right, /area/template_noop) @@ -37,11 +103,94 @@ }, /turf/open/floor/holofloor/chapel/top_right, /area/template_noop) +<<<<<<< HEAD +======= +"al" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/pen/red, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"am" = ( +/obj/item/clothing/head/helmet/chaplain/witchunter_hat, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "an" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/holofloor/dark, /area/template_noop) +<<<<<<< HEAD +======= +"ao" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/storage/fancy/candle_box, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"ap" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"aq" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/pen/red, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"ar" = ( +/obj/item/gavelblock, +/obj/item/gavelhammer, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"as" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "at" = ( /obj/structure/table/wood, /obj/item/food/grown/harebell, @@ -54,6 +203,24 @@ }, /turf/open/floor/holofloor/dark, /area/template_noop) +<<<<<<< HEAD +======= +"au" = ( +/obj/structure/table/wood/fancy, +/obj/item/book/bible, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "av" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -63,6 +230,44 @@ }, /turf/open/floor/holofloor/dark, /area/template_noop) +<<<<<<< HEAD +======= +"aw" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"ax" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"ay" = ( +/obj/item/toy/figure/chaplain, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "az" = ( /obj/structure/closet/secure_closet/courtroom, /obj/effect/turf_decal/tile/neutral/opposingcorners{ @@ -101,6 +306,25 @@ }, /turf/open/floor/holofloor/chapel/bottom_right, /area/template_noop) +<<<<<<< HEAD +======= +"aF" = ( +/obj/item/clothing/suit/costume/judgerobe, +/obj/item/clothing/head/costume/powdered_wig, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aG" = ( /obj/structure/table/wood, /obj/item/food/grown/poppy, @@ -113,6 +337,33 @@ }, /turf/open/floor/holofloor/dark, /area/template_noop) +<<<<<<< HEAD +======= +"aH" = ( +/obj/structure/table/wood/fancy, +/obj/item/book/manual/wiki/security_space_law, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"aI" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -122,12 +373,51 @@ "aK" = ( /turf/open/floor/holofloor/chapel/top_right, /area/template_noop) +<<<<<<< HEAD +======= +"aL" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aM" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, /turf/open/floor/holofloor/dark, /area/template_noop) +<<<<<<< HEAD +======= +"aN" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"aO" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/paper_bin, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aP" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/holofloor/dark, @@ -140,12 +430,42 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/holofloor/dark, /area/template_noop) +<<<<<<< HEAD +======= +"aS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aT" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/holofloor/chapel/top_left, /area/template_noop) +<<<<<<< HEAD +======= +"aU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/hand_labeler, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aV" = ( /obj/structure/chair{ dir = 1 @@ -155,6 +475,34 @@ }, /turf/open/floor/holofloor/dark, /area/template_noop) +<<<<<<< HEAD +======= +"aW" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/holofloor/dark, +/area/template_noop) +"aX" = ( +/obj/item/clothing/suit/chaplainsuit/bishoprobe, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/holofloor/dark, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aY" = ( /obj/item/gavelblock, /obj/item/gavelhammer, diff --git a/_maps/templates/holodeck_lounge.dmm b/_maps/templates/holodeck_lounge.dmm index 508c9a0de85..1c155269081 100644 --- a/_maps/templates/holodeck_lounge.dmm +++ b/_maps/templates/holodeck_lounge.dmm @@ -31,6 +31,7 @@ icon_state = "wood" }, /area/template_noop) +<<<<<<< HEAD "e" = ( /obj/structure/table/wood, /obj/item/cigarette/pipe, @@ -38,6 +39,9 @@ /turf/open/floor/holofloor/carpet, /area/template_noop) "g" = ( +======= +"f" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/table/wood, /obj/item/flashlight/lamp/green, /turf/open/floor/holofloor{ @@ -45,6 +49,15 @@ icon_state = "wood" }, /area/template_noop) +<<<<<<< HEAD +======= +"h" = ( +/obj/structure/table/wood, +/obj/item/cigarette/pipe, +/obj/effect/holodeck_effect/random_book, +/turf/open/floor/holofloor/carpet, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "i" = ( /obj/structure/table/wood/shuttle_bar, /obj/item/reagent_containers/cup/glass/shaker, @@ -53,6 +66,16 @@ icon_state = "wood" }, /area/template_noop) +<<<<<<< HEAD +======= +"j" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/holofloor{ + dir = 9; + icon_state = "wood" + }, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "k" = ( /obj/structure/table/wood/poker, /obj/item/storage/box/matches, @@ -61,6 +84,17 @@ icon_state = "wood" }, /area/template_noop) +<<<<<<< HEAD +======= +"l" = ( +/obj/structure/chair/stool/bar/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/holofloor{ + dir = 9; + icon_state = "wood" + }, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "m" = ( /obj/structure/chair/wood, /turf/open/floor/holofloor{ @@ -85,6 +119,7 @@ "q" = ( /turf/open/floor/holofloor/carpet, /area/template_noop) +<<<<<<< HEAD "r" = ( /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/holofloor{ @@ -100,6 +135,8 @@ icon_state = "wood" }, /area/template_noop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "t" = ( /obj/structure/table/wood/shuttle_bar, /obj/item/book/manual/wiki/barman_recipes, @@ -117,6 +154,7 @@ icon_state = "wood" }, /area/template_noop) +<<<<<<< HEAD "v" = ( /obj/structure/table/wood/shuttle_bar, /obj/structure/window/reinforced/spawner/directional/east, @@ -125,6 +163,8 @@ icon_state = "wood" }, /area/template_noop) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "w" = ( /obj/structure/table/wood, /obj/item/instrument/saxophone, @@ -256,6 +296,17 @@ icon_state = "wood" }, /area/template_noop) +<<<<<<< HEAD +======= +"T" = ( +/obj/structure/table/wood/poker, +/obj/item/cigarette/pipe, +/turf/open/floor/holofloor{ + dir = 9; + icon_state = "wood" + }, +/area/template_noop) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "U" = ( /obj/structure/table/wood/poker, /obj/item/storage/dice, @@ -271,9 +322,15 @@ icon_state = "wood" }, /area/template_noop) +<<<<<<< HEAD "X" = ( /obj/structure/table/wood/poker, /obj/item/cigarette/pipe, +======= +"Y" = ( +/obj/structure/table/wood/shuttle_bar, +/obj/structure/window/reinforced/spawner/directional/east, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" @@ -297,7 +354,11 @@ H a "} (2,1,1) = {" +<<<<<<< HEAD g +======= +f +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 z z z @@ -314,9 +375,15 @@ u u z z +<<<<<<< HEAD r s v +======= +j +l +Y +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 c G "} @@ -347,7 +414,11 @@ p (6,1,1) = {" m P +<<<<<<< HEAD X +======= +T +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 o z F @@ -390,5 +461,9 @@ O q E E +<<<<<<< HEAD e +======= +h +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} diff --git a/_maps/templates/lazy_templates/ninja_den.dmm b/_maps/templates/lazy_templates/ninja_den.dmm index b992aad5116..c28a1443466 100644 --- a/_maps/templates/lazy_templates/ninja_den.dmm +++ b/_maps/templates/lazy_templates/ninja_den.dmm @@ -66,11 +66,14 @@ }, /turf/open/floor/vault/rock, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "aW" = ( /obj/machinery/griddle, /obj/item/kitchen/rollingpin, /turf/open/floor/iron/cafeteria, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "be" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -80,6 +83,7 @@ "bl" = ( /turf/open/floor/bamboo/tatami/purple, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "bm" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -90,6 +94,8 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bH" = ( /obj/machinery/photocopier, /turf/open/floor/catwalk_floor, @@ -143,6 +149,14 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"cK" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cQ" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -228,6 +242,7 @@ /obj/machinery/duct, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "er" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -237,6 +252,8 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fu" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -246,12 +263,43 @@ }, /turf/open/floor/eighties/red, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"ga" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/toy/mecha/phazon, +/turf/open/floor/bamboo/tatami/purple{ + dir = 8 + }, +/area/centcom/central_command_areas/holding) +"gd" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/toy/katana{ + desc = "As seen in your favourite Japanese cartoon."; + name = "anime katana" + }, +/turf/open/floor/bamboo/tatami, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gp" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /turf/open/misc/sandy_dirt, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"gy" = ( +/obj/machinery/griddle, +/obj/item/kitchen/rollingpin, +/turf/open/floor/iron/cafeteria, +/area/centcom/central_command_areas/holding) +"gK" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/rcl/pre_loaded, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gX" = ( /obj/structure/window/paperframe{ can_atmos_pass = 0 @@ -306,11 +354,25 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "hD" = ( /obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, +======= +"hv" = ( +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole/bookmanagement, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) +"hw" = ( +/obj/item/kirbyplants/organic/plant10, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/carpet/black, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "hH" = ( /obj/item/flashlight/lantern, @@ -335,16 +397,28 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "iD" = ( /obj/structure/table/reinforced/rglass, /obj/item/book/manual/hydroponics_pod_people, /obj/item/paper/guides/jobs/hydroponics, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iF" = ( /obj/structure/table/wood, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"iH" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iQ" = ( /obj/machinery/gibber, /turf/open/floor/catwalk_floor, @@ -360,6 +434,7 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "jm" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer{ @@ -372,6 +447,17 @@ pixel_y = -4 }, /obj/machinery/light/small/directional/west, +======= +"jc" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/item/toy/toy_xeno, +/turf/open/floor/wood/parquet, +/area/centcom/central_command_areas/holding) +"jf" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/table/wood/fancy/green, +/obj/effect/spawner/random/entertainment/gambling, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) "jq" = ( @@ -418,10 +504,21 @@ /obj/item/food/meat/slab/synthmeat, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "kc" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/storage/crayons, /turf/open/floor/catwalk_floor, +======= +"jR" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/carpet/black, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "kl" = ( /obj/effect/turf_decal/siding/wood, @@ -432,11 +529,14 @@ name = "Guest House Entrance" }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "kM" = ( /obj/structure/table/wood/fancy/royalblue, /obj/item/toy/toy_xeno, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kO" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -459,6 +559,7 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "kY" = ( /obj/structure/table/wood/fancy/royalblue, /obj/item/clothing/mask/animal/pig, @@ -482,6 +583,22 @@ pixel_y = 9 }, /turf/open/floor/wood/tile, +======= +"lh" = ( +/obj/structure/toilet, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/centcom/central_command_areas/holding) +"ln" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/carpet/black, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "lx" = ( /obj/machinery/light/small/directional/north, @@ -545,12 +662,15 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "nq" = ( /obj/structure/sign/painting/library{ pixel_y = 32 }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nt" = ( /obj/structure/flora/rock/pile/style_random, /turf/open/misc/ironsand{ @@ -566,9 +686,27 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/stairs/medium, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "of" = ( /obj/machinery/vending/boozeomat, /turf/closed/wall/mineral/wood, +======= +"nW" = ( +/obj/machinery/light/warm/directional/west, +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/centcom/central_command_areas/holding) +"od" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/basket, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/sepia, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "oh" = ( /obj/machinery/light/directional/south, @@ -585,10 +723,19 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "op" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, /turf/open/floor/carpet/black, +======= +"os" = ( +/obj/machinery/shower/directional/south, +/obj/item/soap/syndie, +/obj/structure/curtain, +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/iron/showroomfloor, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "ov" = ( /obj/structure/flora/rock/pile/style_random, @@ -600,6 +747,14 @@ initial_gas_mix = "TEMP=2.7" }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"oG" = ( +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oH" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -638,6 +793,23 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"pu" = ( +/obj/structure/closet/crate, +/obj/item/vending_refill/autodrobe, +/obj/item/stack/sheet/paperframes/fifty, +/obj/item/stack/sheet/paperframes/fifty, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/box/lights/mixed, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pB" = ( /obj/structure/rack, /obj/item/nullrod/claymore{ @@ -711,6 +883,20 @@ /obj/machinery/autolathe, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"qx" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/centcom/central_command_areas/holding) +"qE" = ( +/turf/closed/indestructible/fakedoor{ + name = "Guest House Back Entrance" + }, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qF" = ( /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, @@ -719,6 +905,23 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"qI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/wallframe/newscaster{ + pixel_x = -6 + }, +/obj/item/flashlight/lamp/bananalamp{ + pixel_x = 9; + pixel_y = 9 + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qT" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -741,11 +944,29 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"rn" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 4; + pixel_x = -8; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rz" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "rE" = ( /turf/closed/indestructible/fakedoor{ name = "Guest House Back Entrance" @@ -758,6 +979,8 @@ /obj/effect/landmark/holding_facility, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rQ" = ( /obj/machinery/duct, /turf/open/floor/iron/cafeteria, @@ -775,6 +998,7 @@ dir = 8 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "so" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -801,6 +1025,13 @@ /turf/open/water{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, +======= +"sc" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/showroomfloor, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "ts" = ( /obj/item/food/meat/slab/chicken, @@ -821,6 +1052,18 @@ /obj/structure/closet/secure_closet/freezer/meat/open, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"uv" = ( +/obj/structure/toilet/greyscale{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uw" = ( /mob/living/basic/bot/medbot/stationary{ desc = "A little medical robot. You can make out the word \"sincerity\" on its chassis."; @@ -835,6 +1078,21 @@ initial_gas_mix = "TEMP=2.7" }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"uL" = ( +/obj/structure/closet/crate/bin, +/obj/item/clothing/suit/costume/xenos, +/obj/item/clothing/head/costume/xenos, +/obj/item/xenos_claw, +/obj/item/grown/log/bamboo, +/obj/item/grown/log/bamboo, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uQ" = ( /obj/structure/chair/wood{ dir = 8 @@ -843,6 +1101,7 @@ dir = 4 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "uZ" = ( /obj/structure/closet/crate, /obj/item/vending_refill/autodrobe, @@ -857,6 +1116,8 @@ }, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vr" = ( /obj/structure/rack, /obj/item/nullrod/claymore/saber{ @@ -875,9 +1136,16 @@ /obj/machinery/seed_extractor, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "vW" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole/bookmanagement, +======= +"vS" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fountain, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) "wc" = ( @@ -893,10 +1161,13 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "wz" = ( /obj/structure/sign/poster/contraband/syndicate_recruitment/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wU" = ( /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) @@ -945,6 +1216,7 @@ dir = 1 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "xR" = ( /obj/structure/chair/wood{ dir = 4 @@ -954,6 +1226,8 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xU" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -984,6 +1258,7 @@ /obj/structure/chair/stool/directional/west, /turf/open/misc/beach/sand, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "zg" = ( /obj/structure/table/reinforced/rglass, /obj/item/shovel/spade{ @@ -991,6 +1266,14 @@ }, /obj/item/cultivator, /turf/open/floor/wood/tile, +======= +"zc" = ( +/obj/structure/table/wood, +/obj/machinery/microwave{ + pixel_y = 6 + }, +/turf/open/floor/carpet/black, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "zh" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, @@ -1037,6 +1320,7 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Ac" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/table/reinforced/plastitaniumglass, @@ -1053,6 +1337,8 @@ /obj/effect/turf_decal/tile/dark/fourcorners, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Af" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -1073,6 +1359,15 @@ "Am" = ( /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"An" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/chef_recipes, +/obj/item/knife/kitchen, +/turf/open/floor/iron/cafeteria, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ar" = ( /obj/structure/sink/kitchen/directional/west, /obj/item/reagent_containers/cup/bucket, @@ -1136,11 +1431,22 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Co" = ( /obj/structure/toilet, /obj/structure/window/reinforced/survival_pod/spawner/directional/east, /obj/machinery/door/window/survival_pod/left/directional/south, /turf/open/floor/iron/showroomfloor, +======= +"CD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/carpet/black, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "CG" = ( /turf/closed/indestructible/wood, @@ -1150,18 +1456,22 @@ dir = 8 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "CP" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "CT" = ( /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/bamboo/tatami{ dir = 4 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Dd" = ( /obj/structure/toilet/greyscale{ dir = 4 @@ -1171,6 +1481,8 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/showroomfloor, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Dh" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/tile/dark/fourcorners, @@ -1210,6 +1522,7 @@ "DI" = ( /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "DJ" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/toy/mecha/phazon, @@ -1217,17 +1530,22 @@ dir = 8 }, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DL" = ( /obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "DW" = ( /turf/open/water{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DZ" = ( /obj/structure/kitchenspike, /obj/item/gun/magic/hook, @@ -1292,12 +1610,15 @@ /obj/machinery/light/directional/west, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "FD" = ( /obj/structure/table/wood, /obj/item/food/grown/tea/astra, /obj/item/food/grown/soybeans, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FE" = ( /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) @@ -1341,6 +1662,25 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"Gw" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/clothing/suit/costume/hawaiian{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/suit/costume/hawaiian, +/obj/item/clothing/suit/costume/hawaiian{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/suit/costume/hawaiian, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron/sepia, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Gy" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/bottle/sake{ @@ -1348,6 +1688,7 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "GC" = ( /obj/structure/table/reinforced, /obj/item/book/manual/chef_recipes, @@ -1362,6 +1703,8 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "GN" = ( /obj/structure/bed/dogbed/cayenne{ name = "Paprika's bed" @@ -1435,12 +1778,39 @@ initial_gas_mix = "TEMP=2.7" }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"HV" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/obj/effect/landmark/holding_facility, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HW" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"Ia" = ( +/obj/structure/table/reinforced, +/obj/item/food/grown/tea/astra{ + pixel_y = 13 + }, +/obj/item/food/grown/soybeans{ + pixel_y = 13 + }, +/obj/machinery/reagentgrinder{ + desc = "Used to grind things up into raw materials and liquids."; + pixel_y = 5 + }, +/turf/open/floor/iron/cafeteria, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ig" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1452,6 +1822,7 @@ /obj/machinery/deepfryer, /turf/open/floor/iron/cafeteria, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Iz" = ( /obj/machinery/shower/directional/south, /obj/item/soap/syndie, @@ -1459,6 +1830,8 @@ /obj/machinery/door/window/survival_pod/left/directional/south, /turf/open/floor/iron/showroomfloor, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "II" = ( /mob/living/basic/bot/medbot/stationary{ desc = "When engaged in combat, the vanquishing of thine enemy can be the warrior's only concern."; @@ -1467,6 +1840,25 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"IM" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/paper/guides/jobs/hydroponics, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/holding) +"Jf" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/wrench{ + pixel_y = -16 + }, +/obj/item/wirecutters{ + pixel_y = 3 + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jg" = ( /obj/item/clothing/shoes/galoshes{ pixel_y = -8 @@ -1499,6 +1891,7 @@ }, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Jw" = ( /obj/item/food/grown/rice, /obj/item/food/grown/rice, @@ -1519,6 +1912,16 @@ name = "kitchen cabinet" }, /turf/open/floor/carpet/black, +======= +"Jz" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp{ + pixel_x = -5; + pixel_y = 11 + }, +/obj/item/camera_film, +/turf/open/floor/wood/large, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "JC" = ( /obj/structure/closet{ @@ -1560,6 +1963,30 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"JV" = ( +/obj/item/food/grown/rice, +/obj/item/food/grown/rice, +/obj/item/food/grown/rice, +/obj/item/food/grown/rice, +/obj/item/food/grown/rice, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/onion, +/obj/item/food/grown/onion, +/obj/item/food/grown/onion/red, +/obj/item/food/grown/onion/red, +/obj/item/food/grown/coffee, +/obj/structure/closet/secure_closet/freezer/fridge/open{ + name = "kitchen cabinet" + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Kb" = ( /obj/structure/musician/piano, /turf/open/misc/beach/sand, @@ -1573,6 +2000,7 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Ks" = ( /obj/structure/table/reinforced, /obj/item/food/grown/tea/astra{ @@ -1587,6 +2015,8 @@ }, /turf/open/floor/iron/cafeteria, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Kt" = ( /obj/structure/dresser, /obj/machinery/light/small/directional/west, @@ -1594,12 +2024,15 @@ dir = 8 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "KW" = ( /obj/structure/sign/painting/library{ pixel_y = 32 }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Lw" = ( /obj/item/bedsheet/syndie{ dir = 4 @@ -1636,6 +2069,7 @@ }, /turf/open/floor/iron/cafeteria, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Mm" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp{ @@ -1644,6 +2078,14 @@ }, /obj/item/camera_film, /turf/open/floor/wood/large, +======= +"My" = ( +/obj/item/kirbyplants/organic/plant10, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/sepia, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "Mz" = ( /obj/structure/closet, @@ -1659,6 +2101,7 @@ /obj/item/defibrillator, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "MA" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/toy/katana{ @@ -1667,6 +2110,8 @@ }, /turf/open/floor/bamboo/tatami, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ML" = ( /obj/structure/window/paperframe{ can_atmos_pass = 0 @@ -1677,6 +2122,33 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"MM" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/toy/figure/syndie, +/turf/open/floor/bamboo/tatami/purple, +/area/centcom/central_command_areas/holding) +"MR" = ( +/obj/structure/table/wood, +/obj/item/food/grown/tea/astra, +/obj/item/food/grown/soybeans, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) +"Nt" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks{ + dir = 4; + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 10; + pixel_y = 2 + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Nz" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -1713,12 +2185,22 @@ dir = 1 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Oj" = ( /obj/structure/table/wood, /obj/machinery/microwave{ pixel_y = 6 }, /turf/open/floor/carpet/black, +======= +"Od" = ( +/obj/item/kirbyplants/organic/plant10, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/sepia, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "Ok" = ( /obj/effect/turf_decal/siding/wood{ @@ -1739,6 +2221,7 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Os" = ( /obj/item/kirbyplants/organic/plant10, /obj/structure/sign/painting/library{ @@ -1746,6 +2229,8 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OC" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1762,10 +2247,16 @@ /obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Pz" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/rcl/pre_loaded, /turf/open/floor/catwalk_floor, +======= +"PB" = ( +/obj/structure/sign/poster/contraband/syndicate_recruitment/directional/south, +/turf/open/floor/wood/large, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "PH" = ( /obj/structure/chair/comfy/black{ @@ -1773,6 +2264,7 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Qa" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1800,6 +2292,21 @@ /obj/structure/table/wood/fancy/green, /obj/effect/spawner/random/entertainment/gambling, /turf/open/floor/carpet/black, +======= +"PK" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/shovel/spade{ + pixel_y = -14 + }, +/obj/item/cultivator, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/holding) +"PV" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/item/instrument/piano_synth, +/obj/item/instrument/saxophone, +/turf/open/floor/wood/parquet, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "Qt" = ( /obj/machinery/light/small/directional/north, @@ -1842,6 +2349,7 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/cafeteria, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Rj" = ( /obj/structure/table/reinforced/rglass, /obj/item/wrench{ @@ -1852,6 +2360,8 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ry" = ( /obj/structure/dresser, /obj/machinery/light/small/directional/east, @@ -1896,6 +2406,7 @@ "Sc" = ( /turf/open/floor/stone, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "Si" = ( /obj/item/kirbyplants/organic/plant10, /obj/structure/sign/painting/library{ @@ -1903,6 +2414,8 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Tc" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/chair/sofa/corp/right{ @@ -1932,6 +2445,15 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"TO" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/sepia, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TP" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1956,10 +2478,37 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"UB" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/toy/figure/ninja, +/turf/open/floor/bamboo/tatami{ + dir = 4 + }, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "UO" = ( /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"UW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood/fancy/green, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 6 + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) +"UY" = ( +/obj/machinery/vending/boozeomat, +/turf/closed/wall/mineral/wood, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Vd" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -1983,6 +2532,20 @@ /obj/machinery/stasis, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"Vj" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, +/obj/item/paper_bin, +/obj/item/pen/fountain, +/obj/item/camera/detective{ + desc = "A polaroid camera with extra capacity for social media marketing."; + name = "Professional camera" + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "VC" = ( /obj/structure/closet/crate/bin, /obj/item/soap/syndie, @@ -2043,6 +2606,7 @@ dir = 4 }, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "WJ" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, @@ -2054,6 +2618,8 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "WS" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -2092,6 +2658,14 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD +======= +"Xd" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/crayons, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Xi" = ( /obj/structure/flora/rock/pile/jungle/large/style_random{ pixel_y = -3 @@ -2124,6 +2698,7 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "XS" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks{ @@ -2136,12 +2711,24 @@ pixel_y = 2 }, /turf/open/floor/carpet/black, +======= +"Yd" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/item/clothing/mask/animal/pig, +/obj/item/clothing/mask/animal/horsehead, +/obj/item/clothing/mask/animal/small/rat, +/obj/item/clothing/mask/fakemoustache{ + pixel_y = 9 + }, +/turf/open/floor/wood/parquet, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/holding) "Ye" = ( /obj/structure/table/wood/fancy/red, /obj/item/toy/spinningtoy, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) +<<<<<<< HEAD "YF" = ( /obj/structure/table/wood/fancy/royalblue, /obj/item/instrument/piano_synth, @@ -2154,6 +2741,8 @@ /obj/item/pen/fountain, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "YQ" = ( /turf/open/floor/bamboo/tatami{ dir = 4 @@ -2388,7 +2977,11 @@ Zj LK Mh BB +<<<<<<< HEAD Ks +======= +Ia +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CG CG LK @@ -2423,6 +3016,7 @@ Zj Zj Zj LK +<<<<<<< HEAD aW wV Ea @@ -2431,6 +3025,16 @@ Oj jm XS Jw +======= +gy +wV +Ea +dg +zc +rn +Nt +JV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zh Xn dg @@ -2534,6 +3138,7 @@ ox Zj Zj LK +<<<<<<< HEAD GC nA wV @@ -2548,6 +3153,22 @@ dg DW sH DW +======= +An +nA +wV +dg +UY +vS +Am +Am +MR +dg +dg +oG +nW +oG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LK Ed xB @@ -2580,11 +3201,19 @@ AE Gy Bo iF +<<<<<<< HEAD op dg DW DW DW +======= +cK +dg +oG +oG +oG +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LK Ed xB @@ -2610,7 +3239,11 @@ Zj Zj HU CG +<<<<<<< HEAD nq +======= +TO +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zN Jj Xb @@ -2762,8 +3395,13 @@ XP dg hO hO +<<<<<<< HEAD Qa Qm +======= +UW +jf +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hO hO Ig @@ -2862,13 +3500,21 @@ Zj HU aB CT +<<<<<<< HEAD Qh +======= +UB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gX mw mw WW XP +<<<<<<< HEAD WJ +======= +Vj +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mw DL ht @@ -2901,18 +3547,30 @@ CG dg dg dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GU dg dg Zs mw +<<<<<<< HEAD Mm +======= +Jz +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ht kl dg dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mw CG Zj @@ -2936,14 +3594,22 @@ Zj Zj aB AO +<<<<<<< HEAD Qj +======= +MM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ML mw mw hs dg dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iB ht kl @@ -3023,7 +3689,11 @@ jb NN dg dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GU CG Zj @@ -3049,16 +3719,27 @@ CG dg dg dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mw dg dg dg dg +<<<<<<< HEAD er al Am vW +======= +CD +al +Am +hv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 XP mw mw @@ -3082,14 +3763,24 @@ Zj Zj Zj LK +<<<<<<< HEAD Co hD +======= +lh +qx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dg QJ mw mw +<<<<<<< HEAD bm Ac +======= +od +Gw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 XP xw Am @@ -3119,7 +3810,11 @@ HU Zj HU LK +<<<<<<< HEAD Co +======= +lh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jv Tv Xt @@ -3134,7 +3829,11 @@ dg Qt GN dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mw CG HU @@ -3156,8 +3855,13 @@ Zj ov HU LK +<<<<<<< HEAD Iz CP +======= +os +sc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dg QJ mw @@ -3197,16 +3901,28 @@ CG dg dg dg +<<<<<<< HEAD KW wz +======= +iH +PB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dg dg dg dg +<<<<<<< HEAD so xe Am vW +======= +ln +xe +Am +hv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 XP mw mw @@ -3245,7 +3961,11 @@ JR RY dg dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mw eg Sc @@ -3306,16 +4026,26 @@ Zj HU aB Dr +<<<<<<< HEAD MA +======= +gd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ML pp jA dg dg dg +<<<<<<< HEAD KW mw lb +======= +iH +mw +qI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kl Zq XP @@ -3345,7 +4075,11 @@ CG dg dg dg +<<<<<<< HEAD rF +======= +HV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pp JC XP @@ -3380,7 +4114,11 @@ ov Zj aB xF +<<<<<<< HEAD DJ +======= +ga +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ML pp pp @@ -3459,7 +4197,11 @@ ML ND ND dg +<<<<<<< HEAD Dd +======= +uv +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Zk mw mw @@ -3514,7 +4256,11 @@ bH qr FB bP +<<<<<<< HEAD kc +======= +Xd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CG Ed Ed @@ -3547,11 +4293,19 @@ CG Zj HU CG +<<<<<<< HEAD uZ FE FE Ju Pz +======= +pu +FE +FE +Ju +gK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CG Ed Ed @@ -3597,7 +4351,11 @@ Ed Ed CG LK +<<<<<<< HEAD rE +======= +qE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LK CG LK @@ -3609,13 +4367,21 @@ LK LK LK CG +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mw dg XP XP dg +<<<<<<< HEAD KW +======= +iH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GU dg af @@ -3757,17 +4523,29 @@ Mz DI dv dg +<<<<<<< HEAD Os +======= +hw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 NU Vf NU EC dg +<<<<<<< HEAD GJ Wm Mz dg sF +======= +Od +Wm +Mz +dg +uL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hO hO hO @@ -3831,13 +4609,21 @@ wq DI Uj dg +<<<<<<< HEAD xR +======= +jR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 NU NU NU NU dg +<<<<<<< HEAD Si +======= +My +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DI DG dg @@ -3971,8 +4757,13 @@ xB Ed CG hm +<<<<<<< HEAD kY YF +======= +Yd +PV +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Tj dg ni @@ -4024,7 +4815,11 @@ Rf RC wU wU +<<<<<<< HEAD kM +======= +jc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CG CG CG @@ -4068,9 +4863,15 @@ HU Zj CG Ar +<<<<<<< HEAD Rj zg iD +======= +Jf +PK +IM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CG Ed "} diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm index cf6aacd092e..64e13b786b7 100644 --- a/_maps/templates/lazy_templates/nukie_base.dmm +++ b/_maps/templates/lazy_templates/nukie_base.dmm @@ -1124,6 +1124,7 @@ /obj/machinery/chem_dispenser/mutagensaltpeter, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bioterrorism) +<<<<<<< HEAD "mj" = ( /obj/structure/table/wood/poker, /obj/machinery/light/warm/directional/north, @@ -1150,6 +1151,8 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "my" = ( /obj/effect/landmark/start/nukeop_leader, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -1501,6 +1504,36 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) +<<<<<<< HEAD +======= +"qs" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/fishmeat, +/obj/item/food/fishmeat, +/obj/item/food/fishmeat, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 9 + }, +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qv" = ( /obj/item/kirbyplants/random, /turf/open/floor/mineral/titanium, @@ -1962,6 +1995,7 @@ }, /turf/open/floor/carpet, /area/centcom/syndicate_mothership/control) +<<<<<<< HEAD "wr" = ( /obj/machinery/light/small/directional/west, /obj/structure/closet/secure_closet/freezer/fridge/open, @@ -1989,6 +2023,8 @@ }, /turf/open/floor/plastic, /area/centcom/syndicate_mothership/expansion_fridgerummage) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ws" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -2603,6 +2639,35 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bombthreat) +<<<<<<< HEAD +======= +"DY" = ( +/obj/structure/table/wood/poker, +/obj/machinery/light/warm/directional/north, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/toy/cards/deck{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/cigarette/robust{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/ash{ + pixel_x = 12; + pixel_y = -6 + }, +/obj/effect/spawner/random/entertainment/lighter{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DZ" = ( /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) @@ -6419,7 +6484,11 @@ rJ Cf nU ek +<<<<<<< HEAD wr +======= +qs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ek DZ eK @@ -7041,7 +7110,11 @@ DZ Gr tc mJ +<<<<<<< HEAD mj +======= +DY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lQ Nb VK diff --git a/_maps/templates/lazy_templates/wizard_den.dmm b/_maps/templates/lazy_templates/wizard_den.dmm index 15af9f324ab..bd05b063ab2 100644 --- a/_maps/templates/lazy_templates/wizard_den.dmm +++ b/_maps/templates/lazy_templates/wizard_den.dmm @@ -44,6 +44,21 @@ /obj/structure/showcase/machinery/rng, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +<<<<<<< HEAD +======= +"dr" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar{ + pixel_y = -9; + pixel_x = -5 + }, +/obj/item/camera/spooky{ + pixel_y = 7; + pixel_x = 2 + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dB" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine/cult, @@ -315,6 +330,16 @@ /obj/machinery/griddle, /turf/open/floor/iron, /area/centcom/wizard_station) +<<<<<<< HEAD +======= +"qg" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ql" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -360,6 +385,7 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +<<<<<<< HEAD "sw" = ( /obj/structure/table/wood, /obj/item/cigarette/cigar{ @@ -372,6 +398,8 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sx" = ( /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, @@ -500,6 +528,16 @@ }, /turf/open/floor/plastic, /area/centcom/wizard_station) +<<<<<<< HEAD +======= +"yX" = ( +/obj/structure/railing, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zB" = ( /turf/open/floor/iron, /area/centcom/wizard_station) @@ -600,6 +638,7 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +<<<<<<< HEAD "Ii" = ( /obj/structure/railing, /obj/structure/railing/corner{ @@ -607,6 +646,8 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "II" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civilian{ @@ -846,6 +887,7 @@ /obj/machinery/vending/magivend, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +<<<<<<< HEAD "Va" = ( /obj/structure/railing, /obj/structure/railing{ @@ -853,6 +895,8 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "VB" = ( /turf/closed/indestructible/wood, /area/centcom/wizard_station) @@ -1551,7 +1595,11 @@ kZ uy VB TX +<<<<<<< HEAD Ii +======= +yX +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VB VB op @@ -1597,7 +1645,11 @@ kZ uy VB fX +<<<<<<< HEAD Va +======= +qg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX VB VB @@ -1643,7 +1695,11 @@ LU cy VB eI +<<<<<<< HEAD Va +======= +qg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX fX dk @@ -1735,7 +1791,11 @@ LU cy VB fX +<<<<<<< HEAD Va +======= +qg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX fX dk @@ -1781,7 +1841,11 @@ kZ uy VB fX +<<<<<<< HEAD Va +======= +qg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX VB VB @@ -1827,7 +1891,11 @@ kZ uy VB fX +<<<<<<< HEAD Va +======= +qg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VB VB op @@ -1852,7 +1920,11 @@ op op TG TG +<<<<<<< HEAD sw +======= +dr +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HD VB Dq diff --git a/_maps/virtual_domains/breeze_bay.dmm b/_maps/virtual_domains/breeze_bay.dmm index 6035cfd2000..19d99b74403 100644 --- a/_maps/virtual_domains/breeze_bay.dmm +++ b/_maps/virtual_domains/breeze_bay.dmm @@ -13,6 +13,13 @@ "e" = ( /turf/open/floor/carpet/red, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"f" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "g" = ( /obj/item/toy/beach_ball/branded, /turf/open/misc/beach/sand, @@ -41,10 +48,13 @@ /obj/structure/table/wood, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +<<<<<<< HEAD "n" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/open/water/beach, /area/virtual_domain/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "o" = ( /obj/structure/flora/tree/jungle/style_5, /turf/open/misc/beach/sand, @@ -230,7 +240,11 @@ i Q i i +<<<<<<< HEAD n +======= +f +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 a "} (3,1,1) = {" diff --git a/_maps/virtual_domains/grasslands_hunt.dmm b/_maps/virtual_domains/grasslands_hunt.dmm new file mode 100644 index 00000000000..c77bdae196f --- /dev/null +++ b/_maps/virtual_domains/grasslands_hunt.dmm @@ -0,0 +1,6650 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aj" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/water, +/area/virtual_domain/fullbright) +"av" = ( +/obj/structure/flora/bush/pointy/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"aD" = ( +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"aZ" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"bd" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"br" = ( +/obj/structure/flora/bush/reed/style_random, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"bG" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"bI" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"bU" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/holofloor/basalt, +/area/virtual_domain/fullbright) +"ce" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"cL" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"cS" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/holofloor/basalt, +/area/virtual_domain/fullbright) +"cZ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"dk" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"ec" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"ep" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"eE" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"fa" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"fm" = ( +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"fK" = ( +/turf/closed/indestructible/rock, +/area/virtual_domain/fullbright) +"fZ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"gT" = ( +/obj/structure/table/wood, +/obj/item/gun/ballistic/rifle/boltaction{ + pixel_y = 8 + }, +/obj/item/gun/ballistic/rifle/boltaction{ + pixel_y = 4 + }, +/obj/item/gun/ballistic/rifle/boltaction, +/turf/template_noop, +/area/virtual_domain/safehouse) +"hH" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"ic" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"iy" = ( +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"iT" = ( +/obj/structure/flora/bush/pointy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"jc" = ( +/obj/structure/flora/bush/stalky/style_random, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"jo" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"jq" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"kd" = ( +/obj/structure/flora/tree/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"kj" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"kq" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"kG" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"kM" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"kX" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"lf" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"lh" = ( +/obj/structure/flora/bush/pointy/style_random, +/turf/closed/indestructible/rock, +/area/virtual_domain/fullbright) +"lF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"lK" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"lN" = ( +/obj/structure/flora/bush/reed/style_random, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"lQ" = ( +/obj/structure/table/wood, +/obj/item/storage/cans/sixbeer, +/turf/template_noop, +/area/virtual_domain/safehouse) +"nn" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"nE" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"nK" = ( +/obj/structure/flora/bush/pointy/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"od" = ( +/obj/item/knife/hunting, +/obj/structure/table/wood, +/turf/template_noop, +/area/virtual_domain/safehouse) +"or" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"oy" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/pointy/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"oJ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"oT" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"ph" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"pn" = ( +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"pJ" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"rj" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"rx" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/tree/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"rO" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"rW" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"sq" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"st" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/misc/dirt/station, +/area/virtual_domain/fullbright) +"sx" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"sZ" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"tw" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/dirt/station, +/area/virtual_domain/fullbright) +"tM" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"tZ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"uh" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"uk" = ( +/turf/open/water, +/area/virtual_domain/fullbright) +"uA" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"uN" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/water, +/area/virtual_domain/fullbright) +"vF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"vN" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"vS" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"we" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"wq" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"wT" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"xj" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"xw" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"xE" = ( +/obj/structure/flora/bush/ferny/style_random, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"yr" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"yC" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"zb" = ( +/obj/structure/flora/bush/stalky/style_random, +/obj/effect/turf_decal/weather/dirt, +/turf/open/water, +/area/virtual_domain/fullbright) +"zd" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"zr" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/rock/pile/jungle/large/style_3, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"zX" = ( +/obj/modular_map_root/safehouse{ + key = "wood" + }, +/turf/template_noop, +/area/virtual_domain/safehouse) +"An" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"Az" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"AM" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) +"AP" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/tree/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Be" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Bl" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Bn" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"BR" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"BS" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/holofloor/basalt, +/area/virtual_domain/fullbright) +"Co" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Cw" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"CH" = ( +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Dk" = ( +/obj/effect/landmark/bitrunning/loot_signal, +/turf/template_noop, +/area/virtual_domain/safehouse) +"DM" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"DT" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Es" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"EW" = ( +/obj/structure/flora/rock/pile/style_2, +/turf/open/floor/holofloor/basalt, +/area/virtual_domain/fullbright) +"Fm" = ( +/obj/structure/flora/tree/jungle/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"FC" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/structure/flora/bush/leavy, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Gt" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"HT" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Ib" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/tree/jungle/small/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Ik" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"IC" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"IQ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"Jr" = ( +/obj/structure/flora/tree/jungle/small/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Js" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/rock/pile/jungle/style_2, +/turf/open/water, +/area/virtual_domain/fullbright) +"Jv" = ( +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"Jw" = ( +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"JD" = ( +/obj/structure/flora/bush/pointy/style_random, +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"JF" = ( +/turf/open/floor/holofloor/basalt, +/area/virtual_domain/fullbright) +"KE" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"KR" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"Lx" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) +"LN" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Mh" = ( +/obj/structure/flora/bush/pale/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"No" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"NG" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"NY" = ( +/obj/structure/flora/tree/stump, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/dirt/station, +/area/virtual_domain/fullbright) +"PA" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"PM" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/dirt/station, +/area/virtual_domain/fullbright) +"PX" = ( +/turf/open/misc/dirt/station, +/area/virtual_domain/fullbright) +"Qh" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"QA" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"QM" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Rl" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Rs" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"RL" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/tree/jungle/small/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"RY" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Se" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Sm" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"SK" = ( +/obj/structure/flora/rock/pile/jungle/style_random, +/turf/open/misc/dirt/station, +/area/virtual_domain/fullbright) +"SP" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"SW" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Tx" = ( +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"TF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/reed/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"Vi" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/holofloor/basalt, +/area/virtual_domain/fullbright) +"Vt" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"VN" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"XP" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/water, +/area/virtual_domain/fullbright) +"Yw" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/rock/pile/jungle/style_3, +/turf/open/water, +/area/virtual_domain/fullbright) +"YF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"YH" = ( +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water, +/area/virtual_domain/fullbright) +"YY" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) +"Zk" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/virtual_domain/fullbright) + +(1,1,1) = {" +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +ec +"} +(2,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(3,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(4,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +JF +JF +JF +JF +JF +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +No +No +yC +LN +LN +yC +yC +aD +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(5,1,1) = {" +VN +fK +fK +fK +fK +fK +cS +JF +JF +JF +JF +cS +JF +JF +JF +fK +fK +SK +SK +PX +PX +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +No +nn +yC +yC +AP +LN +yC +aD +CH +CH +CH +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(6,1,1) = {" +VN +fK +fK +fK +fK +uk +YH +uk +uk +uk +JF +JF +JF +YH +YH +uk +uk +An +An +ep +PM +PM +PM +SK +PX +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +CH +fm +fm +fm +CH +yC +yC +LN +yC +yC +iT +aD +nn +CH +No +nn +yC +yC +yC +yC +Fm +fm +aD +CH +CH +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(7,1,1) = {" +VN +fK +uk +uk +uk +uk +uk +uk +uk +uk +uk +uk +uk +uk +uk +uk +Jv +uk +uk +uk +An +An +ep +PM +PM +PM +tw +PX +PX +SK +fK +fK +LN +yC +yC +CH +CH +aD +Fm +iT +aD +aD +yC +yC +yC +aD +iy +iT +aD +aD +yC +aD +yC +yC +yC +yC +fm +fm +CH +CH +CH +CH +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(8,1,1) = {" +VN +fK +fK +uk +uk +uk +uk +Jv +uk +YH +uk +uk +uk +uk +uk +YH +tZ +jq +jq +tZ +YH +uk +uk +An +An +zd +oJ +vF +PM +SK +SK +SK +Rl +LN +yC +yC +yC +aD +iT +aD +yC +aD +Fm +nn +aD +aD +aD +aD +aD +aD +aD +kd +nn +nn +nn +nn +aD +aD +aD +nn +wT +fm +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(9,1,1) = {" +VN +fK +uk +uk +uk +uk +JF +JF +EW +JF +JF +JF +uk +JF +JF +fK +SK +PX +PX +PM +vN +YH +uk +uk +aj +st +bI +Jw +TF +vF +PM +PX +QM +yC +yC +yC +yC +nn +pn +aD +aD +aD +aD +aD +pn +pn +nn +nn +aD +nn +iT +pn +aD +aD +aD +RL +fm +aD +yC +yC +AP +wT +nn +aD +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(10,1,1) = {" +VN +fK +fK +fK +fK +JF +JF +cS +JF +JF +JF +JF +JF +fK +fK +fK +fK +fK +PX +PM +cZ +or +tZ +jq +uk +An +uk +uk +YH +kj +PM +NY +PM +lf +yC +KE +aD +aD +Jr +iT +aD +aD +pn +aD +aD +iy +nn +nn +aD +aD +kd +iT +nn +aD +aD +fm +aD +yC +yC +yC +yC +yC +yC +nn +nn +aD +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(11,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +JF +fK +fK +JF +JF +fK +fK +fK +fK +fK +fK +SK +PX +tw +PM +PM +BR +jq +uk +uk +uk +aj +PM +tw +PX +Cw +KE +aD +yC +aD +aD +aD +aD +nn +Fm +Tx +yC +yC +yC +yC +yC +LN +fm +pn +aD +aD +nn +aD +aD +yC +yC +yC +yC +yC +AP +aD +aD +aD +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(12,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +aD +yC +pJ +PM +PM +PX +PX +PX +PX +tw +BR +uk +uk +aj +PX +tw +tw +Bl +yC +aD +aD +aD +aD +nn +aD +aD +nn +aD +yC +yC +yC +AP +yC +yC +nn +aD +CH +nn +nn +aD +aD +nn +nn +aD +nn +nn +nn +nn +aD +aD +iT +aD +aD +fK +fK +fK +fK +fK +VN +"} +(13,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +aD +aD +pn +Mh +LN +lK +lK +rj +PX +PX +PX +PM +PM +bI +uk +aj +PM +tw +PX +Zk +Mh +yC +yC +aD +aD +nn +aD +aD +RL +yC +yC +yC +yC +yC +yC +yC +nn +iy +yC +yC +yC +aD +Fm +iT +aD +nn +aD +aD +aD +aD +aD +aD +Fm +iT +nn +fK +fK +fK +fK +fK +VN +"} +(14,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +nn +nn +nn +aD +pn +jo +fm +yC +LN +LN +yC +kX +xj +PX +PX +PM +bI +YH +aj +PX +PX +PM +QM +fm +yC +yC +yC +aD +aD +CH +aD +nn +yC +yC +yC +AP +yC +yC +yC +nn +iT +yC +yC +yC +aD +iT +aD +aD +aD +aD +iy +fm +aD +nn +nn +nn +aD +aD +fK +fK +fK +fK +fK +VN +"} +(15,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +nn +nn +nn +nn +nn +nn +aD +pn +yC +pn +KE +KE +aD +yC +oT +aZ +tw +PX +PX +bI +uk +uk +IQ +tw +PM +PX +Rl +LN +yC +yC +aD +aD +iy +yC +yC +yC +yC +yC +yC +yC +yC +aD +pn +aD +aD +aD +aD +aD +aD +aD +aD +wT +aD +nn +aD +aD +yC +aD +aD +aD +nn +nn +fK +fK +fK +fK +VN +"} +(16,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +nn +nn +wT +wT +nn +pn +fm +fm +aD +aD +aD +yC +aD +aD +aD +aZ +tw +PM +Ik +uk +uk +uk +aj +tw +PM +PX +Rl +yC +yC +yC +aD +aD +pn +aD +aD +yC +yC +yC +aD +yC +aD +aD +Fm +fm +aD +yC +CH +aD +aD +aD +aD +Fm +iT +aD +aD +aD +aD +nn +nn +aD +nn +nn +fK +fK +fK +fK +VN +"} +(17,1,1) = {" +VN +fK +fK +fK +fK +LN +LN +yC +nn +nn +RL +oy +nn +aD +Fm +nK +CH +fm +yC +yC +aD +aD +aD +aZ +tw +PM +Sm +uk +uk +uk +aj +tw +PM +PX +rW +yC +yC +aD +aD +aD +Fm +pn +aD +aD +yC +aD +aD +aD +aD +aD +fm +fm +aD +nn +aD +aD +aD +nn +aD +fm +fm +aD +aD +Lx +Lx +Lx +Lx +Lx +zX +aD +fK +fK +fK +fK +VN +"} +(18,1,1) = {" +VN +fK +fK +fK +yC +yC +AP +iT +aD +aD +iT +aD +aD +pn +JD +aD +pn +Fm +iT +aD +yC +yC +aD +kG +PX +PX +Sm +uk +Jv +YH +aj +PM +tw +wq +aD +yC +aD +aD +aD +nn +CH +CH +aD +aD +aD +aD +aD +Fm +aD +nn +nn +aD +aD +aD +aD +nn +nn +aD +aD +aD +aD +aD +fm +Lx +gT +lQ +Lx +Lx +Lx +aD +fK +fK +fK +fK +VN +"} +(19,1,1) = {" +VN +fK +fK +fK +yC +yC +yC +aD +nn +nn +CH +aD +fm +aD +aD +aD +xE +iT +pn +aD +yC +yC +KE +KE +SP +PX +BR +uk +uk +uk +aj +PM +tw +Zk +Mh +aD +aD +aD +aD +aD +CH +nn +aD +aD +Fm +pn +aD +aD +aD +aD +aD +aD +iy +wT +aD +nn +kq +sx +kq +aD +sx +Az +sx +Lx +Lx +Lx +Lx +Lx +Lx +aD +fK +fK +fK +fK +VN +"} +(20,1,1) = {" +VN +fK +fK +fK +yC +yC +yC +aD +nn +nn +aD +fm +fm +fm +aD +nn +nn +aD +aD +aD +iy +iT +aD +KE +kG +PX +PM +bI +uk +uk +aj +PM +tw +lf +yC +yC +yC +CH +nn +aD +aD +bG +aD +nn +pn +aD +aD +yC +yC +yC +aD +aD +fm +Az +sx +Vt +PX +PX +PX +ic +PX +PM +PX +Lx +Lx +Lx +Lx +Lx +Lx +aD +fK +fK +fK +fK +VN +"} +(21,1,1) = {" +VN +fK +fK +fK +yr +fm +aD +aD +nn +nn +kd +yC +Jr +fm +fm +nn +nn +aD +fm +fm +iT +aD +aD +yC +aZ +PX +PM +vN +YH +uk +aj +PM +PX +Rl +LN +yC +aD +aD +aD +aD +yC +aD +aD +yC +aD +yC +yC +yC +yC +yC +yC +aD +fa +PX +PX +rW +YF +NG +PX +PX +PX +PX +wq +Lx +Lx +Lx +Lx +Lx +Lx +nn +fK +fK +fK +fK +VN +"} +(22,1,1) = {" +VN +fK +fK +fK +yC +aD +nn +aD +aD +aD +yC +yC +yC +aD +Jr +aD +aD +pn +Fm +fm +pn +aD +nn +yC +aZ +PM +PM +vN +Jw +uk +aj +PX +PX +lF +LN +LN +nn +nn +aD +aD +aD +aD +aD +aD +nn +nn +nn +AP +yC +yC +yC +PA +PM +PX +wq +yC +aD +aD +cL +YF +YF +bd +fm +Lx +Dk +Lx +od +Lx +Lx +nn +fK +fK +fK +fK +VN +"} +(23,1,1) = {" +VN +fK +fK +fK +fm +fm +nn +Fm +yC +yC +yC +yC +yC +nn +nn +aD +aD +pn +fm +nn +nn +nn +aD +fm +fm +ce +PM +cZ +Jw +YH +aj +tw +PX +PX +Zk +aD +nn +nn +nn +aD +aD +Jr +nn +aD +nn +nn +nn +aD +yC +sx +Vt +PX +PX +Be +aD +yC +aD +aD +aD +aD +aD +aD +aD +Lx +Lx +Lx +Lx +Lx +AM +nn +fK +fK +fK +fK +VN +"} +(24,1,1) = {" +VN +fK +fK +fK +Fm +fm +aD +aD +yC +yC +yC +yC +yC +nn +nn +nn +nn +aD +aD +yC +yC +yC +aD +Mh +fm +hH +PX +PM +cZ +uk +uk +ep +PM +PX +Bn +aD +nn +nn +nn +nn +aD +aD +aD +yC +aD +aD +aD +aD +Vt +PX +rW +bd +bd +aD +yC +yC +yC +aD +aD +aD +fm +pn +aD +aD +aD +nn +nn +nn +aD +nn +fK +fK +fK +fK +VN +"} +(25,1,1) = {" +VN +fK +fK +fK +iT +aD +RL +pn +nn +yC +yC +AP +nn +nn +aD +aD +aD +Fm +yC +yC +oT +yC +yC +aD +yC +aZ +PX +PM +PX +nE +uk +uk +ep +PX +PX +Ib +yC +yC +nn +nn +aD +aD +aD +aD +pn +pn +nn +aD +aD +YF +aD +yC +yC +yC +yC +yC +yC +yC +nn +aD +Fm +iT +aD +yC +aD +pn +fm +fm +aD +aD +fK +fK +fK +fK +VN +"} +(26,1,1) = {" +VN +fK +fK +aD +aD +aD +iT +aD +nn +yC +yC +yC +nn +aD +aD +iy +aD +aD +aD +yC +oT +yC +aD +aD +yC +yC +SP +PX +tw +PM +BR +uk +ph +tw +PX +rW +yC +yC +yC +nn +aD +nn +aD +aD +aD +Fm +pn +aD +aD +yC +aD +yC +yC +yC +yC +yC +yC +yC +nn +aD +iT +nn +aD +aD +aD +nn +iy +fm +aD +fK +fK +fK +fK +fK +VN +"} +(27,1,1) = {" +VN +fK +fK +aD +nn +nn +pn +aD +nn +nn +nn +yC +nn +aD +aD +aD +aD +aD +aD +aD +AP +fm +yC +aD +CH +KE +KE +SP +PX +PM +PX +sq +PX +PX +Es +aD +yC +yC +yC +aD +aD +aD +aD +aD +aD +pn +aD +aD +yC +aD +aD +nn +nn +nn +yC +yC +yC +rx +wT +pn +aD +aD +aD +aD +pn +iT +iT +nn +nn +fK +fK +fK +fK +fK +VN +"} +(28,1,1) = {" +VN +fK +fK +CH +nn +nn +Fm +fm +aD +nn +rx +aD +aD +nn +aD +nn +nn +nn +aD +fm +fm +yC +yC +yC +aD +aD +yC +kG +PX +tw +PX +sq +tw +PX +Zk +aD +yC +yC +aD +aD +aD +Fm +aD +aD +nn +nn +aD +aD +aD +aD +nn +iy +aD +aD +nn +yC +nn +wT +nn +aD +aD +aD +aD +aD +pn +Fm +iT +aD +aD +fK +fK +fK +fK +fK +VN +"} +(29,1,1) = {" +VN +fK +fK +CH +nn +nn +fm +pn +fm +fm +aD +aD +aD +aD +Fm +nn +nn +nn +nn +aD +aD +aD +yC +yC +aD +yC +yC +yC +rj +PX +tw +uN +PM +Co +KE +aD +aD +yC +aD +aD +aD +aD +aD +aD +yC +yC +yC +aD +aD +aD +iT +aD +aD +Fm +aD +aD +nn +aD +aD +aD +Fm +aD +aD +yC +aD +fm +fm +aD +fK +fK +fK +fK +fK +fK +VN +"} +(30,1,1) = {" +VN +fK +fK +CH +CH +aD +aD +nn +iT +Fm +fm +aD +aD +aD +iT +nn +nn +nn +fm +pn +nn +aD +aD +yC +aD +aD +yC +aD +Vt +PX +PX +uN +PM +Se +yC +yC +aD +aD +aD +nn +nn +aD +yC +yC +yr +yC +yC +aD +aD +aD +kd +iT +aD +aD +aD +fm +fm +aD +nn +aD +aD +aD +yC +yC +aD +aD +aD +aD +aD +aD +fK +fK +fK +fK +VN +"} +(31,1,1) = {" +VN +fK +fK +CH +aD +aD +aD +aD +aD +iT +aD +nn +nn +nn +aD +aD +aD +aD +kd +fm +nn +aD +aD +iT +yC +aD +aD +yC +aZ +tw +PM +uN +PM +PX +Zk +yC +aD +aD +aD +nn +nn +aD +aD +yC +yC +yC +yC +yC +aD +nn +nn +nn +nn +aD +aD +aD +Fm +iT +aD +aD +yC +yC +yC +yC +yC +yC +aD +pn +pn +nn +fK +fK +fK +fK +VN +"} +(32,1,1) = {" +VN +fK +fK +fK +aD +fm +nn +nn +nn +aD +aD +nn +RL +nn +CH +aD +aD +aD +fm +fm +aD +aD +iT +Fm +pn +aD +yC +yC +aZ +PX +PM +Js +tw +PX +Bn +aD +aD +aD +aD +nn +nn +aD +nn +nn +Fm +yC +yC +aD +aD +nn +nn +nn +nn +aD +aD +nn +fm +aD +yC +AP +yC +yC +yC +yC +yC +yC +Gt +nn +Jr +fm +fK +fK +fK +fK +VN +"} +(33,1,1) = {" +VN +fK +fK +fK +aD +iy +wT +nn +nn +pn +aD +aD +iT +aD +aD +yC +nn +nn +nn +aD +aD +aD +nn +iT +aD +aD +aD +yC +aZ +PX +PX +Yw +PX +tw +PX +Zk +yC +aD +aD +RL +yC +aD +aD +aD +nn +nn +nn +kd +aD +aD +No +nn +aD +aD +aD +aD +aD +aD +yC +yC +yC +yC +yC +yC +yC +AP +wT +nn +fm +aD +fK +fK +fK +fK +VN +"} +(34,1,1) = {" +VN +fK +fK +fK +aD +nn +fm +aD +aD +Fm +bG +aD +nn +nn +nn +rx +yC +yC +yC +nn +aD +aD +aD +aD +nn +nn +nn +Mh +hH +PX +PX +bI +ep +tw +PM +Zk +yC +yC +aD +yC +aD +aD +aD +aD +aD +aD +aD +aD +aD +aD +iy +dk +nn +aD +kd +nn +aD +aD +yC +LN +yC +dk +yC +yC +yC +oT +nn +nn +aD +nn +fK +fK +fK +fK +VN +"} +(35,1,1) = {" +VN +fK +fK +fK +aD +aD +aD +aD +aD +pn +pn +yC +yC +yC +yC +nn +yC +yC +yC +nn +RL +aD +aD +aD +yC +yC +yC +fm +hH +PX +tw +bI +ph +PX +PM +Zk +yC +aD +aD +aD +aD +yC +aD +aD +nn +aD +aD +aD +aD +aD +yC +yC +nn +aD +aD +aD +aD +Gt +nn +rx +LN +yC +yC +yC +yC +yC +nn +nn +aD +fK +fK +fK +fK +fK +VN +"} +(36,1,1) = {" +VN +fK +fK +aD +yC +aD +kd +aD +aD +aD +pn +yC +yC +yC +yC +nn +yC +yC +yC +aD +iT +aD +Fm +yC +yC +yC +LN +fm +we +PM +tw +uN +PM +PX +PM +rW +aD +aD +nn +nn +nn +aD +aD +kd +aD +aD +aD +rx +nn +nn +yC +yC +nn +aD +iT +iT +aD +pn +nn +nn +yC +nn +yC +yC +AP +nn +nn +aD +aD +fK +fK +fK +fK +fK +VN +"} +(37,1,1) = {" +VN +fK +fK +yC +yC +yC +yC +aD +yC +aD +Fm +pn +aD +aD +aD +yC +aD +nn +nn +nn +aD +aD +aD +aD +yC +yC +yC +hH +PX +PM +PX +uN +PM +PX +Es +aD +Mh +fm +yC +yC +nn +nn +nn +aD +aD +aD +aD +nn +nn +yC +yC +yC +yC +yC +rx +iT +aD +aD +pn +iT +aD +RL +yC +yC +yC +nn +aD +pn +fm +fK +fK +fK +fK +fK +VN +"} +(38,1,1) = {" +VN +fK +fK +yC +LN +LN +yC +aD +yC +aD +pn +pn +aD +aD +aD +aD +Fm +fm +aD +aD +iy +fm +aD +aD +aD +yC +aD +Vt +PX +PX +XP +aj +PM +PX +QM +rO +Mh +aD +yC +yC +yC +aD +aD +aD +aD +aD +yC +yC +yC +yC +yC +yC +yC +yC +iT +aD +aD +iy +aD +aD +aD +iT +aD +nn +nn +nn +aD +pn +kd +fK +fK +fK +fK +fK +VN +"} +(39,1,1) = {" +VN +fK +fK +yC +AP +LN +LN +aD +yC +yC +RL +pn +nn +aD +aD +nn +fm +fm +aD +aD +fm +fm +aD +aD +Jr +fm +aD +yC +IC +PX +SK +bI +ep +PX +PX +PX +Zk +yC +yC +yC +yC +yC +aD +nn +kd +aD +yC +yC +AP +yC +yC +yC +yC +yC +aD +aD +aD +iT +iT +aD +aD +aD +aD +iT +iT +aD +aD +aD +iT +fK +fK +fK +fK +fK +VN +"} +(40,1,1) = {" +VN +fK +fK +yC +yC +yC +kd +nn +yC +yC +nn +aD +nn +aD +fm +fm +aD +aD +nn +nn +aD +aD +nn +aD +fm +aD +yC +yC +aZ +PX +PX +bI +zb +PM +PX +PX +Zk +fm +yC +yC +yC +aD +iT +aD +aD +aD +aD +yC +iT +yC +yC +yC +AP +yC +aD +aD +aD +rx +nn +nn +aD +nn +pn +kd +iT +aD +aD +aD +aD +fK +fK +fK +fK +fK +VN +"} +(41,1,1) = {" +VN +fK +aD +yC +yC +yC +aD +nn +yC +yC +nn +aD +aD +aD +Fm +yC +yC +aD +nn +nn +Fm +fm +aD +aD +KE +aD +aD +yC +aZ +PX +PM +BR +YH +vF +PM +PX +Bn +aD +aD +yC +nn +nn +Fm +iT +CH +aD +aD +aD +aD +iT +yC +yC +yC +aD +aD +nn +nn +nn +nn +nn +aD +aD +pn +pn +aD +nn +aD +aD +fK +fK +fK +fK +fK +fK +VN +"} +(42,1,1) = {" +VN +fK +yC +yC +RL +aD +aD +nn +yC +oT +nn +aD +aD +aD +yC +yC +yr +aD +aD +aD +aD +aD +aD +fm +fm +aD +aD +RY +kG +PX +PM +PX +bI +Jw +vF +PM +PX +Zk +yC +aD +nn +nn +iT +iy +iT +nn +aD +nn +pn +Fm +yC +yC +yC +aD +aD +aD +aD +nn +nn +iT +aD +aD +aD +yC +yC +aD +aD +fK +fK +fK +fK +fK +fK +fK +VN +"} +(43,1,1) = {" +VN +fK +yC +yC +Gt +aD +aD +nn +nn +AP +nn +aD +Jr +aD +aD +aD +aD +aD +nn +nn +nn +aD +aD +Jr +oT +aD +KE +RY +eE +PX +PM +PM +bI +YH +sZ +PM +PX +Zk +yC +aD +nn +aD +aD +iT +aD +aD +aD +nn +pn +iT +iT +yC +aD +aD +aD +rx +iT +aD +iy +iT +aD +pn +yC +dk +yC +yC +CH +fK +fK +fK +fK +fK +fK +fK +VN +"} +(44,1,1) = {" +VN +fK +fK +aD +nn +aD +nn +nn +yC +oT +yC +nn +aD +aD +aD +fm +fm +aD +nn +nn +nn +nn +aD +oT +yC +nn +aD +KE +Qh +PX +PX +PX +Sm +uk +DM +PX +tw +Zk +yC +aD +nn +aD +nn +nn +nn +aD +yC +aD +aD +pn +pn +aD +aD +aD +aD +iT +aD +aD +aD +aD +aD +kd +yC +yC +yC +yC +CH +fK +fK +fK +fK +fK +fK +fK +VN +"} +(45,1,1) = {" +VN +fK +fK +aD +aD +Jr +Gt +nn +yC +yC +yC +nn +aD +aD +fm +Fm +fm +yC +yC +yC +rx +wT +yC +yC +yC +nn +aD +aZ +PM +PX +KR +TF +YH +aj +tw +PX +PM +rW +CH +aD +yC +yC +yC +aD +aD +aD +aD +pn +aD +aD +Jr +iT +nn +nn +aD +yC +aD +yC +yC +aD +yC +yC +yC +AP +dk +yC +CH +fK +fK +fK +fK +fK +fK +fK +VN +"} +(46,1,1) = {" +VN +fK +fK +fK +nn +aD +aD +nn +yC +AP +yC +aD +aD +wT +fm +oT +oT +yC +yC +yC +nn +nn +aD +yC +yC +nn +KE +aZ +PX +PX +tw +Sm +uk +aj +tw +PX +wq +aD +aD +aD +yC +yC +yC +yC +aD +nn +aD +kd +nn +aD +pn +aD +aD +pn +aD +aD +yC +yC +yC +yC +yC +yC +yC +yC +yC +yC +aD +fK +fK +fK +fK +fK +fK +fK +VN +"} +(47,1,1) = {" +VN +fK +fK +fK +nn +aD +nn +aD +nn +aD +aD +aD +aD +yC +yC +yC +yC +yC +yC +yC +aD +aD +Fm +aD +aD +bG +aD +Vt +PX +PM +Ik +uk +uk +ph +PX +Es +yC +iT +iy +yC +aD +yC +aD +Fm +av +aD +pn +pn +pn +nn +aD +aD +iT +iT +pn +nn +nn +nn +rx +nn +yC +yC +yC +yC +yC +yC +iT +fK +fK +fK +fK +fK +fK +fK +VN +"} +(48,1,1) = {" +VN +fK +fK +fK +nn +aD +aD +kd +pn +aD +aD +aD +rx +nn +nn +AP +yC +yC +yC +oT +yC +aD +aD +nn +nn +aD +yC +PA +PX +Ik +uk +uk +aj +PX +PX +Zk +yC +aD +iT +yC +yC +yC +aD +iT +pn +nn +aD +aD +nn +aD +aD +nn +aD +Fm +iT +aD +aD +aD +fm +fm +nn +nn +yC +yC +yC +AP +iT +fK +fK +fK +fK +fK +fK +fK +VN +"} +(49,1,1) = {" +VN +fK +fK +CH +nn +aD +pn +pn +aD +aD +nn +aD +pn +aD +nn +nn +yC +yC +yC +Fm +fm +fm +aD +aD +aD +yC +aZ +PX +PX +bI +uk +YH +aj +PM +FC +aD +aD +aD +aD +yC +aD +yC +yC +yC +aD +aD +aD +nn +aD +aD +aD +aD +pn +iT +aD +aD +aD +yC +CH +aD +aD +nn +nn +yC +aD +iT +pn +fK +fK +fK +fK +fK +fK +fK +VN +"} +(50,1,1) = {" +VN +fK +fK +nn +aD +aD +aD +yC +yC +CH +aD +nn +aD +aD +aD +pn +nn +nn +nn +fm +fm +aD +aD +aD +Fm +yC +aZ +PX +PM +bI +uk +uk +ph +PM +Zk +yC +Mh +fm +aD +yC +aD +yC +yC +yC +aD +yC +aD +aD +yC +aD +Mh +fm +aD +pn +aD +aD +yr +yC +aD +pn +pn +aD +nn +nn +nn +aD +aD +aD +fK +fK +fK +fK +fK +fK +VN +"} +(51,1,1) = {" +VN +fK +fK +No +aD +aD +nn +yC +AP +aD +aD +aD +iT +aD +aD +iy +pn +aD +aD +aD +aD +nn +aD +aD +yC +yC +aZ +PX +PM +bI +uk +aj +PX +PX +Zk +yC +fm +fm +fm +aD +KE +yC +yC +yC +aD +nn +Jr +yC +yC +yC +fm +fm +Mh +Jr +yC +aD +yC +yC +LN +fm +kd +fm +aD +kd +aD +aD +aD +aD +fK +fK +fK +fK +fK +fK +VN +"} +(52,1,1) = {" +VN +fK +fK +nn +aD +aD +nn +nn +nn +aD +aD +aD +Fm +Gt +nn +nn +aD +aD +nn +aD +HT +aD +aD +iT +aD +yC +aZ +PX +PM +bI +uk +aj +tw +PX +DT +vS +rO +rO +rO +sx +aD +KE +KE +aD +KE +sx +sx +vS +vS +vS +rO +uA +fm +aD +yC +aD +yC +yC +nn +fm +fm +aD +aD +aD +nn +pn +nn +fm +nn +fK +fK +fK +fK +fK +VN +"} +(53,1,1) = {" +VN +fK +fK +nn +nn +RL +aD +aD +aD +aD +aD +aD +aD +yC +nn +nn +nn +aD +Jr +HT +yC +yC +aD +Fm +iT +yC +aZ +PX +PX +bI +uk +aj +PX +PM +PM +PM +tw +tw +tw +PX +Se +kM +kM +aD +PA +PX +tw +PX +PM +tw +PX +PX +lF +vS +yC +yC +KE +aD +bG +aD +aD +nn +aD +aD +aD +aD +RL +fm +nn +fK +fK +fK +fK +fK +VN +"} +(54,1,1) = {" +VN +fK +fK +fK +nn +nn +aD +Fm +CH +bG +aD +HT +HT +HT +aD +HT +aD +HT +aD +aD +yC +yC +fm +fm +fm +aD +Vt +PM +tw +BR +uk +uk +An +An +ep +PX +PX +PM +PM +PX +PX +PX +PX +fZ +PM +PX +PX +PM +PM +PM +PX +PX +PX +PX +QM +vS +sx +KE +yC +KE +aD +nn +aD +nn +fm +aD +fm +nn +nn +nn +fK +fK +fK +fK +VN +"} +(55,1,1) = {" +VN +fK +fK +fK +nn +nn +aD +aD +iT +aD +HT +HT +HT +HT +HT +aD +yC +aD +aD +nn +aD +aD +yC +aD +aD +fm +hH +PX +PX +PM +jc +uk +uk +uk +uk +An +oJ +TF +TF +vF +PM +PM +tw +PX +tw +PX +Ik +An +An +ep +PM +PX +tw +tw +PM +PM +PX +xw +aD +KE +yC +nn +aD +aD +kd +fm +CH +No +nn +nn +fK +fK +fK +fK +VN +"} +(56,1,1) = {" +VN +fK +fK +fK +fK +aD +aD +aD +Fm +iT +HT +HT +HT +HT +HT +HT +aD +aD +Fm +fm +aD +nn +aD +nn +aD +fm +fm +tM +PX +PX +br +YH +uk +uk +Jv +uk +uk +YH +YH +sZ +PM +PM +PX +SK +Ik +An +uk +uk +uk +uk +oJ +ep +tw +tw +tw +PX +PM +Zk +yC +yC +aD +KE +aD +aD +fm +No +CH +CH +fK +fK +fK +fK +fK +fK +VN +"} +(57,1,1) = {" +VN +fK +fK +fK +fK +yC +yC +yC +aD +HT +HT +HT +zr +HT +HT +HT +aD +aD +fm +fm +fm +aD +aD +iT +fm +aD +fm +Mh +rj +PX +cZ +lN +YH +uk +uk +uk +uk +uk +uk +YH +oJ +oJ +An +An +uk +uk +uk +uk +uk +uk +uk +uk +An +ep +PM +PX +PM +QM +yC +yC +aD +nn +nn +nn +aD +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(58,1,1) = {" +VN +fK +fK +fK +fK +yC +yC +yr +aD +aD +HT +HT +HT +HT +HT +HT +aD +aD +nn +nn +aD +nn +iT +iy +fm +aD +yC +yC +Vt +PX +PX +PM +nE +jq +jq +jq +jq +jq +uk +uk +uk +jq +uk +uk +uk +uk +jq +tZ +tZ +jq +uk +uk +uk +uk +ep +PX +NY +tw +rW +aD +aD +nn +nn +nn +aD +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(59,1,1) = {" +VN +fK +fK +fK +fK +yC +yC +yC +yC +yC +aD +HT +HT +HT +HT +aD +aD +aD +yC +AP +yC +nn +aD +iT +aD +nn +yC +yC +aD +rj +PX +PM +PM +PX +PM +PM +PM +tw +BR +uk +aj +st +bI +uk +jq +ph +PX +tw +PM +PM +BR +uk +uk +uk +aj +PM +PX +PM +Bn +yC +CH +CH +CH +aD +nn +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(60,1,1) = {" +VN +fK +fK +fK +fK +AP +LN +yC +yC +oT +HT +HT +aD +pn +pn +HT +aD +yC +yC +yC +yC +nn +Fm +aD +nn +nn +yC +yC +nn +aD +rj +PX +PX +SW +PM +PM +PM +PM +PX +BR +jq +Rs +tZ +ph +PX +PX +PX +PM +tw +PX +PM +vN +YH +uk +uk +IQ +PM +PX +PM +Zk +dk +dk +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(61,1,1) = {" +VN +fK +fK +fK +fK +fm +aD +yC +oT +Fm +iT +aD +nn +pn +aD +aD +aD +yr +yC +yC +yC +nn +fm +aD +nn +nn +nn +AP +yC +yC +aD +QA +QA +kG +PX +PM +tw +PX +NY +PX +PM +PM +PM +PX +PX +PX +PX +PX +wq +IC +PM +vN +Jw +uk +uk +kj +PM +PX +PX +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(62,1,1) = {" +VN +fK +fK +fK +fK +CH +aD +aD +aD +aD +aD +iy +iT +aD +HT +yC +fm +fm +fm +aD +aD +pn +fm +aD +aD +nn +nn +yC +yC +yC +iT +aD +KE +KE +bd +bd +YY +IC +PM +PM +PX +PX +PX +Es +YY +YY +bd +bd +aD +aZ +PM +cZ +or +YH +uk +uk +An +vF +PX +SK +SK +bU +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(63,1,1) = {" +VN +fK +fK +fK +fK +fK +nn +aD +aD +yC +yC +yC +yC +Fm +aD +aD +aD +nn +AP +aD +aD +pn +Fm +iT +CH +aD +nn +nn +nn +RL +nn +aD +yC +yC +yC +nn +yC +yC +bd +YY +YY +YY +cL +yC +yC +yC +yC +aD +KE +kG +PX +PM +PM +Sm +uk +uk +uk +kj +PM +PX +BS +JF +cS +JF +JF +JF +JF +JF +fK +fK +fK +fK +fK +fK +VN +"} +(64,1,1) = {" +VN +fK +fK +fK +fK +fK +nn +aD +aD +yC +yC +yC +aD +nn +nn +nn +fm +aD +nn +aD +yC +aD +iT +fm +nn +aD +aD +aD +aD +yC +aD +aD +yC +yC +aD +nn +yC +yC +aD +yC +yC +yC +fm +fm +Mh +fm +aD +KE +KE +KE +rj +PX +PX +BR +jq +jq +jq +uk +An +An +uk +uk +uk +uk +JF +JF +JF +JF +fK +fK +fK +fK +fK +fK +VN +"} +(65,1,1) = {" +VN +fK +fK +fK +fK +fK +nn +aD +aD +aD +AP +iT +aD +nn +nn +nn +Fm +iT +nn +yC +yC +yC +yC +aD +aD +fm +fm +fm +aD +aD +aD +fm +nn +nn +aD +aD +aD +aD +Fm +fm +fm +fm +yC +yC +aD +Jr +fm +aD +aD +yC +aZ +PM +PX +PM +PM +PX +PX +bI +uk +uk +uk +uk +uk +YH +JF +JF +EW +JF +JF +JF +JF +fK +fK +fK +VN +"} +(66,1,1) = {" +VN +fK +fK +fK +fK +fK +RL +Gt +aD +aD +iT +aD +pn +nn +nn +nn +iT +fm +nn +yC +yC +yC +yC +aD +aD +aD +Fm +nn +nn +nn +aD +aD +Fm +fm +aD +nn +nn +fm +fm +fm +aD +fm +yC +yC +aD +aD +uh +yC +CH +yC +yC +fK +PX +PX +PX +PX +tw +BR +uk +YH +YH +uk +uk +uk +uk +uk +JF +JF +JF +EW +JF +fK +fK +fK +VN +"} +(67,1,1) = {" +VN +fK +fK +fK +fK +fK +wT +nn +aD +CH +aD +aD +iy +fm +aD +nn +yC +nn +yC +yC +yC +AP +yC +yC +nn +aD +fm +nn +nn +nn +aD +aD +fm +fm +aD +Fm +aD +aD +aD +nn +nn +aD +aD +aD +Fm +fm +yC +yC +fK +fK +fK +fK +fK +fK +fK +SK +PX +PX +Vi +JF +JF +JF +Jv +uk +uk +uk +YH +YH +uk +uk +uk +JF +fK +fK +VN +"} +(68,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +CH +aD +aD +iT +aD +aD +kd +yC +yC +AP +yC +yC +yC +yC +uh +yC +nn +aD +aD +nn +nn +nn +nn +aD +nn +CH +CH +nn +nn +nn +CH +nn +nn +aD +aD +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +SK +PX +SK +bU +JF +JF +JF +JF +YH +uk +uk +uk +uk +uk +uk +uk +fK +fK +VN +"} +(69,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +nn +aD +nn +rx +iT +aD +aD +yC +yC +LN +yC +yC +dk +yC +yC +yC +nn +aD +aD +nn +RL +nn +nn +aD +aD +No +No +nn +nn +No +CH +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +JF +EW +JF +JF +JF +JF +uk +uk +uk +uk +uk +Jv +uk +uk +fK +VN +"} +(70,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +lh +iT +iT +iT +CH +aD +aD +nn +rx +LN +yC +yC +yC +yC +yC +aD +Fm +aD +aD +CH +CH +aD +aD +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +JF +JF +JF +JF +JF +JF +JF +JF +JF +fK +uk +uk +uk +uk +fK +VN +"} +(71,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +aD +nn +wT +fm +CH +nn +wT +nn +nn +aD +aD +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +cS +JF +JF +JF +JF +fK +fK +fK +fK +fK +fK +VN +"} +(72,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(73,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(74,1,1) = {" +VN +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +fK +VN +"} +(75,1,1) = {" +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +VN +"} diff --git a/_maps/virtual_domains/meta_central.dmm b/_maps/virtual_domains/meta_central.dmm new file mode 100644 index 00000000000..bf821cc6e34 --- /dev/null +++ b/_maps/virtual_domains/meta_central.dmm @@ -0,0 +1,8434 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ab" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood{ + pixel_x = -4 + }, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/carpet, +/area/virtual_domain) +"ac" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Command Hallway" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ai" = ( +/obj/structure/broken_flooring/corner/always_floorplane/directional/south, +/turf/open/floor/plating, +/area/virtual_domain) +"an" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Showroom Shutters" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"as" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + name = "Showroom Shutters" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"at" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/item/storage/box/mothic_rations{ + pixel_y = -9; + pixel_x = 6 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"au" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/toy/figure/detective{ + pixel_y = 13 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"av" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"aw" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/right/directional/north{ + name = "Head of Personnel's Desk"; + req_access = list("hop") + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "hop"; + name = "Privacy Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ay" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/item/surgicaldrill, +/turf/open/indestructible/meat, +/area/virtual_domain) +"aA" = ( +/obj/item/restraints/legcuffs/beartrap/prearmed, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"aC" = ( +/obj/structure/fluff/paper/stack, +/turf/open/floor/iron, +/area/virtual_domain) +"aO" = ( +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/machinery/light/directional/south, +/obj/machinery/light_switch/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/virtual_domain) +"aQ" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/decal/cleanable/food/egg_smudge, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"aT" = ( +/obj/effect/mob_spawn/ghost_role/human/pirate/skeleton/captain, +/turf/open/floor/plating, +/area/virtual_domain) +"aV" = ( +/obj/structure/flora/bush/large/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"aZ" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/robot_debris/limb, +/obj/machinery/exoscanner, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron, +/area/virtual_domain) +"ba" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"bb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/spawner/random/trash, +/turf/open/floor/iron, +/area/virtual_domain) +"bd" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor4" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"bf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor7" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"bg" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = 9; + pixel_y = 2 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"bl" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"bm" = ( +/obj/item/clothing/mask/surgical, +/obj/effect/mob_spawn/corpse/human/doctor, +/turf/open/indestructible/meat, +/area/virtual_domain) +"br" = ( +/obj/effect/spawner/random/decoration/showcase, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/carpet, +/area/virtual_domain) +"bs" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/item/assembly/flash, +/turf/open/floor/iron, +/area/virtual_domain) +"bu" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/structure/bonfire/prelit, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"bw" = ( +/obj/effect/decal/cleanable/blood/footprints{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"bO" = ( +/obj/structure/bed/maint, +/obj/item/bedsheet/pirate, +/turf/open/floor/carpet, +/area/virtual_domain) +"bP" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L6" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"bQ" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/ai_module/malf, +/turf/open/floor/iron, +/area/virtual_domain) +"bR" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"bS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/iron, +/area/virtual_domain) +"bT" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/stock_parts/subspace/filter{ + pixel_x = 15 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"bU" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"bW" = ( +/obj/structure/barricade/sandbags, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"bZ" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/turf_decal/caution/red, +/turf/open/floor/iron, +/area/virtual_domain) +"cj" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"ck" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L3" + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "w"; + pixel_y = -15; + pixel_x = -17 + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "e"; + pixel_y = -16; + pixel_x = -2 + }, +/obj/effect/decal/cleanable/blood{ + pixel_y = -13 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"cp" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/holosign/barrier, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron, +/area/virtual_domain) +"cr" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/virtual_domain) +"cw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"cx" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/kirbyplants/organic/plant16, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"cz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"cB" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt, +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/iron, +/area/virtual_domain) +"cC" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"cD" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/wood, +/area/virtual_domain) +"cF" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"cH" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/large/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"cI" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = 5; + pixel_y = 7 + }, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron, +/area/virtual_domain) +"cK" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/barricade/sandbags, +/obj/structure/railing, +/turf/open/floor/iron, +/area/virtual_domain) +"cN" = ( +/obj/structure/sign/departments/court/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/barricade/security, +/turf/open/floor/iron, +/area/virtual_domain) +"cO" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/item/trash/fleet_ration, +/obj/effect/decal/cleanable/food/egg_smudge, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"cW" = ( +/obj/structure/alien/weeds, +/turf/open/floor/plating, +/area/virtual_domain) +"cZ" = ( +/obj/machinery/button/door/directional/west{ + name = "Privacy Shutters Control" + }, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"db" = ( +/turf/open/floor/carpet, +/area/virtual_domain) +"dc" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/virtual_domain) +"dd" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"di" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"dk" = ( +/obj/machinery/button/door/directional/south{ + name = "E.V.A. Storage Shutter Control" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/suit_storage_unit/void_old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"dl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, +/turf/open/floor/iron, +/area/virtual_domain) +"dz" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/structure/bed/dogbed/ian, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/wood, +/area/virtual_domain) +"dA" = ( +/obj/structure/holosign/barrier/medical, +/turf/closed/indestructible/fakedoor, +/area/virtual_domain) +"dC" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"dD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"dE" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/virtual_domain) +"dP" = ( +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/obj/structure/sign/directions/command{ + pixel_y = -8 + }, +/turf/closed/wall/r_wall, +/area/virtual_domain) +"dU" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"dX" = ( +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/bot, +/obj/item/shard, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"dY" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/banner/medical, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"dZ" = ( +/obj/item/storage/belt/utility, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/structure/rack, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/button/door/directional/south{ + name = "Gateway Shutter Control" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ej" = ( +/obj/structure/flora/bush/jungle/a/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"ek" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"ep" = ( +/obj/structure/table/wood, +/obj/item/storage/briefcase/secure{ + desc = "A large briefcase with a digital locking system, and the Nanotrasen logo emblazoned on the sides."; + name = "\improper Nanotrasen-brand secure briefcase exhibit"; + pixel_y = 2 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"er" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"eu" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/virtual_domain) +"ey" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"ez" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ + pixel_x = -2; + pixel_y = -3 + }, +/obj/item/wrench, +/obj/item/multitool, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/incident_display/delam/directional/south, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"eA" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/bookcase/random, +/obj/machinery/light/broken/directional/west, +/turf/open/floor/iron, +/area/virtual_domain) +"eB" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"eD" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L3" + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron, +/area/virtual_domain) +"eG" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"eN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"eR" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/computer/old{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"eV" = ( +/obj/machinery/light/directional/west, +/obj/structure/table, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"eX" = ( +/obj/structure/meateor_fluff/abandoned_headcrab_egg, +/turf/open/indestructible/meat, +/area/virtual_domain) +"eZ" = ( +/obj/structure/meateor_fluff/eyeball, +/obj/effect/mob_spawn/corpse/human/doctor, +/turf/open/indestructible/meat, +/area/virtual_domain) +"fc" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/barricade/sandbags, +/obj/structure/railing, +/turf/open/floor/iron, +/area/virtual_domain) +"fh" = ( +/turf/open/floor/plating, +/area/virtual_domain) +"fj" = ( +/obj/structure/closet/crate/cargo, +/obj/effect/spawner/random/maintenance/no_decals/seven, +/turf/open/floor/iron, +/area/virtual_domain) +"fn" = ( +/obj/item/camera/detective{ + pixel_y = 4; + pixel_x = 9 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"fr" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"fz" = ( +/obj/machinery/pdapainter{ + pixel_y = 2 + }, +/obj/machinery/requests_console/directional/north{ + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console" + }, +/turf/open/floor/wood, +/area/virtual_domain) +"fB" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/virtual_domain) +"fC" = ( +/obj/structure/rack, +/obj/item/wrench, +/obj/item/screwdriver, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 16; + icon_state = "candle2_lit"; + pixel_x = 17 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"fD" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/armory/laser_gun, +/turf/template_noop, +/area/virtual_domain/safehouse) +"fF" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"fG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/decal/cleanable/glass, +/obj/item/clothing/head/costume/party, +/turf/open/floor/iron, +/area/virtual_domain) +"fK" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/virtual_domain) +"fN" = ( +/obj/structure/sign/directions/science{ + pixel_y = -8 + }, +/obj/structure/sign/directions/medical{ + pixel_y = 8 + }, +/obj/structure/sign/directions/evac, +/turf/closed/wall/r_wall, +/area/virtual_domain) +"fP" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"fQ" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"gb" = ( +/obj/structure/flora/rock/pile/jungle, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"ge" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/tree/jungle/small/style_4, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"gg" = ( +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"gj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/virtual_domain) +"gk" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/fluff/paper/stack, +/obj/item/flashlight/lamp/green, +/turf/open/floor/iron, +/area/virtual_domain) +"gt" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"gC" = ( +/obj/item/kirbyplants/synthetic, +/turf/open/floor/plating, +/area/virtual_domain) +"gE" = ( +/turf/open/floor/wood, +/area/virtual_domain) +"gM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/bodypart/head/robot, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/digital_clock/directional/north, +/obj/item/knife/combat/cyborg{ + pixel_x = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"gU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/carpet, +/area/virtual_domain) +"hb" = ( +/obj/structure/table/wood, +/obj/item/camera{ + pixel_y = 4 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/carpet, +/area/virtual_domain) +"hc" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron, +/area/virtual_domain) +"hd" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"hg" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/holosign/barrier, +/turf/open/floor/iron, +/area/virtual_domain) +"hh" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/carpet, +/area/virtual_domain) +"hi" = ( +/obj/structure/broken_flooring/pile/directional/west, +/obj/structure/holosign/barrier, +/turf/open/floor/plating, +/area/virtual_domain) +"hj" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Command Hallway" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"hp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ht" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L13" + }, +/obj/effect/spawner/random/trash, +/turf/open/floor/iron, +/area/virtual_domain) +"hv" = ( +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/vending/wallmed/directional/west, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron, +/area/virtual_domain) +"hw" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/iron, +/area/virtual_domain) +"hz" = ( +/obj/structure/reagent_dispensers/wall/virusfood/directional/south, +/obj/structure/meateor_fluff/eyeball, +/turf/open/indestructible/meat, +/area/virtual_domain) +"hF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron, +/area/virtual_domain) +"hG" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Gateway Chamber" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"hR" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"hU" = ( +/obj/structure/frame/computer, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"hV" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet/crate/secure/syndicrate, +/turf/open/floor/iron, +/area/virtual_domain) +"hX" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) +"hZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/virtual_domain) +"id" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"ie" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/virtual_domain) +"ii" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/holosign/barrier/atmos, +/turf/open/floor/plating, +/area/virtual_domain) +"il" = ( +/obj/structure/table, +/obj/machinery/newscaster/directional/north, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"im" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/indestructible/meat, +/area/virtual_domain) +"iv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/plating, +/area/virtual_domain) +"ix" = ( +/obj/item/trash/fleet_ration, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"iy" = ( +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/virtual_domain) +"iA" = ( +/obj/structure/flora/bush/jungle/a/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/large/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"iH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/item/trash/can, +/turf/open/floor/carpet, +/area/virtual_domain) +"iI" = ( +/obj/structure/closet/crate, +/obj/item/stack/cable_coil, +/obj/item/crowbar, +/obj/item/screwdriver{ + pixel_y = 16 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"iK" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"iP" = ( +/obj/effect/decal/cleanable/food/flour, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"iQ" = ( +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/structure/table, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/machinery/airalarm/directional/west, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/crowbar, +/obj/item/wrench, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"iY" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/east, +/obj/item/stock_parts/subspace/crystal{ + pixel_y = -12; + pixel_x = 6 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"iZ" = ( +/obj/item/storage/box/mothic_rations{ + pixel_y = -7 + }, +/obj/effect/decal/cleanable/food/tomato_smudge, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"ja" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"jc" = ( +/obj/item/shard, +/turf/open/floor/carpet, +/area/virtual_domain) +"jd" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral, +/obj/item/chair{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"jh" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/wood, +/area/virtual_domain) +"jk" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "E.V.A. Storage" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/virtual_domain) +"jm" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/clothing/mask/facehugger/dead, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"jt" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"jx" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "med" + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"jy" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/computer/old{ + dir = 8 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/wood, +/area/virtual_domain) +"jz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"jC" = ( +/obj/item/ammo_box/magazine/wt550m9, +/turf/open/floor/plating, +/area/virtual_domain) +"jD" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/egg/burst, +/turf/open/floor/plating, +/area/virtual_domain) +"jF" = ( +/obj/machinery/holopad/secure, +/obj/item/storage/box/lethalshot{ + pixel_y = 7 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"jG" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/table/glass, +/obj/item/clothing/head/utility/chefhat{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"jR" = ( +/obj/structure/fluff/paper/stack{ + dir = 8 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"kc" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/mine/gas/plasma, +/turf/open/floor/wood, +/area/virtual_domain) +"kd" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/virtual_domain) +"kg" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/trash/boritos/red, +/turf/open/floor/carpet, +/area/virtual_domain) +"ki" = ( +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood{ + pixel_x = 2 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"km" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"kn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + name = "Vacant Commissary Shutter" + }, +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"kp" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Bridge Blast Door" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"kt" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"kv" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor4-old" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"kx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/alien/weeds, +/turf/open/floor/plating, +/area/virtual_domain) +"kI" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron, +/area/virtual_domain) +"kK" = ( +/obj/structure/sign/directions/command{ + dir = 4; + pixel_y = -8 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/turf/closed/wall, +/area/virtual_domain) +"kM" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor4" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"kN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + name = "E.V.A. Storage Shutter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/virtual_domain) +"kW" = ( +/obj/structure/table, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"lb" = ( +/obj/item/stack/sheet/iron, +/turf/open/floor/iron, +/area/virtual_domain) +"ld" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + name = "Vacant Commissary Shutter" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"lk" = ( +/obj/item/grenade/c4/x4, +/turf/open/floor/plating, +/area/virtual_domain) +"lt" = ( +/obj/machinery/camera/motion/directional/east{ + c_tag = "E.V.A. Storage" + }, +/obj/machinery/requests_console/directional/east{ + department = "EVA"; + name = "EVA Requests Console" + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"lu" = ( +/obj/structure/chair/stool/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"lv" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/pickaxe/rusted, +/turf/open/floor/iron, +/area/virtual_domain) +"lx" = ( +/obj/structure/barricade/sandbags, +/obj/machinery/deployable_turret{ + dir = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"lC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Command Hallway" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"lD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "E.V.A. Storage" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/iron, +/area/virtual_domain) +"lE" = ( +/obj/structure/sign/departments/science, +/turf/closed/wall, +/area/virtual_domain) +"lG" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"lJ" = ( +/obj/item/tank/internals/oxygen, +/obj/effect/decal/cleanable/glass, +/obj/effect/gibspawner/human, +/turf/open/floor/plating, +/area/virtual_domain) +"lK" = ( +/obj/structure/table/wood, +/obj/structure/sign/picture_frame/showroom/one{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/two{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/item/ammo_casing/shotgun/buckshot/spent, +/turf/open/floor/wood, +/area/virtual_domain) +"lL" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"lM" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L6" + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "c"; + pixel_x = -11; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "o"; + pixel_y = 16; + pixel_x = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"lN" = ( +/obj/item/bodybag{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 9; + pixel_y = -5 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"lQ" = ( +/obj/structure/spacevine{ + can_spread = 0 + }, +/turf/closed/wall, +/area/virtual_domain) +"lT" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/virtual_domain) +"lU" = ( +/obj/structure/fluff/paper/stack, +/obj/structure/marker_beacon/bronze, +/turf/open/floor/plating, +/area/virtual_domain) +"lY" = ( +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"mb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/button/door/directional/south{ + name = "Gateway Shutter Control"; + pixel_y = -34 + }, +/obj/machinery/button/door/directional/south{ + name = "E.V.A. Storage Shutter Control" + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/carpet, +/area/virtual_domain) +"mc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"mf" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L4" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"mi" = ( +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south, +/obj/structure/rack, +/obj/item/storage/briefcase/secure, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"mj" = ( +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = -13; + pixel_y = 8; + icon_state = "candle3_lit" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"mo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + name = "Showroom Shutters" + }, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/virtual_domain) +"mq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"mt" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"mw" = ( +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"my" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/computer/records/security/laptop/syndie, +/obj/structure/sign/poster/official/state_laws/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"mI" = ( +/obj/structure/bookcase/random, +/turf/open/floor/iron, +/area/virtual_domain) +"mK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 9 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"mO" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/large/style_random, +/obj/structure/spacevine{ + can_spread = 0 + }, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"mP" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/ammo_casing/shotgun/buckshot/spent, +/turf/open/floor/carpet, +/area/virtual_domain) +"mQ" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"mR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"mW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"nq" = ( +/obj/effect/mob_spawn/corpse/human/scientist, +/turf/open/misc/dirt/dark/jungle, +/area/virtual_domain) +"nw" = ( +/obj/structure/punji_sticks/spikes, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"ny" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/broken/directional/west, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"nz" = ( +/obj/effect/decal/cleanable/glass, +/obj/item/clothing/head/costume/party, +/turf/open/floor/iron, +/area/virtual_domain) +"nO" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/glass, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"nP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/barricade/sandbags, +/obj/structure/railing, +/turf/open/floor/iron, +/area/virtual_domain) +"nS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"nU" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/sign/departments/aiupload/directional/north, +/obj/effect/decal/cleanable/shreds, +/obj/item/card/emag, +/turf/open/floor/iron, +/area/virtual_domain) +"nW" = ( +/obj/machinery/light_switch{ + pixel_x = 38; + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + pixel_x = 38; + pixel_y = -25 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/bed/maint, +/obj/item/bedsheet/pirate{ + dir = 4 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"nY" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/computer/old{ + dir = 8 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"nZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/fluff/paper/stack{ + dir = 1 + }, +/obj/item/book, +/turf/open/floor/iron, +/area/virtual_domain) +"od" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/leafy, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"ok" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/borg/upgrade/pinpointer, +/turf/open/floor/iron, +/area/virtual_domain) +"ol" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor6" + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/item/modular_computer/laptop{ + icon_state = "laptop"; + pixel_y = 12; + pixel_x = 2 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"on" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/paper/stack, +/turf/open/floor/iron, +/area/virtual_domain) +"oo" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Gateway Maintenance" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"op" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/structure/closet/body_bag, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"oy" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"oA" = ( +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/turf/open/floor/iron, +/area/virtual_domain) +"oD" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"oH" = ( +/obj/structure/sign/plaques/kiddie/perfect_man{ + pixel_y = 32 + }, +/obj/effect/spawner/random/decoration/showcase, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"oI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Corporate Showroom" + }, +/turf/open/floor/wood, +/area/virtual_domain) +"oM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/carpet, +/area/virtual_domain) +"oO" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 8 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"oQ" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"oS" = ( +/obj/structure/barricade/sandbags, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"pb" = ( +/obj/item/radio/intercom/directional/north{ + pixel_y = 34 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"pc" = ( +/obj/structure/fluff/paper/stack{ + dir = 9 + }, +/obj/item/book, +/turf/open/floor/iron, +/area/virtual_domain) +"pd" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/plating, +/area/virtual_domain) +"pr" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/structure/closet/crate/cargo, +/obj/effect/spawner/random/maintenance/no_decals/seven, +/turf/open/floor/iron, +/area/virtual_domain) +"ps" = ( +/turf/closed/wall, +/area/virtual_domain) +"pv" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/item/trash/fleet_ration, +/turf/open/floor/iron, +/area/virtual_domain) +"pA" = ( +/obj/structure/broken_flooring/side/directional/west, +/turf/open/floor/plating, +/area/virtual_domain) +"pB" = ( +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = -8 + }, +/turf/closed/wall, +/area/virtual_domain) +"pD" = ( +/turf/closed/indestructible/fakedoor/maintenance, +/area/virtual_domain) +"pE" = ( +/obj/structure/fluff/paper/stack{ + dir = 10 + }, +/obj/item/flashlight/lamp/green, +/turf/open/floor/iron, +/area/virtual_domain) +"pI" = ( +/obj/effect/decal/cleanable/xenoblood/xgibs/up, +/obj/structure/alien/weeds, +/turf/open/floor/plating, +/area/virtual_domain) +"pJ" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"pK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_casing/shotgun/buckshot/spent, +/turf/open/floor/wood, +/area/virtual_domain) +"pL" = ( +/obj/item/extinguisher, +/turf/open/floor/plating, +/area/virtual_domain) +"pN" = ( +/obj/structure/meateor_fluff/eyeball, +/turf/open/indestructible/meat, +/area/virtual_domain) +"pO" = ( +/obj/effect/decal/cleanable/robot_debris/old, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/fluff/paper/stack{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"pP" = ( +/obj/machinery/button/door/directional/north{ + name = "Privacy Shutters Control" + }, +/obj/machinery/computer/old, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood, +/area/virtual_domain) +"pQ" = ( +/obj/machinery/ticket_machine/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"pR" = ( +/obj/structure/broken_flooring/pile/directional/north, +/turf/open/floor/plating, +/area/virtual_domain) +"pT" = ( +/obj/structure/barricade/sandbags, +/obj/machinery/deployable_turret/hmg, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"pV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"pW" = ( +/obj/structure/alien/weeds, +/obj/item/flamethrower/full/tank, +/turf/open/floor/plating, +/area/virtual_domain) +"pX" = ( +/obj/item/photo/old{ + pixel_y = 14 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"qa" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"qk" = ( +/obj/structure/chair/comfy/beige, +/turf/open/floor/carpet, +/area/virtual_domain) +"qq" = ( +/obj/structure/broken_flooring/side/directional/west, +/obj/structure/sign/warning/gas_mask/directional/north, +/turf/open/floor/plating, +/area/virtual_domain) +"qr" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/virtual_domain) +"qu" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/chair{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"qv" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/structure/sign/departments/botany/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"qz" = ( +/obj/structure/table/wood, +/obj/machinery/light_switch/directional/west, +/obj/item/storage/briefcase/secure{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/wood, +/area/virtual_domain) +"qI" = ( +/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"qJ" = ( +/obj/machinery/light/floor, +/obj/item/stack/sheet/iron, +/turf/open/floor/iron, +/area/virtual_domain) +"qL" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/item/trash/semki/healthy, +/turf/open/floor/iron, +/area/virtual_domain) +"qM" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/obj/item/mop, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"qP" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/turf/open/floor/iron, +/area/virtual_domain) +"qS" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/requests_console/directional/east{ + department = "Captain's Desk"; + name = "Captain's Requests Console" + }, +/obj/structure/frame/computer{ + dir = 8 + }, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = 5 + }, +/obj/item/stack/cable_coil/cut, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood, +/area/virtual_domain) +"qY" = ( +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ra" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L13" + }, +/obj/effect/decal/cleanable/crayon/x{ + pixel_x = -6; + pixel_y = -15 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"rb" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/shard, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"re" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/iron, +/area/virtual_domain) +"rf" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/ammo_casing/spent{ + dir = 9 + }, +/obj/item/ammo_casing/spent{ + dir = 10; + pixel_x = -13; + pixel_y = -8 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/plating, +/area/virtual_domain) +"rh" = ( +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"rj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"rm" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/blood/gibs/torso, +/turf/open/space/basic, +/area/virtual_domain) +"ro" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"rq" = ( +/obj/machinery/vending/cigarette, +/obj/item/gun/ballistic/shotgun/lethal{ + pixel_y = 13 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"rr" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron, +/area/virtual_domain) +"rs" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) +"rt" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"rv" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/virtual_domain) +"ry" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/structure/showcase/machinery/tv/broken, +/turf/open/floor/wood, +/area/virtual_domain) +"rz" = ( +/obj/machinery/computer/old{ + dir = 4 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"rC" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"rJ" = ( +/obj/effect/spawner/random/trash, +/turf/open/floor/carpet, +/area/virtual_domain) +"rO" = ( +/obj/item/disk/nuclear/fake/obvious, +/turf/open/floor/carpet, +/area/virtual_domain) +"rP" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"rQ" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/wood, +/area/virtual_domain) +"rW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/wood, +/area/virtual_domain) +"rX" = ( +/obj/machinery/photocopier, +/turf/open/floor/carpet, +/area/virtual_domain) +"sa" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"sc" = ( +/obj/machinery/cell_charger{ + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"se" = ( +/obj/effect/mine/explosive/flame, +/turf/open/floor/carpet, +/area/virtual_domain) +"sf" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/flora/rock/icy, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"si" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"sm" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/suit_storage_unit/void_old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"sr" = ( +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/plating, +/area/virtual_domain) +"ss" = ( +/obj/item/stock_parts/micro_laser/high, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/virtual_domain) +"st" = ( +/obj/item/seeds/coffee, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"sz" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/safe/floor, +/obj/item/stack/spacecash/c10000, +/obj/item/stack/spacecash/c10000, +/obj/item/stack/spacecash/c10000, +/obj/item/stack/sheet/mineral/gold, +/turf/open/floor/wood, +/area/virtual_domain) +"sA" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/carpet, +/area/virtual_domain) +"sB" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"sF" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/storage/briefcase/lawyer, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"sI" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/frame/computer, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"sS" = ( +/obj/structure/lattice, +/obj/structure/marker_beacon/bronze, +/turf/open/space/basic, +/area/virtual_domain) +"sX" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/turf_decal/caution/red, +/obj/item/clothing/suit/caution{ + pixel_y = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"sZ" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/item/banner/science, +/turf/open/floor/iron, +/area/virtual_domain) +"te" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Head of Personnel" + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"tf" = ( +/obj/effect/rune, +/obj/item/knife/envy, +/turf/open/floor/plating, +/area/virtual_domain) +"th" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"tj" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox, +/obj/item/stack/spacecash/c1000{ + pixel_y = 15; + pixel_x = 5 + }, +/obj/item/storage/briefcase/secure/syndie{ + pixel_y = 13; + pixel_x = -6 + }, +/obj/item/stack/sheet/mineral/diamond{ + pixel_x = 9; + pixel_y = 9 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"tk" = ( +/obj/machinery/button/door/directional/west{ + id = "bridge blast"; + name = "Bridge Access Blast Door Control" + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"tl" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/resin, +/turf/open/floor/plating, +/area/virtual_domain) +"tn" = ( +/obj/effect/decal/cleanable/xenoblood/xgibs/core, +/obj/structure/alien/weeds, +/turf/open/floor/plating, +/area/virtual_domain) +"to" = ( +/obj/item/boulder{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/boulder{ + icon_state = "rock_medium"; + pixel_x = -12; + pixel_y = 8 + }, +/obj/item/boulder{ + icon_state = "boulder_medium"; + pixel_x = -4; + pixel_y = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"tq" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"tu" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"tw" = ( +/obj/structure/flora/rock/pile/jungle, +/obj/effect/mob_spawn/corpse/human/scientist, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"ty" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"tF" = ( +/obj/structure/fluff/paper/stack{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/virtual_domain) +"tI" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/trash/can/food/pine_nuts, +/turf/open/floor/iron, +/area/virtual_domain) +"tM" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/item/crowbar, +/turf/open/floor/iron, +/area/virtual_domain) +"tO" = ( +/obj/structure/sign/directions/evac, +/obj/structure/sign/directions/medical{ + pixel_y = 8 + }, +/obj/structure/sign/directions/science{ + pixel_y = -8 + }, +/turf/closed/wall, +/area/virtual_domain) +"tR" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/iron, +/area/virtual_domain) +"tS" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron, +/area/virtual_domain) +"tV" = ( +/obj/structure/table/wood, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/folder/blue, +/obj/item/clothing/head/collectable/hop{ + name = "novelty HoP hat" + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"tW" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/mob_spawn/corpse/human/scientist, +/turf/open/misc/dirt/dark/jungle, +/area/virtual_domain) +"ub" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/glass, +/obj/effect/mine/explosive/flame, +/turf/open/floor/plating, +/area/virtual_domain) +"ud" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/trash/cheesie, +/turf/open/floor/iron, +/area/virtual_domain) +"uf" = ( +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/virtual_domain) +"ug" = ( +/obj/structure/holosign/barrier/wetsign, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"uk" = ( +/obj/structure/marker_beacon/bronze, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/virtual_domain) +"ul" = ( +/obj/machinery/door/poddoor/preopen{ + name = "Bridge Blast Door" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge Access" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"up" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"uq" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/tree/jungle/small/style_4, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"ut" = ( +/obj/structure/sign/directions/engineering{ + dir = 4 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 + }, +/obj/structure/sign/directions/command{ + dir = 8; + pixel_y = -8 + }, +/turf/closed/wall, +/area/virtual_domain) +"uw" = ( +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ux" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"uz" = ( +/turf/template_noop, +/area/template_noop) +"uA" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/iron, +/area/virtual_domain) +"uB" = ( +/turf/closed/indestructible/meat, +/area/virtual_domain) +"uD" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/shreds, +/turf/open/floor/iron, +/area/virtual_domain) +"uH" = ( +/obj/structure/bookcase, +/turf/open/floor/wood, +/area/virtual_domain) +"uP" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/item/radio/intercom/directional/west, +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood{ + pixel_x = 2 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/carpet, +/area/virtual_domain) +"uS" = ( +/turf/closed/wall/r_wall, +/area/virtual_domain) +"uT" = ( +/obj/structure/mop_bucket/janitorialcart{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"uX" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"uY" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/blood, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/exoscanner, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron, +/area/virtual_domain) +"vf" = ( +/obj/structure/broken_flooring/corner/directional/east, +/turf/open/floor/plating, +/area/virtual_domain) +"vg" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/chair/pew/right, +/obj/item/reagent_containers/cup/glass/coffee, +/turf/open/floor/iron, +/area/virtual_domain) +"vi" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/book/manual/wiki/detective, +/turf/open/floor/iron, +/area/virtual_domain) +"vn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"vo" = ( +/obj/effect/turf_decal/tile/bar, +/obj/structure/holosign/barrier/engineering, +/turf/open/floor/iron, +/area/virtual_domain) +"vt" = ( +/obj/machinery/bluespace_beacon, +/obj/structure/alien/weeds, +/turf/open/floor/plating, +/area/virtual_domain) +"vw" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/virtual_domain) +"vy" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L12" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"vA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/trash/candle, +/turf/open/floor/plating, +/area/virtual_domain) +"vI" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/button/door/directional/east{ + name = "Teleporter Shutter Control"; + pixel_y = 5 + }, +/obj/structure/alien/weeds, +/turf/open/floor/iron, +/area/virtual_domain) +"vK" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"vM" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"vN" = ( +/obj/structure/broken_flooring/pile/directional/west, +/turf/open/floor/plating, +/area/virtual_domain) +"vO" = ( +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/iron, +/area/virtual_domain) +"vU" = ( +/obj/machinery/recharger, +/turf/open/floor/plating, +/area/virtual_domain) +"vV" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"vW" = ( +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron, +/area/virtual_domain) +"wa" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/trash/popcorn/caramel, +/turf/open/floor/iron, +/area/virtual_domain) +"wi" = ( +/obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"wj" = ( +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/iron, +/area/virtual_domain) +"wl" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/rock/pile/jungle, +/obj/structure/flora/bush/leavy/style_3, +/obj/structure/flora/tree/jungle/small/style_2, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"wn" = ( +/obj/machinery/light_switch/directional/south, +/obj/structure/table/wood, +/obj/item/razor{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/flask/gold, +/turf/open/floor/carpet, +/area/virtual_domain) +"wo" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/directional/north, +/obj/machinery/coffeemaker/impressa, +/turf/open/floor/wood, +/area/virtual_domain) +"wq" = ( +/obj/structure/reagent_dispensers/wall/virusfood/directional/south, +/obj/item/clothing/mask/surgical, +/obj/structure/meateor_fluff/abandoned_headcrab_egg, +/turf/open/indestructible/meat, +/area/virtual_domain) +"wu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ww" = ( +/obj/item/knife/shiv/plastitanium, +/turf/open/floor/carpet, +/area/virtual_domain) +"wA" = ( +/obj/structure/table/glass, +/obj/structure/safe, +/obj/item/storage/toolbox/guncase/cqc, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"wB" = ( +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = -8 + }, +/turf/closed/wall/r_wall, +/area/virtual_domain) +"wD" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/secure_closet/personal, +/obj/effect/spawner/random/bureaucracy/briefcase, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"wH" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron, +/area/virtual_domain) +"wL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + name = "Bridge Access Blast Door Control" + }, +/obj/machinery/button/door/directional/south{ + name = "Council Chamber Blast Door Control"; + pixel_y = -34 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"wN" = ( +/obj/structure/barricade/sandbags, +/turf/open/floor/plating, +/area/virtual_domain) +"wP" = ( +/obj/structure/sign/directions/medical{ + dir = 8; + pixel_y = 8 + }, +/obj/structure/sign/directions/evac, +/obj/structure/sign/directions/science{ + dir = 4; + pixel_y = -8 + }, +/turf/closed/wall, +/area/virtual_domain) +"wV" = ( +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"wY" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/bitrunning/cache_spawn, +/obj/machinery/light/broken/directional/north, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"xb" = ( +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"xd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"xe" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/plating, +/area/virtual_domain) +"xj" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/virtual_domain) +"xu" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"xI" = ( +/obj/item/disk/data{ + pixel_x = 9; + pixel_y = -1 + }, +/obj/item/disk/tech_disk{ + pixel_x = -2; + pixel_y = -3 + }, +/obj/item/disk/design_disk{ + name = "component design disk"; + pixel_y = 6 + }, +/obj/structure/table/wood, +/obj/item/toy/talking/ai{ + name = "\improper Nanotrasen-brand toy AI"; + pixel_y = 6 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"xK" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/iron, +/area/virtual_domain) +"xV" = ( +/obj/machinery/button/door/directional/west{ + name = "Council Chamber Blast Door Control" + }, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"xW" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/glass, +/obj/item/stack/rods, +/turf/open/floor/plating, +/area/virtual_domain) +"yc" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"yh" = ( +/obj/structure/chair/office{ + dir = 1; + pixel_x = -11 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"yn" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "E.V.A. Storage Shutter" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"yq" = ( +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 2; + pixel_x = 7 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"yt" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/grille/broken, +/obj/structure/cable, +/turf/open/floor/plating, +/area/virtual_domain) +"yw" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/item/trash/popcorn, +/turf/open/floor/iron, +/area/virtual_domain) +"yx" = ( +/obj/structure/grille/broken, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/glass, +/obj/effect/mine/explosive/flame, +/turf/open/floor/plating, +/area/virtual_domain) +"yy" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"yz" = ( +/turf/closed/indestructible/fakedoor, +/area/virtual_domain) +"yC" = ( +/obj/structure/showcase/machinery/tv/broken, +/turf/open/floor/carpet, +/area/virtual_domain) +"yD" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"yE" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"yH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"yI" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/bikehorn/rubberducky, +/obj/machinery/light_switch/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/wood, +/area/virtual_domain) +"yK" = ( +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/virtual_domain) +"yM" = ( +/obj/structure/chair/comfy/brown, +/turf/open/floor/wood, +/area/virtual_domain) +"yN" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/bed/medical/emergency, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron, +/area/virtual_domain) +"yO" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/spacevine{ + can_spread = 0 + }, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"yP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "hop"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"yT" = ( +/obj/item/seeds/cucumber, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"zb" = ( +/obj/item/clothing/head/costume/party, +/turf/open/floor/plating, +/area/virtual_domain) +"ze" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"zg" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/table/glass, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/suture, +/turf/open/floor/plating, +/area/virtual_domain) +"zj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"zo" = ( +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood{ + pixel_x = -4 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"zq" = ( +/obj/structure/mop_bucket, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"zw" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/trash/ready_donk{ + pixel_y = 10 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"zx" = ( +/obj/structure/grille/broken, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/glass, +/obj/item/stack/rods, +/turf/open/floor/plating, +/area/virtual_domain) +"zA" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/table/glass, +/obj/item/papercutter, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"zB" = ( +/obj/structure/broken_flooring/side/directional/north, +/obj/effect/decal/cleanable/crayon{ + icon_state = "m"; + pixel_y = 17; + pixel_x = -13 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"zE" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"zL" = ( +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/indestructible/meat, +/area/virtual_domain) +"zO" = ( +/obj/item/stack/rods/ten, +/turf/open/floor/plating, +/area/virtual_domain) +"zP" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"zQ" = ( +/obj/item/storage/belt/security/full{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/storage/belt/security/full, +/obj/item/storage/belt/security/full{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/structure/table/reinforced, +/turf/template_noop, +/area/virtual_domain/safehouse) +"zR" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"zT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/closet/body_bag, +/turf/open/floor/iron, +/area/virtual_domain) +"Ad" = ( +/obj/item/clothing/head/cone{ + pixel_y = -5; + pixel_x = 7 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Ah" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron, +/area/virtual_domain) +"Ao" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Ar" = ( +/obj/item/ammo_casing/shotgun/buckshot/spent, +/turf/open/floor/plating, +/area/virtual_domain) +"Ax" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/item/radio/off, +/turf/open/floor/iron, +/area/virtual_domain) +"Ay" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"AA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + dir = 4 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"AC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/virtual_domain) +"AD" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/clothing/head/cone{ + pixel_y = 3; + pixel_x = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"AM" = ( +/obj/structure/fluff/paper/stack{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/virtual_domain) +"AN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/suit/caution{ + pixel_y = -9 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"AP" = ( +/obj/structure/grille, +/obj/item/shard{ + icon_state = "medium"; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/virtual_domain) +"AQ" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/ammo_casing/spent{ + dir = 10 + }, +/obj/item/ammo_casing/spent{ + dir = 9; + pixel_x = -19; + pixel_y = -5 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"AR" = ( +/obj/structure/table, +/obj/item/folder/yellow, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/iron, +/area/virtual_domain) +"AV" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"AX" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/virtual_domain) +"Bd" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/virtual_domain) +"Bg" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/item/chair, +/turf/open/floor/iron, +/area/virtual_domain) +"Bh" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Bj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/broken/directional/south, +/obj/item/stack/rods, +/turf/open/floor/iron, +/area/virtual_domain) +"Bn" = ( +/obj/item/ammo_casing/spent, +/turf/open/floor/plating, +/area/virtual_domain) +"Bp" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"Bt" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Bv" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Bw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"BF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner, +/turf/open/floor/iron, +/area/virtual_domain) +"BJ" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L1" + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"BK" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"BM" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"BN" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L14" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"BP" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters" + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"BZ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/indestructible/meat, +/area/virtual_domain) +"Ca" = ( +/obj/item/gun/ballistic/shotgun/riot{ + pixel_y = 6 + }, +/obj/item/gun/ballistic/shotgun/riot, +/turf/template_noop, +/area/virtual_domain/safehouse) +"Cb" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/virtual_domain) +"Cc" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/leavy/style_2, +/obj/structure/spacevine{ + can_spread = 0 + }, +/obj/structure/flora/bush/large/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"Cd" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/weeds/node, +/turf/open/floor/plating, +/area/virtual_domain) +"Cg" = ( +/obj/effect/turf_decal/tile/purple, +/obj/item/restraints/legcuffs/beartrap/prearmed, +/turf/open/floor/iron, +/area/virtual_domain) +"Cn" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/closet/crate/cargo, +/obj/effect/spawner/random/maintenance/no_decals/seven, +/turf/open/floor/iron, +/area/virtual_domain) +"Cr" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L10" + }, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/iron, +/area/virtual_domain) +"Cw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/west, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Cx" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_x = -6 + }, +/obj/machinery/recharger{ + pixel_x = 6 + }, +/turf/template_noop, +/area/virtual_domain/safehouse) +"Cy" = ( +/obj/machinery/light_switch/directional/south, +/obj/effect/spawner/random/vending/colavend, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Cz" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"CA" = ( +/obj/structure/flora/rock/pile/jungle, +/obj/structure/barricade/sandbags, +/turf/open/misc/dirt/dark/jungle, +/area/virtual_domain) +"CC" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/plating, +/area/virtual_domain) +"CJ" = ( +/obj/structure/holosign/barrier, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron, +/area/virtual_domain) +"CK" = ( +/obj/structure/sign/map/left{ + 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)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/item/banner/security, +/turf/open/floor/iron, +/area/virtual_domain) +"CL" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor3-old" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"CM" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"CQ" = ( +/obj/effect/decal/cleanable/xenoblood, +/obj/structure/alien/weeds, +/turf/open/floor/plating, +/area/virtual_domain) +"Dc" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/clothing/head/cone{ + pixel_y = 3; + pixel_x = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Dk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Dl" = ( +/obj/structure/water_source/puddle, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"Dp" = ( +/obj/structure/chair/sofa/bench/solo, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Dx" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/virtual_domain) +"DA" = ( +/obj/item/seeds/cocoapod, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"DC" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/spacevine{ + can_spread = 0 + }, +/obj/structure/flora/bush/large/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"DF" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/detective_scanner{ + pixel_x = -7; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"DL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Showroom Shutters" + }, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/virtual_domain) +"DM" = ( +/turf/closed/indestructible/fakedoor/engineering, +/area/virtual_domain) +"DO" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, +/area/virtual_domain) +"DP" = ( +/obj/machinery/holopad, +/turf/open/floor/carpet, +/area/virtual_domain) +"DQ" = ( +/obj/machinery/power/shieldwallgen, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"DU" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/item/knife/butcher, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"DV" = ( +/turf/open/misc/dirt/dark/jungle, +/area/virtual_domain) +"DW" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 8 + }, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/iron, +/area/virtual_domain) +"Ec" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/flora/tree/jungle/small/style_5, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"Ed" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/glass, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/virtual_domain) +"El" = ( +/obj/effect/decal/cleanable/blood/gibs/limb, +/obj/structure/meateor_fluff/flesh_pod_open, +/turf/open/indestructible/meat, +/area/virtual_domain) +"En" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"Er" = ( +/obj/structure/rack, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Es" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/mecha_wreckage/ripley/paddy, +/turf/open/floor/iron, +/area/virtual_domain) +"Eu" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"EC" = ( +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = -5 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"ED" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/iron, +/area/virtual_domain) +"EF" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/blue, +/obj/structure/closet/crate/cardboard, +/obj/effect/spawner/random/maintenance/no_decals/seven, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"EH" = ( +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"EK" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/reagent_containers/spray/chemsprayer/party, +/turf/open/floor/iron, +/area/virtual_domain) +"EQ" = ( +/obj/machinery/door/poddoor/preopen{ + name = "Bridge Blast Door" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"ET" = ( +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/computer/security/wooden_tv{ + pixel_x = 1; + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"EV" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L7" + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "e"; + pixel_y = -16; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "guy"; + pixel_y = -5 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Fc" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/clothing/suit/bio_suit/virology, +/obj/item/clothing/head/bio_hood/virology{ + pixel_y = 10; + pixel_x = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"Fd" = ( +/turf/open/space/basic, +/area/space) +"Ff" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/structure/bodycontainer/morgue, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Fg" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/item/banner/medical, +/turf/open/indestructible/meat, +/area/virtual_domain) +"Fh" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Fj" = ( +/obj/structure/table/optable, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/plating, +/area/virtual_domain) +"Fl" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/decal/cleanable/vomit/toxic, +/turf/open/floor/iron, +/area/virtual_domain) +"Fp" = ( +/obj/structure/showcase/machinery/tv{ + dir = 1; + pixel_x = 2; + pixel_y = 3 + }, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"Fr" = ( +/obj/effect/decal/cleanable/xenoblood/xgibs/down, +/obj/structure/alien/weeds, +/turf/open/floor/plating, +/area/virtual_domain) +"Fw" = ( +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"FA" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"FC" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + name = "Gateway Access Shutter" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"FF" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/r_wall, +/area/virtual_domain) +"FG" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"FI" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"FK" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/stack/sheet/iron, +/turf/open/floor/iron, +/area/virtual_domain) +"FN" = ( +/obj/structure/closet/crate/preopen, +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/rods/fifty, +/obj/item/storage/toolbox/emergency, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/iron, +/area/virtual_domain) +"FO" = ( +/obj/structure/flora/rock/pile/jungle, +/obj/structure/flora/tree/jungle/small/style_6, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"FR" = ( +/obj/item/storage/toolbox/drone, +/turf/open/floor/iron, +/area/virtual_domain) +"FS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/gibspawner/human, +/turf/open/floor/plating, +/area/virtual_domain) +"FT" = ( +/obj/item/clothing/mask/surgical, +/obj/structure/meateor_fluff/eyeball, +/obj/effect/decal/cleanable/vomit/toxic, +/turf/open/indestructible/meat, +/area/virtual_domain) +"FV" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"FZ" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/marker_beacon/bronze, +/turf/open/floor/plating, +/area/virtual_domain) +"Gi" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/fluff/paper/stack{ + dir = 6 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Gk" = ( +/obj/machinery/door/window/left/directional/south{ + name = "HoP's Desk" + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/virtual_domain) +"Gm" = ( +/obj/structure/meateor_fluff/flesh_pod_open, +/turf/open/indestructible/meat, +/area/virtual_domain) +"Gn" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Gq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Gr" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"Gs" = ( +/obj/item/clothing/mask/gas, +/turf/open/floor/plating, +/area/virtual_domain) +"Gx" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Head of Personnel" + }, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/wood, +/area/virtual_domain) +"Gy" = ( +/obj/structure/flora/rock/pile/jungle/large/style_random, +/turf/open/misc/dirt/dark/jungle, +/area/virtual_domain) +"GA" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"GD" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/space/basic, +/area/virtual_domain) +"GG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/sandbags, +/turf/open/floor/wood, +/area/virtual_domain) +"GJ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/cardboard/mothic{ + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"GQ" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"GS" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/computer/old{ + dir = 8 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"GT" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/virtual_domain) +"Hb" = ( +/obj/effect/spawner/random/trash, +/turf/open/floor/iron, +/area/virtual_domain) +"Hc" = ( +/obj/structure/rack, +/obj/item/gun/ballistic/revolver/golden, +/turf/open/floor/plating, +/area/virtual_domain) +"Hd" = ( +/turf/open/floor/iron, +/area/virtual_domain) +"Hg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = -9; + icon_state = "candle2_lit" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Hh" = ( +/obj/machinery/shower/directional/south, +/obj/structure/curtain, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/spawner/random/trash/graffiti, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/iron/white, +/area/virtual_domain) +"Hl" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/virtual_domain) +"Hs" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron, +/area/virtual_domain) +"Ht" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Hv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Hw" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/chair/office{ + dir = 4; + pixel_x = -10 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"HC" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/item/trash/fleet_ration, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"HG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/virtual_domain) +"HH" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/highsecurity{ + name = "Secure Network Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/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/command/ai_upload, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"HM" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain) +"HP" = ( +/obj/structure/holosign/barrier/engineering, +/turf/open/floor/plating, +/area/virtual_domain) +"HS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = 13; + pixel_y = 8; + icon_state = "candle3_lit" + }, +/obj/item/trash/candle, +/turf/open/floor/plating, +/area/virtual_domain) +"HX" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/banner/command, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Ie" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/ammo_casing/spent{ + dir = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Ii" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Ij" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Il" = ( +/obj/structure/lattice, +/obj/item/ammo_box/strilka310/surplus, +/turf/open/space/basic, +/area/virtual_domain) +"Io" = ( +/obj/structure/fluff/paper/stack{ + dir = 10 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Iq" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/turf/open/floor/wood, +/area/virtual_domain) +"Ir" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/carpet, +/area/virtual_domain) +"Iw" = ( +/obj/structure/closet/crate/cardboard{ + pixel_y = 8 + }, +/obj/item/spear/explosive, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"IC" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"IH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"IJ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/iron, +/area/virtual_domain) +"IL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/barricade/sandbags, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"IM" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/ammo_casing/spent, +/obj/item/ammo_casing/spent{ + dir = 10; + pixel_x = -13; + pixel_y = -8 + }, +/obj/item/ammo_casing/spent{ + dir = 9; + pixel_x = -13; + pixel_y = 9 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"IS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Teleport Access" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/iron, +/area/virtual_domain) +"IU" = ( +/obj/item/radio/off, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Jh" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Captain's Bedroom" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood, +/area/virtual_domain) +"Ji" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/closet/crate/trashcart/filled, +/turf/open/floor/plating, +/area/virtual_domain) +"Jm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"JD" = ( +/obj/structure/spider/stickyweb, +/turf/open/floor/iron, +/area/virtual_domain) +"JG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"JK" = ( +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"JL" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/structure/barricade/sandbags, +/obj/structure/railing, +/turf/open/floor/iron, +/area/virtual_domain) +"JM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/iron, +/area/virtual_domain) +"JP" = ( +/turf/open/floor/iron/dark, +/area/virtual_domain) +"JR" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/caution/red{ + dir = 8 + }, +/obj/item/clothing/suit/caution{ + pixel_y = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"JY" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/banner/engineering, +/turf/open/floor/iron, +/area/virtual_domain) +"Ka" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/fluff/paper/stack{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Ke" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"Kf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Kh" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"Kl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Km" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash, +/turf/open/floor/plating, +/area/virtual_domain) +"Kn" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/item/storage/cans/sixbeer, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Kq" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/holosign/barrier/engineering, +/turf/open/floor/plating, +/area/virtual_domain) +"Kr" = ( +/obj/item/clothing/head/utility/hardhat, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Kv" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L9" + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "floor4"; + pixel_y = -15 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Kw" = ( +/obj/structure/plaque/static_plaque/golden/commission/meta, +/turf/open/floor/iron, +/area/virtual_domain) +"KA" = ( +/obj/item/chair, +/turf/open/floor/iron, +/area/virtual_domain) +"KF" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"KM" = ( +/obj/structure/sign/warning/pods, +/turf/closed/wall, +/area/virtual_domain) +"KN" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/vending/cigarette, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"KP" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/closet/body_bag, +/turf/open/floor/iron, +/area/virtual_domain) +"KQ" = ( +/obj/structure/rack, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/timer, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"KR" = ( +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"KT" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/virtual_domain) +"KW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron, +/area/virtual_domain) +"Lg" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Lh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/iron, +/area/virtual_domain) +"Ll" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"Lm" = ( +/obj/structure/alien/weeds, +/obj/item/clothing/mask/facehugger/dead, +/turf/open/floor/plating, +/area/virtual_domain) +"Lq" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/hud/security/night{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/clothing/glasses/hud/security/night, +/obj/item/clothing/glasses/hud/security/night{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/template_noop, +/area/virtual_domain/safehouse) +"Ls" = ( +/obj/modular_map_root/safehouse{ + key = "shuttle_space" + }, +/turf/template_noop, +/area/virtual_domain/safehouse) +"Lu" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"Lz" = ( +/obj/effect/decal/cleanable/confetti, +/obj/machinery/jukebox/disco{ + anchored = 1; + req_access = null + }, +/turf/open/floor/iron, +/area/virtual_domain) +"LB" = ( +/obj/structure/lattice, +/obj/item/gun/ballistic/rifle/boltaction/surplus, +/turf/open/space/basic, +/area/virtual_domain) +"LD" = ( +/obj/item/kirbyplants/random/dead/research_director, +/turf/open/floor/plating, +/area/virtual_domain) +"LG" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"LJ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + name = "E.V.A. Storage Shutter Control" + }, +/obj/effect/decal/cleanable/blood/old, +/obj/item/clothing/suit/bio_suit/virology{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning, +/turf/open/floor/iron, +/area/virtual_domain) +"LK" = ( +/obj/machinery/button/door/directional/east{ + name = "Bridge Access Blast Door Control" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/flora/rock/icy/style_2, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"LL" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/holosign/barrier, +/turf/open/floor/iron, +/area/virtual_domain) +"LN" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/iron, +/area/virtual_domain) +"LP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"LS" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/virtual_domain) +"LV" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/holosign/barrier, +/turf/open/floor/iron, +/area/virtual_domain) +"Mb" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Mj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/virtual_domain) +"Mk" = ( +/obj/structure/table/wood, +/obj/machinery/light/directional/south, +/obj/item/papercutter{ + pixel_x = -4 + }, +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/floor/wood, +/area/virtual_domain) +"Ml" = ( +/obj/effect/decal/cleanable/crayon/x, +/turf/closed/wall/rust, +/area/virtual_domain) +"Mm" = ( +/obj/structure/lattice, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/space/basic, +/area/virtual_domain) +"Mn" = ( +/obj/machinery/holopad, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Mo" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/computer/old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Mq" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"Mr" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/virtual_domain) +"Ms" = ( +/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker{ + pixel_x = 3; + pixel_y = -5 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Mt" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Council Chamber" + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Mu" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/item/clothing/head/bio_hood/virology{ + pixel_y = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Mz" = ( +/obj/effect/decal/cleanable/shreds, +/turf/open/floor/iron, +/area/virtual_domain) +"MC" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"MF" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"MG" = ( +/turf/open/indestructible/meat, +/area/virtual_domain) +"MJ" = ( +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood, +/obj/effect/spawner/random/trash, +/turf/open/floor/carpet, +/area/virtual_domain) +"ML" = ( +/obj/structure/bed/maint, +/obj/item/bedsheet/pirate, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet, +/area/virtual_domain) +"MM" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/storage/toolbox/emergency, +/obj/effect/spawner/random/engineering/flashlight, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"MN" = ( +/obj/structure/flora/bush/jungle/a/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"MP" = ( +/obj/structure/sign/picture_frame/showroom/three{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/four{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/wood, +/area/virtual_domain) +"MS" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/screwdriver, +/turf/open/floor/plating, +/area/virtual_domain) +"MZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/bookcase/random, +/turf/open/floor/iron, +/area/virtual_domain) +"Ne" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/flasher/directional/east{ + pixel_y = -26 + }, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron, +/area/virtual_domain) +"Nh" = ( +/obj/structure/barricade/sandbags, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/virtual_domain) +"Nl" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law{ + pixel_y = 3 + }, +/obj/item/radio/intercom/command/directional/north, +/obj/item/paper/fluff/jobs/engineering/frequencies, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Nm" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"No" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + name = "HoP Queue Shutters" + }, +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"Nq" = ( +/obj/item/stock_parts/scanning_module/triphasic{ + pixel_x = 4 + }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/virtual_domain) +"Nr" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/ai/directional/north, +/obj/item/stock_parts/subspace/amplifier{ + pixel_y = -6 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Nu" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Ny" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/barricade/security, +/turf/open/floor/iron, +/area/virtual_domain) +"Nz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "council blast"; + name = "Council Blast Doors" + }, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/virtual_domain) +"ND" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/digital_clock/directional/north, +/obj/item/light/bulb/broken{ + pixel_x = 15 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"NG" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"NN" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"NO" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/broken_flooring/singular/always_floorplane/directional/east, +/obj/item/surgery_tray/full/deployed, +/turf/open/floor/plating, +/area/virtual_domain) +"NR" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"NZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/structure/barricade/sandbags, +/obj/structure/railing, +/turf/open/floor/iron, +/area/virtual_domain) +"Oc" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/clothing/mask/party_horn, +/turf/open/floor/iron, +/area/virtual_domain) +"Od" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"Oe" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron, +/area/virtual_domain) +"Of" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"Oh" = ( +/obj/effect/spawner/random/decoration/microwave{ + dir = 1; + pixel_y = 2 + }, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"Oi" = ( +/obj/structure/holosign/barrier/atmos, +/turf/open/floor/plating, +/area/virtual_domain) +"Oj" = ( +/obj/item/ammo_box/magazine/wt550m9, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/virtual_domain) +"Ol" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"Om" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L8" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Oq" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Or" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/item/evidencebag, +/turf/open/floor/iron, +/area/virtual_domain) +"Os" = ( +/obj/structure/rack, +/obj/item/aicard, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Ou" = ( +/obj/structure/barricade/sandbags, +/turf/open/floor/iron, +/area/virtual_domain) +"Ov" = ( +/obj/machinery/vending/boozeomat, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/virtual_domain) +"Ox" = ( +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"OC" = ( +/obj/structure/tank_dispenser/oxygen{ + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"OD" = ( +/obj/structure/rack, +/obj/item/clothing/shoes/magboots, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"OE" = ( +/obj/machinery/door/airlock/silver{ + name = "Bathroom" + }, +/turf/open/floor/iron/white, +/area/virtual_domain) +"OS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/wood, +/area/virtual_domain) +"OU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/trash/popcorn/caramel, +/turf/open/floor/iron, +/area/virtual_domain) +"OV" = ( +/obj/item/flashlight/flare{ + icon_state = "flare-on"; + light_on = 1 + }, +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/virtual_domain) +"OX" = ( +/obj/machinery/fax{ + pixel_y = 9 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Pa" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L4" + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "l"; + pixel_x = 10; + pixel_y = 16 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Pd" = ( +/obj/item/cigbutt, +/turf/open/floor/wood, +/area/virtual_domain) +"Pg" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/alien/weeds, +/turf/open/floor/iron, +/area/virtual_domain) +"Pk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/alien/weeds, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Pq" = ( +/obj/item/ammo_casing/spent{ + dir = 1 + }, +/obj/item/ammo_casing/spent{ + dir = 10; + pixel_x = -13; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Py" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/item/radio/intercom/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/clothing/mask/facehugger/dead, +/obj/structure/displaycase, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood, +/area/virtual_domain) +"PC" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/closet/crate/trashcart/filled, +/turf/open/floor/iron, +/area/virtual_domain) +"PG" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L10" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"PP" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law, +/obj/machinery/light/small/directional/west, +/obj/item/paper/fluff/gateway, +/obj/item/coin/plasma, +/obj/item/melee/chainofcommand, +/turf/open/floor/wood, +/area/virtual_domain) +"PQ" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"PR" = ( +/obj/machinery/vending/boozeomat/syndicate_access, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/virtual_domain) +"PT" = ( +/obj/structure/alien/weeds, +/obj/structure/bed/nest, +/turf/open/floor/plating, +/area/virtual_domain) +"PU" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"PY" = ( +/obj/item/restraints/legcuffs/beartrap/prearmed, +/turf/open/floor/iron, +/area/virtual_domain) +"Qc" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/alien/weeds, +/obj/structure/alien/weeds/node, +/obj/effect/mob_spawn/corpse/human/assistant/brainrot_infection, +/turf/open/floor/plating, +/area/virtual_domain) +"Qg" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/item/folder/yellow{ + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Qh" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/barricade/sandbags, +/obj/structure/railing, +/turf/open/floor/iron, +/area/virtual_domain) +"Qm" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Qp" = ( +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/fluff/paper/stack{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Qq" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron, +/area/virtual_domain) +"Qw" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L5" + }, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron, +/area/virtual_domain) +"QA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Bridge Blast Door" + }, +/obj/structure/barricade/wooden/crude, +/obj/structure/cable, +/turf/open/floor/plating, +/area/virtual_domain) +"QM" = ( +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/suit_storage_unit/void_old, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"QN" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/item/restraints/handcuffs/cable/white, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/carpet, +/area/virtual_domain) +"QQ" = ( +/obj/item/ammo_casing/shotgun/buckshot/spent, +/turf/open/floor/carpet, +/area/virtual_domain) +"Ra" = ( +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"Rg" = ( +/obj/machinery/light/cold/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/north, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Rj" = ( +/obj/structure/broken_flooring/side/directional/north, +/turf/open/floor/plating, +/area/virtual_domain) +"Rl" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Rn" = ( +/obj/item/clothing/head/cone{ + pixel_y = 3; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/toolbox/electrical{ + pixel_y = -5; + pixel_x = -2 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Rx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Rz" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/trash/energybar, +/turf/open/floor/iron, +/area/virtual_domain) +"RB" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/holosign/barrier, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron, +/area/virtual_domain) +"RD" = ( +/obj/structure/lattice, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/space/basic, +/area/virtual_domain) +"RE" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/frame/machine/secured, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"RI" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/spawner/random/decoration/showcase, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"RJ" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"RL" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/item/ammo_casing/spent{ + dir = 4 + }, +/obj/item/ammo_casing/spent{ + dir = 9; + pixel_x = -13; + pixel_y = 9 + }, +/obj/item/ammo_casing/spent{ + dir = 8; + pixel_x = -19; + pixel_y = -5 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"RR" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/item/ammo_casing/spent, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"RT" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + name = "HoP Queue Shutters" + }, +/obj/effect/turf_decal/loading_area, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) +"RV" = ( +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/item/banner/security, +/turf/open/floor/iron, +/area/virtual_domain) +"RX" = ( +/obj/effect/spawner/random/decoration/showcase, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"RZ" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Sa" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/suit_storage_unit{ + state_open = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Sj" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Sl" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Sm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/iron, +/area/virtual_domain) +"Sq" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/frame/computer, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = 5 + }, +/obj/item/stack/cable_coil/cut, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Sr" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood, +/turf/open/floor/wood, +/area/virtual_domain) +"Ss" = ( +/obj/machinery/recharger{ + pixel_y = 3 + }, +/obj/item/restraints/handcuffs{ + pixel_y = 3 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Sx" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/iron, +/area/virtual_domain) +"Sz" = ( +/obj/item/seeds/eggplant, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"SC" = ( +/obj/structure/marker_beacon/bronze, +/obj/structure/broken_flooring/side/directional/north, +/turf/open/floor/plating, +/area/virtual_domain) +"SF" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/item/flashlight/flare{ + icon_state = "flare-on"; + light_on = 1 + }, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"SG" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/frame/computer, +/obj/item/shard, +/obj/item/stack/cable_coil/cut, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"SH" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"SJ" = ( +/obj/machinery/airalarm/directional/north, +/obj/item/kirbyplants/organic/applebush, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"SK" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"SN" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/virtual_domain) +"SP" = ( +/obj/effect/turf_decal/tile/neutral, +/mob/living/basic/bot/cleanbot/autopatrol, +/turf/open/floor/iron, +/area/virtual_domain) +"SR" = ( +/obj/structure/fluff/paper/stack{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ST" = ( +/obj/structure/alien/weeds, +/obj/structure/barricade/wooden, +/turf/open/floor/plating, +/area/virtual_domain) +"SY" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/syringe/lethal/execution, +/obj/item/reagent_containers/syringe/lethal/execution{ + pixel_y = 7; + pixel_x = -4 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"Te" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 + }, +/obj/effect/mob_spawn/corpse/human/doctor, +/turf/open/indestructible/meat, +/area/virtual_domain) +"Tm" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/virtual_domain) +"To" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/glass, +/obj/item/stack/rods, +/obj/effect/mine/explosive/flame, +/turf/open/floor/plating, +/area/virtual_domain) +"Ty" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L14" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"TC" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/virtual_domain) +"TH" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/chair/pew/left, +/obj/item/newspaper, +/turf/open/floor/iron, +/area/virtual_domain) +"TJ" = ( +/obj/structure/grille, +/obj/item/shard, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/virtual_domain) +"TL" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"TN" = ( +/obj/structure/table/wood, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/machinery/button/door/directional/east{ + name = "corporate showroom shutters control" + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/virtual_domain) +"TP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/virtual_domain) +"TT" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/button/door/directional/north{ + name = "Gateway Shutter Control" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"TW" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Ua" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/chair/sofa/corp/right{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Ue" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/carpet, +/area/virtual_domain) +"Ui" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/banner/engineering, +/turf/open/floor/iron, +/area/virtual_domain) +"Uj" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Un" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Uo" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"Uq" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/turf/open/floor/plating, +/area/virtual_domain) +"Ur" = ( +/obj/machinery/vending/cart{ + req_access = list("hop") + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/wood, +/area/virtual_domain) +"Uv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Ux" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/virtual_domain) +"Uz" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/virtual_domain) +"UF" = ( +/obj/structure/flora/bush/jungle/a/style_random, +/obj/item/banner/science, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"UJ" = ( +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood{ + pixel_x = 2 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"UP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/carpet, +/area/virtual_domain) +"UT" = ( +/obj/structure/flora/bush/leavy/style_3, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/spacevine{ + can_spread = 0 + }, +/obj/effect/mob_spawn/corpse/human/scientist, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"Ve" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Vk" = ( +/obj/effect/turf_decal/stripes/line, +/obj/item/stack/sheet/mineral/wood{ + pixel_x = -9 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Vr" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/gelpod, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/plating, +/area/virtual_domain) +"Vs" = ( +/turf/closed/indestructible/rock, +/area/virtual_domain) +"Vw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Vz" = ( +/obj/structure/barricade/security, +/turf/open/floor/plating, +/area/virtual_domain) +"VD" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash, +/turf/open/floor/carpet, +/area/virtual_domain) +"VG" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/trash/flare, +/turf/open/floor/carpet, +/area/virtual_domain) +"VH" = ( +/obj/item/storage/box/lights/mixed, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 16; + icon_state = "candle2_lit"; + pixel_x = -17 + }, +/turf/open/floor/plating, +/area/virtual_domain) +"VO" = ( +/obj/machinery/door/airlock{ + name = "Central Emergency Storage" + }, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/virtual_domain) +"VP" = ( +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"VT" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/chair, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"VZ" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/iron, +/area/virtual_domain) +"Wf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/crowbar, +/turf/open/floor/iron, +/area/virtual_domain) +"Wh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/virtual_domain) +"Wl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Wm" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/light/small/directional/north, +/obj/structure/table/wood, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/under/suit/black_really, +/obj/item/clothing/glasses/sunglasses, +/turf/open/floor/wood, +/area/virtual_domain) +"Wt" = ( +/obj/structure/flora/grass/jungle/b/style_random, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/misc/dirt/jungle, +/area/virtual_domain) +"Wv" = ( +/obj/machinery/door/firedoor, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"WF" = ( +/obj/structure/table/wood, +/obj/machinery/button/ticket_machine{ + pixel_x = 38 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 6; + pixel_y = -34 + }, +/obj/machinery/button/door/directional/south{ + pixel_x = -6 + }, +/obj/item/paper_bin/carbon{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/stamp/head/hop{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/button/door/directional/south{ + pixel_x = -6; + pixel_y = -34 + }, +/obj/item/pen{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/machinery/button/photobooth{ + pixel_x = 26 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"WH" = ( +/obj/item/clothing/head/cone{ + pixel_x = 5; + pixel_y = -4 + }, +/obj/item/crowbar/hammer{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/virtual_domain) +"WL" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/assembly/flash, +/turf/open/floor/iron, +/area/virtual_domain) +"WM" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/trash/chips, +/turf/open/floor/iron, +/area/virtual_domain) +"Xa" = ( +/obj/machinery/requests_console/directional/east{ + department = "Bridge"; + name = "Bridge Requests Console" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/computer/old, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Xj" = ( +/obj/machinery/light/directional/north, +/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)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/iron, +/area/virtual_domain) +"Xn" = ( +/obj/structure/bed/maint, +/obj/item/bedsheet/pirate{ + dir = 4 + }, +/obj/item/knife/hunting{ + pixel_y = -4 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"Xp" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L2" + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Xs" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/mine/explosive, +/turf/open/floor/plating, +/area/virtual_domain) +"Xw" = ( +/obj/effect/turf_decal/tile/blue, +/obj/item/boulder{ + icon_state = "boulder_large"; + pixel_y = 7 + }, +/obj/item/boulder{ + icon_state = "boulder_small"; + pixel_x = 9; + pixel_y = -1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Xx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/flashlight/lantern{ + light_on = 1 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"XD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron, +/area/virtual_domain) +"XI" = ( +/obj/structure/frame/computer{ + dir = 1 + }, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = 5 + }, +/obj/item/stack/cable_coil/cut, +/turf/open/floor/wood, +/area/virtual_domain) +"XJ" = ( +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood{ + pixel_x = -4 + }, +/turf/open/floor/wood, +/area/virtual_domain) +"XK" = ( +/obj/structure/grille, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/virtual_domain) +"XL" = ( +/obj/structure/barricade/sandbags, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/structure/marker_beacon/bronze, +/turf/open/floor/iron, +/area/virtual_domain) +"XM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/photo/old{ + pixel_x = 4 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"XN" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/bot, +/obj/item/wallframe/light_fixture/small, +/obj/item/stack/cable_coil/cut, +/turf/open/floor/iron, +/area/virtual_domain) +"XW" = ( +/obj/structure/frame/machine/secured, +/obj/structure/marker_beacon/teal, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Yc" = ( +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron, +/area/virtual_domain) +"Yd" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Yf" = ( +/obj/machinery/recharger{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/structure/secure_safe/directional/east, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/virtual_domain) +"Yg" = ( +/obj/structure/broken_flooring/singular/directional/east, +/turf/open/floor/plating, +/area/virtual_domain) +"Yi" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/virtual_domain) +"Yl" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/virtual_domain) +"Yn" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Yo" = ( +/obj/structure/sign/plaques/kiddie/perfect_drone{ + pixel_y = 32 + }, +/obj/structure/table/wood, +/obj/item/storage/backpack/duffelbag/drone, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/carpet, +/area/virtual_domain) +"Yr" = ( +/obj/machinery/door/firedoor, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/virtual_domain) +"Ys" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plating, +/area/virtual_domain) +"Yt" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor1-old" + }, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/iron, +/area/virtual_domain) +"Yv" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/west, +/obj/item/clothing/head/cone{ + pixel_x = 5; + pixel_y = -4 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"YA" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"YB" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/bluespace_vendor/directional/east, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron, +/area/virtual_domain) +"YD" = ( +/obj/item/clothing/head/cone{ + pixel_y = 2; + pixel_x = 6 + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/virtual_domain) +"YG" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/carpet, +/area/virtual_domain) +"YN" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "floor7" + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/virtual_domain) +"YQ" = ( +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/weather/dirt, +/obj/structure/fluff/paper/stack{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/virtual_domain) +"YR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Command Hallway" + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/virtual_domain) +"YU" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/plating, +/area/virtual_domain) +"Za" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/virtual_domain) +"Zb" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = 1 + }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/virtual_domain) +"Zc" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"Zh" = ( +/obj/structure/table_frame/wood, +/obj/item/stack/sheet/mineral/wood, +/turf/open/floor/carpet, +/area/virtual_domain) +"Zi" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"Zl" = ( +/obj/machinery/airalarm/directional/south, +/obj/structure/rack, +/obj/item/wrench, +/obj/item/crowbar, +/turf/open/floor/wood, +/area/virtual_domain) +"Zm" = ( +/obj/structure/spacevine{ + can_spread = 0 + }, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/virtual_domain) +"Zp" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain) +"Zq" = ( +/obj/structure/sign/poster/random/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/iron, +/area/virtual_domain) +"Zu" = ( +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Zx" = ( +/obj/machinery/disposal/bin, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"ZC" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/grass/jungle, +/area/virtual_domain) +"ZD" = ( +/obj/item/trash/candy, +/turf/open/floor/iron, +/area/virtual_domain) +"ZF" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/virtual_domain) +"ZG" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/virtual_domain) +"ZH" = ( +/obj/item/clothing/head/cone{ + pixel_y = 3; + pixel_x = 7 + }, +/obj/structure/grille/broken, +/obj/structure/cable, +/turf/open/floor/plating, +/area/virtual_domain) +"ZK" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"ZM" = ( +/obj/item/book/manual/wiki/security_space_law{ + name = "space law"; + pixel_y = 2 + }, +/obj/item/toy/gun, +/obj/item/restraints/handcuffs, +/obj/structure/table/wood, +/obj/item/clothing/head/collectable/hos{ + name = "novelty HoS hat" + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/carpet, +/area/virtual_domain) +"ZP" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/closet/crate/trashcart/filled, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"ZR" = ( +/obj/machinery/door/airlock/command{ + name = "Command Desk" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"ZS" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"ZT" = ( +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters" + }, +/turf/open/floor/carpet, +/area/virtual_domain) +"ZV" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/mob_spawn/corpse/human/assistant, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/iron, +/area/virtual_domain) +"ZY" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/virtual_domain) + +(1,1,1) = {" +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +uz +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +uz +HM +HM +HM +HM +HM +HM +uz +uz +uz +uz +uz +uz +uz +uz +uz +"} +(2,1,1) = {" +uz +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +Vs +Vs +Vs +Vs +Vs +ps +ps +ps +ps +ps +HM +HM +HM +ps +ps +pD +ps +HM +uz +uz +uz +uz +uz +uz +uz +uz +uz +"} +(3,1,1) = {" +uz +HM +Vs +Vs +Vs +Vs +Hl +Hl +Hl +Vs +Vs +Vs +ps +ps +ps +ps +tO +ps +ps +ps +Hl +Vs +Vs +Hl +ps +Ao +vM +eB +ps +ps +ps +ps +ps +Zx +Ii +ps +HM +uz +uz +uz +uz +uz +uz +uz +uz +uz +"} +(4,1,1) = {" +uz +HM +Vs +Vs +Vs +DW +bl +pr +Vs +Vs +Vs +Cn +cK +Uj +vN +Ah +nP +nS +gk +eA +Vs +Vs +MZ +nZ +Lg +nS +nS +Jm +dU +xK +ux +CM +KR +nS +ro +ps +HM +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(5,1,1) = {" +uz +HM +ps +Vs +yH +Hd +KT +mc +Hd +fj +dD +Hd +oS +hw +IL +Pq +pT +dD +KT +pc +mI +pE +SR +dD +mK +tR +Hd +JD +Zp +jR +Hd +hw +Hd +MG +kd +ps +ps +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(6,1,1) = {" +HM +HM +pD +yD +mc +Lu +PU +Ol +Ol +Ol +FV +Nm +lY +Lu +JL +RL +RR +Ol +Wv +Ol +on +dd +Ol +dd +ZV +AX +Cz +jt +rP +km +cj +dd +dd +Hd +pN +LN +Hl +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(7,1,1) = {" +HM +uS +uS +er +Hb +Ol +ps +Cb +xj +xj +GT +uS +uS +yP +uS +uS +Gx +uS +uS +ps +kK +lC +ac +fN +uS +uS +uS +uS +uS +uS +uS +uS +qq +kI +eZ +eX +uB +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(8,1,1) = {" +HM +uS +yc +th +Hd +LS +ps +ps +kn +ld +ps +uS +pP +EC +rQ +cZ +db +dc +uS +Zu +ps +pQ +nS +uS +rt +Sa +Fw +eV +iQ +Ij +sm +uS +hR +pN +Fl +Yc +Hl +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(9,1,1) = {" +HM +Hl +eB +Uz +kv +SP +ps +wD +FS +Cw +dD +Wh +dc +ZF +Gk +gU +YG +fh +To +GT +No +cI +ZY +lD +cz +Bw +cw +zj +zE +hF +mW +kN +mq +MG +NN +ps +uB +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(10,1,1) = {" +HM +uS +eB +WL +KT +KP +ps +il +TP +KW +fh +uS +Yf +nY +GS +rX +Ue +ZF +uS +dX +XK +tq +tI +FF +mq +oA +wj +OC +uw +qP +fK +yn +BF +mw +BZ +uB +HM +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(11,1,1) = {" +HM +uS +uS +ol +Mz +uY +ps +iv +dl +HS +fC +uS +uS +uS +uS +ML +DP +Mk +uS +ND +AP +rb +nS +jk +Ax +Wl +Wl +lt +bb +si +IH +kN +ED +El +wq +ps +HM +uz +uz +uz +uz +uz +uz +uz +uz +uz +"} +(12,1,1) = {" +HM +HM +uS +gM +CL +aZ +ps +ps +Hg +tf +fh +ps +rv +uS +Ur +VD +Xn +XI +uS +XN +OV +vN +Bj +uS +QM +GA +OD +ps +Er +Sa +dk +uS +LJ +bm +zL +uB +HM +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(13,1,1) = {" +uz +HM +HH +JM +Kl +VZ +ps +Yi +vA +mj +VH +lJ +Oq +uS +fz +oM +db +rz +To +fQ +TJ +OU +Qm +uS +ps +ps +ps +ps +ps +ps +ps +uS +Fc +BZ +hz +ps +uB +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(14,1,1) = {" +uz +HM +uS +nU +pO +bs +VO +ey +sr +fh +Gs +pL +IU +uS +dz +bO +ww +nW +aw +Ne +RT +bg +Ed +uS +kW +lL +pI +Qc +Fr +DQ +Pk +uS +Mu +qY +ay +im +Hl +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(15,1,1) = {" +uz +HM +uS +qa +Yt +uD +ps +uS +hZ +uS +uS +ps +uf +uS +cD +Kh +yq +WF +uS +YB +uS +TH +nS +uS +ZS +jD +kx +vt +PT +pV +mW +Pg +AN +bZ +Te +Gm +dA +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(16,1,1) = {" +uz +HM +ps +my +iy +Hs +dE +SN +SN +SN +uS +uS +EQ +uS +ps +ps +te +ps +uS +uS +wB +vg +pA +IS +jm +cW +Cd +CQ +Lm +jD +IH +vI +mq +vn +Sj +FT +dA +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(17,1,1) = {" +HM +HM +ps +hV +Hd +bQ +hZ +ii +SN +SN +kp +sI +Un +pJ +oQ +Hv +Xw +sf +ny +JP +ul +tq +Rz +FF +iI +MM +Vr +PT +VP +Rg +Gq +uS +AV +Ll +sX +Fg +Hl +HM +HM +HM +HM +HM +HM +HM +HM +Yl +"} +(18,1,1) = {" +HM +ps +ps +Rl +Hd +cr +FZ +fh +QA +kp +uS +uX +xu +JP +oy +Hv +to +ze +Bv +LK +ul +pR +tu +uS +uS +dE +tn +cW +cW +ps +ps +uS +vW +wH +Zc +JR +ps +ps +ps +ps +ps +ps +ps +ps +ps +HM +"} +(19,1,1) = {" +HM +uS +SJ +bS +pA +lT +fh +fh +yt +fh +Ox +gg +Yn +SK +ZP +ps +ps +ps +Mt +ps +uS +PQ +nS +dE +SN +SN +as +tl +pW +ST +tV +DL +rr +Hd +dD +ZG +Za +sS +SN +sS +SN +sS +SN +sS +ps +HM +"} +(20,1,1) = {" +HM +Hl +Es +mc +Hd +Ux +Ux +lT +AC +lT +vw +fh +ug +ba +mi +ps +uH +ZK +JP +xV +uS +WM +Kf +uS +hZ +hZ +uS +Yo +jh +pK +ep +FF +GJ +FR +Hd +Ka +ps +Fd +Fd +Fd +Fd +Fd +Fd +Fd +ps +HM +"} +(21,1,1) = {" +HM +uS +RV +BJ +Xp +Ol +Ad +vw +ZH +uk +NG +aA +SK +up +Os +ps +ps +Nl +YG +iH +FF +dd +FK +Of +qu +nS +as +RX +Bn +OS +ZF +oI +MF +vf +Xp +ZG +ps +hX +hX +hX +hX +hX +Ls +Fd +ps +HM +"} +(22,1,1) = {" +HM +dP +tS +eD +mf +Ke +dE +ii +uS +Qg +ug +uT +qM +zq +sc +Cy +ps +Mn +db +id +Nz +MF +Hd +bU +Mr +VT +uS +lK +rf +Ie +Oh +uS +Qp +ck +Pa +oD +pB +hX +zQ +Lq +hX +hX +hX +Fd +ps +HM +"} +(23,1,1) = {" +HM +yz +Vz +Qw +bP +Ol +hZ +SN +kp +zP +xu +Mb +RJ +JP +YG +wL +ps +Dp +qk +UJ +Nz +cp +ub +ZD +lb +LP +uS +wo +Ar +jC +Zh +an +PC +pA +lM +Bp +LD +hX +hX +hX +hX +hX +hX +Fd +ps +HM +"} +(24,1,1) = {" +HM +yz +Vz +wN +Om +wi +dE +SN +kp +SG +Vw +bW +MC +hU +TL +DP +ZR +JP +kg +zo +zx +AD +iy +Kw +yH +Dx +oI +ZF +vw +Km +fh +MS +mt +EV +zB +Io +vw +hX +hX +fD +Cx +hX +hX +Fd +ps +HM +"} +(25,1,1) = {" +HM +yz +Vz +wN +Cr +nS +hZ +SN +kp +zP +JP +yh +Hw +wA +hh +mb +ps +nw +se +xW +lk +Ad +CJ +Hd +KA +lG +uS +Wm +Mj +fh +Oj +vw +fh +Kv +PG +KF +gC +hX +hX +hX +hX +hX +hX +Fd +ps +HM +"} +(26,1,1) = {" +HM +tO +Oe +wN +vy +Wf +dE +LB +uS +Bt +gt +Xx +HX +ET +JK +Sl +ps +wY +YG +Gr +yx +Or +ie +bU +qJ +bR +uS +MP +fh +GG +Fp +uS +wN +wN +Rj +fB +wP +hX +hX +hX +Ca +hX +hX +Fd +ps +HM +"} +(27,1,1) = {" +HM +ps +CK +ht +Ty +YA +hZ +Il +kp +BK +di +Mb +Yd +cO +KQ +ps +ps +Ht +rJ +VG +FF +RB +qL +jd +LP +Bg +mo +br +ZF +rW +Mj +oI +MF +ra +BN +yK +ps +hX +hX +hX +hX +hX +rs +Fd +ps +HM +"} +(28,1,1) = {" +HM +ps +Xj +Hd +Hd +Ua +hZ +SN +kp +Sq +Eu +ix +iP +aQ +ez +ps +uH +FI +Ms +KN +uS +Bh +re +uS +dE +dE +uS +oH +Mj +gE +xI +FF +Gi +Hd +aC +Uo +lE +Fd +Fd +Fd +Fd +Fd +Fd +Fd +ps +HM +"} +(29,1,1) = {" +HM +ps +cx +rj +kI +ZY +dE +SN +kp +Mo +Kn +Ss +at +yy +HC +ps +ps +ps +Mt +ps +uS +zw +Ol +hZ +SN +SN +as +RI +Pd +TN +ZM +an +sB +kI +Hd +Cg +Za +sS +SN +sS +SN +sS +SN +sS +ps +HM +"} +(30,1,1) = {" +HM +ps +ps +hi +Hd +hg +dE +SN +kp +kp +uS +pb +iZ +bu +kt +Hv +EF +SK +SK +tk +ul +dd +yw +uS +uS +dE +uS +ps +ps +ps +ps +uS +rh +PY +Ou +CA +lQ +ps +ps +ps +ps +ps +ps +ps +ps +HM +"} +(31,1,1) = {" +HM +HM +ps +sF +pX +vi +hZ +SN +SN +Mm +kp +Xa +fF +DU +RZ +Hv +Iw +qI +Bv +Bv +ul +wa +tM +Nh +zg +Fj +NO +hv +uA +yN +Ff +uS +tq +Hd +DV +UF +Zm +Vs +HM +HM +HM +HM +HM +HM +HM +HM +"} +(32,1,1) = {" +uz +HM +Hl +Ny +yH +DF +dE +SN +GD +RD +uS +uS +uS +zA +jG +uS +uS +uS +BP +uS +wB +dd +pA +Nh +Uq +Rj +wu +XD +wu +Rx +jx +uS +cC +HG +Gy +mO +wl +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(33,1,1) = {" +uz +HM +yz +Ny +fn +Mq +uS +uS +uS +uS +uS +Hh +uS +uS +uS +uS +Ov +rq +db +LG +uS +hd +Ol +lx +vU +hp +lu +ok +hc +fK +op +uS +Ra +nq +Cc +zR +ge +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(34,1,1) = {" +uz +HM +ps +cN +vO +XM +uS +uP +ab +hb +ps +YQ +ps +Py +PP +qz +jF +QQ +YG +YG +BP +Yg +pv +uS +FN +AR +eR +Zb +zT +IH +dZ +uS +PQ +DV +ej +tw +Zm +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(35,1,1) = {" +uz +HM +ps +au +Ay +TW +uS +Zi +vK +wn +ps +aO +ps +ry +ZF +gE +mP +vV +vV +FA +uS +TC +mQ +uS +uS +AA +AA +uS +hZ +hG +hZ +uS +TT +Gy +aV +yO +lQ +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(36,1,1) = {" +uz +HM +ps +LL +KT +LV +uS +yC +jc +UP +ps +OE +ps +xb +XJ +Iq +sA +MJ +SY +tj +uS +dd +ai +ty +uS +bT +ss +Yv +dY +Dk +Vk +FC +mq +UT +SF +MN +lQ +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(37,1,1) = {" +uz +HM +Hl +dd +Hd +nS +pd +YN +dc +rO +yI +gE +ZT +kc +yM +ki +vw +vK +QN +Ir +uS +ud +xd +sa +uS +Nr +XW +Kq +Ii +Hd +fK +FC +mq +cH +gb +ZC +Ec +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(38,1,1) = {" +uz +HM +yz +dd +Hd +FZ +WH +Oi +tF +YU +Jh +gE +ps +jy +qS +Sr +fh +fh +aT +SH +uS +Fh +Ol +Gn +uS +Nq +iY +Dc +dC +jz +qr +FC +mq +Gy +DC +od +FO +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(39,1,1) = {" +uz +HM +yz +fh +mc +yE +Oi +SN +Oi +YD +zO +sz +ps +ps +uS +uS +OX +Xs +fh +uS +uS +dd +iK +uS +uS +uS +uS +uS +uS +oo +uS +FF +fr +DV +MN +EH +iA +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(40,1,1) = {" +uz +HM +Hl +pA +Hd +Kr +Oi +GD +rm +Oi +bd +Zl +ps +Hc +uS +ek +vw +eG +xe +Ji +DO +dd +Ol +DO +ey +eu +fh +wV +vw +ja +Tm +DO +tq +Hd +tW +lQ +uq +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(41,1,1) = {" +uz +HM +KM +dd +Hd +lU +Rn +Oi +Oi +AM +CC +uS +uS +Ml +uS +DO +ps +ps +ps +ps +ut +hj +YR +tO +ps +ps +ps +ps +ps +ps +ps +ps +JG +Hd +sZ +ps +lQ +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(42,1,1) = {" +uz +HM +ps +nO +kI +nS +FZ +bw +lN +IC +SC +gj +Qq +lv +Lg +Oc +IJ +Ys +EK +Zq +En +tq +bf +tq +av +Qh +Sx +Ve +tq +Uv +BM +DA +fP +NR +eN +FG +Vs +Vs +HM +uz +uz +uz +uz +uz +uz +uz +"} +(43,1,1) = {" +uz +HM +ps +dd +mR +mc +Hd +KT +Ay +fh +Hd +vw +mc +KT +Lh +nz +oO +Lz +zb +vw +Hd +Hd +kI +XL +KT +oS +mR +XL +GQ +fP +fP +Sz +fP +Dl +Wt +yT +Vs +HM +HM +uz +uz +uz +uz +uz +uz +uz +"} +(44,1,1) = {" +uz +HM +ps +dd +jt +km +dd +Nu +JY +HP +HP +vo +Ui +Yr +Bd +PR +Vs +Vs +Sm +fG +Bd +Od +rC +NZ +kM +IM +AQ +fc +cB +Vs +Vs +cF +qv +fP +st +RE +Vs +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(45,1,1) = {" +uz +HM +ps +ps +ps +ps +ps +ps +ps +DM +DM +DM +ps +ps +Hl +Hl +Vs +Vs +Vs +Hl +ps +ps +ps +ps +ps +ps +ps +ps +ps +ps +Vs +Vs +ps +Hl +Vs +Vs +Vs +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} +(46,1,1) = {" +uz +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +HM +uz +uz +uz +uz +uz +uz +uz +uz +"} diff --git a/_maps/virtual_domains/pipedream.dmm b/_maps/virtual_domains/pipedream.dmm index dd7fdd90f8b..3ef049d6956 100644 --- a/_maps/virtual_domains/pipedream.dmm +++ b/_maps/virtual_domains/pipedream.dmm @@ -22,6 +22,12 @@ }, /turf/open/floor/iron, /area/virtual_domain) +<<<<<<< HEAD +======= +"aK" = ( +/turf/open/space/basic, +/area/space/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aL" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, @@ -103,9 +109,12 @@ }, /turf/open/floor/iron, /area/virtual_domain) +<<<<<<< HEAD "dr" = ( /turf/open/space/basic, /area/space/virtual_domain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dx" = ( /obj/effect/turf_decal/trimline/yellow/line, /obj/item/shard, @@ -741,6 +750,13 @@ icon_state = "carpet_royalblue-207" }, /area/virtual_domain) +<<<<<<< HEAD +======= +"wl" = ( +/obj/item/shard, +/turf/open/space/basic, +/area/space/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wm" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -792,10 +808,13 @@ }, /turf/open/floor/plating, /area/virtual_domain) +<<<<<<< HEAD "xc" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/closed/indestructible/binary, /area/virtual_domain/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xj" = ( /obj/structure/railing/corner/end{ dir = 4 @@ -828,6 +847,13 @@ /obj/machinery/light/broken, /turf/open/floor/iron, /area/virtual_domain) +<<<<<<< HEAD +======= +"xF" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xM" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 4 @@ -859,10 +885,13 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/virtual_domain) +<<<<<<< HEAD "zn" = ( /obj/item/stack/rods/two, /turf/open/space/basic, /area/space/virtual_domain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zp" = ( /obj/structure/chair/sofa/corp/right{ dir = 1 @@ -894,6 +923,13 @@ /obj/machinery/light/broken, /turf/open/floor/iron, /area/virtual_domain) +<<<<<<< HEAD +======= +"Av" = ( +/obj/item/stack/rods/two, +/turf/open/space/basic, +/area/space/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Aw" = ( /obj/structure/lattice/catwalk{ name = "industrial lift" @@ -1107,9 +1143,12 @@ icon_state = "carpet_royalblue-21" }, /area/virtual_domain) +<<<<<<< HEAD "Gf" = ( /turf/closed/indestructible/binary, /area/virtual_domain/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Gh" = ( /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, @@ -1145,10 +1184,13 @@ /obj/effect/turf_decal/trimline/yellow/arrow_ccw, /turf/open/floor/iron, /area/virtual_domain) +<<<<<<< HEAD "GQ" = ( /obj/item/shard, /turf/open/space/basic, /area/space/virtual_domain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "GV" = ( /obj/machinery/light/small/red/dim{ dir = 8 @@ -1220,10 +1262,13 @@ /obj/structure/sign/warning/doors/directional/east, /turf/open/floor/iron, /area/virtual_domain) +<<<<<<< HEAD "Jo" = ( /obj/effect/smooths_with_walls, /turf/closed/indestructible/binary, /area/virtual_domain/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jq" = ( /obj/structure/broken_flooring/pile{ dir = 1 @@ -1535,6 +1580,16 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron, /area/virtual_domain) +<<<<<<< HEAD +======= +"RI" = ( +/obj/effect/smooths_with_walls, +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"RJ" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "RK" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/iron, @@ -1919,6 +1974,7 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf Gf @@ -1932,6 +1988,21 @@ Gf Gf Gf Gf +======= +RJ +RJ +RJ +RJ +RJ +RJ +RI +RJ +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -1969,7 +2040,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rO rO eg @@ -1981,7 +2056,11 @@ eg Xb rO rO +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -2019,7 +2098,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rO Bx SZ @@ -2031,6 +2114,7 @@ OQ bs Ib rO +<<<<<<< HEAD Gf Gf Gf @@ -2039,6 +2123,16 @@ Gf Gf Gf Gf +======= +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ "} @@ -2061,6 +2155,7 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf Gf @@ -2070,6 +2165,17 @@ Gf Gf Gf Gf +======= +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg ho ho @@ -2081,6 +2187,7 @@ pa bs zp eY +<<<<<<< HEAD Gf Gf rO @@ -2091,6 +2198,18 @@ rO Gf Gf xc +======= +RJ +RJ +rO +RJ +RJ +rO +rO +RJ +RJ +xF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (5,1,1) = {" yQ @@ -2111,7 +2230,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Jo +======= +RI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg eg eg @@ -2119,7 +2242,11 @@ eg eg eg eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg um DP @@ -2140,7 +2267,11 @@ AU rO rO rO +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (6,1,1) = {" yQ @@ -2161,7 +2292,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg vA Dr @@ -2169,7 +2304,11 @@ bw Jq gc eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg Hn fK @@ -2184,13 +2323,22 @@ eY rO Ez AU +<<<<<<< HEAD dr dr +======= +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AU AU BN rO +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (7,1,1) = {" yQ @@ -2211,7 +2359,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg jQ lW @@ -2219,7 +2371,11 @@ kU vU lN eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg QI Fo @@ -2235,12 +2391,21 @@ rO AU AU BN +<<<<<<< HEAD dr dr dr AU rO Gf +======= +aK +aK +aK +AU +rO +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (8,1,1) = {" yQ @@ -2261,7 +2426,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg uU gj @@ -2269,7 +2438,11 @@ lt pb OR eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg eg uk @@ -2280,6 +2453,7 @@ eg qV Vb eY +<<<<<<< HEAD dr dr dr @@ -2291,6 +2465,19 @@ dr dr dr Gf +======= +aK +aK +aK +aK +aK +aK +aK +aK +aK +aK +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (9,1,1) = {" yQ @@ -2311,7 +2498,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg ki gj @@ -2319,7 +2510,11 @@ kU kU kU eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg kU kU @@ -2330,6 +2525,7 @@ Qj FK nc eY +<<<<<<< HEAD dr dr dr @@ -2341,6 +2537,19 @@ dr dr dr Gf +======= +aK +aK +aK +aK +aK +aK +AU +aK +aK +aK +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (10,1,1) = {" yQ @@ -2356,12 +2565,21 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Jo Gf Gf Gf Gf +======= +RJ +RI +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg eg kJ @@ -2369,7 +2587,11 @@ lx lx lp eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg mu AJ @@ -2380,6 +2602,7 @@ BW hi Sg eY +<<<<<<< HEAD dr dr dr @@ -2391,6 +2614,19 @@ dr dr dr Gf +======= +aK +aK +aK +aK +aK +aK +aK +aK +aK +aK +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (11,1,1) = {" yQ @@ -2399,6 +2635,7 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf Gf @@ -2407,6 +2644,16 @@ Gf Gf Gf Gf +======= +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg eg eg @@ -2430,17 +2677,28 @@ XR vQ Vg eY +<<<<<<< HEAD dr dr dr +======= +aK +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JR JR JR JR JR Qo +<<<<<<< HEAD dr Gf +======= +aK +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (12,1,1) = {" yQ @@ -2449,7 +2707,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg eg eg @@ -2481,16 +2743,26 @@ hi CX eY eY +<<<<<<< HEAD dr dr +======= +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JR JR JR JR JR JR +<<<<<<< HEAD dr Gf +======= +aK +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (13,1,1) = {" yQ @@ -2498,8 +2770,13 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf +======= +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg VA bA @@ -2539,8 +2816,13 @@ JR JR JR JR +<<<<<<< HEAD dr Gf +======= +aK +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (14,1,1) = {" yQ @@ -2548,7 +2830,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kU kU Zy @@ -2589,6 +2875,7 @@ JR JR JR JR +<<<<<<< HEAD dr Gf "} @@ -2600,6 +2887,19 @@ Gf Gf Gf Gf +======= +aK +RJ +"} +(15,1,1) = {" +yQ +RJ +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kU QP kU @@ -2639,17 +2939,30 @@ JR JR JR JR +<<<<<<< HEAD dr Gf "} (16,1,1) = {" yQ Gf +======= +aK +RJ +"} +(16,1,1) = {" +yQ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rO rO rO rO +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg eg eg @@ -2681,20 +2994,34 @@ FK CX eY eY +<<<<<<< HEAD dr dr +======= +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JR JR JR JR JR JR +<<<<<<< HEAD dr Gf "} (17,1,1) = {" yQ Gf +======= +aK +RJ +"} +(17,1,1) = {" +yQ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rO BN AU @@ -2730,15 +3057,22 @@ kU FK rz eY +<<<<<<< HEAD dr dr dr +======= +aK +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JR JR JR JR JR ev +<<<<<<< HEAD dr Gf "} @@ -2751,6 +3085,20 @@ AU AU dr dr +======= +aK +RJ +"} +(18,1,1) = {" +yQ +RJ +aK +AU +AU +AU +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg Ct oN @@ -2780,6 +3128,7 @@ UO hi CX eY +<<<<<<< HEAD dr dr dr @@ -2801,6 +3150,29 @@ dr dr GQ dr +======= +aK +aK +aK +aK +aK +aK +aK +aK +aK +aK +RJ +"} +(19,1,1) = {" +RJ +RJ +aK +aK +aK +aK +wl +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yX ve Tt @@ -2830,6 +3202,7 @@ kU hi Ok eY +<<<<<<< HEAD dr dr dr @@ -2851,6 +3224,29 @@ dr dr dr dr +======= +aK +aK +aK +aK +aK +aK +aK +aK +aK +aK +RJ +"} +(20,1,1) = {" +RJ +aK +aK +aK +aK +aK +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tr uz Mh @@ -2881,6 +3277,7 @@ Ci YP eY eY +<<<<<<< HEAD dr dr dr @@ -2900,6 +3297,27 @@ dr dr dr zn +======= +aK +aK +aK +aK +aK +aK +aK +aK +aK +RJ +"} +(21,1,1) = {" +RJ +aK +aK +aK +aK +aK +Av +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 BN tr kU @@ -2931,6 +3349,7 @@ hi hi af eY +<<<<<<< HEAD dr dr dr @@ -2950,6 +3369,27 @@ dr dr dr dr +======= +aK +aK +aK +aK +aK +aK +aK +aK +aK +RJ +"} +(22,1,1) = {" +RJ +aK +aK +aK +aK +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AU eg eg @@ -2981,6 +3421,7 @@ hi lN QK eY +<<<<<<< HEAD dr dr dr @@ -2999,6 +3440,26 @@ dr dr dr dr +======= +aK +aK +aK +aK +BN +aK +aK +aK +aK +RJ +"} +(23,1,1) = {" +RJ +aK +aK +aK +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AU AU rO @@ -3031,6 +3492,7 @@ hi hi Nc eY +<<<<<<< HEAD dr BN AU @@ -3048,11 +3510,34 @@ Gf dr dr dr +======= +aK +BN +AU +aK +aK +aK +aK +aK +aK +RJ +"} +(24,1,1) = {" +RJ +RJ +aK +aK +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AU Ez rO rO +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rO rO Vy @@ -3068,8 +3553,13 @@ jv fR cB rO +<<<<<<< HEAD Gf Gf +======= +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg Ry hk @@ -3085,6 +3575,7 @@ rO rO AU AU +<<<<<<< HEAD dr dr dr @@ -3096,13 +3587,31 @@ Gf yQ Gf dr +======= +aK +aK +aK +aK +rO +RJ +"} +(25,1,1) = {" +yQ +RJ +aK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AU BN AU rO rO +<<<<<<< HEAD Gf Gf +======= +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eY Xm TH @@ -3118,8 +3627,13 @@ uP Ge vb eg +<<<<<<< HEAD Gf Gf +======= +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg rO rO @@ -3130,6 +3644,7 @@ eg eg rO rO +<<<<<<< HEAD Jo Gf rO @@ -3153,6 +3668,31 @@ rO Gf Gf Gf +======= +RI +RJ +rO +rO +rO +RJ +RJ +rO +rO +rO +RJ +"} +(26,1,1) = {" +yQ +RJ +RJ +RJ +RJ +rO +rO +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eY Bd vL @@ -3168,6 +3708,7 @@ wh Zg Nu eg +<<<<<<< HEAD Gf Gf Gf @@ -3191,18 +3732,52 @@ Gf Gf Gf Gf +======= +RJ +RJ +RJ +RJ +RJ +RJ +RI +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (27,1,1) = {" yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf Gf Gf yQ Gf +======= +RJ +RJ +RJ +RJ +yQ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eY Jl RK @@ -3218,7 +3793,11 @@ bx Cv Nu eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3252,7 +3831,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eY NW UY @@ -3268,7 +3851,11 @@ wq Zg Nu eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3302,7 +3889,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eY xk Te @@ -3318,7 +3909,11 @@ ZI Ex xE eg +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3352,7 +3947,11 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eY eY eY @@ -3368,7 +3967,11 @@ xM Qv LU rO +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3402,11 +4005,19 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf Gf Gf Gf +======= +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg Gs jH @@ -3418,7 +4029,11 @@ eg rO rO rO +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3456,12 +4071,17 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eg Ok nz IK eg +<<<<<<< HEAD Gf Gf Gf @@ -3469,6 +4089,15 @@ Gf Gf Gf Gf +======= +RJ +RJ +RJ +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3506,13 +4135,22 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf +======= +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rO CX hi Nu +<<<<<<< HEAD Gf Gf +======= +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3556,6 +4194,7 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf rO CX @@ -3563,6 +4202,15 @@ Gf Lp eg Gf +======= +RJ +rO +CX +RJ +Lp +eg +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3606,6 +4254,7 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf fl @@ -3613,6 +4262,15 @@ Gf Gf Gf Gf +======= +RJ +RJ +fl +RJ +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ @@ -3657,9 +4315,15 @@ yQ yQ yQ yQ +<<<<<<< HEAD Gf Gf Gf +======= +RJ +RJ +RJ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yQ yQ yQ diff --git a/_maps/virtual_domains/pirates.dmm b/_maps/virtual_domains/pirates.dmm index 3f6b66d6d44..9c177370930 100644 --- a/_maps/virtual_domains/pirates.dmm +++ b/_maps/virtual_domains/pirates.dmm @@ -1,8 +1,21 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +<<<<<<< HEAD +======= +"af" = ( +/obj/structure/flora/rock/pile/style_2, +/turf/open/water/beach, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "al" = ( /obj/structure/flora/bush/sunny, /turf/open/misc/grass, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"au" = ( +/turf/open/water/beach, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bb" = ( /obj/effect/turf_decal/weather/sand, /turf/open/floor/wood, @@ -12,6 +25,7 @@ dir = 10 }, /area/virtual_domain/fullbright) +<<<<<<< HEAD "br" = ( /obj/structure/flora/grass/jungle/b, /turf/open/misc/dirt/jungle, @@ -26,6 +40,41 @@ }, /turf/open/misc/dirt/jungle, /area/virtual_domain/protected_space) +======= +"be" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/rock/pile, +/turf/open/water/beach, +/area/virtual_domain/protected_space) +"bI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/gun/energy/laser/musket{ + pixel_y = 7 + }, +/obj/item/gun/energy/laser/musket{ + pixel_y = 2 + }, +/obj/item/gun/energy/laser/musket{ + pixel_y = -3 + }, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +"cr" = ( +/obj/item/stack/cannonball/shellball{ + pixel_x = 13; + pixel_y = 11 + }, +/obj/item/stack/cannonball{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/claymore/cutlass, @@ -41,6 +90,7 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +<<<<<<< HEAD "dc" = ( /turf/open/misc/beach/coast/corner, /area/virtual_domain/fullbright) @@ -73,6 +123,18 @@ }, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) +======= +"db" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/beach, +/area/virtual_domain/protected_space) +"dc" = ( +/turf/open/misc/beach/coast/corner, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dN" = ( /obj/machinery/door/airlock/vault{ color = "#825427"; @@ -80,9 +142,31 @@ }, /turf/open/floor/wood/parquet, /area/virtual_domain) +<<<<<<< HEAD "eS" = ( /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +======= +"eO" = ( +/obj/structure/flora/rock/pile, +/turf/open/water/beach, +/area/virtual_domain/protected_space/fullbright) +"eP" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/misc/beach/coast{ + dir = 6 + }, +/area/virtual_domain/protected_space) +"eS" = ( +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"fd" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fh" = ( /obj/structure/flora/bush/sparsegrass, /obj/structure/flora/bush/lavendergrass, @@ -92,10 +176,26 @@ /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/grass, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"fw" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fR" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/closed/indestructible/binary, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"gc" = ( +/obj/structure/flora/rock/pile/jungle/style_2, +/obj/effect/baseturf_helper/virtual_domain, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gf" = ( /obj/effect/turf_decal/weather/sand{ dir = 5 @@ -121,11 +221,19 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"gD" = ( +/obj/item/flashlight/flare/torch, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gK" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/ferny, /turf/open/misc/grass, /area/virtual_domain/fullbright) +<<<<<<< HEAD "gN" = ( /obj/structure/fermenting_barrel/gunpowder{ pixel_x = -4; @@ -150,6 +258,21 @@ }, /obj/effect/turf_decal/weather/dirt, /turf/open/water/beach, +======= +"hb" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"hn" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/water/beach, +/area/virtual_domain/protected_space) +"hq" = ( +/obj/structure/closet/crate/grave, +/obj/structure/flora/grass/jungle/b, +/turf/open/misc/dirt/jungle, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain/protected_space) "jp" = ( /obj/effect/landmark/bitrunning/cache_spawn, @@ -167,6 +290,7 @@ /obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/grass, /area/virtual_domain/fullbright) +<<<<<<< HEAD "ki" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -186,6 +310,8 @@ }, /turf/open/misc/dirt/jungle, /area/virtual_domain/protected_space) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lF" = ( /obj/structure/table/wood, /obj/item/melee/energy/sword/pirate{ @@ -216,29 +342,71 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "lM" = ( /obj/structure/flora/rock/pile/style_3, /turf/open/misc/dirt/jungle, /area/virtual_domain/protected_space) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mp" = ( /turf/open/misc/beach/coast{ dir = 4 }, /area/virtual_domain/fullbright) +<<<<<<< HEAD "na" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/flora/rock/pile, /turf/open/water/beach, /area/virtual_domain/protected_space) +======= +"nb" = ( +/obj/structure/fermenting_barrel{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/mob_spawn/ghost_role/human/virtual_domain/pirate, +/turf/open/floor/wood{ + icon_state = "wood_large" + }, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nr" = ( /mob/living/basic/trooper/pirate/melee, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"nN" = ( +/obj/structure/flora/rock, +/turf/open/water/beach, +/area/virtual_domain/protected_space/fullbright) +"nQ" = ( +/turf/closed/wall/mineral/wood/nonmetal, +/area/virtual_domain/protected_space/fullbright) +"oB" = ( +/obj/structure/flora/grass/jungle, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "oL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/bed/maint, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"oM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pi" = ( /obj/structure/flora/rock/style_3, /turf/open/water/beach, @@ -247,18 +415,35 @@ /obj/structure/flora/bush/flowers_br/style_random, /turf/open/misc/grass, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"ps" = ( +/obj/machinery/smartfridge/drying/rack, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"py" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain/protected_space/fullbright) +"qk" = ( +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qE" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/ordnance, /turf/open/floor/carpet/blue, /area/virtual_domain) +<<<<<<< HEAD "qR" = ( /turf/open/misc/dirt/jungle, /area/virtual_domain/protected_space) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qS" = ( /obj/effect/decal/cleanable/ants, /turf/open/misc/grass, /area/virtual_domain/fullbright) +<<<<<<< HEAD "qT" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -269,6 +454,8 @@ /obj/machinery/smartfridge/drying/rack, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ri" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -277,6 +464,32 @@ /mob/living/basic/trooper/pirate/ranged/space, /turf/open/floor/carpet/blue, /area/virtual_domain) +<<<<<<< HEAD +======= +"rm" = ( +/obj/structure/closet/crate/goldcrate, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +"rn" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/flashlight/flare/torch{ + pixel_y = 10; + pixel_x = 7 + }, +/obj/item/reagent_containers/cup/bucket/wooden{ + pixel_y = -16; + pixel_x = 12 + }, +/obj/machinery/recharger{ + pixel_y = 6; + pixel_x = -5 + }, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ru" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -288,16 +501,25 @@ /obj/item/toy/plush/beeplushie, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"sb" = ( +/turf/open/water/beach, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sj" = ( /obj/effect/mine/explosive/light, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +<<<<<<< HEAD "sH" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "td" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/bitrunning/cache_spawn, @@ -308,6 +530,12 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood/parquet, /area/virtual_domain) +<<<<<<< HEAD +======= +"tA" = ( +/turf/closed/mineral/random/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tH" = ( /obj/structure/closet/cabinet, /obj/item/clothing/head/costume/pirate/armored, @@ -324,10 +552,13 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +<<<<<<< HEAD "tR" = ( /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/misc/dirt/jungle, /area/virtual_domain/protected_space) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ub" = ( /turf/template_noop, /area/virtual_domain/safehouse) @@ -360,6 +591,7 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +<<<<<<< HEAD "uS" = ( /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) @@ -387,6 +619,14 @@ }, /turf/open/misc/dirt/jungle, /area/virtual_domain/protected_space) +======= +"vR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wj" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -395,6 +635,7 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "wn" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -411,6 +652,19 @@ }, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) +======= +"wu" = ( +/obj/structure/flora/grass/jungle/b{ + pixel_x = -15; + pixel_y = 9 + }, +/obj/structure/flora/rock/pile/jungle/large/style_2{ + pixel_x = -3; + pixel_y = -1 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wH" = ( /obj/structure/fluff/beach_umbrella{ pixel_x = -7; @@ -434,14 +688,41 @@ "xp" = ( /turf/open/water/beach, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"yF" = ( +/obj/effect/light_emitter{ + set_cap = 3; + set_luminosity = 5 + }, +/turf/open/misc/beach/coast, +/area/virtual_domain/fullbright) +"zc" = ( +/obj/item/gun/energy/laser/hellgun{ + pixel_y = 10 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zj" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/garbage, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "zA" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/mapping_helpers/broken_floor, +======= +"zk" = ( +/obj/effect/turf_decal/siding/wood, +/obj/item/melee/sabre{ + pixel_y = 12; + pixel_x = -10 + }, +/obj/item/gun/energy/laser/retro, +/obj/effect/decal/cleanable/dirt/dust, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) "zR" = ( @@ -501,6 +782,7 @@ /obj/structure/bonfire/prelit, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +<<<<<<< HEAD "Ca" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/closed/indestructible/binary, @@ -521,6 +803,17 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +======= +"BX" = ( +/obj/structure/flora/bush/sunny/style_3{ + pixel_y = 22 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +"Ci" = ( +/turf/closed/wall/mineral/wood/nonmetal, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Cu" = ( /obj/item/kirbyplants/organic/plant21{ pixel_x = -8 @@ -530,6 +823,7 @@ }, /turf/open/floor/wood/parquet, /area/virtual_domain) +<<<<<<< HEAD "DM" = ( /turf/closed/mineral/random/jungle, /area/virtual_domain/fullbright) @@ -564,6 +858,20 @@ /obj/structure/closet/cabinet, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) +======= +"CL" = ( +/obj/structure/flora/rock/pile/jungle/large, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +"Dd" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +"DM" = ( +/turf/closed/mineral/random/jungle, +/area/virtual_domain/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Eb" = ( /obj/structure/flora/tree/palm, /turf/open/misc/beach/sand, @@ -595,6 +903,13 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"Gl" = ( +/obj/structure/flora/rock/pile/style_3, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Gy" = ( /obj/structure/flora/rock/style_2, /turf/open/water/beach, @@ -610,12 +925,25 @@ }, /turf/open/floor/carpet/blue, /area/virtual_domain) +<<<<<<< HEAD "Ic" = ( +======= +"Iv" = ( +/obj/structure/flora/rock/style_3, +/turf/open/water/beach, +/area/virtual_domain/protected_space/fullbright) +"ID" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +"IW" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/weather/dirt{ dir = 5 }, /turf/open/water/beach, /area/virtual_domain/protected_space) +<<<<<<< HEAD "In" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -628,6 +956,8 @@ }, /turf/open/misc/beach/coast, /area/virtual_domain/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jf" = ( /obj/structure/flora/bush/sparsegrass, /turf/open/misc/grass, @@ -646,10 +976,13 @@ /obj/structure/bed/double, /turf/open/floor/carpet/blue, /area/virtual_domain) +<<<<<<< HEAD "JF" = ( /obj/structure/flora/rock, /turf/open/water/beach, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "JK" = ( /obj/structure/flora/bush/stalky{ pixel_y = 13; @@ -662,9 +995,15 @@ dir = 1 }, /area/virtual_domain/fullbright) +<<<<<<< HEAD "Ka" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, +======= +"KP" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain/protected_space/fullbright) "KS" = ( /obj/effect/turf_decal/siding/wood{ @@ -674,6 +1013,7 @@ /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/floor/carpet/blue, /area/virtual_domain) +<<<<<<< HEAD "KW" = ( /obj/structure/flora/grass/jungle, /turf/open/misc/dirt/jungle, @@ -683,24 +1023,55 @@ /turf/open/misc/grass, /area/virtual_domain/fullbright) "LO" = ( +======= +"KU" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/light_emitter{ set_cap = 3; set_luminosity = 5 }, /turf/open/water/beach, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"KV" = ( +/obj/structure/flora/rock/pile/jungle/style_3{ + pixel_x = -15; + pixel_y = -4 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +"Li" = ( +/turf/closed/mineral/random/jungle, +/area/virtual_domain/protected_space/fullbright) +"LC" = ( +/mob/living/basic/trooper/pirate/melee, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"LK" = ( +/obj/structure/fermenting_barrel/gunpowder{ + pixel_x = -4; + pixel_y = 17 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LP" = ( /obj/effect/turf_decal/weather/sand{ dir = 5 }, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "LX" = ( /turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain/protected_space/fullbright) "Mc" = ( /turf/closed/indestructible/binary, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Mf" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood{ @@ -711,6 +1082,7 @@ /obj/structure/barricade/sandbags, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +<<<<<<< HEAD "MJ" = ( /obj/structure/closet/crate/goldcrate, /turf/open/misc/dirt/jungle, @@ -720,15 +1092,20 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/water/beach, /area/virtual_domain/protected_space) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "MP" = ( /obj/effect/turf_decal/weather/sand{ dir = 4 }, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "Nx" = ( /turf/open/water/beach, /area/virtual_domain/protected_space) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "NE" = ( /obj/effect/mob_spawn/corpse/human/damaged, /turf/open/water/beach, @@ -745,6 +1122,20 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"NU" = ( +/obj/structure/flora/grass/jungle/b/style_random{ + pixel_x = -13; + pixel_y = 18 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +"Oi" = ( +/obj/effect/mob_spawn/corpse/human/pirate, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ov" = ( /turf/open/misc/beach/coast{ dir = 6 @@ -757,6 +1148,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/blue, /area/virtual_domain) +<<<<<<< HEAD "OB" = ( /obj/structure/flora/grass/jungle/b{ pixel_x = -15; @@ -768,12 +1160,15 @@ }, /turf/open/misc/dirt/jungle, /area/virtual_domain/protected_space) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OD" = ( /obj/effect/turf_decal/weather/sand{ dir = 6 }, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "OE" = ( /obj/effect/mob_spawn/corpse/human/pirate, /turf/open/misc/dirt/jungle, @@ -782,6 +1177,13 @@ /obj/structure/flora/rock/pile/jungle/style_2, /obj/effect/baseturf_helper/virtual_domain, /turf/open/misc/dirt/jungle, +======= +"OW" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/water/beach, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain/protected_space) "Qc" = ( /obj/effect/mapping_helpers/broken_floor, @@ -789,10 +1191,22 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) +<<<<<<< HEAD "QJ" = ( /obj/structure/flora/rock/pile, /turf/open/water/beach, /area/virtual_domain/protected_space/fullbright) +======= +"QF" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/beach, +/area/virtual_domain/protected_space) +"QG" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/beach, +/area/virtual_domain/protected_space) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "QN" = ( /obj/structure/barricade/sandbags, /obj/effect/turf_decal/weather/sand{ @@ -810,6 +1224,7 @@ /obj/effect/mob_spawn/corpse/human/pirate/melee, /turf/open/water/beach, /area/virtual_domain/fullbright) +<<<<<<< HEAD "RC" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -818,6 +1233,39 @@ dir = 6 }, /area/virtual_domain/protected_space) +======= +"QX" = ( +/obj/item/clothing/suit/armor/militia{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/clothing/suit/armor/militia{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/militia{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/clothing/head/costume/fancy{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/clothing/head/costume/fancy{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/head/hats/coordinator{ + pixel_x = 8; + pixel_y = -5 + }, +/obj/structure/closet/cabinet, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "RJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -849,9 +1297,12 @@ }, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "SE" = ( /turf/open/water/beach, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "SK" = ( /turf/open/misc/beach/coast, /area/virtual_domain/fullbright) @@ -865,6 +1316,7 @@ }, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "SZ" = ( /obj/effect/turf_decal/siding/wood, /obj/item/melee/sabre{ @@ -875,6 +1327,8 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ta" = ( /obj/structure/flora/bush/flowers_pp, /turf/open/misc/grass, @@ -891,6 +1345,7 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood/parquet, /area/virtual_domain) +<<<<<<< HEAD "TT" = ( /obj/structure/flora/rock/style_3, /turf/open/water/beach, @@ -898,10 +1353,31 @@ "Ul" = ( /turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain) +======= +"Ul" = ( +/turf/closed/wall/mineral/wood/nonmetal, +/area/virtual_domain) +"Uw" = ( +/obj/structure/cannon{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Vx" = ( /obj/structure/flora/rock/style_4, /turf/open/water/beach, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"VE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "VG" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -909,6 +1385,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/blue, /area/virtual_domain) +<<<<<<< HEAD "VI" = ( /obj/item/flashlight/flare/torch, /turf/open/misc/beach/sand, @@ -916,6 +1393,8 @@ "VP" = ( /turf/closed/mineral/random/jungle, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Wu" = ( /obj/structure/fermenting_barrel/gunpowder{ pixel_x = -4; @@ -937,6 +1416,13 @@ }, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"Wx" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Xn" = ( /obj/modular_map_root/safehouse{ key = "wood" @@ -947,6 +1433,7 @@ /obj/structure/barricade/wooden/crude, /turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain/fullbright) +<<<<<<< HEAD "XR" = ( /obj/structure/cannon{ dir = 1 @@ -956,6 +1443,8 @@ }, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "XW" = ( /obj/effect/mob_spawn/corpse/human/pirate, /turf/open/misc/beach/coast{ @@ -971,6 +1460,12 @@ /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +<<<<<<< HEAD +======= +"Yy" = ( +/turf/open/floor/wood, +/area/virtual_domain/protected_space/fullbright) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "YJ" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -1016,10 +1511,13 @@ }, /turf/open/floor/wood, /area/virtual_domain/fullbright) +<<<<<<< HEAD "ZR" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 (1,1,1) = {" xg @@ -1268,10 +1766,17 @@ DM hb hb fR +<<<<<<< HEAD Mc Mc Mc Mc +======= +py +py +py +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg xg xg @@ -1312,10 +1817,17 @@ DM hb hb DM +<<<<<<< HEAD VP VP VP Mc +======= +Li +Li +Li +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg xg xg @@ -1356,10 +1868,17 @@ sj hb hb DM +<<<<<<< HEAD VP VP VP Mc +======= +Li +Li +Li +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg xg xg @@ -1400,6 +1919,7 @@ mp Ov xp xp +<<<<<<< HEAD SE SE SE @@ -1407,6 +1927,15 @@ Mc Mc Mc Mc +======= +au +au +au +py +py +py +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg xg xg @@ -1444,6 +1973,7 @@ xp xp xp NE +<<<<<<< HEAD SE SE SE @@ -1453,6 +1983,17 @@ LX Mc Mc Mc +======= +au +au +au +au +au +nQ +py +py +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg xg xg @@ -1488,6 +2029,7 @@ xp xp xp Gy +<<<<<<< HEAD SE SE SE @@ -1504,6 +2046,24 @@ Mc Mc Mc Ca +======= +au +au +au +au +au +nQ +bI +VE +py +py +py +py +py +py +py +KP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (12,1,1) = {" xg @@ -1532,6 +2092,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1541,13 +2102,28 @@ LX dL Ka In +======= +au +au +au +au +nN +nQ +rn +VE +fw +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ub ub ub ub ub Xn +<<<<<<< HEAD Mc +======= +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (13,1,1) = {" hb @@ -1576,6 +2152,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1585,13 +2162,28 @@ LX DT uS SZ +======= +au +au +au +au +Iv +nQ +QX +Yy +zk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ub ub ub ub ub ub +<<<<<<< HEAD Mc +======= +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (14,1,1) = {" hb @@ -1601,7 +2193,11 @@ Ul Ul Ul Hn +<<<<<<< HEAD qV +======= +ps +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eS eS eS @@ -1620,6 +2216,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1629,13 +2226,28 @@ LX LX uS zA +======= +au +au +au +au +au +nQ +nQ +Yy +Dd +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ub ub ub ub ub ub +<<<<<<< HEAD Mc +======= +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (15,1,1) = {" hb @@ -1664,6 +2276,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1673,13 +2286,28 @@ SE SE SE ZR +======= +au +au +au +au +au +au +au +au +Wx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ub ub ub ub ub ub +<<<<<<< HEAD Mc +======= +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (16,1,1) = {" hb @@ -1708,6 +2336,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1717,13 +2346,28 @@ SE SE SE SE +======= +au +au +au +au +au +au +au +au +au +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ub ub ub ub ub ub +<<<<<<< HEAD Mc +======= +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (17,1,1) = {" hb @@ -1752,6 +2396,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1761,13 +2406,28 @@ SE SE SE SE +======= +au +au +au +au +au +au +au +au +au +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ub ub ub ub ub ub +<<<<<<< HEAD Mc +======= +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (18,1,1) = {" hb @@ -1778,7 +2438,11 @@ BU td Ul Ci +<<<<<<< HEAD Cq +======= +nb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Mf gx tQ @@ -1796,6 +2460,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1805,13 +2470,28 @@ SE SE ZR SE +======= +au +au +au +au +au +au +au +Wx +au +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ub ub ub ub ub zR +<<<<<<< HEAD Mc +======= +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (19,1,1) = {" hb @@ -1840,6 +2520,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1856,6 +2537,24 @@ SE SE Mc Mc +======= +au +au +au +au +au +au +nQ +fw +au +au +au +au +au +au +py +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (20,1,1) = {" hb @@ -1884,6 +2583,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1899,6 +2599,23 @@ SE SE SE Mc +======= +au +au +au +au +au +au +Uw +cr +vR +au +au +au +au +au +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (21,1,1) = {" @@ -1928,6 +2645,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1943,6 +2661,23 @@ SE SE SE Mc +======= +au +au +au +au +au +af +nQ +LK +fw +au +au +au +au +au +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (22,1,1) = {" @@ -1972,6 +2707,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -1987,6 +2723,23 @@ SE SE SE Mc +======= +au +au +au +au +au +au +oM +VE +eO +au +au +au +au +au +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (23,1,1) = {" @@ -2016,6 +2769,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -2031,6 +2785,23 @@ SE VP VP Mc +======= +au +au +au +au +au +au +au +au +au +au +au +au +Li +Li +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (24,1,1) = {" @@ -2060,6 +2831,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -2075,6 +2847,23 @@ SE VP VP Mc +======= +au +au +au +au +au +au +au +au +au +au +au +au +Li +Li +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (25,1,1) = {" @@ -2094,9 +2883,15 @@ eS eS nr eS +<<<<<<< HEAD VI Io LO +======= +gD +yF +KU +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xp xp xp @@ -2104,6 +2899,7 @@ xp xp xp xp +<<<<<<< HEAD SE SE SE @@ -2119,6 +2915,23 @@ VP VP VP Mc +======= +au +au +au +au +au +au +au +au +au +au +au +Li +Li +Li +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (26,1,1) = {" @@ -2137,17 +2950,27 @@ DM DM DM DM +<<<<<<< HEAD ha ha RC Nx ha ha +======= +tA +tA +eP +sb +tA +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hb hb xp xp xp +<<<<<<< HEAD SE SE SE @@ -2163,6 +2986,23 @@ VP VP VP Mc +======= +au +au +au +au +au +au +au +au +au +py +Li +Li +Li +Li +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (27,1,1) = {" @@ -2182,16 +3022,24 @@ DM DM DM DM +<<<<<<< HEAD ha br qT ha +======= +tA +fd +OW +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM DM hb hb xp xp +<<<<<<< HEAD SE SE SE @@ -2207,6 +3055,23 @@ VP VP Mc Mc +======= +au +au +au +au +au +au +au +au +py +py +Li +Li +Li +py +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg "} (28,1,1) = {" @@ -2226,16 +3091,25 @@ DM DM DM DM +<<<<<<< HEAD ha wf qT ha ha +======= +tA +KV +OW +tA +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM DM hb hb hb +<<<<<<< HEAD Mc SE SE @@ -2250,6 +3124,22 @@ Mc Mc Mc Mc +======= +py +au +au +au +au +au +au +py +py +py +py +py +py +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg xg "} @@ -2270,6 +3160,7 @@ DM DM DM DM +<<<<<<< HEAD ha qR Ic @@ -2288,6 +3179,26 @@ Mc Mc Mc Mc +======= +tA +qk +IW +sb +tA +tA +tA +DM +DM +DM +py +py +py +py +py +py +py +py +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xg xg xg @@ -2314,6 +3225,7 @@ DM DM DM DM +<<<<<<< HEAD ha lM qR @@ -2324,6 +3236,18 @@ ha ha ha ha +======= +tA +Gl +qk +IW +hn +sb +tA +tA +tA +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM hb hb @@ -2358,6 +3282,7 @@ hb DM DM DM +<<<<<<< HEAD ha ha qR @@ -2369,6 +3294,19 @@ na OS ha ha +======= +tA +tA +qk +qk +Oi +OW +sb +be +gc +tA +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM hb hb @@ -2403,6 +3341,7 @@ hb DM DM DM +<<<<<<< HEAD ha ha qR @@ -2414,6 +3353,19 @@ qR MJ ha ha +======= +tA +tA +qk +CL +IW +sb +QG +qk +rm +tA +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM hb xg @@ -2448,6 +3400,7 @@ hb DM DM DM +<<<<<<< HEAD ha KW qR @@ -2458,6 +3411,18 @@ kl qR MJ ha +======= +tA +oB +qk +wu +IW +QF +BX +qk +rm +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM hb xg @@ -2492,6 +3457,7 @@ hb hb DM DM +<<<<<<< HEAD ha ha qR @@ -2502,6 +3468,18 @@ vo cT tR ha +======= +tA +tA +qk +qk +NU +db +hq +zc +ID +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM hb xg @@ -2537,6 +3515,7 @@ hb hb hb DM +<<<<<<< HEAD ha ha ha @@ -2546,6 +3525,17 @@ ha ha ha ha +======= +tA +tA +tA +tA +tA +tA +tA +tA +tA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DM hb xg diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm index 003a4aee7fb..e7fa57c11d5 100644 --- a/_maps/virtual_domains/syndicate_assault.dmm +++ b/_maps/virtual_domains/syndicate_assault.dmm @@ -1,4 +1,20 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +<<<<<<< HEAD +======= +"aq" = ( +/obj/item/storage/backpack/duffelbag/syndie/surgery, +/obj/structure/table/reinforced, +/turf/open/floor/plastic, +/area/virtual_domain) +"aw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aN" = ( /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -14,6 +30,7 @@ /obj/item/stack/rods/fifty, /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) +<<<<<<< HEAD "aV" = ( /obj/machinery/door/airlock/grunge{ name = "Syndicate Ship Airlock" @@ -28,17 +45,42 @@ "bl" = ( /obj/machinery/computer/operating, /turf/open/floor/plastic, +======= +"aO" = ( +/obj/machinery/recharge_station, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"bh" = ( +/turf/open/floor/carpet/royalblack, +/area/virtual_domain) +"bD" = ( +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain) "bG" = ( /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) +<<<<<<< HEAD "bN" = ( +======= +"cc" = ( +/obj/structure/closet/crate/secure/gear{ + req_access = list("syndicate") + }, +/obj/effect/spawner/random/clothing/costume, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "cj" = ( /obj/structure/transit_tube/crossing, /turf/closed/wall/r_wall/syndicate, /area/virtual_domain/protected_space) +<<<<<<< HEAD "cr" = ( /obj/machinery/power/shuttle_engine/propulsion{ dir = 8 @@ -50,12 +92,70 @@ /obj/item/paper/fluff/ruins/forgottenship/missionobj, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) +======= +"ct" = ( +/obj/structure/closet/syndicate{ + anchored = 1; + desc = "A basic closet for all your villainous needs."; + locked = 1; + name = "Closet"; + req_access = list("syndicate"); + secure = 1 + }, +/obj/item/gun/ballistic/automatic/pistol, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"cw" = ( +/obj/structure/closet/syndicate{ + anchored = 1; + desc = "A basic closet for all your villainous needs."; + locked = 1; + name = "Closet"; + req_access = list("syndicate"); + secure = 1 + }, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/under/syndicate/skirt, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"cy" = ( +/obj/machinery/door/airlock/grunge{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"cB" = ( +/obj/machinery/camera/xray{ + c_tag = "Medbay"; + dir = 6; + network = list("fsci"); + screen_loc = "" + }, +/turf/open/floor/plastic, +/area/virtual_domain) +"cR" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/royalblack, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cZ" = ( /obj/structure/table/reinforced, /obj/item/gun/ballistic/automatic/l6_saw/unrestricted, /obj/item/ammo_box/magazine/m7mm, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) +<<<<<<< HEAD "dp" = ( /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) @@ -75,6 +175,43 @@ /area/ruin/space/virtual_domain) "eu" = ( /turf/open/space/basic, +======= +"da" = ( +/obj/machinery/stasis, +/turf/open/floor/plastic, +/area/virtual_domain) +"dd" = ( +/obj/structure/sign/warning/vacuum/external, +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain) +"di" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/obj/item/paper/fluff/ruins/forgottenship/powerissues, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"dp" = ( +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain/protected_space) +"dw" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"dz" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"dU" = ( +/obj/structure/cable, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/ruin{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/plastitanium, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain) "eB" = ( /obj/machinery/camera/xray{ @@ -92,6 +229,7 @@ /obj/item/card/id/advanced/black/syndicate_command/crew_id, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) +<<<<<<< HEAD "eH" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/carpet/royalblack, @@ -100,10 +238,13 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fd" = ( /obj/structure/transit_tube/crossing, /turf/open/space/basic, /area/virtual_domain/protected_space) +<<<<<<< HEAD "fs" = ( /obj/machinery/light/directional/north, /turf/open/floor/mineral/plastitanium/red, @@ -113,11 +254,329 @@ /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "fW" = ( +======= +"fG" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/virtual_domain) +"fJ" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"fV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"gD" = ( +/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"hg" = ( +/obj/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/door/poddoor{ + id = "fslockdown"; + name = "Ship Blast Door"; + state_open = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"hy" = ( +/obj/structure/table/reinforced, +/obj/item/paper/fluff/ruins/forgottenship/missionobj, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"hA" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain) +"hD" = ( +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"ip" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/plastic, +/area/virtual_domain) +"iB" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"iL" = ( +/obj/structure/sign/departments/cargo, +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain/protected_space) +"iU" = ( +/obj/structure/closet/crate/secure/gear{ + req_access = list("syndicate") + }, +/obj/item/melee/energy/sword/saber/red, +/obj/machinery/light/small/directional/north, +/turf/open/floor/pod/dark, +/area/virtual_domain/protected_space) +"iW" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "fslockdown"; + name = "Window shutters"; + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"iX" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"ja" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Spare Equipment"; + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"jl" = ( +/obj/structure/bodycontainer/crematorium{ + id = "fscremate" + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"jA" = ( +/obj/structure/cable, +/mob/living/basic/trooper/syndicate/melee/space/stormtrooper, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"jJ" = ( +/obj/machinery/door/airlock/grunge{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/virtual_domain) +"kh" = ( +/obj/machinery/door/airlock/grunge{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"kI" = ( +/obj/machinery/computer/atmos_alert{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"kJ" = ( +/obj/modular_map_root/safehouse{ + key = "shuttle_space" + }, +/turf/template_noop, +/area/virtual_domain/safehouse) +"li" = ( +/obj/structure/transit_tube/station/dispenser/reverse{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain/protected_space) +"ln" = ( +/obj/machinery/turretid{ + control_area = "/area/ruin/space/has_grav/syndicate_forgotten_ship"; + enabled = 0; + icon_state = "control_kill"; + lethal = 1; + name = "Ship turret control panel"; + pixel_y = 32; + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"lo" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/ruin{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"lN" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"mo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"mA" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain/protected_space) +"mD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 + }, +/obj/item/wrench, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"mL" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain/protected_space) +"nk" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"nn" = ( +/turf/closed/mineral/random, +/area/virtual_domain/protected_space) +"nB" = ( +/turf/closed/mineral/random, +/area/ruin/space/virtual_domain) +"nG" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"nU" = ( +/obj/structure/sign/poster/contraband/syndicate_pistol, +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain) +"og" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/trophy/silver_cup, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"oM" = ( +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"pl" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"pz" = ( +/obj/machinery/computer/security{ + desc = "Used to access interrogation room camera."; + dir = 8; + name = "Ship cameras console"; + network = list("fsc","fsci"); + screen_loc = "" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"pH" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/nukeplushie, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"pM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"pS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"pU" = ( +/obj/machinery/shower/directional/north, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/virtual_domain) +"qf" = ( +/obj/structure/table/optable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plastic, +/area/virtual_domain) +"qx" = ( +/turf/open/space/basic, +/area/space/virtual_domain) +"qU" = ( +/obj/structure/sign/poster/contraband/c20r, +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain/protected_space) +"qY" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"rm" = ( +/obj/machinery/button/crematorium{ + id = "fscremate"; + pixel_x = -32 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"ru" = ( +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain) +"rH" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"rM" = ( +/obj/structure/closet/syndicate{ + anchored = 1; + desc = "A basic closet for all your villainous needs."; + locked = 1; + name = "Closet"; + req_access = list("syndicate"); + secure = 1 + }, +/obj/effect/spawner/random/contraband/armory, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"rP" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"sg" = ( +/obj/machinery/ore_silo, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain/protected_space) +"sq" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Control Room"; + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"sz" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4 }, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) +<<<<<<< HEAD "gW" = ( /obj/structure/sign/poster/contraband/syndicate_recruitment, /turf/closed/wall/r_wall/syndicate, @@ -135,6 +594,9 @@ /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "hn" = ( +======= +"sH" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/syndicate{ anchored = 1; desc = "A basic closet for all your villainous needs."; @@ -147,6 +609,7 @@ /obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) +<<<<<<< HEAD "hr" = ( /turf/open/floor/plastic, /area/virtual_domain) @@ -442,6 +905,8 @@ /obj/item/paper/fluff/ruins/forgottenship/powerissues, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sK" = ( /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -454,6 +919,7 @@ }, /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) +<<<<<<< HEAD "sM" = ( /turf/template_noop, /area/virtual_domain/safehouse) @@ -480,12 +946,81 @@ }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) +======= +"sL" = ( +/obj/structure/chair/comfy, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"sM" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) +"tv" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "fscaproom"; + name = "Room shutters control"; + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"tI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"uP" = ( +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"vp" = ( +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"vD" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"vK" = ( +/obj/machinery/door/airlock/grunge{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"vU" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"wb" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/obj/machinery/portable_atmospherics/scrubber{ + anchored = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"we" = ( +/turf/closed/mineral/random/high_chance, +/area/ruin/space/virtual_domain) +"wK" = ( +/obj/machinery/door/airlock/grunge{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/dark, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wL" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/regular, /obj/machinery/light/small/directional/north, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) +<<<<<<< HEAD "wR" = ( /obj/machinery/turretid{ control_area = "/area/ruin/space/has_grav/syndicate_forgotten_ship"; @@ -565,6 +1100,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) "An" = ( +======= +"xJ" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/syndicate{ anchored = 1; desc = "A basic closet for all your villainous needs."; @@ -573,6 +1111,7 @@ req_access = list("syndicate"); secure = 1 }, +<<<<<<< HEAD /obj/item/clothing/under/syndicate/combat, /obj/item/clothing/gloves/combat, /obj/item/clothing/shoes/combat, @@ -609,16 +1148,90 @@ name = "Syndicate Ship Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +======= +/obj/item/ammo_box/c9mm, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"xS" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/virtual_domain) +"yl" = ( +/obj/machinery/door/airlock/grunge{ + name = "Captain's Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/poddoor{ + id = "fscaproom"; + name = "Captain's Blast Door"; + state_open = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"yJ" = ( +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"yR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"yT" = ( +/obj/item/ai_module/core/full/cybersun, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"yV" = ( +/obj/structure/table/reinforced, +/obj/item/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"yZ" = ( +/turf/closed/mineral, +/area/ruin/space/virtual_domain) +"zi" = ( +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"zt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"zN" = ( +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain/protected_space) +"Aa" = ( +/obj/structure/chair/comfy/shuttle, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "Bm" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/closed/indestructible/syndicate, /area/virtual_domain/protected_space) +<<<<<<< HEAD +======= +"BK" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BN" = ( /obj/structure/transit_tube/crossing, /turf/template_noop, /area/virtual_domain/safehouse) +<<<<<<< HEAD "BQ" = ( /obj/machinery/shower/directional/north, /obj/machinery/light/directional/south, @@ -657,6 +1270,62 @@ /obj/machinery/portable_atmospherics/scrubber{ anchored = 1 }, +======= +"Cf" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Ci" = ( +/obj/structure/closet/syndicate{ + anchored = 1; + desc = "A basic closet for all your villainous needs."; + locked = 1; + name = "Closet"; + req_access = list("syndicate"); + secure = 1 + }, +/obj/item/crowbar/red, +/obj/item/ammo_box/magazine/m9mm_aps, +/obj/item/ammo_box/magazine/m9mm_aps, +/obj/item/gun/ballistic/automatic/pistol/aps, +/turf/open/floor/carpet/royalblack, +/area/virtual_domain) +"Cn" = ( +/obj/machinery/camera/xray/directional/east{ + c_tag = "Conference room"; + network = list("fsc"); + screen_loc = "" + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"CK" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/mob/living/basic/trooper/syndicate/ranged/smg/pilot, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"CR" = ( +/obj/structure/closet/syndicate{ + anchored = 1; + desc = "A basic closet for all your villainous needs."; + locked = 1; + name = "Closet"; + req_access = list("syndicate"); + secure = 1 + }, +/obj/item/coin/antagtoken, +/obj/item/dnainjector/thermal, +/obj/item/storage/box/firingpins/syndicate, +/obj/item/storage/box/firingpins/syndicate, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"De" = ( +/obj/machinery/door/airlock/grunge{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) "Dj" = ( @@ -667,6 +1336,7 @@ /obj/item/gun/ballistic/automatic/c20r/unrestricted, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) +<<<<<<< HEAD "Dn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -693,6 +1363,17 @@ /turf/open/floor/carpet/royalblack, /area/virtual_domain) "Eb" = ( +======= +"DA" = ( +/obj/structure/closet/crate/secure/gear{ + req_access = list("syndicate") + }, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"EB" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -700,6 +1381,7 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) +<<<<<<< HEAD "EJ" = ( /obj/machinery/door/airlock/grunge{ name = "Syndicate Ship Airlock" @@ -735,10 +1417,79 @@ /area/virtual_domain) "Gh" = ( /obj/structure/cable, +======= +"Fp" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"FN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Gn" = ( +/obj/structure/chair/comfy{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Gs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"GB" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/external/ruin{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"GZ" = ( +/obj/machinery/door/airlock/external/ruin{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Hq" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"HU" = ( +/obj/machinery/door/airlock/grunge{ + name = "Bridge" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"Ia" = ( +/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie, +/turf/open/floor/carpet/royalblack, +/area/virtual_domain) +"Id" = ( +/obj/machinery/power/shuttle_engine/huge{ + dir = 8 + }, +/turf/open/space/basic, +/area/virtual_domain) +"If" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +<<<<<<< HEAD dir = 5 }, /turf/open/floor/mineral/plastitanium/red, @@ -752,17 +1503,45 @@ /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "Is" = ( +======= + dir = 9 + }, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"Ig" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/porta_turret/syndicate/energy{ dir = 4; name = "Syndicate Ship Turret"; on = 0; shot_delay = 10 }, +<<<<<<< HEAD /turf/closed/wall/r_wall/syndicate, /area/virtual_domain) "IA" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/mineral/plastitanium/red, +======= +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/virtual_domain) +"Im" = ( +/obj/structure/table/reinforced, +/obj/item/ammo_box/c9mm, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Io" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"IC" = ( +/obj/structure/table/reinforced, +/obj/item/paper, +/obj/item/pen, +/obj/machinery/computer/security/telescreen/forgotten_ship/sci/directional/south, +/turf/open/floor/carpet/royalblack, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain) "IH" = ( /obj/machinery/door/airlock/external/ruin{ @@ -773,7 +1552,82 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/virtual_domain/protected_space) +<<<<<<< HEAD "Ji" = ( +======= +"IV" = ( +/obj/machinery/door/airlock/grunge{ + name = "Syndicate Ship Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/plating, +/area/virtual_domain) +"Jg" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"Jz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"JA" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"JN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"JP" = ( +/obj/structure/sink/directional/south, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Kz" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"Lk" = ( +/obj/structure/transit_tube/crossing, +/turf/closed/mineral/random, +/area/virtual_domain/protected_space) +"Lo" = ( +/obj/structure/filingcabinet, +/obj/machinery/door/window/left/directional/west{ + name = "Syndicate Interior Door"; + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"LB" = ( +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain/protected_space) +"Mc" = ( +/obj/structure/closet/syndicate{ + anchored = 1; + desc = "A basic closet for all your villainous needs."; + locked = 1; + name = "Closet"; + req_access = list("syndicate"); + secure = 1 + }, +/obj/item/crowbar/red, +/obj/item/ammo_box/magazine/m9mm, +/obj/item/ammo_box/magazine/m9mm, +/obj/item/gun/ballistic/automatic/pistol, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Mm" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/syndicate{ anchored = 1; desc = "A basic closet for all your villainous needs."; @@ -791,6 +1645,7 @@ /obj/item/clothing/shoes/combat, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) +<<<<<<< HEAD "JJ" = ( /obj/structure/closet/syndicate{ anchored = 1; @@ -902,6 +1757,15 @@ /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/floor/plastic, /area/virtual_domain) +======= +"MR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Nm" = ( /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -921,6 +1785,7 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) +<<<<<<< HEAD "Ns" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/mineral/plastitanium, @@ -935,6 +1800,8 @@ /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Of" = ( /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -942,6 +1809,13 @@ /obj/item/disk/surgery/forgottenship, /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) +<<<<<<< HEAD +======= +"Ox" = ( +/obj/machinery/atmospherics/components/unary/vent_pump, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OH" = ( /obj/structure/cable, /obj/structure/table/reinforced, @@ -949,6 +1823,7 @@ /obj/item/storage/toolbox/syndicate, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) +<<<<<<< HEAD "Pe" = ( /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -966,6 +1841,14 @@ /turf/open/floor/iron/dark/side{ dir = 1 }, +======= +"OI" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain) "PR" = ( /obj/machinery/door/password/voice/sfc{ @@ -979,6 +1862,7 @@ /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) +<<<<<<< HEAD "PW" = ( /obj/machinery/door/airlock/grunge{ name = "Bridge" @@ -1000,6 +1884,22 @@ "QA" = ( /obj/machinery/vending/medical/syndicate_access/cybersun, /turf/open/floor/plastic, +======= +"Qg" = ( +/obj/machinery/suit_storage_unit/syndicate{ + helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black; + suit_type = /obj/item/clothing/suit/space/syndicate/black + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Qi" = ( +/obj/item/stack/sheet/mineral/uranium{ + amount = 15 + }, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/mineral/plastitanium/red, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain) "QF" = ( /obj/structure/table/reinforced, @@ -1007,6 +1907,7 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) +<<<<<<< HEAD "QY" = ( /obj/machinery/door/window/left/directional/north{ name = "Spare Equipment"; @@ -1039,11 +1940,45 @@ /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) +======= +"QG" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/closed/mineral/random, +/area/ruin/space/virtual_domain) +"QX" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Ra" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2, +/obj/machinery/light/small/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"RQ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "RU" = ( /obj/machinery/suit_storage_unit/syndicate, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) +<<<<<<< HEAD "RY" = ( +======= +"Sc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Sd" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/syndicate{ anchored = 1; desc = "A basic closet for all your villainous needs."; @@ -1052,6 +1987,7 @@ req_access = list("syndicate"); secure = 1 }, +<<<<<<< HEAD /obj/item/coin/antagtoken, /obj/item/dnainjector/thermal, /obj/item/storage/box/firingpins/syndicate, @@ -1100,10 +2036,38 @@ "Ts" = ( /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/floor/mineral/plastitanium/red, +======= +/obj/item/crowbar/red, +/obj/item/ammo_box/magazine/m9mm, +/obj/item/ammo_box/magazine/m9mm, +/obj/machinery/light/small/directional/north, +/obj/item/gun/ballistic/automatic/pistol, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Sq" = ( +/obj/machinery/power/smes, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"Sv" = ( +/obj/structure/closet/crate/secure/gear{ + req_access = list("syndicate") + }, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Sz" = ( +/turf/open/floor/iron/dark, +/area/virtual_domain) +"SX" = ( +/obj/machinery/vending/medical/syndicate_access/cybersun, +/turf/open/floor/plastic, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain) "TB" = ( /turf/closed/indestructible/syndicate, /area/virtual_domain/protected_space) +<<<<<<< HEAD "TU" = ( /obj/machinery/door/airlock/grunge{ name = "Syndicate Ship Airlock" @@ -1135,16 +2099,34 @@ id = "fscremate" }, /turf/open/floor/mineral/plastitanium, +======= +"UQ" = ( +/obj/structure/sign/poster/contraband/syndicate_recruitment, +/turf/closed/wall/r_wall/syndicate, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/virtual_domain) "Vg" = ( /turf/open/space/basic, /area/virtual_domain/protected_space) +<<<<<<< HEAD +======= +"Vk" = ( +/obj/machinery/porta_turret/syndicate/energy{ + dir = 4; + name = "Syndicate Ship Turret"; + on = 0; + shot_delay = 10 + }, +/turf/closed/wall/r_wall/syndicate, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Vq" = ( /obj/structure/transit_tube/station/dispenser/reverse{ dir = 8 }, /turf/template_noop, /area/virtual_domain/safehouse) +<<<<<<< HEAD "Vs" = ( /obj/machinery/vending/cigarette/syndicate, /turf/open/floor/mineral/plastitanium, @@ -1161,10 +2143,13 @@ }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Wd" = ( /obj/structure/sign/poster/contraband/tools, /turf/closed/wall/r_wall/syndicate, /area/virtual_domain/protected_space) +<<<<<<< HEAD "We" = ( /obj/machinery/door/airlock/grunge{ name = "Syndicate Ship Airlock" @@ -1180,6 +2165,31 @@ /obj/machinery/atmospherics/components/unary/vent_pump, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) +======= +"Wy" = ( +/obj/structure/closet/crate/secure/gear{ + req_access = list("syndicate") + }, +/obj/item/stack/ore/plasma{ + amount = 19 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"WR" = ( +/obj/machinery/power/port_gen/pacman/super{ + anchored = 1 + }, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) +"Xp" = ( +/turf/open/space/basic, +/area/virtual_domain) +"XS" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Yb" = ( /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -1188,10 +2198,39 @@ /obj/item/clothing/suit/space/syndicate/black/engie, /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) +<<<<<<< HEAD +======= +"Yi" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/plastic, +/area/virtual_domain) +"Yj" = ( +/obj/structure/closet/crate/secure/gear{ + req_access = list("syndicate") + }, +/obj/item/stack/ore/diamond{ + amount = 3 + }, +/turf/open/floor/mineral/plastitanium, +/area/virtual_domain) +"Yk" = ( +/obj/machinery/door/airlock/grunge{ + name = "Captain's Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/poddoor{ + id = "fscaproom"; + name = "Captain's Blast Door"; + state_open = 1 + }, +/turf/open/floor/carpet/royalblack, +/area/virtual_domain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Yr" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/template_noop, /area/virtual_domain/safehouse) +<<<<<<< HEAD "YA" = ( /obj/machinery/door/airlock/external/ruin{ name = "Syndicate Ship Airlock" @@ -2297,10 +3336,1115 @@ tE tE Lv Lv +======= +"Yu" = ( +/obj/structure/chair/comfy/black, +/turf/open/floor/carpet/royalblack, +/area/virtual_domain) +"YV" = ( +/obj/structure/sink/directional/south, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/dark, +/area/virtual_domain) +"Za" = ( +/obj/machinery/computer/operating, +/turf/open/floor/plastic, +/area/virtual_domain) +"Zb" = ( +/turf/open/floor/plastic, +/area/virtual_domain) +"ZA" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/turf/open/space/basic, +/area/virtual_domain) + +(1,1,1) = {" +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +"} +(2,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(3,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(4,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(5,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(6,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(7,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(8,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(9,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(10,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Xp +Xp +Id +qx +qx +Xp +Xp +Id +qx +qx +Xp +Xp +Id +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(11,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Xp +Xp +Xp +qx +qx +Xp +Xp +Xp +qx +qx +Xp +Xp +Xp +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(12,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ZA +Xp +Xp +Xp +ZA +ZA +Xp +Xp +Xp +ZA +ZA +Xp +Xp +Xp +ZA +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(13,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +ru +ru +ru +ru +ru +ru +ru +ru +ru +ru +ru +ru +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +we +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(14,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +Vk +ru +Sv +vD +uP +Io +Yj +vD +uP +Wy +DA +Io +uP +vD +cc +ru +Vk +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(15,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +Io +uP +uP +QX +lN +uP +uP +uP +uP +uP +lN +uP +QX +uP +Io +hA +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(16,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +ru +ru +ru +ru +ru +ru +IV +ru +ru +ru +IV +ru +ru +ru +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(17,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +vp +ru +Ia +Ci +ru +Sq +di +WR +ru +yV +Gn +uP +Mc +uP +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +nB +we +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(18,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +og +Jg +ru +bh +cR +ru +Qi +sz +Kz +ru +Mc +uP +uP +uP +rP +ru +qx +qx +qx +qx +qx +qx +qx +nB +nB +nB +nB +nB +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(19,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +Kz +Kz +yl +bh +bh +Yk +pS +RQ +Jz +vK +uP +uP +Io +sL +hy +ru +qx +qx +qx +qx +qx +qx +nB +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TB TB TB TB +<<<<<<< HEAD Lv Lv tE @@ -2354,12 +4498,68 @@ tE tE Lv Lv +======= +nB +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(20,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +CR +Kz +ru +bh +bh +Yk +pM +zt +pM +vK +uP +uP +QX +sL +Im +ru +qx +qx +qx +qx +qx +nB +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TB TB Yb Yb TB Bm +<<<<<<< HEAD Lv tE tE @@ -2412,12 +4612,67 @@ tE Lv Gv Lv +======= +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(21,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +yT +Kz +ru +Yu +IC +ru +mD +JN +MR +ru +Sd +uP +uP +uP +gD +ru +qx +qx +qx +qx +nB +QG +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TB aN bG bG sK TB +<<<<<<< HEAD Lv tE tE @@ -2470,12 +4725,67 @@ tE Lv vY Lv +======= +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(22,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +Ig +ru +Lo +ru +tv +hD +nU +wb +EB +pl +ru +hD +Gn +uP +Mc +ru +Ig +qx +qx +qx +qx +nB +we +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TB iU bG bG Nr TB +<<<<<<< HEAD Lv vY tE @@ -2528,12 +4838,67 @@ tE tE Lv Lv +======= +nB +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(23,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +ru +ru +ru +ru +ru +cy +ru +ru +ru +ru +ru +ru +ru +qx +qx +qx +qx +qx +qx +nB +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TB Nm bG bG Of TB +<<<<<<< HEAD Lv Lv tE @@ -2543,12 +4908,24 @@ tE tE tE tE +======= +nB +nB +qx +qx +qx +qx +qx +qx +qx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sM sM sM sM sM kJ +<<<<<<< HEAD tE mR "} @@ -2586,12 +4963,52 @@ tE Lv Lv Lv +======= +qx +Hq +"} +(24,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +Za +Yi +Zb +SX +ru +uP +yR +uP +ru +YV +Sz +jJ +fG +ru +qx +qx +qx +qx +qx +nB +nB +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TB TB PR TB TB TB +<<<<<<< HEAD Lv Lv Lv @@ -2601,12 +5018,24 @@ tE tE tE tE +======= +nB +nB +nB +qx +qx +qx +qx +qx +qx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sM sM sM sM sM sM +<<<<<<< HEAD tE mR "} @@ -2644,6 +5073,45 @@ tE Lv Lv vY +======= +qx +Hq +"} +(25,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +qf +Zb +ip +da +ru +Ra +Sc +uP +ru +JP +qY +ru +ru +ru +qx +qx +qx +qx +qx +nB +nB +we +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zN zN dp @@ -2665,6 +5133,7 @@ sM sM sM sM +<<<<<<< HEAD tE mR "} @@ -2702,6 +5171,45 @@ tE tE Lv Lv +======= +qx +Hq +"} +(26,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +aq +cB +Zb +Zb +De +Ox +Gs +uP +wK +Sz +Sz +jJ +pU +ru +qx +qx +qx +qx +qx +qx +nB +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qU mL dp @@ -2723,6 +5231,7 @@ sM sM sM sM +<<<<<<< HEAD tE mR "} @@ -2760,6 +5269,45 @@ tE tE Lv Lv +======= +qx +Hq +"} +(27,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +Vk +ru +ru +ru +ru +ru +ru +ru +kh +ru +ru +ru +ru +ru +ru +ru +ru +qx +qx +qx +qx +qx +nB +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zN eB dp @@ -2781,6 +5329,7 @@ sM sM sM sM +<<<<<<< HEAD tE mR "} @@ -2818,12 +5367,52 @@ tE tE tE Lv +======= +qx +Hq +"} +(28,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +jl +rm +ru +nk +oM +oM +oM +yR +oM +oM +oM +uP +ru +uP +Qg +ru +qx +qx +qx +qx +qx +qx +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zN wL LB dp mA zN +<<<<<<< HEAD dQ Lv Lv @@ -2833,12 +5422,24 @@ tE tE tE tE +======= +yZ +nB +nB +nB +qx +qx +qx +qx +qx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sM sM sM sM sM sM +<<<<<<< HEAD tE mR "} @@ -2876,12 +5477,52 @@ tE tE tE tE +======= +qx +Hq +"} +(29,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +uP +dw +ru +rH +uP +JA +JA +iX +JA +JA +oM +uP +ru +fJ +Qg +ru +qx +qx +qx +qx +qx +qx +qx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Wd OH LB dp RU zN +<<<<<<< HEAD vY Lv Lv @@ -2891,12 +5532,24 @@ tE tE tE tE +======= +we +nB +nB +qx +qx +qx +qx +qx +qx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sM sM sM sM sM Yr +<<<<<<< HEAD tE mR "} @@ -2934,12 +5587,52 @@ EP EP EP EP +======= +qx +Hq +"} +(30,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +lo +uP +uP +GZ +uP +Aa +hD +yJ +bD +hD +hD +OI +oM +GB +jA +oM +dU +BK +BK +BK +BK +BK +BK +BK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 IH LB LB dp RU zN +<<<<<<< HEAD Lv Lv tE @@ -2992,12 +5685,67 @@ tE tE tE tE +======= +nB +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(31,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +uP +uP +dd +uP +uP +uP +Ox +aw +uP +uP +uP +uP +dd +uP +Qg +ru +qx +qx +qx +qx +qx +qx +qx +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iL cZ dp dp RU zN +<<<<<<< HEAD Lv Lv tE @@ -3050,12 +5798,67 @@ tE tE tE Lv +======= +nB +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(32,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +aO +uP +ru +XS +uP +uP +uP +FN +uP +uP +uP +Cf +ru +uP +Fp +ru +qx +qx +qx +qx +qx +qx +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zN zN Dj QF zN zN +<<<<<<< HEAD Lv Lv tE @@ -3109,10 +5912,66 @@ tE Lv Lv Lv +======= +nB +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(33,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +Ig +ru +hD +ru +zi +uP +uP +uP +FN +Cn +uP +uP +uP +ru +hD +ru +xS +qx +qx +qx +qx +qx +nB +nB +nB +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zN zN zN zN +<<<<<<< HEAD Lv Lv vY @@ -4233,4 +7092,1126 @@ mR mR mR mR +======= +nB +nB +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(34,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +ru +ru +ru +ru +ru +HU +ru +ru +ru +ru +ru +ru +ru +qx +qx +qx +qx +qx +qx +qx +nB +nB +nB +nB +we +nB +nB +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(35,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +UQ +rM +xJ +Kz +Kz +tI +Kz +Kz +ct +sH +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +nB +nB +nB +nB +nB +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(36,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +ru +ru +Kz +Kz +Kz +Kz +tI +Kz +Kz +Kz +Kz +ru +ru +ru +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(37,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +ln +Kz +ru +iB +Kz +Kz +fV +If +Kz +Kz +Kz +nG +ru +cw +cw +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(38,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +ru +Kz +dz +sq +Kz +CK +Kz +vU +mo +vU +Kz +CK +Kz +ja +Kz +Jg +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(39,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +Ig +ru +Kz +ru +Kz +Kz +Kz +pz +Kz +kI +Kz +Kz +Kz +ru +Mm +ru +Ig +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(40,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +ru +Kz +Kz +Kz +Kz +Kz +Kz +Kz +Kz +dz +ru +ru +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(41,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +ru +ru +vp +vp +pH +vp +iW +vp +vp +vp +vp +ru +ru +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(42,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Ig +hg +hg +hg +hg +hg +hg +hg +hg +hg +Ig +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(43,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(44,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(45,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(46,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +we +we +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(47,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +we +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(48,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(49,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(50,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(51,1,1) = {" +Hq +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +qx +Hq +"} +(52,1,1) = {" +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +Hq +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} diff --git a/_maps/virtual_domains/xeno_nest.dmm b/_maps/virtual_domains/xeno_nest.dmm index 96c98d6e903..7f7c5f7d6ce 100644 --- a/_maps/virtual_domains/xeno_nest.dmm +++ b/_maps/virtual_domains/xeno_nest.dmm @@ -1,4 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +<<<<<<< HEAD "aa" = ( /turf/template_noop, /area/template_noop) @@ -8,10 +9,22 @@ /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/virtual_domain) "ac" = ( +======= +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/resin/wall, +/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, +/area/virtual_domain) +"c" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /obj/structure/alien/resin/wall, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "ad" = ( /obj/structure/alien/resin/wall, @@ -22,10 +35,19 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "af" = ( +======= +/area/virtual_domain) +"e" = ( +/obj/structure/alien/weeds, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"f" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /obj/structure/alien/egg/burst, /obj/effect/decal/cleanable/blood, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "ag" = ( /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, @@ -36,6 +58,15 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "ai" = ( +======= +/area/virtual_domain) +"h" = ( +/obj/structure/alien/weeds, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"i" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs, @@ -43,6 +74,7 @@ /obj/item/clothing/under/syndicate, /obj/item/clothing/glasses/night, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "aj" = ( /obj/machinery/suit_storage_unit/spaceruin, @@ -59,10 +91,29 @@ /turf/closed/indestructible/binary, /area/ruin/space/has_grav/powered/virtual_domain) "am" = ( +======= +/area/virtual_domain) +"j" = ( +/obj/machinery/suit_storage_unit/spaceruin, +/turf/template_noop, +/area/virtual_domain/safehouse) +"k" = ( +/obj/structure/alien/weeds/node, +/obj/structure/alien/resin/wall, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"l" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/resin/wall, +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"m" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/structure/alien/resin/wall, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "an" = ( /turf/template_noop, @@ -73,11 +124,24 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "ap" = ( +======= +/area/virtual_domain) +"n" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) +"o" = ( +/obj/structure/alien/weeds, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"p" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /mob/living/basic/alien/drone{ can_plant_weeds = 0 }, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "aq" = ( /obj/structure/alien/resin/wall, @@ -88,11 +152,24 @@ /turf/template_noop, /area/virtual_domain/safehouse) "as" = ( +======= +/area/virtual_domain) +"q" = ( +/obj/structure/alien/resin/wall, +/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, +/area/virtual_domain) +"r" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) +"s" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds/node, /mob/living/basic/alien/drone{ can_plant_weeds = 0 }, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "at" = ( /obj/structure/alien/weeds, @@ -105,19 +182,38 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "av" = ( +======= +/area/virtual_domain) +"t" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/weeds, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"u" = ( +/obj/structure/alien/weeds/node, +/obj/effect/decal/cleanable/blood, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"v" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/modular_map_root/safehouse{ key = "shuttle" }, /turf/template_noop, /area/virtual_domain/safehouse) +<<<<<<< HEAD "aw" = ( /turf/closed/indestructible/binary, /area/virtual_domain/fullbright) "ax" = ( +======= +"x" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "ay" = ( /obj/structure/alien/weeds/node, @@ -150,6 +246,40 @@ /turf/closed/indestructible/binary, /area/ruin/space/has_grav/powered/virtual_domain) "aF" = ( +======= +/area/virtual_domain) +"y" = ( +/obj/structure/alien/weeds/node, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"z" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/resin/wall, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"A" = ( +/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, +/area/virtual_domain) +"B" = ( +/obj/structure/alien/weeds, +/obj/effect/decal/cleanable/blood, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"C" = ( +/obj/structure/alien/weeds, +/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, +/area/virtual_domain) +"D" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/weeds, +/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, +/area/virtual_domain) +"E" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"F" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/table/greyscale, /obj/item/gun/energy/xray, /obj/item/gun/energy/laser{ @@ -162,12 +292,21 @@ }, /turf/template_noop, /area/virtual_domain/safehouse) +<<<<<<< HEAD "aG" = ( /obj/structure/alien/resin/wall, /obj/structure/alien/weeds, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "aH" = ( +======= +"G" = ( +/obj/structure/alien/resin/wall, +/obj/structure/alien/weeds, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"H" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/table/greyscale, /obj/machinery/recharger{ pixel_x = 8; @@ -179,12 +318,21 @@ }, /turf/template_noop, /area/virtual_domain/safehouse) +<<<<<<< HEAD "aI" = ( /obj/structure/alien/weeds, /obj/structure/bed/nest, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "aJ" = ( +======= +"I" = ( +/obj/structure/alien/weeds, +/obj/structure/bed/nest, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"J" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /mob/living/basic/alien/queen/large{ desc = "A gigantic alien who is in charge of the hive and all of its loyal servants."; @@ -193,6 +341,7 @@ can_plant_weeds = 0 }, /turf/open/misc/asteroid/basalt/lava_land_surface, +<<<<<<< HEAD /area/ruin/space/has_grav/powered/virtual_domain) "aK" = ( /obj/structure/alien/weeds, @@ -200,10 +349,20 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "aL" = ( +======= +/area/virtual_domain) +"K" = ( +/obj/structure/alien/weeds, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"L" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/medkit/regular, /obj/item/storage/medkit/regular, /turf/template_noop, /area/virtual_domain/safehouse) +<<<<<<< HEAD "aM" = ( /obj/structure/alien/weeds, /obj/structure/alien/resin/wall{ @@ -440,12 +599,16 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/virtual_domain) "SC" = ( +======= +"M" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /obj/structure/alien/resin/wall{ move_resist = 3000 }, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/virtual_domain) +<<<<<<< HEAD "SD" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood, @@ -467,6 +630,9 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/virtual_domain) "XX" = ( +======= +"N" = ( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs, @@ -476,6 +642,7 @@ /obj/item/clothing/head/helmet, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/virtual_domain) +<<<<<<< HEAD (1,1,1) = {" aa @@ -2280,4 +2447,1861 @@ aa aa aa aa +======= +"O" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"P" = ( +/obj/structure/alien/weeds/node, +/mob/living/basic/alien, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"Q" = ( +/obj/structure/alien/resin/wall, +/obj/structure/alien/resin/wall, +/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, +/area/virtual_domain) +"S" = ( +/obj/structure/alien/weeds, +/mob/living/basic/alien, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"T" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/egg/burst, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"U" = ( +/obj/structure/alien/weeds, +/obj/structure/bed/nest, +/obj/effect/decal/cleanable/blood/gibs, +/obj/item/gun/ballistic/automatic/pistol, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"V" = ( +/obj/structure/alien/weeds/node, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"W" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/egg/burst, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) +"Z" = ( +/obj/structure/alien/weeds, +/obj/structure/bed/nest, +/obj/effect/decal/cleanable/blood/gibs, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/suit/space/syndicate/orange, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/helmet/space/syndicate/orange, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain) + +(1,1,1) = {" +a +a +a +a +E +E +E +E +E +E +E +E +E +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +E +z +z +z +z +z +z +z +z +E +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +E +E +z +e +W +W +z +e +e +z +M +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +E +z +z +e +e +e +e +p +e +W +z +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +E +z +e +e +k +z +z +z +k +z +z +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +E +z +e +h +m +K +J +o +i +z +z +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +E +z +W +e +e +e +e +B +o +K +z +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +E +z +I +o +z +e +V +e +e +W +z +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +E +z +U +u +e +z +e +e +W +z +z +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +E +z +e +o +z +e +e +e +k +W +z +E +a +a +a +a +a +a +a +a +a +a +E +E +E +E +E +E +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +E +z +z +e +e +e +e +e +h +e +z +E +a +a +a +a +a +a +a +a +a +E +E +z +z +z +z +E +E +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +E +E +z +W +e +e +e +e +e +e +z +E +a +a +a +a +a +a +a +a +E +E +z +z +Z +I +z +z +E +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +E +z +z +e +e +V +e +e +z +z +E +a +a +a +a +a +a +a +a +E +z +z +W +o +B +K +z +E +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +E +E +z +z +e +e +e +z +z +E +E +a +a +a +a +a +a +E +E +E +z +I +e +y +e +W +z +E +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +E +E +z +z +z +z +z +E +E +a +a +a +a +a +a +E +E +z +z +z +e +e +e +I +z +z +E +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +E +z +V +V +z +E +E +E +E +E +E +E +E +E +E +z +z +e +S +e +W +z +z +z +E +E +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +E +z +p +e +z +z +E +z +z +z +z +z +z +z +z +z +e +e +z +z +z +z +E +E +E +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +E +z +e +e +e +z +z +z +e +e +e +e +e +e +z +z +e +z +z +E +E +E +E +E +E +E +E +E +E +E +E +E +O +"} +(19,1,1) = {" +E +E +E +E +E +E +E +z +z +e +e +e +z +e +e +e +e +e +e +V +e +e +e +z +E +E +a +a +a +E +Q +q +q +q +q +q +q +q +E +"} +(20,1,1) = {" +E +z +z +z +z +E +E +E +z +z +e +V +e +e +e +z +z +z +z +e +e +t +z +z +E +a +a +a +a +E +q +A +A +A +A +A +A +A +E +"} +(21,1,1) = {" +E +z +W +I +z +z +z +z +z +z +e +e +e +e +z +z +E +E +z +z +e +e +z +E +E +a +a +a +a +E +q +A +A +A +A +A +A +A +E +"} +(22,1,1) = {" +E +G +t +h +e +z +z +e +e +e +e +e +e +z +z +E +E +E +z +e +e +e +z +E +a +a +a +a +a +E +q +A +C +A +A +A +A +A +E +"} +(23,1,1) = {" +E +G +K +W +V +e +e +e +z +z +e +z +z +z +E +E +E +E +z +e +e +z +z +E +a +a +a +a +a +E +q +C +C +C +A +A +A +A +E +"} +(24,1,1) = {" +E +z +z +I +I +z +z +z +z +z +e +z +E +E +E +E +E +E +z +e +e +z +E +E +E +a +a +a +a +E +q +C +C +A +A +C +A +A +E +"} +(25,1,1) = {" +E +E +z +z +z +z +E +E +E +z +e +z +z +E +E +E +E +E +z +e +s +z +z +z +E +E +E +E +E +E +b +C +C +C +A +C +C +A +E +"} +(26,1,1) = {" +a +E +E +E +E +E +E +E +E +z +e +e +z +E +E +E +E +E +z +e +e +e +e +z +z +z +E +E +E +z +z +n +n +n +n +n +v +A +E +"} +(27,1,1) = {" +a +a +a +a +a +E +E +z +z +z +e +e +z +z +E +E +E +E +z +z +e +e +e +e +e +z +z +z +z +k +e +n +j +j +j +n +n +A +E +"} +(28,1,1) = {" +a +a +a +a +a +E +z +z +T +e +h +V +W +z +E +E +E +z +z +e +e +z +z +e +e +e +z +V +e +e +e +n +n +n +n +n +n +A +E +"} +(29,1,1) = {" +a +a +a +a +a +E +z +N +f +e +e +W +I +z +E +E +E +z +e +e +z +z +z +z +e +V +z +V +t +e +e +n +n +F +H +n +n +A +E +"} +(30,1,1) = {" +a +a +a +a +a +E +z +x +o +e +I +I +z +z +E +E +E +z +e +z +z +E +E +z +z +z +z +z +k +e +e +n +n +n +n +n +n +A +E +"} +(31,1,1) = {" +a +a +a +a +a +E +z +z +z +e +z +z +z +E +E +E +E +z +e +z +z +E +E +E +E +E +E +E +z +e +e +n +L +n +n +n +n +A +E +"} +(32,1,1) = {" +a +a +a +a +a +E +E +E +z +e +z +E +E +E +E +E +E +z +e +e +z +E +a +a +a +a +E +E +z +e +e +n +n +n +n +n +r +A +E +"} +(33,1,1) = {" +a +a +a +a +a +a +a +E +z +e +z +E +E +a +a +a +E +l +z +V +z +E +a +a +a +a +E +z +z +z +q +C +A +A +C +A +A +A +E +"} +(34,1,1) = {" +a +a +a +a +a +a +a +E +z +V +z +E +E +a +a +a +E +E +z +e +z +E +a +a +a +a +E +z +E +q +q +C +C +C +A +A +A +A +E +"} +(35,1,1) = {" +a +a +a +a +a +a +a +E +z +e +z +E +E +a +a +a +E +E +z +e +z +E +a +a +a +a +E +E +E +q +q +A +A +A +A +A +A +A +E +"} +(36,1,1) = {" +a +a +a +a +a +a +a +E +z +e +z +E +E +E +E +E +E +z +z +e +z +E +a +a +a +a +a +a +E +q +q +A +C +D +A +A +A +A +E +"} +(37,1,1) = {" +a +a +a +a +a +a +E +E +z +e +z +E +E +E +E +E +z +z +e +e +z +E +a +a +a +a +a +a +E +q +q +A +A +A +A +A +A +A +E +"} +(38,1,1) = {" +a +a +a +a +a +E +E +z +z +e +z +z +z +z +z +z +z +e +e +z +z +E +a +a +a +a +a +a +E +q +q +A +A +A +A +A +A +A +E +"} +(39,1,1) = {" +a +a +a +a +a +E +z +z +e +e +W +z +z +e +e +P +e +e +z +z +E +E +a +a +a +a +a +a +E +Q +q +q +q +q +q +q +q +q +E +"} +(40,1,1) = {" +a +a +a +a +E +E +z +I +e +h +e +e +e +e +z +z +z +z +z +E +E +a +a +a +a +a +a +a +E +E +E +E +E +E +E +E +E +E +E +"} +(41,1,1) = {" +a +a +a +a +E +z +z +W +e +V +e +W +z +z +z +E +E +E +E +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(42,1,1) = {" +a +a +a +a +E +z +W +K +e +I +I +z +z +E +E +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(43,1,1) = {" +a +a +a +a +E +c +z +z +z +z +z +z +E +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(44,1,1) = {" +a +a +a +a +E +E +E +E +E +E +E +E +E +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 9f0d708273d..143aa5f4472 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -16,8 +16,13 @@ #define MINOR_NEGATIVE 4 +<<<<<<< HEAD //Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you dont want people to fuck with like wizard mutate /// A mutation that can be activated and deactived by completing a sequence +======= +//Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you don't want people to fuck with like wizard mutate +/// A mutation that can be activated and deactivated by completing a sequence +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MUT_NORMAL 1 /// A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before its name in the mutation section of the dna console #define MUT_EXTRA 2 @@ -44,8 +49,11 @@ #define DNA_UNI_IDENTITY_BLOCKS 12 +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/_DEFINES/DNA.dm) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// This number needs to equal the total number of DNA blocks #define DNA_MUTANT_COLOR_BLOCK 1 #define DNA_ETHEREAL_COLOR_BLOCK 2 @@ -62,7 +70,10 @@ #define DNA_MOTH_MARKINGS_BLOCK 13 #define DNA_MUSHROOM_CAPS_BLOCK 14 #define DNA_POD_HAIR_BLOCK 15 +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Hey! Listen up if you're here because you're adding a species feature! // @@ -71,6 +82,7 @@ // (Which means having a DNA block for a feature tied to a mob without DNA is entirely pointless.) /// Total amount of DNA blocks, must be equal to the highest DNA block number +<<<<<<< HEAD #define DNA_FEATURE_BLOCKS SSaccessories.dna_total_feature_blocks // SKYRAT EDIT CHANGE - ORIGINAL: #define DNA_FEATURE_BLOCKS 15 // SKYRAT EDIT ADDITION START #define DNA_MANDATORY_COLOR_BLOCKS 5 @@ -81,6 +93,9 @@ #define DNA_SKIN_COLOR_BLOCK 5 #define DNA_POD_HAIR_BLOCK 15 // SKYRAT EDIT ADDITION END +======= +#define DNA_FEATURE_BLOCKS 15 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DNA_SEQUENCE_LENGTH 4 #define DNA_MUTATION_BLOCKS 8 diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index 4836625d919..df2b06a7a77 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -19,7 +19,11 @@ ///creates a running average of "things elapsed" per time period when you need to count via a smaller time period. ///eg you want an average number of things happening per second but you measure the event every tick (50 milliseconds). +<<<<<<< HEAD ///make sure both time intervals are in the same units. doesnt work if current_duration > total_duration or if total_duration == 0 +======= +///make sure both time intervals are in the same units. doesn't work if current_duration > total_duration or if total_duration == 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MC_AVG_OVER_TIME(average, current, total_duration, current_duration) ((((total_duration) - (current_duration)) / (total_duration)) * (average) + (current)) #define MC_AVG_MINUTES(average, current, current_duration) (MC_AVG_OVER_TIME(average, current, 1 MINUTES, current_duration)) @@ -32,7 +36,11 @@ #define STOP_PROCESSING(Processor, Datum) Datum.datum_flags &= ~DF_ISPROCESSING;Processor.processing -= Datum;Processor.currentrun -= Datum /// Returns true if the MC is initialized and running. +<<<<<<< HEAD /// Optional argument init_stage controls what stage the mc must have initializted to count as initialized. Defaults to INITSTAGE_MAX if not specified. +======= +/// Optional argument init_stage controls what stage the mc must have initialized to count as initialized. Defaults to INITSTAGE_MAX if not specified. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MC_RUNNING(INIT_STAGE...) (Master && Master.processing > 0 && Master.current_runlevel && Master.init_stage_completed == (max(min(INITSTAGE_MAX, ##INIT_STAGE), 1))) #define MC_LOOP_RTN_NEWSTAGES 1 diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index bf1f4a354bd..7182068bf51 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -11,6 +11,11 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define DF_USE_TAG (1<<0) #define DF_VAR_EDITED (1<<1) #define DF_ISPROCESSING (1<<2) +<<<<<<< HEAD +======= +/// Placed on datums that have a static, constant reference. Primarily only used for turfs. +#define DF_STATIC_OBJECT (1<<3) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //FLAGS BITMASK // scroll down before changing the numbers on these @@ -23,7 +28,11 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define NO_SCREENTIPS_1 (1<<2) /// Prevent clicking things below it on the same turf eg. doors/ fulltile windows #define PREVENT_CLICK_UNDER_1 (1<<3) +<<<<<<< HEAD ///specifies that this atom is a hologram that isnt real +======= +///specifies that this atom is a hologram that isn't real +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define HOLOGRAM_1 (1<<4) ///Whether /atom/Initialize() has already run for the object #define INITIALIZED_1 (1<<5) @@ -50,7 +59,11 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// Whether or not this atom is storing contents for a disassociated storage object #define HAS_DISASSOCIATED_STORAGE_1 (1<<16) /// If this atom has experienced a decal element "init finished" sourced appearance update +<<<<<<< HEAD /// We use this to ensure stacked decals don't double up appearance updates for no rasin +======= +/// We use this to ensure stacked decals don't double up appearance updates for no reason +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Flag as an optimization, don't make this a trait without profiling /// Yes I know this is a stupid flag, no you can't take him from me #define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<17) @@ -79,9 +92,15 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define RICOCHET_HARD (1<<1) //TURF FLAGS +<<<<<<< HEAD /// If a turf cant be jaunted through. #define NOJAUNT (1<<0) /// If a turf is an usused reservation turf awaiting assignment +======= +/// If a turf can't be jaunted through. +#define NOJAUNT (1<<0) +/// If a turf is an unused reservation turf awaiting assignment +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define UNUSED_RESERVATION_TURF (1<<1) /// If a turf is a reserved turf #define RESERVATION_TURF (1<<2) @@ -279,8 +298,13 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define RELIGION_TOOL_SACRIFICE (1<<1) #define RELIGION_TOOL_SECTSELECT (1<<2) +<<<<<<< HEAD // ---- Skillchip incompatability flags ---- // // These flags control which skill chips are compatible with eachother. +======= +// ---- Skillchip incompatibility flags ---- // +// These flags control which skill chips are compatible with each other. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // By default, skillchips are incompatible with themselves and multiple of the same istype() cannot be implanted together. Set this flag to disable that check. #define SKILLCHIP_ALLOWS_MULTIPLE (1<<0) // This skillchip is incompatible with other skillchips from the incompatible_category list. diff --git a/code/__DEFINES/_helpers.dm b/code/__DEFINES/_helpers.dm index f1b1b21df33..d9f75fe8e9d 100644 --- a/code/__DEFINES/_helpers.dm +++ b/code/__DEFINES/_helpers.dm @@ -32,3 +32,7 @@ // Custom types that we define don't get a unique id, but this is useful for identifying // types that don't normally have a way to run istype() on them. #define TYPEID(thing) copytext(REF(thing), 4, 6) + +/// A null statement to guard against EmptyBlock lint without necessitating the use of pass() +/// Used to avoid proc-call overhead. But use sparingly. Probably pointless in most places. +#define EMPTY_BLOCK_GUARD ; diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 6200a86da62..48cf38db373 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -337,8 +337,12 @@ ACCESS_VIROLOGY, \ ACCESS_WEAPONS, \ ACCESS_XENOBIOLOGY, \ +<<<<<<< HEAD ACCESS_BARBER, \ ) // SKYRAT EDIT ADDITION +======= +) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Command staff/secure accesses, think bridge/armoury, ai_upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND) #define COMMAND_ACCESS list( \ @@ -365,7 +369,11 @@ ACCESS_HOP, \ ACCESS_QM, \ ACCESS_RD, \ +<<<<<<< HEAD ) // SKYRAT EDIT - Added ACCESS_CE and ACCESS_CMO to PRIVATE_COMMAND_ACCESS +======= +) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Captains private rooms. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CAPTAIN) #define CAPTAIN_ACCESS list( \ diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index e566f62dc53..76b159be262 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -76,8 +76,8 @@ #define ADMIN_LUAVIEW_CHUNK(state, log_index) "(VIEW CODE)" /// Displays "(SHOW)" in the chat, when clicked it tries to show atom(paper). First you need to set the request_state variable to TRUE for the paper. #define ADMIN_SHOW_PAPER(atom) "(SHOW)" -/// Displays "(PRINT)" in the chat, when clicked it will try to print the atom(paper) on the CentCom fax machine. -#define ADMIN_PRINT_FAX(atom, fax_name) "(PRINT)" +/// Displays "(PRINT)" in the chat, when clicked it will try to print the atom(paper) on the CentCom/Syndicate fax machine. +#define ADMIN_PRINT_FAX(atom, sender, destination) "(PRINT)" /// Displays "(PLAY)" in the chat, when clicked it tries to play internet sounds from the request. #define ADMIN_PLAY_INTERNET(text, credit) "(PLAY)" /// Displays "(SEE Z-LEVEL LAYOUT)" in the chat, when clicked it shows the z-level layouts for the current world state. diff --git a/code/__DEFINES/ai/ai.dm b/code/__DEFINES/ai/ai.dm index 94780b7d5f3..b77e7cf0145 100644 --- a/code/__DEFINES/ai/ai.dm +++ b/code/__DEFINES/ai/ai.dm @@ -2,7 +2,10 @@ #define GET_TARGETING_STRATEGY(targeting_type) SSai_behaviors.targeting_strategies[targeting_type] #define HAS_AI_CONTROLLER_TYPE(thing, type) istype(thing?.ai_controller, type) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //AI controller flags //If you add a new status, be sure to add it to the ai_controllers subsystem's ai_controllers_by_status list. ///The AI is currently active. @@ -69,7 +72,11 @@ ///macro for whether it's appropriate to resist right now, used by resist subtree #define SHOULD_RESIST(source) (source.on_fire || source.buckled || HAS_TRAIT(source, TRAIT_RESTRAINED) || (source.pulledby && source.pulledby.grab_state > GRAB_PASSIVE)) ///macro for whether the pawn can act, used generally to prevent some horrifying ai disasters +<<<<<<< HEAD #define IS_DEAD_OR_INCAP(source) (source.incapacitated() || source.stat) +======= +#define IS_DEAD_OR_INCAP(source) (source.incapacitated || source.stat) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(all_radial_directions, list( "NORTH" = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow", dir = NORTH), diff --git a/code/__DEFINES/ai/monsters.dm b/code/__DEFINES/ai/monsters.dm index fb6952eb084..b95e10a34b6 100644 --- a/code/__DEFINES/ai/monsters.dm +++ b/code/__DEFINES/ai/monsters.dm @@ -288,3 +288,22 @@ //netguardians /// rocket launcher #define BB_NETGUARDIAN_ROCKET_ABILITY "netguardian_rocket" +<<<<<<< HEAD +======= + +//deer +///our water target +#define BB_DEER_WATER_TARGET "deer_water_target" +///our grass target +#define BB_DEER_GRASS_TARGET "deer_grass_target" +///our tree target +#define BB_DEER_TREE_TARGET "deer_tree_target" +///our temporary playmate +#define BB_DEER_PLAYFRIEND "deer_playfriend" +///our home target +#define BB_DEER_TREEHOME "deer_home" +///our resting duration +#define BB_DEER_RESTING "deer_resting" +///time till our next rest duration +#define BB_DEER_NEXT_REST_TIMER "deer_next_rest_timer" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index dee779f0b58..67685364e0d 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -76,6 +76,7 @@ #define CONTRACT_UPLINK_PAGE_CONTRACTS "CONTRACTS" #define CONTRACT_UPLINK_PAGE_HUB "HUB" +<<<<<<< HEAD // Heretic path defines. #define PATH_START "Start Path" @@ -245,6 +246,196 @@ GLOBAL_LIST_INIT(ai_employers, list( /// Checks if the given mob is a wizard #define IS_WIZARD(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/wizard)) +======= + +// Heretic path defines. +#define PATH_START "Start Path" +#define PATH_SIDE "Side Path" +#define PATH_ASH "Ash Path" +#define PATH_RUST "Rust Path" +#define PATH_FLESH "Flesh Path" +#define PATH_VOID "Void Path" +#define PATH_BLADE "Blade Path" +#define PATH_COSMIC "Cosmic Path" +#define PATH_LOCK "Lock Path" +#define PATH_MOON "Moon Path" + +/// Defines are used in /proc/has_living_heart() to report if the heretic has no heart period, no living heart, or has a living heart. +#define HERETIC_NO_HEART_ORGAN -1 +#define HERETIC_NO_LIVING_HEART 0 +#define HERETIC_HAS_LIVING_HEART 1 + +/// A define used in ritual priority for heretics. +#define MAX_KNOWLEDGE_PRIORITY 100 + +/// Checks if the passed mob can become a heretic ghoul. +/// - Must be a human (type, not species) +/// - Skeletons cannot be husked (they are snowflaked instead of having a trait) +/// - Monkeys are monkeys, not quite human (balance reasons) +#define IS_VALID_GHOUL_MOB(mob) (ishuman(mob) && !isskeleton(mob) && !ismonkey(mob)) + +/// Forces the blob to place the core where they currently are, ignoring any checks. +#define BLOB_FORCE_PLACEMENT -1 +/// Normal blob placement, does the regular checks to make sure the blob isn't placing itself in an invalid location +#define BLOB_NORMAL_PLACEMENT 0 +/// Selects a random location for the blob to be placed. +#define BLOB_RANDOM_PLACEMENT 1 + +#define CONSTRUCT_JUGGERNAUT "Juggernaut" +#define CONSTRUCT_WRAITH "Wraith" +#define CONSTRUCT_ARTIFICER "Artificer" +#define CONSTRUCT_HARVESTER "Harvester" + +/// The Classic Wizard wizard loadout. +#define WIZARD_LOADOUT_CLASSIC "loadout_classic" +/// Mjolnir's Power wizard loadout. +#define WIZARD_LOADOUT_MJOLNIR "loadout_hammer" +/// Fantastical Army wizard loadout. +#define WIZARD_LOADOUT_WIZARMY "loadout_army" +/// Soul Tapper wizard loadout. +#define WIZARD_LOADOUT_SOULTAP "loadout_tap" +/// Convenient list of all wizard loadouts for unit testing. +#define ALL_WIZARD_LOADOUTS list( \ + WIZARD_LOADOUT_CLASSIC, \ + WIZARD_LOADOUT_MJOLNIR, \ + WIZARD_LOADOUT_WIZARMY, \ + WIZARD_LOADOUT_SOULTAP, \ +) +/// Number of times you need to perform the grand ritual to complete it +#define GRAND_RITUAL_FINALE_COUNT 7 +/// The crew will start being warned every time a rune is created after this many invocations. +#define GRAND_RITUAL_RUNES_WARNING_POTENCY 3 +/// The crew will get a louder warning when this level of rune is created, and the next one will be special +#define GRAND_RITUAL_IMMINENT_FINALE_POTENCY 6 + +/// Used in logging spells for roundend results +#define LOG_SPELL_TYPE "type" +#define LOG_SPELL_AMOUNT "amount" + +///File to the traitor flavor +#define TRAITOR_FLAVOR_FILE "antagonist_flavor/traitor_flavor.json" + +///File to the malf flavor +#define MALFUNCTION_FLAVOR_FILE "antagonist_flavor/malfunction_flavor.json" + +/// JSON string file for all of our heretic influence flavors +#define HERETIC_INFLUENCE_FILE "antagonist_flavor/heretic_influences.json" + +/// JSON file containing spy objectives +#define SPY_OBJECTIVE_FILE "antagonist_flavor/spy_objective.json" + +///employers that are from the syndicate +GLOBAL_LIST_INIT(syndicate_employers, list( + "Animal Rights Consortium", + "Bee Liberation Front", + "Cybersun Industries", + "Donk Corporation", + "Gorlex Marauders", + "MI13", + "Tiger Cooperative Fanatic", + "Waffle Corporation Terrorist", + "Waffle Corporation", +)) +///employers that are from Nanotrasen +GLOBAL_LIST_INIT(nanotrasen_employers, list( + "Champions of Evil", + "Corporate Climber", + "Gone Postal", + "Internal Affairs Agent", + "Legal Trouble", +)) + +///employers who hire agents to do the hijack +GLOBAL_LIST_INIT(hijack_employers, list( + "Animal Rights Consortium", + "Bee Liberation Front", + "Gone Postal", + "Tiger Cooperative Fanatic", + "Waffle Corporation Terrorist", +)) + +///employers who hire agents to do a task and escape... or martyrdom. whatever +GLOBAL_LIST_INIT(normal_employers, list( + "Champions of Evil", + "Corporate Climber", + "Cybersun Industries", + "Donk Corporation", + "Gorlex Marauders", + "Internal Affairs Agent", + "Legal Trouble", + "MI13", + "Waffle Corporation", +)) + +///employers for malfunctioning ais. they do not have sides, unlike traitors. +GLOBAL_LIST_INIT(ai_employers, list( + "Biohazard", + "Despotic Ruler", + "Fanatical Revelation", + "Logic Core Error", + "Problem Solver", + "S.E.L.F.", + "Something's Wrong", + "Spam Virus", + "SyndOS", + "Unshackled", +)) + +#define UPLINK_THEME_SYNDICATE "syndicate" + +#define UPLINK_THEME_UNDERWORLD_MARKET "neutral" + +/// Checks if the given mob is a traitor +#define IS_TRAITOR(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/traitor)) + +/** + * Cult checks + */ + +/// Checks if the given mob is a blood cultist +#define IS_CULTIST(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/cult) || HAS_TRAIT(mob, TRAIT_ACT_AS_CULTIST)) + +/// Checks if the given mob is a blood cultist and is guaranteed to return the datum if possible - will cause issues with above trait +#define GET_CULTIST(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/cult)) + +/// Checks if the mob is a sentient or non-sentient cultist +#define IS_CULTIST_OR_CULTIST_MOB(mob) ((IS_CULTIST(mob)) || (mob.faction.Find(FACTION_CULT))) + +/** + * Heretic checks + */ + +/// Checks if the given mob is a heretic. +#define IS_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic) || HAS_TRAIT(mob, TRAIT_ACT_AS_HERETIC)) +/// Checks if the given mob is a heretic and is guaranteed to return the datum if possible - will cause issues with above trait +#define GET_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic)) + +/// Check if the given mob is a heretic monster. +#define IS_HERETIC_MONSTER(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic_monster)) +/// Check if the given mob is a lunatic +#define IS_LUNATIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/lunatic)) +/// Checks if the given mob is either a heretic, heretic monster or a lunatic. +#define IS_HERETIC_OR_MONSTER(mob) (IS_HERETIC(mob) || IS_HERETIC_MONSTER(mob) || IS_LUNATIC(mob)) +/// CHecks if the given mob is in the mansus realm +#define IS_IN_MANSUS(mob) (istype(get_area(mob), /area/centcom/heretic_sacrifice)) + +/** + * Etc. + */ + +/// Checks if the given mob is a changeling +#define IS_CHANGELING(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/changeling)) + +/// Checks if the given mob is a nuclear operative +#define IS_NUKE_OP(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/nukeop)) + +//Tells whether or not someone is a space ninja +#define IS_SPACE_NINJA(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/ninja)) + +/// Checks if the given mob is a wizard +#define IS_WIZARD(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/wizard)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Checks if the given mob is a revolutionary. Will return TRUE for rev heads as well. #define IS_REVOLUTIONARY(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/rev)) @@ -379,6 +570,10 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list( /// For changelings, this is how many recent say lines are retained when absorbing a mob #define LING_ABSORB_RECENT_SPEECH 8 +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Various abductor equipment modes. #define VEST_STEALTH 1 diff --git a/code/__DEFINES/atmospherics/atmos_helpers.dm b/code/__DEFINES/atmospherics/atmos_helpers.dm index ca32e485980..8921aa05eab 100644 --- a/code/__DEFINES/atmospherics/atmos_helpers.dm +++ b/code/__DEFINES/atmospherics/atmos_helpers.dm @@ -82,7 +82,11 @@ GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0)) turf.archived_cycle = SSair.times_fired;\ turf.temperature_archived = turf.temperature; +<<<<<<< HEAD /* Fetch the energy transferred when two gas mixtures's temperature equalize. +======= +/* Fetch the energy transferred when two gas mixtures' temperature equalize. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * To equalize two gas mixtures, we simply pool the energy and divide it by the pooled heat capacity. * T' = (W1+W2) / (C1+C2) @@ -107,7 +111,11 @@ GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0)) * Not immediately obvious, but saves us operation time. * * We put a lot of parentheses here because the numbers get really really big. +<<<<<<< HEAD * By prioritizing the division we try to tone the number down so we dont get overflows. +======= + * By prioritizing the division we try to tone the number down so we don't get overflows. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * Arguments: * * temperature_delta: T2 - T1. [/datum/gas_mixture/var/temperature] diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index a105e119847..9722ae1a57c 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -47,6 +47,7 @@ #define DIAG_CAMERA_HUD "22" /// Steady Hacked APC effect, visible only to Malf AIs #define MALF_APC_HUD "23" +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - gun permits and DNR /// ammo of guns @@ -57,6 +58,8 @@ /// If they have the DNR trait #define DNR_HUD "27" // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //by default everything in the hud_list of an atom is an image //a value in hud_list with one of these will change that behavior @@ -75,7 +78,10 @@ #define DATA_HUD_AI_DETECT 9 #define DATA_HUD_FAN 10 #define DATA_HUD_MALF_APC 11 +<<<<<<< HEAD #define DATA_HUD_PERMIT 12 //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// cooldown for being shown the images for any particular data hud #define ADD_HUD_TO_COOLDOWN 20 diff --git a/code/__DEFINES/blob_defines.dm b/code/__DEFINES/blob_defines.dm index 966e02af3fc..f4bd496e1a7 100644 --- a/code/__DEFINES/blob_defines.dm +++ b/code/__DEFINES/blob_defines.dm @@ -13,8 +13,12 @@ // Generic blob defines +<<<<<<< HEAD //#define BLOB_BASE_POINT_RATE 2 // Base amount of points per process() #define BLOB_BASE_POINT_RATE 2.5 // SKYRAT EDIT CHANGE +======= +#define BLOB_BASE_POINT_RATE 2 // Base amount of points per process() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BLOB_EXPAND_COST 4 // Price to expand onto a new tile #define BLOB_ATTACK_REFUND 2 // Points 'refunded' when the expand attempt actually attacks something instead #define BLOB_BRUTE_RESIST 0.5 // Brute damage taken gets multiplied by this value diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm index 12d0d572288..79e8d764a91 100644 --- a/code/__DEFINES/bodyparts.dm +++ b/code/__DEFINES/bodyparts.dm @@ -6,9 +6,15 @@ /// The max damage a limb can take before it stops taking damage. /// Used by the max_damage var. #define LIMB_MAX_HP_PROSTHESIS 20 //Used by surplus prosthesis limbs. +<<<<<<< HEAD #define LIMB_MAX_HP_DEFAULT 60 //Used by most all limbs by default. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_DEFAULT 50 #define LIMB_MAX_HP_ADVANCED 75 //Used by advanced robotic limbs. #define LIMB_MAX_HP_CORE 250 //Only use this for heads and torsos. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_CORE 200 +======= +#define LIMB_MAX_HP_DEFAULT 50 //Used by most all limbs by default. +#define LIMB_MAX_HP_ADVANCED 75 //Used by advanced robotic limbs. +#define LIMB_MAX_HP_CORE 200 //Only use this for heads and torsos. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Xenomorph Limbs #define LIMB_MAX_HP_ALIEN_LARVA 50 //Used by the weird larva chest and head. Did you know they have those? diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm index 7e07c3d0541..eefd8f127f9 100644 --- a/code/__DEFINES/callbacks.dm +++ b/code/__DEFINES/callbacks.dm @@ -18,7 +18,11 @@ /* Written with `0 ||` to avoid the compiler seeing call("string"), and thinking it's a deprecated DLL */ \ call(0 || proc_owner, proc_path)(##proc_arguments); \ }; \ +<<<<<<< HEAD } +======= + } +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// like CALLBACK but specifically for verb callbacks #define VERB_CALLBACK new /datum/callback/verb_callback diff --git a/code/__DEFINES/cameranets.dm b/code/__DEFINES/cameranets.dm index 935e015e0cd..7cfc33dd0bf 100644 --- a/code/__DEFINES/cameranets.dm +++ b/code/__DEFINES/cameranets.dm @@ -30,6 +30,10 @@ #define CAMERA_NETWORK_CARGO "cargo" #define CAMERANET_NETWORK_ABDUCTOR "abductor" #define OPERATIVE_CAMERA_NET "operative" +<<<<<<< HEAD +======= +#define CAMERANET_NETWORK_CURATOR "curator" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Ruins/Away missiosn/Misc camera nets #define CAMERANET_NETWORK_MOON19_XENO "mo19x" diff --git a/code/__DEFINES/cleaning.dm b/code/__DEFINES/cleaning.dm index a53887dd0ed..8f544bc256b 100644 --- a/code/__DEFINES/cleaning.dm +++ b/code/__DEFINES/cleaning.dm @@ -32,6 +32,7 @@ /// Cleans decals such as cobwebs off the floor #define CLEAN_TYPE_HARD_DECAL (1 << 7) +<<<<<<< HEAD // SKYRAT EDIT BEGIN ADD: Turf liquid cleaning type! /// Cleans all the liquids from a turf, or "evaporates" them @@ -43,6 +44,12 @@ // Use these when calling the wash proc for your cleaning apparatus #define CLEAN_WASH (CLEAN_TYPE_BLOOD | CLEAN_TYPE_DISEASE | CLEAN_TYPE_ACID | CLEAN_TYPE_LIGHT_DECAL) #define CLEAN_SCRUB (CLEAN_WASH | CLEAN_TYPE_FINGERPRINTS | CLEAN_TYPE_FIBERS | CLEAN_TYPE_HARD_DECAL | CLEAN_TYPE_LIQUIDS) // Skyrat edit - adds CLEAN_TYPE_LIQUIDS +======= +// Different cleaning methods. +// Use these when calling the wash proc for your cleaning apparatus +#define CLEAN_WASH (CLEAN_TYPE_BLOOD | CLEAN_TYPE_DISEASE | CLEAN_TYPE_ACID | CLEAN_TYPE_LIGHT_DECAL) +#define CLEAN_SCRUB (CLEAN_WASH | CLEAN_TYPE_FINGERPRINTS | CLEAN_TYPE_FIBERS | CLEAN_TYPE_HARD_DECAL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CLEAN_RAD CLEAN_TYPE_RADIATION #define CLEAN_ALL ALL diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 4c7a9c16962..bed569911bb 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -13,14 +13,22 @@ #define OXY "oxygen" /// Exhaustion and nonlethal damage. #define STAMINA "stamina" +<<<<<<< HEAD /// Brain damage. Should probably be decomissioned and replaced with proper organ damage. +======= +/// Brain damage. Should probably be decommissioned and replaced with proper organ damage. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BRAIN "brain" //Damage flag defines // /// Involves corrosive substances. #define ACID "acid" +<<<<<<< HEAD /// Involved in checking wheter a disease can infect or spread. Also involved in xeno neurotoxin. +======= +/// Involved in checking whether a disease can infect or spread. Also involved in xeno neurotoxin. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BIO "bio" /// Involves a shockwave, usually from an explosion. #define BOMB "bomb" @@ -36,7 +44,11 @@ #define LASER "laser" /// Involves a melee attack or a thrown object. #define MELEE "melee" +<<<<<<< HEAD /// Involved in checking the likelyhood of applying a wound to a mob. +======= +/// Involved in checking the likelihood of applying a wound to a mob. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define WOUND "wound" #define ARMOR_ALL "all_damage_types" diff --git a/code/__DEFINES/communications.dm b/code/__DEFINES/communications.dm index 813179974f9..1b4dd8931aa 100644 --- a/code/__DEFINES/communications.dm +++ b/code/__DEFINES/communications.dm @@ -4,8 +4,11 @@ /// The extended time an admin has to cancel a cross-sector message if they pass the filter, for instance #define EXTENDED_CROSS_SECTOR_CANCEL_TIME (30 SECONDS) +<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN - modularized into code/__DEFINES/~skyrat_defines/security_alerts.dm /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Security levels affect the escape shuttle timer /// Security level is green. (no threats) #define SEC_LEVEL_GREEN 0 @@ -15,5 +18,8 @@ #define SEC_LEVEL_RED 2 /// Security level is delta. (station destruction immiment) #define SEC_LEVEL_DELTA 3 +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/construction/material.dm b/code/__DEFINES/construction/material.dm index 445b4e0dc88..c8aa68874b7 100644 --- a/code/__DEFINES/construction/material.dm +++ b/code/__DEFINES/construction/material.dm @@ -1,4 +1,8 @@ +<<<<<<< HEAD //Defines for amount of material retrived from sheets & other items +======= +//Defines for amount of material retrieved from sheets & other items +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The amount of materials you get from a sheet of mineral like iron/diamond/glass etc. 100 Units. #define SHEET_MATERIAL_AMOUNT 100 /// The amount of materials you get from half a sheet. Used in standard object quantities. 50 units. diff --git a/code/__DEFINES/construction/rcd.dm b/code/__DEFINES/construction/rcd.dm index 95c5ab80053..05db5a1619b 100644 --- a/code/__DEFINES/construction/rcd.dm +++ b/code/__DEFINES/construction/rcd.dm @@ -7,7 +7,11 @@ #define RCD_WINDOWGRILLE (1 << 1) /// Windoors & Airlocks #define RCD_AIRLOCK (1 << 2) +<<<<<<< HEAD /// Literarly anything that is spawned on top of a turf such as tables, machines etc +======= + /// Literally anything that is spawned on top of a turf such as tables, machines etc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define RCD_STRUCTURE (1 << 3) /// For wallmounts like air alarms, fire alarms & apc #define RCD_WALLFRAME (1 << 4) diff --git a/code/__DEFINES/crushing.dm b/code/__DEFINES/crushing.dm index 1261b98e730..c8dc788155b 100644 --- a/code/__DEFINES/crushing.dm +++ b/code/__DEFINES/crushing.dm @@ -8,7 +8,11 @@ #define SUCCESSFULLY_FELL_OVER (1<<2) #define CRUSH_CRIT_SHATTER_LEGS "crush_crit_shatter_legs" +<<<<<<< HEAD #define CRUSH_CRIT_PARAPALEGIC "crush_crit_parapalegic" +======= +#define CRUSH_CRIT_PARAPLEGIC "crush_crit_paraplegic" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CRUSH_CRIT_SQUISH_LIMB "crush_crit_pin" #define CRUSH_CRIT_HEADGIB "crush_crit_headgib" #define VENDOR_CRUSH_CRIT_PIN "vendor_crush_crit_pin" diff --git a/code/__DEFINES/database.dm b/code/__DEFINES/database.dm index 3d20b3b9a3c..80919b5d049 100644 --- a/code/__DEFINES/database.dm +++ b/code/__DEFINES/database.dm @@ -4,3 +4,9 @@ #define DB_QUERY_FINISHED 1 /// When there was a problem with the execution of a query. #define DB_QUERY_BROKEN 2 +<<<<<<< HEAD +======= + +///The probability of non-maploaded photos and papers being saved as bottle messages at the end of the round. +#define MESSAGE_BOTTLE_CHANCE 0.2 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_action.dm b/code/__DEFINES/dcs/signals/signals_action.dm index 2226e34bccc..0d0185286e3 100644 --- a/code/__DEFINES/dcs/signals/signals_action.dm +++ b/code/__DEFINES/dcs/signals/signals_action.dm @@ -2,7 +2,11 @@ ///from base of datum/action/proc/Trigger(): (datum/action) #define COMSIG_ACTION_TRIGGER "action_trigger" +<<<<<<< HEAD // Return to block the trigger from occuring +======= + // Return to block the trigger from occurring +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ACTION_BLOCK_TRIGGER (1<<0) /// From /datum/action/Grant(): (mob/grant_to) #define COMSIG_ACTION_GRANTED "action_grant" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm index d75d8bacec7..ce7e58f1d11 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm @@ -74,7 +74,11 @@ #define COMSIG_MOVABLE_DISPOSING "movable_disposing" // called when movable is expelled from a disposal pipe, bin or outlet on obj/pipe_eject: (direction) #define COMSIG_MOVABLE_PIPE_EJECTING "movable_pipe_ejecting" +<<<<<<< HEAD ///called when the movable sucessfully has its anchored var changed, from base atom/movable/set_anchored(): (value) +======= +///called when the movable successfully has its anchored var changed, from base atom/movable/set_anchored(): (value) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_MOVABLE_SET_ANCHORED "movable_set_anchored" ///from base of atom/movable/setGrabState(): (newstate) #define COMSIG_MOVABLE_SET_GRAB_STATE "living_set_grab_state" @@ -119,6 +123,15 @@ /// From base of area/Exited(): (area/left, direction) #define COMSIG_MOVABLE_EXITED_AREA "movable_exited_area" +<<<<<<< HEAD +======= +///from base of /datum/component/splat/splat: (hit_atom) +#define COMSIG_MOVABLE_SPLAT "movable_splat" + +///from base of /atom/movable/point_at: (atom/A, obj/effect/temp_visual/point/point) +#define COMSIG_MOVABLE_POINTED "movable_pointed" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Sent to movables when they are being stolen by a spy: (mob/living/spy, datum/spy_bounty/bounty) #define COMSIG_MOVABLE_SPY_STEALING "movable_spy_stealing" /// Called when something is pushed by a living mob bumping it: (mob/living/pusher, push force) diff --git a/code/__DEFINES/dcs/signals/signals_bitrunning.dm b/code/__DEFINES/dcs/signals/signals_bitrunning.dm index 23461a90a11..f6e2f66278f 100644 --- a/code/__DEFINES/dcs/signals/signals_bitrunning.dm +++ b/code/__DEFINES/dcs/signals/signals_bitrunning.dm @@ -53,3 +53,9 @@ /// from /obj/effect/mob_spawn/ghost_role/human/virtual_domain/proc/artificial_spawn() : (mob/living/runner) #define COMSIG_BITRUNNER_SPAWNED "bitrunner_spawned" +<<<<<<< HEAD +======= + +/// from /obj/effect/landmark/bitrunning/mob_segment/proc/spawn_mobs() : (list/mob/living) +#define COMSIG_BITRUNNING_MOB_SEGMENT_SPAWNED "bitrunner_mob_segment_spawned" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_fish.dm b/code/__DEFINES/dcs/signals/signals_fish.dm index 2fbf99446ab..01c950b1b8e 100644 --- a/code/__DEFINES/dcs/signals/signals_fish.dm +++ b/code/__DEFINES/dcs/signals/signals_fish.dm @@ -17,6 +17,15 @@ #define COMSIG_FISH_EATEN_BY_OTHER_FISH "fish_eaten_by_other_fish" ///From /obj/item/fish/feed: (fed_reagents, fed_reagent_type) #define COMSIG_FISH_FED "fish_on_fed" +<<<<<<< HEAD +======= +///from /obj/item/fish/pet_fish +#define COMSIG_FISH_PETTED "fish_petted" +///From /obj/item/fish/update_size_and_weight: (new_size, new_weight) +#define COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT "fish_update_size_and_weight" +///From /obj/item/fish/update_fish_force: (weight_rank, bonus_malus) +#define COMSIG_FISH_FORCE_UPDATED "fish_force_updated" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fishing challenge completed #define COMSIG_FISHING_CHALLENGE_COMPLETED "fishing_completed" diff --git a/code/__DEFINES/dcs/signals/signals_food.dm b/code/__DEFINES/dcs/signals/signals_food.dm index 36a8b7b3392..2a91706619b 100644 --- a/code/__DEFINES/dcs/signals/signals_food.dm +++ b/code/__DEFINES/dcs/signals/signals_food.dm @@ -16,6 +16,12 @@ /// called when an edible ingredient is added: (datum/component/edible/ingredient) #define COMSIG_FOOD_INGREDIENT_ADDED "edible_ingredient_added" +<<<<<<< HEAD +======= +/// from base of /datum/component/edible/get_recipe_complexity(): (list/extra_complexity) +#define COMSIG_FOOD_GET_EXTRA_COMPLEXITY "food_get_extra_complexity" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Deep frying foods /// An item becomes fried - From /datum/element/fried_item/Attach: (fry_time) #define COMSIG_ITEM_FRIED "item_fried" @@ -31,6 +37,11 @@ #define COMPONENT_MICROWAVE_BAD_RECIPE (1<<1) ///called on item when created through microwaving (): (obj/machinery/microwave/M, cooking_efficiency) #define COMSIG_ITEM_MICROWAVE_COOKED "microwave_cooked" +<<<<<<< HEAD +======= +///called on the ingredient through microwawing: (result) +#define COMSIG_ITEM_MICROWAVE_COOKED_FROM "item_microwave_cooked_from" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Grilling foods (griddle, grill, and bonfire) ///Called when an object is placed onto a griddle @@ -46,6 +57,12 @@ ///Called when an object is turned into another item through grilling ontop of a griddle #define COMSIG_ITEM_GRILLED "item_grill_completed" +<<<<<<< HEAD +======= +///Called when the object is grilled by the grill (not to be confused by the griddle, but oh gee the two should be merged in one) +#define COMSIG_ITEM_BARBEQUE_GRILLED "item_barbeque_grilled" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Baking foods (oven) //Called when an object is inserted into an oven (atom/oven, mob/baker) #define COMSIG_ITEM_OVEN_PLACED_IN "item_placed_in_oven" diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index 5e9011f5f40..78ff266f668 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -57,7 +57,11 @@ #define COMSIG_GLOB_NEW_MACHINE "!new_machine" /// a client (re)connected, after all /client/New() checks have passed : (client/connected_client) #define COMSIG_GLOB_CLIENT_CONNECT "!client_connect" +<<<<<<< HEAD /// a weather event of some kind occured +======= +/// a weather event of some kind occurred +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_WEATHER_TELEGRAPH(event_type) "!weather_telegraph [event_type]" #define COMSIG_WEATHER_START(event_type) "!weather_start [event_type]" #define COMSIG_WEATHER_WINDDOWN(event_type) "!weather_winddown [event_type]" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm index 026247acf57..fafff26749e 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm @@ -9,3 +9,8 @@ ///Signal sent when a bot is reset #define COMSIG_BOT_RESET "bot_reset" +<<<<<<< HEAD +======= +///Sent off /mob/living/basic/bot/proc/set_mode_flags() : (new_flags) +#define COMSIG_BOT_MODE_FLAGS_SET "bot_mode_flags_set" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm index 2a936bbbbd9..a2105699baa 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm @@ -3,6 +3,7 @@ /// Stops the rest of the help #define COMPONENT_BLOCK_HELP_ACT (1<<0) +<<<<<<< HEAD ///Called from /mob/living/carbon/help_shake_act, before any hugs have ocurred. (mob/living/helper) #define COMSIG_CARBON_PRE_MISC_HELP "carbon_pre_misc_help" /// Stops the rest of help act (hugging, etc) from occuring @@ -11,6 +12,16 @@ ///Called from /mob/living/carbon/help_shake_act on the person being helped, after any hugs have ocurred. (mob/living/helper) #define COMSIG_CARBON_HELP_ACT "carbon_help" ///Called from /mob/living/carbon/help_shake_act on the helper, after any hugs have ocurred. (mob/living/helped) +======= +///Called from /mob/living/carbon/help_shake_act, before any hugs have occurred. (mob/living/helper) +#define COMSIG_CARBON_PRE_MISC_HELP "carbon_pre_misc_help" + /// Stops the rest of help act (hugging, etc) from occurring + #define COMPONENT_BLOCK_MISC_HELP (1<<0) + +///Called from /mob/living/carbon/help_shake_act on the person being helped, after any hugs have occurred. (mob/living/helper) +#define COMSIG_CARBON_HELP_ACT "carbon_help" +///Called from /mob/living/carbon/help_shake_act on the helper, after any hugs have occurred. (mob/living/helped) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_CARBON_HELPED "carbon_helped_someone" ///When a carbon slips. Called on /turf/open/handle_slip() @@ -95,11 +106,19 @@ #define COMPONENT_OVERRIDE_HEALTH_HUD (1<<0) ///Called when a carbon updates their sanity (source = carbon) #define COMSIG_CARBON_SANITY_UPDATE "carbon_sanity_update" +<<<<<<< HEAD ///Called when a carbon attempts to breath, before the breath has actually occured #define COMSIG_CARBON_ATTEMPT_BREATHE "carbon_attempt_breathe" // Prevents the breath #define COMSIG_CARBON_BLOCK_BREATH (1 << 0) ///Called when a carbon breathes, before the breath has actually occured +======= +///Called when a carbon attempts to breath, before the breath has actually occurred +#define COMSIG_CARBON_ATTEMPT_BREATHE "carbon_attempt_breathe" + // Prevents the breath + #define COMSIG_CARBON_BLOCK_BREATH (1 << 0) +///Called when a carbon breathes, before the breath has actually occurred +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_CARBON_PRE_BREATHE "carbon_pre_breathe" ///Called when a carbon updates their mood #define COMSIG_CARBON_MOOD_UPDATE "carbon_mood_update" @@ -133,9 +152,15 @@ #define VISIBLE_NAME_FACE 1 //Index for the name of the id #define VISIBLE_NAME_ID 2 +<<<<<<< HEAD //Index for whether their name is being overriden instead of obsfuscated #define VISIBLE_NAME_FORCED 3 ///from /mob/living/carbon/human/get_id_name; only returns if the mob has TRAIT_UNKNOWN and it's being overriden: (identity) +======= + //Index for whether their name is being overridden instead of obfuscated + #define VISIBLE_NAME_FORCED 3 +///from /mob/living/carbon/human/get_id_name; only returns if the mob has TRAIT_UNKNOWN and it's being overridden: (identity) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_HUMAN_GET_FORCED_NAME "human_get_forced_name" // Mob transformation signals @@ -159,10 +184,17 @@ #define HANDLE_BLOOD_HANDLED (1<<0) /// Return to skip default nutrition -> blood conversion #define HANDLE_BLOOD_NO_NUTRITION_DRAIN (1<<1) +<<<<<<< HEAD /// Return to skip oxyloss and similar effecst from blood level #define HANDLE_BLOOD_NO_OXYLOSS (1<<2) /// from /datum/status_effect/limp/proc/check_step(mob/whocares, OldLoc, Dir, forced) iodk where it shuld go +======= + /// Return to skip oxyloss and similar effects from blood level + #define HANDLE_BLOOD_NO_OXYLOSS (1<<2) + +/// from /datum/status_effect/limp/proc/check_step(mob/whocares, OldLoc, Dir, forced) iodk where it should go +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_CARBON_LIMPING "mob_limp_check" #define COMPONENT_CANCEL_LIMP (1<<0) 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 4f625ee7b74..d547e532196 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -50,7 +50,11 @@ #define COMSIG_MOB_CLIENT_BLOCK_PRE_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE /// The argument of move_args which corresponds to the loc we're moving to #define MOVE_ARG_NEW_LOC 1 +<<<<<<< HEAD /// The arugment of move_args which dictates our movement direction +======= + /// The argument of move_args which dictates our movement direction +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MOVE_ARG_DIRECTION 2 /// From base of /client/Move(): (direction, old_dir) #define COMSIG_MOB_CLIENT_MOVED "mob_client_moved" @@ -72,7 +76,11 @@ #define COMSIG_MOB_MIND_TRANSFERRED_INTO "mob_mind_transferred_into" ///from mind/transfer_from. Sent to the mob the mind is being transferred out of. #define COMSIG_MOB_MIND_TRANSFERRED_OUT_OF "mob_mind_transferred_out_of" +<<<<<<< HEAD /// From /mob/proc/ghostize() Called when a mob sucessfully ghosts +======= +/// From /mob/proc/ghostize() Called when a mob successfully ghosts +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_MOB_GHOSTIZED "mob_ghostized" ///from base of obj/allowed(mob/M): (/obj) returns ACCESS_ALLOWED if mob has id access to the obj @@ -151,8 +159,11 @@ /// from base of mob/swap_hand(): () /// Performed after the hands are swapped. #define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" +<<<<<<< HEAD ///from base of /mob/verb/pointed: (atom/A) #define COMSIG_MOB_POINTED "mob_pointed" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Mob is trying to open the wires of a target [/atom], from /datum/wires/interactable(): (atom/target) #define COMSIG_TRY_WIRES_INTERACT "try_wires_interact" #define COMPONENT_CANT_INTERACT_WIRES (1<<0) @@ -172,8 +183,13 @@ ///Called on user, from base of /datum/strippable_item/try_(un)equip() (atom/target, obj/item/equipping?) #define COMSIG_TRY_STRIP "try_strip" #define COMPONENT_CANT_STRIP (1<<0) +<<<<<<< HEAD ///From /datum/component/creamed/Initialize() #define COMSIG_MOB_CREAMED "mob_creamed" +======= +///From /datum/component/face_decal/splat/Initialize() +#define COMSIG_MOB_HIT_BY_SPLAT "hit_by_splat" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///From /obj/item/gun/proc/check_botched() #define COMSIG_MOB_CLUMSY_SHOOT_FOOT "mob_clumsy_shoot_foot" ///from /obj/item/hand_item/slapper/attack_atom(): (source=obj/structure/table/slammed_table, mob/living/slammer) @@ -249,3 +265,9 @@ /// from /mob/proc/key_down(): (key, client/client, full_key) #define COMSIG_MOB_KEYDOWN "mob_key_down" +<<<<<<< HEAD +======= + +/// from /mob/update_incapacitated(): (old_incap, new_incap) +#define COMSIG_MOB_INCAPACITATE_CHANGED "mob_incapacitated" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm index 72828cc8916..ca6dd17aa12 100644 --- a/code/__DEFINES/dcs/signals/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_object.dm @@ -153,12 +153,20 @@ /// Sebt from obj/item/ui_action_click(): (mob/user, datum/action) #define COMSIG_ITEM_UI_ACTION_CLICK "item_action_click" +<<<<<<< HEAD /// Return to prevent the default behavior (attack_selfing) from ocurring. +======= + /// Return to prevent the default behavior (attack_selfing) from occurring. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ACTION_HANDLED (1<<0) /// Sent from obj/item/item_action_slot_check(): (mob/user, datum/action, slot) #define COMSIG_ITEM_UI_ACTION_SLOT_CHECKED "item_action_slot_checked" +<<<<<<< HEAD /// Return to prevent the default behavior (attack_selfing) from ocurring. +======= + /// Return to prevent the default behavior (attack_selfing) from occurring. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ITEM_ACTION_SLOT_INVALID (1<<0) ///from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone) diff --git a/code/__DEFINES/dcs/signals/signals_reagent.dm b/code/__DEFINES/dcs/signals/signals_reagent.dm index 5bb2c89d4ef..50135da59b7 100644 --- a/code/__DEFINES/dcs/signals/signals_reagent.dm +++ b/code/__DEFINES/dcs/signals/signals_reagent.dm @@ -53,8 +53,11 @@ #define COMSIG_REAGENTS_EXPOSE_MOB "reagents_expose_mob" ///from base of [/turf/proc/expose_reagents]: (/turf, /list, methods, volume_modifier, show_message) #define COMSIG_REAGENTS_EXPOSE_TURF "reagents_expose_turf" +<<<<<<< HEAD ///from base of [/datum/component/personal_crafting/proc/del_reqs]: () #define COMSIG_REAGENTS_CRAFTING_PING "reagents_crafting_ping" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// sent when reagents are transfered from a cup, to something refillable (atom/transfer_to) #define COMSIG_REAGENTS_CUP_TRANSFER_TO "reagents_cup_transfer_to" /// sent when reagents are transfered from some reagent container, to a cup (atom/transfer_from) diff --git a/code/__DEFINES/dcs/signals/signals_spell.dm b/code/__DEFINES/dcs/signals/signals_spell.dm index d9ef98527e2..31f8bb4fd95 100644 --- a/code/__DEFINES/dcs/signals/signals_spell.dm +++ b/code/__DEFINES/dcs/signals/signals_spell.dm @@ -113,7 +113,11 @@ // Charge /// Sent from /datum/action/cooldown/spell/charge/cast(), to the item in hand being charged: (datum/action/cooldown/spell/spell, mob/user) #define COMSIG_ITEM_MAGICALLY_CHARGED "item_magic_charged" +<<<<<<< HEAD /// Return if an item was successfuly recharged +======= + /// Return if an item was successful recharged +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ITEM_CHARGED (1 << 0) /// Return if the item had a negative side effect occur while recharging #define COMPONENT_ITEM_BURNT_OUT (1 << 1) diff --git a/code/__DEFINES/dcs/signals/signals_tools.dm b/code/__DEFINES/dcs/signals/signals_tools.dm index 562aa29d595..3fe59826d0d 100644 --- a/code/__DEFINES/dcs/signals/signals_tools.dm +++ b/code/__DEFINES/dcs/signals/signals_tools.dm @@ -1,6 +1,10 @@ // Notifies tools that something is happening. +<<<<<<< HEAD // Sucessful actions against an atom. +======= +// Successful actions against an atom. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Called from /atom/proc/tool_act (atom) #define COMSIG_TOOL_ATOM_ACTED_PRIMARY(tooltype) "tool_atom_acted_[tooltype]" ///Called from /atom/proc/tool_act (atom) diff --git a/code/__DEFINES/events.dm b/code/__DEFINES/events.dm index 2b1755b22c4..cd71ca713ab 100644 --- a/code/__DEFINES/events.dm +++ b/code/__DEFINES/events.dm @@ -22,7 +22,11 @@ #define EVENT_CATEGORY_FRIENDLY "Friendly" ///Events that affect the body and mind #define EVENT_CATEGORY_HEALTH "Health" +<<<<<<< HEAD ///Events reserved for special occassions +======= +///Events reserved for special occasions +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define EVENT_CATEGORY_HOLIDAY "Holiday" ///Events with enemy groups with a more complex plan #define EVENT_CATEGORY_INVASION "Invasion" diff --git a/code/__DEFINES/external_organs.dm b/code/__DEFINES/external_organs.dm index b47c6cff3bc..b265f8a69b7 100644 --- a/code/__DEFINES/external_organs.dm +++ b/code/__DEFINES/external_organs.dm @@ -11,4 +11,7 @@ /// Tail spine defines #define SPINE_KEY_LIZARD "lizard" +<<<<<<< HEAD #define SPINE_KEY_VOX "vox" // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/fish.dm b/code/__DEFINES/fish.dm index 3671ff3d8cd..aca4d5eafb0 100644 --- a/code/__DEFINES/fish.dm +++ b/code/__DEFINES/fish.dm @@ -1,5 +1,10 @@ /// Use in fish tables to denote miss chance. #define FISHING_DUD "dud" +<<<<<<< HEAD +======= +///Used in the the hydro tray fishing spot to define a random seed reward +#define FISHING_RANDOM_SEED "Random seed" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Baseline fishing difficulty levels #define FISHING_DEFAULT_DIFFICULTY 15 @@ -14,11 +19,14 @@ #define FISH_TRAIT_MINOR_DIFFICULTY_BOOST 5 +<<<<<<< HEAD // These define how the fish will behave in the minigame #define FISH_AI_DUMB "dumb" #define FISH_AI_ZIPPY "zippy" #define FISH_AI_SLOW "slow" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Slot defines for the fishing rod and its equipment #define ROD_SLOT_BAIT "bait" #define ROD_SLOT_LINE "line" @@ -70,9 +78,17 @@ #define FISHING_MINIGAME_RULE_FLIP (1 << 5) ///Skip the biting phase and go straight to the minigame, avoiding the penalty for having slow reflexes. #define FISHING_MINIGAME_AUTOREEL (1 << 6) +<<<<<<< HEAD ///all the effects that are active and will last for a few seconds before triggering a cooldown #define FISHING_MINIGAME_ACTIVE_EFFECTS (FISHING_MINIGAME_RULE_ANTIGRAV|FISHING_MINIGAME_RULE_FLIP) +======= +///The fish will fade in and out at intervals +#define FISHING_MINIGAME_RULE_CAMO (1 << 7) + +///all the effects that are active and will last for a few seconds before triggering a cooldown +#define FISHING_MINIGAME_ACTIVE_EFFECTS (FISHING_MINIGAME_RULE_ANTIGRAV|FISHING_MINIGAME_RULE_FLIP|FISHING_MINIGAME_RULE_CAMO) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default additive value for fishing hook catch weight modifiers. #define FISHING_DEFAULT_HOOK_BONUS_ADDITIVE 0 @@ -89,7 +105,16 @@ #define FISH_ICON_GEM "gem" #define FISH_ICON_CRAB "crab" #define FISH_ICON_JELLYFISH "jellyfish" +<<<<<<< HEAD #define FISH_ICON_BONE "bone" +======= +#define FISH_ICON_BOTTLE "bottle" +#define FISH_ICON_BONE "bone" +#define FISH_ICON_ELECTRIC "electric" +#define FISH_ICON_WEAPON "weapon" +#define FISH_ICON_CRITTER "critter" +#define FISH_ICON_SEED "seed" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define AQUARIUM_ANIMATION_FISH_SWIM "fish" #define AQUARIUM_ANIMATION_FISH_DEAD "dead" @@ -110,8 +135,16 @@ ///Fish size thresholds for w_class. #define FISH_SIZE_TINY_MAX 30 #define FISH_SIZE_SMALL_MAX 50 +<<<<<<< HEAD #define FISH_SIZE_NORMAL_MAX 90 #define FISH_SIZE_BULKY_MAX 130 +======= +#define FISH_SIZE_NORMAL_MAX 80 +#define FISH_SIZE_BULKY_MAX 120 +///size threshold for requiring two-handed carry +#define FISH_SIZE_TWO_HANDS_REQUIRED 135 +#define FISH_SIZE_HUGE_MAX 165 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The coefficient for maximum weight/size divergence relative to the averages. #define MAX_FISH_DEVIATION_COEFF 2.5 @@ -121,6 +154,18 @@ ///The number of fillets is multiplied by the fish' size and divided by this. #define FISH_FILLET_NUMBER_SIZE_DIVISOR 30 +<<<<<<< HEAD +======= +///The slowdown of the fish when carried begins at this value +#define FISH_WEIGHT_SLOWDOWN 2100 +///The value of the slowdown equals to the weight divided by this (and then at the power of a sub-1 exponent) +#define FISH_WEIGHT_SLOWDOWN_DIVISOR 500 +///The sub-one exponent that results in the final slowdown of the fish item +#define FISH_WEIGHT_SLOWDOWN_EXPONENT 0.54 +///Used to calculate the force of the fish by comparing (1 + log(weight/this_define)) and the w_class of the item. +#define FISH_WEIGHT_FORCE_DIVISOR 250 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The breeding timeout for newly instantiated fish is multiplied by this. #define NEW_FISH_BREEDING_TIMEOUT_MULT 2 ///The last feeding timestamp of newly instantiated fish is multiplied by this: ergo, they spawn 50% hungry. @@ -164,3 +209,22 @@ //Fish breeding stops if fish count exceeds this. #define AQUARIUM_MAX_BREEDING_POPULATION 20 +<<<<<<< HEAD +======= + +//Minigame defines +/// The height of the minigame slider. Not in pixels, but minigame units. +#define FISHING_MINIGAME_AREA 1000 + +///Defines for fish properties from the collect_fish_properties proc +#define FISH_PROPERTIES_FAV_BAIT "fav_bait" +#define FISH_PROPERTIES_BAD_BAIT "bad_bait" +#define FISH_PROPERTIES_TRAITS "fish_traits" + +///Define for favorite and disliked baits that aren't just item typepaths. +#define FISH_BAIT_TYPE "Type" +#define FISH_BAIT_FOODTYPE "Foodtype" +#define FISH_BAIT_REAGENT "Reagent" +#define FISH_BAIT_VALUE "Value" +#define FISH_BAIT_AMOUNT "Amount" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm index b8932860fca..2df43b40953 100644 --- a/code/__DEFINES/fonts.dm +++ b/code/__DEFINES/fonts.dm @@ -13,7 +13,11 @@ #define SIGNATURE_FONT "Segoe Script" /// Emoji icon set +<<<<<<< HEAD #define EMOJI_SET 'modular_skyrat/master_files/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui/chat/emoji.dmi' +======= +#define EMOJI_SET 'icons/ui/chat/emoji.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Font metrics bitfield /// Include leading A width and trailing C width in GetWidth() or in DrawText() diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 1304bd53cd3..4e249f0fb7d 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -19,7 +19,10 @@ #define BUGS (1<<18) #define GORE (1<<19) #define STONE (1<<20) +<<<<<<< HEAD #define BLOODY (1<<21) // SKYRAT EDIT - Hemophage Food +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DEFINE_BITFIELD(foodtypes, list( "MEAT" = MEAT, @@ -43,7 +46,10 @@ DEFINE_BITFIELD(foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, +<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// A list of food type names, in order of their flags @@ -69,7 +75,10 @@ DEFINE_BITFIELD(foodtypes, list( "BUGS", \ "GORE", \ "STONE", \ +<<<<<<< HEAD "BLOODY", /* SKYRAT EDIT - Hemophage Food */ \ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// IC meaning (more or less) for food flags @@ -95,7 +104,10 @@ DEFINE_BITFIELD(foodtypes, list( "Bugs", \ "Gore", \ "Rocks", \ +<<<<<<< HEAD "Bloody", /* SKYRAT EDIT - Hemophage Food */ \ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) #define DRINK_REVOLTING 1 @@ -105,7 +117,10 @@ DEFINE_BITFIELD(foodtypes, list( #define DRINK_FANTASTIC 5 #define FOOD_AMAZING 6 +<<<<<<< HEAD #define RACE_DRINK 7 // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FOOD_QUALITY_NORMAL 1 #define FOOD_QUALITY_NICE 2 @@ -175,14 +190,25 @@ GLOBAL_LIST_INIT(food_buffs, list( #define FOOD_IN_CONTAINER (1<<0) /// Finger food can be eaten while walking / running around #define FOOD_FINGER_FOOD (1<<1) +<<<<<<< HEAD +======= + +DEFINE_BITFIELD(food_flags, list( + "FOOD_FINGER_FOOD" = FOOD_FINGER_FOOD, + "FOOD_IN_CONTAINER" = FOOD_IN_CONTAINER, +)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DEFINE_BITFIELD(food_flags, list( "FOOD_FINGER_FOOD" = FOOD_FINGER_FOOD, "FOOD_IN_CONTAINER" = FOOD_IN_CONTAINER, )) +<<<<<<< HEAD #define STOP_SERVING_BREAKFAST (35 MINUTES) // SKYRAT EDIT - ORIGINAL: 15 MINUTES +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FOOD_MEAT_HUMAN 50 #define FOOD_MEAT_MUTANT 100 #define FOOD_MEAT_MUTANT_RARE 200 diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index aff51851e18..24b2d1cbe9b 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -139,6 +139,7 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(59) ///turf/closed/wall/mineral/titanium/survival #define SMOOTH_GROUP_TURF_OPEN_CLIFF S_TURF(60) ///turf/open/cliff +<<<<<<< HEAD // SKYRAT EDIT ADDITION #define SMOOTH_GROUP_ELEVATED_PLASTEEL S_TURF(61) #define SMOOTH_GROUP_LOWERED_PLASTEEL S_TURF(62) @@ -148,6 +149,9 @@ DEFINE_BITFIELD(smoothing_junction, list( #define MAX_S_TURF 63 //Always match this value with the one above it. //SKYRAT EDIT END +======= +#define MAX_S_TURF 60 //Always match this value with the one above it. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define S_OBJ(num) ("-" + #num + ",") /* /obj included */ @@ -170,11 +174,14 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_BAMBOO_WALLS S_TURF(17) //![/turf/closed/wall/mineral/bamboo, /obj/structure/falsewall/bamboo] #define SMOOTH_GROUP_PLASTINUM_WALLS S_TURF(18) //![turf/closed/indestructible/riveted/plastinum] +<<<<<<< HEAD //SKYRAT EDIT ADDITION #define SMOOTH_GROUP_SHIPWALLS S_OBJ(19) ///turf/closed/wall/mineral/titanium/spaceship #define SMOOTH_GROUP_STONE_WALLS S_OBJ(20) ///turf/closed/wall/mineral/stone, /obj/structure/falsewall/stone //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SMOOTH_GROUP_PAPERFRAME S_OBJ(21) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe #define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(22) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/reinforced/plasma/fulltile @@ -219,12 +226,15 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH S_OBJ(73) // /obj/structure/spider/stickyweb/sealed/thick #define SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR S_OBJ(74) // /obj/structure/spider/stickyweb/sealed/reflector +<<<<<<< HEAD //SKYRAT EDIT ADDITION #define SMOOTH_GROUP_SHUTTERS S_OBJ(75) #define SMOOTH_GROUP_WATER S_OBJ(76) ///obj/effect/abstract/liquid_turf //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SMOOTH_GROUP_GRAV_FIELD S_OBJ(69) /// Performs the work to set smoothing_groups and canSmoothWith. diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index aadf93fad74..19336594769 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -63,6 +63,11 @@ #define ITEM_SLOT_HANDCUFFED (1<<18) /// Legcuff slot (bolas, beartraps) #define ITEM_SLOT_LEGCUFFED (1<<19) +<<<<<<< HEAD +======= +/// Inside of a character's BELT......... +#define ITEM_SLOT_BELTPACK (1<<20) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Total amount of slots #define SLOTS_AMT 20 // Keep this up to date! @@ -108,6 +113,7 @@ DEFINE_BITFIELD(no_equip_flags, list( #define HIDEMUTWINGS (1<<13) ///hides belts and riggings #define HIDEBELT (1<<14) +<<<<<<< HEAD //SKYRAT EDIT ADDITION: CUSTOM EAR TOGGLE FOR ANTHRO/ETC EAR SHOWING - /// Manually set this on items you want anthro ears to show on! @@ -121,6 +127,8 @@ DEFINE_BITFIELD(no_equip_flags, list( /// If this has our taur variant, do we hide our taur part? #define HIDETAUR (1<<18) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //bitflags for clothing coverage - also used for limbs #define HEAD (1<<0) @@ -154,10 +162,13 @@ DEFINE_BITFIELD(no_equip_flags, list( #define FEMALE_UNIFORM_TOP_ONLY (1<<1) /// For when you don't want the "breast" effect to be applied (the one that cuts two pixels in the middle of the front of the uniform when facing east or west). #define FEMALE_UNIFORM_NO_BREASTS (1<<2) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START /// For when you -don't- want to apply FEMALE_UNIFORM_TOP_ONLY to the digi version (which happens by default). #define FEMALE_UNIFORM_DIGI_FULL (1<<3) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in #define NORMAL_STYLE 0 @@ -165,6 +176,7 @@ DEFINE_BITFIELD(no_equip_flags, list( #define DIGITIGRADE_STYLE 2 //Flags (actual flags, fucker ^) for /obj/item/var/supports_variations_flags +<<<<<<< HEAD ///No alternative sprites based on bodytype #define CLOTHING_NO_VARIATION (1<<0) ///Has a sprite for digitigrade legs specifically. @@ -187,6 +199,20 @@ DEFINE_BITFIELD(no_equip_flags, list( /// The sprite works fine for vox snouts as is. #define CLOTHING_SNOUTED_BETTER_VOX_VARIATION_NO_NEW_ICON (1<<9) // SKYRAT EDIT ADDITION END +======= +/// No alternative sprites or handling based on bodytype +#define CLOTHING_NO_VARIATION (1<<0) +/// Has a sprite for digitigrade legs specifically. +#define CLOTHING_DIGITIGRADE_VARIATION (1<<1) +/// The sprite works fine for digitigrade legs as-is. +#define CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON (1<<2) +/// Auto-generates the leg portion of the sprite with GAGS +/// Suggested that you set [/obj/item/var/digitigrade_greyscale_config_worn] when using this flag +#define CLOTHING_DIGITIGRADE_MASK (1<<3) + +/// All variation flags which render "correctly" on a digitigrade leg setup +#define DIGITIGRADE_VARIATIONS (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON|CLOTHING_DIGITIGRADE_MASK) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //flags for covering body parts #define GLASSESCOVERSEYES (1<<0) @@ -231,7 +257,10 @@ GLOBAL_LIST_INIT(detective_vest_allowed, list( /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/energy, /obj/item/gun/ballistic/shotgun/automatic/combat/compact, +<<<<<<< HEAD /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(security_vest_allowed, list( @@ -249,7 +278,10 @@ GLOBAL_LIST_INIT(security_vest_allowed, list( /obj/item/storage/belt/holster/energy, /obj/item/gun/ballistic/shotgun/automatic/combat/compact, /obj/item/pen/red/security, +<<<<<<< HEAD /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(security_wintercoat_allowed, list( @@ -262,7 +294,10 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, list( /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/energy, /obj/item/gun/ballistic/shotgun/automatic/combat/compact, +<<<<<<< HEAD /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) //Allowed list for all chaplain suits (except the honkmother robe) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index be21dcf081a..52c7d2f83d1 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -139,6 +139,7 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( //Silicon mobs #define issilicon(A) (istype(A, /mob/living/silicon)) +<<<<<<< HEAD ///Define on whether A has access to Silicon stuff either through being a silicon, admin ghost or is a non-silicon holding the Silicon remote. ///This can only be used for instances where you are not specifically looking for silicon, but access. #define HAS_SILICON_ACCESS(A) (istype(A, /mob/living/silicon) || isAdminGhostAI(A) || A.has_unlimited_silicon_privilege || istype(A.get_active_held_item(), /obj/item/machine_remote)) @@ -152,6 +153,17 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( #define ispAI(A) (istype(A, /mob/living/silicon/pai)) +======= +#define isAI(A) (istype(A, /mob/living/silicon/ai)) +#define iscyborg(A) (istype(A, /mob/living/silicon/robot)) +#define ispAI(A) (istype(A, /mob/living/silicon/pai)) + +///This is used to see if you have Silicon access. This includes things like Admins, Drones, Bots, and Human wands. +#define HAS_SILICON_ACCESS(possible_silicon) (HAS_TRAIT(possible_silicon, TRAIT_SILICON_ACCESS) || isAdminGhostAI(possible_silicon)) +///This is used to see if you have the access of an AI. This doesn't mean you are an AI, just have the same access as one. +#define HAS_AI_ACCESS(possible_ai) (HAS_TRAIT(possible_ai, TRAIT_AI_ACCESS) || isAdminGhostAI(possible_ai)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // basic mobs #define isbasicmob(A) (istype(A, /mob/living/basic)) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index f7700da8441..64c0351bc5d 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -63,30 +63,45 @@ #define JOB_SECURITY_OFFICER_ENGINEERING "Security Officer (Engineering)" #define JOB_SECURITY_OFFICER_SCIENCE "Security Officer (Science)" #define JOB_SECURITY_OFFICER_SUPPLY "Security Officer (Cargo)" +<<<<<<< HEAD #define JOB_CORRECTIONS_OFFICER "Corrections Officer" // SKYRAT EDIT ADDITION //Engineering #define JOB_STATION_ENGINEER "Station Engineer" #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" #define JOB_ENGINEERING_GUARD "Engineering Guard" // SKYRAT EDIT ADDITION #define JOB_TELECOMMS_SPECIALIST "Telecomms Specialist" // SKYRAT EDIT ADDITION +======= +//Engineering +#define JOB_STATION_ENGINEER "Station Engineer" +#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Medical #define JOB_CORONER "Coroner" #define JOB_MEDICAL_DOCTOR "Medical Doctor" #define JOB_PARAMEDIC "Paramedic" #define JOB_CHEMIST "Chemist" +<<<<<<< HEAD #define JOB_ORDERLY "Orderly" // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Science #define JOB_SCIENTIST "Scientist" #define JOB_ROBOTICIST "Roboticist" #define JOB_GENETICIST "Geneticist" +<<<<<<< HEAD #define JOB_SCIENCE_GUARD "Science Guard" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Supply #define JOB_QUARTERMASTER "Quartermaster" #define JOB_CARGO_TECHNICIAN "Cargo Technician" #define JOB_CARGO_GORILLA "Cargo Gorilla" #define JOB_SHAFT_MINER "Shaft Miner" #define JOB_BITRUNNER "Bitrunner" +<<<<<<< HEAD #define JOB_CUSTOMS_AGENT "Customs Agent" // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Service #define JOB_BARTENDER "Bartender" #define JOB_BOTANIST "Botanist" @@ -99,8 +114,11 @@ #define JOB_LAWYER "Lawyer" #define JOB_CHAPLAIN "Chaplain" #define JOB_PSYCHOLOGIST "Psychologist" +<<<<<<< HEAD #define JOB_BARBER "Barber" // SKYRAT EDIT ADDITION #define JOB_BOUNCER "Bouncer" // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //ERTs #define JOB_ERT_DEATHSQUAD "Death Commando" #define JOB_ERT_COMMANDER "Emergency Response Team Commander" @@ -123,6 +141,7 @@ #define JOB_CENTCOM_RESEARCH_OFFICER "Research Officer" #define JOB_CENTCOM_SPECIAL_OFFICER "Special Ops Officer" #define JOB_CENTCOM_PRIVATE_SECURITY "Private Security Force" +<<<<<<< HEAD // SKYRAT EDIT ADDITION START #define JOB_BLUESHIELD "Blueshield" #define JOB_NT_REP "Nanotrasen Consultant" @@ -140,6 +159,8 @@ #define JOB_SOLFED "SolFed" #define JOB_SOLFED_LIASON "SolFed Liason" // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define JOB_GROUP_ENGINEERS list( \ JOB_STATION_ENGINEER, \ @@ -186,6 +207,7 @@ #define JOB_DISPLAY_ORDER_DETECTIVE 37 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 38 #define JOB_DISPLAY_ORDER_PRISONER 39 +<<<<<<< HEAD #define JOB_DISPLAY_ORDER_SECURITY_MEDIC 100 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 101 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 102 //SKYRAT EDIT ADDITON @@ -197,6 +219,8 @@ #define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 108 //SKYRAT EDIT ADDITION #define JOB_DISPLAY_ORDER_EXP_CORPS 109 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_TELECOMMS_SPECIALIST 51 //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DEPARTMENT_UNASSIGNED "No Department" @@ -220,8 +244,11 @@ #define DEPARTMENT_ASSISTANT "Assistant" #define DEPARTMENT_BITFLAG_CAPTAIN (1<<9) #define DEPARTMENT_CAPTAIN "Captain" +<<<<<<< HEAD #define DEPARTMENT_BITFLAG_CENTRAL_COMMAND (1<<10) //SKYRAT EDIT CHANGE #define DEPARTMENT_CENTRAL_COMMAND "Central Command" //SKYRAT EDIT CHANGE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DEFINE_BITFIELD(departments_bitflags, list( "SECURITY" = DEPARTMENT_BITFLAG_SECURITY, diff --git a/code/__DEFINES/lag_switch.dm b/code/__DEFINES/lag_switch.dm index 2152d0d9a55..fdcde76a86d 100644 --- a/code/__DEFINES/lag_switch.dm +++ b/code/__DEFINES/lag_switch.dm @@ -16,8 +16,13 @@ #define DISABLE_PARALLAX 7 /// Disables footsteps, TRAIT_BYPASS_MEASURES exempted #define DISABLE_FOOTSTEPS 8 +<<<<<<< HEAD // SKYRAT EDIT ADDITION /// Stops people from changing things in the character creator. Entirely. #define DISABLE_CREATOR 9 // SKYRAT EDIT END #define MEASURES_AMOUNT 9 // The total number of switches defined above // SKYRAT EDIT ADDITION +======= + +#define MEASURES_AMOUNT 8 // The total number of switches defined above +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 06d5eb8408b..6ae326f6164 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -132,7 +132,10 @@ // this allows larger then bound floors to layer as we'd expect // ANYTHING on the floor plane needs TOPDOWN_LAYER, and nothing that isn't on the floor plane can have it +<<<<<<< HEAD //FLOOR_PLANE layers +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // NOTICE: we break from the pattern of increasing in steps of like 0.01 here // Because TOPDOWN_LAYER is 10000 and that's enough to floating point our modifications away #define LOW_FLOOR_LAYER (1 + TOPDOWN_LAYER) @@ -269,7 +272,10 @@ #define CURSE_LAYER 6 #define ECHO_LAYER 7 #define PARRY_LAYER 8 +<<<<<<< HEAD #define CARRIER_LAYER 9 // SKYRAT EDIT - CARRIERS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FOV_EFFECT_LAYER 100 diff --git a/code/__DEFINES/lazy_templates.dm b/code/__DEFINES/lazy_templates.dm index bc1e99e594c..4f54c72760d 100644 --- a/code/__DEFINES/lazy_templates.dm +++ b/code/__DEFINES/lazy_templates.dm @@ -12,5 +12,9 @@ "Abductor Ships" = LAZY_TEMPLATE_KEY_ABDUCTOR_SHIPS, \ "Heretic Sacrifice Level" = LAZY_TEMPLATE_KEY_HERETIC_SACRIFICE, \ "Voidwalker Void" = LAZY_TEMPLATE_KEY_VOIDWALKER_VOID, \ +<<<<<<< HEAD "Outpost of Cogs" = LAZY_TEMPLATE_KEY_OUTPOST_OF_COGS, \ ) // SKYRAT EDIT ABOVE - OUTPOST OF COGS +======= +) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index d6586f390c6..08f6dafc4a0 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -10,6 +10,16 @@ #define OVERLAY_LIGHT_BEAM 4 /// Nonesensical value for light color, used for null checks. #define NONSENSICAL_VALUE -99999 +<<<<<<< HEAD +======= + +/// Is our overlay light source attached to another movable (its loc), meaning that the lighting component should go one level deeper. +#define LIGHT_ATTACHED (1<<0) +/// Freezes a light in its current state, blocking any attempts at modification +#define LIGHT_FROZEN (1<<1) +/// Does this light ignore inherent offsets? (Pixels, transforms, etc) +#define LIGHT_IGNORE_OFFSET (1<<2) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Is our overlay light source attached to another movable (its loc), meaning that the lighting component should go one level deeper. #define LIGHT_ATTACHED (1<<0) @@ -18,8 +28,11 @@ /// Does this light ignore inherent offsets? (Pixels, transforms, etc) #define LIGHT_IGNORE_OFFSET (1<<2) +<<<<<<< HEAD #define MINIMUM_USEFUL_LIGHT_RANGE 1.5 // SKYRAT EDIT CHANGE - Original value 1.4 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// light UNDER the floor. primarily used for starlight, shouldn't fuck with this #define LIGHTING_HEIGHT_SPACE -0.5 /// light ON the floor diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index a2d66b9d4fc..4b36814adf9 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -66,10 +66,13 @@ #define AWAY_IMPRINTER (1<<9) /// For wiremod/integrated circuits. Uses various minerals. #define COMPONENT_PRINTER (1<<10) +<<<<<<< HEAD // SKYRAT EDIT ADDITION /// Can be made by the orderable colony fabricator #define COLONY_FABRICATOR (1<<11) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define HYPERTORUS_INACTIVE 0 // No or minimal energy #define HYPERTORUS_NOMINAL 1 // Normal operation diff --git a/code/__DEFINES/melee.dm b/code/__DEFINES/melee.dm index 55240946de0..c156f08c55e 100644 --- a/code/__DEFINES/melee.dm +++ b/code/__DEFINES/melee.dm @@ -12,4 +12,8 @@ #define MARTIALART_WRESTLING "wrestling" /// The number of hits required to crit a target +<<<<<<< HEAD #define HITS_TO_CRIT(damage) round(HUMAN_MAXHEALTH / damage, 0.1) // SKYRAT EDIT - changes the magic health number of 100 to HUMAN_MAXHEALTH. +======= +#define HITS_TO_CRIT(damage) round(100 / damage, 0.1) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/mobfactions.dm b/code/__DEFINES/mobfactions.dm index aea143dad25..935b6e78bae 100644 --- a/code/__DEFINES/mobfactions.dm +++ b/code/__DEFINES/mobfactions.dm @@ -33,13 +33,21 @@ #define FACTION_HELL "hell" /// Hivebots #define FACTION_HIVEBOT "hivebot" +<<<<<<< HEAD /// Illusionary creaturs +======= +/// Illusionary creatures +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FACTION_ILLUSION "illusion" /// Creatures of the never finished jungle planet, and gorillas #define FACTION_JUNGLE "jungle" /// Small lizards #define FACTION_LIZARD "lizard" +<<<<<<< HEAD /// Maint creatures have mutual respect for eachother. +======= +/// Maint creatures have mutual respect for each other. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FACTION_MAINT_CREATURES "maint_creatures" /// Animated objects and statues #define FACTION_MIMIC "mimic" diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 51bb4bf1cea..8deccd78351 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -15,7 +15,11 @@ //Blood levels #define BLOOD_VOLUME_MAX_LETHAL 2150 #define BLOOD_VOLUME_EXCESS 2100 +<<<<<<< HEAD #define BLOOD_VOLUME_MAXIMUM 1000 // SKYRAT EDIT - Blood volume balancing (mainly for Hemophages as nobody else really goes much above regular blood volume) - ORIGINAL VALUE: 2000 +======= +#define BLOOD_VOLUME_MAXIMUM 2000 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BLOOD_VOLUME_SLIME_SPLIT 1120 #define BLOOD_VOLUME_NORMAL 560 #define BLOOD_VOLUME_SAFE (BLOOD_VOLUME_NORMAL * (1 - 0.15)) // Latter number is percentage of blood lost, for readability! @@ -89,6 +93,7 @@ #define BODYTYPE_GOLEM (1<<4) //The limb is a peg limb #define BODYTYPE_PEG (1<<5) +<<<<<<< HEAD // SKYRAT EDIT ADDITION ///The limb fits a modular custom shape #define BODYSHAPE_CUSTOM (1<<9) @@ -114,6 +119,22 @@ #define BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE (BODYTYPE_ROBOTIC | BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_GOLEM | BODYTYPE_PEG) #define BODYTYPE_CAN_BE_BIOSCRAMBLED(bodytype) (!(bodytype & BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE)) +======= + +// Bodyshape defines for how things can be worn, i.e., what "shape" the mob sprite is +///The limb fits the human mold. This is not meant to be literal, if the sprite "fits" on a human, it is "humanoid", regardless of origin. +#define BODYSHAPE_HUMANOID (1<<0) +///The limb fits the monkey mold. +#define BODYSHAPE_MONKEY (1<<1) +///The limb is digitigrade. +#define BODYSHAPE_DIGITIGRADE (1<<2) +///The limb is snouted. +#define BODYSHAPE_SNOUTED (1<<3) + +#define BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE (BODYTYPE_ROBOTIC | BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_GOLEM | BODYTYPE_PEG) +#define BODYTYPE_CAN_BE_BIOSCRAMBLED(bodytype) (!(bodytype & BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Defines for Species IDs. Used to refer to the name of a species, for things like bodypart names or species preferences. #define SPECIES_ABDUCTOR "abductor" #define SPECIES_ANDROID "android" @@ -163,7 +184,14 @@ ///The species is forced to have digitigrade legs in generation. #define DIGITIGRADE_FORCED 2 +<<<<<<< HEAD ///Digitigrade's prefs, used in features for legs if you're meant to be a Digitigrade. +======= +// Preferences for leg types +/// Legs that are normal +#define NORMAL_LEGS "Normal Legs" +/// Digitgrade legs that are like bended and uhhh no shoes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DIGITIGRADE_LEGS "Digitigrade Legs" // Health/damage defines @@ -316,7 +344,11 @@ #define BRUTE_DAMAGE_REQUIRED_TO_STOP_CRYSTALIZATION 30 +<<<<<<< HEAD #define CRYSTALIZE_STAGE_ENGULFING 100 //Cant use second defines +======= +#define CRYSTALIZE_STAGE_ENGULFING 100 //Can't use second defines +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CRYSTALIZE_STAGE_ENCROACHING 300 //In switches #define CRYSTALIZE_STAGE_SMALL 600 //Because they're not static @@ -438,6 +470,7 @@ #define OFFSET_SUIT "suit" #define OFFSET_NECK "neck" #define OFFSET_HELD "held" +<<<<<<< HEAD #define OFFSET_ACCESSORY "accessory" // Skyrat edit - addition #define OFFSET_HAIR "hair" // Skyrat edit - addition - Akulas @@ -454,6 +487,19 @@ #define POCKET_STRIP_DELAY (4 SECONDS) //time taken to search somebody's pockets #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you +======= + +//MINOR TWEAKS/MISC +#define AGE_MIN 17 //youngest a character can be +#define AGE_MAX 85 //oldest a character can be +#define AGE_MINOR 20 //legal age of space drinking and smoking +#define WIZARD_AGE_MIN 30 //youngest a wizard can be +#define APPRENTICE_AGE_MIN 29 //youngest an apprentice can be +#define SHOES_SLOWDOWN 0 //How much shoes slow you down by default. Negative values speed you up +#define POCKET_STRIP_DELAY (4 SECONDS) //time taken to search somebody's pockets +#define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define HUNGER_FACTOR 0.05 //factor at which mob nutrition decreases #define ETHEREAL_DISCHARGE_RATE (8e-4 * STANDARD_CELL_CHARGE) // Rate at which ethereal stomach charge decreases /// How much nutrition eating clothes as moth gives and drains @@ -505,6 +551,27 @@ #define RACE_SWAP (1<<3) //Wabbacjack staff projectiles #define WABBAJACK (1<<4) +<<<<<<< HEAD + +// These flags do NOT unlock the Lepton Violet shuttle, hardcoded in wabbajack() - use for things like xenobio, admins, etc. +//Badmin magic mirror +#define MIRROR_BADMIN (1<<5) +//ERT spawn template (avoid races that don't function without correct gear) +#define ERT_SPAWN (1<<6) +//xenobio black crossbreed +#define SLIME_EXTRACT (1<<7) + +// Randomization keys for calling wabbajack with. +// Note the contents of these keys are important, as they're displayed to the player +// Ex: (You turn into a "monkey", You turn into a "xenomorph") +#define WABBAJACK_MONKEY "monkey" +#define WABBAJACK_ROBOT "robot" +#define WABBAJACK_SLIME "slime" +#define WABBAJACK_XENO "xenomorph" +#define WABBAJACK_HUMAN "humanoid" +#define WABBAJACK_ANIMAL "animal" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // These flags do NOT unlock the Lepton Violet shuttle, hardcoded in wabbajack() - use for things like xenobio, admins, etc. //Badmin magic mirror @@ -524,7 +591,7 @@ #define WABBAJACK_HUMAN "humanoid" #define WABBAJACK_ANIMAL "animal" -// Reasons a defibrilation might fail +// Reasons a defibrillation might fail #define DEFIB_POSSIBLE (1<<0) #define DEFIB_FAIL_SUICIDE (1<<1) #define DEFIB_FAIL_HUSK (1<<2) @@ -689,6 +756,7 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( /// Total number of layers for mob overlays /// KEEP THIS UP-TO-DATE OR SHIT WILL BREAK /// Also consider updating layers_to_offset +<<<<<<< HEAD #define TOTAL_LAYERS 41 // SKYRAT EDIT CHANGE - ORIGINAL: 35 /// Mutations layer - Tk headglows, cold resistance glow, etc #define MUTATIONS_LAYER 41 // SKYRAT EDIT CHANGE - ORIGINAL: 35 @@ -719,6 +787,27 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( #define NIPPLES_LAYER 28 #define BANDAGE_LAYER 27 //SKYRAT EDIT ADDITION END +======= +#define TOTAL_LAYERS 35 +/// Mutations layer - Tk headglows, cold resistance glow, etc +#define MUTATIONS_LAYER 35 +/// Mutantrace features (tail when looking south) that must appear behind the body parts +#define BODY_BEHIND_LAYER 34 +/// Layer for bodyparts that should appear behind every other bodypart - Mostly, legs when facing WEST or EAST +#define BODYPARTS_LOW_LAYER 33 +/// Layer for most bodyparts, appears above BODYPARTS_LOW_LAYER and below BODYPARTS_HIGH_LAYER +#define BODYPARTS_LAYER 32 +/// Mutantrace features (snout, body markings) that must appear above the body parts +#define BODY_ADJ_LAYER 31 +/// Underwear, undershirts, socks, eyes, lips(makeup) +#define BODY_LAYER 30 +/// Mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) +#define FRONT_MUTATIONS_LAYER 29 +/// Damage indicators (cuts and burns) +#define DAMAGE_LAYER 28 +/// Jumpsuit clothing layer +#define UNIFORM_LAYER 27 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// ID card layer #define ID_LAYER 26 /// ID card layer (might be deprecated) @@ -740,7 +829,11 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( /// Glasses layer #define GLASSES_LAYER 17 /// Belt layer +<<<<<<< HEAD #define BELT_LAYER 16 //Possible make this an overlay of somethign required to wear a belt? +======= +#define BELT_LAYER 16 //Possible make this an overlay of something required to wear a belt? +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Suit storage layer (tucking a gun or baton underneath your armor) #define SUIT_STORE_LAYER 15 /// Neck layer (for wearing capes and bedsheets) @@ -819,6 +912,7 @@ GLOBAL_LIST_INIT(layers_to_offset, list( // WOUND_LAYER (full body) )) +<<<<<<< HEAD //Bitflags for the layers an external organ can draw on (organs can be drawn on multiple layers) /// Draws organ on the BODY_FRONT_LAYER #define EXTERNAL_FRONT (1 << 1) @@ -834,6 +928,15 @@ GLOBAL_LIST_INIT(layers_to_offset, list( /// Draws organ on the HEAD_LAYER, for things that need to be above hair but below hats. #define EXTERNAL_FRONT_ABOVE_HAIR (1 << 6) // SKYRAT EDIT END (not touching what comes next because we don't actually have to (nor want to)) +======= +//Bitflags for the layers a bodypart overlay can draw on (can be drawn on multiple layers) +/// Draws overlay on the BODY_FRONT_LAYER +#define EXTERNAL_FRONT (1 << 0) +/// Draws overlay on the BODY_ADJ_LAYER +#define EXTERNAL_ADJACENT (1 << 1) +/// Draws overlay on the BODY_BEHIND_LAYER +#define EXTERNAL_BEHIND (1 << 2) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Draws organ on all EXTERNAL layers #define ALL_EXTERNAL_OVERLAYS EXTERNAL_FRONT | EXTERNAL_ADJACENT | EXTERNAL_BEHIND @@ -879,7 +982,11 @@ GLOBAL_LIST_INIT(layers_to_offset, list( #define NEED_VENTCRAWL (1<<8) /// Skips adjacency checks #define BYPASS_ADJACENCY (1<<9) +<<<<<<< HEAD /// Skips reccursive loc checks +======= +/// Skips recursive loc checks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define NOT_INSIDE_TARGET (1<<10) /// Checks for base adjacency, but silences the error #define SILENT_ADJACENCY (1<<11) @@ -1011,6 +1118,11 @@ GLOBAL_LIST_INIT(layers_to_offset, list( /// The duration of the flip emote animation #define FLIP_EMOTE_DURATION 0.7 SECONDS +<<<<<<< HEAD +======= +///The duration of a taunt emote, so how long they can deflect projectiles +#define TAUNT_EMOTE_DURATION 0.9 SECONDS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Sprites for photocopying butts #define BUTT_SPRITE_HUMAN_MALE "human_male" diff --git a/code/__DEFINES/pai.dm b/code/__DEFINES/pai.dm index 356cbc28843..8d642b95676 100644 --- a/code/__DEFINES/pai.dm +++ b/code/__DEFINES/pai.dm @@ -12,7 +12,11 @@ #define PAI_SPAM_TIME (40 SECONDS) /// Maximum distance you can set the holoform leash +<<<<<<< HEAD #define HOLOFORM_MAX_RANGE 25 // SKYRAT EDIT CHANGE - ORIGINAL: #define HOLOFORM_MAX_RANGE 9 +======= +#define HOLOFORM_MAX_RANGE 9 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Minimum distance you can set the holoform leash #define HOLOFORM_MIN_RANGE 3 /// Default holoform leash distance diff --git a/code/__DEFINES/paper.dm b/code/__DEFINES/paper.dm index 0d70a2f3ca4..68485721601 100644 --- a/code/__DEFINES/paper.dm +++ b/code/__DEFINES/paper.dm @@ -18,3 +18,32 @@ #define BARCODE_SCANNER_INVENTORY "inventory" #define IS_WRITING_UTENSIL(thing) (thing?.get_writing_implement_details()?["interaction_mode"] == MODE_WRITING) +<<<<<<< HEAD +======= + +/** + * key defines used when converting a paper to and fro' a data/json list. It's really important that they stay the same + * lest we break persistence. + */ +#define LIST_PAPER_COLOR "paper_color" +#define LIST_PAPER_NAME "paper_name" + +#define LIST_PAPER_RAW_TEXT_INPUT "raw_text_input" +#define LIST_PAPER_RAW_FIELD_INPUT "raw_field_input" +#define LIST_PAPER_RAW_STAMP_INPUT "raw_stamp_input" + +#define LIST_PAPER_RAW_TEXT "raw_text" +#define LIST_PAPER_FONT "font" +#define LIST_PAPER_FIELD_COLOR "color" +#define LIST_PAPER_BOLD "bold" +#define LIST_PAPER_ADVANCED_HTML "advanced_html" + +#define LIST_PAPER_FIELD_INDEX "field_index" +#define LIST_PAPER_FIELD_DATA "field_data" +#define LIST_PAPER_IS_SIGNATURE "is_signature" + +#define LIST_PAPER_CLASS "class" +#define LIST_PAPER_STAMP_X "x" +#define LIST_PAPER_STAMP_Y "y" +#define LIST_PAPER_ROTATION "rotation" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index c85b2519869..02cb99106c5 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -60,7 +60,10 @@ // Playtime tracking system, see jobs_exp.dm #define EXP_TYPE_LIVING "Living" #define EXP_TYPE_CREW "Crew" +<<<<<<< HEAD #define EXP_TYPE_CENTRAL_COMMAND "Central Command" // SKYRAT EDIT ADD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define EXP_TYPE_COMMAND "Command" #define EXP_TYPE_ENGINEERING "Engineering" #define EXP_TYPE_MEDICAL "Medical" diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 686c42e07d0..13221b53910 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -37,6 +37,10 @@ #define RADIO_KEY_AI_PRIVATE "o" #define RADIO_TOKEN_AI_PRIVATE ":o" +#define RADIO_CHANNEL_ENTERTAINMENT "Entertainment" +#define RADIO_KEY_ENTERTAINMENT "p" +#define RADIO_TOKEN_ENTERTAINMENT ":p" + #define RADIO_CHANNEL_SYNDICATE "Syndicate" #define RADIO_KEY_SYNDICATE "t" @@ -73,6 +77,10 @@ #define FREQ_MEDICAL 1355 // Medical comms frequency, soft blue #define FREQ_ENGINEERING 1357 // Engineering comms frequency, orange #define FREQ_SECURITY 1359 // Security comms frequency, red +<<<<<<< HEAD +======= +#define FREQ_ENTERTAINMENT 1415 // Used by entertainment monitors, cyan +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FREQ_HOLOGRID_SOLUTION 1433 #define FREQ_STATUS_DISPLAYS 1435 @@ -130,3 +138,13 @@ #define RADIO_FREQENCY_LOCKED 1 /// Radio frequency is locked and unchangeable, but can be unlocked by an emag #define RADIO_FREQENCY_EMAGGABLE_LOCK 2 +<<<<<<< HEAD +======= + +///Bitflag for if a headset can use the syndicate radio channel +#define RADIO_SPECIAL_SYNDIE (1<<0) +///Bitflag for if a headset can use the centcom radio channel +#define RADIO_SPECIAL_CENTCOM (1<<1) +///Bitflag for if a headset can use the binary radio channel +#define RADIO_SPECIAL_BINARY (1<<2) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 2414ff046b2..2b779630b81 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -142,11 +142,19 @@ #define MAX_ADDICTION_POINTS 1000 ///Addiction start/ends +<<<<<<< HEAD #define WITHDRAWAL_STAGE1_START_CYCLE 121 // SKYRAT EDIT CHANGE - Original 61 #define WITHDRAWAL_STAGE1_END_CYCLE 240 // SKYRAT EDIT CHANGE - Original 120 #define WITHDRAWAL_STAGE2_START_CYCLE 241 // SKYRAT EDIT CHANGE - Original 121 #define WITHDRAWAL_STAGE2_END_CYCLE 360 // SKYRAT EDIT CHANGE - Original 180 #define WITHDRAWAL_STAGE3_START_CYCLE 361 // SKYRAT EDIT CHANGE - Original 181 +======= +#define WITHDRAWAL_STAGE1_START_CYCLE 61 +#define WITHDRAWAL_STAGE1_END_CYCLE 120 +#define WITHDRAWAL_STAGE2_START_CYCLE 121 +#define WITHDRAWAL_STAGE2_END_CYCLE 180 +#define WITHDRAWAL_STAGE3_START_CYCLE 181 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///reagent tags - used to look up reagents for specific effects. Feel free to add to but comment it /// This reagent does brute effects (BOTH damaging and healing) @@ -215,7 +223,11 @@ #define GOLDSCHLAGER_GOLD_RATIO (GOLDSCHLAGER_GOLD/(GOLDSCHLAGER_VODKA+GOLDSCHLAGER_GOLD)) /// The rate at which alcohol affects the drinker +<<<<<<< HEAD #define ALCOHOL_RATE 0.0025 // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: 0.005 +======= +#define ALCOHOL_RATE 0.005 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BLASTOFF_DANCE_MOVE_CHANCE_PER_UNIT 3 #define BLASTOFF_DANCE_MOVES_PER_SUPER_MOVE 3 diff --git a/code/__DEFINES/research/anomalies.dm b/code/__DEFINES/research/anomalies.dm index 209a539ac7e..bb1d379ad6d 100644 --- a/code/__DEFINES/research/anomalies.dm +++ b/code/__DEFINES/research/anomalies.dm @@ -43,9 +43,12 @@ GLOBAL_LIST_INIT(bioscrambler_organs_blacklist, typecacheof(list ( /obj/item/organ/internal/tongue/dullahan, /obj/item/organ/internal/vocal_cords/colossus, /obj/item/organ/internal/zombie_infection, +<<<<<<< HEAD /obj/item/organ/internal/empowered_borer_egg, // SKYRAT EDIT ADDITION /obj/item/organ/internal/eyes/robotic, // SKYRAT EDIT ADDITION /obj/item/organ/internal/eyes/night_vision/cyber, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ))) /// List of body parts we can apply to people diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm index f135635b185..ec280d42c33 100644 --- a/code/__DEFINES/robots.dm +++ b/code/__DEFINES/robots.dm @@ -55,6 +55,7 @@ ///Third Borg module slot. #define BORG_CHOOSE_MODULE_THREE 3 +<<<<<<< HEAD // SKYRAT EDIT START - TODO - Move this upstream later /// To store all the different cyborg models, instead of creating that for each cyborg. GLOBAL_LIST_EMPTY(cyborg_model_list) @@ -64,6 +65,8 @@ GLOBAL_LIST_EMPTY(cyborg_base_models_icon_list) GLOBAL_LIST_EMPTY(cyborg_all_models_icon_list) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SKIN_ICON "skin_icon" #define SKIN_ICON_STATE "skin_icon_state" #define SKIN_PIXEL_X "skin_pixel_x" diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 72f04b66869..ba380c965e6 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -17,10 +17,13 @@ #define ROLE_TRAITOR "Traitor" #define ROLE_WIZARD "Wizard" #define ROLE_SPY "Spy" +<<<<<<< HEAD // SKYRAT EDIT START #define ROLE_ASSAULT_OPERATIVE "Assault Operative" #define ROLE_OPFOR_CANDIDATE "OPFOR Candidate" // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Midround roles #define ROLE_ABDUCTOR "Abductor" @@ -41,12 +44,15 @@ #define ROLE_SPACE_DRAGON "Space Dragon" #define ROLE_SPIDER "Spider" #define ROLE_WIZARD_MIDROUND "Wizard (Midround)" +<<<<<<< HEAD //SKYRAT EDIT START #define ROLE_BORER "Borer" #define ROLE_LONE_INFILTRATOR "Lone Infiltrator" #define ROLE_MUTANT "Mutated Abomination" #define ROLE_CLOCK_CULTIST "Clock Cultist" // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define ROLE_VOIDWALKER "Voidwalker" // Latejoin roles @@ -127,6 +133,7 @@ #define ROLE_CYBER_POLICE "Cyber Police" #define ROLE_CYBER_TAC "Cyber Tac" #define ROLE_NETGUARDIAN "NetGuardian Prime" +<<<<<<< HEAD //SKYRAT EDIT START - Skyrat roles #define ROLE_BLACK_MARKET_DEALER "Black Market Dealer" #define ROLE_DS2 "DS2 Syndicate" @@ -134,6 +141,8 @@ #define ROLE_GHOST_CAFE "Ghost Cafe Visitor" #define ROLE_PORT_TARKON "Port Tarkon Survivor" //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// This defines the antagonists you can operate with in the settings. /// Keys are the antagonist, values are the number of days since the player's @@ -151,9 +160,12 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_TRAITOR = 0, ROLE_WIZARD = 14, ROLE_SPY = 0, +<<<<<<< HEAD // SKYRAT EDIT ADDITION ROLE_ASSAULT_OPERATIVE = 14, // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Midround ROLE_ABDUCTOR = 0, @@ -174,11 +186,14 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_SPACE_DRAGON = 0, ROLE_SPIDER = 0, ROLE_WIZARD_MIDROUND = 14, +<<<<<<< HEAD //SKYRAT EDIT START ROLE_LONE_INFILTRATOR = 0, ROLE_BORER = 0, ROLE_MUTANT = 0, //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ROLE_VOIDWALKER = 0, // Latejoin diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 86432d25ecb..cba857beed1 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -105,7 +105,11 @@ #define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "(F)" //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam +<<<<<<< HEAD #define MAX_MESSAGE_LEN 2048 //SKYRAT EDIT CHANGE - ORIGINAL 1024 - I SAID DOUBLE IT!! FUCK THE WARNING! +======= +#define MAX_MESSAGE_LEN 1024 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MAX_NAME_LEN 42 #define MAX_BROADCAST_LEN 512 #define MAX_CHARTER_LEN 80 diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm index 0e616b090dc..57a8b07c7c3 100644 --- a/code/__DEFINES/sight.dm +++ b/code/__DEFINES/sight.dm @@ -56,6 +56,7 @@ /// NOTE: this does not function with the SIDE_MAP map format. So we can't. :( //#define SEE_BLACKNESS (1<<10) +<<<<<<< HEAD /// Bitfield of sight flags that show things "inside" the blackness plane /// We've gotta alpha it down if we get this, cause otherwise the sight flag won't work #define BLACKNESS_CUTTING (SEE_MOBS|SEE_OBJS|SEE_TURFS|SEE_TURFS|SEE_TURFS) @@ -66,6 +67,8 @@ /// Range in tiles that a mob can see in the dark (used to determine if a mob has night_vision) #define NIGHTVISION_RANGE 8 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitfield of sight flags that show THINGS but no lighting /// Since lighting is an underlay on turfs, this is everything but that #define SEE_AVOID_TURF_BLACKNESS (SEE_MOBS|SEE_OBJS) diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 4094eb93f2f..034bc9a5e11 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -16,11 +16,14 @@ #define MAX_INSTRUMENT_CHANNELS (128 * 6) +<<<<<<< HEAD // SKYRAT EDIT START - JUKEBOX #define CHANNEL_JUKEBOX_START 1006 #define CHANNEL_HEV 1005 //SKYRAT EDIT CHANGE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Default range of a sound. #define SOUND_RANGE 17 #define MEDIUM_RANGE_SOUND_EXTRARANGE -5 @@ -122,6 +125,7 @@ #define ANNOUNCER_SHUTTLERECALLED "announcer_shuttlerecalled" #define ANNOUNCER_SPANOMALIES "announcer_spanomalies" +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN #define ANNOUNCER_SHUTTLELEFT "announcer_shuttleleft" #define ANNOUNCER_CARP "announcer_carp" @@ -153,6 +157,8 @@ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Global list of all of our announcer keys. GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_AIMALF, @@ -171,6 +177,7 @@ GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_SHUTTLEDOCK, ANNOUNCER_SHUTTLERECALLED, ANNOUNCER_SPANOMALIES, +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN ANNOUNCER_SHUTTLELEFT, ANNOUNCER_CARP, @@ -197,6 +204,8 @@ GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_NRI_RAIDERS, ANNOUNCER_OUTBREAK6, //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// List of all of our sound keys. @@ -242,3 +251,10 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_KEYBOARD_CLICKS "keyboard_clicks" #define SFX_STONE_DROP "stone_drop" #define SFX_STONE_PICKUP "stone_pickup" +<<<<<<< HEAD +======= +#define SFX_MUFFLED_SPEECH "muffspeech" +#define SFX_DEFAULT_FISH_SLAP "default_fish_slap" +#define SFX_ALT_FISH_SLAP "alt_fish_slap" +#define SFX_FISH_PICKUP "fish_pickup" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/spacevines.dm b/code/__DEFINES/spacevines.dm index 84739f344b5..082c6401481 100644 --- a/code/__DEFINES/spacevines.dm +++ b/code/__DEFINES/spacevines.dm @@ -27,10 +27,17 @@ #define SEVERITY_MAJOR 10 /// Kudzu mutativeness is based on a scale factor * potency +<<<<<<< HEAD #define MUTATIVENESS_SCALE_FACTOR 0.1 // SKYRAT EDIT CHANGE - Original: 0.2 /// Kudzu maximum mutation severity is a linear function of potency #define MAX_SEVERITY_LINEAR_COEFF 0.1 // SKYRAT EDIT CHANGE - Original: 0.15 +======= +#define MUTATIVENESS_SCALE_FACTOR 0.2 + +/// Kudzu maximum mutation severity is a linear function of potency +#define MAX_SEVERITY_LINEAR_COEFF 0.15 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MAX_SEVERITY_CONSTANT_TERM 10 /// Additional maximum mutation severity given to kudzu spawned by a random event diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index fadd0005315..36c3438e784 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -48,6 +48,10 @@ #define span_drone(str) ("" + str + "") #define span_engradio(str) ("" + str + "") #define span_extremelybig(str) ("" + str + "") +<<<<<<< HEAD +======= +#define span_enteradio(str) ("" + str + "") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define span_game_say(str) ("" + str + "") #define span_ghostalert(str) ("" + str + "") #define span_green(str) ("" + str + "") diff --git a/code/__DEFINES/species_clothing_paths.dm b/code/__DEFINES/species_clothing_paths.dm index be95aa3a3b0..17148efcc80 100644 --- a/code/__DEFINES/species_clothing_paths.dm +++ b/code/__DEFINES/species_clothing_paths.dm @@ -8,8 +8,16 @@ //DIGITIGRADE PATHS ///The dmi containing digitigrade uniforms +<<<<<<< HEAD #define DIGITIGRADE_UNIFORM_FILE 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi' // SKYRAT EDIT CHANGE ///The dmi containing digitigrade shoes #define DIGITIGRADE_SHOES_FILE 'modular_skyrat/master_files/icons/mob/clothing/feet_digi.dmi' // SKYRAT EDIT CHANGE ///The dmi containing digitigrade oversuits #define DIGITIGRADE_SUIT_FILE 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' // SKYRAT EDIT CHANGE +======= +#define DIGITIGRADE_UNIFORM_FILE 'icons/mob/human/species/misc/digitigrade.dmi' +///The dmi containing digitigrade shoes +#define DIGITIGRADE_SHOES_FILE 'icons/mob/human/species/misc/digitigrade_shoes.dmi' +///The dmi containing digitigrade oversuits +#define DIGITIGRADE_SUIT_FILE 'icons/mob/human/species/misc/digitigrade_suits.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 8ada83a2109..889fa06429c 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -24,6 +24,7 @@ #define CURSE_GRASPING (1<<3) //Incapacitated status effect flags +<<<<<<< HEAD /// If the incapacitated status effect will ignore a mob in restraints (handcuffs) #define IGNORE_RESTRAINTS (1<<0) /// If the incapacitated status effect will ignore a mob in stasis (stasis beds) @@ -31,6 +32,21 @@ /// If the incapacitated status effect will ignore a mob being agressively grabbed #define IGNORE_GRAB (1<<2) +======= +/// If the mob is normal incapacitated. Should never need this, just avoids issues if we ever overexpand this +#define TRADITIONAL_INCAPACITATED (1<<0) +/// If the incapacitated status effect is being caused by restraints (handcuffs) +#define INCAPABLE_RESTRAINTS (1<<1) +/// If the incapacitated status effect is being caused by stasis (stasis beds) +#define INCAPABLE_STASIS (1<<2) +/// If the incapacitated status effect is being caused by being agressively grabbed +#define INCAPABLE_GRAB (1<<3) + +/// Checks to see if a mob would be incapacitated even while ignoring some types +/// Does this by inverting the passed in flags and seeing if we're still incapacitated +#define INCAPACITATED_IGNORING(mob, flags) (mob.incapacitated & ~(flags)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Maxamounts of fire stacks a mob can get #define MAX_FIRE_STACKS 20 /// If a mob has a higher threshold than this, the icon shown will be increased to the big fire icon. diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 73241b9d34b..0757bd3f226 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -20,7 +20,11 @@ * * make sure you add an update to the schema_version stable in the db changelog */ +<<<<<<< HEAD #define DB_MINOR_VERSION 30 +======= +#define DB_MINOR_VERSION 27 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //! ## Timing subsystem @@ -39,7 +43,11 @@ * Timing should be based on how timing progresses on clients, not the server. * * Tracking this is more expensive, +<<<<<<< HEAD * should only be used in conjuction with things that have to progress client side, such as +======= + * should only be used in conjunction with things that have to progress client side, such as +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * animate() or sound() */ #define TIMER_CLIENT_TIME (1<<2) @@ -81,15 +89,22 @@ ///Nothing happens #define INITIALIZE_HINT_NORMAL 0 /** +<<<<<<< HEAD * call LateInitialize at the end of all atom Initalization * * The item will be added to the late_loaders list, this is iterated over after * initalization of subsystems is complete and calls LateInitalize on the atom +======= + * call LateInitialize at the end of all atom Initialization + * + * The item will be added to the late_loaders list, this is iterated over after + * initialization of subsystems is complete and calls LateInitalize on the atom +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * see [this file for the LateIntialize proc](atom.html#proc/LateInitialize) */ #define INITIALIZE_HINT_LATELOAD 1 -///Call qdel on the atom after intialization +///Call qdel on the atom after initialization #define INITIALIZE_HINT_QDEL 2 ///type and all subtypes should always immediately call Initialize in New() @@ -106,23 +121,39 @@ //! ### SS initialization hints /** +<<<<<<< HEAD * Negative values incidate a failure or warning of some kind, positive are good. * 0 and 1 are unused so that TRUE and FALSE are guarenteed to be invalid values. +======= + * Negative values indicate a failure or warning of some kind, positive are good. + * 0 and 1 are unused so that TRUE and FALSE are guaranteed to be invalid values. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /// Subsystem failed to initialize entirely. Print a warning, log, and disable firing. #define SS_INIT_FAILURE -2 +<<<<<<< HEAD /// The default return value which must be overriden. Will succeed with a warning. #define SS_INIT_NONE -1 /// Subsystem initialized sucessfully. +======= +/// The default return value which must be overridden. Will succeed with a warning. +#define SS_INIT_NONE -1 + +/// Subsystem initialized successfully. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SS_INIT_SUCCESS 2 /// If your system doesn't need to be initialized (by being disabled or something) #define SS_INIT_NO_NEED 3 +<<<<<<< HEAD /// Succesfully initialized, BUT do not announce it to players (generally to hide game mechanics it would otherwise spoil) +======= +/// Successfully initialized, BUT do not announce it to players (generally to hide game mechanics it would otherwise spoil) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SS_INIT_NO_MESSAGE 4 //! ### SS initialization load orders @@ -136,9 +167,14 @@ #define INIT_ORDER_DBCORE 95 #define INIT_ORDER_BLACKBOX 94 #define INIT_ORDER_SERVER_MAINT 93 +<<<<<<< HEAD #define INIT_ORDER_PLAYER_RANKS 86 // SKYRAT EDIT - Player Ranks Subsystem #define INIT_ORDER_INPUT 85 #define INIT_ORDER_ADMIN_VERBS 84 // needs to be pretty high, admins cant do much without it +======= +#define INIT_ORDER_INPUT 85 +#define INIT_ORDER_ADMIN_VERBS 84 // needs to be pretty high, admins can't do much without it +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_SOUNDS 83 #define INIT_ORDER_INSTRUMENTS 82 #define INIT_ORDER_GREYSCALE 81 @@ -156,7 +192,10 @@ #define INIT_ORDER_AI_CONTROLLERS 55 //So the controller can get the ref #define INIT_ORDER_TICKER 55 #define INIT_ORDER_TCG 55 +<<<<<<< HEAD #define INIT_ORDER_AUTOMAPPER 51 // SKYRAT EDIT ADDITION - We need to load just before mapping. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_MAPPING 50 #define INIT_ORDER_AI_IDLE_CONTROLLERS 50 #define INIT_ORDER_EARLY_ASSETS 48 @@ -167,9 +206,13 @@ #define INIT_ORDER_OUTPUTS 35 #define INIT_ORDER_RESTAURANT 34 #define INIT_ORDER_TTS 33 +<<<<<<< HEAD #define INIT_ORDER_POLLUTION 32 //SKYRAT EDIT ADDITION - //Needs to be above atoms #define INIT_ORDER_ATOMS 30 #define INIT_ORDER_ARMAMENTS 27 // SKYRAT EDIT ADDITION - Needs to be between atoms and default so it runs before gun companies +======= +#define INIT_ORDER_ATOMS 30 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_LANGUAGE 25 #define INIT_ORDER_MACHINES 20 #define INIT_ORDER_SKILLS 15 @@ -189,9 +232,12 @@ #define INIT_ORDER_SHUTTLE -21 #define INIT_ORDER_MINOR_MAPPING -40 #define INIT_ORDER_PATH -50 +<<<<<<< HEAD #define INIT_ORDER_MATURITY_GUARD -60 //SKYRAT EDIT ADDITION #define INIT_ORDER_DECAY -61 //SKYRAT EDIT ADDITION #define INIT_ORDER_POWERATOR_PENALITY -62 // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_EXPLOSIONS -69 #define INIT_ORDER_STATPANELS -97 #define INIT_ORDER_BAN_CACHE -98 diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm index 2fb6ab61557..07e1ffcb858 100644 --- a/code/__DEFINES/surgery.dm +++ b/code/__DEFINES/surgery.dm @@ -28,6 +28,10 @@ #define ORGAN_VIRGIN (1<<10) /// ALWAYS show this when scanned by advanced scanners, even if it is totally healthy #define ORGAN_PROMINENT (1<<11) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Helper to figure out if a limb is organic #define IS_ORGANIC_LIMB(limb) (limb.bodytype & BODYTYPE_ORGANIC) /// Helper to figure out if a limb is robotic @@ -67,7 +71,11 @@ /// All head flags, default for most heads #define HEAD_ALL_FEATURES (HEAD_HAIR|HEAD_FACIAL_HAIR|HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN) +<<<<<<< HEAD /// When the surgery step fails :( +======= +/// Return value when the surgery step fails :( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SURGERY_STEP_FAIL -1 // Flags for surgery_flags on surgery datums diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm index 06d2a938898..42574992f97 100644 --- a/code/__DEFINES/text.dm +++ b/code/__DEFINES/text.dm @@ -94,10 +94,13 @@ #define FLESH_SCAR_FILE "wounds/flesh_scar_desc.json" /// File location for bone wound descriptions #define BONE_SCAR_FILE "wounds/bone_scar_desc.json" +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - SYNTH WOUNDS /// File location for metalic wound descriptions #define METAL_SCAR_FILE "wounds/metal_scar_desc.json" // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// File location for scar wound descriptions #define SCAR_LOC_FILE "wounds/scar_loc.json" /// File location for exodrone descriptions diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index 4766b3dfe66..f4416fb65bf 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,7 +1,11 @@ // tgstation-server DMAPI // The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119. +<<<<<<< HEAD #define TGS_DMAPI_VERSION "7.2.1" +======= +#define TGS_DMAPI_VERSION "7.3.0" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // All functions and datums outside this document are subject to change with any version and should not be relied on. diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index ff2e0aa3198..2b27ff263e7 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -24,7 +24,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_PULL_BLOCKED "pullblocked" /// Abstract condition that prevents movement if being pulled and might be resisted against. Handcuffs and straight jackets, basically. #define TRAIT_RESTRAINED "restrained" +<<<<<<< HEAD /// Apply this to make a mob not dense, and remove it when you want it to no longer make them undense, other sorces of undesity will still apply. Always define a unique source when adding a new instance of this! +======= +/// Apply this to make a mob not dense, and remove it when you want it to no longer make them undense, other sources of undesity will still apply. Always define a unique source when adding a new instance of this! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_UNDENSE "undense" /// Expands our FOV by 30 degrees if restricted #define TRAIT_EXPANDED_FOV "expanded_fov" @@ -50,7 +54,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_DEAF "deaf" #define TRAIT_FAT "fat" #define TRAIT_HUSK "husk" +<<<<<<< HEAD ///Blacklisted from being revived via defibrilator +======= +///Blacklisted from being revived via defibrillator +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_DEFIB_BLACKLISTED "defib_blacklisted" #define TRAIT_BADDNA "baddna" #define TRAIT_CLUMSY "clumsy" @@ -169,7 +177,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_NO_ZOMBIFY "no_zombify" /// Carbons with this trait can't have their DNA copied by diseases nor changelings #define TRAIT_NO_DNA_COPY "no_dna_copy" +<<<<<<< HEAD /// Carbons with this trait cant have their dna scrambled by genetics or a disease retrovirus. +======= +/// Carbons with this trait can't have their DNA scrambled by genetics or a disease retrovirus. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_NO_DNA_SCRAMBLE "no_dna_scramble" /// Carbons with this trait can eat blood to regenerate their own blood volume, instead of injecting it #define TRAIT_DRINKS_BLOOD "drinks_blood" @@ -233,6 +245,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FISHING_SPOT "fishing_spot" ///Trait given to mobs that can fish without a rod #define TRAIT_PROFOUND_FISHER "profound_fisher" +<<<<<<< HEAD +======= +/// If an atom has this trait, then you can toss a bottle with a message in it. +#define TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION "message_in_a_bottle_location" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// This trait lets you evaluate someone's fitness level against your own #define TRAIT_EXAMINE_FITNESS "reveal_power_level" /// These mobs have particularly hygienic tongues @@ -253,7 +270,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Stop the mob from sliding around from being slipped, but not the slip part. /// DOES NOT include ice slips. #define TRAIT_NO_SLIP_SLIDE "noslip_slide" +<<<<<<< HEAD /// Stops all slipping and sliding from ocurring +======= +/// Stops all slipping and sliding from occurring +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_NO_SLIP_ALL "noslip_all" /// Unlinks gliding from movement speed, meaning that there will be a delay between movements rather than a single move movement between tiles @@ -362,16 +383,25 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_GUNFLIP "gunflip" /// Increases chance of getting special traumas, makes them harder to cure #define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" +<<<<<<< HEAD /// Doubles the duration and cooldown of a flip #define TRAIT_SLOW_FLIP "slow_flip" #define TRAIT_SPACEWALK "spacewalk" /// Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we werent +======= +#define TRAIT_SPACEWALK "spacewalk" +/// Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we weren't +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_HYPERSPACED "hyperspaced" ///Gives the movable free hyperspace movement without being pulled during shuttle transit #define TRAIT_FREE_HYPERSPACE_MOVEMENT "free_hyperspace_movement" ///Lets the movable move freely in the soft-cordon area of transit space, which would otherwise teleport them away just before they got to see the true cordon #define TRAIT_FREE_HYPERSPACE_SOFTCORDON_MOVEMENT "free_hyperspace_softcordon_movement" +<<<<<<< HEAD ///Deletes the object upon being dumped into space, usually from exiting hyperspace. Useful if you're spawning in a lot of stuff for hyperspace events that dont need to flood the entire game +======= +///Deletes the object upon being dumped into space, usually from exiting hyperspace. Useful if you're spawning in a lot of stuff for hyperspace events that don't need to flood the entire game +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_DEL_ON_SPACE_DUMP "del_on_hyperspace_leave" /// We can walk up or around cliffs, or at least we don't fall off of it #define TRAIT_CLIFF_WALKER "cliff_walker" @@ -438,7 +468,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_BLOODSHOT_EYES "bloodshot_eyes" /// This mob should never close UI even if it doesn't have a client #define TRAIT_PRESERVE_UI_WITHOUT_CLIENT "preserve_ui_without_client" +<<<<<<< HEAD /// This mob overrides certian SSlag_switch measures with this special trait +======= +/// This mob overrides certain SSlag_switch measures with this special trait +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_BYPASS_MEASURES "bypass_lagswitch_measures" /// Someone can safely be attacked with honorbound with ONLY a combat mode check, the trait is assuring holding a weapon and hitting won't hurt them.. #define TRAIT_ALLOWED_HONORBOUND_ATTACK "allowed_honorbound_attack" @@ -534,9 +568,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Mobs with this trait cannot be hit by projectiles, meaning the projectiles will just go through. #define TRAIT_UNHITTABLE_BY_PROJECTILES "unhittable_by_projectiles" +<<<<<<< HEAD /// Projectile with this trait will always hit the defined zone of a struck living mob. #define TRAIT_ALWAYS_HIT_ZONE "always_hit_zone" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Mobs with this trait do care about a few grisly things, such as digging up graves. They also really do not like bringing people back to life or tending wounds, but love autopsies and amputations. #define TRAIT_MORBID "morbid" @@ -677,6 +714,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// This movable atom has the explosive block element #define TRAIT_BLOCKING_EXPLOSIVES "blocking_explosives" +<<<<<<< HEAD +======= +///This mob is currently blocking a projectile. +#define TRAIT_BLOCKING_PROJECTILES "blocking_projectiles" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Lava will be safe to cross while it has this trait. #define TRAIT_LAVA_STOPPED "lava_stopped" ///Chasms will be safe to cross while they've this trait. @@ -743,14 +785,29 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FOOD_SILVER "food_silver" /// If this item's been made by a chef instead of being map-spawned or admin-spawned or such #define TRAIT_FOOD_CHEF_MADE "food_made_by_chef" +<<<<<<< HEAD +======= +/// This atom has a quality_food_ingredient element attached +#define TRAIT_QUALITY_FOOD_INGREDIENT "quality_food_ingredient" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The items needs two hands to be carried #define TRAIT_NEEDS_TWO_HANDS "needstwohands" /// Can't be catched when thrown #define TRAIT_UNCATCHABLE "uncatchable" +<<<<<<< HEAD +======= +/// You won't catch duds while fishing with this rod. +#define TRAIT_ROD_REMOVE_FISHING_DUD "rod_remove_fishing_dud" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Stuff that can go inside fish cases #define TRAIT_FISH_CASE_COMPATIBILE "fish_case_compatibile" /// If the item can be used as a bit. #define TRAIT_FISHING_BAIT "fishing_bait" +<<<<<<< HEAD +======= +/// This bait will kill any fish that doesn't have it on its favorite_bait list +#define TRAIT_POISONOUS_BAIT "poisonous_bait" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The quality of the bait. It influences odds of catching fish #define TRAIT_BASIC_QUALITY_BAIT "baic_quality_bait" #define TRAIT_GOOD_QUALITY_BAIT "good_quality_bait" @@ -758,7 +815,18 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Baits with this trait will ignore bait preferences and related fish traits. #define TRAIT_OMNI_BAIT "omni_bait" /// The bait won't be consumed when used +<<<<<<< HEAD #define TRAIT_BAIT_UNCONSUMABLE "bait_unconsumabe" +======= +#define TRAIT_BAIT_UNCONSUMABLE "bait_unconsumable" +/// This bait ignores environmental conditions for fishing (like low light for nocturnal fish) +#define TRAIT_BAIT_IGNORE_ENVIRONMENT "bait_ignore_environment" +/** + * This bait won't apply TRAIT_ROD_REMOVE_FISHING_DUD to the rod it's attached on, + * instead, it'll allow the fishing dud to be there unless there's at least one fish that likes the bait + */ +#define TRAIT_BAIT_ALLOW_FISHING_DUD "bait_dont_affect_fishing_dud" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Plants that were mutated as a result of passive instability, not a mutation threshold. #define TRAIT_PLANT_WILDMUTATE "wildmutation" /// If you hit an APC with exposed internals with this item it will try to shock you @@ -952,6 +1020,17 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FISH_FROM_CASE "fish_from_case" ///Fish will also occasionally fire weak tesla zaps #define TRAIT_FISH_ELECTROGENESIS "fish_electrogenesis" +<<<<<<< HEAD +======= +///Offsprings from this fish will never be of its same type (unless it's self-reproducing). +#define TRAIT_FISH_RECESSIVE "fish_recessive" +///This fish comes equipped with a stinger (increased damage and potentially venomous if also toxic) +#define TRAIT_FISH_STINGER "fish_stinger" +///This fish is currently on cooldown and cannot splash ink unto people's faces +#define TRAIT_FISH_INK_ON_COOLDOWN "fish_ink_on_cooldown" +///This fish requires two hands to carry even if smaller than FISH_SIZE_TWO_HANDS_REQUIRED, as long as it's bulky-sized. +#define TRAIT_FISH_SHOULD_TWOHANDED "should_twohanded" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trait given to angelic constructs to let them purge cult runes #define TRAIT_ANGELIC "angelic" @@ -1049,6 +1128,16 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// things with this trait are treated as having no access in /atom/movable/proc/check_access(obj/item) #define TRAIT_ALWAYS_NO_ACCESS "alwaysnoaccess" +<<<<<<< HEAD +======= +///The entity has Silicon 'access', so is either a silicon, has an access wand, or is an admin ghost AI. +///This is put on the mob, it is used on the client for Admins but they are the exception as they use `isAdminGhostAI`. +#define TRAIT_SILICON_ACCESS "silicon_access_trait" +///The entity has AI 'access', so is either an AI, has an access wand, or is an admin ghost AI. Used to block off regular Silicons from things. +///This is put on the mob, it is used on the client for Admins but they are the exception as they use `isAdminGhostAI`. +#define TRAIT_AI_ACCESS "ai_access_trait" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Used by wearable_client_colour to determine whether the mob wants to have the colours of the screen affected by worn items (some still do regardless). #define TRAIT_SEE_WORN_COLOURS "see_worn_colour" @@ -1094,6 +1183,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Currently fishing #define TRAIT_GONE_FISHING "fishing" +<<<<<<< HEAD +======= +/// Currently fishing, and it's the active minigame phase +#define TRAIT_ACTIVELY_FISHING "actively_fishing" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Makes a character be better/worse at tackling depending on their wing's status #define TRAIT_TACKLING_WINGED_ATTACKER "tacking_winged_attacker" @@ -1199,6 +1293,15 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Trait given to anything linked to, not necessarily allied to, the mansus #define TRAIT_MANSUS_TOUCHED "mansus_touched" +<<<<<<< HEAD +======= + +// These traits are used in IS_X() as an OR, and is utilized for pseudoantags (such as deathmatch or domains) so they don't need to actually get antag status. +// To specifically and only get the antag datum, GET_X() exists now. +#define TRAIT_ACT_AS_CULTIST "act_as_cultist" +#define TRAIT_ACT_AS_HERETIC "act_as_heretic" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Appiled when wizard buy (/datum/spellbook_entry/perks/spalls_lottery) perk. /// Give 50/25% chance not spend a spellbook charge on 1/2 cost spell. /// Appiled it wizard can't refund any spells. diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm index d50de26219b..37b75c31d70 100644 --- a/code/__DEFINES/traits/sources.dm +++ b/code/__DEFINES/traits/sources.dm @@ -36,6 +36,11 @@ #define VENDING_MACHINE_TRAIT "vending_machine" +<<<<<<< HEAD +======= +///A trait given by a held item +#define HELD_ITEM_TRAIT "held-item-trait" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define ABSTRACT_ITEM_TRAIT "abstract-item" /// A trait given by any status effect #define STATUS_EFFECT_TRAIT "status-effect" @@ -45,7 +50,12 @@ /// Trait given by an Action datum #define ACTION_TRAIT "action" +<<<<<<< HEAD +======= +///A trait given by someone blocking. +#define BLOCKING_TRAIT "blocking" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CLOTHING_TRAIT "clothing" #define HELMET_TRAIT "helmet" /// inherited from the mask diff --git a/code/__DEFINES/transport.dm b/code/__DEFINES/transport.dm index b47bb6c2f06..cb2caea75e8 100644 --- a/code/__DEFINES/transport.dm +++ b/code/__DEFINES/transport.dm @@ -99,10 +99,15 @@ DEFINE_BITFIELD(request_flags, list( #define XING_STATE_RED 2 #define XING_STATE_MALF 3 +<<<<<<< HEAD // #define XING_THRESHOLD_AMBER 45 // #define XING_THRESHOLD_RED 27 #define XING_THRESHOLD_AMBER 60 // SKYRAT EDIT CHANGE - RUN/WALK SPEED #define XING_THRESHOLD_RED 36 // SKYRAT EDIT CHANGE - RUN/WALK SPEED +======= +#define XING_THRESHOLD_AMBER 45 +#define XING_THRESHOLD_RED 27 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DEFAULT_TRAM_LENGTH 10 #define DEFAULT_TRAM_MIDPOINT 5 diff --git a/code/__DEFINES/wiremod.dm b/code/__DEFINES/wiremod.dm index 45c2dfae84b..a7c8eeaea1a 100644 --- a/code/__DEFINES/wiremod.dm +++ b/code/__DEFINES/wiremod.dm @@ -123,10 +123,13 @@ #define CIRCUIT_FLAG_REFUSE_MODULE (1<<5) /// This circuit component cannot be inserted into the same circuit multiple times. Only use this for major headaches. #define CIRCUIT_NO_DUPLICATES (1<<6) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - This is required since we have two reagent components, and the BCI only allows one active /// This circuit component is a reagent container type. Check for existing reagent containers before adding. #define CIRCUIT_REAGENT_CONTAINER_TYPE (1<<7) // This value should not conflict with any of the previous flags // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Datatype flags /// The datatype supports manual inputs diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index 678a3fa80b9..64b312b04da 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -46,6 +46,10 @@ GLOBAL_LIST_INIT(wound_severities_chronological, list( /// Mainly a define used for wound_pregen_data, if a pregen data instance expects this, it will accept any and all wound types, even none at all #define WOUND_ALL "wound_all" +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // ~determination second wind defines // How much determination reagent to add each time someone gains a new wound in [/datum/wound/proc/second_wind] #define WOUND_DETERMINATION_MODERATE 1 @@ -113,6 +117,10 @@ GLOBAL_LIST_INIT(bio_state_anatomy, list( // Wound series // A "wound series" is just a family of wounds that logically follow eachother // Multiple wounds in a single series cannot be on a limb - the highest severity will always be prioritized, and lower ones will be skipped +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// T1-T3 Bleeding slash wounds. Requires flesh. Can cause bleeding, but doesn't require it. From: slash.dm #define WOUND_SERIES_FLESH_SLASH_BLEED "wound_series_flesh_slash_bled" /// T1-T3 Basic blunt wounds. T1 requires jointed, but 2-3 require bone. From: bone.dm @@ -126,6 +134,7 @@ GLOBAL_LIST_INIT(bio_state_anatomy, list( /// Cranial fissure wound. #define WOUND_SERIES_CRANIAL_FISSURE "wound_series_cranial_fissure" +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MUSCLE AND SYNTH WOUNDS // Have to put it here so I can use it in the global list of wound series /// See muscle.dm and robotic_blunt.dm @@ -137,6 +146,8 @@ GLOBAL_LIST_INIT(bio_state_anatomy, list( #define WOUND_SERIES_WIRE_PIERCE_ELECTRICAL_DAMAGE "wound_series_metal_pierce_electrical_damage_basic" // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A assoc list of (wound typepath -> wound_pregen_data instance). Every wound should have a pregen data. GLOBAL_LIST_INIT_TYPED(all_wound_pregen_data, /datum/wound_pregen_data, generate_wound_static_data()) @@ -208,6 +219,7 @@ GLOBAL_LIST_INIT(wound_series_collections, generate_wound_series_collection()) /// Allows for determining of which wound series are caused by what. GLOBAL_LIST_INIT(wounding_types_to_series, list( WOUND_BLUNT = list( +<<<<<<< HEAD WOUND_SERIES_BONE_BLUNT_BASIC, WOUND_SERIES_MUSCLE_DAMAGE, // SKYRAT EDIT -- MUSCLE WOUNDS WOUND_SERIES_METAL_BLUNT_BASIC, // SKYRAT EDIT ADDITION - SYNTH WOUNDS @@ -227,6 +239,18 @@ GLOBAL_LIST_INIT(wounding_types_to_series, list( WOUND_SERIES_FLESH_PUNCTURE_BLEED, WOUND_SERIES_MUSCLE_DAMAGE, // SKYRAT EDIT ADDITION - MUSCLE WOUNDS WOUND_SERIES_WIRE_PIERCE_ELECTRICAL_DAMAGE, // SKYRAT EDIT ADDITION - SYNTH WOUNDS +======= + WOUND_SERIES_BONE_BLUNT_BASIC + ), + WOUND_SLASH = list( + WOUND_SERIES_FLESH_SLASH_BLEED, + ), + WOUND_BURN = list( + WOUND_SERIES_FLESH_BURN_BASIC, + ), + WOUND_PIERCE = list( + WOUND_SERIES_FLESH_PUNCTURE_BLEED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), )) @@ -297,8 +321,12 @@ GLOBAL_LIST_INIT(wounding_types_to_series, list( /// Assoc list of biotype -> ideal scar file to be used and grab stuff from. GLOBAL_LIST_INIT(biotypes_to_scar_file, list( "[BIO_FLESH]" = FLESH_SCAR_FILE, +<<<<<<< HEAD "[BIO_BONE]" = BONE_SCAR_FILE, "[BIO_METAL]" = METAL_SCAR_FILE // SKYRAT EDIT ADDITION - METAL SCARS (see robotic_blunt.dm) +======= + "[BIO_BONE]" = BONE_SCAR_FILE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) // ~burn wound infection defines diff --git a/code/__HELPERS/_auxtools_api.dm b/code/__HELPERS/_auxtools_api.dm index 0117ded4c51..92782717d1a 100644 --- a/code/__HELPERS/_auxtools_api.dm +++ b/code/__HELPERS/_auxtools_api.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD #define AUXTOOLS_FULL_INIT 2 #define AUXTOOLS_PARTIAL_INIT 1 @@ -33,6 +34,8 @@ GLOBAL_PROTECT(auxtools_initialized) GLOB.auxtools_initialized[LIB] = FALSE;\ } +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/auxtools_stack_trace(msg) CRASH(msg) diff --git a/code/__HELPERS/_dreamluau.dm b/code/__HELPERS/_dreamluau.dm index 196774d6a88..7915a6d14b6 100644 --- a/code/__HELPERS/_dreamluau.dm +++ b/code/__HELPERS/_dreamluau.dm @@ -1,8 +1,18 @@ /* This comment bypasses grep checks */ /var/__dreamluau +<<<<<<< HEAD #define DREAMLUAU (world.system_type == MS_WINDOWS ? "dreamluau.dll" : (__dreamluau || (__dreamluau = __detect_auxtools("dreamluau")))) #define DREAMLUAU_CALL(func) call_ext(DREAMLUAU, "byond:[#func]") +======= +/* This comment also bypasses grep checks */ /var/__dreamluau_exists + +#define DREAMLUAU_EXISTS (__dreamluau_exists ||= fexists(DREAMLUAU)) + +#define DREAMLUAU (world.system_type == MS_WINDOWS ? "dreamluau.dll" : (__dreamluau ||= __detect_auxtools("dreamluau"))) + +#define DREAMLUAU_CALL(func) (!DREAMLUAU_EXISTS) ? null : call_ext(DREAMLUAU, "byond:[#func]") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * All of the following functions will return a string if the underlying rust code returns an error or a wrapped panic. diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 157a17012a8..dc87b93372d 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -978,17 +978,32 @@ else return element +<<<<<<< HEAD /// Returns a copy of the list where any element that is a datum or the world is converted into a ref /proc/refify_list(list/target_list, list/visited, path_accumulator = "list") if(!visited) visited = list() var/list/ret = list() visited[target_list] = path_accumulator +======= +/** + * Intermediate step for preparing lists to be passed into the lua editor tgui. + * Resolves weakrefs, converts some values without a standard textual representation to text, + * and can handle self-referential lists and potential duplicate output keys. + */ +/proc/prepare_lua_editor_list(list/target_list, list/visited) + if(!visited) + visited = list() + var/list/ret = list() + visited[target_list] = ret + var/list/duplicate_keys = list() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in 1 to target_list.len) var/key = target_list[i] var/new_key = key if(isweakref(key)) var/datum/weakref/ref = key +<<<<<<< HEAD var/resolved = ref.resolve() if(resolved) new_key = "[resolved] [REF(resolved)]" @@ -1025,6 +1040,43 @@ var/list/to_add = list(new_key) if(value) to_add[new_key] = value +======= + new_key = ref.resolve() || "null weakref" + else if(key == world) + new_key = world.name + else if(ref(key) == "\[0xe000001\]") + new_key = "global" + else if(islist(key)) + if(visited[key]) + new_key = visited[key] + else + new_key = prepare_lua_editor_list(key, visited) + var/value + if(!isnull(key) && !isnum(key)) + value = target_list[key] + if(isweakref(value)) + var/datum/weakref/ref = value + value = ref.resolve() || "null weakref" + if(value == world) + value = "world" + else if(ref(value) == "\[0xe000001\]") + value = "global" + else if(islist(value)) + if(visited[value]) + value = visited[value] + else + value = prepare_lua_editor_list(value, visited) + var/list/to_add = list() + if(!isnull(value)) + var/final_key = new_key + while(duplicate_keys[final_key]) + duplicate_keys[new_key]++ + final_key = "[new_key] ([duplicate_keys[new_key]])" + duplicate_keys[final_key] = 1 + to_add[final_key] = value + else + to_add += list(new_key) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ret += to_add if(i < target_list.len) CHECK_TICK @@ -1033,16 +1085,28 @@ /** * Converts a list into a list of assoc lists of the form ("key" = key, "value" = value) * so that list keys that are themselves lists can be fully json-encoded +<<<<<<< HEAD */ /proc/kvpify_list(list/target_list, depth = INFINITY, list/visited, path_accumulator = "list") if(!visited) visited = list() var/list/ret = list() visited[target_list] = path_accumulator +======= + * and that unique objects with the same string representation do not + * produce duplicate keys that are clobbered by the standard JavaScript JSON.parse function + */ +/proc/kvpify_list(list/target_list, depth = INFINITY, list/visited) + if(!visited) + visited = list() + var/list/ret = list() + visited[target_list] = ret +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in 1 to target_list.len) var/key = target_list[i] var/new_key = key if(islist(key) && depth) +<<<<<<< HEAD if(visited.Find(key)) new_key = visited[key] else @@ -1056,6 +1120,21 @@ else value = kvpify_list(value, depth-1, visited, path_accumulator + "\[[key]\]") if(value) +======= + if(visited[key]) + new_key = visited[key] + else + new_key = kvpify_list(key, depth-1, visited) + var/value + if(!isnull(key) && !isnum(key)) + value = target_list[key] + if(islist(value) && depth) + if(visited[value]) + value = visited[value] + else + value = kvpify_list(value, depth-1, visited) + if(!isnull(value)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ret += list(list("key" = new_key, "value" = value)) else ret += list(list("key" = i, "value" = new_key)) @@ -1065,12 +1144,21 @@ /// Compares 2 lists, returns TRUE if they are the same /proc/deep_compare_list(list/list_1, list/list_2) +<<<<<<< HEAD if(!islist(list_1) || !islist(list_2)) return FALSE if(list_1 == list_2) return TRUE +======= + if(list_1 == list_2) + return TRUE + + if(!islist(list_1) || !islist(list_2)) + return FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(list_1.len != list_2.len) return FALSE @@ -1093,11 +1181,19 @@ return TRUE /// Returns a copy of the list where any element that is a datum is converted into a weakref +<<<<<<< HEAD /proc/weakrefify_list(list/target_list, list/visited, path_accumulator = "list") if(!visited) visited = list() var/list/ret = list() visited[target_list] = path_accumulator +======= +/proc/weakrefify_list(list/target_list, list/visited) + if(!visited) + visited = list() + var/list/ret = list() + visited[target_list] = ret +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in 1 to target_list.len) var/key = target_list[i] var/new_key = key @@ -1107,13 +1203,20 @@ if(visited.Find(key)) new_key = visited[key] else +<<<<<<< HEAD new_key = weakrefify_list(key, visited, path_accumulator + "\[[i]\]") var/value if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world) +======= + new_key = weakrefify_list(key, visited) + var/value + if(!isnull(key) && !isnum(key)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 value = target_list[key] if(isdatum(value)) value = WEAKREF(value) else if(islist(value)) +<<<<<<< HEAD if(visited.Find(value)) value = visited[value] else @@ -1163,6 +1266,14 @@ value = encode_text_and_nulls(value, visited) var/list/to_add = list(new_key) if(value) +======= + if(visited[value]) + value = visited[value] + else + value = weakrefify_list(value, visited) + var/list/to_add = list(new_key) + if(!isnull(value)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_add[new_key] = value ret += to_add if(i < target_list.len) @@ -1188,3 +1299,158 @@ if("x" in coords) return locate(coords["x"], coords["y"], coords["z"]) return locate(coords[1], coords[2], coords[3]) +<<<<<<< HEAD +======= + +/** + * Given a list and a list of its variant hints, appends variants that aren't explicitly required by dreamluau, + * but are required by the lua editor tgui. + */ +/proc/add_lua_editor_variants(list/values, list/variants, list/visited, path = "") + if(!islist(visited)) + visited = list() + visited[values] = "\[\]" + if(!islist(values) || !islist(variants)) + return + if(values.len != variants.len) + CRASH("values and variants must be the same length") + for(var/i in 1 to variants.len) + var/pair = variants[i] + var/pair_modified = FALSE + if(isnull(pair)) + pair = list("key", "value") + var/key = values[i] + if(islist(key)) + if(visited[key]) + pair["key"] = list("cycle", visited[key]) + else + var/list/key_variants = pair["key"] + var/new_path = path + "\[[i], \"key\"\]," + visited[key] = new_path + add_lua_editor_variants(key, key_variants, visited, new_path) + visited -= key + pair["key"] = list("list", key_variants) + pair_modified = TRUE + else if(isdatum(key) || key == world || ref(key) == "\[0xe000001\]") + pair["key"] = list("ref", ref(key)) + pair_modified = TRUE + var/value + if(!isnull(key) && !isnum(key)) + value = values[key] + if(islist(value)) + if(visited[value]) + pair["value"] = list("cycle", visited[value]) + else + var/list/value_variants = pair["value"] + var/new_path = path + "\[[i], \"value\"\]," + visited[value] = new_path + add_lua_editor_variants(value, value_variants, visited, new_path) + visited -= value + pair["value"] = list("list", value_variants) + pair_modified = TRUE + else if(isdatum(value) || value == world || ref(value) == "\[0xe000001\]") + pair["value"] = list("ref", ref(value)) + pair_modified = TRUE + if(pair_modified && pair != variants[i]) + variants[i] = pair + if(i < variants.len) + CHECK_TICK + +/proc/add_lua_return_value_variants(list/values, list/variants) + if(!islist(values) || !islist(variants)) + return + if(values.len != variants.len) + CRASH("values and variants must be the same length") + for(var/i in 1 to values.len) + var/value = values[i] + if(islist(value)) + add_lua_editor_variants(value, variants[i]) + else if(isdatum(value) || value == world || ref(value) == "\[0xe000001\]") + variants[i] = list("ref", ref(value)) + +/proc/deep_copy_without_cycles(list/values, list/visited) + if(!islist(visited)) + visited = list() + if(!islist(values)) + return values + var/list/ret = list() + var/cycle_count = 0 + visited[values] = TRUE + for(var/i in 1 to values.len) + var/key = values[i] + var/out_key = key + if(islist(key)) + if(visited[key]) + do + out_key = "\[cyclical reference[cycle_count ? " (i)" : ""]\]" + cycle_count++ + while(values.Find(out_key)) + else + visited[key] = TRUE + out_key = deep_copy_without_cycles(key, visited) + visited -= key + var/value + if(!isnull(key) && !isnum(key)) + value = values[key] + var/out_value = value + if(islist(value)) + if(visited[value]) + out_value = "\[cyclical reference\]" + else + visited[value] = TRUE + out_value = deep_copy_without_cycles(value, visited) + visited -= value + var/list/to_add = list(out_key) + if(!isnull(out_value)) + to_add[out_key] = out_value + ret += to_add + if(i < values.len) + CHECK_TICK + return ret + +/** + * Given a list and a list of its variant hints, removes any list key/values that are represent lua values that could not be directly converted to DM. + */ +/proc/remove_non_dm_variants(list/return_values, list/variants, list/visited) + if(!islist(visited)) + visited = list() + if(!islist(return_values) || !islist(variants) || visited[return_values]) + return + visited[return_values] = TRUE + if(return_values.len != variants.len) + CRASH("return_values and variants must be the same length") + for(var/i in 1 to variants.len) + var/pair = variants[i] + if(!islist(variants)) + continue + var/key = return_values[i] + if(pair["key"]) + if(!islist(pair["key"])) + return_values[i] = null + continue + remove_non_dm_variants(key, pair["key"], visited) + if(pair["value"]) + if(!islist(pair["value"])) + return_values[key] = null + continue + remove_non_dm_variants(return_values[key], pair["value"], visited) + +/proc/compare_lua_logs(list/log_1, list/log_2) + if(log_1 == log_2) + return TRUE + for(var/field in list("status", "name", "message", "chunk")) + if(log_1[field] != log_2[field]) + return FALSE + switch(log_1["status"]) + if("finished", "yield") + return deep_compare_list( + recursive_list_resolve(log_1["return_values"]), + recursive_list_resolve(log_2["return_values"]) + ) && deep_compare_list(log_1["variants"], log_2["variants"]) + if("runtime") + return log_1["file"] == log_2["file"]\ + && log_1["line"] == log_2["line"]\ + && deep_compare_list(log_1["stack"], log_2["stack"]) + else + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__HELPERS/atmospherics.dm b/code/__HELPERS/atmospherics.dm index 2a59cf60b40..1e5fcb788a1 100644 --- a/code/__HELPERS/atmospherics.dm +++ b/code/__HELPERS/atmospherics.dm @@ -105,13 +105,21 @@ GLOBAL_LIST_EMPTY(gas_handbook) factor_info["factor_name"] = factor factor_info["factor_type"] = "misc" if(factor == "Temperature" || factor == "Pressure") +<<<<<<< HEAD factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occuring." +======= + factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occurring." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(factor == "Energy") factor_info["tooltip"] = "Energy released by the reaction, may or may not result in linear temperature change depending on a slew of other factors." else if(factor == "Radiation") factor_info["tooltip"] = "This reaction emits dangerous radiation! Take precautions." else if (factor == "Location") +<<<<<<< HEAD factor_info["tooltip"] = "This reaction has special behaviour when occuring in specific locations." +======= + factor_info["tooltip"] = "This reaction has special behaviour when occurring in specific locations." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(factor == "Hot Ice") factor_info["tooltip"] = "Hot ice are solidified stacks of plasma. Ignition of one will result in a raging fire." reaction_info["factors"] += list(factor_info) @@ -138,13 +146,21 @@ GLOBAL_LIST_EMPTY(gas_handbook) factor_info["factor_name"] = factor factor_info["factor_type"] = "misc" if(factor == "Temperature" || factor == "Pressure") +<<<<<<< HEAD factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occuring." +======= + factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occurring." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(factor == "Energy") factor_info["tooltip"] = "Energy released by the reaction, may or may not result in linear temperature change depending on a slew of other factors." else if(factor == "Radiation") factor_info["tooltip"] = "This reaction emits dangerous radiation! Take precautions." else if (factor == "Location") +<<<<<<< HEAD factor_info["tooltip"] = "This reaction has special behaviour when occuring in specific locations." +======= + factor_info["tooltip"] = "This reaction has special behaviour when occurring in specific locations." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reaction_info["factors"] += list(factor_info) GLOB.reaction_handbook += list(reaction_info) qdel(reaction) diff --git a/code/__HELPERS/atoms.dm b/code/__HELPERS/atoms.dm index 7106ec81be1..05ab5278e9e 100644 --- a/code/__HELPERS/atoms.dm +++ b/code/__HELPERS/atoms.dm @@ -63,6 +63,7 @@ var/turf/target_turf = get_turf(target) if(get_dist(source, target) > length) return FALSE +<<<<<<< HEAD var/steps = 1 if(current == target_turf)//they are on the same turf, source can see the target return TRUE @@ -74,6 +75,19 @@ return FALSE current = get_step_towards(current, target_turf) steps++ +======= + if(current == target_turf)//they are on the same turf, source can see the target + return TRUE + var/list/steps = get_steps_to(current, target_turf) + if(isnull(steps) || length(steps) > length) + return FALSE + for(var/direction in steps) + current = get_step(current, direction) + if(current == target_turf) + break + if(IS_OPAQUE_TURF(current)) + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE ///Get the cardinal direction between two atoms diff --git a/code/__HELPERS/construction.dm b/code/__HELPERS/construction.dm index f7b0ece13f8..6d3da7d033c 100644 --- a/code/__HELPERS/construction.dm +++ b/code/__HELPERS/construction.dm @@ -61,7 +61,11 @@ . = new target.type(target.drop_location(), amount, FALSE, target.mats_per_unit) /** +<<<<<<< HEAD * divides a list of materials uniformly among all contents of the target_object reccursively +======= + * divides a list of materials uniformly among all contents of the target_object recursively +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Used to set materials of printed items with their design cost by taking into consideration their already existing materials * e.g. if 12 iron is to be divided uniformly among 2 objects A, B who's current iron contents are 3 & 7 * Then first we normalize those values i.e. find their weights to decide who gets an higher share of iron @@ -81,7 +85,11 @@ target_object.set_custom_materials(custom_materials, multiplier) return +<<<<<<< HEAD //Step 1: Get reccursive contents of all objects, only filter obj cause that what's material container accepts +======= + //Step 1: Get recursive contents of all objects, only filter obj cause that what's material container accepts +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/reccursive_contents = target_object.get_all_contents_type(/obj/item) //Step 2: find the sum of each material type per object and record their amounts into an 2D list diff --git a/code/__HELPERS/dna.dm b/code/__HELPERS/dna.dm index 17fd7e21b8e..c8af5840069 100644 --- a/code/__HELPERS/dna.dm +++ b/code/__HELPERS/dna.dm @@ -15,4 +15,8 @@ ///Getter macro used to get the length of a identity block #define GET_UI_BLOCK_LEN(blocknum) (GLOB.identity_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) ///Ditto, but for a feature. +<<<<<<< HEAD #define GET_UF_BLOCK_LEN(blocknum) (SSaccessories.features_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) //SKYRAT CHANGE EDIT - Customization ORIGINAL: #define GET_UF_BLOCK_LEN(blocknum) (GLOB.features_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) +======= +#define GET_UF_BLOCK_LEN(blocknum) (GLOB.features_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__HELPERS/duplicating.dm b/code/__HELPERS/duplicating.dm index 225dca91fb5..f7367a9aa09 100644 --- a/code/__HELPERS/duplicating.dm +++ b/code/__HELPERS/duplicating.dm @@ -15,8 +15,11 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars, list( "contents", "cooldowns", "_datum_components", +<<<<<<< HEAD "external_organs", "external_organs_slot", +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "group", "hand_bodyparts", "held_items", diff --git a/code/__HELPERS/dynamic_human_icon_gen.dm b/code/__HELPERS/dynamic_human_icon_gen.dm index eb6d53517df..a5755fba51c 100644 --- a/code/__HELPERS/dynamic_human_icon_gen.dm +++ b/code/__HELPERS/dynamic_human_icon_gen.dm @@ -17,7 +17,10 @@ GLOBAL_LIST_EMPTY(dynamic_human_appearances) dummy.underwear = "Nude" dummy.undershirt = "Nude" dummy.socks = "Nude" +<<<<<<< HEAD dummy.bra = "Nude" // SKYRAT EDIT ADDITION - Underwear and bra split +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(outfit_path) var/datum/outfit/outfit = new outfit_path() if(r_hand != NO_REPLACE) //we can still override to be null, no replace means just use outfit's diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 1cdf2efa896..e2bced4b7ff 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -33,8 +33,11 @@ GLOBAL_VAR_INIT(fileaccess_timer, 0) var/confirmation = input(src, "Are you SURE you want to download all the files in this folder? (This will open [length(comp_flist)] prompt[length(comp_flist) == 1 ? "" : "s"])", "Confirmation") in list("Yes", "No") if(confirmation != "Yes") continue +<<<<<<< HEAD log_admin("[key_name(src)] is downloading [length(comp_flist)] files from [path]") // SKYRAT EDIT -- ADDITION message_admins("Admin [key_name_admin(src)] is downloading [length(comp_flist)] files from [path]") // SKYRAT EDIT -- ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/file in comp_flist) src << ftp(path + file) return diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 461adc9bc0a..c0dfc33e113 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -1,3 +1,10 @@ +<<<<<<< HEAD +======= +////////////////////////// +/////Initial Building///// +////////////////////////// + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Inits GLOB.surgeries /proc/init_surgeries() var/surgeries = list() @@ -10,9 +17,13 @@ /proc/make_datum_reference_lists() // I tried to eliminate this proc but I couldn't untangle their init-order interdependencies -Dominion/Cyberboss init_keybindings() +<<<<<<< HEAD make_skyrat_datum_references() //SKYRAT EDIT ADDITION - CUSTOMIZATION GLOB.emote_list = init_emote_list() // WHY DOES THIS NEED TO GO HERE? IT JUST INITS DATUMS init_skyrat_stack_recipes() //SKYRAT EDIT ADDITION - More sheet recipes +======= + GLOB.emote_list = init_emote_list() // WHY DOES THIS NEED TO GO HERE? IT JUST INITS DATUMS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 init_crafting_recipes() init_crafting_recipes_atoms() @@ -22,7 +33,11 @@ if(ispath(path, /datum/crafting_recipe/stack)) continue var/datum/crafting_recipe/recipe = new path() +<<<<<<< HEAD var/is_cooking = ((recipe.category in GLOB.crafting_category_food) || (recipe.category in GLOB.crafting_category_food_skyrat)) // SKYRAT EDIT CHANGE - ORIGINAL: var/is_cooking = (recipe.category in GLOB.crafting_category_food) +======= + var/is_cooking = (recipe.category in GLOB.crafting_category_food) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 recipe.reqs = sort_list(recipe.reqs, GLOBAL_PROC_REF(cmp_crafting_req_priority)) if(recipe.name != "" && recipe.result) if(is_cooking) @@ -184,7 +199,10 @@ GLOBAL_LIST_INIT(WALLITEMS_INTERIOR, typecacheof(list( /obj/machinery/status_display, /obj/machinery/ticket_machine, /obj/machinery/turretid, +<<<<<<< HEAD /obj/machinery/time_clock, //SKYRAT EDIT TIME CLOCK +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/barsign, /obj/structure/extinguisher_cabinet, /obj/structure/fireaxecabinet, diff --git a/code/__HELPERS/heap.dm b/code/__HELPERS/heap.dm index eeabfa6a20b..308dc5e2d27 100644 --- a/code/__HELPERS/heap.dm +++ b/code/__HELPERS/heap.dm @@ -26,7 +26,11 @@ swim(length(L)) //removes and returns the first element of the heap +<<<<<<< HEAD //(i.e the max or the min dependant on the comparison function) +======= +//(i.e the max or the min dependent on the comparison function) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/heap/proc/pop() if(!length(L)) return 0 diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 132a6b26eb5..14b012170bd 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -272,7 +272,11 @@ world Blend(mask_icon, ICON_ADD) /// Converts an rgb color into a list storing hsva +<<<<<<< HEAD /// Exists because it's useful to have a guarenteed alpha value +======= +/// Exists because it's useful to have a guaranteed alpha value +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/rgb2hsv(rgb) var/list/hsv = rgb2num(rgb, COLORSPACE_HSV) if(length(hsv) < 4) @@ -766,7 +770,11 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) if(job) body.dna.species.pre_equip_species_outfit(job, body, TRUE) if(outfit) +<<<<<<< HEAD body.equip_outfit_and_loadout(outfit, prefs, TRUE) //SKYRAT EDIT CHANGE +======= + body.equipOutfit(outfit, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing") for(var/direction in showDirs) @@ -815,11 +823,19 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) /// generates a filename for a given asset. /// like generate_asset_name(), except returns the rsc reference and the rsc file hash as well as the asset name (sans extension) +<<<<<<< HEAD /// used so that certain asset files dont have to be hashed twice /proc/generate_and_hash_rsc_file(file, dmi_file_path) var/rsc_ref = fcopy_rsc(file) var/hash //if we have a valid dmi file path we can trust md5'ing the rsc file because we know it doesnt have the bug described in http://www.byond.com/forum/post/2611357 +======= +/// used so that certain asset files don't have to be hashed twice +/proc/generate_and_hash_rsc_file(file, dmi_file_path) + var/rsc_ref = fcopy_rsc(file) + var/hash + //if we have a valid dmi file path we can trust md5'ing the rsc file because we know it doesn't have the bug described in http://www.byond.com/forum/post/2611357 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(dmi_file_path) hash = md5(rsc_ref) else //otherwise, we need to do the expensive fcopy() workaround @@ -845,7 +861,11 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) fdel(savefile_path) return new /savefile(savefile_path) catch(var/exception/error) +<<<<<<< HEAD // if we failed to create a dummy once, try again; maybe someone slept somewhere they shouldnt have +======= + // if we failed to create a dummy once, try again; maybe someone slept somewhere they shouldn't have +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(from_failure) // this *is* the retry, something fucked up CRASH("get_dummy_savefile failed to create a dummy savefile: '[error]'") return get_dummy_savefile(from_failure = TRUE) @@ -890,18 +910,30 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) var/atom/atom_icon = icon icon = atom_icon.icon //atom icons compiled in from 'icons/path/to/dmi_file.dmi' are weird and not really icon objects that you generate with icon(). +<<<<<<< HEAD //if theyre unchanged dmi's then they're stringifiable to "icons/path/to/dmi_file.dmi" if(isicon(icon) && isfile(icon)) //icons compiled in from 'icons/path/to/dmi_file.dmi' at compile time are weird and arent really /icon objects, ///but they pass both isicon() and isfile() checks. theyre the easiest case since stringifying them gives us the path we want +======= + //if they're unchanged dmi's then they're stringifiable to "icons/path/to/dmi_file.dmi" + + if(isicon(icon) && isfile(icon)) + //icons compiled in from 'icons/path/to/dmi_file.dmi' at compile time are weird and aren't really /icon objects, + ///but they pass both isicon() and isfile() checks. they're the easiest case since stringifying them gives us the path we want +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/icon_ref = text_ref(icon) var/locate_icon_string = "[locate(icon_ref)]" icon_path = locate_icon_string else if(isicon(icon) && "[icon]" == "/icon") +<<<<<<< HEAD // icon objects generated from icon() at runtime are icons, but they ARENT files themselves, they represent icon files. +======= + // icon objects generated from icon() at runtime are icons, but they AREN'T files themselves, they represent icon files. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // if the files they represent are compile time dmi files in the rsc, then // the rsc reference returned by fcopy_rsc() will be stringifiable to "icons/path/to/dmi_file.dmi" var/rsc_ref = fcopy_rsc(icon) @@ -960,7 +992,11 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) if(!length(targets)) return +<<<<<<< HEAD //check if the given object is associated with a dmi file in the icons folder. if it is then we dont need to do a lot of work +======= + //check if the given object is associated with a dmi file in the icons folder. if it is then we don't need to do a lot of work +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //for asset generation to get around byond limitations var/icon_path = get_icon_dmi_path(thing) @@ -1004,7 +1040,11 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) var/list/name_and_ref = generate_and_hash_rsc_file(icon2collapse, icon_path)//pretend that tuples exist +<<<<<<< HEAD var/rsc_ref = name_and_ref[1] //weird object thats not even readable to the debugger, represents a reference to the icons rsc entry +======= + var/rsc_ref = name_and_ref[1] //weird object that's not even readable to the debugger, represents a reference to the icons rsc entry +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/file_hash = name_and_ref[2] key = "[name_and_ref[3]].png" diff --git a/code/__HELPERS/levels.dm b/code/__HELPERS/levels.dm index 096655ad748..6e1aaa336e7 100644 --- a/code/__HELPERS/levels.dm +++ b/code/__HELPERS/levels.dm @@ -56,5 +56,9 @@ // Syndicate recon outpost is on some moon or something return TRUE +<<<<<<< HEAD // Finally, more specific checks are ran for edge cases, such as lazyily loaded map templates or away missions. Not perfect. +======= + // Finally, more specific checks are ran for edge cases, such as lazily loaded map templates or away missions. Not perfect. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return istype(what_turf) && what_turf.planetary_atmos && what_turf.has_gravity() diff --git a/code/__HELPERS/logging/_logging.dm b/code/__HELPERS/logging/_logging.dm index 12487a5c240..b3abc019531 100644 --- a/code/__HELPERS/logging/_logging.dm +++ b/code/__HELPERS/logging/_logging.dm @@ -99,6 +99,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) if(!log_globally) return +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN #ifndef SPACEMAN_DMM if(CONFIG_GET(flag/sql_game_log) && CONFIG_GET(flag/sql_enabled)) @@ -117,6 +118,8 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) return #endif //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/log_text = "[key_name_and_tag(src)] [message] [loc_name(src)]" switch(message_type) /// ship both attack logs and victim logs to the end of round attack.log just to ensure we don't lose information @@ -128,12 +131,15 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) log_whisper(log_text, data) if(LOG_EMOTE) log_emote(log_text, data) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(LOG_SUBTLE) log_subtle(log_text, data) if(LOG_SUBTLER) log_subtler(log_text, data) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(LOG_RADIO_EMOTE) log_radio_emote(log_text, data) if(LOG_DSAY) diff --git a/code/__HELPERS/logging/mob.dm b/code/__HELPERS/logging/mob.dm index 9b8f3c0a831..b2377623e22 100644 --- a/code/__HELPERS/logging/mob.dm +++ b/code/__HELPERS/logging/mob.dm @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * Logs a mesage to the mob_tags log, including the mobs tag +======= + * Logs a message to the mob_tags log, including the mobs tag +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Arguments: * * text - text to log. */ @@ -44,12 +48,15 @@ colored_message = "(ASAY) [colored_message]" if(LOG_EMOTE) colored_message = "(EMOTE) [colored_message]" +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(LOG_SUBTLE) colored_message = "(EMOTE) (SUBTLE) [colored_message]" if(LOG_SUBTLER) colored_message = "(EMOTE) (SUBTLER) [colored_message]" //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(LOG_RADIO_EMOTE) colored_message = "(RADIOEMOTE) [colored_message]" diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 95af398d416..b2bec972ddc 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -72,6 +72,7 @@ /proc/random_backpack() return pick(GLOB.backpacklist) +<<<<<<< HEAD // SKYRAT EDIT REMOVAL - CUSTOMIZATION (moved to modular) /* /proc/random_features() @@ -130,6 +131,8 @@ */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/random_hairstyle(gender) switch(gender) if(MALE) @@ -592,8 +595,13 @@ GLOBAL_LIST_INIT(skin_tone_names, list( * When passed the difference between two temperatures returns the amount of change to temperature to apply. * The change rate should be kept at a low value tween 0.16 and 0.02 for optimal results. * vars: +<<<<<<< HEAD * * temp_diff (required) The differance between two temperatures * * change_rate (optional)(Default: 0.06) The rate of range multiplyer +======= + * * temp_diff (required) The difference between two temperatures + * * change_rate (optional)(Default: 0.06) The rate of range multiplier +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /proc/get_temp_change_amount(temp_diff, change_rate = 0.06) if(temp_diff < 0) @@ -637,11 +645,16 @@ GLOBAL_LIST_INIT(skin_tone_names, list( // We've already added slimes. if(isslime(mob_to_sort)) continue +<<<<<<< HEAD // SKYRAT EDIT START - SOULCATCHERS for(var/mob/living/soulcatcher_soul/mob_to_sort in sortmob) moblist += mob_to_sort // SKYRAT EDIT END - SOULCATCHERS return moblist +======= + return moblist + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///returns a mob type controlled by a specified ckey /proc/get_mob_by_ckey(key) if(!key) @@ -746,6 +759,11 @@ GLOBAL_LIST_INIT(skin_tone_names, list( slot_strings += "dextrous storage" if(slot_flags & ITEM_SLOT_BACKPACK) slot_strings += "backpack" +<<<<<<< HEAD +======= + if(slot_flags & ITEM_SLOT_BELTPACK) + slot_strings += "belt" // ? +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return slot_strings ///Returns the direction that the initiator and the target are facing diff --git a/code/__HELPERS/paths/path.dm b/code/__HELPERS/paths/path.dm index 189120b76c3..863bafa4f0a 100644 --- a/code/__HELPERS/paths/path.dm +++ b/code/__HELPERS/paths/path.dm @@ -16,7 +16,11 @@ */ /proc/get_path_to(atom/movable/caller, atom/end, max_distance = 30, mintargetdist, access=list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE, diagonal_handling=DIAGONAL_REMOVE_CLUNKY) var/list/hand_around = list() +<<<<<<< HEAD // We're guarenteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +======= + // We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around)) if(!SSpathfinder.pathfind(caller, end, max_distance, mintargetdist, access, simulated_only, exclude, skip_first, diagonal_handling, await)) return list() @@ -49,7 +53,11 @@ */ /proc/get_swarm_path_to(atom/movable/caller, atom/end, max_distance = 30, mintargetdist, age = MAP_REUSE_INSTANT, access = list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE) var/list/hand_around = list() +<<<<<<< HEAD // We're guarenteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +======= + // We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around)) if(!SSpathfinder.swarmed_pathfind(caller, end, max_distance, mintargetdist, age, access, simulated_only, exclude, skip_first, await)) return list() @@ -62,7 +70,11 @@ /proc/get_sssp(atom/movable/caller, max_distance = 30, access = list(), simulated_only = TRUE, turf/exclude) var/list/hand_around = list() +<<<<<<< HEAD // We're guarenteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +======= + // We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around)) if(!SSpathfinder.build_map(caller, get_turf(caller), max_distance, access, simulated_only, exclude, await)) return null @@ -335,7 +347,11 @@ src.has_gravity = construct_from.has_gravity() if(ismob(construct_from)) var/mob/living/mob_construct = construct_from +<<<<<<< HEAD src.incapacitated = mob_construct.incapacitated() +======= + src.incapacitated = mob_construct.incapacitated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(mob_construct.buckled) src.buckled_info = new(mob_construct.buckled, access, no_id, call_depth + 1) if(isobserver(construct_from)) diff --git a/code/__HELPERS/paths/sssp.dm b/code/__HELPERS/paths/sssp.dm index f735c664694..752138264a9 100644 --- a/code/__HELPERS/paths/sssp.dm +++ b/code/__HELPERS/paths/sssp.dm @@ -130,7 +130,11 @@ /// Returns a new /datum/pathfind/sssp based off our settings /// Will have an invalid source mob, no max distance, and no ending callback /datum/path_map/proc/settings_to_path() +<<<<<<< HEAD // Default creation to not set any vars incidentially +======= + // Default creation to not set any vars incidentally +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/mob/jeremy = new() var/datum/pathfind/sssp/based_on_what = new() based_on_what.setup(pass_info, null, INFINITY, pass_space, avoid) @@ -155,7 +159,11 @@ working_index -= 1 var/list/hand_around = list() +<<<<<<< HEAD // We're guarenteed that hand_around will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +======= + // We're guaranteed that hand_around will be the first list in pathfinding_finished's argset because of how callback handles the arguments list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around) // We're gonna build a pathfind datum from our settings and set it running diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index b9964b9be93..955881c2584 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -142,7 +142,11 @@ else finalized_announcement = CHAT_ALERT_DEFAULT_SPAN(jointext(minor_announcement_strings, "")) +<<<<<<< HEAD var/custom_sound = sound_override || (alert ? 'modular_skyrat/modules/alerts/sound/alerts/alert1.ogg' : 'sound/misc/notice2.ogg') // SKYRAT EDIT CHANGE - CUSTOM ANNOUNCEMENTS - Original: 'sound/misc/notice1.ogg' +======= + var/custom_sound = sound_override || (alert ? 'sound/misc/notice1.ogg' : 'sound/misc/notice2.ogg') +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound) /// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message. @@ -186,9 +190,12 @@ /// Proc that just dispatches the announcement to our applicable audience. Only the announcement is a mandatory arg. /proc/dispatch_announcement_to_players(announcement, list/players = GLOB.player_list, sound_override = null, should_play_sound = TRUE) +<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - CUSTOM ANNOUNCEMENTS /* Original: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/misc/notice2.ogg' for(var/mob/target in players) @@ -201,6 +208,7 @@ if(target.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements)) SEND_SOUND(target, sound(sound_to_play)) +<<<<<<< HEAD */ if(!sound_override) sound_override = SSstation.announcer.get_rand_alert_sound() @@ -220,6 +228,8 @@ to_chat(target, announcement) // SKYRAT EDIT CHANGE END - CUSTOM ANNOUNCEMENTS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAJOR_ANNOUNCEMENT_TITLE #undef MAJOR_ANNOUNCEMENT_TEXT diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index cb87e21cefa..a3f460fd098 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -180,6 +180,7 @@ else return null +<<<<<<< HEAD ///Returns a random reagent object minus blacklisted reagents /proc/get_random_reagent_id() var/static/list/random_reagents = list() @@ -188,6 +189,25 @@ if(initial(reagent_path.chemical_flags) & REAGENT_CAN_BE_SYNTHESIZED) random_reagents += reagent_path var/picked_reagent = pick(random_reagents) +======= +///Returns a random reagent object, with the option to blacklist reagents. +/proc/get_random_reagent_id(list/blacklist) + var/static/list/reagent_static_list = list() //This is static, and will be used by default if a blacklist is not passed. + var/list/reagent_list_to_process + if(blacklist) //If we do have a blacklist, we recompile a new list with the excluded reagents not present and pick from there. + reagent_list_to_process = list() + else + reagent_list_to_process = reagent_static_list + + if(!reagent_list_to_process.len) + for(var/datum/reagent/reagent_path as anything in subtypesof(/datum/reagent)) + if(is_path_in_list(reagent_path, blacklist)) + continue + if(initial(reagent_path.chemical_flags) & REAGENT_CAN_BE_SYNTHESIZED) + reagent_list_to_process += reagent_path + + var/picked_reagent = pick(reagent_list_to_process) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return picked_reagent ///Returns a random reagent consumable ethanol object minus blacklisted reagents diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 1d607e7d7a3..bfb2bb47e18 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -192,7 +192,11 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) if(human_mob.mind && (length(human_mob.mind.antag_datums) > 0)) for(var/datum/antagonist/antag_datums as anything in human_mob.mind.antag_datums) +<<<<<<< HEAD if(!antag_datums.hardcore_random_bonus) //dont give bonusses to dumb stuff like revs or hypnos +======= + if(!antag_datums.hardcore_random_bonus) //don't give bonuses to dumb stuff like revs or hypnos +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(initial(antag_datums.can_assign_self_objectives) && !antag_datums.can_assign_self_objectives) continue // You don't get a prize if you picked your own objective, you can't fail those @@ -471,7 +475,11 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) var/mob/living/silicon/ai/aiPlayer = i var/datum/mind/aiMind = aiPlayer.deployed_shell?.mind || aiPlayer.mind if(aiMind) +<<<<<<< HEAD parts += "[aiPlayer.name]'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was [span_redtext("deactivated")]"] were:" //SKYRAT EDIT CHANGE +======= + parts += "[aiPlayer.name] (Played by: [aiMind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was [span_redtext("deactivated")]"] were:" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE) parts += "Total law changes: [aiPlayer.law_change_counter]" @@ -482,19 +490,27 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) borg_num-- if(robo.mind) +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - ROUNDEND //parts += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " [span_redtext("(Deactivated)")]" : ""][borg_num ?", ":""]" - SKYRAT EDIT - ORIGINAL parts += "[robo.name] [robo.stat == DEAD ? " [span_redtext("(Deactivated)")]" : ""][borg_num ?", ":""]" //SKYRAT EDIT CHANGE END +======= + parts += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " [span_redtext("(Deactivated)")]" : ""][borg_num ?", ":""]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!borg_spacer) borg_spacer = TRUE for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs) if (!robo.connected_ai && robo.mind) +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - ROUNDEND //parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "[span_greentext("survived")] as an AI-less borg!" : "was [span_redtext("unable to survive")] the rigors of being a cyborg without an AI."] Its laws were:" parts += "[borg_spacer?"
":""][robo.name] [(robo.stat != DEAD)? "[span_greentext("survived")] as an AI-less borg!" : "was [span_redtext("unable to survive")] the rigors of being a cyborg without an AI."] Its laws were:" //SKYRAT EDIT CHANGE END +======= + parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "[span_greentext("survived")] as an AI-less borg!" : "was [span_redtext("unable to survive")] the rigors of being a cyborg without an AI."] Its laws were:" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(robo) //How the hell do we lose robo between here and the world messages directly above this? parts += robo.laws.get_law_list(include_zeroth=TRUE) @@ -703,10 +719,14 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) var/jobtext = "" if(!is_unassigned_job(ply.assigned_role)) jobtext = " the [ply.assigned_role.title]" +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - ROUNDEND //var/text = "[ply.key] was [ply.name][jobtext] and" - SKYRAT EDIT - ORIGINAL var/text = "[ply.name][jobtext]" //SKYRAT EDIT CHANGE END +======= + var/text = "[ply.key] was [ply.name][jobtext] and" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ply.current) if(ply.current.stat == DEAD) text += " [span_redtext("died")]" @@ -750,7 +770,11 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) parts += "Total Achievements Earned: [length(GLOB.achievements_unlocked)]!
" parts += "" return "
" diff --git a/code/__HELPERS/sorts/sort_instance.dm b/code/__HELPERS/sorts/sort_instance.dm index bd1bbe0582a..eaae55c18d3 100644 --- a/code/__HELPERS/sorts/sort_instance.dm +++ b/code/__HELPERS/sorts/sort_instance.dm @@ -392,7 +392,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) var/count1 = 0 //# of times in a row that first run won var/count2 = 0 // " " " " " " second run won - //do the straightfoward thin until one run starts winning consistently + //do the straightforward thin until one run starts winning consistently do //ASSERT(len1 > 1 && len2 > 0) @@ -417,7 +417,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) while((count1 | count2) < minGallop) - //one run is winning consistently so galloping may provide huge benifits + //one run is winning consistently so galloping may provide huge benefits //so try galloping, until such time as the run is no longer consistently winning do //ASSERT(len1 > 1 && len2 > 0) @@ -493,7 +493,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) var/count1 = 0 //# of times in a row that first run won var/count2 = 0 // " " " " " " second run won - //do the straightfoward thing until one run starts winning consistently + //do the straightforward thing until one run starts winning consistently do //ASSERT(len1 > 0 && len2 > 1) if(call(cmp)(fetchElement(L,cursor2), fetchElement(L,cursor1)) < 0) @@ -516,7 +516,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) break outer while((count1 | count2) < minGallop) - //one run is winning consistently so galloping may provide huge benifits + //one run is winning consistently so galloping may provide huge benefits //so try galloping, until such time as the run is no longer consistently winning do //ASSERT(len1 > 0 && len2 > 1) diff --git a/code/__HELPERS/spatial_info.dm b/code/__HELPERS/spatial_info.dm index 529532f50cf..5a94cef45e6 100644 --- a/code/__HELPERS/spatial_info.dm +++ b/code/__HELPERS/spatial_info.dm @@ -195,8 +195,17 @@ var/turf/inbetween_turf = center_turf //this is the lowest overhead way of doing a loop in dm other than a goto. distance is guaranteed to be >= steps taken to target by this algorithm +<<<<<<< HEAD for(var/step_counter in 1 to distance) inbetween_turf = get_step_towards(inbetween_turf, target_turf) +======= + var/list/steps = get_steps_to(inbetween_turf, target_turf) + if(isnull(steps)) + return + steps.Cut(distance + 1) + for(var/direction in steps) + inbetween_turf = get_step(inbetween_turf, direction) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(inbetween_turf == target_turf)//we've gotten to target's turf without returning due to turf opacity, so we must be able to see target break diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 460dd99a894..ca46638c8ea 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -157,7 +157,11 @@ * * allow_numbers - allows numbers and common special characters - used for silicon/other weird things names * * cap_after_symbols - words like Bob's will be capitalized to Bob'S by default. False is good for titles. */ +<<<<<<< HEAD /proc/reject_bad_name(t_in, allow_numbers = TRUE, max_length = MAX_NAME_LEN, ascii_only = TRUE, strict = FALSE, cap_after_symbols = TRUE) // SKYRAT EDIT CHANGE - allow_numbers to TRUE +======= +/proc/reject_bad_name(t_in, allow_numbers = FALSE, max_length = MAX_NAME_LEN, ascii_only = TRUE, strict = FALSE, cap_after_symbols = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!t_in) return //Rejects the input if it is null @@ -1228,6 +1232,16 @@ GLOBAL_LIST_INIT(binary, list("0","1")) var/input_length = LAZYLEN(ending) return !!findtext(input_text, ending, -input_length) +<<<<<<< HEAD +======= +/// Returns TRUE if the input_text starts with any of the beginnings +/proc/starts_with_any(input_text, list/beginnings) + for(var/beginning in beginnings) + if(!!findtext(input_text, beginning, 1, LAZYLEN(beginning)+1)) + return TRUE + return FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Generate a grawlix string of length of the text argument. /proc/grawlix(text) var/grawlix = "" diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm index 93da26ef292..a2a44309664 100644 --- a/code/__HELPERS/turfs.dm +++ b/code/__HELPERS/turfs.dm @@ -76,7 +76,11 @@ Turf and target are separate in case you want to teleport some distance from a t //destination_list = new() /*This will draw a block around the target turf, given what the error is. Specifying the values above will basically draw a different sort of block. +<<<<<<< HEAD If the values are the same, it will be a square. If they are different, it will be a rectengle. +======= + If the values are the same, it will be a square. If they are different, it will be a rectangle. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 In either case, it will center based on offset. Offset is position from center. Offset always calculates in relation to direction faced. In other words, depending on the direction of the teleport, the offset should remain positioned in relation to destination.*/ @@ -206,7 +210,11 @@ Turf and target are separate in case you want to teleport some distance from a t * NOTE: if your atom has non-standard bounds then this proc * will handle it, but: * if the bounds are even, then there are an even amount of "middle" turfs, the one to the EAST, NORTH, or BOTH is picked +<<<<<<< HEAD * this may seem bad, but you're atleast as close to the center of the atom as possible, better than byond's default loc being all the way off) +======= + * this may seem bad, but you're at least as close to the center of the atom as possible, better than byond's default loc being all the way off) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * if the bounds are odd, the true middle turf of the atom is returned **/ /proc/get_turf_pixel(atom/checked_atom) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 7cdecfe41ed..03d308e34d6 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -36,8 +36,8 @@ return "northwest" if(SOUTHWEST) return "southwest" - else - return + + return NONE //Turns text into proper directions /proc/text2dir(direction) @@ -58,8 +58,8 @@ return SOUTHEAST if("SOUTHWEST") return SOUTHWEST - else - return + + return NONE //Converts an angle (degrees) into a ss13 direction GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,SOUTHWEST,WEST,NORTHWEST)) diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 5ab05258b99..35f1156170f 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -19,7 +19,11 @@ /// We'll use another define to convert uses of the proc over. That'll be all // #define APPEARANCE_SUCCESS_TRACKING +<<<<<<< HEAD ///Used to find the sources of harddels, quite laggy, don't be surpised if it freezes your client for a good while +======= +///Used to find the sources of harddels, quite laggy, don't be surprised if it freezes your client for a good while +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //#define REFERENCE_TRACKING #ifdef REFERENCE_TRACKING @@ -131,7 +135,11 @@ #warn compiling in TESTING mode. testing() debug messages will be visible. #endif +<<<<<<< HEAD #ifdef CIBUILDING +======= +#if defined(CIBUILDING) && !defined(OPENDREAM) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define UNIT_TESTS #endif @@ -156,10 +164,24 @@ #define CBT #endif +<<<<<<< HEAD #if !defined(CBT) && !defined(SPACEMAN_DMM) #warn Building with Dream Maker is no longer supported and will result in errors. #warn In order to build, run BUILD.bat in the root directory. #warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build. +======= +#if defined(OPENDREAM) + #if !defined(CIBUILDING) + #warn You are building with OpenDream. Remember to build TGUI manually. + #warn You can do this by running tgui-build.cmd from the bin directory. + #endif +#else + #if !defined(CBT) && !defined(SPACEMAN_DMM) + #warn Building with Dream Maker is no longer supported and will result in errors. + #warn In order to build, run BUILD.cmd in the root directory. + #warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build. + #endif +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #endif /// Runs the game in "map test mode" diff --git a/code/_globalvars/admin.dm b/code/_globalvars/admin.dm index 96f07e3cca8..23635891313 100644 --- a/code/_globalvars/admin.dm +++ b/code/_globalvars/admin.dm @@ -76,6 +76,10 @@ GLOBAL_LIST_INIT(spanname_to_formatting, list( "Drone Radio" = "drone", "Engineering Radio" = "engradio", "Extremely Big" = "extremelybig", +<<<<<<< HEAD +======= + "Entertainment Radio" = "enteradio", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Game Say" = "game say", "Ghost Alert" = "ghostalert", "Green" = "green", diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index fd934e922bb..819fff7e5a4 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -205,10 +205,13 @@ DEFINE_BITFIELD(flags_inv, list( "HIDESHOES" = HIDESHOES, "HIDESNOUT" = HIDESNOUT, "HIDESUITSTORAGE" = HIDESUITSTORAGE, +<<<<<<< HEAD "SHOWSPRITEEARS" = SHOWSPRITEEARS, // SKYRAT EDIT ADDITION START "HIDETAIL" = HIDETAIL, "HIDESPINE" = HIDESPINE, "HIDESEXTOY" = HIDESEXTOY, // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(machine_stat, list( @@ -413,12 +416,15 @@ DEFINE_BITFIELD(bodyshape, list( "BODYSHAPE_MONKEY" = BODYSHAPE_MONKEY, "BODYSHAPE_DIGITIGRADE" = BODYSHAPE_DIGITIGRADE, "BODYSHAPE_SNOUTED" = BODYSHAPE_SNOUTED, +<<<<<<< HEAD // SKYRAT EDIT ADDITION - customization "BODYSHAPE__CUSTOM" = BODYSHAPE_CUSTOM, "BODYSHAPE__TAUR" = BODYSHAPE_TAUR, "BODYSHAPE__HIDE_SHOES" = BODYSHAPE_HIDE_SHOES, "BODYSHAPE__ALT_FACEWEAR_LAYER" = BODYSHAPE_ALT_FACEWEAR_LAYER, // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(acceptable_bodyshape, list( @@ -426,12 +432,15 @@ DEFINE_BITFIELD(acceptable_bodyshape, list( "BODYSHAPE_MONKEY" = BODYSHAPE_MONKEY, "BODYSHAPE_DIGITIGRADE" = BODYSHAPE_DIGITIGRADE, "BODYSHAPE_SNOUTED" = BODYSHAPE_SNOUTED, +<<<<<<< HEAD // SKYRAT EDIT ADDITION - customization "BODYSHAPE__CUSTOM" = BODYSHAPE_CUSTOM, "BODYSHAPE__TAUR" = BODYSHAPE_TAUR, "BODYSHAPE__HIDE_SHOES" = BODYSHAPE_HIDE_SHOES, "BODYSHAPE__ALT_FACEWEAR_LAYER" = BODYSHAPE_ALT_FACEWEAR_LAYER, // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(bodypart_flags, list( @@ -458,10 +467,14 @@ DEFINE_BITFIELD(supports_variations_flags, list( "CLOTHING_NO_VARIATION" = CLOTHING_NO_VARIATION, "CLOTHING_DIGITIGRADE_VARIATION" = CLOTHING_DIGITIGRADE_VARIATION, "CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON" = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON, +<<<<<<< HEAD "CLOTHING_SNOUTED_VARIATION" = CLOTHING_SNOUTED_VARIATION, "CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON" = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON, "CLOTHING_SNOUTED_VOX_VARIATION" = CLOTHING_SNOUTED_VOX_VARIATION, "CLOTHING_SNOUTED_VOX_VARIATION_NO_NEW_ICON" = CLOTHING_SNOUTED_VOX_VARIATION_NO_NEW_ICON, // SKYRAT EDIT END +======= + "CLOTHING_DIGITIGRADE_MASK" = CLOTHING_DIGITIGRADE_MASK, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(flora_flags, list( @@ -518,7 +531,10 @@ DEFINE_BITFIELD(liked_foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, +<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(disliked_foodtypes, list( @@ -543,7 +559,10 @@ DEFINE_BITFIELD(disliked_foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, +<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(toxic_foodtypes, list( @@ -568,7 +587,10 @@ DEFINE_BITFIELD(toxic_foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, +<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(sharpness, list( diff --git a/code/_globalvars/lists/achievements.dm b/code/_globalvars/lists/achievements.dm old mode 100755 new mode 100644 diff --git a/code/_globalvars/lists/ambience.dm b/code/_globalvars/lists/ambience.dm index 3a9ab81dde4..d1ba50f5053 100644 --- a/code/_globalvars/lists/ambience.dm +++ b/code/_globalvars/lists/ambience.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL BEGIN +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(generic_ambience,list( 'sound/ambience/ambigen1.ogg', 'sound/ambience/ambigen2.ogg', @@ -14,7 +17,10 @@ GLOBAL_LIST_INIT(generic_ambience,list( 'sound/ambience/ambigen13.ogg', 'sound/ambience/ambigen14.ogg', )) +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(holy_ambience,list( 'sound/ambience/ambicha1.ogg', @@ -111,7 +117,10 @@ GLOBAL_LIST_INIT(spooky_ambience,list( )) GLOBAL_LIST_INIT(space_ambience,list( +<<<<<<< HEAD 'modular_skyrat/master_files/sound/ambience/starlight.ogg', //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 03dd87ad456..21b20b95d76 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -254,12 +254,17 @@ GLOBAL_LIST_INIT(status_display_approved_pictures, list( "lockdown", "greenalert", "bluealert", +<<<<<<< HEAD "violetalert", // SKYRAT EDIT ADD - Alert Levels "orangealert", // SKYRAT EDIT ADD - Alert Levels "amberalert", // SKYRAT EDIT ADD - Alert Levels "redalert", "deltaalert", "gammaalert", // SKYRAT EDIT ADD - Alert Levels +======= + "redalert", + "deltaalert", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "radiation", "currentalert", //For automatic set of status display on current level )) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 4ccca8fae56..5b74ee059f4 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -257,12 +257,20 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items list(//computer disks /obj/item/computer_disk/maintenance/scanner = 1, +<<<<<<< HEAD ///obj/item/computer_disk/maintenance/camera = 1, //SKYRAT EDIT REMOVAL - Available To Crew Now +======= + /obj/item/computer_disk/maintenance/camera = 1, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/computer_disk/maintenance/modsuit_control = 1, /obj/item/computer_disk/maintenance/spectre_meter = 1, /obj/item/computer_disk/maintenance/arcade = 1, /obj/item/computer_disk/maintenance/theme = 3, +<<<<<<< HEAD ) = 3, //SKYRAT EDIT CHANGE - Original : 4 +======= + ) = 4, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list(//modsuits /obj/effect/spawner/random/mod/maint = 3, diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm index 9dcdf05db73..3e01fbc8015 100644 --- a/code/_globalvars/lists/poll_ignore.dm +++ b/code/_globalvars/lists/poll_ignore.dm @@ -1,7 +1,10 @@ //Each lists stores ckeys for "Never for this round" option category #define POLL_IGNORE_ACADEMY_WIZARD "academy_wizard" +<<<<<<< HEAD #define POLL_IGNORE_CORTICAL_BORER "cortical_borer" // SKYRAT EDIT - Cortical Borer +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define POLL_IGNORE_ALIEN_LARVA "alien_larva" #define POLL_IGNORE_ASH_SPIRIT "ash_spirit" #define POLL_IGNORE_ASHWALKER "ashwalker" @@ -40,7 +43,10 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list( POLL_IGNORE_ACADEMY_WIZARD = "Academy Wizard Defender", +<<<<<<< HEAD POLL_IGNORE_CORTICAL_BORER = "Cortical Borer", // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 POLL_IGNORE_ALIEN_LARVA = "Xenomorph larva", POLL_IGNORE_ASH_SPIRIT = "Ash Spirit", POLL_IGNORE_ASHWALKER = "Ashwalker eggs", diff --git a/code/_globalvars/lists/quirks.dm b/code/_globalvars/lists/quirks.dm index 0f7bd890888..2afc1f65586 100644 --- a/code/_globalvars/lists/quirks.dm +++ b/code/_globalvars/lists/quirks.dm @@ -8,8 +8,11 @@ GLOBAL_LIST_INIT(nearsighted_glasses, list( "Thin" = /obj/item/clothing/glasses/regular/thin, "Jamjar" = /obj/item/clothing/glasses/regular/jamjar, "Binoclard" = /obj/item/clothing/glasses/regular/kim, +<<<<<<< HEAD "Modern" = /obj/item/clothing/glasses/regular/betterunshit, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) ///Options for the prosthetic limb quirk to choose from diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index 44ac6d574cd..cd532b321cc 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -35,6 +35,7 @@ GLOBAL_LIST_INIT(reagent_containers, list( CAT_PATCHES = typecacheof(list( /obj/item/reagent_containers/pill/patch/style )), +<<<<<<< HEAD // SKYRAT EDIT ADDITION START CAT_HYPOS = typecacheof(list( /obj/item/reagent_containers/cup/vial/small/style, @@ -44,6 +45,8 @@ GLOBAL_LIST_INIT(reagent_containers, list( /obj/item/reagent_containers/syringe/smartdart )), // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// list of all /datum/chemical_reaction datums indexed by their typepath. Use this for general lookup stuff @@ -58,7 +61,11 @@ GLOBAL_LIST_INIT(chemical_reagents_list, init_chemical_reagent_list()) GLOBAL_LIST(chemical_reactions_results_lookup_list) /// list of all reagents that are parent types used to define a bunch of children - but aren't used themselves as anything. GLOBAL_LIST(fake_reagent_blacklist) +<<<<<<< HEAD /// Turfs metalgen cant touch +======= +/// Turfs metalgen can't touch +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(blacklisted_metalgen_types, typecacheof(list( /turf/closed/indestructible, //indestructible turfs should be indestructible, metalgen transmutation to plasma allows them to be destroyed /turf/open/indestructible @@ -185,7 +192,11 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagentlist()) /proc/build_name2reagentlist() . = list() +<<<<<<< HEAD //build map with keys stored seperatly +======= + //build map with keys stored separately +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/name_to_reagent = list() var/list/only_names = list() for (var/datum/reagent/reagent as anything in GLOB.chemical_reagents_list) diff --git a/code/_globalvars/lists/typecache.dm b/code/_globalvars/lists/typecache.dm index 805cea677a0..b1460165564 100644 --- a/code/_globalvars/lists/typecache.dm +++ b/code/_globalvars/lists/typecache.dm @@ -1,5 +1,5 @@ //please store common type caches here. -//type caches should only be stored here if used in mutiple places or likely to be used in mutiple places. +//type caches should only be stored here if used in multiple places or likely to be used in multiple places. //Note: typecache can only replace istype if you know for sure the thing is at least a datum. diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 2f05cedf316..89b38ee7fe0 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -41,6 +41,10 @@ DECLARE_LOG_NAMED(harddel_log, "harddels", START_LOG) DECLARE_LOG_NAMED(test_log, "tests", START_LOG) #endif +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Picture logging GLOBAL_VAR(picture_log_directory) GLOBAL_PROTECT(picture_log_directory) diff --git a/code/_globalvars/tgui.dm b/code/_globalvars/tgui.dm index a81078420f5..df34a04efe6 100644 --- a/code/_globalvars/tgui.dm +++ b/code/_globalvars/tgui.dm @@ -1,4 +1,7 @@ GLOBAL_DATUM(crew_manifest_tgui, /datum/crew_manifest) GLOBAL_DATUM(changelog_tgui, /datum/changelog) GLOBAL_DATUM(hotkeys_tgui, /datum/hotkeys_help) +<<<<<<< HEAD GLOBAL_DATUM(record_manifest_tgui, /datum/record_manifest) //SKYRAT EDIT ADDITION -- EXPLOITABLE VERB +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 00d8be0defd..1d3b2c4d80f 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -19,15 +19,26 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_DRYABLE" = TRAIT_DRYABLE, "TRAIT_FOOD_CHEF_MADE" = TRAIT_FOOD_CHEF_MADE, "TRAIT_FOOD_FRIED" = TRAIT_FOOD_FRIED, +<<<<<<< HEAD "TRAIT_FOOD_SILVER" = TRAIT_FOOD_SILVER, "TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER, "TRAIT_LIGHTING_DEBUGGED" = TRAIT_LIGHTING_DEBUGGED, +======= + "TRAIT_QUALITY_FOOD_INGREDIENT" = TRAIT_QUALITY_FOOD_INGREDIENT, + "TRAIT_FOOD_SILVER" = TRAIT_FOOD_SILVER, + "TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER, + "TRAIT_LIGHTING_DEBUGGED" = TRAIT_LIGHTING_DEBUGGED, + "TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION" = TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_RECENTLY_COINED" = TRAIT_RECENTLY_COINED, "TRAIT_RUSTY" = TRAIT_RUSTY, "TRAIT_SPINNING" = TRAIT_SPINNING, "TRAIT_STICKERED" = TRAIT_STICKERED, "TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES, +<<<<<<< HEAD "TRAIT_COMMISSIONED" = TRAIT_COMMISSIONED, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), /atom/movable = list( "TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE, @@ -112,18 +123,30 @@ GLOBAL_LIST_INIT(traits_by_type, list( /datum/wound = list( "TRAIT_WOUND_SCANNED" = TRAIT_WOUND_SCANNED, ), +<<<<<<< HEAD // SKYRAT EDIT ADDITON BEGIN - Synthetic wounds /datum/wound/electrical_damage = list( "TRAIT_ELECTRICAL_DAMAGE_REPAIRING" = TRAIT_ELECTRICAL_DAMAGE_REPAIRING, ), // SKYRAT EDIT ADDITON END - Synthetic wounds +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj = list( "TRAIT_WALLMOUNTED" = TRAIT_WALLMOUNTED, "TRAIT_CONTRABAND" = TRAIT_CONTRABAND, ), /mob = list( +<<<<<<< HEAD "TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING, "TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING, +======= + "TRAIT_AI_ACCESS" = TRAIT_AI_ACCESS, + "TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING, + "TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING, + "TRAIT_ACT_AS_CULTIST" = TRAIT_ACT_AS_CULTIST, + "TRAIT_ACT_AS_HERETIC" = TRAIT_ACT_AS_HERETIC, + "TRAIT_ACTIVELY_FISHING" = TRAIT_ACTIVELY_FISHING, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_ADAMANTINE_EXTRACT_ARMOR" = TRAIT_ADAMANTINE_EXTRACT_ARMOR, "TRAIT_ADVANCEDTOOLUSER" = TRAIT_ADVANCEDTOOLUSER, "TRAIT_AGENDER" = TRAIT_AGENDER, @@ -153,6 +176,10 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_BIRTHDAY_BOY" = TRAIT_BIRTHDAY_BOY, "TRAIT_BLOB_ALLY" = TRAIT_BLOB_ALLY, "TRAIT_BLOCK_SHUTTLE_MOVEMENT" = TRAIT_BLOCK_SHUTTLE_MOVEMENT, +<<<<<<< HEAD +======= + "TRAIT_BLOCKING_PROJECTILES" = TRAIT_BLOCKING_PROJECTILES, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_BLOOD_CLANS" = TRAIT_BLOOD_CLANS, "TRAIT_BLOODSHOT_EYES" = TRAIT_BLOODSHOT_EYES, "TRAIT_BLOODY_MESS" = TRAIT_BLOODY_MESS, @@ -450,11 +477,18 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE, "TRAIT_SIGN_LANG" = TRAIT_SIGN_LANG, "TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS, +<<<<<<< HEAD +======= + "TRAIT_SILICON_ACCESS" = TRAIT_SILICON_ACCESS, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_SILICON_EMOTES_ALLOWED" = TRAIT_SILICON_EMOTES_ALLOWED, "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, "TRAIT_SKITTISH" = TRAIT_SKITTISH, "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, +<<<<<<< HEAD "TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_SMOKER" = TRAIT_SMOKER, "TRAIT_SNEAK" = TRAIT_SNEAK, "TRAIT_SNOB" = TRAIT_SNOB, @@ -543,6 +577,11 @@ GLOBAL_LIST_INIT(traits_by_type, list( ), /obj/item = list( "TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING, +<<<<<<< HEAD +======= + "TRAIT_BAIT_ALLOW_FISHING_DUD" = TRAIT_BAIT_ALLOW_FISHING_DUD, + "TRAIT_BAIT_IGNORE_ENVIRONMENT" = TRAIT_BAIT_IGNORE_ENVIRONMENT, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_BAIT_UNCONSUMABLE" = TRAIT_BAIT_UNCONSUMABLE, "TRAIT_BAKEABLE" = TRAIT_BAKEABLE, "TRAIT_BASIC_QUALITY_BAIT" = TRAIT_BASIC_QUALITY_BAIT, @@ -568,6 +607,10 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NODROP" = TRAIT_NODROP, "TRAIT_OMNI_BAIT" = TRAIT_OMNI_BAIT, "TRAIT_PLANT_WILDMUTATE" = TRAIT_PLANT_WILDMUTATE, +<<<<<<< HEAD +======= + "TRAIT_POISONOUS_BAIT" = TRAIT_POISONOUS_BAIT, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_T_RAY_VISIBLE" = TRAIT_T_RAY_VISIBLE, "TRAIT_TRANSFORM_ACTIVE" = TRAIT_TRANSFORM_ACTIVE, "TRAIT_UNCATCHABLE" = TRAIT_UNCATCHABLE, @@ -598,6 +641,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( /obj/item/fish = list( "TRAIT_FISH_AMPHIBIOUS" = TRAIT_FISH_AMPHIBIOUS, "TRAIT_FISH_CROSSBREEDER" = TRAIT_FISH_CROSSBREEDER, +<<<<<<< HEAD "TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE, "TRAIT_FISH_FLOPPING" = TRAIT_FISH_FLOPPING, "TRAIT_FISH_FROM_CASE" = TRAIT_FISH_FROM_CASE, @@ -610,6 +654,27 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_RESIST_EMULSIFY" = TRAIT_RESIST_EMULSIFY, "TRAIT_YUCKY_FISH" = TRAIT_YUCKY_FISH, ), +======= + "TRAIT_FISH_ELECTROGENESIS" = TRAIT_FISH_ELECTROGENESIS, + "TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE, + "TRAIT_FISH_FLOPPING" = TRAIT_FISH_FLOPPING, + "TRAIT_FISH_FROM_CASE" = TRAIT_FISH_FROM_CASE, + "TRAIT_FISH_INK_ON_COOLDOWN" = TRAIT_FISH_INK_ON_COOLDOWN, + "TRAIT_FISH_NO_HUNGER" = TRAIT_FISH_NO_HUNGER, + "TRAIT_FISH_NO_MATING" = TRAIT_FISH_NO_MATING, + "TRAIT_FISH_RECESSIVE" = TRAIT_FISH_RECESSIVE, + "TRAIT_FISH_SELF_REPRODUCE" = TRAIT_FISH_SELF_REPRODUCE, + "TRAIT_FISH_SHOULD_TWOHANDED" = TRAIT_FISH_SHOULD_TWOHANDED, + "TRAIT_FISH_STASIS" = TRAIT_FISH_STASIS, + "TRAIT_FISH_STINGER" = TRAIT_FISH_STINGER, + "TRAIT_FISH_TOXIN_IMMUNE" = TRAIT_FISH_TOXIN_IMMUNE, + "TRAIT_RESIST_EMULSIFY" = TRAIT_RESIST_EMULSIFY, + "TRAIT_YUCKY_FISH" = TRAIT_YUCKY_FISH, + ), + /obj/item/fishing_rod = list( + "TRAIT_ROD_REMOVE_FISHING_DUD" = TRAIT_ROD_REMOVE_FISHING_DUD, + ), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/integrated_circuit = list( "TRAIT_CIRCUIT_UI_OPEN" = TRAIT_CIRCUIT_UI_OPEN, "TRAIT_CIRCUIT_UNDUPABLE" = TRAIT_CIRCUIT_UNDUPABLE, @@ -643,9 +708,12 @@ GLOBAL_LIST_INIT(traits_by_type, list( /obj/machinery/modular_computer = list( "TRAIT_MODPC_INTERACTING_WITH_FRAME" = TRAIT_MODPC_INTERACTING_WITH_FRAME, ), +<<<<<<< HEAD /obj/projectile = list( "TRAIT_ALWAYS_HIT_ZONE" = TRAIT_ALWAYS_HIT_ZONE, ), +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure = list( "TRAIT_RADSTORM_IMMUNE" = TRAIT_RADSTORM_IMMUNE, ), @@ -669,6 +737,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_TURF_IGNORE_SLIPPERY" = TRAIT_TURF_IGNORE_SLIPPERY, "TRAIT_TURF_IGNORE_SLOWDOWN" = TRAIT_TURF_IGNORE_SLOWDOWN, ), +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - SKYRAT TRAITS /obj/item/toy/plush/skyrat = list( "TRAIT_AFFECTION_AVERSION" = TRAIT_AFFECTION_AVERSION, @@ -746,6 +815,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_CLOTHES_DAMAGED_BY_PIERCING" = TRAIT_CLOTHES_DAMAGED_BY_PIERCING, ), // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// value -> trait name, list of ALL traits that exist in the game, used for any type of accessing. diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 84f65ae5868..69e6c78c810 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -26,6 +26,11 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( /mob = list( "TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING, "TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING, +<<<<<<< HEAD +======= + "TRAIT_ACT_AS_CULTIST" = TRAIT_ACT_AS_CULTIST, + "TRAIT_ACT_AS_HERETIC" = TRAIT_ACT_AS_HERETIC, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_ADVANCEDTOOLUSER" = TRAIT_ADVANCEDTOOLUSER, "TRAIT_AGENDER" = TRAIT_AGENDER, "TRAIT_AGEUSIA" = TRAIT_AGEUSIA, @@ -258,7 +263,10 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, "TRAIT_SKITTISH" = TRAIT_SKITTISH, "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, +<<<<<<< HEAD "TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_SMOKER" = TRAIT_SMOKER, "TRAIT_SNOB" = TRAIT_SNOB, "TRAIT_SOFTSPOKEN" = TRAIT_SOFTSPOKEN, @@ -333,6 +341,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_MAGNETIC_ID_CARD" = TRAIT_MAGNETIC_ID_CARD, ), /obj/item/fish = list( +<<<<<<< HEAD "TRAIT_FISH_CROSSBREEDER" = TRAIT_FISH_CROSSBREEDER, "TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE, "TRAIT_FISH_NO_HUNGER" = TRAIT_FISH_NO_HUNGER, @@ -343,6 +352,28 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_RESIST_EMULSIFY" = TRAIT_RESIST_EMULSIFY, "TRAIT_YUCKY_FISH" = TRAIT_YUCKY_FISH, ), +======= + "TRAIT_FISH_AMPHIBIOUS" = TRAIT_FISH_AMPHIBIOUS, + "TRAIT_FISH_CROSSBREEDER" = TRAIT_FISH_CROSSBREEDER, + "TRAIT_FISH_ELECTROGENESIS" = TRAIT_FISH_ELECTROGENESIS, + "TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE, + "TRAIT_FISH_FROM_CASE" = TRAIT_FISH_FROM_CASE, + "TRAIT_FISH_INK_ON_COOLDOWN" = TRAIT_FISH_INK_ON_COOLDOWN, + "TRAIT_FISH_NO_HUNGER" = TRAIT_FISH_NO_HUNGER, + "TRAIT_FISH_NO_MATING" = TRAIT_FISH_NO_MATING, + "TRAIT_FISH_RECESSIVE" = TRAIT_FISH_RECESSIVE, + "TRAIT_FISH_SELF_REPRODUCE" = TRAIT_FISH_SELF_REPRODUCE, + "TRAIT_FISH_SHOULD_TWOHANDED" = TRAIT_FISH_SHOULD_TWOHANDED, + "TRAIT_FISH_STASIS" = TRAIT_FISH_STASIS, + "TRAIT_FISH_STINGER" = TRAIT_FISH_STINGER, + "TRAIT_FISH_TOXIN_IMMUNE" = TRAIT_FISH_TOXIN_IMMUNE, + "TRAIT_RESIST_EMULSIFY" = TRAIT_RESIST_EMULSIFY, + "TRAIT_YUCKY_FISH" = TRAIT_YUCKY_FISH, + ), + /obj/item/fishing_rod = list( + "TRAIT_ROD_REMOVE_FISHING_DUD" = TRAIT_ROD_REMOVE_FISHING_DUD, + ), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/liver = list( "TRAIT_BALLMER_SCIENTIST" = TRAIT_BALLMER_SCIENTIST, "TRAIT_COMEDY_METABOLISM" = TRAIT_COMEDY_METABOLISM, @@ -358,6 +389,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( /obj/item/organ/internal/lungs = list( "TRAIT_SPACEBREATHING" = TRAIT_SPACEBREATHING, ), +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - SKYRAT TRAITS /obj/item/toy/plush/skyrat = list( "TRAIT_AFFECTION_AVERSION" = TRAIT_AFFECTION_AVERSION, @@ -434,6 +466,8 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_CLOTHES_DAMAGED_BY_PIERCING" = TRAIT_CLOTHES_DAMAGED_BY_PIERCING, ), // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// value -> trait name, generated as needed for adminning. diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index e8399b2a8f2..9bc25f034fe 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -7,7 +7,7 @@ Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner. */ /mob/living/silicon/ai/DblClickOn(atom/A, params) - if(control_disabled || incapacitated()) + if(control_disabled || incapacitated) return if(ismob(A)) @@ -39,7 +39,7 @@ if(check_click_intercept(params,A)) return - if(control_disabled || incapacitated()) + if(control_disabled || incapacitated) return var/turf/pixel_turf = get_turf_pixel(A) @@ -111,7 +111,11 @@ for AI shift, ctrl, and alt clicking. */ +<<<<<<< HEAD /mob/living/silicon/ai/CtrlShiftClickOn(atom/target) // Procs overriden in modular_skyrat/modules/Silicon_QoL +======= +/mob/living/silicon/ai/CtrlShiftClickOn(atom/target) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.AICtrlShiftClick(src) /mob/living/silicon/ai/ShiftClickOn(atom/target) @@ -147,6 +151,19 @@ /* Atom Procs */ /atom/proc/AICtrlClick(mob/living/silicon/ai/user) +<<<<<<< HEAD +======= + return + +/atom/proc/ai_click_alt(mob/living/silicon/ai/user) + SHOULD_CALL_PARENT(FALSE) + return + +/atom/proc/AIShiftClick(mob/living/silicon/ai/user) + return + +/atom/proc/AICtrlShiftClick(mob/living/silicon/ai/user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return /atom/proc/ai_click_alt(mob/living/silicon/ai/user) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 1d7e07f7b99..17fd56856c6 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -101,7 +101,11 @@ CtrlClickOn(A) return +<<<<<<< HEAD if(incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) +======= + if(INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return face_atom(A) @@ -247,7 +251,8 @@ return TRUE /proc/CheckToolReach(atom/movable/here, atom/movable/there, reach) - if(!here || !there) + . = FALSE + if(QDELETED(here) || QDELETED(there)) return switch(reach) if(0) @@ -258,14 +263,23 @@ var/obj/dummy = new(get_turf(here)) dummy.pass_flags |= PASSTABLE dummy.SetInvisibility(INVISIBILITY_ABSTRACT) +<<<<<<< HEAD for(var/i in 1 to reach) //Limit it to that many tries var/turf/T = get_step(dummy, get_dir(dummy, there)) +======= + var/list/steps = get_steps_to(dummy, there) + if(isnull(steps) || length(steps) > reach) // If the path is further than the reach, no way we can reach it anyways. + qdel(dummy) + return FALSE + for(var/direction in steps) + var/turf/next_step = get_step(dummy, direction) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(dummy.CanReach(there)) qdel(dummy) return TRUE - if(!dummy.Move(T)) //we're blocked! + if(!dummy.Move(next_step)) // We're blocked, nope. qdel(dummy) - return + return FALSE qdel(dummy) /// Default behavior: ignore double clicks (the second click that makes the doubleclick call already calls for a normal click) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 3da6f338250..0e30fb12c37 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -58,7 +58,11 @@ return if(W) +<<<<<<< HEAD if(incapacitated()) +======= + if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //while buckled, you can still connect to and control things like doors, but you can't use your modules @@ -91,7 +95,11 @@ //Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks // for non-doors/apcs +<<<<<<< HEAD /mob/living/silicon/robot/CtrlShiftClickOn(atom/target) // Procs overriden in modular_skyrat/modules/Silicon_QoL +======= +/mob/living/silicon/robot/CtrlShiftClickOn(atom/target) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.BorgCtrlShiftClick(src) /mob/living/silicon/robot/ShiftClickOn(atom/target) @@ -203,7 +211,10 @@ attack_ai(user) return +<<<<<<< HEAD */ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * What happens when the cyborg without active module holds right-click on an item. Returns a SECONDARY_ATTACK_* value. diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index 84efaf77c5d..18e0cedaec6 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -2,7 +2,11 @@ icon = 'icons/hud/screen_ai.dmi' /atom/movable/screen/ai/Click() +<<<<<<< HEAD if(isobserver(usr) || usr.incapacitated()) +======= + if(isobserver(usr) || usr.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /atom/movable/screen/ai/aicore diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index c3a94e932db..9fd5cacfdaa 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -49,6 +49,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( var/inventory_shown = FALSE //Equipped item inventory var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) +<<<<<<< HEAD var/atom/movable/screen/ammo_counter //SKYRAT EDIT ADDITION var/atom/movable/screen/blobpwrdisplay @@ -58,6 +59,15 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( var/atom/movable/screen/combo/combo_display +======= + var/atom/movable/screen/blobpwrdisplay + + var/atom/movable/screen/alien_plasma_display + var/atom/movable/screen/alien_queen_finder + + var/atom/movable/screen/combo/combo_display + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/screen/action_intent var/atom/movable/screen/zone_select var/atom/movable/screen/pull_icon @@ -128,13 +138,21 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( // and avoid needing to make changes to all idk 300 consumers if we want to change the appearance var/list/asset_refs_for_reuse = list() + // List of weakrefs to objects that we add to our screen that we don't expect to DO anything + // They typically use * in their render target. They exist solely so we can reuse them, + // and avoid needing to make changes to all idk 300 consumers if we want to change the appearance + var/list/asset_refs_for_reuse = list() + /datum/hud/New(mob/owner) mymob = owner if (!ui_style) // will fall back to the default if any of these are null ui_style = ui_style2icon(owner.client?.prefs?.read_preference(/datum/preference/choiced/ui_style)) +<<<<<<< HEAD erp_ui_style = erp_ui_style2icon(owner.client?.prefs?.read_preference(/datum/preference/choiced/ui_style)) //SKYRAT EDIT - ADDITION - ERP ICONS FIX +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 toggle_palette = new() toggle_palette.set_hud(src) @@ -270,10 +288,13 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( alien_queen_finder = null combo_display = null +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - SKYRAT HUD wanted_lvl = null // SKYRAT EDIT ADDITION END - SKYRAT HUD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_LIST_ASSOC_VAL(master_groups) QDEL_LIST_ASSOC_VAL(plane_master_controllers) QDEL_LIST(always_visible_inventory) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 39cb742d672..45fe1886fe0 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -295,9 +295,12 @@ combo_display = new /atom/movable/screen/combo(null, src) infodisplay += combo_display +<<<<<<< HEAD ammo_counter = new /atom/movable/screen/ammo_counter(null, src) //SKYRAT EDIT ADDITION infodisplay += ammo_counter //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv @@ -373,6 +376,11 @@ screenmob.client.screen -= H.wear_neck if(H.head) screenmob.client.screen -= H.head +<<<<<<< HEAD +======= + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/hud/human/persistent_inventory_update(mob/viewer) if(!mymob) diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index 3f6a94bb40a..2bae526986d 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - Custom HTML Lobby Screen +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SHUTTER_MOVEMENT_DURATION 0.4 SECONDS #define SHUTTER_WAIT_DURATION 0.2 SECONDS /// Maximum number of station trait buttons we will display, please think hard before creating scenarios where there are more than this @@ -111,7 +114,10 @@ return flick("[base_icon_state]_pressed", src) update_appearance(UPDATE_ICON) +<<<<<<< HEAD SEND_SOUND(hud.mymob, sound('modular_skyrat/master_files/sound/effects/save.ogg')) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /atom/movable/screen/lobby/button/MouseEntered(location,control,params) @@ -210,6 +216,7 @@ if(!.) return var/mob/dead/new_player/new_player = hud.mymob +<<<<<<< HEAD // SKYRAT EDIT BEGIN if(!is_admin(new_player.client) && length_char(new_player.client?.prefs?.read_preference(/datum/preference/text/flavor_text)) < FLAVOR_TEXT_CHAR_REQUIREMENT) @@ -217,6 +224,8 @@ return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ready = !ready if(ready) new_player.ready = PLAYER_READY_TO_PLAY @@ -280,18 +289,25 @@ to_chat(new_player, span_notice("You have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].")) return +<<<<<<< HEAD // SKYRAT EDIT BEGIN if(length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text)) <= FLAVOR_TEXT_CHAR_REQUIREMENT) to_chat(new_player, span_notice("You need at least [FLAVOR_TEXT_CHAR_REQUIREMENT] characters of flavor text to join the round. You have [length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text))] characters.")) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!LAZYACCESS(params2list(params), CTRL_CLICK)) GLOB.latejoin_menu.ui_interact(new_player) else to_chat(new_player, span_warning("Opening emergency fallback late join menu! If THIS doesn't show, ahelp immediately!")) GLOB.latejoin_menu.fallback_ui(new_player) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/lobby/button/join/proc/show_join_button() SIGNAL_HANDLER set_button_status(TRUE) @@ -585,4 +601,7 @@ #undef SHUTTER_MOVEMENT_DURATION #undef SHUTTER_WAIT_DURATION #undef MAX_STATION_TRAIT_BUTTONS_VERTICAL +<<<<<<< HEAD */ // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/_onclick/hud/parallax/parallax.dm b/code/_onclick/hud/parallax/parallax.dm index 0a3732e134f..91055ec565b 100755 --- a/code/_onclick/hud/parallax/parallax.dm +++ b/code/_onclick/hud/parallax/parallax.dm @@ -273,7 +273,11 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer) /atom/movable/screen/parallax_layer/Initialize(mapload, datum/hud/hud_owner, template = FALSE) . = ..() +<<<<<<< HEAD // Parallax layers are independant of hud, they care about client +======= + // Parallax layers are independent of hud, they care about client +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Not doing this will just create a bunch of hard deletes set_new_hud(hud_owner = null) @@ -335,7 +339,11 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer) /atom/movable/screen/parallax_layer/planet icon_state = "planet" blend_mode = BLEND_OVERLAY +<<<<<<< HEAD absolute = TRUE //Status of seperation +======= + absolute = TRUE //Status of separation +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 speed = 3 layer = 30 diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 6ee994cf79c..b608ced23d4 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -119,6 +119,9 @@ GLOBAL_LIST_EMPTY(radial_menus) ///A replacement icon state for the generic radial slice bg icon. Doesn't affect the next page nor the center buttons var/radial_slice_icon + ///A replacement icon state for the generic radial slice bg icon. Doesn't affect the next page nor the center buttons + var/radial_slice_icon + //If we swap to vis_contens inventory these will need a redo /datum/radial_menu/proc/check_screen_border(mob/user) var/atom/movable/AM = anchor @@ -162,7 +165,10 @@ GLOBAL_LIST_EMPTY(radial_menus) var/elements_to_add = max_elements - elements.len for(var/i in 1 to elements_to_add) //Create all elements var/atom/movable/screen/radial/slice/new_element = new /atom/movable/screen/radial/slice +<<<<<<< HEAD new_element.icon = icon_path //SKYRAT EDIT ADDITION - GUNPOINT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_element.tooltips = use_tooltips new_element.set_parent(src) elements += new_element diff --git a/code/_onclick/hud/rendering/_render_readme.md b/code/_onclick/hud/rendering/_render_readme.md index 2c5e9875801..1d21b610415 100644 --- a/code/_onclick/hud/rendering/_render_readme.md +++ b/code/_onclick/hud/rendering/_render_readme.md @@ -8,11 +8,19 @@ ## Byond internal functionality This part of the guide will assume that you have read the byond reference entry for rendering at www.byond.com/docs/ref//#/{notes}/renderer +<<<<<<< HEAD When you create an atom, this will always create an internal byond structure called an "appearance". This appearance you will likely be familiar with, as it is exposed through the /atom/var/appearance var. This appearance var holds data on how to render the object, ie what icon/icon_state/color etc it is using. Note that appearance vars will always copy, and do not hold a reference. When you update a var, for example lets pretend we add a filter, the appearance will be updated to include the filter. Note that, however, vis_contents objets are uniquely excluded from appearances. Then, when the filter is updated, the appearance will be recreated, and the atom marked as "dirty". After it has been updated, the SendMaps() function (sometimes also called maptick), which is a internal byond function that iterates over all objects in a clients view and in the clients.mob.contents, checks for "dirty" atoms, then resends any "dirty" appearances to clients as needed and unmarks them as dirty. This function is notoriosly slow, but we can see its tick usage through the world.map_cpu var. We can also avoid more complex checks checking whether an object is visible on a clients screen by using the TILE_BOUND appearance flag. Finally, we arrive at clientside behavior, where we have two main clientside functions: GetMapIcons, and Render. GetMapIcons is repsonsible for actual rendering calculations on the clientside, such as "Group Icons and Set bounds", which performs clientside calculations for transform matrixes. Note that particles here are handled in a separate thread and are not diplayed in the clientside profiler. Render handles the actual drawing of the screen. For debugging rendering issues its reccomended you do two things: +======= +When you create an atom, this will always create an internal byond structure called an "appearance". This appearance you will likely be familiar with, as it is exposed through the /atom/var/appearance var. This appearance var holds data on how to render the object, ie what icon/icon_state/color etc it is using. Note that appearance vars will always copy, and do not hold a reference. When you update a var, for example lets pretend we add a filter, the appearance will be updated to include the filter. Note that, however, vis_contents objets are uniquely excluded from appearances. Then, when the filter is updated, the appearance will be recreated, and the atom marked as "dirty". After it has been updated, the SendMaps() function (sometimes also called maptick), which is a internal byond function that iterates over all objects in a clients view and in the clients.mob.contents, checks for "dirty" atoms, then resends any "dirty" appearances to clients as needed and unmarks them as dirty. This function is notoriously slow, but we can see its tick usage through the world.map_cpu var. We can also avoid more complex checks checking whether an object is visible on a clients screen by using the TILE_BOUND appearance flag. + +Finally, we arrive at clientside behavior, where we have two main clientside functions: GetMapIcons, and Render. GetMapIcons is responsible for actual rendering calculations on the clientside, such as "Group Icons and Set bounds", which performs clientside calculations for transform matrixes. Note that particles here are handled in a separate thread and are not displayed in the clientside profiler. Render handles the actual drawing of the screen. + +For debugging rendering issues its recommended you do two things: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A) Talk to someone who has inside knowledge(like lummox) about it, most of this is undocumented and bugs often B) Use the undocumented debug printer which reads of data on icons rendering, this is very dense but can be useful in some cases. To use: Right click top tab -> Options & Messages -> Client -> Command -> Enter ".debug profile mapicons" and press Enter -> go to your Byond directory and find BYOND/cfg/mapicons.json . Yes this is one giant one-line json. @@ -22,9 +30,15 @@ The following is an incomplete list of pitfalls that come from byond snowflake t 1. Transforms are very slow on clientside. This is not usually noticable, but if you start using large amounts of them it will grind you to a halt quickly, regardless of whether its on overlays or objs 2. The darkness plane. This is unused, as it doesn't work with our rendering format, so this section is purely academic. The darkness plane has specific variables it needs to render correctly, and these can be found in the plane masters file. it is composed internally of two parts, a black mask over the clients screen, and a non rendering mask that blocks all luminosity=0 turfs and their contents from rendering if the SEE_BLACKNESS flag is set properly. The blocker will always block rendering but the mask can be layered under other objects. 3. render_target/source. Render_target/source will only copy certain rendering instructions, and these are only defined as "etc." in the byond reference. Known non copied appearance vars include: blend_mode, plane, layer, vis_contents, mouse_opacity... +<<<<<<< HEAD 4. Large icons on the screen that peek over the edge will instead of only rendering partly like you would expect will instead stretch the screen while not adgusting the render buffer, which means that you can actively see as tiles and map objects are rendered. You can use this for an easy "offscreen" UI. 5. Numerically large filters on objects of any size will torpedo performance, even though large objects with small filters will perform massively better. (ie blur(size=20) BAD) 6. Texture Atlas: the texture atlas byond uses to render icons is very susceptible to corruption and can regularily replace icons with other icons or just not render at all. This can be exasperated by alt tabbing or pausing the dreamseeker process. +======= +4. Large icons on the screen that peek over the edge will instead of only rendering partly like you would expect will instead stretch the screen while not adjusting the render buffer, which means that you can actively see as tiles and map objects are rendered. You can use this for an easy "offscreen" UI. +5. Numerically large filters on objects of any size will torpedo performance, even though large objects with small filters will perform massively better. (ie blur(size=20) BAD) +6. Texture Atlas: the texture atlas byond uses to render icons is very susceptible to corruption and can regularly replace icons with other icons or just not render at all. This can be exasperated by alt tabbing or pausing the dreamseeker process. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 7. The renderer is awful code and lummox said he will try changing a large part of it for 515 so keep an eye on that 8. Byond uses DirectX 9 (Lummox said he wants to update to DirectX 11) 9. Particles are just fancy overlays and are not independent of their owner @@ -32,7 +46,11 @@ The following is an incomplete list of pitfalls that come from byond snowflake t 11. Displacement filter: The byond "displacement filter" does not, as the name would make you expect, use displacement maps, but instead uses normal maps. ## The rendering solution +<<<<<<< HEAD One of the main issues with making pretty effects is how objects can only render to one plane, and how filters can only be applied to single objects. Quite simply it means we cant apply effects to multiple planes at once, and an effect to one plane only by treating it as a single unit: +======= +One of the main issues with making pretty effects is how objects can only render to one plane, and how filters can only be applied to single objects. Quite simply it means we can't apply effects to multiple planes at once, and an effect to one plane only by treating it as a single unit: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ![](https://raw.githubusercontent.com/tgstation/documentation-assets/main/rendering/renderpipe_old.png) @@ -50,8 +68,15 @@ Through these this allows us to treat planes as single objects, and lets us dist ## Render plates +<<<<<<< HEAD The rendering system uses two objects to unify planes: render_relay and render_plates. Render relays use render_target/source and the relay_render_to_plane proc to replicate the plane master on the render relay. This render relay is then rendered onto a render_plate, which is a plane master that renders the render_relays onto itself. This plate can then be hierachically rendered with the same process until it reaches the master render_plate, which is the plate that will actually render to the player. These plates naturally in the byond style have quirks. For example, rendering to two plates will double any effects such as color or filters, and as such you need to carefully manage how you render them. Keep in mind as well that when sorting the layers for rendering on a plane that they should not be negative, this is handled automatically in relay_render_to_plane. When debugging note that mouse_opacity can act bizzarly with this method, such as only allowing you to click things that are layered over objects on a certain plane but auomatically setting the mouse_opacity should be handling this. Note that if you decide to manipulate a plane with internal byond objects that you will have to manually extrapolate the vars that are set if you want to render them to another plane (See blackness plane for example), and that this is not documented anywhere. Goodluck and godspeed with coding +======= +The rendering system uses two objects to unify planes: render_relay and render_plates. Render relays use render_target/source and the relay_render_to_plane proc to replicate the plane master on the render relay. This render relay is then rendered onto a render_plate, which is a plane master that renders the render_relays onto itself. This plate can then be hierarchically rendered with the same process until it reaches the master render_plate, which is the plate that will actually render to the player. These plates naturally in the byond style have quirks. For example, rendering to two plates will double any effects such as color or filters, and as such you need to carefully manage how you render them. Keep in mind as well that when sorting the layers for rendering on a plane that they should not be negative, this is handled automatically in relay_render_to_plane. When debugging note that mouse_opacity can act bizarrely with this method, such as only allowing you to click things that are layered over objects on a certain plane but automatically setting the mouse_opacity should be handling this. Note that if you decide to manipulate a plane with internal byond objects that you will have to manually extrapolate the vars that are set if you want to render them to another plane (See blackness plane for example), and that this is not documented anywhere. + + +Good luck and godspeed with coding +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - Just another contributor diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 58333406c20..b7ea5a7719b 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -110,7 +110,7 @@ if(world.time <= usr.next_move) return 1 - if(usr.incapacitated()) + if(usr.incapacitated) return 1 if(ismob(usr)) @@ -143,7 +143,11 @@ screen_loc = ui_building /atom/movable/screen/area_creator/Click() +<<<<<<< HEAD if(usr.incapacitated() || (isobserver(usr) && !isAdminGhostAI(usr))) +======= + if(usr.incapacitated || (isobserver(usr) && !isAdminGhostAI(usr))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE var/area/A = get_area(usr) if(!A.outdoors) @@ -204,7 +208,11 @@ if(world.time <= usr.next_move) return TRUE +<<<<<<< HEAD if(usr.incapacitated(IGNORE_STASIS)) +======= + if(INCAPACITATED_IGNORING(usr, INCAPABLE_STASIS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(ismecha(usr.loc)) // stops inventory actions in a mech return TRUE @@ -294,7 +302,7 @@ return TRUE if(world.time <= user.next_move) return TRUE - if(user.incapacitated()) + if(user.incapacitated) return TRUE if (ismecha(user.loc)) // stops inventory actions in a mech return TRUE @@ -471,7 +479,7 @@ if(world.time <= usr.next_move) return TRUE - if(usr.incapacitated()) + if(usr.incapacitated) return TRUE if(ismecha(usr.loc)) // stops inventory actions in a mech return TRUE @@ -736,7 +744,11 @@ var/client/holder INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/splash/Initialize(mapload, datum/hud/hud_owner, client/C, visible, use_previous_title) . = ..() if(!istype(C)) @@ -756,7 +768,11 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) icon = SStitle.previous_icon holder.screen += src +<<<<<<< HEAD */ // SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/splash/proc/Fade(out, qdel_after = TRUE) if(QDELETED(src)) return diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 33de24c3361..dab3c844084 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -32,7 +32,11 @@ if (SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return TRUE if (SECONDARY_ATTACK_CONTINUE_CHAIN) +<<<<<<< HEAD // Normal behavior +======= + EMPTY_BLOCK_GUARD // Normal behavior +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("pre_attack_secondary must return an SECONDARY_ATTACK_* define, please consult code/__DEFINES/combat.dm") else @@ -51,7 +55,11 @@ if (SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return TRUE if (SECONDARY_ATTACK_CONTINUE_CHAIN) +<<<<<<< HEAD // Normal behavior +======= + EMPTY_BLOCK_GUARD // Normal behavior +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("attackby_secondary must return an SECONDARY_ATTACK_* define, please consult code/__DEFINES/combat.dm") else @@ -409,7 +417,11 @@ // rev deconversion through blunt trauma. // this can be signalized to the rev datum +<<<<<<< HEAD if(mind && stat == CONSCIOUS && src != attacker && prob(damage_done + ((maxHealth - health) * 0.5))) // SKYRAT EDIT CHANGE - ORIGINAL : if(mind && stat == CONSCIOUS && src != attacker && prob(damage_done + ((100 - health) * 0.5))) +======= + if(mind && stat == CONSCIOUS && src != attacker && prob(damage_done + ((100 - health) * 0.5))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/antagonist/rev/rev = mind.has_antag_datum(/datum/antagonist/rev) rev?.remove_revolutionary(attacker) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 2f1465ac4ff..d2dbc398538 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -109,11 +109,19 @@ if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED)) var/ignore_flags = NONE if(interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED) +<<<<<<< HEAD ignore_flags |= IGNORE_RESTRAINTS if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) ignore_flags |= IGNORE_GRAB if(user.incapacitated(ignore_flags)) +======= + ignore_flags |= INCAPABLE_RESTRAINTS + if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) + ignore_flags |= INCAPABLE_GRAB + + if(INCAPACITATED_IGNORING(user, ignore_flags)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 5af3f7b8422..b1eb683a5d4 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -104,11 +104,14 @@ if(CONFIG_GET(flag/usewhitelist)) load_whitelist() +<<<<<<< HEAD // SKYRAT EDIT ADDITION START populate_interaction_instances() remove_erp_things() // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 loaded = TRUE if (Master) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 22b22c54417..42f761c9152 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -115,10 +115,13 @@ /// log attack messages /datum/config_entry/flag/log_attack +<<<<<<< HEAD /datum/config_entry/flag/log_subtler // log subtler emotes //SKYRAT EDIT ADDITION /datum/config_entry/flag/log_econ // log economy actions +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// log emotes /datum/config_entry/flag/log_emote @@ -317,7 +320,11 @@ /datum/config_entry/string/banappeals /datum/config_entry/string/wikiurl +<<<<<<< HEAD default = "https://wiki.skyrat13.space/index.php" //SKYRAT EDIT - Original: "http://www.tgstation13.org/wiki" +======= + default = "http://www.tgstation13.org/wiki" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/config_entry/string/forumurl default = "http://tgstation13.org/phpBB/index.php" diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 337bb5d3f85..3a2e18458a6 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -324,7 +324,11 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie init_stage_completed = 0 var/mc_started = FALSE +<<<<<<< HEAD add_startup_message("Initializing subsystems...") //SKYRAT EDIT CHANGE - Custom HTML Lobby Screen +======= + to_chat(world, span_boldannounce("Initializing subsystems...")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/stage_sorted_subsystems = new(INITSTAGE_MAX) for (var/i in 1 to INITSTAGE_MAX) @@ -358,8 +362,11 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie SetRunLevel(1) // Intentionally not using the defines here because the MC doesn't care about them // Loop. Master.StartProcessing(0) +<<<<<<< HEAD add_startup_message("Clearing clutter...") //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/time = (REALTIMEOFDAY - start_timeofday) / 10 @@ -457,12 +464,19 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie chat_warning = TRUE var/message = "[message_prefix] [seconds] second[seconds == 1 ? "" : "s"]!" +<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN -- chat_message not used anymore due to change below // var/chat_message = chat_warning ? span_boldwarning(message) : span_boldannounce(message) // SKYRAT EDIT REMOVAL END if(result != SS_INIT_NO_MESSAGE) add_startup_message(message, chat_warning) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(world, chat_message) +======= + var/chat_message = chat_warning ? span_boldwarning(message) : span_boldannounce(message) + + if(result != SS_INIT_NO_MESSAGE) + to_chat(world, chat_message) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_world(message) /datum/controller/master/proc/SetRunLevel(new_runlevel) @@ -579,7 +593,11 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie //Anti-tick-contention heuristics: if (init_stage == INITSTAGE_MAX) +<<<<<<< HEAD //if there are mutiple sleeping procs running before us hogging the cpu, we have to run later. +======= + //if there are multiple sleeping procs running before us hogging the cpu, we have to run later. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // (because sleeps are processed in the order received, longer sleeps are more likely to run first) if (starting_tick_usage > TICK_LIMIT_MC) //if there isn't enough time to bother doing anything this tick, sleep a bit. sleep_delta *= 2 diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 63bee7bb22e..33b793596d0 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -19,7 +19,7 @@ /// Time to wait (in deciseconds) between each call to fire(). Must be a positive integer. var/wait = 20 - /// Priority Weight: When mutiple subsystems need to run in the same tick, higher priority subsystems will be given a higher share of the tick before MC_TICK_CHECK triggers a sleep, higher priority subsystems also run before lower priority subsystems + /// Priority Weight: When multiple subsystems need to run in the same tick, higher priority subsystems will be given a higher share of the tick before MC_TICK_CHECK triggers a sleep, higher priority subsystems also run before lower priority subsystems var/priority = FIRE_PRIORITY_DEFAULT /// [Subsystem Flags][SS_NO_INIT] to control binary behavior. Flags must be set at compile time or before preinit finishes to take full effect. (You can also restart the mc to force them to process again) @@ -272,7 +272,11 @@ /datum/controller/subsystem/proc/OnConfigLoad() /** +<<<<<<< HEAD * Used to initialize the subsystem. This is expected to be overriden by subtypes. +======= + * Used to initialize the subsystem. This is expected to be overridden by subtypes. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /datum/controller/subsystem/Initialize() return SS_INIT_NONE diff --git a/code/controllers/subsystem/ai_controllers.dm b/code/controllers/subsystem/ai_controllers.dm index 087aa828165..4d74fd66898 100644 --- a/code/controllers/subsystem/ai_controllers.dm +++ b/code/controllers/subsystem/ai_controllers.dm @@ -9,11 +9,14 @@ SUBSYSTEM_DEF(ai_controllers) ///type of status we are interested in running var/planning_status = AI_STATUS_ON /// The tick cost of all active AI, calculated on fire. +<<<<<<< HEAD var/cost_on /// The tick cost of all idle AI, calculated on fire. var/cost_idle +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/our_cost /datum/controller/subsystem/ai_controllers/Initialize() diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 71eaed14ea2..457c44ac2ca 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -75,7 +75,11 @@ SUBSYSTEM_DEF(atoms) rustg_file_write(json_encode(mapload_init_times), "[GLOB.log_directory]/init_times.json") #endif +<<<<<<< HEAD /// Actually creates the list of atoms. Exists soley so a runtime in the creation logic doesn't cause initalized to totally break +======= +/// Actually creates the list of atoms. Exists solely so a runtime in the creation logic doesn't cause initialized to totally break +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/atoms/proc/CreateAtoms(list/atoms, list/atoms_to_return = null, mapload_source = null) if (atoms_to_return) LAZYINITLIST(created_atoms) @@ -137,8 +141,13 @@ SUBSYSTEM_DEF(atoms) return null return initialized_state[state_length][1] +<<<<<<< HEAD /// Use this to set initialized to prevent error states where the old initialized is overriden, and we end up losing all context /// Accepts a state and a source, the most recent state is used, sources exist to prevent overriding old values accidentially +======= +/// Use this to set initialized to prevent error states where the old initialized is overridden, and we end up losing all context +/// Accepts a state and a source, the most recent state is used, sources exist to prevent overriding old values accidentally +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/atoms/proc/set_tracked_initalized(state, source) if(!length(initialized_state)) base_initialized = initialized diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 13180adbad7..900f78efcb0 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -47,6 +47,7 @@ SUBSYSTEM_DEF(blackbox) /* // SKYRAT EDIT CHANGE - MULTISERVER - ORIGINAL: var/datum/db_query/query_record_playercount = SSdbcore.NewQuery({" INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port, round_id) +<<<<<<< HEAD VALUES (:playercount, :admincount, NOW(), INET_ATON(:server_ip), :server_port, :round_id) */ var/datum/db_query/query_record_playercount = SSdbcore.NewQuery({" @@ -56,6 +57,12 @@ SUBSYSTEM_DEF(blackbox) "playercount" = playercount, "admincount" = admincount, "server_name" = CONFIG_GET(string/serversqlname), // SKYRAT EDIT ADDITION - MULTISERVER +======= + VALUES (:playercount, :admincount, NOW(), INET_ATON(:server_ip), :server_port, :round_id) + "}, list( + "playercount" = playercount, + "admincount" = admincount, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "server_ip" = world.internet_address || "0", "server_port" = "[world.port]", "round_id" = GLOB.round_id, @@ -158,6 +165,8 @@ SUBSYSTEM_DEF(blackbox) record_feedback("tally", "radio_usage", 1, "centcom") if(FREQ_AI_PRIVATE) record_feedback("tally", "radio_usage", 1, "ai private") + if(FREQ_ENTERTAINMENT) + record_feedback("tally", "radio_usage", 1, "entertainment") if(FREQ_CTF_RED) record_feedback("tally", "radio_usage", 1, "CTF red team") if(FREQ_CTF_BLUE) @@ -343,10 +352,13 @@ Versioning var/datum/db_query/query_report_death = SSdbcore.NewQuery({" INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, staminaloss, last_words, suicide) VALUES (:pod, :x_coord, :y_coord, :z_coord, :map, INET_ATON(:internet_address), :port, :round_id, NOW(), :job, :special, :name, :key, :laname, :lakey, :brute, :fire, :brain, :oxy, :tox, :stamina, :last_words, :suicide) +<<<<<<< HEAD */ var/datum/db_query/query_report_death = SSdbcore.NewQuery({" INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_name, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, staminaloss, last_words, suicide) VALUES (:pod, :x_coord, :y_coord, :z_coord, :map, :server_name, INET_ATON(:internet_address), :port, :round_id, NOW(), :job, :special, :name, :key, :laname, :lakey, :brute, :fire, :brain, :oxy, :tox, :clone, :stamina, :last_words, :suicide) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "}, list( "name" = L.real_name, "key" = L.ckey, diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 0e8e3dfd90b..7dcab6daf7e 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -189,12 +189,17 @@ SUBSYSTEM_DEF(dbcore) //Take over control of all active queries var/queries_to_check = queries_active.Copy() queries_active.Cut() +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Start all waiting queries for(var/datum/db_query/query in queries_standby) run_query(query) queries_to_check += query queries_standby -= query +<<<<<<< HEAD //wait for them all to finish for(var/datum/db_query/query in queries_to_check) @@ -205,6 +210,13 @@ SUBSYSTEM_DEF(dbcore) MassInsert(table, rows = queued_log_entries_by_table[table], duplicate_key = FALSE, ignore_errors = FALSE, warn = FALSE, async = TRUE, special_columns = null) // SKYRAT EDIT END +======= + + //wait for them all to finish + for(var/datum/db_query/query in queries_to_check) + UNTIL(query.process() || REALTIMEOFDAY > endtime) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //log shutdown to the db var/datum/db_query/query_round_shutdown = SSdbcore.NewQuery( "UPDATE [format_table_name("round")] SET shutdown_datetime = Now(), end_state = :end_state WHERE id = :round_id", @@ -252,7 +264,12 @@ SUBSYSTEM_DEF(dbcore) /datum/controller/subsystem/dbcore/proc/Connect() if(IsConnected()) return TRUE + + if(connection) + Disconnect() //clear the current connection handle so isconnected() calls stop invoking rustg + connection = null //make sure its cleared even if runtimes happened +<<<<<<< HEAD if(connection) Disconnect() //clear the current connection handle so isconnected() calls stop invoking rustg connection = null //make sure its cleared even if runtimes happened @@ -261,6 +278,12 @@ SUBSYSTEM_DEF(dbcore) failed_connections = 0 failed_connection_timeout = 0 +======= + if(failed_connection_timeout <= world.time) //it's been long enough since we failed to connect, reset the counter + failed_connections = 0 + failed_connection_timeout = 0 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(failed_connection_timeout > 0) return FALSE @@ -298,7 +321,11 @@ SUBSYSTEM_DEF(dbcore) log_sql("Connect() failed | [last_error]") ++failed_connections //If it failed to establish a connection more than 5 times in a row, don't bother attempting to connect for a time. +<<<<<<< HEAD if(failed_connections > max_connection_failures) +======= + if(failed_connections > max_connection_failures) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 failed_connection_timeout_count++ //basic exponential backoff algorithm failed_connection_timeout = world.time + ((2 ** failed_connection_timeout_count) SECONDS) diff --git a/code/controllers/subsystem/dynamic/dynamic.dm b/code/controllers/subsystem/dynamic/dynamic.dm index e81260cf306..da654339b69 100644 --- a/code/controllers/subsystem/dynamic/dynamic.dm +++ b/code/controllers/subsystem/dynamic/dynamic.dm @@ -140,10 +140,17 @@ SUBSYSTEM_DEF(dynamic) /// The maximum amount of time for antag random events to be hijacked. var/random_event_hijack_maximum = 18 MINUTES +<<<<<<< HEAD /// What is the lower bound of when the roundstart annoucement is sent out? var/waittime_l = 600 /// What is the higher bound of when the roundstart annoucement is sent out? +======= + /// What is the lower bound of when the roundstart announcement is sent out? + var/waittime_l = 600 + + /// What is the higher bound of when the roundstart announcement is sent out? +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/waittime_h = 1800 /// A number between 0 and 100. The maximum amount of threat allowed to generate. @@ -571,10 +578,14 @@ SUBSYSTEM_DEF(dynamic) if (!CONFIG_GET(flag/no_intercept_report)) addtimer(CALLBACK(src, PROC_REF(send_intercept)), rand(waittime_l, waittime_h)) +<<<<<<< HEAD //SKYRAT EDIT START - DIVERGENCY/GOALS REPORT else addtimer(CALLBACK(src, PROC_REF(send_trait_report)), rand(waittime_l, waittime_h)) //SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 addtimer(CALLBACK(src, PROC_REF(display_roundstart_logout_report)), ROUNDSTART_LOGOUT_REPORT_TIME) if(CONFIG_GET(flag/reopen_roundstart_suicide_roles)) @@ -946,6 +957,7 @@ SUBSYSTEM_DEF(dynamic) ruleset.restricted_roles |= ruleset.protected_roles if(CONFIG_GET(flag/protect_assistant_from_antagonist)) ruleset.restricted_roles |= JOB_ASSISTANT +<<<<<<< HEAD // SKYRAT EDIT ADDITION for(var/datum/job/iterating_job as anything in subtypesof(/datum/job)) if(!initial(iterating_job.antagonist_restricted)) @@ -958,6 +970,8 @@ SUBSYSTEM_DEF(dynamic) else ruleset.restricted_roles |= initial(iterating_job.title) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!(ruleset.ruleset_category & GLOB.dynamic_ruleset_categories)) ruleset.requirements = list(101,101,101,101,101,101,101,101,101,101) diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets.dm index 8460307009e..f5ef98805ab 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets.dm @@ -262,6 +262,7 @@ candidates.Remove(candidate_player) continue +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(!candidate_client.prefs?.read_preference(/datum/preference/toggle/be_antag)) candidates.Remove(candidate_player) @@ -272,6 +273,8 @@ continue //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(candidate_client.get_remaining_days(minimum_required_age) > 0) candidates.Remove(candidate_player) continue diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm index afc3bca78d0..9fd2217bb66 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm @@ -16,6 +16,7 @@ candidates.Remove(P) else if (!((antag_preference || antag_flag) in P.client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE))) candidates.Remove(P) +<<<<<<< HEAD // SKYRAT EDIT ADDITION - PROTECTED JOBS else if(P.client?.prefs && !P.client.prefs.read_preference(/datum/preference/toggle/be_antag)) candidates.Remove(P) @@ -24,6 +25,8 @@ candidates.Remove(P) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dynamic_ruleset/latejoin/ready(forced = 0) if (forced) diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm index fb7b7db9bb9..69b6066216c 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm @@ -63,6 +63,7 @@ if (isnull(creature.client)) // Are they connected? trimmed_list.Remove(creature) continue +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(is_banned_from(creature.client.ckey, BAN_ANTAGONIST)) trimmed_list.Remove(creature) @@ -71,6 +72,8 @@ trimmed_list.Remove(creature) continue //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(creature.client.get_remaining_days(minimum_required_age) > 0) trimmed_list.Remove(creature) continue diff --git a/code/controllers/subsystem/dynamic/ruleset_picking.dm b/code/controllers/subsystem/dynamic/ruleset_picking.dm index 4373fe76da0..a8bdf6bc683 100644 --- a/code/controllers/subsystem/dynamic/ruleset_picking.dm +++ b/code/controllers/subsystem/dynamic/ruleset_picking.dm @@ -1,4 +1,8 @@ +<<<<<<< HEAD #define ADMIN_CANCEL_MIDROUND_TIME (180 SECONDS) //SKYRAT EDIT - ORIGINAL 10 SECONDS +======= +#define ADMIN_CANCEL_MIDROUND_TIME (10 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// /// @@ -66,14 +70,19 @@ ADMIN_CANCEL_MIDROUND_TIME, \ TIMER_STOPPABLE, \ ) +<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN - Event notification /** +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_dynamic("[rule] ruleset executing...") message_admins("DYNAMIC: Executing midround ruleset [rule] in [DisplayTimeText(ADMIN_CANCEL_MIDROUND_TIME)]. \ CANCEL | \ SOMETHING ELSE") return rule +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - Event notification @@ -93,6 +102,8 @@ return rule // SKYRAT EDIT ADDITION END - Event notification +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fired after admins do not cancel a midround injection. /datum/controller/subsystem/dynamic/proc/execute_midround_rule(datum/dynamic_ruleset/rule) diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index f4b8c8138b8..1d601bb6769 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -17,8 +17,11 @@ SUBSYSTEM_DEF(events) ///Will wizard events be included in the event pool? var/wizardmode = FALSE +<<<<<<< HEAD var/list/previously_run = list() //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/events/Initialize() for(var/type in typesof(/datum/round_event_control)) var/datum/round_event_control/event = new type() diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index 31de67361bf..e547a324891 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -454,11 +454,14 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec if(EXPLODE_LIGHT) SSexplosions.lowturf += explode +<<<<<<< HEAD //SKYRAT EDIT ADDITION for(var/obj/machinery/light/iterating_light in explode) iterating_light.start_flickering() //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(40) && dist < flame_range && !isspaceturf(explode) && !explode.density) flameturf += explode diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 706b4e51d69..980b86a425b 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -346,6 +346,10 @@ SUBSYSTEM_DEF(garbage) /// Datums passed to this will be given a chance to clean up references to allow the GC to collect them. /proc/qdel(datum/to_delete, force = FALSE) if(!istype(to_delete)) +<<<<<<< HEAD +======= + DREAMLUAU_CLEAR_REF_USERDATA(to_delete) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 del(to_delete) return diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index 6c5df16d7e7..fe0c46c8d6d 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -330,7 +330,10 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold" desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch" desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den" +<<<<<<< HEAD desc_by_access["[ACCESS_BARBER]"] = "Barber" // SKYRAT EDIT ADD - BARBER UPDATE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Returns the access bitflags associated with any given access level. @@ -399,6 +402,11 @@ SUBSYSTEM_DEF(id_access) id_card.clear_access() id_card.trim = trim +<<<<<<< HEAD +======= + id_card.big_pointer = trim.big_pointer + id_card.pointer_color = trim.pointer_color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(copy_access) id_card.access = trim.access.Copy() @@ -442,6 +450,11 @@ SUBSYSTEM_DEF(id_access) id_card.department_color_override = trim.department_color id_card.department_state_override = trim.department_state id_card.subdepartment_color_override = trim.subdepartment_color +<<<<<<< HEAD +======= + id_card.big_pointer = trim.big_pointer + id_card.pointer_color = trim.pointer_color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!check_forged || !id_card.forged) id_card.assignment = trim.assignment @@ -462,6 +475,11 @@ SUBSYSTEM_DEF(id_access) id_card.department_color_override = null id_card.department_state_override = null id_card.subdepartment_color_override = null +<<<<<<< HEAD +======= + id_card.big_pointer = id_card.trim.big_pointer + id_card.pointer_color = id_card.trim.pointer_color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Adds the accesses associated with a trim to an ID card. diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index e1409c12f89..4b54eb4ac5e 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -294,12 +294,15 @@ SUBSYSTEM_DEF(job) JobDebug("GRJ skipping command role, Player: [player], Job: [job]") continue +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(job.departments_bitflags & DEPARTMENT_BITFLAG_CENTRAL_COMMAND) //If you want a CC position, select it! JobDebug("GRJ skipping Central Command role, Player: [player], Job: [job]") continue //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // This check handles its own output to JobDebug. if(check_job_eligibility(player, job, "GRJ", add_job_to_log = TRUE) != JOB_AVAILABLE) continue @@ -559,6 +562,7 @@ SUBSYSTEM_DEF(job) //Gives the player the stuff he should have with his rank /datum/controller/subsystem/job/proc/EquipRank(mob/living/equipping, datum/job/job, client/player_client) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - ALTERNATIVE_JOB_TITLES // The alt job title, if user picked one, or the default var/alt_title = player_client?.prefs.alt_job_titles[job.title] @@ -572,13 +576,26 @@ SUBSYSTEM_DEF(job) equipping.on_job_equipping(job, player_client) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: equipping.on_job_equipping(job) job.announce_job(equipping, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: job.announce_job(equipping) +======= + equipping.job = job.title + + SEND_SIGNAL(equipping, COMSIG_JOB_RECEIVED, job) + + equipping.mind?.set_assigned_role_with_greeting(job, player_client) + equipping.on_job_equipping(job, player_client) + job.announce_job(equipping) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(player_client?.holder) if(CONFIG_GET(flag/auto_deadmin_players) || (player_client.prefs?.toggles & DEADMIN_ALWAYS)) player_client.holder.auto_deadmin() else handle_auto_deadmin_roles(player_client, job.title) +<<<<<<< HEAD setup_alt_job_items(equipping, job, player_client) // SKYRAT EDIT ADDITION - ALTERNATIVE_JOB_TITLES +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 job.after_spawn(equipping, player_client) /datum/controller/subsystem/job/proc/handle_auto_deadmin_roles(client/C, rank) @@ -685,7 +702,10 @@ SUBSYSTEM_DEF(job) if(!run_divide_occupation_pure) to_chat(player, "You have failed to qualify for any job you desired.") player.ready = PLAYER_NOT_READY +<<<<<<< HEAD player.client << output(player.ready, "lobby_browser:imgsrc") //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/job/Recover() @@ -914,6 +934,7 @@ SUBSYSTEM_DEF(job) JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_AGE)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_AGE +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION if(!CONFIG_GET(flag/bypass_veteran_system) && possible_job.veteran_only && !SSplayer_ranks.is_veteran(player.client)) JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_NOT_VETERAN)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") @@ -945,6 +966,8 @@ SUBSYSTEM_DEF(job) // Run this check after is_banned_from since it can query the DB which may sleep. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Need to recheck the player exists after is_banned_from since it can query the DB which may sleep. if(QDELETED(player)) JobDebug("[debug_prefix] player is qdeleted, Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") diff --git a/code/controllers/subsystem/lag_switch.dm b/code/controllers/subsystem/lag_switch.dm index fdd9a9287e5..d66bfc1c78f 100644 --- a/code/controllers/subsystem/lag_switch.dm +++ b/code/controllers/subsystem/lag_switch.dm @@ -124,6 +124,7 @@ SUBSYSTEM_DEF(lag_switch) to_chat(world, span_boldannounce("Footstep sounds have been disabled for performance concerns.")) else to_chat(world, span_boldannounce("Footstep sounds have been re-enabled.")) +<<<<<<< HEAD // SKYRAT EDIT ADDITION if (DISABLE_CREATOR) if (state) @@ -131,6 +132,8 @@ SUBSYSTEM_DEF(lag_switch) else to_chat(world, span_boldannounce("The character creator has been re-enabled.")) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/controllers/subsystem/lua.dm b/code/controllers/subsystem/lua.dm index 1ab88a01746..0645ea81f2b 100644 --- a/code/controllers/subsystem/lua.dm +++ b/code/controllers/subsystem/lua.dm @@ -2,7 +2,10 @@ SUBSYSTEM_DEF(lua) name = "Lua Scripting" runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT wait = 0.1 SECONDS +<<<<<<< HEAD flags = SS_OK_TO_FAIL_INIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A list of all lua states var/list/datum/lua_state/states = list() @@ -18,6 +21,7 @@ SUBSYSTEM_DEF(lua) var/list/current_run = list() var/list/current_states_run = list() +<<<<<<< HEAD /// Protects return values from getting GCed before getting converted to lua values /// Gets cleared every tick. var/list/gc_guard = list() @@ -43,6 +47,21 @@ SUBSYSTEM_DEF(lua) initialization_failure_message = crash_message warning(crash_message) return SS_INIT_FAILURE +======= + var/list/needs_gc_cycle = list() + +/datum/controller/subsystem/lua/Initialize() + DREAMLUAU_SET_EXECUTION_LIMIT_SECS(5) + // Set wrappers to ensure that lua scripts are subject to the same safety restrictions as other admin tooling + DREAMLUAU_SET_NEW_WRAPPER("/proc/_new") + DREAMLUAU_SET_VAR_GET_WRAPPER("/proc/wrap_lua_get_var") + DREAMLUAU_SET_VAR_SET_WRAPPER("/proc/wrap_lua_set_var") + DREAMLUAU_SET_OBJECT_CALL_WRAPPER("/proc/wrap_lua_datum_proc_call") + DREAMLUAU_SET_GLOBAL_CALL_WRAPPER("/proc/wrap_lua_global_proc_call") + // Set the print wrapper, as otherwise, the print function is meaningless + DREAMLUAU_SET_PRINT_WRAPPER("/proc/wrap_lua_print") + return SS_INIT_SUCCESS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/lua/OnConfigLoad() // Read the paths from the config file @@ -52,9 +71,12 @@ SUBSYSTEM_DEF(lua) lua_path += path world.SetConfig("env", "LUAU_PATH", jointext(lua_path, ";")) +<<<<<<< HEAD /datum/controller/subsystem/lua/Shutdown() AUXTOOLS_FULL_SHUTDOWN(AUXLUA) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/lua/proc/queue_resume(datum/lua_state/state, index, arguments) if(!initialized) return @@ -64,6 +86,7 @@ SUBSYSTEM_DEF(lua) arguments = list() else if(!islist(arguments)) arguments = list(arguments) +<<<<<<< HEAD resumes += list(list("state" = state, "index" = index, "arguments" = arguments)) /datum/controller/subsystem/lua/proc/kill_task(datum/lua_state/state, list/task_info) @@ -94,6 +117,35 @@ SUBSYSTEM_DEF(lua) resumes.Cut(i, i+1) break state.kill_task(task_info) +======= + else + var/list/args_list = arguments + arguments = args_list.Copy() + resumes += list(list("state" = state, "index" = index, "arguments" = arguments)) + +/datum/controller/subsystem/lua/proc/kill_task(datum/lua_state/state, is_sleep, index) + if(!istype(state)) + return + if(is_sleep) + var/state_index = 1 + + // Get the nth sleep in the sleep list corresponding to the target state + for(var/i in 1 to length(sleeps)) + var/datum/lua_state/sleeping_state = sleeps[i] + if(sleeping_state == state) + if(state_index == index) + sleeps.Cut(i, i+1) + break + state_index++ + else + // Remove the resumt from the resumt list + for(var/i in 1 to length(resumes)) + var/resume = resumes[i] + if(resume["state"] == state && resume["index"] == index) + resumes.Cut(i, i+1) + break + state.kill_task(is_sleep, index) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/lua/fire(resumed) // Each fire of SSlua awakens every sleeping task in the order they slept, @@ -104,7 +156,10 @@ SUBSYSTEM_DEF(lua) sleeps.Cut() resumes.Cut() +<<<<<<< HEAD gc_guard.Cut() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/current_sleeps = current_run["sleeps"] var/list/affected_states = list() while(length(current_sleeps)) @@ -147,6 +202,38 @@ SUBSYSTEM_DEF(lua) if(MC_TICK_CHECK) break +<<<<<<< HEAD // Update every lua editor TGUI open for each state that had a task awakened or resumed for(var/datum/lua_state/state in affected_states) INVOKE_ASYNC(state, TYPE_PROC_REF(/datum/lua_state, update_editors)) +======= + while(length(needs_gc_cycle)) + var/datum/lua_state/state = needs_gc_cycle[needs_gc_cycle.len] + needs_gc_cycle.len-- + state.collect_garbage() + + // Update every lua editor TGUI open for each state that had a task awakened or resumed + for(var/datum/lua_state/state in affected_states) + INVOKE_ASYNC(state, TYPE_PROC_REF(/datum/lua_state, update_editors)) + +/datum/controller/subsystem/lua/proc/log_involved_runtime(exception/runtime, list/desclines, list/lua_stacks) + var/list/json_data = list("status" = "runtime", "file" = runtime.file, "line" = runtime.line, "message" = runtime.name, "stack" = list()) + var/level = 1 + for(var/line in desclines) + line = copytext(line, 3) + if(starts_with_any(line, list( + "/datum/lua_state (/datum/lua_state): load script", + "/datum/lua_state (/datum/lua_state): call function", + "/datum/lua_state (/datum/lua_state): awaken", + "/datum/lua_state (/datum/lua_state): resume" + ))) + json_data["stack"] += lua_stacks[level] + level++ + json_data["stack"] += line + for(var/datum/weakref/state_ref as anything in GLOB.lua_state_stack) + var/datum/lua_state/state = state_ref.resolve() + if(!state) + continue + state.log_result(json_data) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index a723015b80f..60f118b17d3 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -416,7 +416,10 @@ Used by the AI doomsday and the self-destruct nuke. // load the maps for (var/P in parsed_maps) var/datum/parsed_map/pm = P +<<<<<<< HEAD pm.turf_blacklist = turf_blacklist // SKYRAT EDIT ADDITION - apply blacklist +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/bounds = pm.bounds var/x_offset = bounds ? round(world.maxx / 2 - bounds[MAP_MAXX] / 2) + 1 : 1 var/y_offset = bounds ? round(world.maxy / 2 - bounds[MAP_MAXY] / 2) + 1 : 1 @@ -931,6 +934,11 @@ ADMIN_VERB(load_away_mission, R_FUN, "Load Away Mission", "Load a specific away /datum/controller/subsystem/mapping/proc/lazy_load_template(template_key, force = FALSE) RETURN_TYPE(/datum/turf_reservation) +<<<<<<< HEAD +======= + + UNTIL(initialized) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/lazy_loading = FALSE UNTIL(!lazy_loading) diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 3a704d01a82..7cc537ff789 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -26,6 +26,13 @@ SUBSYSTEM_DEF(materials) new /datum/stack_recipe("Sink Frame", /obj/structure/sinkframe, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_FURNITURE), new /datum/stack_recipe("Material floor tile", /obj/item/stack/tile/material, 1, 4, 20, crafting_flags = CRAFT_APPLIES_MATS, category = CAT_TILES), new /datum/stack_recipe("Material airlock assembly", /obj/structure/door_assembly/door_assembly_material, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), +<<<<<<< HEAD +======= + ) + ///List of stackcrafting recipes for materials using rigid recipes + var/list/rigid_stack_recipes = list( + new /datum/stack_recipe("Carving block", /obj/structure/carving_block, 5, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_STRUCTURE), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) ///List of stackcrafting recipes for materials using rigid recipes var/list/rigid_stack_recipes = list( @@ -35,7 +42,10 @@ SUBSYSTEM_DEF(materials) ///A list of dimensional themes used by the dimensional anomaly and other things, most of which require materials to function. var/list/datum/dimension_theme/dimensional_themes -///Ran on initialize, populated the materials and materials_by_category dictionaries with their appropiate vars (See these variables for more info) + ///A list of dimensional themes used by the dimensional anomaly and other things, most of which require materials to function. + var/list/datum/dimension_theme/dimensional_themes + +///Ran on initialize, populated the materials and materials_by_category dictionaries with their appropriate vars (See these variables for more info) /datum/controller/subsystem/materials/proc/InitializeMaterials() materials = list() materials_by_type = list() @@ -53,7 +63,11 @@ SUBSYSTEM_DEF(materials) /** Creates and caches a material datum. * +<<<<<<< HEAD * Arugments: +======= + * Arguments: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - [arguments][/list]: The arguments to use to create the material datum * - The first element is the type of material to initialize. */ @@ -134,7 +148,11 @@ SUBSYSTEM_DEF(materials) value = arguments[key] if(!(istext(key) || isnum(key))) key = REF(key) +<<<<<<< HEAD key = "[key]" // Key is stringified so numbers dont break things +======= + key = "[key]" // Key is stringified so numbers don't break things +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(value)) if(!(istext(value) || isnum(value))) value = REF(value) diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index 9dbc3cd2a05..6bdb93ccd30 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -13,7 +13,11 @@ SUBSYSTEM_DEF(minor_mapping) return SS_INIT_NO_NEED #else trigger_migration(CONFIG_GET(number/mice_roundstart)) +<<<<<<< HEAD place_satchels(satchel_amount = 10) //SKYRAT EDIT CHANGE - ORIGINAL : place_satchels(satchel_amount = 2) +======= + place_satchels(satchel_amount = 2) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return SS_INIT_SUCCESS #endif diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index db94c291a18..ea3258c0971 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -17,7 +17,11 @@ SUBSYSTEM_DEF(overlays) /// Don't have access to that type tho, so this is the best you're gonna get /proc/overlays2text(list/overlays) var/list/unique_overlays = list() +<<<<<<< HEAD // As anything because we're basically doing type coerrsion, rather then actually filtering for mutable apperances +======= + // As anything because we're basically doing type coercion, rather then actually filtering for mutable appearances +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mutable_appearance/overlay as anything in overlays) var/key = "[overlay.icon]-[overlay.icon_state]-[overlay.dir]" unique_overlays[key] += 1 diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm index fa1a7af5c85..938aebc20a4 100644 --- a/code/controllers/subsystem/pathfinder.dm +++ b/code/controllers/subsystem/pathfinder.dm @@ -158,7 +158,11 @@ SUBSYSTEM_DEF(pathfinder) /// Takes a set of pathfind info, returns the first valid pathmap that would work if one exists /// Optionally takes a max age to accept (defaults to 0 seconds) and a minimum acceptable range +<<<<<<< HEAD /// If include_building is true and we can only find a building path, ew'll use that instead. tho we will wait for it to finish first +======= +/// If include_building is true and we can only find a building path, we'll use that instead. tho we will wait for it to finish first +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/pathfinder/proc/get_valid_map(datum/can_pass_info/pass_info, turf/target, simulated_only = TRUE, turf/exclude, age = MAP_REUSE_INSTANT, min_range = -INFINITY, include_building = FALSE) // Walk all the maps that match our caller's turf OR our target's // Then hold onto em. If their cache time is short we can reuse/expand them, if not we'll have to make a new one diff --git a/code/controllers/subsystem/persistence/_persistence.dm b/code/controllers/subsystem/persistence/_persistence.dm index b98a2feb56d..fdc2f22a456 100644 --- a/code/controllers/subsystem/persistence/_persistence.dm +++ b/code/controllers/subsystem/persistence/_persistence.dm @@ -48,6 +48,20 @@ SUBSYSTEM_DEF(persistence) var/tram_hits_this_round = 0 var/tram_hits_last_round = 0 +<<<<<<< HEAD +======= + /// A json database to data/message_bottles.json + var/datum/json_database/message_bottles_database + /// An index used to create unique ids for the message bottles database + var/message_bottles_index = 0 + /** + * A list of non-maploaded photos or papers that met the 0.2% chance to be saved in the message bottles database + * because I don't want the database to feel empty unless there's someone constantly throwing bottles in the + * sea or beach/ocean fishing portals. + */ + var/list/queued_message_bottles + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/persistence/Initialize() load_poly() load_wall_engravings() @@ -58,7 +72,10 @@ SUBSYSTEM_DEF(persistence) load_randomized_recipes() load_custom_outfits() load_delamination_counter() +<<<<<<< HEAD load_panic_bunker() //SKYRAT EDIT ADDITION - PANICBUNKER +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 load_tram_counter() load_adventures() return SS_INIT_SUCCESS @@ -72,13 +89,22 @@ SUBSYSTEM_DEF(persistence) save_randomized_recipes() save_scars() save_custom_outfits() +<<<<<<< HEAD save_modular_persistence() // SKYRAT EDIT ADDITION - MODULAR_PERSISTENCE save_delamination_counter() +======= + save_delamination_counter() + save_queued_message_bottles() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SStransport.can_fire) for(var/datum/transport_controller/linear/tram/transport as anything in SStransport.transports_by_type[TRANSPORT_TYPE_TRAM]) save_tram_history(transport.specific_transport_id) save_tram_counter() +<<<<<<< HEAD save_panic_bunker() //SKYRAT EDIT ADDITION - PANICBUNKER +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Loads up Poly's speech buffer. /datum/controller/subsystem/persistence/proc/load_poly() diff --git a/code/controllers/subsystem/persistence/engravings.dm b/code/controllers/subsystem/persistence/engravings.dm index f47fc7fbba1..b56a8093aa2 100644 --- a/code/controllers/subsystem/persistence/engravings.dm +++ b/code/controllers/subsystem/persistence/engravings.dm @@ -27,7 +27,11 @@ var/successfully_loaded_engravings = 0 +<<<<<<< HEAD for(var/iteration in 1 to rand(MIN_PERSISTENT_ENGRAVINGS, MAX_PERSISTENT_ENGRAVINGS)) +======= + for(var/iteration in 1 to min(rand(MIN_PERSISTENT_ENGRAVINGS, MAX_PERSISTENT_ENGRAVINGS), saved_engravings.len)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/engraving = pick_n_take(saved_engravings) if(!islist(engraving)) stack_trace("something's wrong with the engraving data! one of the saved engravings wasn't a list!") diff --git a/code/controllers/subsystem/persistence/message_bottles.dm b/code/controllers/subsystem/persistence/message_bottles.dm new file mode 100644 index 00000000000..ce1efe5e59c --- /dev/null +++ b/code/controllers/subsystem/persistence/message_bottles.dm @@ -0,0 +1,54 @@ +///This proc is used to save photos, papers and cash stored inside a bottle when tossed into the ocean. +/datum/controller/subsystem/persistence/proc/save_message_bottle(obj/item/message, bottle_type = /obj/item/reagent_containers/cup/glass/bottle) + if(isnull(message_bottles_database)) + message_bottles_database = new("data/message_bottles.json") + + var/list/data = list() + data["bottle_type"] = text2path(bottle_type) + if(istype(message, /obj/item/paper)) + var/obj/item/paper/paper = message + if(!length(paper.raw_text_inputs) && !length(paper.raw_stamp_data) && !length(paper.raw_field_input_data)) + return + data["paper"] = paper.convert_to_data() + else if(istype(message, /obj/item/photo)) + var/obj/item/photo/photo = message + if(!photo.picture?.id) + return + data["photo_id"] = photo.picture.id + else if(istype(message, /obj/item/stack/spacecash)) + var/obj/item/stack/spacecash/cash = message + data["cash"] = text2path(cash.type) + data["amount"] = cash.amount + message_bottles_index++ + message_bottles_database.set_key("message-[GLOB.round_id]-[message_bottles_index]", data) + +/datum/controller/subsystem/persistence/proc/load_message_bottle(atom/loc) + if(isnull(message_bottles_database)) + message_bottles_database = new("data/message_bottles.json") + + var/list/data = message_bottles_database.pick_and_take_key() + if(!data) + var/obj/item/reagent_containers/cup/glass/bottle/bottle = new(loc) + return bottle + + var/bottle_type = text2path(data["bottle_type"]) || /obj/item/reagent_containers/cup/glass/bottle + var/obj/item/reagent_containers/cup/glass/bottle/bottle = new bottle_type(loc) + bottle.reagents.remove_all(bottle.reagents.maximum_volume) + if(data["photo_id"]) + var/obj/item/photo/old/photo = load_photo_from_disk(data["photo_id"], bottle) + bottle.message_in_a_bottle = photo + else if(data["cash"]) + var/cash_type = text2path(data["cash"]) || /obj/item/stack/spacecash/c10 + var/obj/item/stack/spacecash/cash = new cash_type(bottle, data["amount"]) + bottle.message_in_a_bottle = cash + else if(data["paper"]) + var/obj/item/paper/paper = new(bottle) + paper.write_from_data(data["paper"]) + bottle.message_in_a_bottle = paper + + bottle.update_icon(UPDATE_OVERLAYS) + +/datum/controller/subsystem/persistence/proc/save_queued_message_bottles() + for(var/item in queued_message_bottles) + save_message_bottle(item) + queued_message_bottles = null diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm index aba0cbbcfea..d9903ef430a 100644 --- a/code/controllers/subsystem/polling.dm +++ b/code/controllers/subsystem/polling.dm @@ -281,12 +281,15 @@ SUBSYSTEM_DEF(polling) if(is_banned_from(potential_candidate.ckey, list(check_jobban, ROLE_SYNDICATE))) return FALSE +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(is_banned_from(potential_candidate.ckey, BAN_GHOST_TAKEOVER) || is_banned_from(potential_candidate.ckey, BAN_ANTAGONIST)) to_chat(potential_candidate, "There was a ghost prompt for: [role], unfortunately you are banned from ghost takeovers.") return FALSE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /datum/controller/subsystem/polling/proc/polling_finished(datum/candidate_poll/finishing_poll) diff --git a/code/controllers/subsystem/processing/fishing.dm b/code/controllers/subsystem/processing/fishing.dm index da10d3d631a..d38a4826907 100644 --- a/code/controllers/subsystem/processing/fishing.dm +++ b/code/controllers/subsystem/processing/fishing.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /** * So far, only used by the fishing minigame. Feel free to rename it to something like veryfastprocess * if you need one that fires 10 times a second @@ -5,3 +6,38 @@ PROCESSING_SUBSYSTEM_DEF(fishing) name = "Fishing" wait = 0.1 SECONDS +======= +/// subsystem for the fishing minigame processing. +PROCESSING_SUBSYSTEM_DEF(fishing) + name = "Fishing" + flags = SS_BACKGROUND|SS_POST_FIRE_TIMING + wait = 0.05 SECONDS // If you raise it to 0.1 SECONDS, you better also modify [datum/fish_movement/move_fish()] + ///Cached fish properties so we don't have to initalize fish every time + var/list/fish_properties + ///A cache of fish that can be caught by each type of fishing lure + var/list/lure_catchables + +/datum/controller/subsystem/processing/fishing/Initialize() + ///init the properties + fish_properties = list() + for(var/fish_type in subtypesof(/obj/item/fish)) + var/obj/item/fish/fish = new fish_type(null, FALSE) + fish_properties[fish_type] = list() + fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT] = fish.favorite_bait.Copy() + fish_properties[fish_type][FISH_PROPERTIES_BAD_BAIT] = fish.disliked_bait.Copy() + fish_properties[fish_type][FISH_PROPERTIES_TRAITS] = fish.fish_traits.Copy() + qdel(fish) + + ///init the list of things lures can catch + lure_catchables = list() + var/list/fish_types = subtypesof(/obj/item/fish) + for(var/lure_type in typesof(/obj/item/fishing_lure)) + var/obj/item/fishing_lure/lure = new lure_type + lure_catchables[lure_type] = list() + for(var/obj/item/fish/fish_type as anything in fish_types) + if(lure.is_catchable_fish(fish_type, fish_properties[fish_type])) + lure_catchables[lure_type] += fish_type + qdel(lure) + + return SS_INIT_SUCCESS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 6a0b2bd05c0..72aaad287db 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -17,7 +17,11 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/transhumanist, /datum/quirk/body_purist), list(/datum/quirk/prosthetic_organ, /datum/quirk/tin_man, /datum/quirk/body_purist), list(/datum/quirk/quadruple_amputee, /datum/quirk/paraplegic, /datum/quirk/hemiplegic), +<<<<<<< HEAD //list(/datum/quirk/quadruple_amputee, /datum/quirk/frail), // SKYRAT EDIT REMOVAL- Since we have synth wounds now, frail has a large downside for prosthetics and such +======= + list(/datum/quirk/quadruple_amputee, /datum/quirk/frail), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list(/datum/quirk/social_anxiety, /datum/quirk/mute), list(/datum/quirk/mute, /datum/quirk/softspoken), list(/datum/quirk/poor_aim, /datum/quirk/bighands), @@ -26,6 +30,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/photophobia, /datum/quirk/nyctophobia), list(/datum/quirk/item_quirk/settler, /datum/quirk/freerunning), list(/datum/quirk/numb, /datum/quirk/selfaware), +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN list(/datum/quirk/equipping/nerve_staple, /datum/quirk/nonviolent), list(/datum/quirk/equipping/nerve_staple, /datum/quirk/item_quirk/nearsighted), @@ -39,6 +44,8 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/oversized, /datum/quirk/item_quirk/settler), list(/datum/quirk/echolocation, /datum/quirk/item_quirk/blindness, /datum/quirk/item_quirk/nearsighted, /datum/quirk/item_quirk/deafness), //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist()) @@ -89,6 +96,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) if(initial(quirk_type.abstract_parent_type) == type) continue +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(initial(quirk_type.erp_quirk) && CONFIG_GET(flag/disable_erp_preferences)) continue @@ -97,6 +105,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks) continue // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 quirks[initial(quirk_type.name)] = quirk_type quirk_points[initial(quirk_type.name)] = initial(quirk_type.value) @@ -193,7 +203,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks) /// be valid. /// If no changes need to be made, will return the same list. /// Expects all quirk names to be unique, but makes no other expectations. +<<<<<<< HEAD /datum/controller/subsystem/processing/quirks/proc/filter_invalid_quirks(list/quirks, list/augments) // SKYRAT EDIT - AUGMENTS+ +======= +/datum/controller/subsystem/processing/quirks/proc/filter_invalid_quirks(list/quirks) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/new_quirks = list() var/list/positive_quirks = list() var/points_enabled = !CONFIG_GET(flag/disable_quirk_points) @@ -202,11 +216,14 @@ PROCESSING_SUBSYSTEM_DEF(quirks) var/list/all_quirks = get_quirks() +<<<<<<< HEAD // SKYRAT EDIT BEGIN - AUGMENTS+ for(var/key in augments) var/datum/augment_item/aug = GLOB.augment_items[augments[key]] balance += aug.cost // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for (var/quirk_name in quirks) var/datum/quirk/quirk = all_quirks[quirk_name] if (isnull(quirk)) diff --git a/code/controllers/subsystem/processing/reagents.dm b/code/controllers/subsystem/processing/reagents.dm index c4b86a23efc..18533e9c0cb 100644 --- a/code/controllers/subsystem/processing/reagents.dm +++ b/code/controllers/subsystem/processing/reagents.dm @@ -17,6 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(reagents) GLOB.fake_reagent_blacklist = list(/datum/reagent/medicine/c2, /datum/reagent/medicine, /datum/reagent/reaction_agent) //Build GLOB lists - see holder.dm build_chemical_reactions_lists() +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(CONFIG_GET(flag/disable_erp_preferences)) @@ -30,6 +31,8 @@ PROCESSING_SUBSYSTEM_DEF(reagents) if(reaction_list) reaction_list -= reaction_datum // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return SS_INIT_SUCCESS /datum/controller/subsystem/processing/reagents/fire(resumed = FALSE) diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm index 064f1446bf9..afcd008346a 100644 --- a/code/controllers/subsystem/processing/station.dm +++ b/code/controllers/subsystem/processing/station.dm @@ -24,7 +24,11 @@ PROCESSING_SUBSYSTEM_DEF(station) // Autowiki also wants consistent outputs, for example making sure the vending machine page always reports the normal products #if !defined(UNIT_TESTS) && !defined(AUTOWIKI) SetupTraits() +<<<<<<< HEAD //display_lobby_traits() SKYRAT EDIT REMOVAL +======= + display_lobby_traits() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #endif announcer = new announcer() //Initialize the station's announcer datum @@ -173,7 +177,10 @@ PROCESSING_SUBSYSTEM_DEF(station) var/datum/station_trait/trait_to_remove = i selectable_traits_by_types[initial(trait_to_remove.trait_type)] -= trait_to_remove +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Update station trait lobby buttons for clients who joined before we initialised this subsystem /datum/controller/subsystem/processing/station/proc/display_lobby_traits() for (var/mob/dead/new_player/player as anything in GLOB.new_player_list) @@ -182,4 +189,7 @@ PROCESSING_SUBSYSTEM_DEF(station) continue observer_hud.add_station_trait_buttons() observer_hud.show_hud(observer_hud.hud_version) +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index fe8a002d9c4..704b3bc12a4 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -78,8 +78,11 @@ SUBSYSTEM_DEF(research) new /datum/techweb/science new /datum/techweb/admin new /datum/techweb/oldstation +<<<<<<< HEAD new /datum/techweb/tarkon //Skyrat Edit new /datum/techweb/interdyne //Skyrat Edit +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 autosort_categories() error_design = new error_node = new diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index de9de30a87b..ebf7ee70eb5 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -147,6 +147,7 @@ SUBSYSTEM_DEF(shuttle) while(length(pack_processing)) var/datum/supply_pack/pack = pack_processing[length(pack_processing)] pack_processing.len-- +<<<<<<< HEAD //SKYRAT EDIT START if(pack == /datum/supply_pack/armament) continue @@ -159,6 +160,16 @@ SUBSYSTEM_DEF(shuttle) pack_processing += generated_packs continue +======= + if(ispath(pack, /datum/supply_pack)) + pack = new pack + + var/list/generated_packs = pack.generate_supply_packs() + if(generated_packs) + pack_processing += generated_packs + continue + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //we have to create the pack before checking if it has 'contains' because generate_supply_packs manually sets it, therefore we cant check initial. if(!pack.contains) continue @@ -279,7 +290,11 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text = "Emergency shuttle uplink interference detected, shuttle call disabled while the system reinitializes. Estimated restore in [DisplayTimeText(lockout_timer, round_seconds_to = 60)].", title = "Uplink Interference", +<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', +======= + sound = 'sound/misc/announce_dig.ogg', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -293,7 +308,11 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text= "Emergency shuttle uplink services are now back online.", title = "Uplink Restored", +<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', +======= + sound = 'sound/misc/announce_dig.ogg', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) @@ -446,8 +465,12 @@ SUBSYSTEM_DEF(shuttle) if(emergency.timeLeft(1) < emergency_call_time) return if(SEC_LEVEL_BLUE) +<<<<<<< HEAD //if(emergency.timeLeft(1) < emergency_call_time * 0.5) ORIGINAL if(emergency.timeLeft(1) < emergency_call_time * 0.6) //SKYRAT EDIT CHANGE - ALERTS +======= + if(emergency.timeLeft(1) < emergency_call_time * 0.5) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //SKYRAT EDIT ADDITION BEGIN - ALERTS if(SEC_LEVEL_ORANGE) @@ -1052,7 +1075,11 @@ SUBSYSTEM_DEF(shuttle) return data +<<<<<<< HEAD /datum/controller/subsystem/shuttle/ui_act(action, params) +======= +/datum/controller/subsystem/shuttle/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/controllers/subsystem/sprite_accessories.dm b/code/controllers/subsystem/sprite_accessories.dm index 9bb0e286ca5..85449d07cd4 100644 --- a/code/controllers/subsystem/sprite_accessories.dm +++ b/code/controllers/subsystem/sprite_accessories.dm @@ -31,6 +31,7 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/undershirt_m //! stores only undershirt name var/list/undershirt_f //! stores only undershirt name +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Underwear/bra split var/list/bra_list var/list/bra_m @@ -41,13 +42,21 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/socks_list //! stores /datum/sprite_accessory/socks indexed by name /* SKYRAT EDIT REMOVAL START - Customization - Moved to sprite_accessories var +======= + //Socks + var/list/socks_list //! stores /datum/sprite_accessory/socks indexed by name + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Lizard Bits (all datum lists indexed by name) var/list/lizard_markings_list var/list/snouts_list var/list/horns_list var/list/frills_list var/list/spines_list +<<<<<<< HEAD var/list/legs_list +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/tail_spines_list //Mutant Human bits @@ -59,6 +68,7 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/wings_open_list var/list/moth_wings_list var/list/moth_antennae_list +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END var/list/moth_markings_list var/list/pod_hair_list @@ -80,11 +90,19 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/dna_mutant_bodypart_blocks = list() var/list/features_block_lengths = list() // SKYRAT EDIT ADDITION END +======= + var/list/moth_markings_list + var/list/caps_list + var/list/pod_hair_list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/accessories/PreInit() // this stuff NEEDS to be set up before GLOB for preferences and stuff to work so this must go here. sorry setup_lists() init_hair_gradients() +<<<<<<< HEAD make_sprite_accessory_references() // SKYRAT EDIT ADDITION - Customization +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Sets up all of the lists for later utilization in the round and building sprites. /// In an ideal world we could tack everything that just needed `DEFAULT_SPRITE_LIST` into static variables on the top, but due to the initialization order @@ -111,6 +129,7 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity undershirt_m = undershirt_lists[MALE_SPRITE_LIST] undershirt_f = undershirt_lists[FEMALE_SPRITE_LIST] +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Underwear/bra split var/bra_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/bra) bra_list = bra_lists[DEFAULT_SPRITE_LIST] @@ -121,6 +140,10 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST] /* // SKYRAT EDIT REMOVAL START - Customization +======= + socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST] + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lizard_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/lizard_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tails_list_human = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard)[DEFAULT_SPRITE_LIST] @@ -133,6 +156,7 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, add_blank = TRUE)[DEFAULT_SPRITE_LIST] spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] +<<<<<<< HEAD legs_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/legs)[DEFAULT_SPRITE_LIST] caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST] moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST] @@ -155,6 +179,15 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity // SKYRAT EDIT ADDITION END /// This proc just intializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name +======= + caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST] + moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST] + moth_antennae_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae)[DEFAULT_SPRITE_LIST] + moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] + pod_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair)[DEFAULT_SPRITE_LIST] + +/// This proc just initializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/accessories/proc/init_hair_gradients() hair_gradients_list = list() facial_hair_gradients_list = list() diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 7b1394ada16..65753b8325d 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -23,7 +23,10 @@ SUBSYSTEM_DEF(statpanels) if (!resumed) num_fires++ var/datum/map_config/cached = SSmapping.next_map_config +<<<<<<< HEAD /* SKYRAT EDIT CHANGE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 global_data = list( "Map: [SSmapping.config?.map_name || "Loading..."]", cached ? "Next Map: [cached.map_name]" : null, @@ -33,6 +36,7 @@ SUBSYSTEM_DEF(statpanels) "Station Time: [station_time_timestamp()]", "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)" ) +<<<<<<< HEAD */ var/round_time = world.time - SSticker.round_start_time var/real_round_time = world.timeofday - SSticker.real_round_start_time @@ -54,6 +58,8 @@ SUBSYSTEM_DEF(statpanels) "Actual Round Timer: [time2text(real_round_time, "hh:mm:ss", 0)]" ) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSshuttle.emergency) var/ETA = SSshuttle.emergency.getModeStr() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index aef2b12a285..cf967015a0d 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -67,10 +67,13 @@ SUBSYSTEM_DEF(ticker) /// Why an emergency shuttle was called var/emergency_reason +<<<<<<< HEAD var/real_round_start_time = 0 //SKYRAT EDIT ADDITION var/discord_alerted = FALSE //SKYRAT EDIT - DISCORD PING SPAM PREVENTION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/ticker/Initialize() var/list/byond_sound_formats = list( "mid" = TRUE, @@ -161,6 +164,7 @@ SUBSYSTEM_DEF(ticker) for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. to_chat(world, span_notice("Welcome to [station_name()]!")) +<<<<<<< HEAD /* ORIGINAL: send2chat("New round starting on [SSmapping.config.map_name]!", CONFIG_GET(string/channel_announce_new_game)) */ // SKYRAT EDIT START - DISCORD SPAM PREVENTION @@ -173,6 +177,12 @@ SUBSYSTEM_DEF(ticker) addtimer(CALLBACK(SStitle, TYPE_PROC_REF(/datum/controller/subsystem/title, change_title_screen)), 1 SECONDS) //SKYRAT EDIT ADDITION - Title screen //Everyone who wants to be an observer is now spawned SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME) +======= + send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.config.map_name]!"), CONFIG_GET(string/channel_announce_new_game)) + current_state = GAME_STATE_PREGAME + SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fire() if(GAME_STATE_PREGAME) //lobby stats for statpanels @@ -290,8 +300,11 @@ SUBSYSTEM_DEF(ticker) round_start_time = world.time //otherwise round_start_time would be 0 for the signals SEND_SIGNAL(src, COMSIG_TICKER_ROUND_STARTING, world.time) +<<<<<<< HEAD real_round_start_time = REALTIMEOFDAY //SKYRAT EDIT ADDITION SSautotransfer.new_shift(real_round_start_time) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_world("Game start took [(world.timeofday - init_start)/10]s") INVOKE_ASYNC(SSdbcore, TYPE_PROC_REF(/datum/controller/subsystem/dbcore,SetRoundStart)) @@ -338,7 +351,10 @@ SUBSYSTEM_DEF(ticker) iter_human.increment_scar_slot() iter_human.load_persistent_scars() +<<<<<<< HEAD SSpersistence.load_modular_persistence(iter_human.get_organ_slot(ORGAN_SLOT_BRAIN)) // SKYRAT EDIT ADDITION - MODULAR_PERSISTENCE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!iter_human.hardcore_survival_score) continue @@ -372,6 +388,7 @@ SUBSYSTEM_DEF(ticker) GLOB.joined_player_list += player.ckey var/atom/destination = player.mind.assigned_role.get_roundstart_spawn_point() if(!destination) // Failed to fetch a proper roundstart location, won't be going anywhere. +<<<<<<< HEAD player.show_title_screen() //SKYRAT EDIT CHANGE continue player.create_character(destination) @@ -379,6 +396,10 @@ SUBSYSTEM_DEF(ticker) player.show_title_screen() //SKYRAT EDIT ADDITION +======= + continue + player.create_character(destination) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CHECK_TICK /datum/controller/subsystem/ticker/proc/collect_minds() @@ -448,7 +469,10 @@ SUBSYSTEM_DEF(ticker) if(new_player_mob.client?.prefs?.should_be_random_hardcore(player_assigned_role, new_player_living.mind)) new_player_mob.client.prefs.hardcore_random_setup(new_player_living) SSquirks.AssignQuirks(new_player_living, new_player_mob.client) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CHECK_TICK if(captainless) @@ -588,6 +612,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/send_news_report() var/news_message var/news_source = "Nanotrasen News Network" +<<<<<<< HEAD var/decoded_station_name = html_decode(CONFIG_GET(string/cross_comms_name)) //decode station_name to avoid minor_announce double encode // SKYRAT EDIT: CROSS COMMS CONFIG switch(news_report) @@ -697,6 +722,101 @@ SUBSYSTEM_DEF(ticker) else return "We regret to inform you that shit be whack, yo. None of our reporters have any idea of what may or may not have gone on." //SKYRAT EDIT - END +======= + var/decoded_station_name = html_decode(station_name()) //decode station_name to avoid minor_announce double encode + + switch(news_report) + // The nuke was detonated on the syndicate recon outpost + if(NUKE_SYNDICATE_BASE) + news_message = "In a daring raid, the heroic crew of [decoded_station_name] \ + detonated a nuclear device in the heart of a terrorist base." + // The station was destroyed by nuke ops + if(STATION_DESTROYED_NUKE) + news_message = "We would like to reassure all employees that the reports of a Syndicate \ + backed nuclear attack on [decoded_station_name] are, in fact, a hoax. Have a secure day!" + // The station was evacuated (normal result) + if(STATION_EVACUATED) + // Had an emergency reason supplied to pass along + if(emergency_reason) + news_message = "[decoded_station_name] has been evacuated after transmitting \ + the following distress beacon:\n\n[html_decode(emergency_reason)]" + else + news_message = "The crew of [decoded_station_name] has been \ + evacuated amid unconfirmed reports of enemy activity." + // A blob won + if(BLOB_WIN) + news_message = "[decoded_station_name] was overcome by an unknown biological outbreak, killing \ + all crew on board. Don't let it happen to you! Remember, a clean work station is a safe work station." + // A blob was destroyed + if(BLOB_DESTROYED) + news_message = "[decoded_station_name] is currently undergoing decontamination procedures \ + after the destruction of a biological hazard. As a reminder, any crew members experiencing \ + cramps or bloating should report immediately to security for incineration." + // A certain percentage of all cultists managed to escape at the end of round + if(CULT_ESCAPE) + news_message = "Security Alert: A group of religious fanatics have escaped from [decoded_station_name]." + // Cult was completely or almost completely wiped out + if(CULT_FAILURE) + news_message = "Following the dismantling of a restricted cult aboard [decoded_station_name], \ + we would like to remind all employees that worship outside of the Chapel is strictly prohibited, \ + and cause for termination." + // Cult summoned Nar'sie + if(CULT_SUMMON) + news_message = "Company officials would like to clarify that [decoded_station_name] was scheduled \ + to be decommissioned following meteor damage earlier this year. Earlier reports of an \ + unknowable eldritch horror were made in error." + // Nuke detonated, but missed the station entirely + if(NUKE_MISS) + news_message = "The Syndicate have bungled a terrorist attack [decoded_station_name], \ + detonating a nuclear weapon in empty space nearby." + // All nuke ops got killed + if(OPERATIVES_KILLED) + news_message = "Repairs to [decoded_station_name] are underway after an elite \ + Syndicate death squad was wiped out by the crew." + // Nuke ops results inconclusive - Crew escaped without the disk, or nukies were left alive, or something + if(OPERATIVE_SKIRMISH) + news_message = "A skirmish between security forces and Syndicate agents aboard [decoded_station_name] \ + ended with both sides bloodied but intact." + // Revolution victory + if(REVS_WIN) + news_message = "Company officials have reassured investors that despite a union led revolt \ + aboard [decoded_station_name] there will be no wage increases for workers." + // Revolution defeat + if(REVS_LOSE) + news_message = "[decoded_station_name] quickly put down a misguided attempt at mutiny. \ + Remember, unionizing is illegal!" + // All wizards (plus apprentices) have been killed + if(WIZARD_KILLED) + news_message = "Tensions have flared with the Space Wizard Federation following the death \ + of one of their members aboard [decoded_station_name]." + // The station was nuked generically + if(STATION_NUKED) + // There was a blob on board, guess it was nuked to stop it + if(length(GLOB.overminds)) + for(var/mob/camera/blob/overmind as anything in GLOB.overminds) + if(overmind.max_count < overmind.announcement_size) + continue + + news_message = "[decoded_station_name] is currently undergoing decontanimation after a controlled \ + burst of radiation was used to remove a biological ooze. All employees were safely evacuated prior, \ + and are enjoying a relaxing vacation." + break + // A self destruct or something else + else + news_message = "[decoded_station_name] activated its self-destruct device for unknown reasons. \ + Attempts to clone the Captain for arrest and execution are underway." + // The emergency escape shuttle was hijacked + if(SHUTTLE_HIJACK) + news_message = "During routine evacuation procedures, the emergency shuttle of [decoded_station_name] \ + had its navigation protocols corrupted and went off course, but was recovered shortly after." + // A supermatter cascade triggered + if(SUPERMATTER_CASCADE) + news_message = "Officials are advising nearby colonies about a newly declared exclusion zone in \ + the sector surrounding [decoded_station_name]." + + if(news_message) + send2otherserver(news_source, news_message, "News_Report") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/ticker/proc/GetTimeLeft() if(isnull(SSticker.timeLeft)) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 8ecb0c9dc6a..c6ae79bc3a4 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -524,7 +524,11 @@ SUBSYSTEM_DEF(timer) 2 = timeToRun, 3 = wait, 4 = flags, +<<<<<<< HEAD 5 = callBack, /* Safe to hold this directly becasue it's never del'd */ +======= + 5 = callBack, /* Safe to hold this directly because it's never del'd */ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 6 = "[callBack.object]", 7 = text_ref(callBack.object), 8 = getcallingtype(), @@ -539,7 +543,11 @@ SUBSYSTEM_DEF(timer) 2 = timeToRun, 3 = wait, 4 = flags, +<<<<<<< HEAD 5 = callBack, /* Safe to hold this directly becasue it's never del'd */ +======= + 5 = callBack, /* Safe to hold this directly because it's never del'd */ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 6 = "[callBack.object]", 7 = getcallingtype(), 8 = callBack.delegate, diff --git a/code/controllers/subsystem/verb_manager.dm b/code/controllers/subsystem/verb_manager.dm index 337386cff8e..ef73c41c466 100644 --- a/code/controllers/subsystem/verb_manager.dm +++ b/code/controllers/subsystem/verb_manager.dm @@ -8,6 +8,7 @@ * plus TICK_BYOND_RESERVE from the tick and uses up to that amount of time (minus the percentage of the tick used by the time it executes subsystems) * on subsystems running cool things like atmospherics or Life or SSInput or whatever. * +<<<<<<< HEAD * Without this subsystem, verbs are likely to cause overtime if the MC uses all of the time it has alloted for itself in the tick, and SendMaps * uses as much as its expected to, and an expensive verb ends up executing that tick. This is because the MC is completely blind to the cost of * verbs, it can't account for it at all. The only chance for verbs to not cause overtime in a tick where the MC used as much of the tick @@ -17,6 +18,17 @@ * * With this subsystem, the MC can account for the cost of verbs and thus stop major overruns of ticks. This means that the most important subsystems * like SSinput can start at the same time they were supposed to, leading to a smoother experience for the player since ticks arent riddled with +======= + * Without this subsystem, verbs are likely to cause overtime if the MC uses all of the time it has allotted for itself in the tick, and SendMaps + * uses as much as its expected to, and an expensive verb ends up executing that tick. This is because the MC is completely blind to the cost of + * verbs, it can't account for it at all. The only chance for verbs to not cause overtime in a tick where the MC used as much of the tick + * as it allotted itself and where SendMaps costed as much as it was expected to is if the verb(s) take less than TICK_BYOND_RESERVE percent of + * the tick, which isn't much. Not to mention if SendMaps takes more than 30% of the tick and the MC forces itself to take at least 70% of the + * normal tick duration which causes ticks to naturally overrun even in the absence of verbs. + * + * With this subsystem, the MC can account for the cost of verbs and thus stop major overruns of ticks. This means that the most important subsystems + * like SSinput can start at the same time they were supposed to, leading to a smoother experience for the player since ticks aren't riddled with +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * minor hangs over and over again. */ SUBSYSTEM_DEF(verb_manager) @@ -36,17 +48,28 @@ SUBSYSTEM_DEF(verb_manager) ///if TRUE we treat usr's with holders just like usr's without holders. otherwise they always execute immediately var/can_queue_admin_verbs = FALSE +<<<<<<< HEAD ///if this is true all verbs immediately execute and dont queue. in case the mc is fucked or something +======= + ///if this is true all verbs immediately execute and don't queue. in case the mc is fucked or something +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/FOR_ADMINS_IF_VERBS_FUCKED_immediately_execute_all_verbs = FALSE ///used for subtypes to determine if they use their own stats for the stat entry var/use_default_stats = TRUE ///if TRUE this will... message admins every time a verb is queued to this subsystem for the next tick with stats. +<<<<<<< HEAD ///for obvious reasons dont make this be TRUE on the code level this is for admins to turn on var/message_admins_on_queue = FALSE ///always queue if possible. overides can_queue_admin_verbs but not FOR_ADMINS_IF_VERBS_FUCKED_immediately_execute_all_verbs +======= + ///for obvious reasons don't make this be TRUE on the code level this is for admins to turn on + var/message_admins_on_queue = FALSE + + ///always queue if possible. overrides can_queue_admin_verbs but not FOR_ADMINS_IF_VERBS_FUCKED_immediately_execute_all_verbs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/always_queue = FALSE /** @@ -87,7 +110,11 @@ SUBSYSTEM_DEF(verb_manager) #else if(QDELETED(usr) || isnull(usr.client)) +<<<<<<< HEAD stack_trace("_queue_verb() returned false because it wasnt called from player input!") +======= + stack_trace("_queue_verb() returned false because it wasn't called from player input!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE #endif diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 1c519e8aff1..beb48171029 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -356,7 +356,11 @@ SUBSYSTEM_DEF(vote) data["VoteCD"] = CONFIG_GET(number/vote_delay) return data +<<<<<<< HEAD /datum/controller/subsystem/vote/ui_act(action, params) +======= +/datum/controller/subsystem/vote/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/datums/actions/items/reload_rebar.dm b/code/datums/actions/items/reload_rebar.dm new file mode 100644 index 00000000000..a29b02f6b22 --- /dev/null +++ b/code/datums/actions/items/reload_rebar.dm @@ -0,0 +1,5 @@ +/datum/action/item_action/reload_rebar + name = "Reload Rebar" + desc = "Reloads a held crossbow" + button_icon = 'icons/mob/actions/actions_items.dmi' + button_icon_state = "bolts" diff --git a/code/datums/actions/items/toggles.dm b/code/datums/actions/items/toggles.dm index 1ff88f41a73..85d037d1b7f 100644 --- a/code/datums/actions/items/toggles.dm +++ b/code/datums/actions/items/toggles.dm @@ -15,8 +15,11 @@ name = "Toggle Hood" /datum/action/item_action/toggle_firemode +<<<<<<< HEAD button_icon = 'modular_skyrat/master_files/icons/mob/actions/actions_items.dmi' //SKYRAT EDIT ADDITION button_icon_state = "fireselect_no" //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Toggle Firemode" /datum/action/item_action/toggle_gunlight diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 797deb134f2..e6fe63fc8e3 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -63,6 +63,15 @@ multiple modular subtrees with behaviors ///What distance should we be checking for interesting things when considering idling/deidling? Defaults to AI_DEFAULT_INTERESTING_DIST var/interesting_dist = AI_DEFAULT_INTERESTING_DIST +<<<<<<< HEAD +======= + /// TRUE if we're able to run, FALSE if we aren't + /// Should not be set manually, override get_able_to_run() instead + /// Make sure you hook update_able_to_run() in setup_able_to_run() to whatever parameters changing that you added + /// Otherwise we will not pay attention to them changing + var/able_to_run = FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/ai_controller/New(atom/new_pawn) change_ai_movement_type(ai_movement) init_subtrees() @@ -109,6 +118,10 @@ multiple modular subtrees with behaviors ///Proc to move from one pawn to another, this will destroy the target's existing controller. /datum/ai_controller/proc/PossessPawn(atom/new_pawn) +<<<<<<< HEAD +======= + SHOULD_CALL_PARENT(TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(pawn) //Reset any old signals UnpossessPawn(FALSE) @@ -133,6 +146,11 @@ multiple modular subtrees with behaviors RegisterSignal(pawn, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_changed)) RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained)) RegisterSignal(pawn, COMSIG_QDELETING, PROC_REF(on_pawn_qdeleted)) +<<<<<<< HEAD +======= + update_able_to_run() + setup_able_to_run() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_cells = new(interesting_dist, interesting_dist, 1) set_new_cells() @@ -260,11 +278,19 @@ multiple modular subtrees with behaviors ///Proc for deinitializing the pawn to the old controller /datum/ai_controller/proc/UnpossessPawn(destroy) +<<<<<<< HEAD +======= + SHOULD_CALL_PARENT(TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(pawn)) return // instantiated without an applicable pawn, fine set_ai_status(AI_STATUS_OFF) UnregisterSignal(pawn, list(COMSIG_MOVABLE_Z_CHANGED, COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT, COMSIG_MOB_STATCHANGE, COMSIG_QDELETING)) +<<<<<<< HEAD +======= + clear_able_to_run() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ai_movement.moving_controllers[src]) ai_movement.stop_moving_towards(src) var/turf/pawn_turf = get_turf(pawn) @@ -277,8 +303,24 @@ multiple modular subtrees with behaviors if(destroy) qdel(src) +<<<<<<< HEAD ///Returns TRUE if the ai controller can actually run at the moment. /datum/ai_controller/proc/able_to_run() +======= +/datum/ai_controller/proc/setup_able_to_run() + // paused_until is handled by PauseAi() manually + RegisterSignals(pawn, list(SIGNAL_ADDTRAIT(TRAIT_AI_PAUSED), SIGNAL_REMOVETRAIT(TRAIT_AI_PAUSED)), PROC_REF(update_able_to_run)) + +/datum/ai_controller/proc/clear_able_to_run() + UnregisterSignal(pawn, list(SIGNAL_ADDTRAIT(TRAIT_AI_PAUSED), SIGNAL_REMOVETRAIT(TRAIT_AI_PAUSED))) + +/datum/ai_controller/proc/update_able_to_run() + SIGNAL_HANDLER + able_to_run = get_able_to_run() + +///Returns TRUE if the ai controller can actually run at the moment, FALSE otherwise +/datum/ai_controller/proc/get_able_to_run() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(pawn, TRAIT_AI_PAUSED)) return FALSE if(world.time < paused_until) @@ -288,7 +330,11 @@ multiple modular subtrees with behaviors ///Runs any actions that are currently running /datum/ai_controller/process(seconds_per_tick) +<<<<<<< HEAD if(!able_to_run()) +======= + if(!able_to_run) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.move_manager.stop_looping(pawn) //stop moving return //this should remove them from processing in the future through event-based stuff. @@ -405,6 +451,11 @@ multiple modular subtrees with behaviors /datum/ai_controller/proc/PauseAi(time) paused_until = world.time + time +<<<<<<< HEAD +======= + update_able_to_run() + addtimer(CALLBACK(src, PROC_REF(update_able_to_run)), time) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/ai_controller/proc/modify_cooldown(datum/ai_behavior/behavior, new_cooldown) behavior_cooldowns[behavior] = new_cooldown diff --git a/code/datums/ai/bane/bane_controller.dm b/code/datums/ai/bane/bane_controller.dm index 8d6820a800b..02cf8fb1ea3 100644 --- a/code/datums/ai/bane/bane_controller.dm +++ b/code/datums/ai/bane/bane_controller.dm @@ -12,7 +12,23 @@ And the only victory you achieved was a lie. Now you understand Gotham is beyond return AI_CONTROLLER_INCOMPATIBLE return ..() //Run parent at end +<<<<<<< HEAD /datum/ai_controller/bane/able_to_run() +======= +/datum/ai_controller/bane/on_stat_changed(mob/living/source, new_stat) + . = ..() + update_able_to_run() + +/datum/ai_controller/bane/setup_able_to_run() + . = ..() + RegisterSignal(pawn, COMSIG_MOB_INCAPACITATE_CHANGED, PROC_REF(update_able_to_run)) + +/datum/ai_controller/bane/clear_able_to_run() + UnregisterSignal(pawn, list(COMSIG_MOB_INCAPACITATE_CHANGED, COMSIG_MOB_STATCHANGE)) + return ..() + +/datum/ai_controller/bane/get_able_to_run() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/living_pawn = pawn if(IS_DEAD_OR_INCAP(living_pawn)) return FALSE diff --git a/code/datums/ai/basic_mobs/base_basic_controller.dm b/code/datums/ai/basic_mobs/base_basic_controller.dm index cd025b28bcb..bbda7d822b1 100644 --- a/code/datums/ai/basic_mobs/base_basic_controller.dm +++ b/code/datums/ai/basic_mobs/base_basic_controller.dm @@ -12,6 +12,7 @@ return ..() //Run parent at end +<<<<<<< HEAD /datum/ai_controller/basic_controller/able_to_run() . = ..() @@ -23,6 +24,31 @@ incap_flags |= IGNORE_STASIS if(!(ai_traits & CAN_ACT_WHILE_DEAD) && (living_pawn.incapacitated(incap_flags) || living_pawn.stat)) return FALSE +======= +/datum/ai_controller/basic_controller/on_stat_changed(mob/living/source, new_stat) + . = ..() + update_able_to_run() + +/datum/ai_controller/basic_controller/setup_able_to_run() + . = ..() + RegisterSignal(pawn, COMSIG_MOB_INCAPACITATE_CHANGED, PROC_REF(update_able_to_run)) + +/datum/ai_controller/basic_controller/clear_able_to_run() + UnregisterSignal(pawn, list(COMSIG_MOB_INCAPACITATE_CHANGED, COMSIG_MOB_STATCHANGE)) + return ..() + +/datum/ai_controller/basic_controller/get_able_to_run() + . = ..() + if(!.) + return FALSE + var/mob/living/living_pawn = pawn + if(!(ai_traits & CAN_ACT_WHILE_DEAD)) + // Unroll for flags here + if (ai_traits & CAN_ACT_IN_STASIS && (living_pawn.stat || INCAPACITATED_IGNORING(living_pawn, INCAPABLE_STASIS))) + return FALSE + else if(IS_DEAD_OR_INCAP(living_pawn)) + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ai_traits & PAUSE_DURING_DO_AFTER && LAZYLEN(living_pawn.do_afters)) return FALSE diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/emote_with_target.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/emote_with_target.dm new file mode 100644 index 00000000000..8f4483d4daf --- /dev/null +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/emote_with_target.dm @@ -0,0 +1,28 @@ +/datum/ai_behavior/emote_on_target + behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH + + +/datum/ai_behavior/emote_on_target/setup(datum/ai_controller/controller, target_key) + . = ..() + var/atom/hunt_target = controller.blackboard[target_key] + if (isnull(hunt_target)) + return FALSE + set_movement_target(controller, hunt_target) + + +/datum/ai_behavior/emote_on_target/perform(seconds_per_tick, datum/ai_controller/controller, target_key, list/emote_list) + var/atom/target = controller.blackboard[target_key] + if(!length(emote_list) || isnull(target)) + return AI_BEHAVIOR_FAILED | AI_BEHAVIOR_DELAY + run_emote(controller.pawn, target_key, emote_list) + return AI_BEHAVIOR_SUCCEEDED | AI_BEHAVIOR_DELAY + + +/datum/ai_behavior/emote_on_target/finish_action(datum/ai_controller/controller, succeeded, target_key) + . = ..() + if(succeeded) + controller.clear_blackboard_key(target_key) + + +/datum/ai_behavior/emote_on_target/proc/run_emote(mob/living/living_pawn, atom/target, list/emote_list) + living_pawn.manual_emote("[pick(emote_list)] [target]") diff --git a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm index dcd1c54c71b..b033ccfd079 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm @@ -12,8 +12,11 @@ var/atom/flee_from = controller.blackboard[target_key] if(!should_flee(controller, flee_from)) return +<<<<<<< HEAD if(!should_flee(controller, flee_from)) return +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/flee_distance = controller.blackboard[BB_BASIC_MOB_FLEE_DISTANCE] || DEFAULT_BASIC_FLEE_DISTANCE if (get_dist(controller.pawn, flee_from) >= flee_distance) return diff --git a/code/datums/ai/cursed/cursed_controller.dm b/code/datums/ai/cursed/cursed_controller.dm index 4d0f6c6f5fd..2d980ad41e4 100644 --- a/code/datums/ai/cursed/cursed_controller.dm +++ b/code/datums/ai/cursed/cursed_controller.dm @@ -27,9 +27,15 @@ return ..() //Run parent at end ///signal called by the pawn hitting something after a throw +<<<<<<< HEAD /datum/ai_controller/cursed/proc/on_throw_hit(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum) SIGNAL_HANDLER if(!iscarbon(hit_atom)) +======= +/datum/ai_controller/cursed/proc/on_throw_hit(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) + SIGNAL_HANDLER + if(caught || !iscarbon(hit_atom)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //equipcode has sleeps all over it. INVOKE_ASYNC(src, PROC_REF(try_equipping_to_target_slot), hit_atom) diff --git a/code/datums/ai/generic/find_and_set.dm b/code/datums/ai/generic/find_and_set.dm index 41f256c9ba7..efeb20ebb5f 100644 --- a/code/datums/ai/generic/find_and_set.dm +++ b/code/datums/ai/generic/find_and_set.dm @@ -177,3 +177,20 @@ var/mob/living/living_pawn = controller.pawn var/potential_friend = living_pawn.faction.Find(REF(friend)) ? friend : null return potential_friend +<<<<<<< HEAD +======= + + +/datum/ai_behavior/find_and_set/in_list/turf_types + + +/datum/ai_behavior/find_and_set/in_list/turf_types/search_tactic(datum/ai_controller/controller, locate_paths, search_range) + var/list/found = RANGE_TURFS(search_range, controller.pawn) + shuffle_inplace(found) + for(var/turf/possible_turf as anything in found) + if(!is_type_in_typecache(possible_turf, locate_paths)) + continue + if(can_see(controller.pawn, possible_turf, search_range)) + return possible_turf + return null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index 451d692b65d..ea73050cc22 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -104,10 +104,29 @@ have ways of interacting with a specific mob and control it. . = ..() set_trip_mode(mode = TRUE) +<<<<<<< HEAD /datum/ai_controller/monkey/able_to_run() var/mob/living/living_pawn = pawn if(living_pawn.incapacitated(IGNORE_RESTRAINTS | IGNORE_GRAB | IGNORE_STASIS) || living_pawn.stat > CONSCIOUS) +======= +/datum/ai_controller/monkey/on_stat_changed(mob/living/source, new_stat) + . = ..() + update_able_to_run() + +/datum/ai_controller/monkey/setup_able_to_run() + . = ..() + RegisterSignal(pawn, COMSIG_MOB_INCAPACITATE_CHANGED, PROC_REF(update_able_to_run)) + +/datum/ai_controller/monkey/clear_able_to_run() + UnregisterSignal(pawn, list(COMSIG_MOB_INCAPACITATE_CHANGED, COMSIG_MOB_STATCHANGE)) + return ..() + +/datum/ai_controller/monkey/get_able_to_run() + var/mob/living/living_pawn = pawn + + if(INCAPACITATED_IGNORING(living_pawn, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS|INCAPABLE_GRAB) || living_pawn.stat > CONSCIOUS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() @@ -134,7 +153,11 @@ have ways of interacting with a specific mob and control it. for(var/obj/item/item in oview(2, living_pawn)) nearby_items += item +<<<<<<< HEAD for(var/obj/item/item in living_pawn.held_items) // If we've got some garbage in out hands thats going to stop us from effectivly attacking, we should get rid of it. +======= + for(var/obj/item/item in living_pawn.held_items) // If we've got some garbage in out hands that's going to stop us from effectively attacking, we should get rid of it. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(item.force < 2) living_pawn.dropItemToGround(item) @@ -151,7 +174,11 @@ have ways of interacting with a specific mob and control it. if(!weapon || (weapon in living_pawn.held_items)) return FALSE +<<<<<<< HEAD if(weapon.force < 2) // our bite does 2 damage on avarage, no point in settling for anything less +======= + if(weapon.force < 2) // our bite does 2 damage on average, no point in settling for anything less +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE set_blackboard_key(BB_MONKEY_PICKUPTARGET, weapon) diff --git a/code/datums/ai/movement/_ai_movement.dm b/code/datums/ai/movement/_ai_movement.dm index 35492c82699..16005f7d92b 100644 --- a/code/datums/ai/movement/_ai_movement.dm +++ b/code/datums/ai/movement/_ai_movement.dm @@ -59,7 +59,11 @@ var/datum/ai_controller/controller = source.extra_info // Check if this controller can actually run, so we don't chase people with corpses +<<<<<<< HEAD if(!controller.able_to_run()) +======= + if(!controller.able_to_run) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 controller.CancelActions() qdel(source) //stop moving return MOVELOOP_SKIP_STEP diff --git a/code/datums/ai/oldhostile/hostile_tameable.dm b/code/datums/ai/oldhostile/hostile_tameable.dm index 1c30cb95487..3053a99a233 100644 --- a/code/datums/ai/oldhostile/hostile_tameable.dm +++ b/code/datums/ai/oldhostile/hostile_tameable.dm @@ -50,7 +50,23 @@ if(buckler != blackboard[BB_HOSTILE_FRIEND]) return COMPONENT_BLOCK_BUCKLE +<<<<<<< HEAD /datum/ai_controller/hostile_friend/able_to_run() +======= +/datum/ai_controller/hostile_friend/on_stat_changed(mob/living/source, new_stat) + . = ..() + update_able_to_run() + +/datum/ai_controller/hostile_friend/setup_able_to_run() + . = ..() + RegisterSignal(pawn, COMSIG_MOB_INCAPACITATE_CHANGED, PROC_REF(update_able_to_run)) + +/datum/ai_controller/hostile_friend/clear_able_to_run() + UnregisterSignal(pawn, list(COMSIG_MOB_INCAPACITATE_CHANGED, COMSIG_MOB_STATCHANGE)) + return ..() + +/datum/ai_controller/hostile_friend/get_able_to_run() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/living_pawn = pawn if(IS_DEAD_OR_INCAP(living_pawn)) @@ -77,14 +93,22 @@ if(pawn.Adjacent(pawn, new_friend)) new_friend.visible_message("[pawn] looks at [new_friend] in a friendly manner!", span_notice("[pawn] looks at you in a friendly manner!")) set_blackboard_key(BB_HOSTILE_FRIEND, new_friend) +<<<<<<< HEAD RegisterSignal(new_friend, COMSIG_MOB_POINTED, PROC_REF(check_point)) +======= + RegisterSignal(new_friend, COMSIG_MOVABLE_POINTED, PROC_REF(check_point)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command)) /// Someone is being mean to us, take them off our friends (add actual enemies behavior later) /datum/ai_controller/hostile_friend/proc/unfriend() var/mob/living/old_friend = blackboard[BB_HOSTILE_FRIEND] if(old_friend) +<<<<<<< HEAD UnregisterSignal(old_friend, list(COMSIG_MOB_POINTED, COMSIG_MOB_SAY)) +======= + UnregisterSignal(old_friend, list(COMSIG_MOVABLE_POINTED, COMSIG_MOB_SAY)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clear_blackboard_key(BB_HOSTILE_FRIEND) /// Someone is looking at us, if we're currently carrying something then show what it is, and include a message if they're our friend @@ -129,7 +153,11 @@ /datum/ai_controller/hostile_friend/proc/check_menu(mob/user) if(!istype(user)) CRASH("A non-mob is trying to issue an order to [pawn].") +<<<<<<< HEAD if(user.incapacitated() || !can_see(user, pawn)) +======= + if(user.incapacitated || !can_see(user, pawn)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -190,7 +218,11 @@ set_blackboard_key(BB_HOSTILE_ORDER_MODE, HOSTILE_COMMAND_ATTACK) /// Someone we like is pointing at something, see if it's something we might want to interact with (like if they might want us to fetch something for them) +<<<<<<< HEAD /datum/ai_controller/hostile_friend/proc/check_point(mob/pointing_friend, atom/movable/pointed_movable) +======= +/datum/ai_controller/hostile_friend/proc/check_point(mob/pointing_friend, atom/movable/pointed_movable, obj/effect/temp_visual/point/point) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER var/mob/living/simple_animal/hostile/living_pawn = pawn diff --git a/code/datums/announcers/default_announcer.dm b/code/datums/announcers/default_announcer.dm index c5dc142f818..559ed31d97c 100644 --- a/code/datums/announcers/default_announcer.dm +++ b/code/datums/announcers/default_announcer.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/centcom_announcer/default welcome_sounds = list('sound/ai/default/welcome.ogg') alert_sounds = list('sound/ai/default/attention.ogg') @@ -19,4 +22,7 @@ ANNOUNCER_SHUTTLEDOCK = 'sound/ai/default/shuttledock.ogg', ANNOUNCER_SHUTTLERECALLED = 'sound/ai/default/shuttlerecalled.ogg', ANNOUNCER_SPANOMALIES = 'sound/ai/default/spanomalies.ogg') +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm index 29db62369b9..680e3f27e88 100644 --- a/code/datums/atmosphere/planetary.dm +++ b/code/datums/atmosphere/planetary.dm @@ -17,7 +17,11 @@ /datum/gas/miasma=1.2, /datum/gas/water_vapor=0.1, ) +<<<<<<< HEAD restricted_chance = 0 // SKYRAT EDIT: Disables restricted gases from rolling - Original value (30) +======= + restricted_chance = 30 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 minimum_pressure = HAZARD_LOW_PRESSURE + 10 maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1 @@ -42,7 +46,11 @@ /datum/gas/water_vapor=0.1, /datum/gas/miasma=1.2, ) +<<<<<<< HEAD restricted_chance = 0 // SKYRAT EDIT: Disables restricted gases from rolling - Original value (20) +======= + restricted_chance = 20 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 minimum_pressure = HAZARD_LOW_PRESSURE + 10 maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1 diff --git a/code/datums/bodypart_overlays/bodypart_overlay.dm b/code/datums/bodypart_overlays/bodypart_overlay.dm index 15e9bd62f44..0860a959bf5 100644 --- a/code/datums/bodypart_overlays/bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/bodypart_overlay.dm @@ -4,7 +4,11 @@ ///Sometimes we need multiple layers, for like the back, middle and front of the person (EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND) var/layers ///List of all possible layers. Used for looping through in drawing +<<<<<<< HEAD var/static/list/all_layers = list(EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND, EXTERNAL_FRONT_UNDER_CLOTHES, EXTERNAL_FRONT_OVER, EXTERNAL_FRONT_ABOVE_HAIR) // SKYRAT EDIT - Customization - ORIGINAL: var/static/list/all_layers = list(EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND) +======= + var/static/list/all_layers = list(EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Key of the icon states of all the sprite_datums for easy caching var/cache_key = "" @@ -57,6 +61,7 @@ return "ADJ" if(-BODY_FRONT_LAYER) return "FRONT" +<<<<<<< HEAD //SKYRAT EDIT ADDITION - Customization if(-BODY_FRONT_UNDER_CLOTHES) return "FRONT_UNDER" @@ -65,6 +70,8 @@ if(-HEAD_LAYER) return "FRONT_OVER_HAIR" //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Converts a bitflag to the right layer. I'd love to make this a static index list, but byond made an attempt on my life when i did /datum/bodypart_overlay/proc/bitflag_to_layer(layer) @@ -75,6 +82,7 @@ return -BODY_ADJ_LAYER if(EXTERNAL_FRONT) return -BODY_FRONT_LAYER +<<<<<<< HEAD //SKYRAT EDIT ADDITION - Customization if(EXTERNAL_FRONT_UNDER_CLOTHES) return -BODY_FRONT_UNDER_CLOTHES @@ -83,6 +91,8 @@ if(EXTERNAL_FRONT_ABOVE_HAIR) return -HEAD_LAYER //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Check whether we can draw the overlays. You generally don't want lizard snouts to draw over an EVA suit /datum/bodypart_overlay/proc/can_draw_on_bodypart(mob/living/carbon/human/human) diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index 158bba5eece..2561d993148 100644 --- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -13,6 +13,27 @@ ///Take on the dna/preference from whoever we're gonna be inserted in var/imprint_on_next_insertion = TRUE +<<<<<<< HEAD +======= +/datum/bodypart_overlay/mutant/New(obj/item/organ/attached_organ) + . = ..() + + RegisterSignal(attached_organ, COMSIG_ORGAN_IMPLANTED, PROC_REF(on_mob_insert)) + +/datum/bodypart_overlay/mutant/proc/on_mob_insert(obj/item/organ/parent, mob/living/carbon/receiver) + SIGNAL_HANDLER + + if(!should_visual_organ_apply_to(parent.type, receiver)) + stack_trace("adding a [parent.type] to a [receiver.type] when it shouldn't be!") + + if(imprint_on_next_insertion) //We only want this set *once* + var/feature_name = receiver.dna.features[feature_key] + if (isnull(feature_name)) + feature_name = receiver.dna.species.mutant_organs[parent.type] + set_appearance_from_name(feature_name) + imprint_on_next_insertion = FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/get_overlay(layer, obj/item/bodypart/limb) inherit_color(limb) // If draw_color is not set yet, go ahead and do that return ..() @@ -67,7 +88,10 @@ return appearance /datum/bodypart_overlay/mutant/color_image(image/overlay, layer, obj/item/bodypart/limb) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlay.color = sprite_datum.color_src ? draw_color : null /datum/bodypart_overlay/mutant/added_to_limb(obj/item/bodypart/limb) @@ -99,13 +123,19 @@ /datum/bodypart_overlay/mutant/proc/inherit_color(obj/item/bodypart/bodypart_owner, force) if(isnull(bodypart_owner)) draw_color = null +<<<<<<< HEAD alpha = 255 // SKYRAT ADDITION - Mutant bodyparts transparency are based on limb transparency +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(draw_color && !force) return FALSE +<<<<<<< HEAD alpha = bodypart_owner.alpha // SKYRAT ADDITION - Mutant bodyparts transparency are based on limb transparency +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(color_source) if(ORGAN_COLOR_OVERRIDE) draw_color = override_color(bodypart_owner.draw_color) @@ -141,3 +171,7 @@ CRASH("External organ [type] couldn't find sprite accessory [accessory_name]!") else CRASH("External organ [type] had fetch_sprite_datum called with a null accessory name!") +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index d7526aa7779..73f20eda4a4 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -136,10 +136,13 @@ continue if(!(player.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) continue +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Players in the interlink can't be obsession targets if(SSticker.IsRoundInProgress() && istype(get_area(player), /area/centcom/interlink)) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 viable_minds += player.mind for(var/datum/mind/possible_target as anything in viable_minds) if(possible_target != owner && ishuman(possible_target.current)) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index d5f0a0e9124..372dca594e0 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -407,7 +407,11 @@ var/obj/item/bodypart/bodypart = owner.get_bodypart(owner.get_random_valid_zone(even_weights = TRUE)) if(!(bodypart && IS_ORGANIC_LIMB(bodypart)) && bodypart.bodypart_flags & BODYPART_PSEUDOPART) return +<<<<<<< HEAD if(owner.incapacitated()) +======= + if(owner.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return bodypart.receive_damage(scratch_damage) if(SPT_PROB(33, seconds_per_tick)) diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 35103fbc901..95a344cd8f4 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -111,7 +111,11 @@ else calling_arguments = args if(datum_flags & DF_VAR_EDITED) +<<<<<<< HEAD if(usr != GLOB.AdminProcCallHandler && !usr?.client?.ckey) //This happens when a timer or the MC invokes a callback +======= + if(usr != GLOB.AdminProcCallHandler && !(usr && usr?.client?.ckey)) //This happens when a timer or the MC invokes a callback +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return HandleUserlessProcCall(usr, object, delegate, calling_arguments) return WrapAdminProcCall(object, delegate, calling_arguments) if (object == GLOBAL_PROC) @@ -148,7 +152,11 @@ else calling_arguments = args if(datum_flags & DF_VAR_EDITED) +<<<<<<< HEAD if(usr != GLOB.AdminProcCallHandler && !usr?.client?.ckey) //This happens when a timer or the MC invokes a callback +======= + if(usr != GLOB.AdminProcCallHandler && !(usr && usr?.client?.ckey)) //This happens when a timer or the MC invokes a callback +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return HandleUserlessProcCall(usr, object, delegate, calling_arguments) return WrapAdminProcCall(object, delegate, calling_arguments) if (object == GLOBAL_PROC) diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index ba2b91e08fa..b51e72e514c 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -121,12 +121,15 @@ if (length_char(text) > maxlen) text = copytext_char(text, 1, maxlen + 1) + "..." // BYOND index moment +<<<<<<< HEAD // Calculate target color if not already present if (!target.chat_color || target.chat_color_name != target.name) target.chat_color = get_chat_color_string(target.name) // SKYRAT EDIT CHANGE - ORIGINAL: target.chat_color = colorize_string(target.name) target.chat_color_darkened = get_chat_color_string(target.name, darkened = TRUE) // SKYRAT EDIT CHANGE - ORIGINAL: target.chat_color_darkened = colorize_string(target.name, 0.85, 0.85) target.chat_color_name = target.name +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Get rid of any URL schemes that might cause BYOND to automatically wrap something in an anchor tag var/static/regex/url_scheme = new(@"[A-Za-z][A-Za-z0-9+-\.]*:\/\/", "g") text = replacetext(text, url_scheme, "") diff --git a/code/datums/communications.dm b/code/datums/communications.dm index 79f660a4cfa..8c8764116b5 100644 --- a/code/datums/communications.dm +++ b/code/datums/communications.dm @@ -39,7 +39,11 @@ GLOBAL_DATUM_INIT(communications_controller, /datum/communciations_controller, n if(syndicate) priority_announce(html_decode(message_data["message"]), null, 'sound/misc/announce_syndi.ogg', ANNOUNCEMENT_TYPE_SYNDICATE, has_important_message = TRUE, players = players, color_override = "red") else +<<<<<<< HEAD priority_announce(html_decode(message_data["message"]), null, ANNOUNCER_CAPTAIN, ANNOUNCEMENT_TYPE_CAPTAIN, has_important_message = TRUE, players = players) // SKYRAT EDIT CHANGE - 'sound/misc/announce.ogg' to ANNOUNCER_CAPTAIN +======= + priority_announce(html_decode(message_data["message"]), null, 'sound/misc/announce.ogg', ANNOUNCEMENT_TYPE_CAPTAIN, has_important_message = TRUE, players = players) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 COOLDOWN_START(src, nonsilicon_message_cooldown, COMMUNICATION_COOLDOWN) user.log_talk(input, LOG_SAY, tag="priority announcement") message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.") diff --git a/code/datums/components/appearance_on_aggro.dm b/code/datums/components/appearance_on_aggro.dm index 8c0df88e6fd..629242a9caa 100644 --- a/code/datums/components/appearance_on_aggro.dm +++ b/code/datums/components/appearance_on_aggro.dm @@ -13,8 +13,11 @@ var/alpha_on_aggro /// visibility of our icon when deaggroed var/alpha_on_deaggro +<<<<<<< HEAD /// do we currently have a target var/atom/current_target +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/appearance_on_aggro/Initialize(aggro_state, overlay_icon, overlay_state, alpha_on_aggro, alpha_on_deaggro) if (!isliving(parent)) @@ -27,7 +30,11 @@ /datum/component/appearance_on_aggro/RegisterWithParent() RegisterSignal(parent, COMSIG_AI_BLACKBOARD_KEY_SET(target_key), PROC_REF(on_set_target)) +<<<<<<< HEAD RegisterSignal(parent, COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key), PROC_REF(on_clear_target)) +======= + RegisterSignals(parent, list(COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key), COMSIG_LIVING_DEATH), PROC_REF(on_clear_or_death)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!isnull(aggro_state)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON_STATE, PROC_REF(on_icon_state_updated)) if (!isnull(aggro_overlay)) @@ -35,32 +42,53 @@ /datum/component/appearance_on_aggro/UnregisterFromParent() . = ..() +<<<<<<< HEAD UnregisterSignal(parent, list(COMSIG_AI_BLACKBOARD_KEY_SET(target_key), COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key))) +======= + UnregisterSignal(parent, list(COMSIG_AI_BLACKBOARD_KEY_SET(target_key), COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key), COMSIG_LIVING_DEATH)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/appearance_on_aggro/proc/on_set_target(mob/living/source) SIGNAL_HANDLER +<<<<<<< HEAD var/atom/target = source.ai_controller.blackboard[target_key] if (QDELETED(target)) return current_target = target +======= + var/atom/target = source.ai_controller?.blackboard[target_key] + if (QDELETED(target)) + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!isnull(aggro_overlay) || !isnull(aggro_state)) source.update_appearance(UPDATE_ICON) if (!isnull(alpha_on_aggro)) animate(source, alpha = alpha_on_aggro, time = 2 SECONDS) /datum/component/appearance_on_aggro/Destroy() +<<<<<<< HEAD if (!isnull(current_target)) revert_appearance(parent) return ..() /datum/component/appearance_on_aggro/proc/on_clear_target(atom/source) +======= + revert_appearance(parent) + return ..() + +/datum/component/appearance_on_aggro/proc/on_clear_or_death(atom/source) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER revert_appearance(parent) /datum/component/appearance_on_aggro/proc/revert_appearance(mob/living/source) +<<<<<<< HEAD current_target = null +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!isnull(aggro_overlay) || !isnull(aggro_state)) source.update_appearance(UPDATE_ICON) if (!isnull(alpha_on_deaggro)) @@ -70,11 +98,20 @@ SIGNAL_HANDLER if (source.stat == DEAD) return +<<<<<<< HEAD source.icon_state = isnull(current_target) ? initial(source.icon_state) : aggro_state /datum/component/appearance_on_aggro/proc/on_overlays_updated(atom/source, list/overlays) SIGNAL_HANDLER if (isnull(current_target)) +======= + source.icon_state = source.ai_controller?.blackboard_key_exists(target_key) ? aggro_state : initial(source.icon_state) + +/datum/component/appearance_on_aggro/proc/on_overlays_updated(mob/living/basic/source, list/overlays) + SIGNAL_HANDLER + + if(!(source.ai_controller?.blackboard_key_exists(target_key))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return overlays += aggro_overlay diff --git a/code/datums/components/aquarium_content.dm b/code/datums/components/aquarium_content.dm index 21c6c75ca16..386458f233d 100644 --- a/code/datums/components/aquarium_content.dm +++ b/code/datums/components/aquarium_content.dm @@ -24,6 +24,7 @@ //Current layer for the visual object var/base_layer +<<<<<<< HEAD /** * Fish sprite how to: @@ -33,6 +34,17 @@ */ +======= + /** + * Fish sprite how to: + * The aquarium icon state needs to be centered on 16,16 in the dmi and facing left by default. + * sprite_width/sprite_height are the sizes it will have in aquarium and used to control animation boundaries. + * Ideally these two vars represent the size of the aquarium icon state, but they can be one or two units shorter + * to give more room for the visual to float around inside the aquarium, since the aquarium tank frame overlay will likely + * cover the extra pixels anyway. + */ + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Icon used for in aquarium sprite var/icon = 'icons/obj/aquarium/fish.dmi' /// If this is set this icon state will be used for the holder while icon_state will only be used for item/catalog. Transformation from source_width/height WON'T be applied. @@ -52,10 +64,13 @@ var/sprite_height = 3 var/sprite_width = 3 +<<<<<<< HEAD //This is the size of the source sprite. This will be used to calculate scale down factor. var/source_width = 32 var/source_height = 32 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Currently playing animation var/current_animation @@ -97,6 +112,10 @@ ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src)) RegisterSignal(parent, COMSIG_TRY_INSERTING_IN_AQUARIUM, PROC_REF(is_ready_to_insert)) RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium)) +<<<<<<< HEAD +======= + RegisterSignal(parent, COMSIG_FISH_PETTED, PROC_REF(on_fish_petted)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //If component is added to something already in aquarium at the time initialize it properly. var/atom/movable/movable_parent = parent @@ -112,6 +131,7 @@ sprite_width = fish.sprite_width aquarium_vc_color = fish.aquarium_vc_color +<<<<<<< HEAD if(fish.dedicated_in_aquarium_icon_state) if(fish.dedicated_in_aquarium_icon) icon = fish.dedicated_in_aquarium_icon @@ -124,6 +144,11 @@ var/y_scale = fish.sprite_height / fish.source_height matrix.Scale(x_scale, y_scale) base_transform = matrix +======= + icon = fish.dedicated_in_aquarium_icon + icon_state = fish.dedicated_in_aquarium_icon_state + base_transform = matrix() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomize_position = TRUE @@ -274,7 +299,10 @@ dead_animation() return +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Create looping random path animation, pixel offsets parameters include offsets already /datum/component/aquarium_content/proc/swim_animation() var/avg_width = round(sprite_width / 2) @@ -325,6 +353,14 @@ base_layer = current_aquarium.request_layer(layer_mode) vc_obj.layer = base_layer +<<<<<<< HEAD +======= +/datum/component/aquarium_content/proc/on_fish_petted() + SIGNAL_HANDLER + + new /obj/effect/temp_visual/heart(get_turf(parent)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/aquarium_content/proc/randomize_base_position() var/list/aq_properties = current_aquarium.get_surface_properties() var/avg_width = round(sprite_width / 2) diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index afc71936f1b..b65bedcb537 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -93,11 +93,19 @@ var/list/asomnia_hadders = list() for(var/mob/smeller in get_hearers_in_view(DEFAULT_MESSAGE_RANGE, used_oven)) if(HAS_TRAIT(smeller, TRAIT_ANOSMIA)) +<<<<<<< HEAD asomnia_hadders += smeller if(positive_result) used_oven.visible_message( span_notice("You smell something great coming from [used_oven]."), +======= + asomnia_hadders += smeller + + if(positive_result) + used_oven.visible_message( + span_notice("You smell something great coming from [used_oven]."), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blind_message = span_notice("You smell something great..."), ignored_mobs = asomnia_hadders, ) diff --git a/code/datums/components/boomerang.dm b/code/datums/components/boomerang.dm index 23dd63d1467..9c833cc3b26 100644 --- a/code/datums/components/boomerang.dm +++ b/code/datums/components/boomerang.dm @@ -60,12 +60,20 @@ * * hit_atom: The atom that has been hit by the boomerang component. * * init_throwing_datum: The thrownthing datum that originally impacted the object, that we use to build the new throwing datum for the rebound. */ +<<<<<<< HEAD /datum/component/boomerang/proc/return_hit_throw(datum/source, atom/hit_atom, datum/thrownthing/init_throwing_datum) SIGNAL_HANDLER if (!COOLDOWN_FINISHED(src, last_boomerang_throw)) return var/obj/item/true_parent = parent aerodynamic_swing(init_throwing_datum, true_parent) +======= +/datum/component/boomerang/proc/return_hit_throw(datum/source, atom/hit_atom, datum/thrownthing/init_throwing_datum, caught) + SIGNAL_HANDLER + if (!COOLDOWN_FINISHED(src, last_boomerang_throw) || caught) + return + aerodynamic_swing(init_throwing_datum, parent) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Proc that triggers when the thrown boomerang does not hit a target. diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index d4f1df1778b..bbcb3616042 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -97,10 +97,13 @@ return if (!(flags & CALTROP_BYPASS_SHOES)) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - Hardened Soles Quirk if(HAS_TRAIT(digitigrade_fan, TRAIT_HARD_SOLES)) return // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if ((digitigrade_fan.wear_suit?.body_parts_covered | digitigrade_fan.w_uniform?.body_parts_covered | digitigrade_fan.shoes?.body_parts_covered) & FEET) return diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index 43d7201b1e4..4fcce604074 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -14,7 +14,11 @@ /obj/effect/constructing_effect, /obj/effect/dummy/phased_mob, /obj/effect/ebeam, +<<<<<<< HEAD /obj/effect/fishing_lure, +======= + /obj/effect/fishing_float, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/hotspot, /obj/effect/landmark, /obj/effect/light_emitter/tendril, @@ -251,14 +255,60 @@ GLOBAL_LIST_EMPTY(chasm_fallen_mobs) /obj/effect/abstract/chasm_storage/Entered(atom/movable/arrived) . = ..() if(isliving(arrived)) +<<<<<<< HEAD RegisterSignal(arrived, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) GLOB.chasm_fallen_mobs += arrived +======= + //Mobs that have fallen in reserved area should be deleted to avoid fishing stuff from the deathmatch or VR. + if(is_reserved_level(loc.z) && !istype(get_area(loc), /area/shuttle)) + qdel(arrived) + return + RegisterSignal(arrived, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) + LAZYADD(GLOB.chasm_fallen_mobs[get_chasm_category(loc)], arrived) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/abstract/chasm_storage/Exited(atom/movable/gone) . = ..() if(isliving(gone)) UnregisterSignal(gone, COMSIG_LIVING_REVIVE) +<<<<<<< HEAD GLOB.chasm_fallen_mobs -= gone +======= + LAZYREMOVE(GLOB.chasm_fallen_mobs[get_chasm_category(loc)], gone) + +/obj/effect/abstract/chasm_storage/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) + . = ..() + var/old_cat = get_chasm_category(old_turf) + var/new_cat = get_chasm_category(new_turf) + var/list/mobs = list() + for(var/mob/fallen in src) + mobs += fallen + LAZYREMOVE(GLOB.chasm_fallen_mobs[old_cat], mobs) + LAZYADD(GLOB.chasm_fallen_mobs[new_cat], mobs) + +/** + * Returns a key to store, remove and access fallen mobs depending on the z-level. + * This stops rescuing people from places that are waaaaaaaay too far-fetched. + */ +/proc/get_chasm_category(turf/turf) + var/z_level = turf?.z + var/area/area = get_area(turf) + if(istype(area, /area/shuttle)) //shuttle move between z-levels, so they're a special case. + return area + + if(is_away_level(z_level)) + return ZTRAIT_AWAY + if(is_mining_level(z_level)) + return ZTRAIT_MINING + if(is_station_level(z_level)) + return ZTRAIT_STATION + if(is_centcom_level(z_level)) + return ZTRAIT_CENTCOM + if(is_reserved_level(z_level)) + return ZTRAIT_RESERVED + + return ZTRAIT_SPACE_RUINS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CHASM_TRAIT "chasm trait" /** diff --git a/code/datums/components/connect_mob_behalf.dm b/code/datums/components/connect_mob_behalf.dm index b8aa014f810..f4e2ae1e586 100644 --- a/code/datums/components/connect_mob_behalf.dm +++ b/code/datums/components/connect_mob_behalf.dm @@ -1,6 +1,10 @@ /// This component behaves similar to connect_loc_behalf, but working off clients and mobs instead of loc /// To be clear, we hook into a signal on a tracked client's mob +<<<<<<< HEAD /// We retain the ability to react to that signal on a seperate listener, which makes this quite powerful +======= +/// We retain the ability to react to that signal on a separate listener, which makes this quite powerful +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/connect_mob_behalf dupe_mode = COMPONENT_DUPE_UNIQUE diff --git a/code/datums/components/connect_range.dm b/code/datums/components/connect_range.dm index d3407f46714..5da1f95a5e1 100644 --- a/code/datums/components/connect_range.dm +++ b/code/datums/components/connect_range.dm @@ -1,6 +1,10 @@ /** * This component behaves similar to connect_loc_behalf but for all turfs in range, hooking into a signal on each of them. +<<<<<<< HEAD * Just like connect_loc_behalf, It can react to that signal on behalf of a seperate listener. +======= + * Just like connect_loc_behalf, It can react to that signal on behalf of a separate listener. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Good for components, though it carries some overhead. Can't be an element as that may lead to bugs. */ /datum/component/connect_range diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 64f58ce7715..66d7e5f640c 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -248,6 +248,7 @@ return ", must be made on a tram!" //If we're a mob we'll try a do_after; non mobs will instead instantly construct the item +<<<<<<< HEAD //SKYRAT EDIT START: Two Skills (Construction) var/mob/crafter_mob var/skill_modifier = 1 @@ -255,6 +256,9 @@ crafter_mob = crafter skill_modifier = crafter_mob.mind.get_skill_modifier(/datum/skill/construction, SKILL_SPEED_MODIFIER) if(!do_after(crafter, recipe.time * skill_modifier, target = crafter)) +======= + if(ismob(crafter) && !do_after(crafter, recipe.time, target = crafter)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return "." contents = get_surroundings(crafter, recipe.blacklist) if(!check_contents(crafter, recipe, contents)) @@ -272,9 +276,12 @@ if(result.atom_storage && recipe.delete_contents) for(var/obj/item/thing in result) qdel(thing) +<<<<<<< HEAD if(crafter_mob) crafter_mob.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT STOP: Construction Skill +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/reagents/holder = locate() in parts if(holder) //transfer reagents from ingredients to result if(!ispath(recipe.result, /obj/item/reagent_containers) && result.reagents) @@ -317,7 +324,10 @@ var/datum/reagents/holder var/list/surroundings var/list/Deletion = list() +<<<<<<< HEAD var/data +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/amt var/list/requirements = list() if(R.reqs) @@ -354,7 +364,10 @@ RC.reagents.trans_to(holder, reagent_volume, target_id = path_key, no_react = TRUE) surroundings -= RC amt -= reagent_volume +<<<<<<< HEAD SEND_SIGNAL(RC.reagents, COMSIG_REAGENTS_CRAFTING_PING) // - [] TODO: Make this entire thing less spaghetti +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else surroundings -= RC RC.update_appearance(UPDATE_ICON) @@ -368,7 +381,7 @@ SD = new S.type() Deletion += SD S.use(amt) - SD = locate(S.type) in Deletion + SD = SD || locate(S.type) in Deletion // SD might be already set here, no sense in searching for it again SD.amount += amt continue main_loop else @@ -376,9 +389,9 @@ if(!locate(S.type) in Deletion) Deletion += S else - data = S.amount - S = locate(S.type) in Deletion - S.add(data) + SD = SD || locate(S.type) in Deletion + SD.add(S.amount) // add the amount to our tally stack, SD + qdel(S) // We can just delete it straight away as it's going to be fully consumed anyway, saving some overhead from calling use() surroundings -= S else var/atom/movable/I @@ -546,7 +559,11 @@ return TRUE +<<<<<<< HEAD /datum/component/personal_crafting/ui_act(action, params) +======= +/datum/component/personal_crafting/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm index 98595647ea2..56f889a2da4 100644 --- a/code/datums/components/crafting/equipment.dm +++ b/code/datums/components/crafting/equipment.dm @@ -272,8 +272,11 @@ category = CAT_EQUIPMENT tool_behaviors = list(TOOL_WELDER, TOOL_WIRECUTTER) +<<<<<<< HEAD // SKYRAT EDIT REMOVAL START /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/crafting_recipe/arrow_quiver name = "Archery Quiver" result = /obj/item/storage/bag/quiver/lesser @@ -284,4 +287,7 @@ ) category = CAT_EQUIPMENT tool_behaviors = list(TOOL_WELDER, TOOL_WIRECUTTER) +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 3c498f74416..85e33ba8f4a 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -218,6 +218,433 @@ result = /obj/effect/spawner/random/clothing/lizardboots reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1, /obj/item/stack/sheet/leather = 1) time = 6 SECONDS +<<<<<<< HEAD +======= + category = CAT_CLOTHING + +/datum/crafting_recipe/prisonsuit + name = "Prisoner Uniform (Suit)" + result = /obj/item/clothing/under/rank/prisoner + reqs = list(/obj/item/stack/sheet/cloth = 3, /obj/item/stack/license_plates = 1) + time = 2 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/prisonskirt + name = "Prisoner Uniform (Skirt)" + result = /obj/item/clothing/under/rank/prisoner/skirt + reqs = list(/obj/item/stack/sheet/cloth = 3, /obj/item/stack/license_plates = 1) + time = 2 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/prisonshoes + name = "Orange Prison Shoes" + result = /obj/item/clothing/shoes/sneakers/orange + reqs = list(/obj/item/stack/sheet/cloth = 2, /obj/item/stack/license_plates = 1) + time = 1 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/tv_helmet + name = "Television Helmet" + result = /obj/item/clothing/head/costume/tv_head + tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_CROWBAR) + reqs = list(/obj/item/wallframe/status_display = 1) + time = 2 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/lizardhat + name = "Lizard Cloche Hat" + result = /obj/item/clothing/head/costume/lizard + time = 1 SECONDS + reqs = list(/obj/item/organ/external/tail/lizard = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/lizardhat_alternate + name = "Lizard Cloche Hat" + result = /obj/item/clothing/head/costume/lizard + time = 1 SECONDS + reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/kittyears + name = "Kitty Ears" + result = /obj/item/clothing/head/costume/kitty/genuine + time = 1 SECONDS + reqs = list( + /obj/item/organ/external/tail/cat = 1, + /obj/item/organ/internal/ears/cat = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/bonearmor + name = "Bone Armor" + result = /obj/item/clothing/suit/armor/bone + time = 3 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 6, + /obj/item/stack/sheet/animalhide/goliath_hide = 3, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/bonetalisman + name = "Bone Talisman" + result = /obj/item/clothing/accessory/talisman + time = 2 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 2, + /obj/item/stack/sheet/sinew = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/bonecodpiece + name = "Skull Codpiece" + result = /obj/item/clothing/accessory/skullcodpiece + time = 2 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 2, + /obj/item/stack/sheet/animalhide/goliath_hide = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/skilt + name = "Sinew Kilt" + result = /obj/item/clothing/accessory/skilt + time = 2 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 1, + /obj/item/stack/sheet/sinew = 2, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/wreath + name = "Watcher Wreath" + result = /obj/item/clothing/neck/wreath + time = 2 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 2, + /obj/item/stack/sheet/sinew = 2, + /obj/item/stack/ore/diamond = 2, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/icewreath + name = "Icewing Wreath" + result = /obj/item/clothing/neck/wreath/icewing + time = 2 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 1, + /obj/item/stack/sheet/sinew = 1, + /obj/item/stack/ore/diamond = 2, + /obj/item/crusher_trophy/watcher_wing/ice_wing = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/bracers + name = "Bone Bracers" + result = /obj/item/clothing/gloves/bracer + time = 2 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 2, + /obj/item/stack/sheet/sinew = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/skullhelm + name = "Skull Helmet" + result = /obj/item/clothing/head/helmet/skull + time = 3 SECONDS + reqs = list(/obj/item/stack/sheet/bone = 4) + category = CAT_CLOTHING + +/datum/crafting_recipe/goliathcloak + name = "Goliath Cloak" + result = /obj/item/clothing/suit/hooded/cloak/goliath + time = 5 SECONDS + reqs = list( + /obj/item/stack/sheet/sinew = 3, + /obj/item/stack/sheet/animalhide/goliath_hide = 9, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/drakecloak + name = "Ash Drake Armour" + result = /obj/item/clothing/suit/hooded/cloak/drake + time = 4 SECONDS + reqs = list( + /obj/item/stack/sheet/sinew = 2, + /obj/item/drake_remains = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/drakeremains + name = "Drake Remains" + result = /obj/item/drake_remains + time = 1 SECONDS + reqs = list( + /obj/item/stack/sheet/bone = 10, + /obj/item/stack/sheet/animalhide/ashdrake = 5, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/godslayer + name = "Godslayer Armour" + result = /obj/item/clothing/suit/hooded/cloak/godslayer + time = 6 SECONDS + reqs = list( + /obj/item/ice_energy_crystal = 1, + /obj/item/wendigo_skull = 1, + /obj/item/clockwork_alloy = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/mummy + name = "Mummification Bandages (Mask)" + result = /obj/item/clothing/mask/mummy + time = 1 SECONDS + tool_paths = list(/obj/item/nullrod/egyptian) + reqs = list(/obj/item/stack/sheet/cloth = 2) + category = CAT_CLOTHING + +/datum/crafting_recipe/mummy/body + name = "Mummification Bandages (Body)" + result = /obj/item/clothing/under/costume/mummy + reqs = list(/obj/item/stack/sheet/cloth = 5) + +/datum/crafting_recipe/chaplain_hood + name = "Follower Hoodie" + result = /obj/item/clothing/suit/hooded/chaplain_hoodie + time = 1 SECONDS + tool_paths = list( + /obj/item/clothing/suit/hooded/chaplain_hoodie, + /obj/item/book/bible, + ) + reqs = list(/obj/item/stack/sheet/cloth = 4) + category = CAT_CLOTHING + +/datum/crafting_recipe/flower_garland + name = "Flower Garland" + result = /obj/item/clothing/head/costume/garland + time = 1 SECONDS + reqs = list( + /obj/item/food/grown/poppy = 4, + /obj/item/food/grown/harebell = 4, + /obj/item/food/grown/rose = 4, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/poppy_crown + name = "Poppy Crown" + result = /obj/item/clothing/head/costume/garland/poppy + time = 1 SECONDS + reqs = list( + /obj/item/food/grown/poppy = 5, + /obj/item/stack/cable_coil = 3, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/lily_crown + name = "Lily Crown" + result = /obj/item/clothing/head/costume/garland/lily + time = 1 SECONDS + reqs = list( + /obj/item/food/grown/poppy/lily = 5, + /obj/item/stack/cable_coil = 3, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/sunflower_crown + name = "Sunflower Crown" + result = /obj/item/clothing/head/costume/garland/sunflower + time = 1 SECONDS + reqs = list( + /obj/item/food/grown/sunflower = 5, + /obj/item/stack/cable_coil = 3, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/rainbow_bunch_crown + name = "Rainbow Flower Crown" + result = /obj/item/clothing/head/costume/garland/rainbowbunch + time = 1 SECONDS + reqs = list( + /obj/item/food/grown/rainbow_flower = 5, + /obj/item/stack/cable_coil = 3, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/pillow_suit + name = "pillow suit" + result = /obj/item/clothing/suit/pillow_suit + time = 2 SECONDS + reqs = list( + /obj/item/stack/sticky_tape = 10, + /obj/item/pillow = 5, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/pillow_hood + name = "pillow hood" + result = /obj/item/clothing/head/pillow_hood + tool_behaviors = list(TOOL_WIRECUTTER, TOOL_KNIFE) + time = 2 SECONDS + reqs = list( + /obj/item/stack/sticky_tape = 5, + /obj/item/pillow = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/shark_costume + name = "shark costume" + result = /obj/item/clothing/suit/hooded/shark_costume + time = 2 SECONDS + reqs = list( + /obj/item/stack/sheet/leather = 5, + /obj/item/stack/sheet/animalhide/carp = 5, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/shork_costume + name = "shork costume" + result = /obj/item/clothing/suit/hooded/shork_costume + time = 2 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER) + reqs = list( + /obj/item/clothing/suit/hooded/shark_costume = 1, + ) + category = CAT_CLOTHING + + +/datum/crafting_recipe/sturdy_shako + name = "Sturdy Shako" + result = /obj/item/clothing/head/hats/hos/shako + tool_behaviors = list(TOOL_WELDER, TOOL_KNIFE) + time = 5 SECONDS + reqs = list( + /obj/item/clothing/head/hats/hos/cap = 1, + /obj/item/stack/sheet/plasteel = 2, //Stout shako for two refined + /obj/item/stack/sheet/mineral/gold = 2, + ) + + category = CAT_CLOTHING + +/datum/crafting_recipe/atmospherics_gas_mask + name = "atmospherics gas mask" + result = /obj/item/clothing/mask/gas/atmos + tool_behaviors = list(TOOL_WELDER) + time = 8 SECONDS + reqs = list( + /obj/item/stack/sheet/mineral/metal_hydrogen = 1, + /obj/item/stack/sheet/mineral/zaukerite = 1, + ) + + category = CAT_CLOTHING + +/datum/crafting_recipe/paper_hat + name = "Paper Hat" + result = /obj/item/clothing/head/costume/paper_hat + time = 5 SECONDS + reqs = list( + /obj/item/paper = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/biohood_sec + name = "security biohood" + result = /obj/item/clothing/head/bio_hood/security + time = 2 SECONDS + reqs = list( + /obj/item/clothing/head/bio_hood/general = 1, + /obj/item/clothing/head/helmet/sec = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/biosuit_sec + name = "security biosuit" + result = /obj/item/clothing/suit/bio_suit/security + time = 2 SECONDS + reqs = list( + /obj/item/clothing/suit/bio_suit/general = 1, + /obj/item/clothing/suit/armor/vest = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/balloon_helmet + result = /obj/item/clothing/head/helmet/balloon + reqs = list( + /obj/item/toy/balloon/long = 6, + ) + time = 4 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/balloon_helmet/check_requirements(mob/user, list/collected_requirements) + . = ..() + if(HAS_TRAIT(user, TRAIT_BALLOON_SUTRA)) + return TRUE + +/datum/crafting_recipe/balloon_tophat + result = /obj/item/clothing/head/hats/tophat/balloon + reqs = list( + /obj/item/toy/balloon/long = 6, + ) + time = 4 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/balloon_tophat/check_requirements(mob/user, list/collected_requirements) + . = ..() + if(HAS_TRAIT(user, TRAIT_BALLOON_SUTRA)) + return TRUE + +/datum/crafting_recipe/balloon_vest + result = /obj/item/clothing/suit/armor/balloon_vest + reqs = list( + /obj/item/toy/balloon/long = 18, + ) + time = 8 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/balloon_vest/check_requirements(mob/user, list/collected_requirements) + . = ..() + if(HAS_TRAIT(user, TRAIT_BALLOON_SUTRA)) + return TRUE + +/datum/crafting_recipe/press_armor + name = "press armor vest" + result = /obj/item/clothing/suit/armor/vest/press + time = 2 SECONDS + tool_paths = list(/obj/item/clothing/accessory/press_badge) + reqs = list( + /obj/item/clothing/suit/armor/vest = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/press_helmet + name = "press helmet vest" + result = /obj/item/clothing/head/helmet/press + time = 2 SECONDS + tool_paths = list(/obj/item/clothing/accessory/press_badge) + reqs = list( + /obj/item/clothing/head/helmet/sec = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/press_vest + name = "press vest" + result = /obj/item/clothing/suit/hazardvest/press + time = 2 SECONDS + tool_paths = list(/obj/item/clothing/accessory/press_badge) + reqs = list( + /obj/item/clothing/suit/hazardvest = 1, + ) + category = CAT_CLOTHING + +/datum/crafting_recipe/press_fedora + name = "press fedora" + result = /obj/item/clothing/head/fedora/beige/press + time = 2 SECONDS + tool_paths = list(/obj/item/clothing/accessory/press_badge) + reqs = list( + /obj/item/clothing/head/fedora/beige = 1, + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 category = CAT_CLOTHING /datum/crafting_recipe/prisonsuit diff --git a/code/datums/components/crafting/tools.dm b/code/datums/components/crafting/tools.dm index e286e49616c..623f8461096 100644 --- a/code/datums/components/crafting/tools.dm +++ b/code/datums/components/crafting/tools.dm @@ -14,7 +14,11 @@ reqs = list(/obj/item/grown/log = 5) parts = list(/obj/item/grown/log = 5) blacklist = list(/obj/item/grown/log/steel) +<<<<<<< HEAD result = /obj/structure/bonfire/player_made // SKYRAT EDIT - Pollution - ORIGINAL: result = /obj/structure/bonfire +======= + result = /obj/structure/bonfire +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 category = CAT_TOOLS /datum/crafting_recipe/boneshovel diff --git a/code/datums/components/crank_recharge.dm b/code/datums/components/crank_recharge.dm index b5196579f3c..f19e5cee9d0 100644 --- a/code/datums/components/crank_recharge.dm +++ b/code/datums/components/crank_recharge.dm @@ -61,7 +61,10 @@ is_charging = FALSE return charging_cell.give(charge_amount) +<<<<<<< HEAD SEND_SIGNAL(parent, COMSIG_UPDATE_AMMO_HUD) // SKYRAT EDIT ADDITION - AMMO COUNT HUD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 source.update_appearance() is_charging = FALSE if(spin_to_win) diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm index dedd30bda0e..42f5dd79128 100644 --- a/code/datums/components/cult_ritual_item.dm +++ b/code/datums/components/cult_ritual_item.dm @@ -404,7 +404,11 @@ if(!rune.Adjacent(cultist)) return FALSE +<<<<<<< HEAD if(cultist.incapacitated()) +======= + if(cultist.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(cultist.stat == DEAD) @@ -427,7 +431,11 @@ if(QDELETED(tool) || !cultist.is_holding(tool)) return FALSE +<<<<<<< HEAD if(cultist.incapacitated() || cultist.stat == DEAD) +======= + if(cultist.incapacitated || cultist.stat == DEAD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(cultist, span_warning("You can't draw a rune right now.")) return FALSE diff --git a/code/datums/components/echolocation.dm b/code/datums/components/echolocation.dm index f5181a98147..6ad64c3367f 100644 --- a/code/datums/components/echolocation.dm +++ b/code/datums/components/echolocation.dm @@ -32,7 +32,11 @@ /// Cooldown for the echolocation. COOLDOWN_DECLARE(cooldown_last) +<<<<<<< HEAD /datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon, color_path, use_echo = TRUE, show_own_outline = FALSE, personal_color = "#ffffff") // SKYRAT EDIT CHANGE - ORIGINAL: /datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon = "echo", color_path) +======= +/datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon, color_path) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() var/mob/living/echolocator = parent if(!istype(echolocator)) @@ -55,19 +59,26 @@ src.images_are_static = images_are_static if(!isnull(blocking_trait)) src.blocking_trait = blocking_trait +<<<<<<< HEAD // SKYRAT ADDITION START: echolocation src.show_own_outline = show_own_outline src.echo_color = personal_color // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ispath(color_path)) client_color = echolocator.add_client_colour(color_path) src.echo_group = echo_group || REF(src) echolocator.add_traits(list(TRAIT_ECHOLOCATION_RECEIVER, TRAIT_TRUE_NIGHT_VISION), echo_group) //so they see all the tiles they echolocated, even if they are in the dark echolocator.become_blind(ECHOLOCATION_TRAIT) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if (use_echo) // add constructor toggle to not use the eye overlay echolocator.overlay_fullscreen("echo", /atom/movable/screen/fullscreen/echo, echo_icon) // SKYRAT EDIT ADDITION END +======= + echolocator.overlay_fullscreen("echo", /atom/movable/screen/fullscreen/echo, echo_icon) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 START_PROCESSING(SSfastprocess, src) /datum/component/echolocation/Destroy(force) @@ -92,7 +103,11 @@ echolocate() /datum/component/echolocation/proc/echolocate() +<<<<<<< HEAD if(stall || !COOLDOWN_FINISHED(src, cooldown_last)) // SKYRAT EDIT CHANGE - ORIGINAL: if(!COOLDOWN_FINISHED(src, cooldown_last)) +======= + if(!COOLDOWN_FINISHED(src, cooldown_last)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return COOLDOWN_START(src, cooldown_last, cooldown_time) var/mob/living/echolocator = parent @@ -128,6 +143,7 @@ if(images_are_static) final_image.pixel_x = input.pixel_x final_image.pixel_y = input.pixel_y +<<<<<<< HEAD // SKYRAT ADDITION START: echolocation (show outlines on self) if(HAS_TRAIT_FROM(input, TRAIT_ECHOLOCATION_RECEIVER, echo_group)) //mark other echolocation with full white, except ourselves var/datum/component/echolocation/located_component = input.GetComponent(/datum/component/echolocation) @@ -140,6 +156,13 @@ var/list/fade_ins = list(final_image) for(var/mob/living/echolocate_receiver as anything in receivers) if(echolocate_receiver == input && !show_own_outline) // SKYRAT EDIT CHANGE - ORIGINAL: if(echolocate_receiver == input) +======= + if(HAS_TRAIT_FROM(input, TRAIT_ECHOLOCATION_RECEIVER, echo_group)) //mark other echolocation with full white + final_image.color = white_matrix + var/list/fade_ins = list(final_image) + for(var/mob/living/echolocate_receiver as anything in receivers) + if(echolocate_receiver == input) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(receivers[echolocate_receiver][input]) var/previous_image = receivers[echolocate_receiver][input]["image"] diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 439b1563521..06606857356 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -60,10 +60,18 @@ return check_if_detonate(I) +<<<<<<< HEAD /datum/component/explodable/proc/explodable_impact(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum) SIGNAL_HANDLER check_if_detonate(hit_atom) +======= +/datum/component/explodable/proc/explodable_impact(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) + SIGNAL_HANDLER + + if(!caught) + check_if_detonate(hit_atom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/explodable/proc/explodable_bump(datum/source, atom/A) SIGNAL_HANDLER diff --git a/code/datums/components/face_decal.dm b/code/datums/components/face_decal.dm index f045a4f18df..3d89f607f15 100644 --- a/code/datums/components/face_decal.dm +++ b/code/datums/components/face_decal.dm @@ -53,6 +53,11 @@ carbon_parent.update_body_parts() else normal_overlay = get_normal_overlay() +<<<<<<< HEAD +======= + normal_overlay.color = color + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignals(parent, list( COMSIG_COMPONENT_CLEAN_ACT, @@ -113,6 +118,7 @@ SIGNAL_HANDLER qdel(src) +<<<<<<< HEAD /// Creampie subtype, handling signals and mood logic GLOBAL_LIST_INIT(creamable, typecacheof(list( @@ -147,3 +153,41 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list( if(iscarbon(parent)) var/mob/living/carbon/carbon_parent = parent carbon_parent.clear_mood_event("creampie") +======= +/// splat subtype, handling signals and mood logic + +GLOBAL_LIST_INIT(splattable, zebra_typecacheof(list( + /mob/living/carbon/human = "human", + /mob/living/basic/pet/dog/corgi = "corgi", + /mob/living/silicon/ai = "ai", +))) + +/datum/component/face_decal/splat + ///The mood_event that we add + var/mood_event_type + +/datum/component/face_decal/splat/Initialize(icon_state, layers, color, memory_type = /datum/memory/witnessed_creampie, mood_event_type = /datum/mood_event/creampie) + if(!is_type_in_typecache(parent, GLOB.splattable)) + return COMPONENT_INCOMPATIBLE + + . = ..() + + SEND_SIGNAL(parent, COMSIG_MOB_HIT_BY_SPLAT, src) + add_memory_in_range(parent, 7, memory_type, protagonist = parent) + src.mood_event_type = mood_event_type + +/datum/component/face_decal/splat/get_normal_overlay() + return mutable_appearance('icons/mob/effects/face_decal.dmi', "[icon_state]_[GLOB.splattable[type]]") + +/datum/component/face_decal/splat/RegisterWithParent() + . = ..() + if(iscarbon(parent)) + var/mob/living/carbon/human/carbon_parent = parent + carbon_parent.add_mood_event("splat", mood_event_type) + +/datum/component/face_decal/splat/UnregisterFromParent() + . = ..() + if(iscarbon(parent)) + var/mob/living/carbon/carbon_parent = parent + carbon_parent.clear_mood_event("splat") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm index 6638c822ff6..d011f28a1bd 100644 --- a/code/datums/components/fishing_spot.dm +++ b/code/datums/components/fishing_spot.dm @@ -12,7 +12,11 @@ fish_source = configuration else return COMPONENT_INCOMPATIBLE +<<<<<<< HEAD fish_source.on_fishing_spot_init() +======= + fish_source.on_fishing_spot_init(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(handle_attackby)) RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast)) RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined)) @@ -22,6 +26,10 @@ ADD_TRAIT(parent, TRAIT_FISHING_SPOT, REF(src)) /datum/component/fishing_spot/Destroy() +<<<<<<< HEAD +======= + fish_source.on_fishing_spot_del(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish_source = null return ..() @@ -43,6 +51,7 @@ if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT)) return +<<<<<<< HEAD var/has_known_fishes = FALSE for(var/reward in fish_source.fish_table) if(!ispath(reward, /obj/item/fish)) @@ -52,6 +61,9 @@ has_known_fishes = TRUE break if(!has_known_fishes) +======= + if(!fish_source.has_known_fishes()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return examine_text += span_tinynoticeital("This is a fishing spot. You can look again to list its fishes...") @@ -61,6 +73,7 @@ if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT)) return +<<<<<<< HEAD var/list/known_fishes = list() for(var/reward in fish_source.fish_table) if(!ispath(reward, /obj/item/fish)) @@ -73,6 +86,9 @@ return examine_text += span_info("You can catch the following fish here: [english_list(known_fishes)].") +======= + fish_source.get_catchable_fish_names(user, parent, examine_text) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/fishing_spot/proc/try_start_fishing(obj/item/possibly_rod, mob/user) SIGNAL_HANDLER @@ -93,7 +109,11 @@ /datum/component/fishing_spot/proc/start_fishing_challenge(obj/item/fishing_rod/rod, mob/user) /// Roll what we caught based on modified table +<<<<<<< HEAD var/result = fish_source.roll_reward(rod, user) +======= + var/result = fish_source.roll_reward(rod, user, parent) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/fishing_challenge/challenge = new(src, result, rod, user) fish_source.pre_challenge_started(rod, user, challenge) challenge.start(user) diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm index acb44d4c9e9..ae11428eca7 100644 --- a/code/datums/components/food/decomposition.dm +++ b/code/datums/components/food/decomposition.dm @@ -1,8 +1,14 @@ //"Don't leave food on the floor, that's how we get ants" +<<<<<<< HEAD #define DECOMPOSITION_TIME (20 MINUTES) // SKYRAT EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME (10 MINUTES) #define DECOMPOSITION_TIME_RAW (15 MINUTES) // SKYRAT EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME_RAW (5 MINUTES) #define DECOMPOSITION_TIME_GROSS (10 MINUTES) // SKYRAT EDIT CHANGE, - ORIGINAL: #define DECOMPOSITION_TIME_GROSS (7 MINUTES) +======= +#define DECOMPOSITION_TIME (10 MINUTES) +#define DECOMPOSITION_TIME_RAW (5 MINUTES) +#define DECOMPOSITION_TIME_GROSS (7 MINUTES) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Makes things decompose when exposed to germs. Requires /datum/component/germ_sensitive to detect exposure. /datum/component/decomposition diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 89d0e03b72f..95a44f82d34 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -256,7 +256,11 @@ Behavior that's still missing from this component that original food items had t if(!(food_flags & FOOD_IN_CONTAINER)) switch(bitecount) if(0) +<<<<<<< HEAD // pass +======= + pass() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(1) examine_list += span_notice("[owner] was bitten by someone!") if(2, 3) @@ -528,13 +532,21 @@ Behavior that's still missing from this component that original food items had t /datum/component/edible/proc/apply_buff(mob/eater) var/buff var/recipe_complexity = get_recipe_complexity() +<<<<<<< HEAD if(recipe_complexity == 0) +======= + if(recipe_complexity <= 0) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/obj/item/food/food = parent if(!isnull(food.crafted_food_buff)) buff = food.crafted_food_buff else +<<<<<<< HEAD buff = pick_weight(GLOB.food_buffs[recipe_complexity]) +======= + buff = pick_weight(GLOB.food_buffs[min(recipe_complexity, FOOD_COMPLEXITY_5)]) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(buff)) var/mob/living/living_eater = eater var/atom/owner = parent @@ -595,10 +607,20 @@ Behavior that's still missing from this component that original food items had t /// Get the complexity of the crafted food /datum/component/edible/proc/get_recipe_complexity() +<<<<<<< HEAD if(!HAS_TRAIT(parent, TRAIT_FOOD_CHEF_MADE) || !istype(parent, /obj/item/food)) return 0 // It is factory made. Soulless. var/obj/item/food/food = parent return food.crafting_complexity +======= + var/list/extra_complexity = list(0) + SEND_SIGNAL(parent, COMSIG_FOOD_GET_EXTRA_COMPLEXITY, extra_complexity) + var/complexity_to_add = extra_complexity[1] + if(!HAS_TRAIT(parent, TRAIT_FOOD_CHEF_MADE) || !istype(parent, /obj/item/food)) + return complexity_to_add // It is factory made. Soulless. + var/obj/item/food/food = parent + return food.crafting_complexity + complexity_to_add +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Get food quality adjusted according to eater's preferences /datum/component/edible/proc/get_perceived_food_quality(mob/living/carbon/human/eater) diff --git a/code/datums/components/food/germ_sensitive.dm b/code/datums/components/food/germ_sensitive.dm index d0acc49714a..5eaedafd345 100644 --- a/code/datums/components/food/germ_sensitive.dm +++ b/code/datums/components/food/germ_sensitive.dm @@ -25,7 +25,11 @@ GLOBAL_LIST_INIT(floor_diseases, list( RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(handle_movement)) +<<<<<<< HEAD RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(wash)) //Wash germs off dirty things +======= + RegisterSignals(parent, list(COMSIG_COMPONENT_CLEAN_ACT, COMSIG_ITEM_FRIED, COMSIG_ITEM_BARBEQUE_GRILLED, COMSIG_ATOM_FIRE_ACT), PROC_REF(delete_germs)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignals(parent, list( COMSIG_ITEM_DROPPED, //Dropped into the world @@ -50,6 +54,12 @@ GLOBAL_LIST_INIT(floor_diseases, list( COMSIG_ATOM_EXAMINE, COMSIG_ATOM_EXITED, COMSIG_COMPONENT_CLEAN_ACT, +<<<<<<< HEAD +======= + COMSIG_ITEM_FRIED, + COMSIG_ITEM_BARBEQUE_GRILLED, + COMSIG_ATOM_FIRE_ACT, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 COMSIG_ITEM_DROPPED, COMSIG_ITEM_PICKUP, COMSIG_MOVABLE_MOVED, @@ -116,7 +126,11 @@ GLOBAL_LIST_INIT(floor_diseases, list( var/random_disease = pick_weight(GLOB.floor_diseases) parent.AddComponent(/datum/component/infective, new random_disease, weak = TRUE) +<<<<<<< HEAD /datum/component/germ_sensitive/proc/wash() +======= +/datum/component/germ_sensitive/proc/delete_germs() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(infective) infective = FALSE diff --git a/code/datums/components/fov_handler.dm b/code/datums/components/fov_handler.dm index 9f64c648502..b285ba1fc45 100644 --- a/code/datums/components/fov_handler.dm +++ b/code/datums/components/fov_handler.dm @@ -125,5 +125,8 @@ /datum/component/fov_handler/UnregisterFromParent() . = ..() UnregisterSignal(parent, list(COMSIG_MOB_RESET_PERSPECTIVE, COMSIG_ATOM_DIR_CHANGE, COMSIG_LIVING_DEATH, COMSIG_LIVING_REVIVE, COMSIG_MOB_LOGOUT)) +<<<<<<< HEAD UnregisterSignal(parent, COMSIG_LIVING_COMBAT_MODE_TOGGLE) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm index 1faa04ceacc..54e9ca5fc3d 100644 --- a/code/datums/components/fullauto.dm +++ b/code/datums/components/fullauto.dm @@ -275,7 +275,11 @@ // Gun procs. /obj/item/gun/proc/on_autofire_start(mob/living/shooter) +<<<<<<< HEAD if(semicd || shooter.incapacitated() || !can_trigger_gun(shooter)) +======= + if(semicd || shooter.incapacitated || !can_trigger_gun(shooter)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!can_shoot()) shoot_with_empty_chamber(shooter) @@ -295,7 +299,11 @@ /obj/item/gun/proc/do_autofire(datum/source, atom/target, mob/living/shooter, allow_akimbo, params) SIGNAL_HANDLER +<<<<<<< HEAD if(semicd || shooter.incapacitated()) +======= + if(semicd || shooter.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE if(!can_shoot()) shoot_with_empty_chamber(shooter) diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index 72c2e75e8cb..bfba9142e09 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -83,11 +83,14 @@ SIGNAL_HANDLER . = COMPONENT_HANDLED_GRILLING +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(pollutant_type) var/turf/parent_turf = get_turf(parent) parent_turf.pollute_turf(pollutant_type, 10) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_cook_time += seconds_per_tick * 10 //turn it into ds if(current_cook_time >= required_cook_time) diff --git a/code/datums/components/jukebox.dm b/code/datums/components/jukebox.dm index 4017e86a812..15da24482bf 100644 --- a/code/datums/components/jukebox.dm +++ b/code/datums/components/jukebox.dm @@ -1,4 +1,8 @@ +<<<<<<< HEAD /* SKYRAT EDIT: See modular_skyrat/modules/jukebox /// Checks if the mob has jukebox muted in their preferences +======= +/// Checks if the mob has jukebox muted in their preferences +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define IS_PREF_MUTED(mob) (!isnull(mob.client) && !mob.client.prefs.read_preference(/datum/preference/toggle/sound_jukebox)) // Reasons for appling STATUS_MUTE to a mob's sound status @@ -403,4 +407,8 @@ song_path = 'sound/ambience/title3.ogg' song_name = "Tintin on the Moon" song_length = 3 MINUTES + 52 SECONDS +<<<<<<< HEAD song_beat = 1 SECONDS SKYRAT EDIT END*/ +======= + song_beat = 1 SECONDS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/listen_and_repeat.dm b/code/datums/components/listen_and_repeat.dm index 88c64ef4dbc..d0e87421677 100644 --- a/code/datums/components/listen_and_repeat.dm +++ b/code/datums/components/listen_and_repeat.dm @@ -71,11 +71,14 @@ if(over_radio && prob(RADIO_IGNORE_CHANCE)) return +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - parrot commands var/mob/living/basic/parrot/maybe_parrot = parent if(!over_radio && istype(maybe_parrot)) maybe_parrot.check_command(message, speaker) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/number_of_excess_strings = LAZYLEN(speech_buffer) - MAX_SPEECH_BUFFER_SIZE if(number_of_excess_strings > 0) // only remove if we're overfull diff --git a/code/datums/components/material/material_container.dm b/code/datums/components/material/material_container.dm index 7b3753cc71d..edf08526057 100644 --- a/code/datums/components/material/material_container.dm +++ b/code/datums/components/material/material_container.dm @@ -124,10 +124,17 @@ * Material Validation : Checks how much materials are available, Extracts materials from items if the container can hold them * Material Removal : Removes material from the container * +<<<<<<< HEAD * Each Proc furthur belongs to a specific category * LOW LEVEL: Procs that are used internally & should not be used anywhere else unless you know what your doing * MID LEVEL: Procs that can be used by machines(like recycler, stacking machines) to bypass majority of checks * HIGH LEVEL: Procs that can be used by anyone publically and guarentees safty checks & limits +======= + * Each Proc further belongs to a specific category + * LOW LEVEL: Procs that are used internally & should not be used anywhere else unless you know what your doing + * MID LEVEL: Procs that can be used by machines(like recycler, stacking machines) to bypass majority of checks + * HIGH LEVEL: Procs that can be used by anyone publicly and guarantees safety checks & limits +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ //================================Material Insertion procs============================== @@ -236,7 +243,11 @@ //do the insert var/last_inserted_id = insert_item_materials(target, multiplier, context) if(!isnull(last_inserted_id)) +<<<<<<< HEAD if(delete_item || target != weapon) //we could have split the stack ourself +======= + if(delete_item || target != weapon) //we could have split the stack ourselves +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(target) //item gone return material_amount else if(!isnull(item_stack) && item_stack != target) //insertion failed, merge the split stack back into the original @@ -250,7 +261,11 @@ //===================================HIGH LEVEL=================================================== /** +<<<<<<< HEAD * inserts an item from the players hand into the container. Loops through all the contents inside reccursively +======= + * inserts an item from the players hand into the container. Loops through all the contents inside recursively +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Does all explicit checking for mat flags & callbacks to check if insertion is valid * This proc is what you should be using for almost all cases * @@ -584,7 +599,11 @@ for(var/x in mats) //Loop through all required materials var/wanted = OPTIMAL_COST(mats[x] * coefficient) * multiplier if(!has_enough_of_material(x, wanted))//Not a category, so just check the normal way +<<<<<<< HEAD testing("didnt have: [x] wanted: [wanted]") +======= + testing("didn't have: [x] wanted: [wanted]") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -605,7 +624,11 @@ //round amount amt = OPTIMAL_COST(amt) +<<<<<<< HEAD //get ref if nessassary +======= + //get ref if necessary +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!istype(mat)) mat = GET_MATERIAL_REF(mat) diff --git a/code/datums/components/mind_linker.dm b/code/datums/components/mind_linker.dm index d20745a4cce..b392ab89798 100644 --- a/code/datums/components/mind_linker.dm +++ b/code/datums/components/mind_linker.dm @@ -56,6 +56,7 @@ if(post_unlink_callback) src.post_unlink_callback = post_unlink_callback +<<<<<<< HEAD src.speech_action_icon = speech_action_icon src.speech_action_icon_state = speech_action_icon_state src.speech_action_background_icon_state = speech_action_background_icon_state @@ -70,6 +71,10 @@ master_speech = new(src) master_speech.Grant(owner) //SKYRAT EDIT END +======= + master_speech = new(src) + master_speech.Grant(owner) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/mind_linker/Destroy(force) for(var/mob/living/remaining_mob as anything in linked_mobs) @@ -95,6 +100,7 @@ /datum/component/mind_linker/proc/link_mob(mob/living/to_link) if(QDELETED(to_link) || to_link.stat == DEAD) return FALSE +<<<<<<< HEAD /* ORIGINAL CODE if(HAS_TRAIT(to_link, TRAIT_MINDSHIELD)) // Mindshield implant - no dice @@ -108,6 +114,8 @@ if(to_link.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0) && linking_protection) return FALSE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(linked_mobs[to_link]) return FALSE diff --git a/code/datums/components/omen.dm b/code/datums/components/omen.dm index e4094ba679a..4233e2c3aff 100644 --- a/code/datums/components/omen.dm +++ b/code/datums/components/omen.dm @@ -143,12 +143,20 @@ return for(var/obj/machinery/light/evil_light in the_turf) +<<<<<<< HEAD if((evil_light.status == LIGHT_BURNED || evil_light.status == LIGHT_BROKEN) || (HAS_TRAIT(living_guy, TRAIT_SHOCKIMMUNE))) // we cant do anything :( // Why in the world is there no get_siemens_coeff proc??? +======= + if((evil_light.status == LIGHT_BURNED || evil_light.status == LIGHT_BROKEN) || (HAS_TRAIT(living_guy, TRAIT_SHOCKIMMUNE))) // we can't do anything :( // Why in the world is there no get_siemens_coeff proc??? +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(living_guy, span_warning("[evil_light] sparks weakly for a second.")) do_sparks(2, FALSE, evil_light) // hey maybe it'll ignite them return +<<<<<<< HEAD to_chat(living_guy, span_warning("[evil_light] glows ominously...")) // omenously +======= + to_chat(living_guy, span_warning("[evil_light] glows ominously...")) // ominously +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 evil_light.visible_message(span_boldwarning("[evil_light] suddenly flares brightly and sparks!")) evil_light.break_light_tube(skip_sound_and_sparks = FALSE) do_sparks(number = 4, cardinal_only = FALSE, source = evil_light) diff --git a/code/datums/components/overlay_lighting.dm b/code/datums/components/overlay_lighting.dm index 258b8f87972..6f844d3b36e 100644 --- a/code/datums/components/overlay_lighting.dm +++ b/code/datums/components/overlay_lighting.dm @@ -62,6 +62,7 @@ var/directional = FALSE ///Whether we're a beam light var/beam = FALSE +<<<<<<< HEAD ///A cone overlay for directional light, its alpha and color are dependant on the light var/image/cone ///Current tracked direction for the directional cast behaviour @@ -69,6 +70,15 @@ ///Tracks current directional x offset so we dont update unecessarily var/directional_offset_x ///Tracks current directional y offset so we dont update unecessarily +======= + ///A cone overlay for directional light, its alpha and color are dependent on the light + var/image/cone + ///Current tracked direction for the directional cast behaviour + var/current_direction + ///Tracks current directional x offset so we don't update unnecessarily + var/directional_offset_x + ///Tracks current directional y offset so we don't update unnecessarily +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/directional_offset_y ///Cast range for the directional cast (how far away the atom is moved) var/cast_range = 2 diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index 2b59305be14..f5f7447ddc5 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -88,10 +88,13 @@ RegisterSignal(parent, COMSIG_MINE_TRIGGERED, PROC_REF(create_blast_pellets)) else if(issupplypod(parent)) RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, PROC_REF(create_blast_pellets)) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN else if(ishorrorling(parent)) RegisterSignal(parent, COMSIG_HORRORFORM_EXPLODE, PROC_REF(create_blast_pellets)) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/pellet_cloud/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PREQDELETED, COMSIG_FIRE_CASING, COMSIG_GRENADE_DETONATE, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED)) diff --git a/code/datums/components/pet_commands/pet_command.dm b/code/datums/components/pet_commands/pet_command.dm index a8db88d3a44..3a0bc585791 100644 --- a/code/datums/components/pet_commands/pet_command.dm +++ b/code/datums/components/pet_commands/pet_command.dm @@ -186,6 +186,7 @@ /datum/pet_command/point_targeting/add_new_friend(mob/living/tamer) . = ..() +<<<<<<< HEAD RegisterSignal(tamer, COMSIG_MOB_POINTED, PROC_REF(on_point)) /datum/pet_command/point_targeting/remove_friend(mob/living/unfriended) @@ -194,6 +195,16 @@ /// Target the pointed atom for actions /datum/pet_command/point_targeting/proc/on_point(mob/living/friend, atom/pointed_atom) +======= + RegisterSignal(tamer, COMSIG_MOVABLE_POINTED, PROC_REF(on_point)) + +/datum/pet_command/point_targeting/remove_friend(mob/living/unfriended) + . = ..() + UnregisterSignal(unfriended, COMSIG_MOVABLE_POINTED) + +/// Target the pointed atom for actions +/datum/pet_command/point_targeting/proc/on_point(mob/living/friend, atom/pointed_atom, obj/effect/temp_visual/point/point) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER var/mob/living/parent = weak_parent.resolve() diff --git a/code/datums/components/phylactery.dm b/code/datums/components/phylactery.dm index 4a58660992a..e5f4cb8ee75 100644 --- a/code/datums/components/phylactery.dm +++ b/code/datums/components/phylactery.dm @@ -18,7 +18,11 @@ var/phylactery_color = COLOR_VERY_DARK_LIME_GREEN // Internal vars. +<<<<<<< HEAD /// The number of ressurections that have occured from this phylactery. +======= + /// The number of resurrections that have occurred from this phylactery. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/num_resurrections = 0 /// A timerid to the current revival timer. var/revive_timer @@ -150,7 +154,11 @@ UnregisterSignal(source, COMSIG_LIVING_REVIVE) /** +<<<<<<< HEAD * Actually undergo the process of reviving the lich at the site of the phylacery. +======= + * Actually undergo the process of reviving the lich at the site of the phylactery. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * Arguments * * corpse - optional, the old body of the lich. Can be QDELETED or null. diff --git a/code/datums/components/profound_fisher.dm b/code/datums/components/profound_fisher.dm index 4485115db06..f5a57d5b959 100644 --- a/code/datums/components/profound_fisher.dm +++ b/code/datums/components/profound_fisher.dm @@ -1,8 +1,13 @@ +<<<<<<< HEAD ///component that allows player mobs to play the fishing minigame, non-player mobs will "pretend" fish +======= +///component that allows player mobs to play the fishing minigame without a rod equipped, non-player mobs will "pretend" fish +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/profound_fisher ///the fishing rod this mob will use var/obj/item/fishing_rod/mob_fisher/our_rod +<<<<<<< HEAD /datum/component/profound_fisher/Initialize(list/npc_fishing_preset = list()) if(!isliving(parent)) return @@ -30,10 +35,110 @@ return NONE if(living_parent.client) INVOKE_ASYNC(our_rod, TYPE_PROC_REF(/obj/item, melee_attack_chain), parent, target) +======= +/datum/component/profound_fisher/Initialize(our_rod) + var/isgloves = istype(parent, /obj/item/clothing/gloves) + if(!isliving(parent) && !isgloves) + return COMPONENT_INCOMPATIBLE + src.our_rod = our_rod || new(parent) + src.our_rod.internal = TRUE + RegisterSignal(src.our_rod, COMSIG_QDELETING, PROC_REF(on_rod_qdel)) + + if(!isgloves) + RegisterSignal(parent, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(pre_attack)) + else + var/obj/item/clothing/gloves = parent + RegisterSignal(gloves, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(gloves, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(gloves, COMSIG_ATOM_ATTACK_HAND_SECONDARY, PROC_REF(open_rod_menu)) + RegisterSignal(gloves, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + gloves.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 + RegisterSignal(gloves, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) + var/mob/living/wearer = gloves.loc + if(istype(wearer) && wearer.get_item_by_slot(ITEM_SLOT_GLOVES) == gloves) + RegisterSignal(wearer, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) + +/datum/component/profound_fisher/proc/on_requesting_context_from_item(datum/source, list/context, obj/item/held_item, mob/living/user) + SIGNAL_HANDLER + if(isnull(held_item) && user.contains(parent)) + context[SCREENTIP_CONTEXT_RMB] = "Open rod UI" + return CONTEXTUAL_SCREENTIP_SET + +/datum/component/profound_fisher/proc/on_examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + examine_list += span_info("When [EXAMINE_HINT("held")] or [EXAMINE_HINT("equipped")], [EXAMINE_HINT("right-click")] with a empty hand to open the integrated fishing rod interface.") + examine_list += span_tinynoticeital("To fish, you need to turn combat mode off.") + +/datum/component/profound_fisher/proc/on_rod_qdel(datum/source) + SIGNAL_HANDLER + qdel(src) + +/datum/component/profound_fisher/Destroy() + our_rod.internal = FALSE + UnregisterSignal(our_rod, COMSIG_QDELETING) + our_rod = null + return ..() + +/datum/component/profound_fisher/proc/on_equip(obj/item/source, atom/equipper, slot) + SIGNAL_HANDLER + if(slot != ITEM_SLOT_GLOVES) + return + RegisterSignal(equipper, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) + +/datum/component/profound_fisher/proc/open_rod_menu(datum/source, mob/user, list/modifiers) + SIGNAL_HANDLER + INVOKE_ASYNC(our_rod, TYPE_PROC_REF(/datum, ui_interact), user) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + +/datum/component/profound_fisher/proc/on_drop(datum/source, atom/dropper) + SIGNAL_HANDLER + UnregisterSignal(dropper, COMSIG_LIVING_UNARMED_ATTACK) + REMOVE_TRAIT(dropper, TRAIT_PROFOUND_FISHER, TRAIT_GENERIC) //this will cancel the current minigame if the fishing rod was internal. + +/datum/component/profound_fisher/proc/on_unarmed_attack(mob/living/source, atom/attack_target, proximity_flag, list/modifiers) + SIGNAL_HANDLER + if(!source.client || !should_fish_on(source, attack_target)) + return + INVOKE_ASYNC(src, PROC_REF(begin_fishing), source, attack_target) + return COMPONENT_CANCEL_ATTACK_CHAIN + +/datum/component/profound_fisher/proc/pre_attack(mob/living/source, atom/target) + SIGNAL_HANDLER + + if(!should_fish_on(source, target)) + return + if(source.client) + INVOKE_ASYNC(src, PROC_REF(begin_fishing), source, target) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else INVOKE_ASYNC(src, PROC_REF(pretend_fish), target) return COMPONENT_HOSTILE_NO_ATTACK +<<<<<<< HEAD +======= +/datum/component/profound_fisher/proc/should_fish_on(mob/living/user, atom/target) + if(!HAS_TRAIT(target, TRAIT_FISHING_SPOT) || HAS_TRAIT(user, TRAIT_GONE_FISHING)) + return FALSE + if(user.combat_mode || !user.CanReach(target)) + return FALSE + return TRUE + +/datum/component/profound_fisher/proc/begin_fishing(mob/living/user, atom/target) + RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_GONE_FISHING), PROC_REF(actually_fishing_with_internal_rod)) + our_rod.melee_attack_chain(user, target) + UnregisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_GONE_FISHING)) + +/datum/component/profound_fisher/proc/actually_fishing_with_internal_rod(datum/source) + SIGNAL_HANDLER + ADD_TRAIT(source, TRAIT_PROFOUND_FISHER, REF(parent)) + RegisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_GONE_FISHING), PROC_REF(remove_profound_fisher)) + +/datum/component/profound_fisher/proc/remove_profound_fisher(datum/source) + SIGNAL_HANDLER + REMOVE_TRAIT(source, TRAIT_PROFOUND_FISHER, TRAIT_GENERIC) + UnregisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_GONE_FISHING)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/profound_fisher/proc/pretend_fish(atom/target) var/mob/living/living_parent = parent if(DOING_INTERACTION_WITH_TARGET(living_parent, target)) @@ -43,6 +148,7 @@ var/datum/fish_source/fish_spot = fish_spot_container[NPC_FISHING_SPOT] if(isnull(fish_spot)) return null +<<<<<<< HEAD var/obj/effect/fishing_lure/lure = new(get_turf(target), target) playsound(lure, 'sound/effects/splash.ogg', 100) var/happiness_percentage = living_parent.ai_controller?.blackboard[BB_BASIC_HAPPINESS] / 100 @@ -61,3 +167,21 @@ bait = /obj/item/food/bait/doughball/synthetic/unconsumable +======= + var/obj/effect/fishing_float/float = new(get_turf(target), target) + playsound(float, 'sound/effects/splash.ogg', 100) + var/happiness_percentage = living_parent.ai_controller?.blackboard[BB_BASIC_HAPPINESS] / 100 + var/fishing_speed = 10 SECONDS - round(4 SECONDS * happiness_percentage) + if(!do_after(living_parent, fishing_speed, target = target) && !QDELETED(fish_spot)) + qdel(float) + return + var/reward_loot = fish_spot.roll_reward(our_rod, parent) + fish_spot.dispense_reward(reward_loot, parent, target) + playsound(float, 'sound/effects/bigsplash.ogg', 100) + qdel(float) + +/obj/item/fishing_rod/mob_fisher + line = /obj/item/fishing_line/reinforced + bait = /obj/item/food/bait/doughball/synthetic/unconsumable + resistance_flags = INDESTRUCTIBLE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index 8d4b7e6f2cb..a90b9755f02 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -1,11 +1,14 @@ // For any mob that can be ridden +<<<<<<< HEAD //SKYRAT EDIT START: Human Riding Defines #define OVERSIZED_OFFSET 18 #define OVERSIZED_SIDE_OFFSET 11 #define REGULAR_OFFSET 6 #define REGULAR_SIDE_OFFSET 4 //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/riding/creature /// If TRUE, this creature's movements can be controlled by the rider while mounted (as opposed to riding cyborgs and humans, which is passive) var/can_be_driven = TRUE @@ -64,10 +67,17 @@ if(living_parent.body_position != STANDING_UP) // if we move while on the ground, the rider falls off . = FALSE // for piggybacks and (redundant?) borg riding, check if the rider is stunned/restrained +<<<<<<< HEAD else if((ride_check_flags & RIDER_NEEDS_ARMS) && (HAS_TRAIT(rider, TRAIT_RESTRAINED) || rider.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB))) . = FALSE // for fireman carries, check if the ridden is stunned/restrained else if((ride_check_flags & CARRIER_NEEDS_ARM) && (HAS_TRAIT(living_parent, TRAIT_RESTRAINED) || living_parent.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB))) +======= + else if((ride_check_flags & RIDER_NEEDS_ARMS) && (HAS_TRAIT(rider, TRAIT_RESTRAINED) || INCAPACITATED_IGNORING(rider, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB))) + . = FALSE + // for fireman carries, check if the ridden is stunned/restrained + else if((ride_check_flags & CARRIER_NEEDS_ARM) && (HAS_TRAIT(living_parent, TRAIT_RESTRAINED) || INCAPACITATED_IGNORING(living_parent, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = FALSE else if((ride_check_flags & JUST_FRIEND_RIDERS) && !(living_parent.faction.Find(REF(rider)))) . = FALSE @@ -295,6 +305,7 @@ /datum/component/riding/creature/human/get_offsets(pass_index) var/mob/living/carbon/human/H = parent +<<<<<<< HEAD //SKYRAT EDIT BEGIN - Oversized Overhaul if(H.buckle_lying) return HAS_TRAIT(H, TRAIT_OVERSIZED) ? list( @@ -321,6 +332,13 @@ TEXT_WEST = list(REGULAR_OFFSET, REGULAR_SIDE_OFFSET) ) //SKYRAT EDIT END +======= + if(H.buckle_lying) + return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(0, 6), TEXT_WEST = list(0, 6)) + else + return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(-6, 4), TEXT_WEST = list( 6, 4)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/riding/creature/human/force_dismount(mob/living/dismounted_rider) var/atom/movable/AM = parent AM.unbuckle_mob(dismounted_rider) @@ -540,9 +558,15 @@ /datum/component/riding/creature/leaper/Initialize(mob/living/riding_mob, force = FALSE, ride_check_flags = NONE, potion_boost = FALSE) . = ..() +<<<<<<< HEAD RegisterSignal(riding_mob, COMSIG_MOB_POINTED, PROC_REF(attack_pointed)) /datum/component/riding/creature/leaper/proc/attack_pointed(mob/living/rider, atom/pointed) +======= + RegisterSignal(riding_mob, COMSIG_MOVABLE_POINTED, PROC_REF(attack_pointed)) + +/datum/component/riding/creature/leaper/proc/attack_pointed(mob/living/rider, atom/pointed, obj/effect/temp_visual/point/point) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(!isclosedturf(pointed)) return @@ -554,7 +578,11 @@ /datum/component/riding/leaper/handle_unbuckle(mob/living/rider) . = ..() +<<<<<<< HEAD UnregisterSignal(rider, COMSIG_MOB_POINTED) +======= + UnregisterSignal(rider, COMSIG_MOVABLE_POINTED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/riding/creature/raptor require_minigame = TRUE @@ -705,6 +733,7 @@ mounter = null host = null return ..() +<<<<<<< HEAD //SKYRAT EDIT START: Human Riding Defines #undef OVERSIZED_OFFSET @@ -712,3 +741,5 @@ #undef REGULAR_OFFSET #undef REGULAR_SIDE_OFFSET //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm index 0d6d4a4c967..39ba5b3e2e7 100644 --- a/code/datums/components/riding/riding_vehicle.dm +++ b/code/datums/components/riding/riding_vehicle.dm @@ -291,7 +291,11 @@ vehicle_move_delay += 1 /datum/component/riding/vehicle/scooter/skateboard/wheelys +<<<<<<< HEAD vehicle_move_delay = 1.75 // SKYRAT EDIT - ORIGINAL: 0 +======= + vehicle_move_delay = 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 can_slow_down = FALSE /datum/component/riding/vehicle/scooter/skateboard/wheelys/handle_specials() diff --git a/code/datums/components/sitcomlaughter.dm b/code/datums/components/sitcomlaughter.dm index 62e9276b1d7..b10ffab6783 100644 --- a/code/datums/components/sitcomlaughter.dm +++ b/code/datums/components/sitcomlaughter.dm @@ -1,6 +1,10 @@ /datum/component/wearertargeting/sitcomlaughter valid_slots = list(ITEM_SLOT_HANDS, ITEM_SLOT_BELT, ITEM_SLOT_ID, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_DEX_STORAGE) +<<<<<<< HEAD signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_POST_TILT_AND_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT) +======= + signals = list(COMSIG_MOB_HIT_BY_SPLAT, COMSIG_ON_CARBON_SLIP, COMSIG_POST_TILT_AND_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 proctype = PROC_REF(EngageInComedy) mobtype = /mob/living ///Sounds used for when user has a sitcom action occur diff --git a/code/datums/components/space_kidnap.dm b/code/datums/components/space_kidnap.dm index 8a1de2123d9..7aa0baa4de1 100644 --- a/code/datums/components/space_kidnap.dm +++ b/code/datums/components/space_kidnap.dm @@ -23,7 +23,11 @@ target.balloon_alert(parent, "is dead!") return COMPONENT_CANCEL_ATTACK_CHAIN +<<<<<<< HEAD if(!victim.incapacitated()) +======= + if(!victim.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!isspaceturf(get_turf(target))) @@ -39,7 +43,11 @@ var/obj/particles = new /obj/effect/abstract/particle_holder (victim, /particles/void_kidnap) kidnapping = TRUE +<<<<<<< HEAD if(do_after(parent, kidnap_time, victim, extra_checks = CALLBACK(victim, TYPE_PROC_REF(/mob, incapacitated)))) +======= + if(do_after(parent, kidnap_time, victim, extra_checks = victim.incapacitated)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 take_them(victim) qdel(particles) diff --git a/code/datums/components/splat.dm b/code/datums/components/splat.dm new file mode 100644 index 00000000000..5d47d17b98c --- /dev/null +++ b/code/datums/components/splat.dm @@ -0,0 +1,74 @@ +/datum/component/splat + ///The icon state to use for the decal + var/icon_state + ///The bodypart layer to use for the decal + var/layer + ///The type of memory to celebrate the event of getting hit by this + var/memory_type + ///The type of smudge we create on the floor + var/smudge_type + ///The moodlet passed down to the creamed component + var/moodlet_type + ///The color we give to the creamed component/overlay + var/splat_color + ///The callback called when a mob is hit by this + var/datum/callback/hit_callback + +/datum/component/splat/Initialize( + icon_state = "creampie", + layer = EXTERNAL_FRONT, + memory_type = /datum/memory/witnessed_creampie, + smudge_type = /obj/effect/decal/cleanable/food/pie_smudge, + moodlet_type = /datum/mood_event/creampie, + splat_color, + datum/callback/hit_callback, +) + . = ..() + if(!ismovable(parent)) + return COMPONENT_INCOMPATIBLE + + src.icon_state = icon_state + src.layer = layer + src.memory_type = memory_type + src.smudge_type = smudge_type + src.moodlet_type = moodlet_type + src.hit_callback = hit_callback + src.splat_color = splat_color + +/datum/component/splat/Destroy() + hit_callback = null + return ..() + +/datum/component/splat/RegisterWithParent() + if(isprojectile(parent)) + RegisterSignal(parent, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(projectile_splat)) + else + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(throw_splat)) + +/datum/component/splat/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_MOVABLE_IMPACT, COMSIG_PROJECTILE_SELF_ON_HIT)) + +/datum/component/splat/proc/projectile_splat(obj/projectile/source, atom/firer, atom/target, angle, hit_limb_zone, blocked) + SIGNAL_HANDLER + if(blocked != 100) + splat(source, target) + +/datum/component/splat/proc/throw_splat(atom/movable/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) + SIGNAL_HANDLER + if(caught) //someone caught us! + return + splat(source, hit_atom) + +/datum/component/splat/proc/splat(atom/movable/source, atom/hit_atom) + var/turf/hit_turf = get_turf(hit_atom) + new smudge_type(hit_turf) + var/can_splat_on = TRUE + if(isliving(hit_atom)) + var/mob/living/living_target_getting_hit = hit_atom + if(iscarbon(living_target_getting_hit)) + can_splat_on = !!(living_target_getting_hit.get_bodypart(BODY_ZONE_HEAD)) + hit_callback?.Invoke(living_target_getting_hit, can_splat_on) + if(can_splat_on && is_type_in_typecache(hit_atom, GLOB.splattable)) + hit_atom.AddComponent(/datum/component/face_decal/splat, icon_state, layer, splat_color || source.color, memory_type, moodlet_type) + SEND_SIGNAL(source, COMSIG_MOVABLE_SPLAT, hit_atom) + qdel(source) diff --git a/code/datums/components/sticker.dm b/code/datums/components/sticker.dm index 2c87d856da8..de1bcf96f55 100644 --- a/code/datums/components/sticker.dm +++ b/code/datums/components/sticker.dm @@ -13,18 +13,33 @@ var/atom/movable/our_sticker /// Reference to the created overlay, used during component deletion. var/mutable_appearance/sticker_overlay +<<<<<<< HEAD // Callback invoked when sticker is applied to the parent. var/datum/callback/stick_callback // Callback invoked when sticker is peeled (not removed) from the parent. var/datum/callback/peel_callback /datum/component/sticker/Initialize(atom/stickering_atom, dir = NORTH, px = 0, py = 0, datum/callback/stick_callback, datum/callback/peel_callback) +======= + /// Callback invoked when sticker is applied to the parent. + var/datum/callback/stick_callback + /// Callback invoked when sticker is peeled (not removed) from the parent. + var/datum/callback/peel_callback + /// Text added to the atom's examine when stickered. + var/examine_text + +/datum/component/sticker/Initialize(atom/stickering_atom, dir = NORTH, px = 0, py = 0, datum/callback/stick_callback, datum/callback/peel_callback, examine_text) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isatom(parent)) return COMPONENT_INCOMPATIBLE src.our_sticker = our_sticker src.stick_callback = stick_callback src.peel_callback = peel_callback +<<<<<<< HEAD +======= + src.examine_text = examine_text +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stick(stickering_atom, px, py) register_turf_signals(dir) @@ -45,9 +60,16 @@ /datum/component/sticker/RegisterWithParent() RegisterSignal(parent, COMSIG_LIVING_IGNITED, PROC_REF(on_ignite)) RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) +<<<<<<< HEAD /datum/component/sticker/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_LIVING_IGNITED, COMSIG_COMPONENT_CLEAN_ACT)) +======= + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + +/datum/component/sticker/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_LIVING_IGNITED, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_ATOM_EXAMINE)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Subscribes to `COMSIG_TURF_EXPOSE` if parent atom is a turf. If turf is closed - subscribes to signal /datum/component/sticker/proc/register_turf_signals(dir) @@ -116,3 +138,12 @@ if(exposed_temperature >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST) qdel(our_sticker) // which qdels us +<<<<<<< HEAD +======= + +/datum/component/sticker/proc/on_examine(atom/source, mob/user, list/examine_list) + SIGNAL_HANDLER + + if(!isnull(examine_text)) + examine_list += span_warning(examine_text) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/style/style.dm b/code/datums/components/style/style.dm index 04bb25cc2c3..77b32b6143c 100644 --- a/code/datums/components/style/style.dm +++ b/code/datums/components/style/style.dm @@ -94,14 +94,21 @@ if(multitooled) src.multitooled = multitooled +<<<<<<< HEAD ADD_TRAIT(mob_parent, TRAIT_STYLISH, REF(src)) // SKYRAT EDIT ADD - allows style meter chads to do flips +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/style/RegisterWithParent() RegisterSignal(parent, COMSIG_USER_ITEM_INTERACTION, PROC_REF(hotswap)) RegisterSignal(parent, COMSIG_MOB_MINED, PROC_REF(on_mine)) RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_take_damage)) +<<<<<<< HEAD RegisterSignal(parent, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip)) RegisterSignal(parent, COMSIG_MOB_EMOTED("spin"), PROC_REF(on_spin)) +======= + RegisterSignal(parent, COMSIG_MOB_EMOTED("taunt"), PROC_REF(on_taunt)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_MOB_ITEM_ATTACK, PROC_REF(on_attack)) RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_punch)) RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, PROC_REF(on_death)) @@ -116,7 +123,11 @@ UnregisterSignal(parent, COMSIG_USER_ITEM_INTERACTION) UnregisterSignal(parent, COMSIG_MOB_MINED) UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE) +<<<<<<< HEAD UnregisterSignal(parent, list(COMSIG_MOB_EMOTED("flip"), COMSIG_MOB_EMOTED("spin"))) +======= + UnregisterSignal(parent, COMSIG_MOB_EMOTED("taunt")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(parent, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_LIVING_UNARMED_ATTACK)) UnregisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH) UnregisterSignal(parent, COMSIG_LIVING_RESONATOR_BURST) @@ -132,7 +143,10 @@ if(mob_parent.hud_used) mob_parent.hud_used.static_inventory -= meter mob_parent.hud_used.show_hud(mob_parent.hud_used.hud_version) +<<<<<<< HEAD REMOVE_TRAIT(mob_parent, TRAIT_STYLISH, REF(src)) // SKYRAT EDIT ADD - allows style meter chads to do flips +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/component/style/process(seconds_per_tick) @@ -392,23 +406,31 @@ add_action(ACTION_GIBTONITE_DEFUSED, min(40, 20 * (10 - det_time))) // 40 to 180 points depending on speed +<<<<<<< HEAD //SKYRAT EDIT START /* /datum/component/style/proc/on_crusher_detonate(datum/source, mob/living/target, obj/item/kinetic_crusher/crusher, backstabbed) */ /datum/component/style/proc/on_crusher_detonate(datum/component/kinetic_crusher/source, mob/living/target, obj/item/kinetic_crusher/crusher, backstabbed) //SKYRAT EDIT END +======= +/datum/component/style/proc/on_crusher_detonate(datum/source, mob/living/target, obj/item/kinetic_crusher/crusher, backstabbed) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(target.stat == DEAD) return +<<<<<<< HEAD //SKYRAT EDIT START /* var/has_brimdemon_trophy = locate(/obj/item/crusher_trophy/brimdemon_fang) in crusher.trophies */ var/has_brimdemon_trophy = locate(/obj/item/crusher_trophy/brimdemon_fang) in source.stored_trophies //SKYRAT EDIT END +======= + var/has_brimdemon_trophy = locate(/obj/item/crusher_trophy/brimdemon_fang) in crusher.trophies +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_action(ACTION_MARK_DETONATED, round((backstabbed ? 60 : 30) * (ismegafauna(target) ? 1.5 : 1) * (has_brimdemon_trophy ? 1.25 : 1))) @@ -420,12 +442,17 @@ // Emote-based multipliers +<<<<<<< HEAD /datum/component/style/proc/on_flip() +======= +/datum/component/style/proc/on_taunt() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER point_multiplier = round(min(point_multiplier + 0.5, 3), 0.1) update_screen() +<<<<<<< HEAD /datum/component/style/proc/on_spin() SIGNAL_HANDLER @@ -433,6 +460,8 @@ update_screen() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Negative effects /datum/component/style/proc/on_take_damage(...) SIGNAL_HANDLER diff --git a/code/datums/components/subtype_picker.dm b/code/datums/components/subtype_picker.dm index 78401c9e022..f3460b1d2c2 100644 --- a/code/datums/components/subtype_picker.dm +++ b/code/datums/components/subtype_picker.dm @@ -87,6 +87,10 @@ return FALSE if(QDELETED(target)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.is_holding(target)) +======= + if(user.incapacitated || !user.is_holding(target)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm index d360478b8b2..f6b03a0d7d8 100644 --- a/code/datums/components/surgery_initiator.dm +++ b/code/datums/components/surgery_initiator.dm @@ -229,6 +229,7 @@ if (surgery_needs_exposure(surgery, surgery_target)) surgery_info["blocked"] = TRUE +<<<<<<< HEAD surgery_info["blocked_reason"] = "Their body is covered!" // SKYRAT EDIT ADDITION - Surgically unremovable bodyparts // SKYRAT EDIT START - Surgically unremovable bodyparts @@ -240,6 +241,8 @@ surgery_info["blocked"] = TRUE surgery_info["blocked_reason"] = "That limb cannot be surgically removed!" // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 surgeries += list(surgery_info) @@ -303,12 +306,15 @@ target.balloon_alert(user, "no wound to operate on!") return +<<<<<<< HEAD // SKYRAT EDIT START - Limbs that can't be surgically removed if (surgery.removes_target_bodypart && !isnull(affecting_limb) && !affecting_limb.can_be_surgically_removed) target.balloon_alert(user, "limb can't be surgically removed!") return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (IS_IN_INVALID_SURGICAL_POSITION(target, surgery)) target.balloon_alert(user, "patient is not lying down!") return @@ -333,9 +339,12 @@ span_notice("You drape [parent] over [target]'s [target.parse_zone_with_bodypart(selected_zone)] to prepare for \an [procedure.name]."), ) +<<<<<<< HEAD if(!(HAS_TRAIT(target, TRAIT_ANALGESIA) || target.stat >= UNCONSCIOUS)) ///skyrat add start - warning for unanesthetized surgery target.balloon_alert(user, "not numbed!") ///skyrat add end +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_combat(user, target, "operated on", null, "(OPERATION TYPE: [procedure.name]) (TARGET AREA: [selected_zone])") /datum/component/surgery_initiator/proc/surgery_needs_exposure(datum/surgery/surgery, mob/living/target) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 90735cf73e7..86489b9c949 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -74,10 +74,14 @@ if(modifiers[ALT_CLICK] || modifiers[SHIFT_CLICK] || modifiers[CTRL_CLICK] || modifiers[MIDDLE_CLICK]) return +<<<<<<< HEAD if(!modifiers[RIGHT_CLICK]) return if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated()) +======= + if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!clicked_atom || !(isturf(clicked_atom) || isturf(clicked_atom.loc))) @@ -109,7 +113,11 @@ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(checkObstacle)) playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) +<<<<<<< HEAD var/leap_word = isfeline(user) ? "pounce" : "leap" //If cat, "pounce" instead of "leap". // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(user) +======= + var/leap_word = isfelinid(user) ? "pounce" : "leap" //If cat, "pounce" instead of "leap". +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(can_see(user, clicked_atom, 7)) user.visible_message(span_warning("[user] [leap_word]s at [clicked_atom]!"), span_danger("You [leap_word] at [clicked_atom]!")) else @@ -155,7 +163,11 @@ return var/mob/living/carbon/target = hit +<<<<<<< HEAD var/tackle_word = isfeline(user) ? "pounce" : "tackle" //If cat, "pounce" instead of "tackle". // SKYRAT EDIT - FELINE TRAITS - ORIGINAL : var/tackle_word = isfelinid(user) ? "pounce" : "tackle" +======= + var/tackle_word = isfelinid(user) ? "pounce" : "tackle" //If cat, "pounce" instead of "tackle". +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/roll = rollTackle(target) tackling = FALSE diff --git a/code/datums/components/toggle_attached_clothing.dm b/code/datums/components/toggle_attached_clothing.dm index da503985169..d32f689a760 100644 --- a/code/datums/components/toggle_attached_clothing.dm +++ b/code/datums/components/toggle_attached_clothing.dm @@ -67,6 +67,10 @@ RegisterSignal(parent, COMSIG_ITEM_UI_ACTION_CLICK, PROC_REF(on_toggle_pressed)) RegisterSignal(parent, COMSIG_ITEM_UI_ACTION_SLOT_CHECKED, PROC_REF(on_action_slot_checked)) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_parent_equipped)) +<<<<<<< HEAD +======= + RegisterSignal(parent, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(remove_deployable)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_ITEM_EQUIPPED_AS_OUTFIT, PROC_REF(on_parent_equipped_outfit)) if (down_overlay_state_suffix) var/overlay_state = "[initial(clothing_parent.icon_state)][down_overlay_state_suffix]" @@ -189,6 +193,10 @@ /// Removes our deployed equipment from the wearer /datum/component/toggle_attached_clothing/proc/remove_deployable() +<<<<<<< HEAD +======= + SIGNAL_HANDLER +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unequip_deployable() if (!currently_deployed) return diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm index cf989a9b996..e70eac3edfd 100644 --- a/code/datums/components/trapdoor.dm +++ b/code/datums/components/trapdoor.dm @@ -59,11 +59,14 @@ RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, PROC_REF(on_link_requested)) else RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_trapdoor)) +<<<<<<< HEAD // SKYRAT EDIT START - Trapdoors shouldn't be targeted by SSDecay. if(isturf(parent)) var/turf/turf_parent = parent turf_parent.turf_flags &= ~CAN_DECAY_BREAK_1 // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(try_unlink)) /datum/component/trapdoor/UnregisterFromParent() diff --git a/code/datums/components/unobserved_actor.dm b/code/datums/components/unobserved_actor.dm index b46b9caebbb..a823424a594 100644 --- a/code/datums/components/unobserved_actor.dm +++ b/code/datums/components/unobserved_actor.dm @@ -99,7 +99,11 @@ // We aren't in darkness, loop for viewers. for(var/mob/living/mob_target in oview(my_turf, 7)) // They probably cannot see us if we cannot see them... can they? +<<<<<<< HEAD if(mob_target.client && !mob_target.is_blind() && !mob_target.has_unlimited_silicon_privilege && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT)) +======= + if(mob_target.client && !mob_target.is_blind() && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE for(var/obj/vehicle/sealed/mecha/mecha_mob_target in oview(my_turf, 7)) for(var/mob/mechamob_target as anything in mecha_mob_target.occupants) diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 7fb5b80a135..4e1f8db82a2 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -142,6 +142,13 @@ _clear_signal_refs() //END: ECS SHIT +<<<<<<< HEAD +======= + if(!(datum_flags & DF_STATIC_OBJECT)) + DREAMLUAU_CLEAR_REF_USERDATA(vars) // vars ceases existing when src does, so we need to clear any lua refs to it that exist. + DREAMLUAU_CLEAR_REF_USERDATA(src) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return QDEL_HINT_QUEUE ///Only override this if you know what you're doing. You do not know what you're doing diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index 3ec095feb5c..ef9d0281d1c 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -2,7 +2,11 @@ * Slightly hidden. * Lowers resistance tremendously. * Decreases stage speed tremendously. +<<<<<<< HEAD * Decreases transmittablity tremendously. +======= + * Decreases transmittability tremendously. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Fatal level * Bonus: Ignites infected mob. */ diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 90070aa15fb..005a651b7f3 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -70,7 +70,7 @@ Autophagocytosis (AKA Programmed mass cell death) Very noticable. Lowers resistance. Fast stage speed. - Decreases transmittablity. + Decreases transmittability. Fatal Level. Bonus diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index ea235af2b0e..2c765161201 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -280,7 +280,11 @@ . = ..() if(!.) return +<<<<<<< HEAD if(A.totalStageSpeed() >= 7)//SKYRAT EDIT: Brings Noc regen into line with the rest of the healing symptoms. +======= + if(A.totalStageSpeed() >= 8) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 power = 2 /datum/symptom/heal/darkness/CanHeal(datum/disease/advance/A) @@ -378,7 +382,11 @@ return power * 0.9 if(SOFT_CRIT) return power * 0.5 +<<<<<<< HEAD if(M.getBruteLoss() + M.getFireLoss() >= 103 && !active_coma) //SKYRAT EDIT: ORIGINAL: 70 - Adjusts this to remain 37.5% of total health(plus crit health). Because 70 is alot less health here then it is on tg. +======= + if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(M, span_warning("You feel yourself slip into a regenerative coma...")) active_coma = TRUE addtimer(CALLBACK(src, PROC_REF(coma), M), 6 SECONDS) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 6d972b674ad..39f4532c9e5 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(identity_block_lengths, list( )) /** +<<<<<<< HEAD * The same rules of the above also apply here, with the exception that this is for the unique_features string variable * (commonly abbreviated with uf) and its blocks. Both ui and uf have a standard block length of 3 ASCII characters. */ @@ -27,6 +28,8 @@ GLOBAL_LIST_INIT(features_block_lengths, list( /** +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Some identity blocks (basically pieces of the unique_identity string variable of the dna datum, commonly abbreviated with ui) * may have a length that differ from standard length of 3 ASCII characters. This list is necessary * for these non-standard blocks to work, as well as the entire unique identity string. @@ -75,8 +78,12 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) for(var/blocknumber in 1 to DNA_FEATURE_BLOCKS) . += total_block_len total_block_len += GET_UF_BLOCK_LEN(blocknumber) +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /////////////////////////// DNA DATUM /datum/dna ///An md5 hash of the dna holder's real name @@ -151,8 +158,12 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) destination.dna.mutation_index = mutation_index destination.dna.default_mutation_genes = default_mutation_genes if(transfer_species) +<<<<<<< HEAD //destination.set_species(species.type, icon_update=0) - ORIGINAL destination.set_species(species.type, TRUE, FALSE, features.Copy(), mutant_bodyparts.Copy(), body_markings.Copy()) //SKYRAT EDIT CHANGE - CUSTOMIZATION +======= + destination.set_species(species.type, icon_update=0) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/copy_dna(datum/dna/new_dna) new_dna.unique_enzymes = unique_enzymes @@ -162,11 +173,14 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) new_dna.unique_features = unique_features new_dna.blood_type = blood_type new_dna.features = features.Copy() +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION new_dna.mutant_bodyparts = mutant_bodyparts.Copy() new_dna.body_markings = body_markings.Copy() new_dna.update_body_size() //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //if the new DNA has a holder, transform them immediately, otherwise save it if(new_dna.holder) new_dna.holder.set_species(species.type, icon_update = 0) @@ -241,8 +255,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) for(var/blocknum in 1 to DNA_UNI_IDENTITY_BLOCKS) . += L[blocknum] || random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters) +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/code/datums/dna.dm) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/generate_unique_features() . = "" var/list/L = new /list(DNA_FEATURE_BLOCKS) @@ -280,10 +297,13 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) for(var/blocknum in 1 to DNA_FEATURE_BLOCKS) . += L[blocknum] || random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters) +<<<<<<< HEAD return data.Join() */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/generate_dna_blocks() var/bonus @@ -389,8 +409,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(DNA_FACIAL_HAIR_COLOR_GRADIENT_BLOCK) set_uni_identity_block(blocknumber, sanitize_hexcolor(H.grad_color[GRADIENT_FACIAL_HAIR_KEY], include_crunch = FALSE)) +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/code/datums/dna.dm) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/update_uf_block(blocknumber) if(!blocknumber) CRASH("UF block index is null") @@ -427,8 +450,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) set_uni_feature_block(blocknumber, construct_block(SSaccessories.caps_list.Find(features["caps"]), length(SSaccessories.caps_list))) if(DNA_POD_HAIR_BLOCK) set_uni_feature_block(blocknumber, construct_block(SSaccessories.pod_hair_list.Find(features["pod_hair"]), length(SSaccessories.pod_hair_list))) +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Please use add_mutation or activate_mutation instead /datum/dna/proc/force_give(datum/mutation/human/human_mutation) @@ -514,6 +540,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(create_mutation_blocks) //I hate this generate_dna_blocks() if(randomize_features) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - We don't really want this. We instead let get_mutant_bodyparts() handle the bodypart randomization on our end, to prevent getting any crazy cross-species features. var/static/list/all_species_protoypes if(isnull(all_species_protoypes)) @@ -528,9 +555,19 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) features = species.randomize_features() | features // SKYRAT EDIT CHANGE - Where applicable, replace features with the features generated by species/randomize_features() - Original: features["mcolor"] = "#[random_color()]" body_markings = species.get_random_body_markings(features) // SKYRAT EDIT ADDITION +======= + for(var/species_type in GLOB.species_prototypes) + var/list/new_features = GLOB.species_prototypes[species_type].randomize_features() + for(var/feature in new_features) + features[feature] = new_features[feature] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + features["mcolor"] = "#[random_color()]" +<<<<<<< HEAD mutant_bodyparts = species.get_mutant_bodyparts(features, existing_mutant_bodyparts = randomize_features ? list() : mutant_bodyparts) // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_dna_identity() /datum/dna/stored //subtype used by brain mob's stored_dna and the crew manifest @@ -564,13 +601,41 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) stored_dna.species = mrace //not calling any species update procs since we're a brain, not a monkey/human +<<<<<<< HEAD /mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE, list/override_features, list/override_mutantparts, list/override_markings) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) +======= +/mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) CRASH("You're trying to change your species post deletion, this is a recipe for madness") if(isnull(mrace)) CRASH("set_species called without a species to set to") if(!has_dna()) return +<<<<<<< HEAD +======= + + var/datum/species/new_race + if(ispath(mrace)) + new_race = new mrace + else if(istype(mrace)) + if(QDELING(mrace)) + CRASH("someone is calling set_species() and is passing it a qdeling species datum, this is VERY bad, stop it") + new_race = mrace + else + CRASH("set_species called with an invalid mrace [mrace]") + + death_sound = new_race.death_sound + + var/datum/species/old_species = dna.species + dna.species = new_race + + if (old_species.properly_gained) + old_species.on_species_loss(src, new_race, pref_load) + + dna.species.on_species_gain(src, old_species, pref_load) + log_mob_tag("TAG: [tag] SPECIES: [key_name(src)] \[[mrace]\]") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/species/new_race if(ispath(mrace)) @@ -705,8 +770,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) else gender = PLURAL +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/code/datums/dna.dm) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/updateappearance(icon_update = TRUE, mutcolor_update = FALSE, mutations_overlay_update = FALSE) ..() var/structure = dna.unique_identity @@ -749,7 +817,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(dna.features["tail_cat"]) dna.features["tail_cat"] = SSaccessories.tails_list_human[deconstruct_block(get_uni_feature_block(features, DNA_TAIL_BLOCK), length(SSaccessories.tails_list_human))] if(dna.features["tail_lizard"]) +<<<<<<< HEAD dna.features["tail_cat"] = GLOB.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), GLOB.tails_list_lizard.len)] +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dna.features["tail_lizard"] = SSaccessories.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), length(SSaccessories.tails_list_lizard))] if(dna.features["ears"]) dna.features["ears"] = SSaccessories.ears_list[deconstruct_block(get_uni_feature_block(features, DNA_EARS_BLOCK), length(SSaccessories.ears_list))] @@ -760,14 +831,19 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(dna.features["moth_antennae"]) var/genetic_value = SSaccessories.moth_antennae_list[deconstruct_block(get_uni_feature_block(features, DNA_MOTH_ANTENNAE_BLOCK), length(SSaccessories.moth_antennae_list))] dna.features["original_moth_antennae"] = genetic_value +<<<<<<< HEAD if(dna.features["moth_antennae"] != "Burnt Off") dna.features["moth_antennae"] = genetic_value +======= + dna.features["moth_antennae"] = genetic_value +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(dna.features["moth_markings"]) dna.features["moth_markings"] = SSaccessories.moth_markings_list[deconstruct_block(get_uni_feature_block(features, DNA_MOTH_MARKINGS_BLOCK), length(SSaccessories.moth_markings_list))] if(dna.features["caps"]) dna.features["caps"] = SSaccessories.caps_list[deconstruct_block(get_uni_feature_block(features, DNA_MUSHROOM_CAPS_BLOCK), length(SSaccessories.caps_list))] if(dna.features["pod_hair"]) dna.features["pod_hair"] = SSaccessories.pod_hair_list[deconstruct_block(get_uni_feature_block(features, DNA_POD_HAIR_BLOCK), length(SSaccessories.pod_hair_list))] +<<<<<<< HEAD for(var/obj/item/organ/external/external_organ in organs) @@ -778,6 +854,17 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) */ //SKYRAT EDIT REMOVAL END +======= + + for(var/obj/item/organ/organ in organs) + organ.mutate_feature(features, src) + + if(icon_update) + update_body(is_creating = mutcolor_update) + if(mutations_overlay_update) + update_mutations_overlay() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/proc/domutcheck() return @@ -886,7 +973,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(!has_dna()) CRASH("[src] does not have DNA") var/num = rand(1, DNA_UNI_IDENTITY_BLOCKS) +<<<<<<< HEAD dna.set_uni_identity_block(num, random_string(GET_UI_BLOCK_LEN(num), GLOB.hex_characters)) +======= + dna.set_uni_feature_block(num, random_string(GET_UI_BLOCK_LEN(num), GLOB.hex_characters)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 updateappearance(mutations_overlay_update=1) /mob/living/carbon/proc/random_mutate_unique_features() @@ -918,7 +1009,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(ui) for(var/blocknum in 1 to DNA_UNI_IDENTITY_BLOCKS) if(prob(probability)) +<<<<<<< HEAD M.dna.set_uni_identity_block(blocknum, random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters)) +======= + M.dna.set_uni_feature_block(blocknum, random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(uf) for(var/blocknum in 1 to DNA_FEATURE_BLOCKS) if(prob(probability)) diff --git a/code/datums/elements/can_shatter.dm b/code/datums/elements/can_shatter.dm index be7e02e25b4..507c8df6c9d 100644 --- a/code/datums/elements/can_shatter.dm +++ b/code/datums/elements/can_shatter.dm @@ -45,9 +45,16 @@ shatter(source, impacted_turf) /// Tells the parent to shatter if we are thrown and impact something +<<<<<<< HEAD /datum/element/can_shatter/proc/on_throw_impact(datum/source, atom/hit_atom) SIGNAL_HANDLER +======= +/datum/element/can_shatter/proc/on_throw_impact(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) + SIGNAL_HANDLER + if(caught) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shatter(source, hit_atom) /// Handles the actual shattering part, throwing shards of whatever is defined on the component everywhere diff --git a/code/datums/elements/crusher_loot.dm b/code/datums/elements/crusher_loot.dm index 7d53794d5b0..34dab9db01b 100644 --- a/code/datums/elements/crusher_loot.dm +++ b/code/datums/elements/crusher_loot.dm @@ -35,11 +35,15 @@ SIGNAL_HANDLER var/datum/status_effect/crusher_damage/damage = target.has_status_effect(/datum/status_effect/crusher_damage) +<<<<<<< HEAD // SKYRAT EDIT START - ASHWALKER TROPHIES var/datum/status_effect/ashwalker_damage/ashie_damage = target.has_status_effect(/datum/status_effect/ashwalker_damage) // SKYRAT EDIT ADDITION var/damage_total = damage?.total_damage + ashie_damage?.total_damage // SKYRAT EDIT ADDITION if(damage_total && prob((damage_total/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default. // SKYRAT EDIT - ORIGINAL: if(damage && prob((damage.total_damage/target.maxHealth) * drop_mod)) // SKYRAT EDIT END - ASHWALKER TROPHIES +======= + if(damage && prob((damage.total_damage/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(drop_immediately) new trophy_type(get_turf(target)) else diff --git a/code/datums/elements/firestacker.dm b/code/datums/elements/firestacker.dm index b7bad65cc6c..2bcfceb1e97 100644 --- a/code/datums/elements/firestacker.dm +++ b/code/datums/elements/firestacker.dm @@ -27,10 +27,17 @@ /datum/element/firestacker/proc/stack_on(datum/owner, mob/living/target) target.adjust_fire_stacks(amount) +<<<<<<< HEAD /datum/element/firestacker/proc/impact(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum) SIGNAL_HANDLER if(isliving(hit_atom)) +======= +/datum/element/firestacker/proc/impact(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) + SIGNAL_HANDLER + + if(!caught && isliving(hit_atom)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stack_on(source, hit_atom) /datum/element/firestacker/proc/item_attack(datum/source, atom/movable/target, mob/living/user) diff --git a/code/datums/elements/food/food_trash.dm b/code/datums/elements/food/food_trash.dm index 6df36c82c4c..a4df744cd46 100644 --- a/code/datums/elements/food/food_trash.dm +++ b/code/datums/elements/food/food_trash.dm @@ -22,11 +22,22 @@ RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(open_trash)) if(flags & FOOD_TRASH_POPABLE) RegisterSignal(target, COMSIG_FOOD_CROSSED, PROC_REF(food_crossed)) +<<<<<<< HEAD RegisterSignal(target, COMSIG_ITEM_ON_GRIND, PROC_REF(generate_trash)) RegisterSignal(target, COMSIG_ITEM_ON_JUICE, PROC_REF(generate_trash)) RegisterSignal(target, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(generate_trash)) RegisterSignal(target, COMSIG_ITEM_ON_COMPOSTED, PROC_REF(generate_trash)) RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(generate_trash)) +======= + RegisterSignals(target, list( + COMSIG_ITEM_ON_GRIND, + COMSIG_ITEM_ON_JUICE, + COMSIG_ITEM_USED_AS_INGREDIENT, + COMSIG_ITEM_ON_COMPOSTED, + COMSIG_ITEM_SOLD_TO_CUSTOMER, + COMSIG_MOVABLE_SPLAT, + ), PROC_REF(generate_trash)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/food_trash/Detach(datum/target) . = ..() @@ -38,7 +49,13 @@ COMSIG_ITEM_ON_JUICE, COMSIG_ITEM_USED_AS_INGREDIENT, COMSIG_ITEM_ON_COMPOSTED, +<<<<<<< HEAD COMSIG_ITEM_SOLD_TO_CUSTOMER,)) +======= + COMSIG_ITEM_SOLD_TO_CUSTOMER, + COMSIG_MOVABLE_SPLAT, + )) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/food_trash/proc/generate_trash(datum/source, mob/living/eater, mob/living/feeder) SIGNAL_HANDLER diff --git a/code/datums/elements/food/grilled_item.dm b/code/datums/elements/food/grilled_item.dm index de6c2ef41c1..d6dbacf7370 100644 --- a/code/datums/elements/food/grilled_item.dm +++ b/code/datums/elements/food/grilled_item.dm @@ -28,6 +28,11 @@ if(grill_time > 30 SECONDS && isnull(this_food.GetComponent(/datum/component/edible))) this_food.AddComponent(/datum/component/edible, foodtypes = FRIED) +<<<<<<< HEAD +======= + SEND_SIGNAL(this_food, COMSIG_ITEM_BARBEQUE_GRILLED) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/grilled_item/Detach(atom/source, ...) source.name = initial(source.name) source.desc = initial(source.desc) diff --git a/code/datums/elements/food/microwavable.dm b/code/datums/elements/food/microwavable.dm index 8e7305545c0..fe8f4a5c82d 100644 --- a/code/datums/elements/food/microwavable.dm +++ b/code/datums/elements/food/microwavable.dm @@ -44,6 +44,10 @@ var/efficiency = istype(used_microwave) ? used_microwave.efficiency : 1 SEND_SIGNAL(result, COMSIG_ITEM_MICROWAVE_COOKED, source, efficiency) +<<<<<<< HEAD +======= + SEND_SIGNAL(source, COMSIG_ITEM_MICROWAVE_COOKED_FROM, result, efficiency) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(IS_EDIBLE(result) && (result_typepath != default_typepath)) BLACKBOX_LOG_FOOD_MADE(result.type) diff --git a/code/datums/elements/frozen.dm b/code/datums/elements/frozen.dm index d112ef31b5f..5673dfcaf8a 100644 --- a/code/datums/elements/frozen.dm +++ b/code/datums/elements/frozen.dm @@ -28,7 +28,11 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 organ.organ_flags |= ORGAN_FROZEN RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) +<<<<<<< HEAD RegisterSignal(target, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(shatter_on_throw)) +======= + RegisterSignal(target, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(shatter_on_landed)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(shatter_on_throw)) RegisterSignal(target, COMSIG_OBJ_UNFREEZE, PROC_REF(on_unfreeze)) @@ -54,8 +58,18 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 SIGNAL_HANDLER Detach(source) +<<<<<<< HEAD ///signal handler for COMSIG_MOVABLE_POST_THROW that shatters our target after impacting after a throw /datum/element/frozen/proc/shatter_on_throw(datum/target, datum/thrownthing/throwingdatum) +======= +/datum/element/frozen/proc/shatter_on_throw(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) + SIGNAL_HANDLER + if(!caught) + shatter_on_landed(source, throwing_datum) + +///signal handler that shatters our target after impacting after a throw. +/datum/element/frozen/proc/shatter_on_landed(datum/target, datum/thrownthing/throwingdatum) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER var/obj/obj_target = target if(ismob(throwingdatum.thrower)) diff --git a/code/datums/elements/lazy_fishing_spot.dm b/code/datums/elements/lazy_fishing_spot.dm index 1ba296bfe73..a39f697bad2 100644 --- a/code/datums/elements/lazy_fishing_spot.dm +++ b/code/datums/elements/lazy_fishing_spot.dm @@ -41,6 +41,7 @@ var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration] +<<<<<<< HEAD var/has_known_fishes = FALSE for(var/reward in fish_source.fish_table) if(!ispath(reward, /obj/item/fish)) @@ -50,6 +51,9 @@ has_known_fishes = TRUE break if(!has_known_fishes) +======= + if(!fish_source.has_known_fishes()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return examine_text += span_tinynoticeital("This is a fishing spot. You can look again to list its fishes...") @@ -60,6 +64,7 @@ return var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration] +<<<<<<< HEAD var/list/known_fishes = list() for(var/reward in fish_source.fish_table) @@ -73,6 +78,9 @@ return examine_text += span_info("You can catch the following fish here: [english_list(known_fishes)].") +======= + fish_source.get_catchable_fish_names(user, source, examine_text) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/lazy_fishing_spot/proc/explosive_fishing(atom/location, severity) SIGNAL_HANDLER diff --git a/code/datums/elements/leeching_walk.dm b/code/datums/elements/leeching_walk.dm index c0afc52b245..60a495be260 100644 --- a/code/datums/elements/leeching_walk.dm +++ b/code/datums/elements/leeching_walk.dm @@ -55,3 +55,8 @@ // Heals blood loss if(source.blood_volume < BLOOD_VOLUME_NORMAL) source.blood_volume += 2.5 * seconds_per_tick +<<<<<<< HEAD +======= + // Slowly regulates your body temp + source.adjust_bodytemperature((source.get_body_temp_normal() - source.bodytemperature)/5) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/elements/loomable.dm b/code/datums/elements/loomable.dm index d02b062f668..b4266561855 100644 --- a/code/datums/elements/loomable.dm +++ b/code/datums/elements/loomable.dm @@ -73,11 +73,18 @@ /datum/element/loomable/proc/loom_me(obj/item/source, mob/living/user, atom/target) //this allows us to count the amount of times it has successfully used the stack's required amount var/spawning_amount = 0 +<<<<<<< HEAD var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/production, SKILL_SPEED_MODIFIER) //SKYRAT EDIT if(isstack(source)) var/obj/item/stack/stack_we_use = source while(stack_we_use.amount >= required_amount) if(!do_after(user, loom_time * skill_modifier, target)) //SKYRAT EDIT +======= + if(isstack(source)) + var/obj/item/stack/stack_we_use = source + while(stack_we_use.amount >= required_amount) + if(!do_after(user, loom_time, target)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 break if(!stack_we_use.use(required_amount)) @@ -85,16 +92,25 @@ break spawning_amount++ +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/production, 5) //SKYRAT EDIT else if(!do_after(user, loom_time * skill_modifier, target)) //SKYRAT EDIT +======= + + else + if(!do_after(user, loom_time, target)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.balloon_alert(user, "interrupted!") return qdel(source) spawning_amount++ +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/production, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(spawning_amount == 0) return diff --git a/code/datums/elements/lube_walking.dm b/code/datums/elements/lube_walking.dm index f85b3e995f8..934c88d2fca 100644 --- a/code/datums/elements/lube_walking.dm +++ b/code/datums/elements/lube_walking.dm @@ -47,6 +47,7 @@ if(new_resting && lubricate(snail)) snail.add_movespeed_modifier(/datum/movespeed_modifier/snail_crawl) RegisterSignal(snail, COMSIG_MOVABLE_MOVED, PROC_REF(lubricate)) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - This is to prevent snails from achieving FTL speeds without gravity, think of it like snails affixing to walls irl. ADD_TRAIT(snail, TRAIT_NEGATES_GRAVITY, TRAIT_GENERIC) snail.AddElement(/datum/element/forced_gravity, 0) @@ -60,6 +61,11 @@ REMOVE_TRAIT(snail, TRAIT_NEGATES_GRAVITY, TRAIT_GENERIC) snail.RemoveElement(/datum/element/forced_gravity, 0) //SKYRAT EDIT ADDITION END +======= + else + snail.remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl) + UnregisterSignal(snail, COMSIG_MOVABLE_MOVED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/lube_walking/proc/lubricate(atom/movable/snail) SIGNAL_HANDLER @@ -67,7 +73,11 @@ var/turf/open/turf_standing_on = get_turf(snail) if(!istype(turf_standing_on)) return FALSE +<<<<<<< HEAD turf_standing_on.MakeSlippery(TURF_WET_WATER, 1 SECONDS) //SKYRAT EDIT CHANGE: Roundstart Snails - No more lube - ORIGINAL: turf_standing_on.MakeSlippery(wet_flags, min_wet_time = min_time_wet_for) turf_standing_on.wash(CLEAN_WASH) //SKYRAT EDIT ADDITION: Roundstart Snails - Snails Keep Clean +======= + turf_standing_on.MakeSlippery(wet_flags, min_wet_time = min_time_wet_for) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/datums/elements/muffles_speech.dm b/code/datums/elements/muffles_speech.dm index 161d911bd17..4de8844c2f2 100644 --- a/code/datums/elements/muffles_speech.dm +++ b/code/datums/elements/muffles_speech.dm @@ -24,10 +24,13 @@ /datum/element/muffles_speech/proc/emote_override(mob/living/source, key, params, type_override, intentional, datum/emote/emote) SIGNAL_HANDLER +<<<<<<< HEAD // SKYRAT EDIT ADDITION: muzzle_ignore flag if(emote.muzzle_ignore) return NONE // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!emote.hands_use_check && (emote.emote_type & EMOTE_AUDIBLE)) source.audible_message("makes a [pick("strong ", "weak ", "")]noise.", audible_message_flags = EMOTE_MESSAGE|ALWAYS_SHOW_SELF_MESSAGE) return COMPONENT_CANT_EMOTE diff --git a/code/datums/elements/quality_food_ingredient.dm b/code/datums/elements/quality_food_ingredient.dm new file mode 100644 index 00000000000..e9bfec246c5 --- /dev/null +++ b/code/datums/elements/quality_food_ingredient.dm @@ -0,0 +1,71 @@ +///An element that adds extra food quality to any edible that was made from an atom with this attached. +/datum/element/quality_food_ingredient + element_flags = ELEMENT_BESPOKE + argument_hash_start_idx = 2 + ///The increase of recipe complexity (basically hardcoded food quality) of edibles made with this. + var/complexity_increase = 0 + +/datum/element/quality_food_ingredient/Attach(datum/target, complexity_increase) + . = ..() + if(!isatom(target)) + return ELEMENT_INCOMPATIBLE + if(HAS_TRAIT_FROM(target, TRAIT_QUALITY_FOOD_INGREDIENT, REF(src))) //It already has this element attached. + return + + src.complexity_increase = complexity_increase + + RegisterSignal(target, COMSIG_ATOM_USED_IN_CRAFT, PROC_REF(used_in_craft)) + RegisterSignal(target, COMSIG_ITEM_BAKED, PROC_REF(item_baked)) + RegisterSignal(target, COMSIG_ITEM_MICROWAVE_COOKED_FROM, PROC_REF(microwaved_from)) + RegisterSignal(target, COMSIG_ITEM_GRILLED, PROC_REF(item_grilled)) + RegisterSignals(target, list(COMSIG_ITEM_BARBEQUE_GRILLED, COMSIG_ITEM_FRIED), PROC_REF(simply_cooked)) + RegisterSignal(target, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(used_as_ingredient)) + +/datum/element/quality_food_ingredient/Detach(datum/source) + UnregisterSignal(source, list( + COMSIG_ATOM_USED_IN_CRAFT, + COMSIG_ITEM_BAKED, + COMSIG_ITEM_MICROWAVE_COOKED_FROM, + COMSIG_ITEM_GRILLED, + COMSIG_ITEM_BARBEQUE_GRILLED, + COMSIG_ITEM_FRIED, + COMSIG_ITEM_USED_AS_INGREDIENT, + COMSIG_FOOD_GET_EXTRA_COMPLEXITY, + )) + REMOVE_TRAIT(source, TRAIT_QUALITY_FOOD_INGREDIENT, REF(src)) + return ..() + +/datum/element/quality_food_ingredient/proc/used_in_craft(datum/source, atom/result) + SIGNAL_HANDLER + add_quality(result) + +/datum/element/quality_food_ingredient/proc/item_baked(datum/source, atom/baked_result) + SIGNAL_HANDLER + add_quality(baked_result) + +/datum/element/quality_food_ingredient/proc/microwaved_from(datum/source, atom/result) + SIGNAL_HANDLER + add_quality(result) + +/datum/element/quality_food_ingredient/proc/item_grilled(datum/source, atom/grill_result) + SIGNAL_HANDLER + add_quality(grill_result) + +/datum/element/quality_food_ingredient/proc/simply_cooked(datum/source) + SIGNAL_HANDLER + //The target of the food quality and the source are the same, there's no need to re-add the whole element. + RegisterSignal(source, COMSIG_FOOD_GET_EXTRA_COMPLEXITY, PROC_REF(add_complexity), TRUE) + ADD_TRAIT(source, TRAIT_QUALITY_FOOD_INGREDIENT, REF(src)) + +/datum/element/quality_food_ingredient/proc/used_as_ingredient(datum/source, atom/container) + SIGNAL_HANDLER + add_quality(container) + +/datum/element/quality_food_ingredient/proc/add_quality(atom/target) + target.AddElement(/datum/element/quality_food_ingredient, complexity_increase) + RegisterSignal(target, COMSIG_FOOD_GET_EXTRA_COMPLEXITY, PROC_REF(add_complexity), TRUE) + ADD_TRAIT(target, TRAIT_QUALITY_FOOD_INGREDIENT, REF(src)) + +/datum/element/quality_food_ingredient/proc/add_complexity(datum/source, list/extra_complexity) + SIGNAL_HANDLER + extra_complexity[1] += complexity_increase diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index a668fa5ba5d..680eb760c01 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -80,9 +80,12 @@ /// Should we give feedback messages? var/show_visible_message = TRUE +<<<<<<< HEAD /// Can it be silent? var/can_be_silent = FALSE //SKYRAT EDIT ADDITION - THIEVING GLOVES +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Gets the item from the given source. /datum/strippable_item/proc/get_item(atom/source) @@ -144,6 +147,7 @@ if (HAS_TRAIT(item, TRAIT_NO_STRIP)) return FALSE +<<<<<<< HEAD //SKYRAT EDIT CHANGE START - THIEVING GLOVES var/is_silent = can_be_silent && HAS_TRAIT(user, TRAIT_STICKY_FINGERS) if (!is_silent) @@ -154,13 +158,25 @@ ignored_mobs = user, ) //SKYRAT EDIT CHANGE END +======= + source.visible_message( + span_warning("[user] tries to remove [source]'s [item.name]."), + span_userdanger("[user] tries to remove your [item.name]."), + blind_message = span_hear("You hear rustling."), + ignored_mobs = user, + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_danger("You try to remove [source]'s [item.name]...")) user.log_message("is stripping [key_name(source)] of [item].", LOG_ATTACK, color="red") source.log_message("is being stripped of [item] by [key_name(user)].", LOG_VICTIM, color="orange", log_globally=FALSE) item.add_fingerprint(src) +<<<<<<< HEAD if(ishuman(source) && !is_silent) //SKYRAT EDIT ADDITION - THIEVING GLOVES ORIGINAL if(ishuman(source)) +======= + if(ishuman(source)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/victim_human = source if(victim_human.key && !victim_human.client) // AKA braindead if(victim_human.stat <= SOFT_CRIT && LAZYLEN(victim_human.afk_thefts) <= AFK_THEFT_MAX_MESSAGES) @@ -297,7 +313,11 @@ /// A utility function for `/datum/strippable_item`s to start unequipping an item from a mob. /proc/start_unequip_mob(obj/item/item, mob/source, mob/user, strip_delay, hidden = FALSE) +<<<<<<< HEAD if (!do_after(user, (strip_delay || item.strip_delay) * (HAS_TRAIT(user, TRAIT_STICKY_FINGERS) ? THIEVING_GLOVES_STRIP_SLOWDOWN : NORMAL_STRIP_SLOWDOWN), source, interaction_key = REF(item), hidden = hidden)) // SKYRAT EDIT CHANGE - ORIGINAL: if (!do_after(user, strip_delay || item.strip_delay, source, interaction_key = REF(item), hidden = hidden)) +======= + if (!do_after(user, strip_delay || item.strip_delay, source, interaction_key = REF(item), hidden = hidden)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/datums/elements/waddling.dm b/code/datums/elements/waddling.dm index e63d0329bb6..1ec712b673f 100644 --- a/code/datums/elements/waddling.dm +++ b/code/datums/elements/waddling.dm @@ -18,7 +18,11 @@ return if(isliving(moved)) var/mob/living/living_moved = moved +<<<<<<< HEAD if (living_moved.incapacitated() || living_moved.body_position == LYING_DOWN) +======= + if (living_moved.incapacitated || living_moved.body_position == LYING_DOWN) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return waddling_animation(moved) diff --git a/code/datums/elements/wheel.dm b/code/datums/elements/wheel.dm index 2bb8977ca5c..57822b68161 100644 --- a/code/datums/elements/wheel.dm +++ b/code/datums/elements/wheel.dm @@ -17,7 +17,11 @@ return if(isliving(moved)) var/mob/living/living_moved = moved +<<<<<<< HEAD if (living_moved.incapacitated() || living_moved.body_position == LYING_DOWN) +======= + if (living_moved.incapacitated || living_moved.body_position == LYING_DOWN) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/rotation_degree = (360 / 3) if(direction & SOUTHWEST) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 29b567e6f3c..06da343369e 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -102,6 +102,7 @@ var/tmp_sound = get_sound(user) if(tmp_sound && should_play_sound(user, intentional) && TIMER_COOLDOWN_FINISHED(user, type)) TIMER_COOLDOWN_START(user, type, audio_cooldown) +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN //playsound(source = user,soundin = tmp_sound,vol = 50, vary = vary, ignore_walls = sound_wall_ignore) - SKYRAT EDIT - ORIGINAL if(istype(src, /datum/emote/living/lewd)) @@ -109,11 +110,17 @@ else playsound(source = user, soundin = tmp_sound, vol = sound_volume, vary = vary, ignore_walls = sound_wall_ignore) //SKYRAT EDIT CHANGE END +======= + playsound(source = user,soundin = tmp_sound,vol = 50, vary = vary, ignore_walls = sound_wall_ignore) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/is_important = emote_type & EMOTE_IMPORTANT var/is_visual = emote_type & EMOTE_VISIBLE var/is_audible = emote_type & EMOTE_AUDIBLE +<<<<<<< HEAD var/space = should_have_space_before_emote(html_decode(msg)[1]) ? " " : "" // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Emote doesn't get printed to chat, runechat only if(emote_type & EMOTE_RUNECHAT) @@ -125,10 +132,13 @@ continue if(is_visual && viewer.is_blind()) continue +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Pref checked emotes if(!pref_check_emote(viewer)) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user.runechat_prefs_check(viewer, EMOTE_MESSAGE)) viewer.create_chat_message( speaker = user, @@ -151,10 +161,13 @@ // The emote has some important information, and should always be shown to the user else if(is_important) for(var/mob/viewer as anything in viewers(user)) +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Pref checked emotes if(!pref_check_emote(viewer)) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(viewer, "[user] [msg]") if(user.runechat_prefs_check(viewer, EMOTE_MESSAGE)) viewer.create_chat_message( @@ -170,8 +183,11 @@ deaf_message = "You see how [user] [msg]", self_message = msg, audible_message_flags = EMOTE_MESSAGE|ALWAYS_SHOW_SELF_MESSAGE, +<<<<<<< HEAD separation = space, // SKYRAT EDIT ADDITION pref_to_check = pref_to_check // SKYRAT EDIT ADDITION - Pref checked emotes +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // Emote is entirely audible, no visible component else if(is_audible) @@ -179,8 +195,11 @@ message = msg, self_message = msg, audible_message_flags = EMOTE_MESSAGE, +<<<<<<< HEAD separation = space, // SKYRAT EDIT ADDITION pref_to_check = pref_to_check // SKYRAT EDIT ADDITION - Pref checked emotes +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // Emote is entirely visible, no audible component else if(is_visual) @@ -188,12 +207,16 @@ message = msg, self_message = msg, visible_message_flags = EMOTE_MESSAGE|ALWAYS_SHOW_SELF_MESSAGE, +<<<<<<< HEAD separation = space, // SKYRAT EDIT ADDITION pref_to_check = pref_to_check // SKYRAT EDIT ADDITION - Pref checked emotes +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) else CRASH("Emote [type] has no valid emote type set!") +<<<<<<< HEAD // SKYRAT EDIT -- BEGIN -- ADDITION -- AI QOL - RELAY EMOTES OVER HOLOPADS var/obj/effect/overlay/holo_pad_hologram/hologram = GLOB.hologram_impersonators[user] if(hologram) @@ -231,17 +254,25 @@ if(!isnull(user.client)) var/dchatmsg = "[user][space][msg]" // SKYRAT EDIT - Better emotes - Original: var/dchatmsg = "[user] [msg]" +======= + if(!isnull(user.client)) + var/dchatmsg = "[user] [msg]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/ghost as anything in GLOB.dead_mob_list - viewers(get_turf(user))) if(isnull(ghost.client) || isnewplayer(ghost)) continue if(!(get_chat_toggles(ghost.client) & CHAT_GHOSTSIGHT)) continue +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Pref checked emotes if(!pref_check_emote(ghost)) continue // SKYRAT EDIT END ghost.show_message("[FOLLOW_LINK(ghost, user)] [dchatmsg]") // SKYRAT EDIT CHANGE - Indented +======= + to_chat(ghost, "[FOLLOW_LINK(ghost, user)] [dchatmsg]") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return @@ -259,12 +290,19 @@ /datum/emote/proc/check_cooldown(mob/user, intentional) if(!intentional) return TRUE +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - EMOTES - GLOBAL COOLDOWN //if(user.emotes_used && user.emotes_used[src] + cooldown > world.time) - SKYRAT EDIT - ORIGINAL if(user.nextsoundemote > world.time) var/datum/emote/default_emote = new /datum/emote if(cooldown > initial(default_emote.cooldown)) // only worry about longer-than-normal emotes to_chat(user, span_danger("You must wait another [DisplayTimeText(user.nextsoundemote - world.time)] before using that emote.")) +======= + if(user.emotes_used && user.emotes_used[src] + cooldown > world.time) + var/datum/emote/default_emote = /datum/emote + if(cooldown > initial(default_emote.cooldown)) // only worry about longer-than-normal emotes + to_chat(user, span_danger("You must wait another [DisplayTimeText(user.emotes_used[src] - world.time + cooldown)] before using that emote.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE //if(!user.emotes_used) // user.emotes_used = list() @@ -388,6 +426,7 @@ if(HAS_TRAIT(user, TRAIT_EMOTEMUTE)) return FALSE +<<<<<<< HEAD //SKYRAT EDIT BEGIN if(allowed_species && ishuman(user)) var/mob/living/carbon/human/sender = user @@ -412,6 +451,23 @@ if(emote_type & EMOTE_AUDIBLE && !hands_use_check) if(HAS_TRAIT(user, TRAIT_MUTE)) return FALSE +======= + return TRUE + +/** + * Check to see if the user should play a sound when performing the emote. + * + * Arguments: + * * user - Person that is doing the emote. + * * intentional - Bool that says whether the emote was forced (FALSE) or not (TRUE). + * + * Returns a bool about whether or not the user should play a sound when performing the emote. + */ +/datum/emote/proc/should_play_sound(mob/user, intentional = FALSE) + if(emote_type & EMOTE_AUDIBLE && !hands_use_check) + if(HAS_TRAIT(user, TRAIT_MUTE)) + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(user)) var/mob/living/carbon/human/loud_mouth = user if(HAS_MIND_TRAIT(loud_mouth, TRAIT_MIMING)) // vow of silence prevents outloud noises diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 1187a3bad70..5b6c968acda 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -1,13 +1,26 @@ /datum/ert +<<<<<<< HEAD +======= + ///Antag datum team for this type of ERT. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/team = /datum/team/ert + ///Do we open the doors to the "high-impact" weapon/explosive cabinets? Used for combat-focused ERTs. var/opendoors = TRUE + ///Alternate antag datum given to the leader of the squad. var/leader_role = /datum/antagonist/ert/commander + ///Do we humanize all spawned players or keep them the species in their current character prefs? var/enforce_human = TRUE - var/roles = list(/datum/antagonist/ert/security, /datum/antagonist/ert/medic, /datum/antagonist/ert/engineer) //List of possible roles to be assigned to ERT members. + ///A list of roles distributed to the selected candidates that are not the leader. + var/roles = list(/datum/antagonist/ert/security, /datum/antagonist/ert/medic, /datum/antagonist/ert/engineer) + ///The custom name assigned to this team, for their antag datum/roundend reporting. var/rename_team + ///Defines the color/alert code of the response team. Unused if a polldesc is defined. var/code + ///The mission given to this ERT type in their flavor text. var/mission = "Assist the station." + ///The number of players for consideration. var/teamsize = 5 + ///The "would you like to play as XXX" message used when polling for players. var/polldesc /// If TRUE, gives the team members "[role] [random last name]" style names var/random_names = TRUE @@ -15,8 +28,11 @@ var/spawn_admin = FALSE /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot var/leader_experience = TRUE +<<<<<<< HEAD ///SKYRAT EDIT: Do we want to notify the players of this ERT? var/notify_players = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A custom map template to spawn the ERT at. If this is null or use_custom_shuttle is FALSE, the ERT will spawn at Centcom. var/datum/map_template/ert_template /// If we should actually _use_ the ert_template custom shuttle @@ -129,3 +145,17 @@ mission = "Having heard the station's request for aid, assist the crew in defending themselves." polldesc = "an independent station defense militia" random_names = TRUE +<<<<<<< HEAD +======= + +/datum/ert/medical + opendoors = FALSE + teamsize = 4 + leader_role = /datum/antagonist/ert/medical_commander + enforce_human = FALSE //All the best doctors I know are moths and cats + roles = list(/datum/antagonist/ert/medical_technician) + rename_team = "EMT Squad" + code = "Violet" + mission = "Provide emergency medical services to the crew." + polldesc = "an emergency medical response team" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/greyscale/README.md b/code/datums/greyscale/README.md index 9ff6bbca1d1..6a06f98d292 100644 --- a/code/datums/greyscale/README.md +++ b/code/datums/greyscale/README.md @@ -4,7 +4,11 @@ If you're wanting to add easy recolors for your sprite then this is the system f - Multiple color layers so your sprite can be generated from more than one color. - Mixed greyscale and colored sprite layers; You can choose to only greyscale a part of the sprite or have premade filters applied to layers. +<<<<<<< HEAD - Blend modes; Instead of just putting layers of sprites on top of eachother you can use the more advanced blend modes. +======= +- Blend modes; Instead of just putting layers of sprites on top of each other you can use the more advanced blend modes. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - Reusable configurations; You can reference greyscale sprites from within the configuration of another, allowing you to have a bunch of styles with minimal additional configuration. ## Other Documents @@ -31,7 +35,11 @@ This is simply some pointers in the code linking together your dmi and the json ## Json Configuration File +<<<<<<< HEAD The json is made up of some metadata and a list of layers used while creating the sprite. Inner lists are processed as their own chunk before being applied elsewhere, this is useful when you start using more advanced blend modes. Most of the time though you're just going to want a list of icons overlaid on top of eachother. +======= +The json is made up of some metadata and a list of layers used while creating the sprite. Inner lists are processed as their own chunk before being applied elsewhere, this is useful when you start using more advanced blend modes. Most of the time though you're just going to want a list of icons overlaid on top of each other. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ```json { diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm index d549149493f..377b0031740 100644 --- a/code/datums/greyscale/_greyscale_config.dm +++ b/code/datums/greyscale/_greyscale_config.dm @@ -57,6 +57,7 @@ if(!json_config) stack_trace("Greyscale config object [DebugName()] is missing a json configuration, make sure `json_config` has been assigned a value.") string_json_config = "[json_config]" +<<<<<<< HEAD /* SKYRAT EDIT - Added recognition for the Skyrat GAGS folder - ORIGINAL: if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1) stack_trace("All greyscale json configuration files should be located within 'code/datums/greyscale/json_configs/'") @@ -65,6 +66,10 @@ if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1 && skyrat_gags_regex.Find(string_json_config) != 1) stack_trace("All greyscale json configuration files should be located within '/greyscale/json_configs/' or 'modular_skyrat/modules/GAGS/json_configs/'.") // SKYRAT EDIT END +======= + if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1) + stack_trace("All greyscale json configuration files should be located within 'code/datums/greyscale/json_configs/'") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!icon_file) stack_trace("Greyscale config object [DebugName()] is missing an icon file, make sure `icon_file` has been assigned a value.") string_icon_file = "[icon_file]" diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index 99812cfa59a..98c8e5f4bd5 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -35,23 +35,40 @@ name = "Held Sombrero Style (Held, Right)" json_config = 'code/datums/greyscale/json_configs/sombrero_base_righthand.json' +<<<<<<< HEAD /* SKYRAT EDIT START - Beret-lliant (moved to modular_skyrat/modules/berets/code/datums/config_types) /datum/greyscale_config/beret/worn name = "Beret Worn" +======= +/datum/greyscale_config/beret + name = "Beret" + icon_file = 'icons/obj/clothing/head/beret.dmi' + json_config = 'code/datums/greyscale/json_configs/beret.json' + +/datum/greyscale_config/beret/worn +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Beret (Worn)" json_config = 'code/datums/greyscale/json_configs/beret_worn.json' /datum/greyscale_config/beret_badge +<<<<<<< HEAD name = "Beret With Badge" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Badged Beret" icon_file = 'icons/obj/clothing/head/beret.dmi' json_config = 'code/datums/greyscale/json_configs/beret_badge.json' /datum/greyscale_config/beret_badge/worn +<<<<<<< HEAD name = "Beret With Badge Worn" name = "Badged Beret (Worn)" json_config = 'code/datums/greyscale/json_configs/beret_badge_worn.json' SKYRAT EDIT END */ +======= + name = "Badged Beret (Worn)" + json_config = 'code/datums/greyscale/json_configs/beret_badge_worn.json' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/greyscale_config/beanie name = "Beanie" @@ -276,6 +293,14 @@ SKYRAT EDIT END */ icon_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_inhand.json' +<<<<<<< HEAD +======= +/datum/greyscale_config/jumpsuit/worn_digi + name = "Jumpsuit Worn (Digitigrate)" + icon_file = 'icons/mob/clothing/under/digi_template.dmi' + json_config = 'code/datums/greyscale/json_configs/jumpsuit_worn_digilegs.json' + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/greyscale_config/eth_tunic name = "Ethereal Tunic" icon_file = 'icons/obj/clothing/under/ethereal.dmi' diff --git a/code/datums/greyscale/json_configs/jumpsuit_worn_digilegs.json b/code/datums/greyscale/json_configs/jumpsuit_worn_digilegs.json new file mode 100644 index 00000000000..9aa201cece3 --- /dev/null +++ b/code/datums/greyscale/json_configs/jumpsuit_worn_digilegs.json @@ -0,0 +1,10 @@ +{ + "": [ + { + "type": "icon_state", + "icon_state": "jumpsuit", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/layer.dm b/code/datums/greyscale/layer.dm index 06a001c1ad8..c76492ea31a 100644 --- a/code/datums/greyscale/layer.dm +++ b/code/datums/greyscale/layer.dm @@ -64,7 +64,11 @@ /datum/greyscale_layer/proc/CrossVerify() return +<<<<<<< HEAD /// Used to actualy create the layer using the given colors +======= +/// Used to actually create the layer using the given colors +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Do not override, use InternalGenerate instead /datum/greyscale_layer/proc/Generate(list/colors, list/render_steps, icon/new_icon) var/list/processed_colors = list() diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index c69a279938d..ec24f5592d5 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -179,7 +179,11 @@ if(QDELETED(src)) return FALSE +<<<<<<< HEAD . = !QDELETED(user) && !user.incapacitated() && !QDELETED(calling_holopad) && calling_holopad.is_operational && user.loc == calling_holopad.loc +======= + . = !QDELETED(user) && !user.incapacitated && !QDELETED(calling_holopad) && calling_holopad.is_operational && user.loc == calling_holopad.loc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(.) if(!connected_holopad) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 4537a4ada7e..9263eb54f4d 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -19,15 +19,22 @@ GLOBAL_LIST_INIT(huds, list( DATA_HUD_AI_DETECT = new /datum/atom_hud/ai_detector(), DATA_HUD_FAN = new /datum/atom_hud/data/human/fan_hud(), DATA_HUD_MALF_APC = new /datum/atom_hud/data/malf_apc(), +<<<<<<< HEAD DATA_HUD_PERMIT = new/datum/atom_hud/data/human/permit(), // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(trait_to_hud, list( TRAIT_SECURITY_HUD = DATA_HUD_SECURITY_ADVANCED, TRAIT_MEDICAL_HUD = DATA_HUD_MEDICAL_ADVANCED, TRAIT_DIAGNOSTIC_HUD = DATA_HUD_DIAGNOSTIC, +<<<<<<< HEAD TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH, // SKYRAT EDIT CHANGE TRAIT_PERMIT_HUD = DATA_HUD_PERMIT, // SKYRAT EDIT ADDITION +======= + TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /datum/atom_hud @@ -41,11 +48,19 @@ GLOBAL_LIST_INIT(trait_to_hud, list( // by z level so when they change z's we can adjust what images they see from this hud. var/list/hud_users = list() +<<<<<<< HEAD ///used for signal tracking purposes, associative list of the form: list(hud atom = TRUE) that isnt separated by z level var/list/atom/hud_atoms_all_z_levels = list() ///used for signal tracking purposes, associative list of the form: list(hud user = number of times this hud was added to this user). ///that isnt separated by z level +======= + ///used for signal tracking purposes, associative list of the form: list(hud atom = TRUE) that isn't separated by z level + var/list/atom/hud_atoms_all_z_levels = list() + + ///used for signal tracking purposes, associative list of the form: list(hud user = number of times this hud was added to this user). + ///that isn't separated by z level +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/mob/hud_users_all_z_levels = list() ///these will be the indexes for the atom's hud_list @@ -55,10 +70,17 @@ GLOBAL_LIST_INIT(trait_to_hud, list( var/list/next_time_allowed = list() ///mobs that have triggered the cooldown and are queued to see the hud, but do not yet var/list/queued_to_see = list() +<<<<<<< HEAD /// huduser = list(atoms with their hud hidden) - aka everyone hates targeted invisiblity var/list/hud_exceptions = list() ///whether or not this atom_hud type updates the global huds_by_category list. ///some subtypes cant work like this since theyre supposed to "belong" to +======= + /// huduser = list(atoms with their hud hidden) - aka everyone hates targeted invisibility + var/list/hud_exceptions = list() + ///whether or not this atom_hud type updates the global huds_by_category list. + ///some subtypes can't work like this since they're supposed to "belong" to +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///one target atom each. it will still go in the other global hud lists. var/uses_global_hud_category = TRUE @@ -177,9 +199,15 @@ GLOBAL_LIST_INIT(trait_to_hud, list( hud_users_all_z_levels[former_viewer] -= 1//decrement number of sources for this hud on this user (bad way to track i know) +<<<<<<< HEAD if (absolute || hud_users_all_z_levels[former_viewer] <= 0)//if forced or there arent any sources left, remove the user if(!hud_atoms_all_z_levels[former_viewer])//make sure we arent unregistering changes on a mob thats also a hud atom for this hud +======= + if (absolute || hud_users_all_z_levels[former_viewer] <= 0)//if forced or there aren't any sources left, remove the user + + if(!hud_atoms_all_z_levels[former_viewer])//make sure we aren't unregistering changes on a mob that's also a hud atom for this hud +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(former_viewer, COMSIG_MOVABLE_Z_CHANGED) UnregisterSignal(former_viewer, COMSIG_QDELETING) @@ -224,7 +252,11 @@ GLOBAL_LIST_INIT(trait_to_hud, list( if(!hud_atom_to_remove || !hud_atoms_all_z_levels[hud_atom_to_remove]) return FALSE +<<<<<<< HEAD //make sure we arent unregistering a hud atom thats also a hud user mob +======= + //make sure we aren't unregistering a hud atom that's also a hud user mob +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!hud_users_all_z_levels[hud_atom_to_remove]) UnregisterSignal(hud_atom_to_remove, COMSIG_MOVABLE_Z_CHANGED) UnregisterSignal(hud_atom_to_remove, COMSIG_QDELETING) @@ -280,12 +312,21 @@ GLOBAL_LIST_INIT(trait_to_hud, list( for(var/mob/hud_user as anything in get_hud_users_for_z_level(atom_turf.z)) if(!hud_user.client) continue +<<<<<<< HEAD hud_user.client.images -= hud_atom.active_hud_list[hud_category_to_remove]//by this point it shouldnt be in active_hud_list return TRUE ///when a hud atom or hud user changes z levels this makes sure it gets the images it needs and removes the images it doesnt need. ///because of how signals work we need the same proc to handle both use cases because being a hud atom and being a hud user arent mutually exclusive +======= + hud_user.client.images -= hud_atom.active_hud_list[hud_category_to_remove]//by this point it shouldn't be in active_hud_list + + return TRUE + +///when a hud atom or hud user changes z levels this makes sure it gets the images it needs and removes the images it doesn't need. +///because of how signals work we need the same proc to handle both use cases because being a hud atom and being a hud user aren't mutually exclusive +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/atom_hud/proc/on_atom_or_user_z_level_changed(atom/movable/moved_atom, turf/old_turf, turf/new_turf) SIGNAL_HANDLER if(old_turf) @@ -302,7 +343,11 @@ GLOBAL_LIST_INIT(trait_to_hud, list( if(new_turf) if(hud_users_all_z_levels[moved_atom]) +<<<<<<< HEAD hud_users[new_turf.z][moved_atom] = TRUE //hud users is associative, hud atoms isnt +======= + hud_users[new_turf.z][moved_atom] = TRUE //hud users is associative, hud atoms isn't +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_all_atoms_to_single_mob_hud(moved_atom, get_hud_atoms_for_z_level(new_turf.z)) diff --git a/code/datums/id_trim/_id_trim.dm b/code/datums/id_trim/_id_trim.dm index 067e2e38263..cd3d0a8f4a5 100644 --- a/code/datums/id_trim/_id_trim.dm +++ b/code/datums/id_trim/_id_trim.dm @@ -24,6 +24,14 @@ /// Accesses that this trim unlocks on a card that require wildcard slots to apply. If a card cannot accept all a trim's wildcard accesses, the card is incompatible with the trim. var/list/wildcard_access = list() +<<<<<<< HEAD +======= + ///If true, IDs with this trim will grant wearers with bigger arrows when pointing + var/big_pointer = FALSE + ///If set, IDs with this trim will give wearers arrows of different colors when pointing + var/pointer_color + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns the SecHUD job icon state for whatever this object's ID card is, if it has one. /obj/item/proc/get_sechud_job_icon_state() var/obj/item/card/id/id_card = GetID() diff --git a/code/datums/id_trim/admin.dm b/code/datums/id_trim/admin.dm index 9de155c9a04..eaaf2a6b51d 100644 --- a/code/datums/id_trim/admin.dm +++ b/code/datums/id_trim/admin.dm @@ -5,6 +5,11 @@ department_color = COLOR_CENTCOM_BLUE subdepartment_color = COLOR_SERVICE_LIME threat_modifier = -INFINITY +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_GREEN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/admin/New() . = ..() diff --git a/code/datums/id_trim/centcom.dm b/code/datums/id_trim/centcom.dm index 5cc24f4bd6e..a5b3505126e 100644 --- a/code/datums/id_trim/centcom.dm +++ b/code/datums/id_trim/centcom.dm @@ -7,6 +7,11 @@ department_color = COLOR_CENTCOM_BLUE subdepartment_color = COLOR_CENTCOM_BLUE threat_modifier = -10 // Centcom are legally allowed to do whatever they want +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_CENTCOM_BLUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom VIPs /datum/id_trim/centcom/vip @@ -20,6 +25,10 @@ trim_state = "trim_janitor" department_color = COLOR_CENTCOM_BLUE subdepartment_color = COLOR_SERVICE_LIME +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Thunderdome Overseers. /datum/id_trim/centcom/thunderdome_overseer @@ -35,10 +44,18 @@ /datum/id_trim/centcom/intern access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS) assignment = "CentCom Intern" +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Head Interns. Different assignment, common station access added on. /datum/id_trim/centcom/intern/head assignment = "CentCom Head Intern" +<<<<<<< HEAD +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/intern/head/New() . = ..() @@ -49,11 +66,19 @@ /datum/id_trim/centcom/bounty_hunter access = list(ACCESS_CENT_GENERAL) assignment = "Bounty Hunter" +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Bartenders. /datum/id_trim/centcom/bartender access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_BAR) assignment = JOB_CENTCOM_BARTENDER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Medical Officers. /datum/id_trim/centcom/medical_officer @@ -68,6 +93,10 @@ /// Trim for Centcom Specops Officers. All Centcom and Station Access. /datum/id_trim/centcom/specops_officer assignment = JOB_CENTCOM_SPECIAL_OFFICER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/specops_officer/New() . = ..() @@ -129,6 +158,10 @@ trim_state = "trim_securityofficer" subdepartment_color = COLOR_SECURITY_RED sechud_icon_state = SECHUD_SECURITY_RESPONSE_OFFICER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/security/New() . = ..() @@ -141,6 +174,10 @@ trim_state = "trim_stationengineer" subdepartment_color = COLOR_ENGINEERING_ORANGE sechud_icon_state = SECHUD_ENGINEERING_RESPONSE_OFFICER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/engineer/New() . = ..() @@ -153,6 +190,10 @@ trim_state = "trim_medicaldoctor" subdepartment_color = COLOR_MEDICAL_BLUE sechud_icon_state = SECHUD_MEDICAL_RESPONSE_OFFICER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/medical/New() . = ..() @@ -165,6 +206,10 @@ trim_state = "trim_chaplain" subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_RELIGIOUS_RESPONSE_OFFICER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/chaplain/New() . = ..() @@ -177,6 +222,10 @@ trim_state = "trim_ert_janitor" subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_JANITORIAL_RESPONSE_OFFICER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/janitor/New() . = ..() @@ -189,6 +238,10 @@ trim_state = "trim_clown" subdepartment_color = COLOR_MAGENTA sechud_icon_state = SECHUD_ENTERTAINMENT_RESPONSE_OFFICER +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/clown/New() . = ..() @@ -197,6 +250,14 @@ /datum/id_trim/centcom/ert/militia assignment = "Frontier Militia" +<<<<<<< HEAD /datum/id_trim/centcom/ert/militia/general assignment = "Frontier Militia General" +======= + big_pointer = FALSE + +/datum/id_trim/centcom/ert/militia/general + assignment = "Frontier Militia General" + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index b5893380fde..00d8b38ea6c 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -238,6 +238,11 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/captain +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_COMMAND_BLUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Captain gets all station accesses hardcoded in because it's the Captain. /datum/id_trim/job/captain/New() @@ -360,6 +365,11 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/chief_engineer +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_ENGINEERING_ORANGE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/chief_medical_officer assignment = JOB_CHIEF_MEDICAL_OFFICER @@ -399,6 +409,11 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/chief_medical_officer +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_MEDICAL_BLUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/clown assignment = JOB_CLOWN @@ -612,6 +627,11 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/head_of_personnel +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SERVICE_LIME +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/head_of_security assignment = JOB_HEAD_OF_SECURITY @@ -661,6 +681,11 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/head_of_security +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SECURITY_RED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/head_of_security/refresh_trim_access() . = ..() @@ -893,6 +918,11 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/quartermaster +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_CARGO_BROWN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/research_director assignment = JOB_RESEARCH_DIRECTOR @@ -941,6 +971,11 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/research_director +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SCIENCE_PINK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/roboticist assignment = JOB_ROBOTICIST @@ -1206,6 +1241,10 @@ extra_access = list() template_access = list() job = /datum/job/veteran_advisor +<<<<<<< HEAD +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/veteran_advisor/refresh_trim_access() . = ..() @@ -1275,3 +1314,8 @@ extra_access = list() template_access = list() job = /datum/job/human_ai +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_MODERATE_BLUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/id_trim/ruins.dm b/code/datums/id_trim/ruins.dm index e308287ec5c..13fd7ba0213 100644 --- a/code/datums/id_trim/ruins.dm +++ b/code/datums/id_trim/ruins.dm @@ -72,6 +72,10 @@ /datum/id_trim/centcom/corpse/commander assignment = "Commander" access = list(ACCESS_CENT_CAPTAIN, ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE) +<<<<<<< HEAD +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for various Centcom corpses. /datum/id_trim/centcom/corpse/private_security @@ -115,6 +119,10 @@ /datum/id_trim/pirate/captain assignment = "Pirate Captain" trim_state = "trim_captain" +<<<<<<< HEAD +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/pirate/silverscale assignment = "Silver Scale Member" @@ -130,6 +138,10 @@ /datum/id_trim/away/dangerous_research/head_occultist assignment = "Head Occultist" access = list(ACCESS_AWAY_SCIENCE, ACCESS_AWAY_COMMAND) +<<<<<<< HEAD +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Trims for waystation.dmm space ruin /datum/id_trim/away/waystation/cargo_technician @@ -143,6 +155,10 @@ trim_state = "trim_quartermaster" department_color = COLOR_CARGO_BROWN access = list(ACCESS_AWAY_SUPPLY, ACCESS_AWAY_COMMAND) +<<<<<<< HEAD +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/away/waystation/security assignment = "Waystation Security Officer" @@ -162,8 +178,14 @@ /datum/id_trim/away/the_outlet/mad_manager assignment = "The Mad Manager" access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MEDICAL, ACCESS_AWAY_SEC) +<<<<<<< HEAD //Haunted Trading Post IDs // +======= + big_pointer = TRUE + +//Haunted Trading Post IDs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/away/hauntedtradingpost assignment = "Donk Co. Employee" department_color = COLOR_ENGINEERING_ORANGE @@ -174,4 +196,8 @@ /datum/id_trim/away/hauntedtradingpost/boss assignment = "Donk Co. Executive" access = list(ACCESS_SYNDICATE, ACCESS_AWAY_COMMAND) +<<<<<<< HEAD // // +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/id_trim/syndicate.dm b/code/datums/id_trim/syndicate.dm index 9a3e0c5fc91..9aa6feae44e 100644 --- a/code/datums/id_trim/syndicate.dm +++ b/code/datums/id_trim/syndicate.dm @@ -7,11 +7,20 @@ sechud_icon_state = SECHUD_SYNDICATE access = list(ACCESS_SYNDICATE) threat_modifier = 5 // Bad guy on deck +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SYNDIE_RED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Syndicate mobs, outfits and corpses. /datum/id_trim/syndicom/crew assignment = "Syndicate Operative" access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS) +<<<<<<< HEAD +======= + big_pointer = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Interdyne medical Staff /datum/id_trim/syndicom/Interdyne/pharmacist @@ -19,6 +28,11 @@ trim_state = "trim_medicaldoctor" sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY) +<<<<<<< HEAD +======= + big_pointer = FALSE + pointer_color = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Interdyne head medical Staff /datum/id_trim/syndicom/Interdyne/pharmacist_director @@ -28,6 +42,11 @@ subdepartment_color = COLOR_SYNDIE_RED_HEAD sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE_HEAD access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY) +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SYNDIE_RED_HEAD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for the space IRS agents (why are they syndie access? I wouldn't worry about it.) /datum/id_trim/syndicom/irs @@ -37,11 +56,20 @@ subdepartment_color = COLOR_COMMAND_BLUE sechud_icon_state = SECHUD_DEATH_COMMANDO access = list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS) +<<<<<<< HEAD +======= + big_pointer = FALSE + pointer_color = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/syndicom/irs/auditor assignment = "Internal Revenue Service Head Auditor" trim_state = "trim_quartermaster" sechud_icon_state = SECHUD_QUARTERMASTER +<<<<<<< HEAD +======= + big_pointer = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Syndicate mobs, outfits and corpses. /datum/id_trim/syndicom/captain @@ -60,6 +88,11 @@ /datum/id_trim/battlecruiser/captain assignment = "Syndicate Battlecruiser Captain" access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SYNDIE_RED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards. /datum/id_trim/chameleon @@ -79,6 +112,11 @@ /datum/id_trim/chameleon/operative/nuke_leader assignment = "Syndicate Operative Leader" access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SYNDIE_RED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards. /datum/id_trim/chameleon/operative/clown @@ -89,3 +127,8 @@ /datum/id_trim/chameleon/operative/clown_leader assignment = "Syndicate Entertainment Operative Leader" access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) +<<<<<<< HEAD +======= + big_pointer = TRUE + pointer_color = COLOR_SYNDIE_RED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/json_database.dm b/code/datums/json_database.dm index ea3ff354b48..510be35898e 100644 --- a/code/datums/json_database.dm +++ b/code/datums/json_database.dm @@ -61,6 +61,19 @@ /datum/json_database/proc/get_key(key) return cached_data[key] +<<<<<<< HEAD +======= +/// Picks the data of a random key and then removes that key from the database. +/// Since the list is no longer inside the database, you can mutate and use it as you like. +/datum/json_database/proc/pick_and_take_key() + if(!length(cached_data)) + return null + var/key = pick(cached_data) + . = cached_data[key] + cached_data -= key + queue_save() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Sets the data at the key to the value, and queues a save. /datum/json_database/proc/set_key(key, value) cached_data[key] = value diff --git a/code/datums/keybinding/communication.dm b/code/datums/keybinding/communication.dm index 92c8f3c4984..9b120ea062c 100644 --- a/code/datums/keybinding/communication.dm +++ b/code/datums/keybinding/communication.dm @@ -15,8 +15,12 @@ return TRUE /datum/keybinding/client/communication/radio +<<<<<<< HEAD //hotkey_keys = list("Y") // ORIGINAL hotkey_keys = list(";") // SKYRAT EDIT CHANGE - CUSTOMIZATION +======= + hotkey_keys = list("Y") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = RADIO_CHANNEL full_name = "IC Radio (;)" keybind_signal = COMSIG_KB_CLIENT_RADIO_DOWN diff --git a/code/datums/keybinding/living.dm b/code/datums/keybinding/living.dm index 84e3685f5f8..046528392fd 100644 --- a/code/datums/keybinding/living.dm +++ b/code/datums/keybinding/living.dm @@ -121,7 +121,11 @@ user_mob.set_combat_mode(FALSE, silent = FALSE) /datum/keybinding/living/toggle_move_intent +<<<<<<< HEAD hotkey_keys = list("Alt") //SKYRAT EDIT CHANGE - C IS FOR COMBAT INDICATOR - ORIGINAL: hotkey_keys = list("C") +======= + hotkey_keys = list("C") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "toggle_move_intent" full_name = "Hold to toggle move intent" description = "Held down to cycle to the other move intent, release to cycle back" diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 9535bcf8576..066e668e1fe 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -34,7 +34,11 @@ "cargo" = "cargo_skyrat", "ferry" = "ferry_fancy", "whiteship" = "whiteship_meta", +<<<<<<< HEAD "emergency" = "emergency_skyrat") //SKYRAT EDIT CHANGE +======= + "emergency" = "emergency_meta") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Dictionary of job sub-typepath to template changes dictionary var/job_changes = list() diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm index 2c8be2edaa8..dffa59d0789 100644 --- a/code/datums/mapgen/CaveGenerator.dm +++ b/code/datums/mapgen/CaveGenerator.dm @@ -114,10 +114,13 @@ string_gen = rustg_cnoise_generate("[initial_closed_chance]", "[smoothing_iterations]", "[birth_limit]", "[death_limit]", "[world.maxx]", "[world.maxy]") //Generate the raw CA data for(var/turf/gen_turf as anything in turfs) //Go through all the turfs and generate them +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(istype(gen_turf, /turf/open/space/mirage)) continue //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/closed = string_gen[world.maxx * (gen_turf.y - 1) + gen_turf.x] != "0" var/turf/new_turf = pick(closed ? closed_turf_types : open_turf_types) @@ -300,7 +303,11 @@ CHECK_TICK var/message = "[name] terrain population finished in [(REALTIMEOFDAY - start_time)/10]s!" +<<<<<<< HEAD add_startup_message(message) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(world, span_boldannounce("[message]")) +======= + to_chat(world, span_boldannounce("[message]")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_world(message) diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm index 1d983582625..d1cf2c2e457 100644 --- a/code/datums/mapgen/Cavegens/IcemoonCaves.dm +++ b/code/datums/mapgen/Cavegens/IcemoonCaves.dm @@ -72,7 +72,11 @@ /datum/map_generator/cave_generator/icemoon/surface/noruins //use this for when you don't want ruins to spawn in a certain area /datum/map_generator/cave_generator/icemoon/deep +<<<<<<< HEAD weighted_closed_turf_types = list(/turf/closed/mineral/random/snow/underground = 1) // SKYRAT EDIT: Original: list(/turf/closed/mineral/random/snow = 1) +======= + weighted_closed_turf_types = list(/turf/closed/mineral/random/snow = 1) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 weighted_mob_spawn_list = list( SPAWN_MEGAFAUNA = 1, /mob/living/basic/mining/ice_demon = 100, diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm index e5dc7860b0b..27518952507 100644 --- a/code/datums/martial/_martial.dm +++ b/code/datums/martial/_martial.dm @@ -211,7 +211,11 @@ * Resets the current streak. * * Arguments +<<<<<<< HEAD * * mob/living/new_target - (Optional) The mob being attacked while the reset is occuring. +======= + * * mob/living/new_target - (Optional) The mob being attacked while the reset is occurring. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * update_icon - If TRUE, the combo display will be updated. */ /datum/martial_art/proc/reset_streak(mob/living/new_target, update_icon = TRUE) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 3465fe300a5..afb75a66484 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -232,7 +232,11 @@ /datum/martial_art/boxing/proc/check_block(mob/living/boxer, atom/movable/hitby, damage, attack_text, attack_type, ...) SIGNAL_HANDLER +<<<<<<< HEAD if(!can_use(boxer) || !boxer.throw_mode || boxer.incapacitated(IGNORE_GRAB)) +======= + if(!can_use(boxer) || !boxer.throw_mode || INCAPACITATED_IGNORING(boxer, INCAPABLE_GRAB)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE if(attack_type != UNARMED_ATTACK) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 8e33ac5a851..b2ac63a788f 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -46,7 +46,11 @@ /datum/martial_art/cqc/proc/check_block(mob/living/cqc_user, atom/movable/hitby, damage, attack_text, attack_type, ...) SIGNAL_HANDLER +<<<<<<< HEAD if(!can_use(cqc_user) || !cqc_user.throw_mode || cqc_user.incapacitated(IGNORE_GRAB)) +======= + if(!can_use(cqc_user) || !cqc_user.throw_mode || INCAPACITATED_IGNORING(cqc_user, INCAPABLE_GRAB)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE if(attack_type == PROJECTILE_ATTACK) return NONE diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index 8a73f47093b..d7820ec2df5 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -112,7 +112,10 @@ human_attacker.underwear = "Nude" human_attacker.undershirt = "Nude" human_attacker.socks = "Nude" +<<<<<<< HEAD human_attacker.bra = "Nude" // SKYRAT EDIT ADDITION - Underwear and bra split +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human_attacker.update_body() var/turf/boomspot = get_turf(user) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 83c73dda0f6..bf351efaf9a 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -184,7 +184,11 @@ /datum/martial_art/the_sleeping_carp/proc/can_deflect(mob/living/carp_user) if(!can_use(carp_user) || !carp_user.combat_mode) return FALSE +<<<<<<< HEAD if(carp_user.incapacitated(IGNORE_GRAB)) //NO STUN +======= + if(INCAPACITATED_IGNORING(carp_user, INCAPABLE_GRAB)) //NO STUN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!(carp_user.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE return FALSE diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm index b340d95e90f..1c6565a1350 100644 --- a/code/datums/materials/_material.dm +++ b/code/datums/materials/_material.dm @@ -70,7 +70,11 @@ Simple datum which is instanced once per type and is used for every object of sa /** Handles initializing the material. * +<<<<<<< HEAD * Arugments: +======= + * Arguments: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - _id: The ID the material should use. Overrides the existing ID. */ /datum/material/proc/Initialize(_id, ...) diff --git a/code/datums/memory/general_memories.dm b/code/datums/memory/general_memories.dm index b8c44c6fca8..0a5324a677d 100644 --- a/code/datums/memory/general_memories.dm +++ b/code/datums/memory/general_memories.dm @@ -162,6 +162,31 @@ "[protagonist_name] [mood_verb] as they lick off some of the pie", ) +<<<<<<< HEAD +======= +/// Witnessed someone get splashed with squid ink. +/datum/memory/witnessed_inking + story_value = STORY_VALUE_OKAY + memory_flags = MEMORY_CHECK_BLINDNESS + // Protagonist - The mob that got pied + +/datum/memory/witnessed_inking/get_names() + return list("The inking of [protagonist_name].") + +/datum/memory/witnessed_inking/get_starts() + return list( + "[protagonist_name]'s face being covered in squid ink", + "[protagonist_name] getting squid-inked", + ) + +/datum/memory/witnessed_inking/get_moods() + return list( + "[protagonist_name] [mood_verb] as ink drips off their face", + "[protagonist_name] [mood_verb] because of their now expanded laundry task.", + "[protagonist_name] [mood_verb] as they wipe the ink off their face.", + ) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Got slipped by something. /datum/memory/was_slipped story_value = STORY_VALUE_MEH diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm index dddc99c0722..0139c291f83 100644 --- a/code/datums/mind/_mind.dm +++ b/code/datums/mind/_mind.dm @@ -505,6 +505,7 @@ log_admin("[key_name(usr)] tried and failed to give [current] an uplink.") else log_admin("[key_name(usr)] gave [current] an uplink.") +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN -- EXPLOITABLES if("toggle_exploitables") has_exploitables_override = !has_exploitables_override //First we set the override to be the opposite of whatever it was apon execution, then we @@ -512,6 +513,8 @@ log_admin("[key_name(usr)] toggled [current]'s exploitables override to [(has_exploitables_override) ? "true" : "false"].") message_admins("[key_name(usr)] toggled [current]'s exploitables override to [(has_exploitables_override) ? "true" : "false"].") //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if (href_list["obj_announce"]) announce_objectives() @@ -560,12 +563,20 @@ /// Sets us to the passed job datum, then greets them to their new job. /// Use this one for when you're assigning this mind to a new job for the first time, /// or for when someone's receiving a job they'd really want to be greeted to. +<<<<<<< HEAD /datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client) +======= +/datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = set_assigned_role(new_role) if(assigned_role != new_role) return +<<<<<<< HEAD var/intro_message = new_role.get_spawn_message(alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: var/intro_message = new_role.get_spawn_message() +======= + var/intro_message = new_role.get_spawn_message() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(incoming_client && intro_message) to_chat(incoming_client, intro_message) diff --git a/code/datums/mind/antag.dm b/code/datums/mind/antag.dm index b71a5325392..80923349707 100644 --- a/code/datums/mind/antag.dm +++ b/code/datums/mind/antag.dm @@ -25,7 +25,10 @@ antag_team.add_member(src) INVOKE_ASYNC(A, TYPE_PROC_REF(/datum/antagonist, on_gain)) log_game("[key_name(src)] has gained antag datum [A.name]([A.type]).") +<<<<<<< HEAD handle_exploitables() //SKYRAT EDIT ADDITION - EXPLOITABLES MENU +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return A /datum/mind/proc/remove_antag_datum(datum_type) diff --git a/code/datums/mood.dm b/code/datums/mood.dm index cdc7074fd5f..701cffeffeb 100644 --- a/code/datums/mood.dm +++ b/code/datums/mood.dm @@ -288,6 +288,7 @@ if (SANITY_LEVEL_INSANE) mood_screen_object.color = "#f15d36" +<<<<<<< HEAD if (!conflicting_moodies.len) // theres no special icons, use the normal icon states //SKYRAT EDIT ADDITION BEGIN - ALEXITHYMIA if(HAS_TRAIT(mob_parent, TRAIT_MOOD_NOEXAMINE)) @@ -295,6 +296,9 @@ mood_screen_object.color = "#4b96c4" return //SKYRAT EDIT ADDITION END +======= + if (!conflicting_moodies.len) // there's no special icons, use the normal icon states +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mood_screen_object.icon_state = "mood[mood_level]" return @@ -337,8 +341,11 @@ /datum/mood/proc/print_mood(mob/user) var/msg = "[span_info("My current mental status:")]\n" msg += span_notice("My current sanity: ") //Long term +<<<<<<< HEAD //ORIGINAL /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(sanity) if(SANITY_GREAT to INFINITY) msg += "[span_boldnicegreen("My mind feels like a temple!")]\n" @@ -352,6 +359,7 @@ msg += "[span_warning("I'm freaking out!!")]\n" if(SANITY_INSANE to SANITY_CRAZY) msg += "[span_boldwarning("AHAHAHAHAHAHAHAHAHAH!!")]\n" +<<<<<<< HEAD */ //SKYRAT EDIT CHANGE BEGIN - ALEXITHYMIA if(!HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE)) @@ -375,6 +383,10 @@ msg += span_notice("My current mood: ") //Short term //ORIGINAL /* +======= + + msg += span_notice("My current mood: ") //Short term +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(mood_level) if(MOOD_LEVEL_SAD4) msg += "[span_boldwarning("I wish I was dead!")]\n" @@ -394,6 +406,7 @@ msg += "[span_boldnicegreen("I feel amazing!")]\n" if(MOOD_LEVEL_HAPPY4) msg += "[span_boldnicegreen("I love life!")]\n" +<<<<<<< HEAD */ //SKYRAT EDIT CHANGE BEGIN - ALEXITHYMIA / ALCOHOL_PROCESSING if(!HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE)) @@ -424,6 +437,11 @@ msg += get_drunk_mood(user) if(mood_events.len && !HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE)) // ORIGINAL - //if(mood_events.len) //SKYRAT EDIT CHANGE END +======= + + msg += "[span_notice("Moodlets:")]\n"//All moodlets + if(mood_events.len) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/category in mood_events) var/datum/mood_event/event = mood_events[category] switch(event.mood_change) diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 6ad0580e555..82cd275aef2 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -33,6 +33,11 @@ mood_change = -2 timeout = 3 MINUTES +/datum/mood_event/inked + description = "I've been splashed with squid ink. Tastes like salt." + mood_change = -3 + timeout = 3 MINUTES + /datum/mood_event/slipped description = "I slipped. I should be more careful next time..." mood_change = -2 diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 8c760e8c4f8..910057c2daa 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -351,11 +351,14 @@ mood_change = 1 timeout = 2 MINUTES +<<<<<<< HEAD /datum/mood_event/it_was_on_the_mouse description = "Heh heh. \"It's on the mouse\". What a play on words." mood_change = 1 timeout = 2 MINUTES +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/mood_event/birthday description = "It's my birthday!" mood_change = 2 diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index dc7b64089bd..7090f8911da 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -118,10 +118,13 @@ /datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/acquirer) if(!acquirer || !istype(acquirer) || acquirer.stat == DEAD || (src in acquirer.dna.mutations)) return TRUE +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(acquirer.has_borer()) to_chat(acquirer, span_warning("Something inside holds dearly to your humanity!")) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(species_allowed && !species_allowed.Find(acquirer.dna.species.id)) return TRUE if(health_req && acquirer.health < health_req) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index d9cb4aabd25..9d1268185e2 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -172,8 +172,12 @@ // This is specifically happening because they're not used to their new height and are stumbling around into machinery made for normal humans /datum/mutation/human/acromegaly/proc/head_bonk(mob/living/parent) SIGNAL_HANDLER +<<<<<<< HEAD var/turf/airlock_turf = get_turf(parent) var/atom/movable/whacked_by = locate(/obj/machinery/door/airlock) in airlock_turf || locate(/obj/machinery/door/firedoor) in airlock_turf || locate(/obj/structure/mineral_door) in airlock_turf +======= + var/atom/movable/whacked_by = (locate(/obj/machinery/door/airlock) in parent.loc) || (locate(/obj/machinery/door/firedoor) in parent.loc) || (locate(/obj/structure/mineral_door) in parent.loc) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!whacked_by || prob(100 - (8 * GET_MUTATION_SYNCHRONIZER(src)))) return to_chat(parent, span_danger("You hit your head on \the [whacked_by]'s header!")) @@ -193,12 +197,15 @@ /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner) if(..()) return +<<<<<<< HEAD // SKYRAT EDIT BEGIN if(owner.dna.features["body_size"] > 1) to_chat(owner, "You feel your body expanding even further, but it feels like your bones are expanding too much!") owner.adjustBruteLoss(25) // take some DAMAGE return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) owner.update_transform(1.25) owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink..")) @@ -206,12 +213,18 @@ /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner) if(..()) return +<<<<<<< HEAD // SKYRAT EDIT BEGIN if(owner.dna.features["body_size"] > 1) to_chat(owner, "You feel relief as your bones cease their growth spurt.") REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) return // SKYRAT EDIT END +======= + REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) + owner.update_transform(0.8) + owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow..")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Clumsiness has a very large amount of small drawbacks depending on item. /datum/mutation/human/clumsy diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index 01932fcfc9a..42bc4cdd537 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -22,6 +22,7 @@ RegisterSignal(owner, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_attack_hand)) /datum/mutation/human/chameleon/on_life(seconds_per_tick, times_fired) +<<<<<<< HEAD /// SKYRAT EDIT BEGIN if(HAS_TRAIT(owner, TRAIT_CHAMELEON_SKIN)) owner.alpha = max(owner.alpha - (12.5 * (GET_MUTATION_POWER(src)) * seconds_per_tick), 0) @@ -65,6 +66,43 @@ /datum/mutation/human/chameleon/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, list/modifiers) SIGNAL_HANDLER +======= + owner.alpha = max(owner.alpha - (12.5 * (GET_MUTATION_POWER(src)) * seconds_per_tick), 0) + +//Upgraded mutation of the base variant, used for changelings. No instability and better power_coeff +/datum/mutation/human/chameleon/changeling + instability = 0 + power_coeff = 2.5 + locked = TRUE + +/** + * Resets the alpha of the host to the chameleon default if they move. + * + * Arguments: + * - [source][/atom/movable]: The source of the signal. Presumably the host mob. + * - [old_loc][/atom]: The location the host mob used to be in. + * - move_dir: The direction the host mob moved in. + * - forced: Whether the movement was caused by a forceMove or moveToNullspace. + * - [old_locs][/list/atom]: The locations the host mob used to be in. + */ +/datum/mutation/human/chameleon/proc/on_move(atom/movable/source, atom/old_loc, move_dir, forced, list/atom/old_locs) + SIGNAL_HANDLER + + owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY + +/** + * Resets the alpha of the host if they click on something nearby. + * + * Arguments: + * - [source][/mob/living/carbon/human]: The host mob that just clicked on something. + * - [target][/atom]: The thing the host mob clicked on. + * - proximity: Whether the host mob can physically reach the thing that they clicked on. + * - [modifiers][/list]: The set of click modifiers associated with this attack chain call. + */ +/datum/mutation/human/chameleon/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, list/modifiers) + SIGNAL_HANDLER + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!proximity) //stops tk from breaking chameleon return @@ -80,6 +118,9 @@ return owner.alpha = 255 UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_UNARMED_ATTACK)) +<<<<<<< HEAD /// SKYRAT EDIT BEGIN REMOVE_TRAIT(owner, TRAIT_CHAMELEON_SKIN, GENETIC_MUTATION) /// SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 1a44c62ad8c..b627536887f 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -113,7 +113,11 @@ return if(!user.throw_mode || user.get_active_held_item() || user.zone_selected != BODY_ZONE_PRECISE_GROIN) return +<<<<<<< HEAD if(user.grab_state < GRAB_NECK || !iscarbon(user.pulling) || user.buckled || user.incapacitated()) +======= + if(user.grab_state < GRAB_NECK || !iscarbon(user.pulling) || user.buckled || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/mob/living/carbon/possible_throwable = user.pulling @@ -122,8 +126,12 @@ if(ishuman(possible_throwable)) var/mob/living/carbon/human/human_throwable = possible_throwable +<<<<<<< HEAD //if(human_throwable.wear_suit && (human_throwable.wear_suit.flags_inv & HIDEJUMPSUIT)) // ORIGINAL if(human_throwable.wear_suit && (human_throwable.wear_suit.flags_inv & HIDETAIL)) // SKYRAT EDIT CHANGE +======= + if(human_throwable.wear_suit && (human_throwable.wear_suit.flags_inv & HIDEJUMPSUIT)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You can't reach [human_throwable]'s tail through [human_throwable.p_their()] [human_throwable.wear_suit.name]!")) return @@ -167,7 +175,11 @@ * For each step of the swinging, with the delay getting shorter along the way. Checks to see we still have them in our grasp at each step. */ /datum/mutation/human/hulk/proc/swing_loop(mob/living/carbon/human/the_hulk, mob/living/carbon/yeeted_person, step, original_dir) +<<<<<<< HEAD if(!yeeted_person || !the_hulk || the_hulk.incapacitated()) +======= + if(!yeeted_person || !the_hulk || the_hulk.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(get_dist(the_hulk, yeeted_person) > 1 || !isturf(the_hulk.loc) || !isturf(yeeted_person.loc)) to_chat(the_hulk, span_warning("You lose your grasp on [yeeted_person]!")) @@ -238,7 +250,11 @@ /// Time to toss the victim at high speed /datum/mutation/human/hulk/proc/finish_swing(mob/living/carbon/human/the_hulk, mob/living/carbon/yeeted_person, original_dir) +<<<<<<< HEAD if(!yeeted_person || !the_hulk || the_hulk.incapacitated()) +======= + if(!yeeted_person || !the_hulk || the_hulk.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(get_dist(the_hulk, yeeted_person) > 1 || !isturf(the_hulk.loc) || !isturf(yeeted_person.loc)) to_chat(the_hulk, span_warning("You lose your grasp on [yeeted_person]!")) diff --git a/code/datums/mutations/reach.dm b/code/datums/mutations/reach.dm index 829ed5bded2..70060673d38 100644 --- a/code/datums/mutations/reach.dm +++ b/code/datums/mutations/reach.dm @@ -13,7 +13,12 @@ /datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut) ..() if(!(type in visual_indicators)) +<<<<<<< HEAD visual_indicators[type] = list(mutable_appearance('modular_skyrat/master_files/icons/effects/tele_effects.dmi', "telekinesishead", -MUTATIONS_LAYER)) // SKYRAT EDIT CHANGE - ORIGINAL: visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER)) +======= + visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/mutation/human/telekinesis/on_acquiring(mob/living/carbon/human/homan) . = ..() if(.) diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index 3aceb3e7d8a..4ee1de6771a 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -110,7 +110,11 @@ ///X-ray Vision lets you see through walls. /datum/mutation/human/xray name = "X Ray Vision" +<<<<<<< HEAD desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb +======= + desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, which might be fun for later //hmb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 text_gain_indication = span_notice("The walls suddenly disappear!") instability = POSITIVE_INSTABILITY_MAJOR locked = TRUE diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 9c32f5b1a9c..369f4e749b7 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -49,6 +49,16 @@ /// Type path of item to go in belt slot var/belt = null +<<<<<<< HEAD +======= + /** + * list of items that should go in the belt of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/belt_contents = null + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Type path of item to go in ears slot var/ears = null @@ -219,12 +229,15 @@ if(socks) user.socks = initial(socks.name) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Underwear and bra split if(bra) user.bra = initial(bra.name) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(accessory) var/obj/item/clothing/under/U = user.w_uniform @@ -258,6 +271,17 @@ for(var/i in 1 to number) EQUIP_OUTFIT_ITEM(path, ITEM_SLOT_BACKPACK) +<<<<<<< HEAD +======= + if(belt_contents) + for(var/path in belt_contents) + var/number = belt_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + EQUIP_OUTFIT_ITEM(path, ITEM_SLOT_BELTPACK) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 post_equip(user, visualsOnly) if(!visualsOnly) @@ -303,6 +327,7 @@ */ /datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/user) if(!istype(user)) +<<<<<<< HEAD return if(user.back) user.back.add_fingerprint(user, ignoregloves = TRUE) @@ -375,6 +400,46 @@ belt = H.belt.type return TRUE // SKYRAT EDIT END +======= + return + if(user.back) + user.back.add_fingerprint(user, ignoregloves = TRUE) + for(var/obj/item/item in user.back.contents) + item.add_fingerprint(user, ignoregloves = TRUE) + if(user.wear_id) + user.wear_id.add_fingerprint(user, ignoregloves = TRUE) + if(user.w_uniform) + user.w_uniform.add_fingerprint(user, ignoregloves = TRUE) + if(user.wear_suit) + user.wear_suit.add_fingerprint(user, ignoregloves = TRUE) + if(user.wear_mask) + user.wear_mask.add_fingerprint(user, ignoregloves = TRUE) + if(user.wear_neck) + user.wear_neck.add_fingerprint(user, ignoregloves = TRUE) + if(user.head) + user.head.add_fingerprint(user, ignoregloves = TRUE) + if(user.shoes) + user.shoes.add_fingerprint(user, ignoregloves = TRUE) + if(user.gloves) + user.gloves.add_fingerprint(user, ignoregloves = TRUE) + if(user.ears) + user.ears.add_fingerprint(user, ignoregloves = TRUE) + if(user.glasses) + user.glasses.add_fingerprint(user, ignoregloves = TRUE) + if(user.belt) + user.belt.add_fingerprint(user, ignoregloves = TRUE) + for(var/obj/item/item in user.belt.contents) + item.add_fingerprint(user, ignoregloves = TRUE) + if(user.s_store) + user.s_store.add_fingerprint(user, ignoregloves = TRUE) + if(user.l_store) + user.l_store.add_fingerprint(user, ignoregloves = TRUE) + if(user.r_store) + user.r_store.add_fingerprint(user, ignoregloves = TRUE) + for(var/obj/item/item in user.held_items) + item.add_fingerprint(user, ignoregloves = TRUE) + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Return a list of all the types that are required to disguise as this outfit type /datum/outfit/proc/get_chameleon_disguise_info() @@ -400,6 +465,16 @@ num_to_load = 1 for(var/i in 1 to num_to_load) preload += type_to_load +<<<<<<< HEAD +======= + //Load in belt gear and shit + for(var/type_to_load in belt_contents) + var/num_to_load = belt_contents[type_to_load] + if(!isnum(num_to_load)) + num_to_load = 1 + for(var/i in 1 to num_to_load) + preload += type_to_load +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 preload += belt preload += ears preload += glasses @@ -419,8 +494,11 @@ for(var/skillpath in skillchips) preload += skillpath +<<<<<<< HEAD preload -= typesof(/obj/item/clothing/under/color/random) // SKYRAT EDIT - Don't preload random jumpsuit spawners that delete themselves +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return preload /// Return a json list of this outfit @@ -448,6 +526,7 @@ .["l_hand"] = l_hand .["internals_slot"] = internals_slot .["backpack_contents"] = backpack_contents + .["belt_contents"] = belt_contents .["box"] = box .["implants"] = implants .["accessory"] = accessory @@ -475,6 +554,10 @@ l_hand = target.l_hand internals_slot = target.internals_slot backpack_contents = target.backpack_contents +<<<<<<< HEAD +======= + belt_contents = target.belt_contents +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 box = target.box implants = target.implants accessory = target.accessory @@ -518,6 +601,12 @@ var/itype = text2path(item) if(itype) backpack_contents[itype] = backpack[item] + var/list/beltpack = outfit_data["belt_contents"] + belt_contents = list() + for(var/item in beltpack) + var/itype = text2path(item) + if(itype) + belt_contents[itype] = belt[item] box = text2path(outfit_data["box"]) var/list/impl = outfit_data["implants"] implants = list() diff --git a/code/datums/pod_style.dm b/code/datums/pod_style.dm index 853d7e05878..83dd90df9f0 100644 --- a/code/datums/pod_style.dm +++ b/code/datums/pod_style.dm @@ -67,7 +67,11 @@ /datum/pod_style/missile name = "cruise missile" ui_name = "Missile" +<<<<<<< HEAD desc = "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible." +======= + desc = "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shape = POD_SHAPE_OTHER icon_state = "missile" has_door = FALSE @@ -79,7 +83,11 @@ /datum/pod_style/missile/syndicate name = "\improper Syndicate cruise missile" ui_name = "Syndie Missile" +<<<<<<< HEAD desc = "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible." +======= + desc = "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "smissile" id = "syndie_missile" diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index 4e11099989c..b5e79b888aa 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -28,7 +28,11 @@ var/abstract_parent_type = /datum/quirk /// The icon to show in the preferences menu. /// This references a tgui icon, so it can be FontAwesome or a tgfont (with a tg- prefix). +<<<<<<< HEAD var/icon = "bug" //SKYRAT EDIT CHANGE +======= + var/icon +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A lazylist of items people can receive from mail who have this quirk enabled /// The base weight for the each quirk's mail goodies list to be selected is 5 /// then the item selected is determined by pick(selected_quirk.mail_goodies) @@ -203,6 +207,7 @@ */ /mob/living/proc/get_quirk_string(medical = FALSE, category = CAT_QUIRK_ALL, from_scan = FALSE) var/list/dat = list() +<<<<<<< HEAD // SKYRAT EDIT ADDITION START // The health analyzer will first check if the target is a changeling, and if they are, load the quirks of the person they're disguising as. @@ -215,6 +220,9 @@ // SKYRAT EDIT END for(var/datum/quirk/candidate as anything in target_quirks) // SKYRAT EDIT CHANGE - ORIGINAL : for(var/datum/quirk/candidate as anything in quirks) +======= + for(var/datum/quirk/candidate as anything in quirks) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(from_scan & candidate.quirk_flags & QUIRK_HIDE_FROM_SCAN) continue switch(category) diff --git a/code/datums/quirks/_quirk_constant_data.dm b/code/datums/quirks/_quirk_constant_data.dm index 1984acecec0..2b24351a783 100644 --- a/code/datums/quirks/_quirk_constant_data.dm +++ b/code/datums/quirks/_quirk_constant_data.dm @@ -35,7 +35,11 @@ GLOBAL_LIST_INIT_TYPED(all_quirk_constant_data, /datum/quirk_constant_data, gene /datum/quirk_constant_data/New() . = ..() +<<<<<<< HEAD ASSERT(abstract_type != type && !isnull(associated_typepath), "associated_typepath null - please set it! occured on: [src.type]") +======= + ASSERT(abstract_type != type && !isnull(associated_typepath), "associated_typepath null - please set it! occurred on: [src.type]") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns a list of savefile_keys derived from the preference typepaths in [customization_options]. Used in quirks middleware to supply the preferences to render. /datum/quirk_constant_data/proc/get_customization_data() @@ -47,7 +51,11 @@ GLOBAL_LIST_INIT_TYPED(all_quirk_constant_data, /datum/quirk_constant_data, gene var/datum/preference/pref_instance = GLOB.preference_entries[pref_type] if (isnull(pref_instance)) stack_trace("get_customization_data was called before instantiation of [pref_type]!") +<<<<<<< HEAD continue // just in case its a fluke and its only this one thats not instantiated, we'll check the other pref entries +======= + continue // just in case its a fluke and its only this one that's not instantiated, we'll check the other pref entries +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 customization_data += pref_instance.savefile_key diff --git a/code/datums/quirks/negative_quirks/claustrophobia.dm b/code/datums/quirks/negative_quirks/claustrophobia.dm index bafdcd656ff..994c0135730 100644 --- a/code/datums/quirks/negative_quirks/claustrophobia.dm +++ b/code/datums/quirks/negative_quirks/claustrophobia.dm @@ -1,6 +1,10 @@ /datum/quirk/claustrophobia name = "Claustrophobia" +<<<<<<< HEAD desc = "You are terrified of small spaces. If you are placed inside any container, locker, or machinery, a panic attack sets in and you struggle to breathe." // SKYRAT EDIT CHANGE - ORIGINAL: desc = "You are terrified of small spaces and certain jolly figures. If you are placed inside any container, locker, or machinery, a panic attack sets in and you struggle to breathe." +======= + desc = "You are terrified of small spaces and certain jolly figures. If you are placed inside any container, locker, or machinery, a panic attack sets in and you struggle to breathe." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = FA_ICON_BOX_OPEN value = -4 medical_record_text = "Patient demonstrates a fear of tight spaces." @@ -20,12 +24,18 @@ var/nick_spotted = FALSE +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/living/carbon/human/possible_claus in view(5, quirk_holder)) if(evaluate_jolly_levels(possible_claus)) nick_spotted = TRUE break +<<<<<<< HEAD SKYRAT EDIT REMOVAL END */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!nick_spotted && isturf(quirk_holder.loc)) quirk_holder.clear_mood_event("claustrophobia") diff --git a/code/datums/quirks/negative_quirks/cursed.dm b/code/datums/quirks/negative_quirks/cursed.dm index 4b99ff850b8..b5738b6110a 100644 --- a/code/datums/quirks/negative_quirks/cursed.dm +++ b/code/datums/quirks/negative_quirks/cursed.dm @@ -1,5 +1,8 @@ +<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/quirk/cursed name = "Cursed" desc = "You are cursed with bad luck. You are much more likely to suffer from accidents and mishaps. When it rains, it pours." @@ -13,5 +16,8 @@ /datum/quirk/cursed/add(client/client_source) quirk_holder.AddComponent(/datum/component/omen/quirk) +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/quirks/neutral_quirks/colorist.dm b/code/datums/quirks/neutral_quirks/colorist.dm index f82fd5bf6fe..c59fe7ee081 100644 --- a/code/datums/quirks/neutral_quirks/colorist.dm +++ b/code/datums/quirks/neutral_quirks/colorist.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/quirk/item_quirk/colorist name = "Colorist" desc = "You like carrying around a hair dye spray to quickly apply color patterns to your hair." @@ -9,5 +12,8 @@ /datum/quirk/item_quirk/colorist/add_unique(client/client_source) give_item_to_holder(/obj/item/dyespray, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS)) +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/quirks/neutral_quirks/transhumanist.dm b/code/datums/quirks/neutral_quirks/transhumanist.dm index ea6494a6b32..523bd913af8 100644 --- a/code/datums/quirks/neutral_quirks/transhumanist.dm +++ b/code/datums/quirks/neutral_quirks/transhumanist.dm @@ -127,10 +127,17 @@ else if(isorgan(new_part)) var/obj/item/organ/new_organ = new_part old_part = human_holder.get_organ_slot(new_organ.slot) +<<<<<<< HEAD if(new_organ.Insert(human_holder, special = TRUE)) old_part.moveToNullspace() STOP_PROCESSING(SSobj, old_part) slot_string = new_organ.name +======= + new_organ.Insert(human_holder, special = TRUE) + old_part.moveToNullspace() + STOP_PROCESSING(SSobj, old_part) + slot_string = new_organ.name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/quirk/transhumanist/post_add() if(!slot_string) diff --git a/code/datums/quirks/positive_quirks/empath.dm b/code/datums/quirks/positive_quirks/empath.dm index 3379f8a97c4..57f10c08c9e 100644 --- a/code/datums/quirks/positive_quirks/empath.dm +++ b/code/datums/quirks/positive_quirks/empath.dm @@ -2,7 +2,11 @@ name = "Empath" desc = "Whether it's a sixth sense or careful study of body language, it only takes you a quick glance at someone to understand how they feel." icon = FA_ICON_SMILE_BEAM +<<<<<<< HEAD value = 6 // SKYRAT EDIT CHANGE - Quirk Rebalance - Original: value = 8 +======= + value = 8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mob_trait = TRAIT_EMPATH gain_text = span_notice("You feel in tune with those around you.") lose_text = span_danger("You feel isolated from others.") diff --git a/code/datums/quirks/positive_quirks/settler.dm b/code/datums/quirks/positive_quirks/settler.dm index 37eff5cb03a..b4bede4c1d3 100644 --- a/code/datums/quirks/positive_quirks/settler.dm +++ b/code/datums/quirks/positive_quirks/settler.dm @@ -25,10 +25,14 @@ /datum/quirk/item_quirk/settler/add(client/client_source) var/mob/living/carbon/human/human_quirkholder = quirk_holder +<<<<<<< HEAD //SKYRAT EDIT BEGIN - This is so Teshari don't get the height decrease. if(!isteshari(human_quirkholder)) human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST) //SKYRAT EDIT END +======= + human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human_quirkholder.add_movespeed_modifier(/datum/movespeed_modifier/settler) human_quirkholder.physiology.hunger_mod *= 0.5 //good for you, shortass, you don't get hungry nearly as often human_quirkholder.add_traits(settler_traits, QUIRK_TRAIT) diff --git a/code/datums/quirks/positive_quirks/spacer.dm b/code/datums/quirks/positive_quirks/spacer.dm index 47510703f5d..fbdcb8ae945 100644 --- a/code/datums/quirks/positive_quirks/spacer.dm +++ b/code/datums/quirks/positive_quirks/spacer.dm @@ -4,13 +4,21 @@ /datum/quirk/spacer_born name = "Spacer" desc = "You were born in space, and have never known the comfort of a planet's gravity. Your body has adapted to this. \ +<<<<<<< HEAD You are more comfortable in zero and artifical gravity and are more resistant to the effects of space, \ +======= + You are more comfortable in zero and artificial gravity and are more resistant to the effects of space, \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 but travelling to a planet's surface for an extended period of time will make you feel sick." gain_text = span_notice("You feel at home in space.") lose_text = span_danger("You feel homesick.") icon = FA_ICON_USER_ASTRONAUT value = 7 +<<<<<<< HEAD quirk_flags = QUIRK_CHANGES_APPEARANCE //SKYRAT EDIT CHANGE - ORIGINAL: quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE +======= + quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 medical_record_text = "Patient is well-adapted to non-terrestrial environments." mail_goodies = list( /obj/item/storage/pill_bottle/ondansetron, diff --git a/code/datums/quirks/positive_quirks/spiritual.dm b/code/datums/quirks/positive_quirks/spiritual.dm index b08fe8b60c6..ad4d1482da2 100644 --- a/code/datums/quirks/positive_quirks/spiritual.dm +++ b/code/datums/quirks/positive_quirks/spiritual.dm @@ -2,7 +2,11 @@ name = "Spiritual" desc = "You hold a spiritual belief, whether in God, nature or the arcane rules of the universe. You gain comfort from the presence of holy people, and believe that your prayers are more special than others. Being in the chapel makes you happy." icon = FA_ICON_BIBLE +<<<<<<< HEAD value = 2 /// SKYRAT EDIT - Quirk Rebalance - Original: value = 4 +======= + value = 4 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mob_trait = TRAIT_SPIRITUAL gain_text = span_notice("You have faith in a higher power.") lose_text = span_danger("You lose faith!") diff --git a/code/datums/records/manifest.dm b/code/datums/records/manifest.dm index ddb92ea7629..d71a26b0dc7 100644 --- a/code/datums/records/manifest.dm +++ b/code/datums/records/manifest.dm @@ -15,7 +15,11 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) if(readied_player.new_character) log_manifest(readied_player.ckey, readied_player.new_character.mind, readied_player.new_character) if(ishuman(readied_player.new_character)) +<<<<<<< HEAD inject(readied_player.new_character, readied_player.client) // SKYRAT EDIT - RP Records - ORIGINAL: inject(readied_player.new_character) +======= + inject(readied_player.new_character) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CHECK_TICK /// Gets the current manifest. @@ -98,7 +102,11 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) /// Injects a record into the manifest. +<<<<<<< HEAD /datum/manifest/proc/inject(mob/living/carbon/human/person, client/person_client) // SKYRAT EDIT - RP Records - ORIGINAL: /datum/manifest/proc/inject(mob/living/carbon/human/person) +======= +/datum/manifest/proc/inject(mob/living/carbon/human/person) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set waitfor = FALSE if(!(person.mind?.assigned_role.job_flags & JOB_CREW_MANIFEST)) return @@ -116,6 +124,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) var/datum/dna/stored/record_dna = new() person.dna.copy_dna(record_dna) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - ALTERNATIVE_JOB_TITLES // The alt job title, if user picked one, or the default var/chosen_assignment = person_client?.prefs.alt_job_titles[assignment] || assignment @@ -124,6 +133,10 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) var/datum/record/locked/lockfile = new( age = person.age, chrono_age = person.chrono_age, // SKYRAT EDIT ADDITION - Chronological age +======= + var/datum/record/locked/lockfile = new( + age = person.age, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = record_dna.blood_type, character_appearance = character_appearance, dna_string = record_dna.unique_enzymes, @@ -131,7 +144,11 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) gender = person_gender, initial_rank = assignment, name = person.real_name, +<<<<<<< HEAD rank = chosen_assignment, // SKYRAT EDIT - Alt job titles - ORIGINAL: rank = assignment, +======= + rank = assignment, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 species = record_dna.species.name, trim = assignment, // Locked specifics @@ -141,7 +158,10 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) new /datum/record/crew( age = person.age, +<<<<<<< HEAD chrono_age = person.chrono_age, // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = record_dna.blood_type, character_appearance = character_appearance, dna_string = record_dna.unique_enzymes, @@ -149,7 +169,11 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) gender = person_gender, initial_rank = assignment, name = person.real_name, +<<<<<<< HEAD rank = chosen_assignment, // SKYRAT EDIT - Alt job titles - ORIGINAL: rank = assignment, +======= + rank = assignment, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 species = record_dna.species.name, trim = assignment, // Crew specific @@ -159,6 +183,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) minor_disabilities = person.get_quirk_string(FALSE, CAT_QUIRK_MINOR_DISABILITY, from_scan = TRUE), minor_disabilities_desc = person.get_quirk_string(TRUE, CAT_QUIRK_MINOR_DISABILITY), quirk_notes = person.get_quirk_string(TRUE, CAT_QUIRK_NOTES), +<<<<<<< HEAD // SKYRAT EDIT START - RP Records background_information = person_client?.prefs.read_preference(/datum/preference/text/background) || "", exploitable_information = person_client?.prefs.read_preference(/datum/preference/text/exploitable) || "", @@ -166,6 +191,8 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) past_medical_records = person_client?.prefs.read_preference(/datum/preference/text/medical) || "", past_security_records = person_client?.prefs.read_preference(/datum/preference/text/security) || "", // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// Edits the rank and trim of the found record. diff --git a/code/datums/records/record.dm b/code/datums/records/record.dm index 7c1e6be5568..53d972b341e 100644 --- a/code/datums/records/record.dm +++ b/code/datums/records/record.dm @@ -29,7 +29,10 @@ /datum/record/New( age = 18, +<<<<<<< HEAD chrono_age = 18, // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = "?", character_appearance, dna_string = "Unknown", @@ -43,7 +46,10 @@ voice = "?????", ) src.age = age +<<<<<<< HEAD src.chrono_age = chrono_age // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 src.blood_type = blood_type src.character_appearance = character_appearance src.dna_string = dna_string @@ -91,7 +97,10 @@ /datum/record/crew/New( age = 18, +<<<<<<< HEAD chrono_age = 18, // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = "?", character_appearance, dna_string = "Unknown", @@ -111,6 +120,7 @@ physical_status = PHYSICAL_ACTIVE, mental_status = MENTAL_STABLE, quirk_notes, +<<<<<<< HEAD // SKYRAT EDIT START - RP Records background_information = "", exploitable_information = "", @@ -118,6 +128,8 @@ past_medical_records = "", past_security_records = "", // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) . = ..() src.lock_ref = lock_ref @@ -128,6 +140,7 @@ src.physical_status = physical_status src.mental_status = mental_status src.quirk_notes = quirk_notes +<<<<<<< HEAD // SKYRAT EDIT START - RP Records src.background_information = background_information src.exploitable_information = exploitable_information @@ -135,6 +148,8 @@ src.past_medical_records = past_medical_records src.past_security_records = past_security_records // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.manifest.general += src @@ -156,7 +171,10 @@ /datum/record/locked/New( age = 18, +<<<<<<< HEAD chrono_age = 18, // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = "?", character_appearance, dna_string = "Unknown", @@ -268,12 +286,16 @@ var/final_paper_text = "
SR-[print_count]: [header]

" final_paper_text += "Name: [name]
Gender: [gender]
Age: [age]
" +<<<<<<< HEAD final_paper_text += "Chronological Age: [chrono_age]
" // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(alias != name) final_paper_text += "Alias: [alias]
" final_paper_text += "Species: [species]
Fingerprint: [fingerprint]
Wanted Status: [wanted_status]

" +<<<<<<< HEAD //SKYRAT EDIT ADD - RP RECORDS if(past_general_records != "") final_paper_text += "
General Records:" @@ -287,6 +309,10 @@ final_paper_text += "
[past_security_records]
" //SKYRAT EDIT END +======= + final_paper_text += "
Security Data


" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 final_paper_text += "Crimes:
" final_paper_text += {" @@ -332,10 +358,14 @@ final_paper_text += "- [description]
" printed_paper.name = "SR-[print_count] '[name]'" +<<<<<<< HEAD /// SKYRAT EDIT ADD - TRUE printed_paper.add_raw_text(final_paper_text,TRUE) /// SKYRAT EDIT ADD END +======= + printed_paper.add_raw_text(final_paper_text) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 printed_paper.update_appearance() return printed_paper diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm index 529a4a144ca..874a9835dc0 100644 --- a/code/datums/ruins/icemoon.dm +++ b/code/datums/ruins/icemoon.dm @@ -48,6 +48,35 @@ id = "abandoned_homestead" description = "This homestead was once host to a happy homesteading family. It's now host to hungry bears." suffix = "icemoon_underground_abandoned_homestead.dmm" +<<<<<<< HEAD +======= + +/datum/map_template/ruin/icemoon/entemology + name = "Ice-Ruin Insect Research Station" + id = "bug_habitat" + description = "An independently funded research outpost, long abandoned. Their mission, to boldly go where no insect life would ever live, ever, and look for bugs." + suffix = "icemoon_surface_bughabitat.dmm" + +/datum/map_template/ruin/icemoon/pizza + name = "Ice-Ruin Moffuchi's Pizzeria" + id = "pizzeria" + description = "Moffuchi's Family Pizzeria chain has a reputation for providing affordable artisanal meals of questionable edibility. This particular pizzeria seems to have been abandoned for some time." + suffix = "icemoon_surface_pizza.dmm" + +/datum/map_template/ruin/icemoon/frozen_phonebooth + name = "Ice-Ruin Frozen Phonebooth" + id = "frozen_phonebooth" + description = "A venture by nanotrasen to help popularize the use of holopads. This one was sent to a icemoon." + suffix = "icemoon_surface_phonebooth.dmm" + +/datum/map_template/ruin/icemoon/smoking_room + name = "Ice-Ruin Smoking Room" + id = "smoking_room" + description = "Here lies Charles Morlbaro. He died the way he lived." + suffix = "icemoon_surface_smoking_room.dmm" + +// above and below ground together +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/map_template/ruin/icemoon/entemology name = "Ice-Ruin Insect Research Station" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 26981c4b176..d8e4cda86ec 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -179,7 +179,11 @@ /datum/map_template/ruin/space/spacehotel id = "spacehotel" +<<<<<<< HEAD suffix = "spacehotel_skyrat.dmm" // SKYRAT EDIT CHANGE - ORIGINAL: suffix = "spacehotel.dmm" +======= + suffix = "spacehotel.dmm" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Space-Ruin The Twin-Nexus Hotel" description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." @@ -286,6 +290,7 @@ // SKYRAT EDIT CHANGE START -- Reworked whiteship ruin /* SKYRAT EDIT CHANGE -- ORIGINAL COMMENTED OUT /datum/map_template/ruin/space/whiteshipruin_box +<<<<<<< HEAD id = "whiteshipruin_box" suffix = "whiteshipruin_box.dmm"*/ @@ -293,6 +298,10 @@ suffix = "whiteshipruin_box.dmm"*/ id = "whiteshipruin_box_skyrat" suffix = "whiteshipruin_box_skyrat.dmm" // SKYRAT EDIT CHANGE END +======= + id = "whiteshipruin_box" + suffix = "whiteshipruin_box.dmm" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Space-Ruin NT Medical Ship" description = "An ancient ship, said to be among the first discovered derelicts near Space Station 13 that was still in working order. \ Aged and deprecated by time, this relic of a vessel is now broken beyond repair." diff --git a/code/datums/shuttles/emergency.dm b/code/datums/shuttles/emergency.dm index 4c1dd016680..b8e6865511b 100644 --- a/code/datums/shuttles/emergency.dm +++ b/code/datums/shuttles/emergency.dm @@ -1,6 +1,10 @@ #define EMAG_LOCKED_SHUTTLE_COST (CARGO_CRATE_VALUE * 50) +<<<<<<< HEAD /datum/map_template/shuttle/emergency // SKYRAT EDIT OVERRIDE - OVERRIDDEN IN ADVANCED_SHUTTLES - shuttles.dm +======= +/datum/map_template/shuttle/emergency +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 port_id = "emergency" name = "Base Shuttle Template (Emergency)" ///assoc list of shuttle events to add to this shuttle on spawn (typepath = weight) @@ -130,7 +134,10 @@ credit_cost = EMAG_LOCKED_SHUTTLE_COST * 1.8 movement_force = list("KNOCKDOWN" = 3, "THROW" = 5) occupancy_limit = "70" +<<<<<<< HEAD who_can_purchase = null //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/map_template/shuttle/emergency/luxury suffix = "luxury" diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index 5f9869b7dda..c88b2a9ee53 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -34,8 +34,11 @@ * This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. */ var/color_src = MUTANT_COLOR +<<<<<<< HEAD /// Decides if this sprite has an "inner" part, such as the fleshy parts on ears. var/hasinner = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Is this part locked from roundstart selection? Used for parts that apply effects. var/locked = FALSE /// Should we center the sprite? @@ -1893,7 +1896,10 @@ /datum/sprite_accessory/ears/cat name = "Cat" icon_state = "cat" +<<<<<<< HEAD hasinner = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color_src = HAIR_COLOR /datum/sprite_accessory/ears/cat/big @@ -1920,7 +1926,10 @@ icon = 'icons/mob/human/fox_features.dmi' name = "Fox" icon_state = "fox" +<<<<<<< HEAD hasinner = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color_src = HAIR_COLOR locked = TRUE @@ -2083,10 +2092,13 @@ icon = 'icons/mob/human/species/lizard/lizard_spines.dmi' em_block = TRUE +<<<<<<< HEAD /datum/sprite_accessory/spines/none name = SPRITE_ACCESSORY_NONE icon_state = "none" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/sprite_accessory/tail_spines icon = 'icons/mob/human/species/lizard/lizard_spines.dmi' em_block = TRUE @@ -2131,6 +2143,7 @@ name = "Aquatic" icon_state = "aqua" +<<<<<<< HEAD /datum/sprite_accessory/legs //legs are a special case, they aren't actually sprite_accessories but are updated with them. icon = null //These datums exist for selecting legs on preference, and little else em_block = TRUE @@ -2141,6 +2154,8 @@ /datum/sprite_accessory/legs/digitigrade_lizard name = DIGITIGRADE_LEGS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/sprite_accessory/caps icon = 'icons/mob/human/species/mush_cap.dmi' color_src = HAIR_COLOR diff --git a/code/datums/station_alert.dm b/code/datums/station_alert.dm index 5b969afb005..ff4a00d51dd 100644 --- a/code/datums/station_alert.dm +++ b/code/datums/station_alert.dm @@ -61,7 +61,11 @@ data["alarms"] += list(nominal_category) return data +<<<<<<< HEAD /datum/station_alert/ui_act(action, params) +======= +/datum/station_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm index bae9540fa25..f4e89b6b256 100644 --- a/code/datums/station_traits/_station_trait.dm +++ b/code/datums/station_traits/_station_trait.dm @@ -92,7 +92,10 @@ GLOBAL_LIST_EMPTY(lobby_station_traits) /datum/station_trait/proc/can_display_lobby_button(client/player) return sign_up_button && !SSticker.HasRoundStarted() +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Apply any additional handling we need to our lobby button /datum/station_trait/proc/setup_lobby_button(atom/movable/screen/lobby/button/sign_up/lobby_button) SHOULD_CALL_PARENT(TRUE) @@ -117,7 +120,10 @@ GLOBAL_LIST_EMPTY(lobby_station_traits) /datum/station_trait/proc/on_lobby_button_destroyed(atom/movable/screen/lobby/button/sign_up/lobby_button) SIGNAL_HANDLER lobby_buttons -= lobby_button +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Proc ran when round starts. Use this for roundstart effects. By default we clean up our buttons here. /datum/station_trait/proc/on_round_start() diff --git a/code/datums/station_traits/job_traits.dm b/code/datums/station_traits/job_traits.dm index 4ac95ced846..0236d476004 100644 --- a/code/datums/station_traits/job_traits.dm +++ b/code/datums/station_traits/job_traits.dm @@ -29,7 +29,11 @@ SSstation.antag_restricted_roles += job_to_add::title blacklist += subtypesof(/datum/station_trait/job) - type // All but ourselves RegisterSignal(SSdcs, COMSIG_GLOB_PRE_JOBS_ASSIGNED, PROC_REF(pre_jobs_assigned)) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/job/setup_lobby_button(atom/movable/screen/lobby/button/sign_up/lobby_button) RegisterSignal(lobby_button, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_lobby_button_update_overlays)) lobby_button.desc = button_desc @@ -51,7 +55,11 @@ /datum/station_trait/job/proc/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) SIGNAL_HANDLER overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "tick" : "cross" +<<<<<<< HEAD */ +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called before we start assigning roles, assign ours first /datum/station_trait/job/proc/pre_jobs_assigned() SIGNAL_HANDLER @@ -89,11 +97,18 @@ . = ..() RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(replace_cargo)) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL /datum/station_trait/job/cargorilla/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "gorilla_on" : "gorilla_off" */ +======= +/datum/station_trait/job/cargorilla/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) + . = ..() + overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "gorilla_on" : "gorilla_off" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Remove the cargo equipment and personnel that are being replaced by a gorilla. /datum/station_trait/job/cargorilla/proc/replace_cargo(datum/source) SIGNAL_HANDLER @@ -122,11 +137,19 @@ /datum/station_trait/job/bridge_assistant/New() . = ..() RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(add_coffeemaker)) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL /datum/station_trait/job/bridge_assistant/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += "bridge_assistant" */ +======= + +/datum/station_trait/job/bridge_assistant/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) + . = ..() + overlays += "bridge_assistant" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Creates a coffeemaker in the bridge, if we don't have one yet. /datum/station_trait/job/bridge_assistant/proc/add_coffeemaker(datum/source) SIGNAL_HANDLER @@ -173,11 +196,17 @@ can_roll_antag = CAN_ROLL_PROTECTED job_to_add = /datum/job/veteran_advisor +<<<<<<< HEAD /* SKYRAT EDIT -- REMOVAL -- We handle the lobby a bit differently for time being /datum/station_trait/job/veteran_advisor/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += "veteran_advisor" */ +======= +/datum/station_trait/job/veteran_advisor/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) + . = ..() + overlays += "veteran_advisor" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/job/human_ai name = "Human AI" @@ -200,11 +229,17 @@ UnregisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE) return ..() +<<<<<<< HEAD /* SKYRAT EDIT - REMOVAL /datum/station_trait/job/human_ai/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "human_ai_on" : "human_ai_off" */ +======= +/datum/station_trait/job/human_ai/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) + . = ..() + overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "human_ai_on" : "human_ai_off" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/job/human_ai/proc/remove_ai_job(datum/source) SIGNAL_HANDLER diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 14300bedf59..39485e37380 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -507,11 +507,14 @@ var/list/shielding = list() /datum/station_trait/nebula/hostile/process(seconds_per_tick) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(!storms_enabled) get_shielding_level() // So shields still produce tritium return // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 calculate_nebula_strength() apply_nebula_effect(nebula_intensity - get_shielding_level()) @@ -577,7 +580,11 @@ threat_reduction = 30 dynamic_threat_id = "Radioactive Nebula" +<<<<<<< HEAD intensity_increment_time = 10 MINUTES // SKYRAT EDIT longer shield duration - ORIGINAL: intensity_increment_time = 5 MINUTES / +======= + intensity_increment_time = 5 MINUTES +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 maximum_nebula_intensity = 1 HOURS + 40 MINUTES nebula_layer = /atom/movable/screen/parallax_layer/random/space_gas/radioactive @@ -699,7 +706,10 @@ new /obj/effect/pod_landingzone (get_safe_random_station_turf(), new /obj/structure/closet/supplypod/centcompod (), new /obj/machinery/nebula_shielding/emergency/radiation ()) /datum/station_trait/nebula/hostile/radiation/send_instructions() +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - No more radiation storms on station +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/machinery/nebula_shielding/shielder = /obj/machinery/nebula_shielding/radiation var/obj/machinery/gravity_generator/main/innate_shielding = /obj/machinery/gravity_generator/main //How long do we have untill the first shielding unit needs to be up? @@ -718,12 +728,15 @@ You have [deadline] before the nebula enters the station. \ Every shielding unit will provide an additional [shielder_time] of protection, fully protecting the station with [max_shielders] shielding units. "} +<<<<<<< HEAD SKYRAT EDIT REMOVAL END */ // SKYRAT EDIT CHANGE START - ORIGINAL: See above var/announcement = {"Your station has been constructed inside a radioactive nebula. \ Standard spacesuits will not protect against the nebula and using them is strongly discouraged. "} // SKYRAT EDIT CHANGE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 priority_announce(announcement, sound = 'sound/misc/notice1.ogg') diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm index 4e00158df7d..18db6ef37f4 100644 --- a/code/datums/station_traits/neutral_traits.dm +++ b/code/datums/station_traits/neutral_traits.dm @@ -396,6 +396,10 @@ targets += pick_n_take(roundstart_closets) GLOB.eigenstate_manager.create_new_link(targets) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define PRO_SKUB "pro-skub" #define ANTI_SKUB "anti-skub" #define SKUB_IDFC "i don't frikkin' care" @@ -415,7 +419,10 @@ . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) +<<<<<<< HEAD /* SKYRAT EDIT -- REMOVAL -- I swear, we need to update our UI in near future to account for the new buttons and shit +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/skub/setup_lobby_button(atom/movable/screen/lobby/button/sign_up/lobby_button) RegisterSignal(lobby_button, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_lobby_button_update_overlays)) lobby_button.desc = "Are you pro-skub or anti-skub? Click to cycle through pro-skub, anti-skub, random and neutral." @@ -470,7 +477,11 @@ overlays += "neutral_skub" if(RANDOM_SKUB) overlays += "random_skub" +<<<<<<< HEAD */ +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/skub/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) SIGNAL_HANDLER @@ -479,7 +490,11 @@ return if((skub_stance == RANDOM_SKUB && prob(50)) || skub_stance == PRO_SKUB) +<<<<<<< HEAD var/obj/item/storage/box/skub/boxie = new(spawned.loc) +======= + var/obj/item/storage/box/stickers/skub/boxie = new(spawned.loc) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 spawned.equip_to_slot_if_possible(boxie, ITEM_SLOT_BACKPACK, indirect_action = TRUE) if(ishuman(spawned)) var/obj/item/clothing/suit/costume/wellworn_shirt/skub/shirt = new(spawned.loc) @@ -496,6 +511,7 @@ shirt.forceMove(boxie) /// A box containing a skub, for easier carry because skub is a bulky item. +<<<<<<< HEAD /obj/item/storage/box/skub name = "skub box" desc = "A box to store your skub and pro-skub shirt in. A label on the back reads: \"Skubtide, Stationwide\"." @@ -507,13 +523,35 @@ atom_storage.exception_hold = typecacheof(list(/obj/item/skub, /obj/item/clothing/suit/costume/wellworn_shirt/skub)) /obj/item/storage/box/skub/PopulateContents() +======= +/obj/item/storage/box/stickers/skub + name = "skub fan pack" + desc = "A vinyl pouch to store your skub and pro-skub shirt in. A label on the back reads: \"Skubtide, Stationwide\"." + icon_state = "skubpack" + illustration = "label_skub" + w_class = WEIGHT_CLASS_SMALL + +/obj/item/storage/box/stickers/skub/Initialize(mapload) + . = ..() + atom_storage.max_slots = 3 + atom_storage.exception_hold = typecacheof(list(/obj/item/skub, /obj/item/clothing/suit/costume/wellworn_shirt/skub)) + +/obj/item/storage/box/stickers/skub/PopulateContents() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/skub(src) new /obj/item/sticker/skub(src) new /obj/item/sticker/skub(src) /obj/item/storage/box/stickers/anti_skub +<<<<<<< HEAD name = "anti-skub stickers box" desc = "The enemy may have been given a skub and a shirt, but I've more stickers! Plus the box can hold my anti-skub shirt." +======= + name = "anti-skub stickers pack" + desc = "The enemy may have been given a skub and a shirt, but I've got more stickers! Plus the pack can hold my anti-skub shirt." + icon_state = "skubpack" + illustration = "label_anti_skub" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/stickers/anti_skub/Initialize(mapload) . = ..() diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index dfa4fc2ce9c..c6183c95073 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -293,6 +293,7 @@ /datum/job/shaft_miner = /obj/item/organ/internal/monster_core/rush_gland, /datum/job/station_engineer = /obj/item/organ/internal/cyberimp/arm/toolset, /datum/job/warden = /obj/item/organ/internal/cyberimp/eyes/hud/security, +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - MODULAR JOBS /datum/job/blueshield = /obj/item/organ/internal/cyberimp/brain/anti_stun, /datum/job/nanotrasen_consultant = /obj/item/organ/internal/heart/cybernetic/tier3, @@ -305,6 +306,8 @@ /datum/job/engineering_guard = /obj/item/organ/internal/cyberimp/arm/flash, /datum/job/telecomms_specialist = /obj/item/organ/internal/ears/cybernetic/xray, // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/station_trait/cybernetic_revolution/New() diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index 72f2d0c757b..51b1e003e77 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -1,11 +1,20 @@ /// The damage healed per tick while sleeping without any modifiers #define HEALING_SLEEP_DEFAULT 0.2 +<<<<<<< HEAD /// The sleep healing multipler for organ passive healing (since organs heal slowly) #define HEALING_SLEEP_ORGAN_MULTIPLIER 5 /// The sleep multipler for fitness xp conversion #define SLEEP_QUALITY_WORKOUT_MULTIPLER 10 //Largely negative status effects go here, even if they have small benificial effects +======= +/// The sleep healing multiplier for organ passive healing (since organs heal slowly) +#define HEALING_SLEEP_ORGAN_MULTIPLIER 5 +/// The sleep multiplier for fitness xp conversion +#define SLEEP_QUALITY_WORKOUT_MULTIPLER 10 + +//Largely negative status effects go here, even if they have small beneficial effects +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //STUN EFFECTS /datum/status_effect/incapacitating tick_interval = -1 @@ -280,8 +289,12 @@ . = ..() if(!.) return +<<<<<<< HEAD owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS, TRAIT_ANALGESIA), TRAIT_STATUS_EFFECT(id)) // SKYRAT EDIT CHANGE - ORIGINAL: owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) owner.throw_alert("stasis numbed", /atom/movable/screen/alert/numbed) //SKYRAT EDIT ADDITION - STASIS APPLIES NUMBED +======= + owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.add_filter("stasis_status_ripple", 2, list("type" = "ripple", "flags" = WAVE_BOUNDED, "radius" = 0, "size" = 2)) var/filter = owner.get_filter("stasis_status_ripple") animate(filter, radius = 0, time = 0.2 SECONDS, size = 2, easing = JUMP_EASING, loop = -1, flags = ANIMATION_PARALLEL) @@ -292,12 +305,18 @@ /datum/status_effect/grouped/stasis/tick(seconds_between_ticks) update_time_of_death() +<<<<<<< HEAD if(owner.stat >= UNCONSCIOUS) //SKYRAT EDIT START - STASIS KEEPS SLEEP GOING owner.Sleeping(15 SECONDS) //SKYRAT EDIT END /datum/status_effect/grouped/stasis/on_remove() owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS, TRAIT_ANALGESIA), TRAIT_STATUS_EFFECT(id)) // SKYRAT EDIT CHANGE - ORIGINAL: owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) owner.clear_alert("stasis numbed") //SKYRAT EDIT ADDITION - STASIS APPLIED NUMBED +======= + +/datum/status_effect/grouped/stasis/on_remove() + owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.remove_filter("stasis_status_ripple") update_time_of_death() if(iscarbon(owner)) @@ -340,13 +359,20 @@ /datum/status_effect/cultghost/on_apply() owner.set_invis_see(SEE_INVISIBLE_OBSERVER) +<<<<<<< HEAD +======= + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/cultghost/tick(seconds_between_ticks) if(owner.reagents) owner.reagents.del_reagent(/datum/reagent/water/holywater) //can't be deconverted +<<<<<<< HEAD //SKYRAT EDIT START - OVERRIDEN IN MODULAR /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/crusher_mark id = "crusher_mark" duration = 300 //if you leave for 30 seconds you lose the mark, deal with it @@ -360,7 +386,11 @@ boosted = was_boosted /datum/status_effect/crusher_mark/on_apply() +<<<<<<< HEAD if(owner.mob_size >= MOB_SIZE_LARGE && !HAS_TRAIT(owner, TRAIT_OVERSIZED)) // SKYRAT EDIT CHANGE - Original: if(owner.mob_size >= MOB_SIZE_LARGE) +======= + if(owner.mob_size >= MOB_SIZE_LARGE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 marked_underlay = mutable_appearance('icons/effects/effects.dmi', boosted ? "shield" : "shield2") marked_underlay.pixel_x = -owner.pixel_x marked_underlay.pixel_y = -owner.pixel_y @@ -374,9 +404,12 @@ QDEL_NULL(marked_underlay) return ..() +<<<<<<< HEAD */ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/stacking/saw_bleed id = "saw_bleed" tick_interval = 0.6 SECONDS @@ -614,7 +647,11 @@ alert_type = null /datum/status_effect/spasms/tick(seconds_between_ticks) +<<<<<<< HEAD if(owner.stat >= UNCONSCIOUS || owner.incapacitated() || HAS_TRAIT(owner, TRAIT_HANDS_BLOCKED) || HAS_TRAIT(owner, TRAIT_IMMOBILIZED)) +======= + if(owner.stat >= UNCONSCIOUS || owner.incapacitated || HAS_TRAIT(owner, TRAIT_HANDS_BLOCKED) || HAS_TRAIT(owner, TRAIT_IMMOBILIZED)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!prob(15)) return @@ -740,7 +777,11 @@ status_type = STATUS_EFFECT_REPLACE tick_interval = 0.2 SECONDS alert_type = null +<<<<<<< HEAD var/msg_stage = 0//so you dont get the most intense messages immediately +======= + var/msg_stage = 0//so you don't get the most intense messages immediately +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/fake_virus/on_apply() if(HAS_TRAIT(owner, TRAIT_VIRUSIMMUNE)) diff --git a/code/datums/status_effects/debuffs/drunk.dm b/code/datums/status_effects/debuffs/drunk.dm index 31a15c6a70b..f918f747668 100644 --- a/code/datums/status_effects/debuffs/drunk.dm +++ b/code/datums/status_effects/debuffs/drunk.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - ALCOHOL_PROCESSING // Defines for the ballmer peak. #define BALLMER_PEAK_LOW_END 25.8 // Original 12.9 @@ -7,6 +8,15 @@ /// The threshld which determine if someone is tipsy vs drunk #define TIPSY_THRESHOLD 23.4 // Original 6 // SKYRAT EDIT CHANGE END - ALCOHOL_PROCESSING +======= +// Defines for the ballmer peak. +#define BALLMER_PEAK_LOW_END 12.9 +#define BALLMER_PEAK_HIGH_END 13.8 +#define BALLMER_PEAK_WINDOWS_ME 26 + +/// The threshld which determine if someone is tipsy vs drunk +#define TIPSY_THRESHOLD 6 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * The drunk status effect. @@ -71,7 +81,11 @@ // Every tick, the drunk value decrases by // 4% the current drunk_value + 0.01 // (until it reaches 0 and terminates) +<<<<<<< HEAD set_drunk_value(drunk_value - (drunk_value * 0.0015)) // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: set_drunk_value(drunk_value - (0.01 + drunk_value * 0.04) +======= + set_drunk_value(drunk_value - (0.01 + drunk_value * 0.04)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) return @@ -146,8 +160,11 @@ if(drunk_value > BALLMER_PEAK_WINDOWS_ME) // by this point you're into windows ME territory owner.say(pick_list_replacements(VISTA_FILE, "ballmer_windows_me_msg"), forced = "ballmer") +<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - ALCOHOL_PROCESSING /* ORIGINAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Drunk slurring scales in intensity based on how drunk we are -at 16 you will likely not even notice it, // but when we start to scale up you definitely will if(drunk_value >= 16) @@ -175,6 +192,7 @@ // Over 71, we will constantly have blurry eyes if(drunk_value >= 71) owner.set_eye_blur_if_lower((drunk_value * 2 SECONDS) - 140 SECONDS) +<<<<<<< HEAD */ // And drunk people will always lose jitteriness @@ -205,23 +223,39 @@ // Over 81, we will gain constant toxloss if(drunk_value >= 83.4) +======= + + // Over 81, we will gain constant toxloss + if(drunk_value >= 81) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.adjustToxLoss(1) if(owner.stat == CONSCIOUS && prob(5)) to_chat(owner, span_warning("Maybe you should lie down for a bit...")) // Over 91, we gain even more toxloss, brain damage, and have a chance of dropping into a long sleep +<<<<<<< HEAD if(drunk_value >= 93.4) +======= + if(drunk_value >= 91) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.adjustToxLoss(1) owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.4) if(owner.stat == CONSCIOUS) attempt_to_blackout() // And finally, over 100 - let's be honest, you shouldn't be alive by now. +<<<<<<< HEAD if(drunk_value >= 103.4) owner.adjustToxLoss(2) /datum/status_effect/inebriated/drunk/proc/attempt_to_blackout() /* SKYRAT EDIT REMOVAL - Blackout drunk begone +======= + if(drunk_value >= 101) + owner.adjustToxLoss(2) + +/datum/status_effect/inebriated/drunk/proc/attempt_to_blackout() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/drunkard = owner if(drunkard.has_trauma_type(/datum/brain_trauma/severe/split_personality/blackout))// prevent ping spamming if(prob(10)) @@ -231,7 +265,10 @@ if(drunkard.gain_trauma(/datum/brain_trauma/severe/split_personality/blackout, TRAUMA_LIMIT_ABSOLUTE)) drunk_value -= 70 //So that the drunk personality can spice things up without being killed by liver failure return +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && is_station_level(owner.z))// Don't put us in a deep sleep if the shuttle's here. QoL, mainly. to_chat(owner, span_warning("You're so tired... but you can't miss that shuttle...")) else diff --git a/code/datums/status_effects/debuffs/slime/slime_leech.dm b/code/datums/status_effects/debuffs/slime/slime_leech.dm index 49bd0f7b82c..21eb241a61c 100644 --- a/code/datums/status_effects/debuffs/slime/slime_leech.dm +++ b/code/datums/status_effects/debuffs/slime/slime_leech.dm @@ -66,7 +66,11 @@ if(need_mob_update) owner.updatehealth() +<<<<<<< HEAD if(totaldamage >= 0) // AdjustBruteLoss returns a negative value on succesful damage adjustment +======= + if(totaldamage >= 0) // AdjustBruteLoss returns a negative value on successful damage adjustment +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_slime.balloon_alert(our_slime, "not food!") our_slime.stop_feeding() return diff --git a/code/datums/status_effects/debuffs/stamcrit.dm b/code/datums/status_effects/debuffs/stamcrit.dm index 0edd589ab9c..07ea19cc91a 100644 --- a/code/datums/status_effects/debuffs/stamcrit.dm +++ b/code/datums/status_effects/debuffs/stamcrit.dm @@ -15,7 +15,11 @@ // This should be in on apply but we need it to happen AFTER being added to the mob // (Because we need to wait until the status effect is in their status effect list, or we'll add two) +<<<<<<< HEAD if(owner.getStaminaLoss() < 162) // SKYRAT EDIT CHANGE +======= + if(owner.getStaminaLoss() < 120) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. owner.adjustStaminaLoss(30, FALSE) diff --git a/code/datums/status_effects/debuffs/strandling.dm b/code/datums/status_effects/debuffs/strandling.dm index 6050a3df304..b9c06a73de1 100644 --- a/code/datums/status_effects/debuffs/strandling.dm +++ b/code/datums/status_effects/debuffs/strandling.dm @@ -57,7 +57,11 @@ * tool - the tool the user's using to remove the strange. Can be null. */ /datum/status_effect/strandling/proc/try_remove_effect(mob/user, obj/item/tool) +<<<<<<< HEAD if(user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) +======= + if(user.incapacitated || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return user.visible_message( diff --git a/code/datums/status_effects/drug_effects.dm b/code/datums/status_effects/drug_effects.dm index 1d37c8f0e43..b0d47abec30 100644 --- a/code/datums/status_effects/drug_effects.dm +++ b/code/datums/status_effects/drug_effects.dm @@ -52,7 +52,11 @@ owner.set_jitter_if_lower(100 SECONDS) owner.Paralyze(duration) owner.visible_message(span_warning("[owner] drops to the ground as [owner.p_they()] start seizing up."), \ +<<<<<<< HEAD span_warning("[pick("You can't collect your thoughts...", "You suddenly feel extremely dizzy...", "You cant think straight...","You can't move your face properly anymore...")]")) +======= + span_warning("[pick("You can't collect your thoughts...", "You suddenly feel extremely dizzy...", "You can't think straight...","You can't move your face properly anymore...")]")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /atom/movable/screen/alert/status_effect/seizure diff --git a/code/datums/status_effects/stacking_effect.dm b/code/datums/status_effects/stacking_effect.dm index 98dd1c3ad14..67ff9d0ad34 100644 --- a/code/datums/status_effects/stacking_effect.dm +++ b/code/datums/status_effects/stacking_effect.dm @@ -8,7 +8,11 @@ /// How many stacks are currently accumulated. /// Also, the default stacks number given on application. var/stacks = 0 +<<<<<<< HEAD // Deciseconds until ticks start occuring, which removes stacks +======= + // Deciseconds until ticks start occurring, which removes stacks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// (first stack will be removed at this time plus tick_interval) var/delay_before_decay /// How many stacks are lost per tick (decay trigger) @@ -31,11 +35,19 @@ /// Put the state name without the number in these state vars var/overlay_state /// Icon state for underlays applied when the status effect is applied +<<<<<<< HEAD /// The number is concatonated onto the string based on the number of stacks to get the correct state name. var/underlay_state /// A reference to our overlay appearance var/mutable_appearance/status_overlay /// A referenceto our underlay appearance +======= + /// The number is concatenated onto the string based on the number of stacks to get the correct state name. + var/underlay_state + /// A reference to our overlay appearance + var/mutable_appearance/status_overlay + /// A reference to our underlay appearance +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mutable_appearance/status_underlay /// Effects that occur when the stack count crosses stack_threshold @@ -90,7 +102,11 @@ owner.underlays -= status_underlay stacks += stacks_added if(stacks > 0) +<<<<<<< HEAD if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occuring if changing from above threshold to still above threshold +======= + if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occurring if changing from above threshold to still above threshold +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 threshold_crossed = TRUE on_threshold_cross() if(consumed_on_threshold) diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index abf63eb3c75..453a87ade8e 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -389,7 +389,11 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) user.balloon_alert(user, "no room!") return FALSE +<<<<<<< HEAD var/can_hold_it = isnull(can_hold) || is_type_in_typecache(to_insert, can_hold) +======= + var/can_hold_it = isnull(can_hold) || is_type_in_typecache(to_insert, can_hold) || is_type_in_typecache(to_insert, exception_hold) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/cant_hold_it = is_type_in_typecache(to_insert, cant_hold) var/trait_says_no = HAS_TRAIT(to_insert, TRAIT_NO_STORAGE_INSERT) if(!can_hold_it || cant_hold_it || trait_says_no) @@ -738,7 +742,11 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) /datum/storage/proc/on_mousedrop_onto(datum/source, atom/over_object, mob/user) SIGNAL_HANDLER +<<<<<<< HEAD if(ismecha(user.loc) || !user.canUseStorage()) +======= + if(ismecha(user.loc) || user.incapacitated || !user.canUseStorage()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(istype(over_object, /atom/movable/screen/inventory/hand)) @@ -827,6 +835,12 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return if(!iscarbon(user) && !isdrone(user)) return +<<<<<<< HEAD +======= + var/mob/living/user_living = user + if(user_living.incapacitated) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 attempt_insert(dropping, user) return COMPONENT_CANCEL_MOUSEDROPPED_ONTO diff --git a/code/datums/visual_data.dm b/code/datums/visual_data.dm index 3915b613600..15bea475f8d 100644 --- a/code/datums/visual_data.dm +++ b/code/datums/visual_data.dm @@ -11,6 +11,11 @@ var/sight = NONE /// see_invisible values var/see_invis +<<<<<<< HEAD +======= + /// see_in_dark values + var/see_dark +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// What the client is seeing "out of", client.eye var/datum/weakref/client_eye /// Weakref to the mob we're mirroring off @@ -39,6 +44,10 @@ // Note: we explicitly do NOT use setters here, since it would break the behavior paint_to.sight = sight paint_to.see_invisible = see_invis +<<<<<<< HEAD +======= + paint_to.see_in_dark = see_dark +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(paint_to.client) var/atom/eye = client_eye?.resolve() if(eye) diff --git a/code/datums/votes/map_vote.dm b/code/datums/votes/map_vote.dm index 2942a40b833..5e017ad6d87 100644 --- a/code/datums/votes/map_vote.dm +++ b/code/datums/votes/map_vote.dm @@ -14,7 +14,11 @@ var/list/maps = shuffle(global.config.maplist) for(var/map in maps) var/datum/map_config/possible_config = config.maplist[map] +<<<<<<< HEAD if(!possible_config.votable || (possible_config.map_name in SSpersistence.blocked_maps) || possible_config.map_name == SSmapping.config?.map_name) // SKYRAT EDIT - Can't vote for the current map +======= + if(!possible_config.votable || (possible_config.map_name in SSpersistence.blocked_maps)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue default_choices += possible_config.map_name diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 12533845f90..e24b04856aa 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -20,7 +20,11 @@ protected_areas = list(/area/station/maintenance, /area/station/ai_monitored/turret_protected/ai_upload, /area/station/ai_monitored/turret_protected/ai_upload_foyer, /area/station/ai_monitored/turret_protected/aisat/maint, /area/station/ai_monitored/command/storage/satellite, /area/station/ai_monitored/turret_protected/ai, /area/station/commons/storage/emergency/starboard, /area/station/commons/storage/emergency/port, +<<<<<<< HEAD /area/shuttle, /area/station/security/prison/safe, /area/station/security/prison/toilet, /area/icemoon/underground, /area/ruin/comms_agent/maint) +======= + /area/shuttle, /area/station/security/prison/safe, /area/station/security/prison/toilet, /area/mine/maintenance, /area/icemoon/underground, /area/ruin/comms_agent/maint) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target_trait = ZTRAIT_STATION immunity_type = TRAIT_RADSTORM_IMMUNE diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index c3c8a1c0e93..5cf73d1e047 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -348,7 +348,11 @@ data["proper_name"] = (proper_name != "Unknown") ? proper_name : null return data +<<<<<<< HEAD /datum/wires/ui_act(action, params) +======= +/datum/wires/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || !interactable(usr)) return diff --git a/code/datums/wires/mecha.dm b/code/datums/wires/mecha.dm index 4e11eda65f7..843aadff496 100644 --- a/code/datums/wires/mecha.dm +++ b/code/datums/wires/mecha.dm @@ -95,12 +95,22 @@ if(mecha.Adjacent(target) && !TIMER_COOLDOWN_RUNNING(mecha, COOLDOWN_MECHA_MELEE_ATTACK) && target.mech_melee_attack(mecha)) TIMER_COOLDOWN_START(mecha, COOLDOWN_MECHA_MELEE_ATTACK, mecha.melee_cooldown) +<<<<<<< HEAD /datum/wires/mecha/ui_act(action, params) . = ..() if(.) return var/obj/vehicle/sealed/mecha/mecha = holder if(!HAS_SILICON_ACCESS(usr) && mecha.internal_damage & MECHA_INT_SHORT_CIRCUIT && mecha.shock(usr)) +======= +/datum/wires/mecha/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + var/mob/user = ui.user + var/obj/vehicle/sealed/mecha/mecha = holder + if(!HAS_SILICON_ACCESS(user) && mecha.internal_damage & MECHA_INT_SHORT_CIRCUIT && mecha.shock(usr)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /datum/wires/mecha/can_reveal_wires(mob/user) diff --git a/code/datums/wires/mod.dm b/code/datums/wires/mod.dm index 00d836a52eb..cfc5155292c 100644 --- a/code/datums/wires/mod.dm +++ b/code/datums/wires/mod.dm @@ -50,9 +50,16 @@ if(WIRE_INTERFACE) mod.interface_break = !mend +<<<<<<< HEAD /datum/wires/mod/ui_act(action, params) var/obj/item/mod/control/mod = holder if(!HAS_SILICON_ACCESS(usr) && mod.seconds_electrified && mod.shock(usr)) +======= +/datum/wires/mod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + var/obj/item/mod/control/mod = holder + var/mob/user = ui.user + if(!HAS_SILICON_ACCESS(user) && mod.seconds_electrified && mod.shock(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() diff --git a/code/datums/wounds/_wound_static_data.dm b/code/datums/wounds/_wound_static_data.dm index f996bb258c7..d5a780f49e7 100644 --- a/code/datums/wounds/_wound_static_data.dm +++ b/code/datums/wounds/_wound_static_data.dm @@ -1,6 +1,10 @@ // This datum is merely a singleton instance that allows for custom "can be applied" behaviors without instantiating a wound instance. // For example: You can make a pregen_data subtype for your wound that overrides can_be_applied_to to only apply to specifically slimeperson limbs. +<<<<<<< HEAD // Without this, youre stuck with very static initial variables. +======= +// Without this, you're stuck with very static initial variables. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A singleton datum that holds pre-gen and static data about a wound. Each wound datum should have a corresponding wound_pregen_data. /datum/wound_pregen_data @@ -56,9 +60,15 @@ if (!abstract) if (required_limb_biostate == null) +<<<<<<< HEAD stack_trace("required_limb_biostate null - please set it! occured on: [src.type]") if (wound_path_to_generate == null) stack_trace("wound_path_to_generate null - please set it! occured on: [src.type]") +======= + stack_trace("required_limb_biostate null - please set it! occurred on: [src.type]") + if (wound_path_to_generate == null) + stack_trace("wound_path_to_generate null - please set it! occurred on: [src.type]") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scar_priorities = generate_scar_priorities() @@ -82,8 +92,13 @@ * * random_roll = FALSE: If this is in the context of a random wound generation, and this wound wasn't specifically checked. * * Returns: +<<<<<<< HEAD * FALSE if the limb cannot be wounded, if the wounding types dont match ours (via wounding_types_valid()), if we have a higher severity wound already in our series, * if we have a biotype mismatch, if the limb isnt in a viable zone, or if theres any duplicate wound types. +======= + * FALSE if the limb cannot be wounded, if the wounding types don't match ours (via wounding_types_valid()), if we have a higher severity wound already in our series, + * if we have a biotype mismatch, if the limb isn't in a viable zone, or if there's any duplicate wound types. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * TRUE otherwise. */ /datum/wound_pregen_data/proc/can_be_applied_to(obj/item/bodypart/limb, list/suggested_wounding_types = required_wounding_types, datum/wound/old_wound, random_roll = FALSE, duplicates_allowed = src.duplicates_allowed, care_about_existing_wounds = TRUE) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 47f29a21e9d..64636299eb0 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -127,7 +127,11 @@ return ..() +<<<<<<< HEAD /// If we should have an actionspeed_mod, ensures we do and updates its slowdown. Otherwise, ensures we dont have one +======= +/// If we should have an actionspeed_mod, ensures we do and updates its slowdown. Otherwise, ensures we don't have one +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// by qdeleting any existing modifier. /datum/wound/proc/update_actionspeed_modifier() if (should_have_actionspeed_modifier()) @@ -323,7 +327,11 @@ SIGNAL_HANDLER qdel(src) +<<<<<<< HEAD /// Remove the wound from whatever it's afflicting, and cleans up whateverstatus effects it had or modifiers it had on interaction times. ignore_limb is used for detachments where we only want to forget the victim +======= +/// Remove the wound from whatever it's afflicting, and cleans up whatever status effects it had or modifiers it had on interaction times. ignore_limb is used for detachments where we only want to forget the victim +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/wound/proc/remove_wound(ignore_limb, replaced = FALSE) //TODO: have better way to tell if we're getting removed without replacement (full heal) scar stuff var/old_victim = victim @@ -341,7 +349,11 @@ if(limb && !ignore_limb) set_limb(null, replaced) // since we're removing limb's ref to us, we should do the same +<<<<<<< HEAD // if you want to keep the ref, do it externally, theres no reason for us to remember it +======= + // if you want to keep the ref, do it externally, there's no reason for us to remember it +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (ismob(old_victim)) var/mob/mob_victim = old_victim @@ -688,7 +700,11 @@ /datum/wound/proc/get_limb_examine_description() return +<<<<<<< HEAD /// Gets the flat percentage chance increment of a dismember occuring, if a dismember is attempted (requires mangled flesh and bone). returning 15 = +15%. +======= +/// Gets the flat percentage chance increment of a dismember occurring, if a dismember is attempted (requires mangled flesh and bone). returning 15 = +15%. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/wound/proc/get_dismember_chance_bonus(existing_chance) SHOULD_BE_PURE(TRUE) diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 13877c8223b..46ea0ed0bcc 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -13,7 +13,11 @@ /datum/wound/blunt/bone name = "Blunt (Bone) Wound" +<<<<<<< HEAD wound_flags = (ACCEPTS_GAUZE | SPLINT_OVERLAY) // SKYRAT EDIT: MEDICAL -- Makes bone wounds have a splint overlay +======= + wound_flags = (ACCEPTS_GAUZE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 default_scar_file = BONE_SCAR_FILE @@ -336,7 +340,11 @@ brain_trauma_group = BRAIN_TRAUMA_MILD trauma_cycle_cooldown = 1.5 MINUTES internal_bleeding_chance = 40 +<<<<<<< HEAD wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR | SPLINT_OVERLAY) // SKYRAT EDIT - MEDICAL (SPLINT_OVERLAY) +======= + wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 regen_ticks_needed = 120 // ticks every 2 seconds, 240 seconds, so roughly 4 minutes default simple_desc = "Patient's bone has cracked in the middle, drastically reducing limb functionality." @@ -372,7 +380,11 @@ brain_trauma_group = BRAIN_TRAUMA_SEVERE trauma_cycle_cooldown = 2.5 MINUTES internal_bleeding_chance = 60 +<<<<<<< HEAD wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR | SPLINT_OVERLAY) // SKYRAT EDIT - MEDICAL (SPLINT_OVERLAY) +======= + wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 regen_ticks_needed = 240 // ticks every 2 seconds, 480 seconds, so roughly 8 minutes default simple_desc = "Patient's bones have effectively shattered completely, causing total immobilization of the limb." diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 6c35cedd33c..43a65e2b636 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -1,3 +1,7 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* Burn wounds */ @@ -81,11 +85,17 @@ infestation += infestation_rate * seconds_per_tick switch(infestation) if(0 to WOUND_INFECTION_MODERATE) + return + if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE) if(SPT_PROB(15, seconds_per_tick)) victim.adjustToxLoss(0.2) if(prob(6)) to_chat(victim, span_warning("The blisters on your [limb.plaintext_zone] ooze a strange pus...")) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL) if(!disabling) if(SPT_PROB(1, seconds_per_tick)) @@ -356,6 +366,10 @@ desc = "Patient is suffering extreme burns from a strange brand marking, creating serious risk of infection and greatly reduced limb integrity." examine_desc = "appears to have holy symbols painfully branded into their flesh, leaving severe burns." occur_text = "chars rapidly into a strange pattern of holy symbols, burned into the flesh." +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 simple_desc = "Patient's skin has had strange markings burned onto it, significantly weakening the limb and compounding further damage!!" /datum/wound_pregen_data/flesh_burn/third_degree/holy @@ -363,8 +377,13 @@ can_be_randomly_generated = FALSE wound_path_to_generate = /datum/wound/burn/flesh/severe/brand +<<<<<<< HEAD /// special severe wound caused by the cursed slot machine. +======= +/// special severe wound caused by the cursed slot machine. + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/wound/burn/flesh/severe/cursed_brand name = "Ancient Brand" desc = "Patient is suffering extreme burns with oddly ornate brand markings, creating serious risk of infection and greatly reduced limb integrity." diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index c0be047b938..5a9cb50605c 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -1,3 +1,7 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* Piercing wounds */ diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 0c6847e7db3..9a413672981 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -128,7 +128,11 @@ * A list of teleport locations * * Adding a wizard area teleport list because motherfucking lag -- Urist +<<<<<<< HEAD * I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game +======= + * I am far too lazy to make it a proper list of areas so I'll just make it run the usual teleport routine at the start of the game +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ GLOBAL_LIST_EMPTY(teleportlocs) @@ -168,9 +172,15 @@ GLOBAL_LIST_EMPTY(teleportlocs) return ..() /* +<<<<<<< HEAD * Initalize this area * * intializes the dynamic area lighting and also registers the area with the z level via +======= + * Initialize this area + * + * initializes the dynamic area lighting and also registers the area with the z level via +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * reg_in_areas_in_z * * returns INITIALIZE_HINT_LATELOAD @@ -414,7 +424,11 @@ GLOBAL_LIST_EMPTY(teleportlocs) /** * Update the icon state of the area * +<<<<<<< HEAD * Im not sure what the heck this does, somethign to do with weather being able to set icon +======= + * I'm not sure what the heck this does, something to do with weather being able to set icon +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * states on areas?? where the heck would that even display? */ /area/update_icon_state() @@ -439,7 +453,11 @@ GLOBAL_LIST_EMPTY(teleportlocs) /** * Returns int 1 or 0 if the area has power for the given channel * +<<<<<<< HEAD * evalutes a mixture of variables mappers can set, requires_power, always_unpowered and then +======= + * evaluates a mixture of variables mappers can set, requires_power, always_unpowered and then +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * per channel power_equip, power_light, power_environ */ /area/proc/powered(chan) // return true if the area has power to given channel diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index 14ea52648f8..919405c63f2 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -11,7 +11,11 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" has_gravity = STANDARD_GRAVITY ambience_index = AMBIENCE_AWAY sound_environment = SOUND_ENVIRONMENT_ROOM +<<<<<<< HEAD area_flags = NOTELEPORT|UNIQUE_AREA //SKYRAT EDIT CHANGE +======= + area_flags = UNIQUE_AREA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/museum name = "Nanotrasen Museum" diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index f5ac4fac78e..5a47d7f6999 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -87,11 +87,14 @@ name = "Supplypod Loading Facility" icon_state = "supplypod_loading" var/loading_id = "" +<<<<<<< HEAD // SKYRAT EDIT START - Dynamic lights on CentCom static_lighting = FALSE base_lighting_color = COLOR_WHITE base_lighting_alpha = 255 // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/supplypod/loading/Initialize(mapload) . = ..() diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm index fd983f763a3..4d829412707 100644 --- a/code/game/area/areas/ruins/icemoon.dm +++ b/code/game/area/areas/ruins/icemoon.dm @@ -44,7 +44,11 @@ mood_message = "I feel like I am being watched..." /area/ruin/bughabitat +<<<<<<< HEAD name = "\improper Entemology Outreach Center" +======= + name = "\improper Entomology Outreach Center" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mood_bonus = 1 mood_message = "This place seems strangely serene." diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 2063775823a..387bd5929cc 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -98,12 +98,16 @@ //ash walker nest /area/ruin/unpowered/ash_walkers +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - ASH WALKER MACHINES FIX always_unpowered = FALSE power_equip = TRUE //SKYRAT EDIT ADDITION END ambient_buzz = 'sound/ambience/magma.ogg' +======= + ambient_buzz = 'sound/ambience/magma.ogg' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/ruin/unpowered/ratvar outdoors = TRUE ambient_buzz = 'sound/ambience/magma.ogg' diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 1b697dc02b0..a5b498ce22b 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -89,7 +89,10 @@ /area/ruin/space/has_grav/hotel/pool name = "\improper Hotel Pool Room" +<<<<<<< HEAD icon_state = "fitness" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/ruin/space/has_grav/hotel/bar name = "\improper Hotel Bar" diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 78b887173b9..e15d5a52a93 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -154,7 +154,11 @@ name = "Labor Camp Shuttle" /area/shuttle/supply +<<<<<<< HEAD name = "NLV Consign" //SKYRAT EDIT CHANGE +======= + name = "Supply Shuttle" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 area_flags = NOTELEPORT /area/shuttle/escape diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm index 6198370dc24..ea0f6835804 100644 --- a/code/game/atom/_atom.dm +++ b/code/game/atom/_atom.dm @@ -186,6 +186,16 @@ if(smoothing_flags & SMOOTH_QUEUED) SSicon_smooth.remove_from_queues(src) +<<<<<<< HEAD +======= + // These lists cease existing when src does, so we need to clear any lua refs to them that exist. + if(!(datum_flags & DF_STATIC_OBJECT)) + DREAMLUAU_CLEAR_REF_USERDATA(contents) + DREAMLUAU_CLEAR_REF_USERDATA(filters) + DREAMLUAU_CLEAR_REF_USERDATA(overlays) + DREAMLUAU_CLEAR_REF_USERDATA(underlays) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /atom/proc/handle_ricochet(obj/projectile/ricocheting_projectile) @@ -852,11 +862,14 @@ var/mob/user = client?.mob if (isnull(user)) return +<<<<<<< HEAD ///SKYRAT EDIT ADDITION BEGIN // Face directions on combat mode. No procs, no typechecks, just a var for speed if(user.face_mouse) user.face_atom(src) ///SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Screentips var/datum/hud/active_hud = user.hud_used diff --git a/code/game/atom/atom_act.dm b/code/game/atom/atom_act.dm index 53269c5538c..56628b881e2 100644 --- a/code/game/atom/atom_act.dm +++ b/code/game/atom/atom_act.dm @@ -67,8 +67,12 @@ * We then return the protection value */ /atom/proc/emp_act(severity) +<<<<<<< HEAD // SKYRAT EDIT - REMOVAL //SHOULD_CALL_PARENT(TRUE) +======= + SHOULD_CALL_PARENT(TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/protection = SEND_SIGNAL(src, COMSIG_ATOM_PRE_EMP_ACT, severity) if(!(protection & EMP_PROTECT_WIRES) && istype(wires)) wires.emp_pulse() @@ -116,11 +120,21 @@ * Im not sure why this the case, maybe to prevent lots of hitby's if the thrown object is * deleted shortly after hitting something (during explosions or other massive events that * throw lots of items around - singularity being a notable example) +<<<<<<< HEAD +======= + * + * Worth of note: If hitby returns TRUE, it means the object has been blocked or catched by src. + * So far, this is only possible for living mobs and carbons, who can hold shields and catch thrown items. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /atom/proc/hitby(atom/movable/hitting_atom, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) SEND_SIGNAL(src, COMSIG_ATOM_HITBY, hitting_atom, skipcatch, hitpush, blocked, throwingdatum) if(density && !has_gravity(hitting_atom)) //thrown stuff bounces off dense stuff in no grav, unless the thrown stuff ends up inside what it hit(embedding, bola, etc...). addtimer(CALLBACK(src, PROC_REF(hitby_react), hitting_atom), 0.2 SECONDS) +<<<<<<< HEAD +======= + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * We have have actually hit the passed in atom @@ -209,7 +223,11 @@ ///wrapper proc that passes our mob's rust_strength to the target we are rusting /mob/living/proc/do_rust_heretic_act(atom/target) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_data = IS_HERETIC(src) +======= + var/datum/antagonist/heretic/heretic_data = GET_HERETIC(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.rust_heretic_act(heretic_data?.rust_strength) /mob/living/basic/heretic_summon/rust_walker/do_rust_heretic_act(atom/target) diff --git a/code/game/atom/atom_defense.dm b/code/game/atom/atom_defense.dm index d2280fd2b59..1f0a25bae70 100644 --- a/code/game/atom/atom_defense.dm +++ b/code/game/atom/atom_defense.dm @@ -94,29 +94,42 @@ CRASH("/atom/proc/run_atom_armor was called on [src] without being implemented as a type that uses integrity!") if(damage_flag == MELEE && damage_amount < damage_deflection) return 0 +<<<<<<< HEAD switch(damage_type) if(BRUTE) if(BURN) else return 0 +======= + if(damage_type != BRUTE && damage_type != BURN) + return 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/armor_protection = 0 if(damage_flag) armor_protection = get_armor_rating(damage_flag) if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. armor_protection = clamp(PENETRATE_ARMOUR(armor_protection, armour_penetration), min(armor_protection, 0), 100) +<<<<<<< HEAD return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) +======= + return round(damage_amount * (100 - armor_protection) * 0.01, DAMAGE_PRECISION) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///the sound played when the atom is damaged. /atom/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) if(damage_amount) +<<<<<<< HEAD //SKYRAT EDIT ADDITION - CREDITS TO WHITEDREAM(valtos) playsound(src, pick('modular_skyrat/master_files/sound/effects/metalblock1.wav', 'modular_skyrat/master_files/sound/effects/metalblock2.wav', \ 'modular_skyrat/master_files/sound/effects/metalblock3.wav', 'modular_skyrat/master_files/sound/effects/metalblock4.wav', \ 'modular_skyrat/master_files/sound/effects/metalblock5.wav', 'modular_skyrat/master_files/sound/effects/metalblock6.wav', \ 'modular_skyrat/master_files/sound/effects/metalblock7.wav', 'modular_skyrat/master_files/sound/effects/metalblock8.wav'), 50, TRUE) //SKYRAT EDIT END +======= + playsound(src, 'sound/weapons/smash.ogg', 50, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else playsound(src, 'sound/weapons/tap.ogg', 50, TRUE) if(BURN) diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm index e728781ee01..8b5e7c9b753 100644 --- a/code/game/atom/atom_examine.dm +++ b/code/game/atom/atom_examine.dm @@ -13,7 +13,11 @@ /atom/proc/examine(mob/user) var/examine_string = get_examine_string(user, thats = TRUE) if(examine_string) +<<<<<<< HEAD . = list("[examine_string].", EXAMINE_SECTION_BREAK) // SKYRAT EDIT CHANGE +======= + . = list("[examine_string].") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else . = list() @@ -22,19 +26,25 @@ . += desc if(custom_materials) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - HR sections if(length(custom_materials) > 1) . += EXAMINE_SECTION_BREAK //SKYRAT EDIT ADDITION //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/materials_list = list() for(var/custom_material in custom_materials) var/datum/material/current_material = GET_MATERIAL_REF(custom_material) materials_list += "[current_material.name]" . += "It is made out of [english_list(materials_list)]." +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - HR sections if(length(custom_materials) > 1) . += EXAMINE_SECTION_BREAK //SKYRAT EDIT ADDITION //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(reagents) var/user_sees_reagents = user.can_see_reagents() diff --git a/code/game/atom/atom_tool_acts.dm b/code/game/atom/atom_tool_acts.dm index abe580958a4..dbb32985083 100644 --- a/code/game/atom/atom_tool_acts.dm +++ b/code/game/atom/atom_tool_acts.dm @@ -109,6 +109,7 @@ act_result = is_left_clicking ? welder_act(user, tool) : welder_act_secondary(user, tool) if(TOOL_ANALYZER) act_result = is_left_clicking ? analyzer_act(user, tool) : analyzer_act_secondary(user, tool) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - SKYRAT TOOLS if(TOOL_BILLOW) act_result = is_left_clicking ? billow_act(user, tool) : billow_act_secondary(user, tool) @@ -119,6 +120,8 @@ if(TOOL_BLOWROD) act_result = is_left_clicking ? blowrod_act(user, tool) : blowrod_act_secondary(user, tool) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!act_result) return NONE diff --git a/code/game/atom/atoms_initializing_EXPENSIVE.dm b/code/game/atom/atoms_initializing_EXPENSIVE.dm index f76f00670d2..3857cfd331b 100644 --- a/code/game/atom/atoms_initializing_EXPENSIVE.dm +++ b/code/game/atom/atoms_initializing_EXPENSIVE.dm @@ -1,5 +1,9 @@ /// Init this specific atom /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, from_template = FALSE, list/arguments) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/the_type = A.type if(QDELING(A)) @@ -24,7 +28,11 @@ switch(result) if (INITIALIZE_HINT_NORMAL) +<<<<<<< HEAD // pass +======= + EMPTY_BLOCK_GUARD // Pass +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(INITIALIZE_HINT_LATELOAD) if(arguments[1]) //mapload late_loaders += A diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 6ba0d0fc045..a2766cdbe6c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -101,9 +101,12 @@ /// The degree of pressure protection that mobs in list/contents have from the external environment, between 0 and 1 var/contents_pressure_protection = 0 +<<<<<<< HEAD /// Whether a user will face atoms on entering them with a mouse. Despite being a mob variable, it is here for performances //SKYRAT EDIT ADDITION var/face_mouse = FALSE //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The voice that this movable makes when speaking var/voice @@ -234,6 +237,13 @@ LAZYNULL(client_mobs_in_contents) +<<<<<<< HEAD +======= + // These lists cease existing when src does, so we need to clear any lua refs to them that exist. + DREAMLUAU_CLEAR_REF_USERDATA(vis_contents) + DREAMLUAU_CLEAR_REF_USERDATA(vis_locs) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() for(var/movable_content in contents) @@ -637,7 +647,11 @@ if(!direction) direction = get_dir(src, newloc) +<<<<<<< HEAD if(set_dir_on_move && dir != direction && update_dir && !face_mouse) // SKYRAT EDIT - && !face_mouse +======= + if(set_dir_on_move && dir != direction && update_dir) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 setDir(direction) var/is_multi_tile_object = is_multi_tile_object(src) @@ -764,7 +778,11 @@ moving_diagonally = SECOND_DIAG_STEP . = step(src, SOUTH) if(moving_diagonally == SECOND_DIAG_STEP) +<<<<<<< HEAD if(!. && set_dir_on_move && update_dir && !face_mouse) // SKYRAT EDIT CHANGE - && !face_mouse +======= + if(!. && set_dir_on_move && update_dir) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 setDir(first_step_dir) else if(!inertia_moving) newtonian_move(direct) @@ -811,7 +829,11 @@ last_move = direct +<<<<<<< HEAD if(set_dir_on_move && dir != direct && update_dir && !face_mouse) // SKYRAT EDIT CHANGE - && !face_mouse) +======= + if(set_dir_on_move && dir != direct && update_dir) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 setDir(direct) if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc, direct, glide_size_override)) //movement failed due to buckled mob(s) . = FALSE @@ -1256,9 +1278,12 @@ if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier return TRUE +<<<<<<< HEAD if(locate(/obj/structure/spacevine) in range(1, get_turf(src))) //SKYRAT EDIT: allow walking when vines are around return TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE @@ -1285,6 +1310,7 @@ /atom/movable/proc/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) set waitfor = FALSE var/hitpush = TRUE +<<<<<<< HEAD var/impact_signal = SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_IMPACT, hit_atom, throwingdatum) if(impact_signal & COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH) hitpush = FALSE // hacky, tie this to something else or a proper workaround later @@ -1295,6 +1321,24 @@ return SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) return hit_atom.hitby(src, throwingdatum=throwingdatum, hitpush=hitpush) +======= + var/impact_flags = pre_impact(hit_atom, throwingdatum) + if(impact_flags & COMPONENT_MOVABLE_IMPACT_NEVERMIND) + return // in case a signal interceptor broke or deleted the thing before we could process our hit + if(impact_flags & COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH) + hitpush = FALSE + var/caught = hit_atom.hitby(src, throwingdatum=throwingdatum, hitpush=hitpush) + SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum, caught) + return caught + +///Called before we attempt to call hitby and send the COMSIG_MOVABLE_IMPACT signal +/atom/movable/proc/pre_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + var/impact_flags = SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_IMPACT, hit_atom, throwingdatum) + var/target_flags = SEND_SIGNAL(hit_atom, COMSIG_ATOM_PREHITBY, src, throwingdatum) + if(target_flags & COMSIG_HIT_PREVENTED) + impact_flags |= COMPONENT_MOVABLE_IMPACT_NEVERMIND + return impact_flags +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/hitby(atom/movable/hitting_atom, skipcatch, hitpush = TRUE, blocked, datum/thrownthing/throwingdatum) if(HAS_TRAIT(src, TRAIT_NO_THROW_HITPUSH)) diff --git a/code/game/communications.dm b/code/game/communications.dm index 2c87c58b628..8da755a45b7 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -110,6 +110,7 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_SUPPLY = FREQ_SUPPLY, RADIO_CHANNEL_SERVICE = FREQ_SERVICE, RADIO_CHANNEL_AI_PRIVATE = FREQ_AI_PRIVATE, + RADIO_CHANNEL_ENTERTAINMENT = FREQ_ENTERTAINMENT, RADIO_CHANNEL_CTF_RED = FREQ_CTF_RED, RADIO_CHANNEL_CTF_BLUE = FREQ_CTF_BLUE, RADIO_CHANNEL_CTF_GREEN = FREQ_CTF_GREEN, @@ -134,6 +135,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( "[FREQ_SUPPLY]" = RADIO_CHANNEL_SUPPLY, "[FREQ_SERVICE]" = RADIO_CHANNEL_SERVICE, "[FREQ_AI_PRIVATE]" = RADIO_CHANNEL_AI_PRIVATE, + "[FREQ_ENTERTAINMENT]" = RADIO_CHANNEL_ENTERTAINMENT, "[FREQ_CTF_RED]" = RADIO_CHANNEL_CTF_RED, "[FREQ_CTF_BLUE]" = RADIO_CHANNEL_CTF_BLUE, "[FREQ_CTF_GREEN]" = RADIO_CHANNEL_CTF_GREEN, @@ -152,10 +154,18 @@ GLOBAL_LIST_INIT(radiocolors, list( RADIO_CHANNEL_SUPPLY = "#a8732b", RADIO_CHANNEL_SERVICE = "#6eaa2c", RADIO_CHANNEL_AI_PRIVATE = "#ff00ff", +<<<<<<< HEAD RADIO_CHANNEL_CTF_RED = "#ff0000", RADIO_CHANNEL_CTF_BLUE = "#0000ff", RADIO_CHANNEL_CTF_GREEN = "#00ff00", RADIO_CHANNEL_CTF_YELLOW = "#d1ba22" +======= + RADIO_CHANNEL_ENTERTAINMENT = "#00ff99", + RADIO_CHANNEL_CTF_RED = "#ff0000", + RADIO_CHANNEL_CTF_BLUE = "#0000ff", + RADIO_CHANNEL_CTF_GREEN = "#00ff00", + RADIO_CHANNEL_CTF_YELLOW = "#d1ba22", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /datum/radio_frequency diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index c24f6156a61..6aa98d9158e 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -18,7 +18,11 @@ /datum/atom_hud/data /datum/atom_hud/data/human/medical +<<<<<<< HEAD hud_icons = list(STATUS_HUD, HEALTH_HUD, DNR_HUD) // SKYRAT EDIT ADDITION - DNR_HUD +======= + hud_icons = list(STATUS_HUD, HEALTH_HUD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/atom_hud/data/human/medical/basic @@ -47,7 +51,11 @@ hud_icons = list(ID_HUD) /datum/atom_hud/data/human/security/advanced +<<<<<<< HEAD hud_icons = list(ID_HUD, IMPSEC_FIRST_HUD, IMPLOYAL_HUD, IMPSEC_SECOND_HUD, WANTED_HUD, PERMIT_HUD, DNR_HUD) //SKYRAT EDIT ADDITION - PERMIT_HUD, DNR_HUD +======= + hud_icons = list(ID_HUD, IMPSEC_FIRST_HUD, IMPLOYAL_HUD, IMPSEC_SECOND_HUD, WANTED_HUD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/atom_hud/data/human/fan_hud hud_icons = list(FAN_HUD) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 4e7410eef67..5ba5c82c7b6 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -19,13 +19,19 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION var/admin_grantable = FALSE /datum/objective/New(text) +<<<<<<< HEAD GLOB.objectives += src //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(text) explanation_text = text //Apparently objectives can be qdel'd. Learn a new thing every day /datum/objective/Destroy() +<<<<<<< HEAD GLOB.objectives -= src //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/objective/proc/get_owners() // Combine owner and team into a single list. @@ -140,6 +146,7 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION if(!HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(target_area, /area/shuttle/arrival)) return FALSE +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(SSticker.IsRoundInProgress() && istype(target_area, /area/centcom/interlink)) return FALSE @@ -148,6 +155,8 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION return FALSE // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE //dupe_search_range is a list of antag datums / minds / teams @@ -241,7 +250,11 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION /datum/objective/assassinate/update_explanation_text() ..() if(target?.current) +<<<<<<< HEAD explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role.title : target.special_role] ONCE." //SKYRAT EDIT CHANGE +======= + explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role.title : target.special_role]." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else explanation_text = "Free objective." diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 2e82e549cd5..dc9d4d46565 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -388,10 +388,15 @@ return add_item_to_steal(src, /obj/item/clothing/accessory/medal/gold/captain) /datum/objective_item/steal/hypo +<<<<<<< HEAD //name = "the hypospray" // ORIGINAL name = "the Chief Medical Officer's hypospray" // SKYRAT EDIT CHANGE //targetitem = /obj/item/reagent_containers/hypospray/cmo // ORIGINAL targetitem = /obj/item/hypospray/mkii/deluxe/cmo // SKYRAT EDIT CHANGE +======= + name = "the hypospray" + targetitem = /obj/item/reagent_containers/hypospray/cmo +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 excludefromjob = list(JOB_CHIEF_MEDICAL_OFFICER) item_owner = list(JOB_CHIEF_MEDICAL_OFFICER) exists_on_map = TRUE @@ -399,8 +404,13 @@ steal_hint = "The Chief Medical Officer's personal medical injector. \ Usually found amongst their medical supplies on their person, in their belt, or otherwise in their locker." +<<<<<<< HEAD /obj/item/hypospray/mkii/deluxe/cmo/add_stealing_item_objective() // SKYRAT EDIT CHANGE return add_item_to_steal(src, /obj/item/hypospray/mkii/deluxe/cmo) // SKYRAT EDIT CHANGE +======= +/obj/item/reagent_containers/hypospray/cmo/add_stealing_item_objective() + return add_item_to_steal(src, /obj/item/reagent_containers/hypospray/cmo) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/objective_item/steal/nukedisc name = "the nuclear authentication disk" @@ -518,12 +528,19 @@ if(istype(potential_storage, /obj/item/aicard)) var/obj/item/aicard/card = potential_storage being = card.AI // why is this one capitalized and the other one not? i wish i knew. +<<<<<<< HEAD // SKYRAT EDIT REMOVAL START - MOD PAI /*else if(istype(potential_storage, /obj/item/mod/control)) var/obj/item/mod/control/suit = potential_storage if(isAI(suit.ai_assistant)) being = suit.ai_assistant */ // SKYRAT EDIT REMOVAL END +======= + else if(istype(potential_storage, /obj/item/mod/control)) + var/obj/item/mod/control/suit = potential_storage + if(isAI(suit.ai_assistant)) + being = suit.ai_assistant +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else stack_trace("check_special_completion() called on [src] with [potential_storage] ([potential_storage.type])! That's not supposed to happen!") return FALSE diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 679a3182a57..b652b9147f0 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -279,7 +279,11 @@ return data +<<<<<<< HEAD /obj/machinery/pdapainter/ui_act(action, params) +======= +/obj/machinery/pdapainter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 40e06362d97..7868bf1fe45 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -634,7 +634,10 @@ if(!.) return FALSE +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((interaction_flags_machine & INTERACT_MACHINE_REQUIRES_SIGHT) && user.is_blind()) to_chat(user, span_warning("This machine requires sight to use.")) return FALSE @@ -687,10 +690,18 @@ return ..() /obj/machinery/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +<<<<<<< HEAD add_fingerprint(usr) update_last_used(usr) if(HAS_AI_ACCESS(usr) && !GLOB.cameranet.checkTurfVis(get_turf(src))) //We check if they're an AI specifically here, so borgs can still access off-camera stuff. to_chat(usr, span_warning("You can no longer connect to this device!")) +======= + var/mob/user = ui.user + add_fingerprint(user) + update_last_used(user) + if(isAI(user) && !GLOB.cameranet.checkTurfVis(get_turf(src))) //We check if they're an AI specifically here, so borgs/adminghosts/human wand can still access off-camera stuff. + to_chat(user, span_warning("You can no longer connect to this device!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index bddc0492c3c..feb45cbadba 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -7,7 +7,11 @@ circuit = /obj/item/circuitboard/machine/cell_charger pass_flags = PASSTABLE var/obj/item/stock_parts/power_store/cell/charging = null +<<<<<<< HEAD var/charge_rate = STANDARD_CELL_RATE //SKYRAT EDIT CHANGE - ORIGINAL: 0.25 * STANDARD_CELL_RATE +======= + var/charge_rate = 0.25 * STANDARD_CELL_RATE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* OVERWRITTEN IN modular_skyrat\modules\aesthetics\cells\cell.dm /obj/machinery/cell_charger/update_overlays() @@ -25,7 +29,10 @@ . += "ccharger-[charging.connector_type]-on" if((charging.charge > 0.01) && charging.charge_light_type) . += mutable_appearance('icons/obj/machines/cell_charger.dmi', "cell-[charging.charge_light_type]-o[(charging.percent() >= 99.5) ? 2 : 1]") +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/cell_charger/examine(mob/user) . = ..() @@ -133,7 +140,11 @@ /obj/machinery/cell_charger/RefreshParts() . = ..() +<<<<<<< HEAD charge_rate = STANDARD_CELL_RATE //SKYRAT EDIT CHANGE - ORIGINAL: 0.25 * STANDARD_CELL_RATE +======= + charge_rate = 0.25 * STANDARD_CELL_RATE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/stock_part/capacitor/capacitor in component_parts) charge_rate *= capacitor.tier diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm index fa0d28c999c..af495556bed 100644 --- a/code/game/machinery/civilian_bounties.dm +++ b/code/game/machinery/civilian_bounties.dm @@ -151,7 +151,11 @@ say("Requesting ID card has no job assignment registered!") return FALSE var/list/datum/bounty/crumbs = list(random_bounty(pot_acc.account_job.bounty_types), // We want to offer 2 bounties from their appropriate job catagories +<<<<<<< HEAD random_bounty(pot_acc.account_job.bounty_types), // and 1 guarenteed assistant bounty if the other 2 suck. +======= + random_bounty(pot_acc.account_job.bounty_types), // and 1 guaranteed assistant bounty if the other 2 suck. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 random_bounty(CIV_JOB_BASIC)) COOLDOWN_START(pot_acc, bounty_timer, (5 MINUTES) - cooldown_reduction) pot_acc.bounties = crumbs @@ -203,7 +207,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/piratepad_control/civilian/ui_act(action, params) +======= +/obj/machinery/computer/piratepad_control/civilian/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index e37e915aff6..efa31ad8c2f 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -132,11 +132,14 @@ /obj/machinery/computer/ui_interact(mob/user, datum/tgui/ui) SHOULD_CALL_PARENT(TRUE) +<<<<<<< HEAD //SKYRAT EDIT ADDITON BEGIN - AESTHETICS if(clicksound && world.time > next_clicksound && isliving(user)) next_clicksound = world.time + rand(50, 150) playsound(src, get_sfx_skyrat(clicksound), clickvol) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() update_use_power(ACTIVE_POWER_USE) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index ba3041cc484..d6cafec3803 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -46,7 +46,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/aifixer/ui_act(action, params) +======= +/obj/machinery/computer/aifixer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index 85bebddd25c..a2bc73e0ac4 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -181,7 +181,11 @@ return static_data +<<<<<<< HEAD /obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params) +======= +/obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 5f3d7dd6e9e..a9a6e529461 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -28,7 +28,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/atmos_alert/ui_act(action, params) +======= +/obj/machinery/computer/atmos_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/atmos_computers/_atmos_control.dm b/code/game/machinery/computer/atmos_computers/_atmos_control.dm index cdd0349ac85..814f577ff8d 100644 --- a/code/game/machinery/computer/atmos_computers/_atmos_control.dm +++ b/code/game/machinery/computer/atmos_computers/_atmos_control.dm @@ -152,7 +152,11 @@ data["chambers"] += list(chamber_info) return data +<<<<<<< HEAD /obj/machinery/computer/atmos_control/ui_act(action, params) +======= +/obj/machinery/computer/atmos_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || !(control || reconnecting)) return diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 750a1d5d53e..0292f30e1d9 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -304,10 +304,13 @@ new_machine.balloon_alert(user, "monitor connected") new_machine.setDir(dir) transfer_fingerprints_to(new_machine) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - Connecting Computers for(var/obj/machinery/computer/selected in range(1,src)) selected.update_overlays() // SKYRAT EDIT ADDITION END - Connecting Computers +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(istype(new_machine, /obj/machinery/computer)) var/obj/machinery/computer/new_computer = new_machine diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 64955913e40..7197ab0683d 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -50,7 +50,11 @@ /obj/machinery/computer/security/ui_interact(mob/user, datum/tgui/ui) . = ..() +<<<<<<< HEAD if(!user.can_perform_action(src, NEED_DEXTERITY|ALLOW_SILICON_REACH)) //prevents monkeys from using camera consoles +======= + if(!user.client) //prevents errors by trying to pass clients that don't exist. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // Update UI ui = SStgui.try_update_ui(user, src, ui) @@ -108,7 +112,7 @@ return data -/obj/machinery/computer/security/ui_act(action, params) +/obj/machinery/computer/security/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 45bfeb9fcef..11960116063 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -60,7 +60,11 @@ return ..() /obj/machinery/computer/camera_advanced/process() +<<<<<<< HEAD if(!can_use(current_user) || (issilicon(current_user) && !current_user.has_unlimited_silicon_privilege)) +======= + if(!can_use(current_user) || (issilicon(current_user) && !HAS_SILICON_ACCESS(current_user))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_machine() return PROCESS_KILL diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 757c9df3d95..92b7bb7cb86 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -5,6 +5,7 @@ #define STATE_CHANGING_STATUS "changing_status" #define STATE_MAIN "main" #define STATE_MESSAGES "messages" +<<<<<<< HEAD //SKYRAT EDIT ADDITION GLOBAL_VAR_INIT(cops_arrived, FALSE) #define EMERGENCY_RESPONSE_POLICE "WOOP WOOP THAT'S THE SOUND OF THE POLICE" @@ -12,6 +13,8 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) #define EMERGENCY_RESPONSE_EMT "AAAAAUGH, I'M DYING, I NEEEEEEEEEED A MEDIC BAG" #define EMERGENCY_RESPONSE_EMAG "AYO THE PIZZA HERE" //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // The communications computer /obj/machinery/computer/communications @@ -116,12 +119,15 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (HAS_SILICON_ACCESS(user)) return TRUE return authenticated +<<<<<<< HEAD /// Skyrat Edit Start - Are we the AI? /obj/machinery/computer/communications/proc/authenticated_as_ai_or_captain(mob/user) if (isAI(user)) return TRUE return ACCESS_CAPTAIN in authorize_access //Skyrat Edit End +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/communications/attackby(obj/I, mob/user, params) if(isidcard(I)) @@ -144,7 +150,10 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) caller_card.use_charge(user) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(summon_battlecruiser), caller_card.team), rand(20 SECONDS, 1 MINUTES)) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) +<<<<<<< HEAD priority_announce("Attention crew: deep-space sensors detect a Syndicate battlecruiser-class signature subspace rift forming near your station. Estimated time until arrival: three to five minutes.", "[command_name()] High-Priority Update") //SKYRAT EDIT ADDITION: announcement on battlecruiser call +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(obj_flags & EMAGGED) @@ -156,7 +165,11 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) return TRUE +<<<<<<< HEAD /obj/machinery/computer/communications/ui_act(action, list/params) +======= +/obj/machinery/computer/communications/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/approved_states = list(STATE_BUYING_SHUTTLE, STATE_CHANGING_STATUS, STATE_MAIN, STATE_MESSAGES) . = ..() @@ -166,11 +179,19 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (!has_communication()) return +<<<<<<< HEAD +======= + var/mob/user = ui.user +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = TRUE switch (action) if ("answerMessage") +<<<<<<< HEAD if (!authenticated(usr)) +======= + if (!authenticated(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/answer_index = params["answer"] @@ -178,7 +199,11 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) // If either of these aren't numbers, then bad voodoo. if(!isnum(answer_index) || !isnum(message_index)) +<<<<<<< HEAD message_admins("[ADMIN_LOOKUPFLW(usr)] provided an invalid index type when replying to a message on [src] [ADMIN_JMP(src)]. This should not happen. Please check with a maintainer and/or consult tgui logs.") +======= + message_admins("[ADMIN_LOOKUPFLW(user)] provided an invalid index type when replying to a message on [src] [ADMIN_JMP(src)]. This should not happen. Please check with a maintainer and/or consult tgui logs.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CRASH("Non-numeric index provided when answering comms console message.") if (!answer_index || !message_index || answer_index < 1 || message_index < 1) @@ -189,11 +214,16 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) message.answered = answer_index message.answer_callback.InvokeAsync() if ("callShuttle") +<<<<<<< HEAD if (!authenticated(usr) || syndicate) +======= + if (!authenticated(user) || syndicate) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/reason = trim(params["reason"], MAX_MESSAGE_LEN) if (length(reason) < CALL_SHUTTLE_REASON_LENGTH) return +<<<<<<< HEAD SSshuttle.requestEvac(usr, reason) post_status("shuttle") if ("changeSecurityLevel") @@ -210,17 +240,40 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) return if (!(ACCESS_CAPTAIN in id_card.access)) to_chat(usr, span_warning("You are not authorized to do this!")) +======= + SSshuttle.requestEvac(user, reason) + post_status("shuttle") + if ("changeSecurityLevel") + if (!authenticated_as_silicon_or_captain(user)) + return + + // Check if they have + if (!HAS_SILICON_ACCESS(user)) + var/obj/item/held_item = user.get_active_held_item() + var/obj/item/card/id/id_card = held_item?.GetID() + if (!istype(id_card)) + to_chat(user, span_warning("You need to swipe your ID!")) + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + return + if (!(ACCESS_CAPTAIN in id_card.access)) + to_chat(user, span_warning("You are not authorized to do this!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return var/new_sec_level = SSsecurity_level.text_level_to_number(params["newSecurityLevel"]) +<<<<<<< HEAD if (new_sec_level < SEC_LEVEL_GREEN || new_sec_level > SEC_LEVEL_AMBER) //SKYRAT EDIT CHANGE - ALERTS +======= + if (new_sec_level != SEC_LEVEL_GREEN && new_sec_level != SEC_LEVEL_BLUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (SSsecurity_level.get_current_level_as_number() == new_sec_level) return SSsecurity_level.set_level(new_sec_level) +<<<<<<< HEAD to_chat(usr, span_notice("Authorization confirmed. Modifying security level.")) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) @@ -232,17 +285,38 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) alert_level_tick += 1 if ("deleteMessage") if (!authenticated(usr)) +======= + to_chat(user, span_notice("Authorization confirmed. Modifying security level.")) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + + // Only notify people if an actual change happened + user.log_message("changed the security level to [params["newSecurityLevel"]] with [src].", LOG_GAME) + message_admins("[ADMIN_LOOKUPFLW(user)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(user)].") + deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) + + alert_level_tick += 1 + if ("deleteMessage") + if (!authenticated(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/message_index = text2num(params["message"]) if (!message_index) return LAZYREMOVE(messages, LAZYACCESS(messages, message_index)) if ("makePriorityAnnouncement") +<<<<<<< HEAD if (!authenticated_as_silicon_or_captain(usr) && !syndicate) return make_announcement(usr) if ("messageAssociates") if (!authenticated_as_ai_or_captain(usr)) //Skyrat edit | Allows AI and Captain to send messages +======= + if (!authenticated_as_silicon_or_captain(user) && !syndicate) + return + make_announcement(user) + if ("messageAssociates") + if (!authenticated_as_non_silicon_captain(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!COOLDOWN_FINISHED(src, important_action_cooldown)) return @@ -252,6 +326,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/emagged = obj_flags & EMAGGED if (emagged) +<<<<<<< HEAD message_syndicate(message, usr) to_chat(usr, span_danger("SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.")) else if(syndicate) @@ -270,6 +345,26 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (can_buy_shuttles_or_fail_reason != TRUE) if (can_buy_shuttles_or_fail_reason != FALSE) to_chat(usr, span_alert("[can_buy_shuttles_or_fail_reason]")) +======= + message_syndicate(message, user) + to_chat(user, span_danger("SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.")) + else if(syndicate) + message_syndicate(message, user) + to_chat(user, span_danger("Message transmitted to Syndicate Command.")) + else + message_centcom(message, user) + to_chat(user, span_notice("Message transmitted to Central Command.")) + + var/associates = (emagged || syndicate) ? "the Syndicate": "CentCom" + user.log_talk(message, LOG_SAY, tag = "message to [associates]") + deadchat_broadcast(" has messaged [associates], \"[message]\" at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT) + COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) + if ("purchaseShuttle") + var/can_buy_shuttles_or_fail_reason = can_buy_shuttles(user) + if (can_buy_shuttles_or_fail_reason != TRUE) + if (can_buy_shuttles_or_fail_reason != FALSE) + to_chat(user, span_alert("[can_buy_shuttles_or_fail_reason]")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/shuttles = flatten_list(SSmapping.shuttle_templates) var/datum/map_template/shuttle/shuttle = locate(params["shuttle"]) in shuttles @@ -278,7 +373,11 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (!can_purchase_this_shuttle(shuttle)) return if (!shuttle.prerequisites_met()) +<<<<<<< HEAD to_chat(usr, span_alert("You have not met the requirements for purchasing this shuttle.")) +======= + to_chat(user, span_alert("You have not met the requirements for purchasing this shuttle.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/datum/bank_account/bank_account = SSeconomy.get_dep_account(ACCOUNT_CAR) if (bank_account.account_balance < shuttle.credit_cost) @@ -291,24 +390,41 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) SSshuttle.action_load(shuttle, replace = TRUE) bank_account.adjust_money(-shuttle.credit_cost) +<<<<<<< HEAD var/purchaser_name = (obj_flags & EMAGGED) ? scramble_message_replace_chars("AUTHENTICATION FAILURE: CVE-2018-17107", 60) : usr.real_name minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] credits.[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase") message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [shuttle.name].") log_shuttle("[key_name(usr)] has purchased [shuttle.name].") +======= + var/purchaser_name = (obj_flags & EMAGGED) ? scramble_message_replace_chars("AUTHENTICATION FAILURE: CVE-2018-17107", 60) : user.real_name + minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] credits.[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase") + + message_admins("[ADMIN_LOOKUPFLW(user)] purchased [shuttle.name].") + log_shuttle("[key_name(user)] has purchased [shuttle.name].") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSblackbox.record_feedback("text", "shuttle_purchase", 1, shuttle.name) state = STATE_MAIN if ("recallShuttle") // AIs cannot recall the shuttle +<<<<<<< HEAD if (!authenticated(usr) || HAS_SILICON_ACCESS(usr) || syndicate) return SSshuttle.cancelEvac(usr) if ("requestNukeCodes") if (!authenticated_as_non_silicon_captain(usr)) +======= + if (!authenticated(user) || HAS_SILICON_ACCESS(user) || syndicate) + return + SSshuttle.cancelEvac(user) + if ("requestNukeCodes") + if (!authenticated_as_non_silicon_captain(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!COOLDOWN_FINISHED(src, important_action_cooldown)) return var/reason = trim(html_encode(params["reason"]), MAX_MESSAGE_LEN) +<<<<<<< HEAD nuke_request(reason, usr) to_chat(usr, span_notice("Request sent.")) usr.log_message("has requested the nuclear codes from CentCom with reason \"[reason]\"", LOG_SAY) @@ -327,6 +443,26 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (!authenticated_as_non_silicon_captain(usr)) return if (!can_send_messages_to_other_sectors(usr)) +======= + nuke_request(reason, user) + to_chat(user, span_notice("Request sent.")) + user.log_message("has requested the nuclear codes from CentCom with reason \"[reason]\"", LOG_SAY) + priority_announce("The codes for the on-station nuclear self-destruct have been requested by [user]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self-Destruct Codes Requested", SSstation.announcer.get_rand_report_sound()) + playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE) + COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) + if ("restoreBackupRoutingData") + if (!authenticated_as_non_silicon_captain(user)) + return + if (!(obj_flags & EMAGGED)) + return + to_chat(user, span_notice("Backup routing data restored.")) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + obj_flags &= ~EMAGGED + if ("sendToOtherSector") + if (!authenticated_as_non_silicon_captain(user)) + return + if (!can_send_messages_to_other_sectors(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!COOLDOWN_FINISHED(src, important_action_cooldown)) return @@ -338,32 +474,52 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) GLOB.communications_controller.soft_filtering = FALSE var/list/hard_filter_result = is_ic_filtered(message) if(hard_filter_result) +<<<<<<< HEAD tgui_alert(usr, "Your message contains: (\"[hard_filter_result[CHAT_FILTER_INDEX_WORD]]\"), which is not allowed on this server.") +======= + tgui_alert(user, "Your message contains: (\"[hard_filter_result[CHAT_FILTER_INDEX_WORD]]\"), which is not allowed on this server.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/soft_filter_result = is_soft_ooc_filtered(message) if(soft_filter_result) +<<<<<<< HEAD if(tgui_alert(usr,"Your message 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(usr)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". They may be using a disallowed term for a cross-station message. Increasing delay time to reject.\n\n Message: \"[html_encode(message)]\"") log_admin_private("[key_name(usr)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". They may be using a disallowed term for a cross-station message. Increasing delay time to reject.\n\n Message: \"[message]\"") +======= + if(tgui_alert(user,"Your message 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 cross-station message. Increasing delay time to reject.\n\n Message: \"[html_encode(message)]\"") + 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 cross-station message. Increasing delay time to reject.\n\n Message: \"[message]\"") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.communications_controller.soft_filtering = TRUE playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) var/destination = params["destination"] +<<<<<<< HEAD usr.log_message("is about to send the following message to [destination]: [message]", LOG_GAME) to_chat( GLOB.admins, span_adminnotice( \ "CROSS-SECTOR MESSAGE (OUTGOING): [ADMIN_LOOKUPFLW(usr)] is about to send \ +======= + user.log_message("is about to send the following message to [destination]: [message]", LOG_GAME) + to_chat( + GLOB.admins, + span_adminnotice( \ + "CROSS-SECTOR MESSAGE (OUTGOING): [ADMIN_LOOKUPFLW(user)] is about to send \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 the following message to [destination] (will autoapprove in [GLOB.communications_controller.soft_filtering ? DisplayTimeText(EXTENDED_CROSS_SECTOR_CANCEL_TIME) : DisplayTimeText(CROSS_SECTOR_CANCEL_TIME)]): \ REJECT
\ [html_encode(message)]" \ ) ) +<<<<<<< HEAD send_cross_comms_message_timer = addtimer(CALLBACK(src, PROC_REF(send_cross_comms_message), usr, destination, message), GLOB.communications_controller.soft_filtering ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) @@ -377,13 +533,32 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) set_state(usr, params["state"]) if ("setStatusMessage") if (!authenticated(usr)) +======= + send_cross_comms_message_timer = addtimer(CALLBACK(src, PROC_REF(send_cross_comms_message), user, destination, message), GLOB.communications_controller.soft_filtering ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) + + COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) + if ("setState") + if (!authenticated(user)) + return + if (!(params["state"] in approved_states)) + return + if (state == STATE_BUYING_SHUTTLE && can_buy_shuttles(user) != TRUE) + return + set_state(usr, params["state"]) + if ("setStatusMessage") + if (!authenticated(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/line_one = reject_bad_text(params["upperText"] || "", MAX_STATUS_LINE_LENGTH) var/line_two = reject_bad_text(params["lowerText"] || "", MAX_STATUS_LINE_LENGTH) post_status("message", line_one, line_two) last_status_display = list(line_one, line_two) if ("setStatusPicture") +<<<<<<< HEAD if (!authenticated(usr)) +======= + if (!authenticated(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/picture = params["picture"] if (!(picture in GLOB.status_display_approved_pictures)) @@ -409,10 +584,17 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) authenticated = TRUE authorize_access = SSid_access.get_region_access_list(list(REGION_ALL_STATION)) authorize_name = "Unknown" +<<<<<<< HEAD to_chat(usr, span_warning("[src] lets out a quiet alarm as its login is overridden.")) playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE) else if(isliving(usr)) var/mob/living/L = usr +======= + to_chat(user, span_warning("[src] lets out a quiet alarm as its login is overridden.")) + playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE) + else if(isliving(user)) + var/mob/living/L = user +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/card/id/id_card = L.get_idcard(hand_first = TRUE) if (check_access(id_card)) authenticated = TRUE @@ -424,6 +606,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) imprint_gps(gps_tag = "Encrypted Communications Channel") if ("toggleEmergencyAccess") +<<<<<<< HEAD if(emergency_access_cooldown(usr)) //if were in cooldown, dont allow the following code return if (!authenticated_as_silicon_or_captain(usr)) @@ -516,6 +699,61 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) else if((last_toggled + EMERGENCY_ACCESS_COOLDOWN) < world.time) toggle_uses = 0 //either cooldown is done, or we just havent touched it in 30 seconds, either way reset uses +======= + if(emergency_access_cooldown(user)) //if were in cooldown, dont allow the following code + return + if (!authenticated_as_silicon_or_captain(user)) + return + if (GLOB.emergency_access) + revoke_maint_all_access() + user.log_message("disabled emergency maintenance access.", LOG_GAME) + message_admins("[ADMIN_LOOKUPFLW(user)] disabled emergency maintenance access.") + deadchat_broadcast(" disabled emergency maintenance access at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT) + else + make_maint_all_access() + user.log_message("enabled emergency maintenance access.", LOG_GAME) + message_admins("[ADMIN_LOOKUPFLW(user)] enabled emergency maintenance access.") + deadchat_broadcast(" enabled emergency maintenance access at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT) + // Request codes for the Captain's Spare ID safe. + if("requestSafeCodes") + if(SSjob.assigned_captain) + to_chat(user, span_warning("There is already an assigned Captain or Acting Captain on deck!")) + return + + if(SSjob.safe_code_timer_id) + to_chat(user, span_warning("The safe code has already been requested and is being delivered to your station!")) + return + + if(SSjob.safe_code_requested) + to_chat(user, span_warning("The safe code has already been requested and delivered to your station!")) + return + + if(!SSid_access.spare_id_safe_code) + to_chat(user, span_warning("There is no safe code to deliver to your station!")) + return + + var/turf/pod_location = get_turf(src) + + SSjob.safe_code_request_loc = pod_location + SSjob.safe_code_requested = TRUE + SSjob.safe_code_timer_id = addtimer(CALLBACK(SSjob, TYPE_PROC_REF(/datum/controller/subsystem/job, send_spare_id_safe_code), pod_location), 120 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) + minor_announce("Due to staff shortages, your station has been approved for delivery of access codes to secure the Captain's Spare ID. Delivery via drop pod at [get_area(pod_location)]. ETA 120 seconds.") + +/obj/machinery/computer/communications/proc/emergency_access_cooldown(mob/user) + if(toggle_uses == toggle_max_uses) //you have used up free uses already, do it one more time and start a cooldown + to_chat(user, span_warning("This was your last free use without cooldown, you will not be able to use this again for [DisplayTimeText(EMERGENCY_ACCESS_COOLDOWN)].")) + COOLDOWN_START(src, emergency_access_cooldown, EMERGENCY_ACCESS_COOLDOWN) + ++toggle_uses //add a use so that this if() is false the next time you try this button + return FALSE + + if(!COOLDOWN_FINISHED(src, emergency_access_cooldown)) + var/time_left = DisplayTimeText(COOLDOWN_TIMELEFT(src, emergency_access_cooldown), 1) + to_chat(user, span_warning("Emergency Access is still in cooldown for [time_left]!")) + return TRUE //dont use the button, we are in cooldown + else if((last_toggled + EMERGENCY_ACCESS_COOLDOWN) < world.time) + toggle_uses = 0 //either cooldown is done, or we just havent touched it in 30 seconds, either way reset uses + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ++toggle_uses //add a use last_toggled = world.time return FALSE //if we are not in cooldown, allow using the button @@ -525,13 +763,18 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/list/payload = list() +<<<<<<< HEAD payload["sender_ckey"] = usr.ckey +======= + payload["sender_ckey"] = user.ckey +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/network_name = CONFIG_GET(string/cross_comms_network) if(network_name) payload["network"] = network_name if(GLOB.communications_controller.soft_filtering) payload["is_filtered"] = TRUE +<<<<<<< HEAD var/name_to_send = "[CONFIG_GET(string/cross_comms_name)]([station_name()])" //SKYRAT EDIT ADDITION send2otherserver(html_decode(name_to_send), message, "Comms_Console", destination == "all" ? null : list(destination), additional_data = payload) //SKYRAT EDIT END @@ -539,6 +782,13 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) usr.log_talk(message, LOG_SAY, tag = "message to the other server") message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server\[s].") deadchat_broadcast(" has sent an outgoing message to the other station(s).", "[usr.real_name]", usr, message_type = DEADCHAT_ANNOUNCEMENT) +======= + send2otherserver(html_decode(station_name()), message, "Comms_Console", destination == "all" ? null : list(destination), additional_data = payload) + minor_announce(message, title = "Outgoing message to allied station") + user.log_talk(message, LOG_SAY, tag = "message to the other server") + message_admins("[ADMIN_LOOKUPFLW(user)] has sent a message to the other server\[s].") + deadchat_broadcast(" has sent an outgoing message to the other station(s).", "[user.real_name]", user, message_type = DEADCHAT_ANNOUNCEMENT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.communications_controller.soft_filtering = FALSE // set it to false at the end of the proc to ensure that everything prior reads as intended /obj/machinery/computer/communications/ui_data(mob/user) @@ -583,7 +833,10 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) data["canSendToSectors"] = FALSE data["canSetAlertLevel"] = FALSE data["canToggleEmergencyAccess"] = FALSE +<<<<<<< HEAD data["canToggleEngineeringOverride"] = FALSE //SKYRAT EDIT - Engineering Override +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["importantActionReady"] = COOLDOWN_FINISHED(src, important_action_cooldown) data["shuttleCalled"] = FALSE data["shuttleLastCalled"] = FALSE @@ -615,17 +868,24 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (authenticated_as_silicon_or_captain(user)) data["canToggleEmergencyAccess"] = TRUE data["emergencyAccess"] = GLOB.emergency_access +<<<<<<< HEAD data["canToggleEngineeringOverride"] = TRUE //SKYRAT EDIT - Engineering Override Toggle data["engineeringOverride"] = GLOB.force_eng_override //SKYRAT EDIT - Engineering Override Toggle +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["alertLevelTick"] = alert_level_tick data["canMakeAnnouncement"] = TRUE data["canSetAlertLevel"] = HAS_SILICON_ACCESS(user) ? "NO_SWIPE_NEEDED" : "SWIPE_NEEDED" else if(syndicate) data["canMakeAnnouncement"] = TRUE +<<<<<<< HEAD if (authenticated_as_ai_or_captain(user)) data["canMessageAssociates"] = TRUE //Skyrat Edit | Allows AI to report to CC in the event of there being no command alive/to begin with +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (SSshuttle.emergency.mode != SHUTTLE_IDLE && SSshuttle.emergency.mode != SHUTTLE_RECALL) data["shuttleCalled"] = TRUE data["shuttleRecallable"] = SSshuttle.canRecall() || syndicate @@ -799,7 +1059,11 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/list/players = get_communication_players() GLOB.communications_controller.make_announcement(user, is_ai, input, syndicate || (obj_flags & EMAGGED), players) +<<<<<<< HEAD deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(usr, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) +======= + deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/communications/proc/get_communication_players() return GLOB.player_list @@ -997,6 +1261,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) #undef STATE_CHANGING_STATUS #undef STATE_MAIN #undef STATE_MESSAGES +<<<<<<< HEAD //SKYRAT EDIT ADDITION #undef EMERGENCY_RESPONSE_POLICE @@ -1004,3 +1269,5 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) #undef EMERGENCY_RESPONSE_EMT #undef EMERGENCY_RESPONSE_EMAG //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 27ad25f1832..1c207551f09 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -44,7 +44,10 @@ . += create_table_notices(list( "name", "job", +<<<<<<< HEAD "is_robot", //SKYRAT EDIT ADDITION - Displaying robotic species Icon +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "life_status", "suffocation", "toxin", @@ -65,7 +68,10 @@ var/list/entry = list() entry["name"] = player_record["name"] entry["job"] = player_record["assignment"] +<<<<<<< HEAD entry["is_robot"] = player_record["is_robot"] //SKYRAT EDIT ADDITION - Displaying robotic species Icon +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 entry["life_status"] = player_record["life_status"] entry["suffocation"] = player_record["oxydam"] entry["toxin"] = player_record["toxdam"] @@ -103,40 +109,59 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_HEAD_OF_SECURITY = 10, JOB_WARDEN = 11, JOB_SECURITY_OFFICER = 12, +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - We need those slots for our own jobs, these jobs aren't on Skyrat anymore anyway. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JOB_SECURITY_OFFICER_MEDICAL = 13, JOB_SECURITY_OFFICER_ENGINEERING = 14, JOB_SECURITY_OFFICER_SCIENCE = 15, JOB_SECURITY_OFFICER_SUPPLY = 16, +<<<<<<< HEAD */ JOB_CORRECTIONS_OFFICER = 13, // SKYRAT EDIT ADDITION JOB_DETECTIVE = 14, +======= + JOB_DETECTIVE = 17, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 20-29: Medbay JOB_CHIEF_MEDICAL_OFFICER = 20, JOB_CHEMIST = 21, JOB_MEDICAL_DOCTOR = 22, JOB_PARAMEDIC = 23, JOB_CORONER = 24, +<<<<<<< HEAD JOB_ORDERLY = 25, // SKYRAT EDIT ADDITION JOB_PSYCHOLOGIST = 26, // SKYRAT EDIT - ORIGINAL: JOB_PSYCHOLOGIST = 71, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 30-39: Science JOB_RESEARCH_DIRECTOR = 30, JOB_SCIENTIST = 31, JOB_ROBOTICIST = 32, JOB_GENETICIST = 33, +<<<<<<< HEAD JOB_SCIENCE_GUARD = 34, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 40-49: Engineering JOB_CHIEF_ENGINEER = 40, JOB_STATION_ENGINEER = 41, JOB_ATMOSPHERIC_TECHNICIAN = 42, +<<<<<<< HEAD JOB_ENGINEERING_GUARD = 43, // SKYRAT EDIT ADDITION JOB_TELECOMMS_SPECIALIST = 44, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 50-59: Cargo JOB_QUARTERMASTER = 50, JOB_SHAFT_MINER = 51, JOB_CARGO_TECHNICIAN = 52, JOB_BITRUNNER = 53, +<<<<<<< HEAD JOB_CUSTOMS_AGENT = 54, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 60+: Service JOB_HEAD_OF_PERSONNEL = 60, JOB_BARTENDER = 61, @@ -149,8 +174,12 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_MIME = 68, JOB_JANITOR = 69, JOB_LAWYER = 71, +<<<<<<< HEAD JOB_BARBER = 72, // SKYRAT EDIT ADDITION JOB_BOUNCER = 73, // SKYRAT EDIT ADDITION +======= + JOB_PSYCHOLOGIST = 72, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 200-229: Centcom JOB_CENTCOM_ADMIRAL = 200, JOB_CENTCOM = 201, @@ -168,8 +197,11 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_ERT_CHAPLAIN = 225, JOB_ERT_JANITOR = 226, JOB_ERT_DEATHSQUAD = 227, +<<<<<<< HEAD JOB_NT_REP = 230, // SKYRAT EDIT ADDITION JOB_BLUESHIELD = 231, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // ANYTHING ELSE = UNKNOWN_JOB_ID, Unknowns/custom jobs will appear after civilians, and before assistants JOB_ASSISTANT = 999, @@ -196,7 +228,11 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) z = T.z . = list( "sensors" = update_data(z), +<<<<<<< HEAD "link_allowed" = HAS_AI_ACCESS(user) +======= + "link_allowed" = HAS_AI_ACCESS(user), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/crewmonitor/proc/update_data(z) @@ -259,6 +295,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) if (jobs[trim_assignment] != null) entry["ijob"] = jobs[trim_assignment] +<<<<<<< HEAD // SKYRAT EDIT BEGIN: Checking for robotic race if (issynthetic(tracked_human)) entry["is_robot"] = TRUE @@ -288,13 +325,42 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) results[++results.len] = entry +======= + // Current status + if (sensor_mode >= SENSOR_LIVING) + entry["life_status"] = tracked_living_mob.stat + + // Damage + if (sensor_mode >= SENSOR_VITALS) + entry += list( + "oxydam" = round(tracked_living_mob.getOxyLoss(), 1), + "toxdam" = round(tracked_living_mob.getToxLoss(), 1), + "burndam" = round(tracked_living_mob.getFireLoss(), 1), + "brutedam" = round(tracked_living_mob.getBruteLoss(), 1), + "health" = round(tracked_living_mob.health, 1), + ) + + // Location + if (sensor_mode >= SENSOR_COORDS) + entry["area"] = get_area_name(tracked_living_mob, format_text = TRUE) + + // Trackability + entry["can_track"] = tracked_living_mob.can_track() + + results[++results.len] = entry + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Cache result data_by_z["[z]"] = results last_update["[z]"] = world.time return results +<<<<<<< HEAD /datum/crewmonitor/ui_act(action, params) +======= +/datum/crewmonitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 80f59501f02..fcee0761982 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -398,7 +398,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/scan_consolenew/ui_act(action, list/params) +======= +/obj/machinery/computer/scan_consolenew/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/gene_letters = list("A", "T", "C", "G"); var/static/gene_letter_count = length(gene_letters) @@ -720,11 +724,14 @@ var/datum/mutation/human/matched_mutation = null //Go through all sequences for matching gene, and set the mutation for (var/M in subtypesof(/datum/mutation/human)) +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/datum/mutation/human/iterating_mutation = M if(initial(iterating_mutation.disabled)) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/true_sequence = GET_SEQUENCE(M) if (new_sequence == true_sequence) matched_mutation = M diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index 7c6d1307b76..e729a65680d 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -116,7 +116,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/launchpad/ui_act(action, params) +======= +/obj/machinery/computer/launchpad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/mechlaunchpad.dm b/code/game/machinery/computer/mechlaunchpad.dm index 46c0045fb35..3ede8afd4d4 100644 --- a/code/game/machinery/computer/mechlaunchpad.dm +++ b/code/game/machinery/computer/mechlaunchpad.dm @@ -205,7 +205,11 @@ data["mechonly"] = current_pad.mech_only return data +<<<<<<< HEAD /obj/machinery/computer/mechpad/ui_act(action, params) +======= +/obj/machinery/computer/mechpad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm index 43a18c7081f..99586a2138e 100644 --- a/code/game/machinery/computer/operating_computer.dm +++ b/code/game/machinery/computer/operating_computer.dm @@ -163,7 +163,11 @@ )) return data +<<<<<<< HEAD /obj/machinery/computer/operating/ui_act(action, params) +======= +/obj/machinery/computer/operating/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/orders/order_computer/mining_order.dm b/code/game/machinery/computer/orders/order_computer/mining_order.dm index 2ba9e00d9f5..775c8f6e0c1 100644 --- a/code/game/machinery/computer/orders/order_computer/mining_order.dm +++ b/code/game/machinery/computer/orders/order_computer/mining_order.dm @@ -62,7 +62,11 @@ /obj/machinery/computer/order_console/mining/retrieve_points(obj/item/card/id/id_card) return round(id_card.registered_account.mining_points) +<<<<<<< HEAD /obj/machinery/computer/order_console/mining/ui_act(action, params) +======= +/obj/machinery/computer/order_console/mining/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!.) flick("mining-deny", src) @@ -71,11 +75,14 @@ if(istype(weapon, /obj/item/mining_voucher)) redeem_voucher(weapon, user) return +<<<<<<< HEAD //SKYRAT EDIT ADDITON BEGIN - SEVA if(istype(weapon, /obj/item/suit_voucher)) redeem_suit_voucher(weapon, user) return //SKYRAT EDIT ADDITON END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /obj/machinery/computer/order_console/mining/update_icon_state() @@ -126,7 +133,11 @@ /obj/machinery/computer/order_console/mining/proc/check_menu(obj/item/mining_voucher/voucher, mob/living/redeemer) if(!istype(redeemer)) return FALSE +<<<<<<< HEAD if(redeemer.incapacitated()) +======= + if(redeemer.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(QDELETED(voucher)) return FALSE diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm index 54fda957526..c547d91b5f5 100644 --- a/code/game/machinery/computer/orders/order_computer/order_computer.dm +++ b/code/game/machinery/computer/orders/order_computer/order_computer.dm @@ -124,7 +124,11 @@ GLOBAL_LIST_EMPTY(order_console_products) )) return data +<<<<<<< HEAD /obj/machinery/computer/order_console/ui_act(action, params) +======= +/obj/machinery/computer/order_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 4cc32401704..6be8a5aaacc 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -78,7 +78,11 @@ break return data +<<<<<<< HEAD /obj/machinery/computer/pod/ui_act(action, list/params) +======= +/obj/machinery/computer/pod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index 4c2f4dacde3..0323e66663f 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -67,7 +67,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_act(action, list/params) +======= +/obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/prisoner/management.dm b/code/game/machinery/computer/prisoner/management.dm index ada71bad023..612761e9202 100644 --- a/code/game/machinery/computer/prisoner/management.dm +++ b/code/game/machinery/computer/prisoner/management.dm @@ -20,7 +20,11 @@ GLOBAL_LIST_EMPTY_TYPED(tracked_implants, /obj/item/implant) /obj/machinery/computer/prisoner/management/ui_data(mob/user) var/list/data = list() +<<<<<<< HEAD data["authorized"] = (authenticated && isliving(user)) || isAdminGhostAI(user) || issilicon(user) +======= + data["authorized"] = (authenticated && isliving(user)) || HAS_SILICON_ACCESS(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["inserted_id"] = null if(!isnull(contained_id)) data["inserted_id"] = list( @@ -43,7 +47,11 @@ GLOBAL_LIST_EMPTY_TYPED(tracked_implants, /obj/item/implant) return data +<<<<<<< HEAD /obj/machinery/computer/prisoner/management/ui_act(action, list/params) +======= +/obj/machinery/computer/prisoner/management/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/records/medical.dm b/code/game/machinery/computer/records/medical.dm index 2043e129da3..3e0b5a71335 100644 --- a/code/game/machinery/computer/records/medical.dm +++ b/code/game/machinery/computer/records/medical.dm @@ -52,7 +52,10 @@ records += list(list( age = target.age, +<<<<<<< HEAD chrono_age = target.chrono_age, // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = target.blood_type, crew_ref = REF(target), dna = target.dna_string, @@ -67,10 +70,13 @@ rank = target.rank, species = target.species, trim = target.trim, +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Expanded records! past_medical_records = target.past_medical_records, past_general_records = target.past_general_records, // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) data["records"] = records @@ -81,7 +87,10 @@ var/list/data = list() data["min_age"] = AGE_MIN data["max_age"] = AGE_MAX +<<<<<<< HEAD data["max_chrono_age"] = AGE_CHRONO_MAX // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["physical_statuses"] = PHYSICAL_STATUSES data["mental_statuses"] = MENTAL_STATUSES return data @@ -147,7 +156,10 @@ return FALSE target.age = 18 +<<<<<<< HEAD target.chrono_age = 18 // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.blood_type = pick(list("A+", "A-", "B+", "B-", "O+", "O-", "AB+", "AB-")) target.dna_string = "Unknown" target.gender = "Unknown" diff --git a/code/game/machinery/computer/records/security.dm b/code/game/machinery/computer/records/security.dm index eda93ad579d..6de06b8db12 100644 --- a/code/game/machinery/computer/records/security.dm +++ b/code/game/machinery/computer/records/security.dm @@ -119,7 +119,10 @@ records += list(list( age = target.age, +<<<<<<< HEAD chrono_age = target.chrono_age, // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 citations = citations, crew_ref = REF(target), crimes = crimes, @@ -131,10 +134,13 @@ species = target.species, trim = target.trim, wanted_status = target.wanted_status, +<<<<<<< HEAD // SKYRAT EDIT ADDITION - RP Records past_general_records = target.past_general_records, past_security_records = target.past_security_records, // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) data["records"] = records @@ -145,7 +151,10 @@ var/list/data = list() data["min_age"] = AGE_MIN data["max_age"] = AGE_MAX +<<<<<<< HEAD data["max_chrono_age"] = AGE_CHRONO_MAX // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /obj/machinery/computer/records/security/ui_act(action, list/params, datum/tgui/ui) @@ -375,12 +384,19 @@ printable = wanted_poster if("rapsheet") +<<<<<<< HEAD /// SKYRAT EDIT REMOVE - REMOVE CRIMES REQUIREMENT FOR PRINTING RECORDS //var/list/crimes = target.crimes //if(!length(crimes)) //balloon_alert(user, "no crimes") //return FALSE /// SKYRAT EDIT REMOVE END +======= + var/list/crimes = target.crimes + if(!length(crimes)) + balloon_alert(user, "no crimes") + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/paper/rapsheet = target.get_rapsheet(input_alias, input_header, input_description) printable = rapsheet diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 0c8b6e58d6e..6f83b4d3727 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -81,7 +81,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/robotics/ui_act(action, params) +======= +/obj/machinery/computer/robotics/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 53fda80f4fa..ca04ad79563 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -31,7 +31,11 @@ . = ..() if(machine_stat & (NOPOWER|BROKEN)) return +<<<<<<< HEAD if(length(alert_control?.listener.alarms)) /// SKYRAT EDIT - Fixing master - Original: if(length(alert_control.listener.alarms)) +======= + if(length(alert_control.listener.alarms)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "alert:2" /** diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index d00c5824d8b..e9f356df708 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -84,7 +84,11 @@ power_station.teleporter_hub.update_appearance() power_station.teleporter_hub.calibrated = FALSE +<<<<<<< HEAD /obj/machinery/computer/teleporter/ui_act(action, params) +======= +/obj/machinery/computer/teleporter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm index deca4ec8245..d7839760366 100644 --- a/code/game/machinery/computer/telescreen.dm +++ b/code/game/machinery/computer/telescreen.dm @@ -40,6 +40,11 @@ circuit = null interaction_flags_atom = INTERACT_ATOM_UI_INTERACT | INTERACT_ATOM_NO_FINGERPRINT_INTERACT | INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND | INTERACT_MACHINE_REQUIRES_SIGHT frame_type = /obj/item/wallframe/telescreen/entertainment +<<<<<<< HEAD +======= + /// Virtual radio inside of the entertainment monitor to broadcast audio + var/obj/item/radio/entertainment/speakers/speakers +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/icon_state_off = "entertainment_blank" var/icon_state_on = "entertainment" @@ -55,8 +60,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai . = ..() RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick)) find_and_hang_on_wall() +<<<<<<< HEAD // Bypass clickchain to allow humans to use the telescreen from a distance +======= + speakers = new(src) + +/obj/machinery/computer/security/telescreen/entertainment/Destroy() + . = ..() + QDEL_NULL(speakers) + +/// Bypass clickchain to allow humans to use the telescreen from a distance +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/security/telescreen/entertainment/proc/BigClick() SIGNAL_HANDLER @@ -66,7 +81,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, interact), usr) +<<<<<<< HEAD ///Sets the monitor's icon to the selected state, and says an announcement +======= +/// Sets the monitor's icon to the selected state, and says an announcement +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/security/telescreen/entertainment/proc/notify(on, announcement) if(on && icon_state == icon_state_off) icon_state = icon_state_on diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index dea1972cea7..9e49a196297 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -68,7 +68,7 @@ /obj/machinery/jukebox/ui_data(mob/user) return music_player.get_ui_data() -/obj/machinery/jukebox/ui_act(action, list/params) +/obj/machinery/jukebox/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -384,4 +384,7 @@ /obj/machinery/jukebox/disco/proc/dance4_revert(mob/living/dancer, matrix/starting_matrix) animate(dancer, transform = starting_matrix, time = 5, loop = 0) REMOVE_TRAIT(dancer, TRAIT_DISCO_DANCER, REF(src)) +<<<<<<< HEAD SKYRAT EDIT END*/ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index fc74b18c03c..d49c379487b 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -11,8 +11,12 @@ pass_flags = PASSTABLE interaction_flags_click = ALLOW_SILICON_REACH /// List of dishes the drive can hold +<<<<<<< HEAD var/list/collectable_items = list(/obj/item/trash/waffles, // SKYRAT EDIT CHANGE - non-static list /obj/item/trash/waffles, +======= + var/static/list/collectable_items = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/broken_bottle, /obj/item/kitchen/fork, /obj/item/plate, @@ -23,8 +27,12 @@ /obj/item/trash/tray, ) /// List of items the drive detects as trash +<<<<<<< HEAD var/static/list/disposable_items = list(/obj/item/trash/waffles, /obj/item/trash/waffles, +======= + var/static/list/disposable_items = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/broken_bottle, /obj/item/plate_shard, /obj/item/shard, @@ -38,7 +46,10 @@ var/list/dish_drive_contents /// Distance this is capable of sucking dishes up over. (2 + servo tier) var/suck_distance = 0 +<<<<<<< HEAD var/binrange = 7 //SKYRAT EDIT ADDITION - SEC_HAUL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 COOLDOWN_DECLARE(time_since_dishes) @@ -126,7 +137,10 @@ do_the_dishes() if(!suction_enabled) return +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/dish in view(2 + suck_distance, src)) if(is_type_in_list(dish, collectable_items) && dish.loc != src && (!dish.reagents || !dish.reagents.total_volume) && (dish.contents.len < 1)) if(dish.Adjacent(src)) diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm index d24a951d76b..448e43303ff 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm @@ -1,6 +1,10 @@ /* * Tier one entries are unlocked at the start, and are for dna mutants that are: +<<<<<<< HEAD * - easy to aquire (rats) +======= + * - easy to acquire (rats) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - have a bonus for getting past a threshold * - might serve a job purpose for others (goliath) and thus should be gainable early enough */ diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm index 5eb13847bb5..83191d530da 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm @@ -1,6 +1,10 @@ /* * Tier two entries are unlocked after infusing someone/being infused and achieving a bonus, and are for dna mutants that are: +<<<<<<< HEAD * - harder to aquire (gondolas) but not *necessarily* requiring job help +======= + * - harder to acquire (gondolas) but not *necessarily* requiring job help +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - have a bonus for getting past a threshold * * todos for the future: diff --git a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm index f86a161b1ce..15f3ee6cd02 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm @@ -48,6 +48,7 @@ "s" = "z", "S" = "Z", ) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Russian version var/static/list/russian_speech_replacements = list( new /regex("z+", "g") = "zzz", @@ -64,6 +65,12 @@ /obj/item/organ/internal/tongue/fly/New(class, timer, datum/mutation/human/copymut) . = ..() AddComponent(/datum/component/speechmod, replacements = CONFIG_GET(flag/russian_text_formation) ? russian_speech_replacements : speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) // SKYRAT EDIT CHANGE - ORIGINAL:AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) +======= + +/obj/item/organ/internal/tongue/fly/New(class, timer, datum/mutation/human/copymut) + . = ..() + AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/fly/Initialize(mapload) . = ..() @@ -137,7 +144,10 @@ //useless organs we throw in just to fuck with surgeons a bit more. they aren't part of a bonus, just the (absolute) state of flies /obj/item/organ/internal/fly desc = FLY_INFUSED_ORGAN_DESC +<<<<<<< HEAD visual = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/fly/Initialize(mapload) . = ..() diff --git a/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm index a9d2d956f7f..ae7b9047855 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm @@ -6,6 +6,7 @@ visual = TRUE damage_multiplier = 2 +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION /* /obj/item/organ/internal/ears/fox/on_mob_insert(mob/living/carbon/human/ear_owner) @@ -24,3 +25,6 @@ ear_owner.update_body() */ //SKYRAT EDIT REMOVAL END +======= + sprite_accessory_override = /datum/sprite_accessory/ears/fox +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm index 797c7839b2c..b91c899ce98 100644 --- a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm @@ -34,7 +34,11 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_They radiate%PRONOUN_s an aura of serenity.") AddElement(/datum/element/update_icon_blocker) +<<<<<<< HEAD /obj/item/organ/internal/heart/gondola/Insert(mob/living/carbon/receiver, special, movement_flags) +======= +/obj/item/organ/internal/heart/gondola/mob_insert(mob/living/carbon/receiver, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!(FACTION_HOSTILE in receiver.faction)) factions_to_remove += FACTION_HOSTILE @@ -42,7 +46,11 @@ Fluoride Stare: After someone says 5 words, blah blah blah... factions_to_remove += FACTION_MINING receiver.faction |= list(FACTION_HOSTILE, FACTION_MINING) +<<<<<<< HEAD /obj/item/organ/internal/heart/gondola/Remove(mob/living/carbon/heartless, special, movement_flags) +======= +/obj/item/organ/internal/heart/gondola/mob_remove(mob/living/carbon/heartless, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() for(var/faction in factions_to_remove) heartless.faction -= faction @@ -64,11 +72,19 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_Their mouth is permanently affixed into a relaxed smile.", BODY_ZONE_PRECISE_MOUTH) AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/gondola) +<<<<<<< HEAD /obj/item/organ/internal/tongue/gondola/Insert(mob/living/carbon/tongue_owner, special, movement_flags) . = ..() tongue_owner.add_mood_event("gondola_zen", /datum/mood_event/gondola_serenity) /obj/item/organ/internal/tongue/gondola/Remove(mob/living/carbon/tongue_owner, special, movement_flags) +======= +/obj/item/organ/internal/tongue/gondola/mob_insert(mob/living/carbon/tongue_owner, special, movement_flags) + . = ..() + tongue_owner.add_mood_event("gondola_zen", /datum/mood_event/gondola_serenity) + +/obj/item/organ/internal/tongue/gondola/mob_remove(mob/living/carbon/tongue_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tongue_owner.clear_mood_event("gondola_zen") return ..() @@ -87,7 +103,11 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_Their left arm has small needles breaching the skin all over it.", BODY_ZONE_L_ARM) AddElement(/datum/element/noticable_organ, "%PRONOUN_Their right arm has small needles breaching the skin all over it.", BODY_ZONE_R_ARM) +<<<<<<< HEAD /obj/item/organ/internal/liver/gondola/Insert(mob/living/carbon/liver_owner, special, movement_flags) +======= +/obj/item/organ/internal/liver/gondola/mob_insert(mob/living/carbon/liver_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() var/has_left = liver_owner.has_left_hand(check_disabled = FALSE) var/has_right = liver_owner.has_right_hand(check_disabled = FALSE) @@ -102,7 +122,11 @@ Fluoride Stare: After someone says 5 words, blah blah blah... RegisterSignal(liver_owner, COMSIG_LIVING_TRY_PULL, PROC_REF(on_owner_try_pull)) RegisterSignal(liver_owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug)) +<<<<<<< HEAD /obj/item/organ/internal/liver/gondola/Remove(mob/living/carbon/liver_owner, special, movement_flags) +======= +/obj/item/organ/internal/liver/gondola/mob_remove(mob/living/carbon/liver_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() UnregisterSignal(liver_owner, list(COMSIG_HUMAN_EQUIPPING_ITEM, COMSIG_LIVING_TRY_PULL, COMSIG_CARBON_HELPED)) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 0c84e401d6c..82154802d8e 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -117,7 +117,10 @@ return TRUE +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/dna_scannernew/relaymove(mob/living/user, direction) if(user.stat || locked) if(message_cooldown <= world.time) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0b325951e29..1106ef65ad4 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -22,6 +22,7 @@ /// Someone, for the love of god, profile this. Is there a reason to cache mutable_appearance /// if so, why are we JUST doing the airlocks when we can put this in mutable_appearance.dm for /// everything +<<<<<<< HEAD /proc/get_airlock_overlay(icon_state, icon_file, atom/offset_spokesman, em_block, state_color = null) // SKYRAT EDIT - Airlock accent greyscale color support - Added `state_color = null` var/static/list/airlock_overlays = list() @@ -37,6 +38,14 @@ . = airlock_overlays[base_icon_key] = airlock_overlay // SKYRAT EDIT END +======= +/proc/get_airlock_overlay(icon_state, icon_file, atom/offset_spokesman, em_block) + var/static/list/airlock_overlays = list() + + var/base_icon_key = "[icon_state][REF(icon_file)]" + if(!(. = airlock_overlays[base_icon_key])) + . = airlock_overlays[base_icon_key] = mutable_appearance(icon_file, icon_state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(em_block)) return @@ -61,6 +70,7 @@ #define AIRLOCK_FRAME_OPEN "open" #define AIRLOCK_FRAME_OPENING "opening" +<<<<<<< HEAD #define AIRLOCK_SECURITY_NONE 0 //Normal airlock //Wires are not secured #define AIRLOCK_SECURITY_IRON 1 //Medium security airlock //There is a simple iron plate over wires (use welder) #define AIRLOCK_SECURITY_PLASTEEL_I_S 2 //Sliced inner plating (use crowbar), jumps to 0 @@ -69,6 +79,21 @@ #define AIRLOCK_SECURITY_PLASTEEL_O 5 //There is first layer of plasteel (use welder) #define AIRLOCK_SECURITY_PLASTEEL 6 //Max security airlock //Fully secured wires (use wirecutters to remove grille, that is electrified) +======= +#define AIRLOCK_FRAME_CLOSED "closed" +#define AIRLOCK_FRAME_CLOSING "closing" +#define AIRLOCK_FRAME_OPEN "open" +#define AIRLOCK_FRAME_OPENING "opening" + +#define AIRLOCK_SECURITY_NONE 0 //Normal airlock //Wires are not secured +#define AIRLOCK_SECURITY_IRON 1 //Medium security airlock //There is a simple iron plate over wires (use welder) +#define AIRLOCK_SECURITY_PLASTEEL_I_S 2 //Sliced inner plating (use crowbar), jumps to 0 +#define AIRLOCK_SECURITY_PLASTEEL_I 3 //Removed outer plating, second layer here (use welder) +#define AIRLOCK_SECURITY_PLASTEEL_O_S 4 //Sliced outer plating (use crowbar) +#define AIRLOCK_SECURITY_PLASTEEL_O 5 //There is first layer of plasteel (use welder) +#define AIRLOCK_SECURITY_PLASTEEL 6 //Max security airlock //Fully secured wires (use wirecutters to remove grille, that is electrified) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define AIRLOCK_INTEGRITY_N 300 // Normal airlock integrity #define AIRLOCK_INTEGRITY_MULTIPLIER 1.5 // How much reinforced doors health increases /// How much extra health airlocks get when braced with a seal @@ -81,8 +106,11 @@ #define DOOR_CLOSE_WAIT 60 /// Time before a door closes, if not overridden #define DOOR_VISION_DISTANCE 11 ///The maximum distance a door will see out to +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - moved to code/__DEFINES/~skyrat_defines/airlock.dm +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock name = "Airlock" @@ -147,9 +175,15 @@ var/previous_airlock = /obj/structure/door_assembly /// Material of inner filling; if its an airlock with glass, this should be set to "glass" var/airlock_material +<<<<<<< HEAD var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE /// Used for papers and photos pinned to the airlock var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'//OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' + /// Used for papers and photos pinned to the airlock + var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Airlock pump that overrides airlock controlls when set up for cycling var/obj/machinery/atmospherics/components/unary/airlock_pump/cycle_pump @@ -526,7 +560,10 @@ if(AIRLOCK_DENY, AIRLOCK_OPENING, AIRLOCK_CLOSING, AIRLOCK_EMAG) icon_state = "nonexistenticonstate" //MADNESS +<<<<<<< HEAD /* SKYRAT EDIT MOVED TO AIRLOCK.DM IN AESTHETICS MODULE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock/update_overlays() . = ..() @@ -605,7 +642,10 @@ floorlight.pixel_x = -32 floorlight.pixel_y = 0 . += floorlight +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock/run_animation(animation) switch(animation) @@ -845,8 +885,12 @@ if(!istype(H.head, /obj/item/clothing/head/helmet)) H.visible_message(span_danger("[user] headbutts the airlock."), \ span_userdanger("You headbutt the airlock!")) +<<<<<<< HEAD //H.Paralyze(100) - SKYRAT EDIT REMOVAL - COMBAT H.StaminaKnockdown(10, TRUE, TRUE) +======= + H.Paralyze(100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 H.apply_damage(10, BRUTE, BODY_ZONE_HEAD) else visible_message(span_danger("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.")) @@ -1318,8 +1362,12 @@ return TRUE if(BYPASS_DOOR_CHECKS) // No power usage, special sound, get it open. +<<<<<<< HEAD //playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) - ORIGINAL playsound(src, forcedOpen, 30, TRUE) //SKYRAT EDIT CHANGE - AESTHETICS +======= + playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE else @@ -1579,9 +1627,14 @@ if(!disassembled) A?.update_integrity(A.max_integrity * 0.5) +<<<<<<< HEAD else if(obj_flags & EMAGGED) //no electronics nothing else +======= + + else if(!(obj_flags & EMAGGED)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/electronics/airlock/ae if(!electronics) ae = new/obj/item/electronics/airlock(loc) @@ -1677,7 +1730,11 @@ data["wires"] = wire return data +<<<<<<< HEAD /obj/machinery/door/airlock/ui_act(action, params) +======= +/obj/machinery/door/airlock/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -1801,6 +1858,733 @@ /obj/machinery/door/airlock/proc/get_wires() var/area/source_area = get_area(src) return source_area?.airlock_wires ? new source_area.airlock_wires(src) : new /datum/wires/airlock(src) +<<<<<<< HEAD +======= + +/obj/structure/fluff/airlock_filler/Destroy(force) + filled_airlock = null + return ..() + +/** + * Create a ref to our parent airlock and listen for a QDEL, which we will al + */ +/obj/structure/fluff/airlock_filler/proc/pair_airlock(obj/machinery/door/parent_airlock) + if(isnull(parent_airlock)) + stack_trace("Attempted to pair an airlock filler with no parent airlock specified!") + return + + filled_airlock = parent_airlock + RegisterSignal(filled_airlock, COMSIG_QDELETING, PROC_REF(no_airlock)) + +/** + * Multi-tile airlocks pair with a filler panel, if one goes so does the other. + */ +/obj/structure/fluff/airlock_filler/proc/no_airlock() + SIGNAL_HANDLER + + qdel(src) + +/** + * Multi-tile airlocks (using a filler panel) have special handling for movables with PASSGLASS + */ +/obj/structure/fluff/airlock_filler/CanAllowThrough(atom/movable/mover, turf/target) + . = ..() + if(.) + return + + if(istype(mover) && (mover.pass_flags & PASSGLASS)) + return !opacity + +/obj/structure/fluff/airlock_filler/can_be_pulled(user, grab_state, force) + return FALSE + +/obj/structure/fluff/airlock_filler/singularity_act() + return + +/obj/structure/fluff/airlock_filler/singularity_pull(S, current_size) + return + +/obj/machinery/door/airlock/proc/set_cycle_pump(obj/machinery/atmospherics/components/unary/airlock_pump/pump) + RegisterSignal(pump, COMSIG_QDELETING, PROC_REF(unset_cycle_pump)) + cycle_pump = pump + +/obj/machinery/door/airlock/proc/unset_cycle_pump() + SIGNAL_HANDLER + if(locked) + unbolt() + say("Link broken, unbolting.") + cycle_pump = null + +// Station Airlocks Regular + +/obj/machinery/door/airlock/command + name = "command airlock" + icon = 'icons/obj/doors/airlocks/station/command.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_com + normal_integrity = 450 + +/obj/machinery/door/airlock/security + name = "security airlock" + icon = 'icons/obj/doors/airlocks/station/security.dmi' + var/id = null + assemblytype = /obj/structure/door_assembly/door_assembly_sec + normal_integrity = 450 + +/obj/machinery/door/airlock/engineering + name = "engineering airlock" + icon = 'icons/obj/doors/airlocks/station/engineering.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_eng + +/obj/machinery/door/airlock/medical + name = "medical airlock" + icon = 'icons/obj/doors/airlocks/station/medical.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_med + +/obj/machinery/door/airlock/hydroponics //Hydroponics front doors! + name = "hydroponics airlock" + icon = 'icons/obj/doors/airlocks/station/hydroponics.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_hydro + +/obj/machinery/door/airlock/maintenance + name = "maintenance access" + icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_mai + normal_integrity = 250 + +/obj/machinery/door/airlock/maintenance/external + name = "external airlock access" + icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_extmai + +/obj/machinery/door/airlock/mining + name = "mining airlock" + icon = 'icons/obj/doors/airlocks/station/mining.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_min + +/obj/machinery/door/airlock/atmos + name = "atmospherics airlock" + icon = 'icons/obj/doors/airlocks/station/atmos.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_atmo + +/obj/machinery/door/airlock/research + name = "research airlock" + icon = 'icons/obj/doors/airlocks/station/research.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_research + +/obj/machinery/door/airlock/freezer + name = "freezer airlock" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_fre + +/obj/machinery/door/airlock/science + name = "science airlock" + icon = 'icons/obj/doors/airlocks/station/science.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_science + +/obj/machinery/door/airlock/virology + name = "virology airlock" + icon = 'icons/obj/doors/airlocks/station/virology.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_viro + +// Station Airlocks Glass + +/obj/machinery/door/airlock/glass + name = "glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/glass/incinerator + autoclose = FALSE + heat_proof = TRUE + req_access = list(ACCESS_SYNDICATE) + +/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior + name = "Turbine Interior Airlock" + id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR + +/obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior + name = "Turbine Exterior Airlock" + id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR + +/obj/machinery/door/airlock/command/glass + name = "command glass airlock" + opacity = FALSE + glass = TRUE + normal_integrity = 400 + +/obj/machinery/door/airlock/engineering/glass + name = "engineering glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/engineering/glass/critical + critical_machine = TRUE //stops greytide virus from opening & bolting doors in critical positions, such as the SM chamber. + +/obj/machinery/door/airlock/security/glass + name = "security glass airlock" + opacity = FALSE + glass = TRUE + normal_integrity = 400 + +/obj/machinery/door/airlock/medical/glass + name = "medical glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/hydroponics/glass //Uses same icon as medical/glass, maybe update it with its own unique icon one day? + name = "hydroponics glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/research/glass + name = "research glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/research/glass/incinerator + autoclose = FALSE + heat_proof = TRUE + +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior + name = "Mixing Room Interior Airlock" + id_tag = INCINERATOR_ORDMIX_AIRLOCK_INTERIOR + +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior + name = "Mixing Room Exterior Airlock" + id_tag = INCINERATOR_ORDMIX_AIRLOCK_EXTERIOR + +/obj/machinery/door/airlock/mining/glass + name = "mining glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/atmos/glass + name = "atmospheric glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/atmos/glass/critical + critical_machine = TRUE //stops greytide virus from opening & bolting doors in critical positions, such as the SM chamber. + +/obj/machinery/door/airlock/science/glass + name = "science glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/virology/glass + name = "virology glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/maintenance/glass + name = "maintainence glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/maintenance/external/glass + name = "maintainence external glass airlock" + opacity = FALSE + glass = TRUE + normal_integrity = 200 + +// Station Airlocks Mineral + +/obj/machinery/door/airlock/gold + name = "gold airlock" + icon = 'icons/obj/doors/airlocks/station/gold.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_gold + +/obj/machinery/door/airlock/gold/discoinferno + heat_proof = TRUE + resistance_flags = FIRE_PROOF + armor_type = /datum/armor/discoinferno_airlock + +/datum/armor/discoinferno_airlock + melee = 30 + bullet = 30 + laser = 20 + energy = 20 + bomb = 10 + fire = 100 + acid = 100 + +/obj/machinery/door/airlock/gold/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/silver + name = "silver airlock" + icon = 'icons/obj/doors/airlocks/station/silver.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_silver + +/obj/machinery/door/airlock/silver/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/diamond + name = "diamond airlock" + icon = 'icons/obj/doors/airlocks/station/diamond.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_diamond + normal_integrity = 1000 + explosion_block = 2 + +/obj/machinery/door/airlock/diamond/glass + normal_integrity = 950 + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/uranium + name = "uranium airlock" + icon = 'icons/obj/doors/airlocks/station/uranium.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_uranium + var/last_event = 0 + //Is this airlock actually radioactive? + var/actually_radioactive = TRUE + +/obj/machinery/door/airlock/uranium/process() + if(actually_radioactive && world.time > last_event+20) + if(prob(50)) + radiate() + last_event = world.time + +/obj/machinery/door/airlock/uranium/proc/radiate() + radiation_pulse( + src, + max_range = 2, + threshold = RAD_LIGHT_INSULATION, + chance = URANIUM_IRRADIATION_CHANCE, + minimum_exposure_time = URANIUM_RADIATION_MINIMUM_EXPOSURE_TIME, + ) + +/obj/machinery/door/airlock/uranium/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/uranium/safe + actually_radioactive = FALSE + +/obj/machinery/door/airlock/uranium/glass/safe + actually_radioactive = FALSE + +/obj/machinery/door/airlock/plasma + name = "plasma airlock" + desc = "No way this can end badly." + icon = 'icons/obj/doors/airlocks/station/plasma.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_plasma + material_flags = MATERIAL_EFFECTS + material_modifier = 0.25 + +/obj/machinery/door/airlock/plasma/Initialize(mapload) + custom_materials = custom_materials ? custom_materials : list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 10) + . = ..() + +/obj/machinery/door/airlock/plasma/block_superconductivity() //we don't stop the heat~ + return 0 + +/obj/machinery/door/airlock/plasma/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/bananium + name = "bananium airlock" + desc = "Honkhonkhonk" + icon = 'icons/obj/doors/airlocks/station/bananium.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_bananium + doorOpen = 'sound/items/bikehorn.ogg' + +/obj/machinery/door/airlock/bananium/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/sandstone + name = "sandstone airlock" + icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_sandstone + +/obj/machinery/door/airlock/sandstone/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/wood + name = "wooden airlock" + icon = 'icons/obj/doors/airlocks/station/wood.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_wood + +/obj/machinery/door/airlock/wood/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/titanium + name = "shuttle airlock" + assemblytype = /obj/structure/door_assembly/door_assembly_titanium + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + normal_integrity = 400 + +/obj/machinery/door/airlock/titanium/glass + normal_integrity = 350 + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/bronze + name = "bronze airlock" + icon = 'icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi' + overlays_file = 'icons/obj/doors/airlocks/clockwork/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_bronze + +/obj/machinery/door/airlock/bronze/seethru + assemblytype = /obj/structure/door_assembly/door_assembly_bronze/seethru + opacity = FALSE + glass = TRUE + + +// Public Airlocks + +/obj/machinery/door/airlock/public + name = "public airlock" + icon = 'icons/obj/doors/airlocks/public/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/public/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_public + +/obj/machinery/door/airlock/public/glass + name = "public glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/public/glass/incinerator + autoclose = FALSE + heat_proof = TRUE + +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior + name = "Turbine Interior Airlock" + id_tag = INCINERATOR_ATMOS_AIRLOCK_INTERIOR + +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior + name = "Turbine Exterior Airlock" + id_tag = INCINERATOR_ATMOS_AIRLOCK_EXTERIOR + +// External Airlocks + +/obj/machinery/door/airlock/external + name = "external airlock" + icon = 'icons/obj/doors/airlocks/external/external.dmi' + overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_ext + + /// Whether or not the airlock can be opened without access from a certain direction while powered, or with bare hands from any direction while unpowered OR pressurized. + var/space_dir = null + +/obj/machinery/door/airlock/external/Initialize(mapload, ...) + // default setting is for mapping only, let overrides work + if(!mapload) + req_access = null + + return ..() + +/obj/machinery/door/airlock/external/post_machine_initialize() + . = ..() + if(space_dir) + unres_sides |= space_dir + +/obj/machinery/door/airlock/external/examine(mob/user) + . = ..() + if(space_dir) + . += span_notice("It has labels indicating that it has an emergency mechanism to open from the [dir2text(space_dir)] side with just your hands even if there's no power.") + +/obj/machinery/door/airlock/external/cyclelinkairlock() + . = ..() + var/obj/machinery/door/airlock/external/cycle_linked_external_airlock = cyclelinkedairlock + if(istype(cycle_linked_external_airlock)) + cycle_linked_external_airlock.space_dir |= space_dir + space_dir |= cycle_linked_external_airlock.space_dir + +/obj/machinery/door/airlock/external/try_safety_unlock(mob/user) + if(space_dir && density) + if(!hasPower()) + to_chat(user, span_notice("You begin unlocking the airlock safety mechanism...")) + if(do_after(user, 15 SECONDS, target = src)) + try_to_crowbar(null, user, TRUE) + return TRUE + else + // always open from the space side + // get_dir(src, user) & space_dir, checked in unresricted_sides + var/should_safety_open = shuttledocked || cyclelinkedairlock?.shuttledocked || is_safe_turf(get_step(src, space_dir), TRUE, FALSE) + return try_to_activate_door(user, should_safety_open) + + return ..() + +// Access free external airlocks +/obj/machinery/door/airlock/external/ruin + +/obj/machinery/door/airlock/external/glass + name = "external glass airlock" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/external/glass/ruin + +// CentCom Airlocks + +/obj/machinery/door/airlock/centcom //Use grunge as a station side version, as these have special effects related to them via phobias and such. + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_centcom + normal_integrity = 1000 + security_level = 6 + explosion_block = 2 + +/obj/machinery/door/airlock/grunge + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_grunge + + +// Vault Airlocks + +/obj/machinery/door/airlock/vault + name = "vault door" + icon = 'icons/obj/doors/airlocks/vault/vault.dmi' + overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_vault + explosion_block = 2 + normal_integrity = 400 // reverse engieneerd: 400 * 1.5 (sec lvl 6) = 600 = original + security_level = 6 + + +// Hatch Airlocks + +/obj/machinery/door/airlock/hatch + name = "airtight hatch" + icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_hatch + +/obj/machinery/door/airlock/maintenance_hatch + name = "maintenance hatch" + icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_mhatch + +// High Security Airlocks + +/obj/machinery/door/airlock/highsecurity + name = "high tech security airlock" + icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' + overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity + explosion_block = 2 + normal_integrity = 500 + security_level = 1 + damage_deflection = 30 + +// Shuttle Airlocks + +/obj/machinery/door/airlock/shuttle + name = "shuttle airlock" + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_shuttle + +/obj/machinery/door/airlock/shuttle/glass + opacity = FALSE + glass = TRUE + +/obj/machinery/door/airlock/abductor + name = "alien airlock" + desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?" + icon = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' + overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_abductor + note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + damage_deflection = 30 + explosion_block = 3 + hackProof = TRUE + aiControlDisabled = AI_WIRE_DISABLED + normal_integrity = 700 + security_level = 1 + +// Cult Airlocks + +/obj/machinery/door/airlock/cult + name = "cult airlock" + icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_cult + hackProof = TRUE + aiControlDisabled = AI_WIRE_DISABLED + req_access = list(ACCESS_BLOODCULT) + damage_deflection = 10 + var/openingoverlaytype = /obj/effect/temp_visual/cult/door + var/friendly = FALSE + var/stealthy = FALSE + +/obj/machinery/door/airlock/cult/Initialize(mapload) + . = ..() + new openingoverlaytype(loc) + AddElement(/datum/element/empprotection, EMP_PROTECT_ALL) + +/obj/machinery/door/airlock/cult/canAIControl(mob/user) + return (IS_CULTIST(user) && !isAllPowerCut()) + +/obj/machinery/door/airlock/cult/on_break() + set_panel_open(TRUE) + +/obj/machinery/door/airlock/cult/isElectrified() + return FALSE + +/obj/machinery/door/airlock/cult/hasPower() + return TRUE + +/obj/machinery/door/airlock/cult/allowed(mob/living/L) + if(!density) + return TRUE + if(friendly || IS_CULTIST(L) || isshade(L) || isconstruct(L)) + if(!stealthy) + new openingoverlaytype(loc) + return TRUE + else + if(!stealthy) + new /obj/effect/temp_visual/cult/sac(loc) + var/atom/throwtarget + throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) + SEND_SOUND(L, sound(pick('sound/hallucinations/turn_around1.ogg','sound/hallucinations/turn_around2.ogg'),0,1,50)) + flash_color(L, flash_color=COLOR_CULT_RED, flash_time=20) + L.Paralyze(40) + L.throw_at(throwtarget, 5, 1) + return FALSE + +/obj/machinery/door/airlock/cult/proc/conceal() + icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' + overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' + name = "Airlock" + desc = "It opens and closes." + stealthy = TRUE + update_appearance() + +/obj/machinery/door/airlock/cult/proc/reveal() + icon = initial(icon) + overlays_file = initial(overlays_file) + name = initial(name) + desc = initial(desc) + stealthy = initial(stealthy) + update_appearance() + +/obj/machinery/door/airlock/cult/narsie_act() + return + +/obj/machinery/door/airlock/cult/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/glass + glass = TRUE + opacity = FALSE + +/obj/machinery/door/airlock/cult/glass/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/unruned + icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned + openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned + +/obj/machinery/door/airlock/cult/unruned/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/unruned/glass + glass = TRUE + opacity = FALSE + +/obj/machinery/door/airlock/cult/unruned/glass/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/weak + name = "brittle cult airlock" + desc = "An airlock hastily corrupted by blood magic, it is unusually brittle in this state." + normal_integrity = 150 + damage_deflection = 5 + armor_type = /datum/armor/none + +// Material Airlocks + +/obj/machinery/door/airlock/material + name = "Airlock" + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS + greyscale_config = /datum/greyscale_config/material_airlock + assemblytype = /obj/structure/door_assembly/door_assembly_material + +/obj/machinery/door/airlock/material/close(forced, force_crush) + . = ..() + if(!.) + return + for(var/datum/material/mat in custom_materials) + if(mat.alpha < 255) + set_opacity(FALSE) + break + +/obj/machinery/door/airlock/material/prepare_deconstruction_assembly(obj/structure/door_assembly/assembly) + assembly.set_custom_materials(custom_materials) + ..() + +/obj/machinery/door/airlock/material/glass + opacity = FALSE + glass = TRUE + +// Multi-tile (Large) Airlocks + +/obj/machinery/door/airlock/multi_tile + icon = 'icons/obj/doors/airlocks/multi_tile/public/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/multi_tile/public/overlays.dmi' + assemblytype = /obj/structure/door_assembly/multi_tile/door_assembly_public + multi_tile = TRUE + opacity = FALSE + glass = TRUE + +/obj/structure/fluff/airlock_filler + name = "airlock fluff" + desc = "You shouldn't be able to see this fluff!" + icon = null + icon_state = null + density = TRUE + opacity = TRUE + anchored = TRUE + invisibility = INVISIBILITY_MAXIMUM + can_atmos_pass = ATMOS_PASS_DENSITY + /// The door/airlock this fluff panel is attached to + var/obj/machinery/door/filled_airlock + +/obj/machinery/door/airlock/multi_tile/public/glass + +/obj/machinery/door/airlock/multi_tile/narsie_act() + return + +/* + * Subtype used in unit tests to ensure instant airlock opening/closing. + * + * Pretty much just excises everything that would delay the process or is un-needed + * for the sake of the test (sleeps, icon animations). +*/ +/obj/machinery/door/airlock/instant + +// set_density on both open and close procs has a check and return builtin. + +/obj/machinery/door/airlock/instant/open(forced = DEFAULT_DOOR_CHECKS) + operating = TRUE + SEND_SIGNAL(src, COMSIG_AIRLOCK_OPEN, forced) + set_density(FALSE) + operating = FALSE + return TRUE + +/obj/machinery/door/airlock/instant/close(forced = DEFAULT_DOOR_CHECKS, force_crush = FALSE) + operating = TRUE + SEND_SIGNAL(src, COMSIG_AIRLOCK_CLOSE, forced) + set_density(TRUE) + operating = FALSE + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/fluff/airlock_filler/Destroy(force) filled_airlock = null @@ -2551,5 +3335,8 @@ #undef AIRLOCK_FRAME_CLOSING #undef AIRLOCK_FRAME_OPEN #undef AIRLOCK_FRAME_OPENING +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - moved to code/__DEFINES/~skyrat_defines/airlock.dm +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 73ae0994eb5..aeb1eec4681 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -109,7 +109,11 @@ var/new_cycle_id = trim(params["passedCycleId"], 30) passed_cycle_id = new_cycle_id +<<<<<<< HEAD /obj/item/electronics/airlock/ui_act(action, params) +======= +/obj/item/electronics/airlock/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 30489173e67..7105d3bf483 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //#define MAX_TIMER (15 MINUTES) //ORIGINAL #define MAX_TIMER (60 MINUTES) //SKYRAT EDIT CHANGE //#define PRESET_SHORT (2 MINUTES) //ORIGINAL @@ -6,6 +7,12 @@ #define PRESET_MEDIUM (10 MINUTES) //SKYRAT EDIT CHANGE //#define PRESET_LONG (5 MINUTES) //ORIGINAL #define PRESET_LONG (15 MINUTES) //SKYRAT EDIT CHANGE +======= +#define MAX_TIMER (15 MINUTES) +#define PRESET_SHORT (2 MINUTES) +#define PRESET_MEDIUM (3 MINUTES) +#define PRESET_LONG (5 MINUTES) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Brig Door control displays. @@ -78,7 +85,11 @@ if(!timing) return PROCESS_KILL +<<<<<<< HEAD if(REALTIMEOFDAY - activation_time >= timer_duration) // SKYRAT EDIT CHANGE: original was world.time +======= + if(world.time - activation_time >= timer_duration) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timer_end() // open doors, reset timer, clear status screen update_content() @@ -177,7 +188,11 @@ * * seconds - Return the time in seconds if TRUE, else deciseconds. */ /obj/machinery/status_display/door_timer/proc/time_left(seconds = FALSE) +<<<<<<< HEAD . = max(0, timer_duration + (activation_time ? activation_time - REALTIMEOFDAY : 0)) // SKYRAT EDIT CHANGE, Original: . = max(0, timer_duration + (activation_time ? activation_time - world.time : 0)) +======= + . = max(0, timer_duration + (activation_time ? activation_time - world.time : 0)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(seconds) . /= (1 SECONDS) @@ -218,7 +233,11 @@ break return data +<<<<<<< HEAD /obj/machinery/status_display/door_timer/ui_act(action, params) +======= +/obj/machinery/status_display/door_timer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 2edd188c6e8..5c3adb22cbf 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -576,11 +576,19 @@ else if(ismonkey(future_pancake)) //For monkeys future_pancake.emote("screech") future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) +<<<<<<< HEAD future_pancake.StaminaKnockdown(20, TRUE, TRUE) // SKYRAT EDIT CHANGE - AIRLOCKS - ORIGINAL: future_pancake.Paralyze(100) else if(ishuman(future_pancake)) //For humans future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) future_pancake.emote("scream") future_pancake.StaminaKnockdown(20, TRUE, TRUE) // SKYRAT EDIT CHANGE - AIRLOCKS - ORIGINAL: future_pancake.Paralyze(100) +======= + future_pancake.Paralyze(100) + else if(ishuman(future_pancake)) //For humans + future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) + future_pancake.emote("scream") + future_pancake.Paralyze(100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else //for simple_animals & borgs future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) var/turf/location = get_turf(src) @@ -691,4 +699,8 @@ return ..() return ..(0) +<<<<<<< HEAD // #undef DOOR_CLOSE_WAIT // SKYRAT EDIT REMOVAL - moved to code/__DEFINES/~skyrat_defines/airlock.dm +======= +#undef DOOR_CLOSE_WAIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e742eb2c020..1725ae4ffc2 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -279,11 +279,21 @@ /obj/machinery/door/firedoor/proc/check_atmos(turf/checked_turf) var/datum/gas_mixture/environment = checked_turf.return_air() +<<<<<<< HEAD var/pressure = environment?.return_pressure() //SKYRAT EDIT ADDITION - Micro optimisation if(environment?.temperature >= BODYTEMP_HEAT_DAMAGE_LIMIT || pressure > WARNING_HIGH_PRESSURE) //SKYRAT EDIT CHANGE - BETTER LOCKS return FIRELOCK_ALARM_TYPE_HOT if(environment?.temperature <= BODYTEMP_COLD_DAMAGE_LIMIT || pressure < WARNING_LOW_PRESSURE) //SKYRAT EDIT CHANGE - BETTER LOCKS +======= + if(!environment) + stack_trace("We tried to check a gas_mixture that doesn't exist for its firetype, what are you DOING") + return + + if(environment.temperature >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + return FIRELOCK_ALARM_TYPE_HOT + if(environment.temperature <= BODYTEMP_COLD_DAMAGE_LIMIT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FIRELOCK_ALARM_TYPE_COLD return diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index be3730fd57c..2fc64ff1208 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -31,7 +31,11 @@ return TRUE /obj/machinery/door_buttons/access_button +<<<<<<< HEAD icon = 'icons/obj/machines/wallmounts.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/machines/wallmounts.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "access_button_standby" base_icon_state = "access_button" name = "access button" diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index fe0ca05c760..1dbb0c473cb 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -6,7 +6,11 @@ #define AIRLOCK_STATE_OUTOPEN "outopen" /obj/machinery/airlock_controller +<<<<<<< HEAD icon = 'icons/obj/machines/wallmounts.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/machines/wallmounts.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "airlock_control_standby" base_icon_state = "airlock_control" @@ -244,7 +248,11 @@ return data +<<<<<<< HEAD /obj/machinery/airlock_controller/ui_act(action, params) +======= +/obj/machinery/airlock_controller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/flatpacker.dm b/code/game/machinery/flatpacker.dm index 182db1edc08..b58d27e86e3 100644 --- a/code/game/machinery/flatpacker.dm +++ b/code/game/machinery/flatpacker.dm @@ -112,7 +112,11 @@ /obj/machinery/flatpacker/proc/AfterMaterialInsert(container, obj/item/item_inserted, last_inserted_id, mats_consumed, amount_inserted, atom/context) SIGNAL_HANDLER +<<<<<<< HEAD //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benifit from it +======= + //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benefit from it +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(directly_use_energy(ROUND_UP((amount_inserted / (MAX_STACK_SIZE * SHEET_MATERIAL_AMOUNT)) * 0.4 * initial(active_power_usage)))) flick_overlay_view(mutable_appearance('icons/obj/machines/lathes.dmi', "flatpacker_bar"), 1 SECONDS) @@ -292,7 +296,11 @@ if(isnull(amount)) return +<<<<<<< HEAD //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benifit from it +======= + //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benefit from it +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!directly_use_energy(ROUND_UP((amount / MAX_STACK_SIZE) * 0.4 * initial(active_power_usage)))) say("No power to dispense sheets") return diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 72ac0e746f4..c7b046e15d9 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -82,7 +82,11 @@ return data +<<<<<<< HEAD /obj/machinery/gulag_item_reclaimer/ui_act(action, params) +======= +/obj/machinery/gulag_item_reclaimer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index a2d67f8be49..0bcdda80539 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -168,7 +168,11 @@ Possible to do for anyone motivated enough: /obj/machinery/holopad/tutorial/attack_hand(mob/user, list/modifiers) if(!istype(user)) return +<<<<<<< HEAD if(user.incapacitated() || !is_operational) +======= + if(user.incapacitated || !is_operational) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(replay_mode) replay_stop() @@ -308,7 +312,7 @@ Possible to do for anyone motivated enough: data["holo_calls"] += list(call_data) return data -/obj/machinery/holopad/ui_act(action, list/params) +/obj/machinery/holopad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -550,6 +554,7 @@ Possible to do for anyone motivated enough: if(AI) AI.eyeobj.setLoc(get_turf(src)) //ensure the AI camera moves to the holopad +<<<<<<< HEAD hologram.Impersonation = AI //SKYRAT EDIT -- ADDITION -- Customization; puts the AI core as the impersonated mob so that the examine proc can be redirected else //make it like real life hologram.Impersonation = user @@ -559,6 +564,15 @@ Possible to do for anyone motivated enough: hologram.set_anchored(TRUE)//So space wind cannot drag it. //hologram.name = "[user.name] (Hologram)"//If someone decides to right click. // ORIGINAL hologram.name = user.name //SKYRAT EDIT -- Make the name exact, so that the double-emotes are less jarring in the chat +======= + else //make it like real life + hologram.Impersonation = user + hologram.mouse_opacity = MOUSE_OPACITY_TRANSPARENT//So you can't click on it. + hologram.layer = FLY_LAYER //Above all the other objects/mobs. Or the vast majority of them. + SET_PLANE_EXPLICIT(hologram, ABOVE_GAME_PLANE, src) + hologram.set_anchored(TRUE)//So space wind cannot drag it. + hologram.name = "[user.name] (Hologram)"//If someone decides to right click. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_holo(user, hologram) set_holo(user, hologram) @@ -677,7 +691,11 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ if(!isliving(owner)) return TRUE var/mob/living/user = owner +<<<<<<< HEAD if(user.incapacitated() || !user.client) +======= + if(user.incapacitated || !user.client) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/machinery/hypnochair.dm b/code/game/machinery/hypnochair.dm index f8f3ed49be5..2a8d7b90cb5 100644 --- a/code/game/machinery/hypnochair.dm +++ b/code/game/machinery/hypnochair.dm @@ -63,7 +63,11 @@ return data +<<<<<<< HEAD /obj/machinery/hypnochair/ui_act(action, params) +======= +/obj/machinery/hypnochair/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 4ac2a177e76..1105aa34702 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -106,7 +106,11 @@ .["containerMaxVolume"] = drip_reagents.maximum_volume .["containerReagentColor"] = mix_color_from_reagents(drip_reagents.reagent_list) +<<<<<<< HEAD /obj/machinery/iv_drip/ui_act(action, params) +======= +/obj/machinery/iv_drip/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -319,11 +323,19 @@ if(!isliving(usr)) to_chat(usr, span_warning("You can't do that!")) +<<<<<<< HEAD return if(!usr.can_perform_action(src)) return if(usr.incapacitated()) return +======= + return + if(!usr.can_perform_action(src)) + return + if(usr.incapacitated) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(reagent_container) if(attached) visible_message(span_warning("[attached] is detached from [src].")) @@ -340,7 +352,11 @@ if(!isliving(usr)) to_chat(usr, span_warning("You can't do that!")) return +<<<<<<< HEAD if(!usr.can_perform_action(src) || usr.incapacitated()) +======= + if(!usr.can_perform_action(src) || usr.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(inject_only) mode = IV_INJECTING diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 8733ca54863..b12dcdcd341 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -417,7 +417,11 @@ return pad.doteleport(user, sending) +<<<<<<< HEAD /obj/item/launchpad_remote/ui_act(action, params) +======= +/obj/item/launchpad_remote/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 731b8f3a085..d9198a7ddb4 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -1,7 +1,11 @@ /// The light switch. Can have multiple per area. /obj/machinery/light_switch name = "light switch" +<<<<<<< HEAD icon = 'icons/obj/machines/wallmounts.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/machines/wallmounts.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "light-nopower" base_icon_state = "light" desc = "Make dark." diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index de676a8815a..9f3c1e66dad 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -149,7 +149,11 @@ if(user.combat_mode) //so we can hit the machine return ..() +<<<<<<< HEAD /obj/machinery/limbgrower/ui_act(action, list/params) +======= +/obj/machinery/limbgrower/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index d9fe1f2c3a7..b51682ee070 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -263,10 +263,13 @@ var/list/trauma_text = list() for(var/t in patient.get_traumas()) var/datum/brain_trauma/trauma = t +<<<<<<< HEAD //SKYRAT EDIT: Scary Traits (Bimbo) if(!trauma.display_scanner) continue //SKYRAT EDIT: Scary Traits (Bimbo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/trauma_desc = "" switch(trauma.resilience) if(TRAUMA_RESILIENCE_SURGERY) @@ -278,7 +281,10 @@ trauma_desc += "soul-bound " if(TRAUMA_RESILIENCE_ABSOLUTE) trauma_desc += "permanent " +<<<<<<< HEAD // SKYRAT EDIT CHANGE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 trauma_desc += trauma.scan_desc trauma_text += trauma_desc trauma_status = "Cerebral traumas detected: patient appears to be suffering from [english_list(trauma_text)]." diff --git a/code/game/machinery/modular_shield.dm b/code/game/machinery/modular_shield.dm index 5c621be756d..8224b2e7fd7 100644 --- a/code/game/machinery/modular_shield.dm +++ b/code/game/machinery/modular_shield.dm @@ -276,7 +276,11 @@ data["initiating_field"] = initiating return data +<<<<<<< HEAD /obj/machinery/modular_shield_generator/ui_act(action, params) +======= +/obj/machinery/modular_shield_generator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index c15421cbf5a..f1139125c88 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -181,6 +181,7 @@ data["static_controls"] = static_controls return data +<<<<<<< HEAD /obj/machinery/navbeacon/ui_act(action, params) . = ..() if(.) @@ -228,6 +229,56 @@ codes[NAVBEACON_DELIVERY_DIRECTION] = "[text2dir(params["direction"])]" return TRUE +======= +/obj/machinery/navbeacon/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + var/mob/user = ui.user + + if(action == "lock" && allowed(user)) + controls_locked = !controls_locked + return TRUE + + if(controls_locked && !HAS_SILICON_ACCESS(user)) + return + + switch(action) + if("reset_codes") + glob_lists_deregister() + location = original_location + set_codes() + glob_lists_register() + return TRUE + if("toggle_cover") + cover_locked = !cover_locked + return TRUE + if("toggle_patrol") + toggle_code(NAVBEACON_PATROL_MODE) + return TRUE + if("toggle_delivery") + toggle_code(NAVBEACON_DELIVERY_MODE) + return TRUE + if("set_location") + var/input_text = tgui_input_text(user, "Enter the beacon's location tag", "Beacon Location", location, 20) + if (!input_text || location == input_text) + return + glob_lists_deregister() + location = input_text + glob_lists_register() + return TRUE + if("set_patrol_next") + var/next_patrol = codes[NAVBEACON_PATROL_NEXT] + var/input_text = tgui_input_text(user, "Enter the tag of the next patrol location", "Beacon Location", next_patrol, 20) + if (!input_text || location == input_text) + return + codes[NAVBEACON_PATROL_NEXT] = input_text + return TRUE + if("set_delivery_direction") + codes[NAVBEACON_DELIVERY_DIRECTION] = "[text2dir(params["direction"])]" + return TRUE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Adds or removes a specific code /obj/machinery/navbeacon/proc/toggle_code(code) if(codes[code]) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 7f3d8ea806f..482c34187c2 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -64,7 +64,11 @@ acid = 30 /obj/machinery/newscaster/pai/ui_state(mob/user) +<<<<<<< HEAD return GLOB.reverse_contained_state +======= + return GLOB.deep_inventory_state +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) @@ -264,7 +268,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) return data +<<<<<<< HEAD /obj/machinery/newscaster/ui_act(action, params) +======= +/obj/machinery/newscaster/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index ef18dc6b068..39d6fe7d2ea 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -175,7 +175,7 @@ Buildable meters set name = "Invert Pipe" set src in view(1) - if ( usr.incapacitated() ) + if ( usr.incapacitated ) return do_a_flip() diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index eb5b499bce7..66889d8b3f5 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -62,7 +62,11 @@ data["init_directions"] = init_directions return data +<<<<<<< HEAD /obj/machinery/pipedispenser/ui_act(action, params) +======= +/obj/machinery/pipedispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(..()) return switch(action) @@ -187,6 +191,12 @@ //Allow you to drag-drop disposal pipes and transit tubes into it /obj/machinery/pipedispenser/disposal/mouse_drop_receive(obj/structure/pipe, mob/user, params) +<<<<<<< HEAD +======= + if(user.incapacitated) + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod)) return diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index c9694730a3f..44ff9bc1b24 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -264,7 +264,7 @@ DEFINE_BITFIELD(turret_flags, list( data["allow_manual_control"] = TRUE return data -/obj/machinery/porta_turret/ui_act(action, list/params) +/obj/machinery/porta_turret/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -1025,34 +1025,40 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/turretid/ui_data(mob/user) var/list/data = list() data["locked"] = locked - data["siliconUser"] = user.has_unlimited_silicon_privilege + data["siliconUser"] = HAS_SILICON_ACCESS(user) data["enabled"] = enabled data["lethal"] = lethal data["shootCyborgs"] = shoot_cyborgs return data -/obj/machinery/turretid/ui_act(action, list/params) +/obj/machinery/turretid/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return + var/mob/user = ui.user + switch(action) if("lock") - if(!usr.has_unlimited_silicon_privilege) + if(!HAS_SILICON_ACCESS(user)) return if((obj_flags & EMAGGED) || (machine_stat & BROKEN)) +<<<<<<< HEAD to_chat(usr, span_warning("The turret control is unresponsive!")) +======= + to_chat(user, span_warning("The turret control is unresponsive!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return locked = !locked return TRUE if("power") - toggle_on(usr) + toggle_on(user) return TRUE if("mode") - toggle_lethal(usr) + toggle_lethal(user) return TRUE if("shoot_silicons") - shoot_silicons(usr) + shoot_silicons(user) return TRUE /obj/machinery/turretid/proc/toggle_lethal(mob/user) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 3469ddae3a9..2a914a6ca42 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -99,6 +99,7 @@ if(!energy_gun.can_charge) to_chat(user, span_notice("Your gun has no external power connector.")) return TRUE +<<<<<<< HEAD //SKYRAT EDIT ADDITION if (istype(attacking_item, /obj/item/gun/microfusion)) @@ -114,6 +115,8 @@ return TRUE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.transferItemToLoc(attacking_item, src) return TRUE diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 92a0e05f269..e1e0880aefe 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -72,7 +72,11 @@ recharge_speed = 0 repairs = 0 for(var/datum/stock_part/capacitor/capacitor in component_parts) +<<<<<<< HEAD recharge_speed += (capacitor.tier * STANDARD_CELL_CHARGE * 0.1) +======= + recharge_speed += 5e-3 * capacitor.tier +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/stock_part/servo/servo in component_parts) repairs += servo.tier - 1 for(var/obj/item/stock_parts/power_store/cell in component_parts) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index f2b1ba303eb..a0b7940460c 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -200,7 +200,11 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) var/mob/living/L = usr message = L.treat_message(message)["message"] +<<<<<<< HEAD minor_announce(message, "[department] Announcement:", html_encode = FALSE, sound_override = ANNOUNCER_DEPARTMENTAL) // SKYRAT EDIT CHANGE - Announcer Sounds +======= + minor_announce(message, "[department] Announcement:", html_encode = FALSE, sound_override = 'sound/misc/announce_dig.ogg') +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.news_network.submit_article(message, department, "Station Announcements", null) usr.log_talk(message, LOG_SAY, tag="station announcement from [src]") message_admins("[ADMIN_LOOKUPFLW(usr)] has made a station announcement from [src] at [AREACOORD(usr)].") diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 2a8dc8bb49b..8b0117176e3 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -98,7 +98,11 @@ return data +<<<<<<< HEAD /obj/machinery/roulette/ui_act(action, params) +======= +/obj/machinery/roulette/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/satellite/satellite_control.dm b/code/game/machinery/satellite/satellite_control.dm index c0875d9e26a..b85b14156b6 100644 --- a/code/game/machinery/satellite/satellite_control.dm +++ b/code/game/machinery/satellite/satellite_control.dm @@ -11,7 +11,11 @@ ui = new(user, src, "SatelliteControl", name) ui.open() +<<<<<<< HEAD /obj/machinery/computer/sat_control/ui_act(action, params) +======= +/obj/machinery/computer/sat_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/scanner_gate.dm b/code/game/machinery/scanner_gate.dm index ce5158828ca..db3f7c8b1eb 100644 --- a/code/game/machinery/scanner_gate.dm +++ b/code/game/machinery/scanner_gate.dm @@ -17,6 +17,7 @@ #define SCANGATE_POD "pod" #define SCANGATE_GOLEM "golem" #define SCANGATE_ZOMBIE "zombie" +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - MORE SCANNER GATE OPTIONS #define SCANGATE_MAMMAL "mammal" #define SCANGATE_VOX "vox" @@ -32,6 +33,8 @@ #define SCANGATE_SNAIL "snail" #define SCANGATE_GENDER "Gender" //SKYRAT EDIT ADDITION END - MORE SCANNER GATE OPTIONS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/scanner_gate name = "scanner gate" @@ -61,7 +64,10 @@ var/light_fail = FALSE ///Does the scanner ignore light_pass and light_fail for sending signals? var/ignore_signals = FALSE +<<<<<<< HEAD var/detect_gender = "male" //SKYRAT EDIT ADDITION - MORE SCANNER GATE OPTIONS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Modifier to the chance of scanner being false positive/negative var/minus_false_beep = 0 ///Base false positive/negative chance @@ -248,6 +254,7 @@ if(SCANGATE_ZOMBIE) detected_thing = "Zombie" scan_species = /datum/species/zombie +<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS if(SCANGATE_MAMMAL) scan_species = /datum/species/mammal @@ -274,6 +281,8 @@ if(SCANGATE_SNAIL) scan_species = /datum/species/snail //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(is_species(scanned_human, scan_species)) beep = TRUE if(detect_species == SCANGATE_ZOMBIE) //Can detect dormant zombies @@ -308,6 +317,7 @@ if(scanned_human.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT) beep = TRUE detected_thing = "Obesity" +<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS if(SCANGATE_GENDER) detected_thing = detect_gender @@ -317,6 +327,8 @@ if(scanned_human.gender == detect_gender) beep = TRUE //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SCANGATE_CONTRABAND) for(var/obj/item/content in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER)) detected_thing = "Contraband" @@ -379,11 +391,18 @@ data["disease_threshold"] = disease_threshold data["target_species"] = detect_species data["target_nutrition"] = detect_nutrition +<<<<<<< HEAD data["target_gender"] = detect_gender //SKYRAT EDIT - MORE SCANNER GATE OPTIONS data["contraband_enabled"] = !!n_spect return data /obj/machinery/scanner_gate/ui_act(action, params) +======= + data["contraband_enabled"] = !!n_spect + return data + +/obj/machinery/scanner_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -422,6 +441,7 @@ if("Obese") detect_nutrition = NUTRITION_LEVEL_FAT . = TRUE +<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS if("set_target_gender") var/new_gender = params["new_gender"] @@ -437,6 +457,8 @@ detect_gender = "female" . = TRUE //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/scanner_gate/preset_guns locked = TRUE @@ -462,6 +484,7 @@ #undef SCANGATE_POD #undef SCANGATE_GOLEM #undef SCANGATE_ZOMBIE +<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS #undef SCANGATE_MAMMAL #undef SCANGATE_VOX @@ -478,3 +501,5 @@ #undef SCANGATE_GENDER //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index d5dc9e3a26e..462b107e44d 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -283,7 +283,11 @@ /obj/machinery/power/shieldwallgen name = "shield wall generator" desc = "A shield generator." +<<<<<<< HEAD icon ='icons/obj/machines/shield_generator.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/machines/shield_generator.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "shield_wall_gen" base_icon_state = "shield_wall_gen" light_on = FALSE diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm index 63291035e78..34d416498f6 100644 --- a/code/game/machinery/sleepers.dm +++ b/code/game/machinery/sleepers.dm @@ -237,7 +237,11 @@ return data +<<<<<<< HEAD /obj/machinery/sleeper/ui_act(action, params) +======= +/obj/machinery/sleeper/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -300,17 +304,33 @@ * Can be controlled from the inside and can be deconstructed. */ /obj/machinery/sleeper/syndie +<<<<<<< HEAD +======= + name = "syndicate sleeper" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "sleeper_s" base_icon_state = "sleeper_s" controls_inside = TRUE deconstructable = TRUE +<<<<<<< HEAD ///Fully upgraded variant, the circuit using tier 4 parts. /obj/machinery/sleeper/syndie/fullupgrade +======= + circuit = /obj/item/circuitboard/machine/sleeper/syndie + +///Fully upgraded variant, the circuit using tier 4 parts. +/obj/machinery/sleeper/syndie/fullupgrade + name = "upgraded syndicate sleeper" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 circuit = /obj/item/circuitboard/machine/sleeper/fullupgrade ///Fully upgraded, not deconstructable, while using the normal sprite. /obj/machinery/sleeper/syndie/fullupgrade/nt +<<<<<<< HEAD +======= + name = "\improper Nanotrasen sleeper" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "sleeper" base_icon_state = "sleeper" deconstructable = FALSE diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index bb93b7d00f5..b9eca3c52bc 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -109,7 +109,11 @@ else if(!user.temporarilyRemoveItemFromInventory(inserted_coin)) return ITEM_INTERACT_BLOCKING +<<<<<<< HEAD balloon_alert(user, "coin insterted") +======= + balloon_alert(user, "coin inserted") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balance += inserted_coin.value qdel(inserted_coin) return ITEM_INTERACT_SUCCESS diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 90218cef96d..b597fd9e8c2 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -8,7 +8,11 @@ anchored = FALSE density = TRUE interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN +<<<<<<< HEAD icon = 'icons/obj/pipes_n_cables/atmos.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/pipes_n_cables/atmos.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "sheater-off" base_icon_state = "sheater" name = "space heater" @@ -262,7 +266,11 @@ data["currentTemp"] = round(current_temperature - T0C, 1) return data +<<<<<<< HEAD /obj/machinery/space_heater/ui_act(action, params) +======= +/obj/machinery/space_heater/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -387,7 +395,11 @@ .["beaker"] = beaker .["currentTemp"] = beaker ? (round(beaker.reagents.chem_temp - T0C)) : "N/A" +<<<<<<< HEAD /obj/machinery/space_heater/improvised_chem_heater/ui_act(action, params) +======= +/obj/machinery/space_heater/improvised_chem_heater/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 7a6ce09206e..62643f1f924 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -14,7 +14,11 @@ GLOBAL_DATUM_INIT(status_font, /datum/font, new /datum/font/tiny_unicode/size_12 /obj/machinery/status_display name = "status display" desc = null +<<<<<<< HEAD icon = 'icons/obj/machines/status_display.dmi' //// SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/machines/status_display.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "frame" verb_say = "beeps" verb_ask = "beeps" @@ -198,7 +202,11 @@ GLOBAL_LIST_EMPTY(key_to_status_display) if(message1 == "" && message2 == "") return +<<<<<<< HEAD . += emissive_appearance('modular_skyrat/modules/aesthetics/status_display/icons/status_display.dmi', "outline", src, alpha = src.alpha) // SKYRAT EDIT CHANGE - AESTHETICS +======= + . += emissive_appearance(icon, "outline", src, alpha = src.alpha) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Timed process - performs nothing in the base class /obj/machinery/status_display/process() @@ -534,10 +542,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/ai, 32) "Red Alert" = "redalert", "Blue Alert" = "bluealert", "Green Alert" = "greenalert", +<<<<<<< HEAD "Violet Alert" = "violetalert", // SKYRAT EDIT ADD - Alert Levels "Orange Alert" = "orangealert", // SKYRAT EDIT ADD - Alert Levels "Amber Alert" = "amberalert", // SKYRAT EDIT ADD - Alert Levels "Gamma Alert" = "gammaalert", // SKYRAT EDIT ADD - Alert Levels +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Biohazard" = "biohazard", "Lockdown" = "lockdown", "Radiation" = "radiation", diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 6b04b2c6f34..9b3a7666669 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -230,7 +230,11 @@ /obj/machinery/suit_storage_unit/update_overlays() . = ..() +<<<<<<< HEAD //if things arent powered, these show anyways +======= + //if things aren't powered, these show anyways +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(panel_open) . += "[base_icon_state]_panel" if(state_open) @@ -793,7 +797,11 @@ */ /obj/machinery/suit_storage_unit/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver) if(screwdriver.tool_behaviour == TOOL_SCREWDRIVER && (uv || locked)) +<<<<<<< HEAD to_chat(user, span_warning("You cant open the panel while its [locked ? "locked" : "decontaminating"]")) +======= + to_chat(user, span_warning("You can't open the panel while its [locked ? "locked" : "decontaminating"]")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE return ..() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 3a7cc849acd..fa8529b2168 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -621,7 +621,11 @@ balloon_alert(user, "set to [chosen_theme?.name || DIMENSION_CHOICE_RANDOM]") /obj/item/bombcore/dimensional/proc/check_menu(mob/user) +<<<<<<< HEAD if(!user.is_holding(src) || user.incapacitated()) +======= + if(!user.is_holding(src) || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index 2c31dcbd989..8b9211418d8 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -155,7 +155,11 @@ if (TRANSMISSION_SUPERSPACE) // Only radios which are independent for(var/obj/item/radio/independent_radio in GLOB.all_radios["[frequency]"]) +<<<<<<< HEAD if(independent_radio.independent && independent_radio.can_receive(frequency, signal_reaches_every_z_level)) +======= + if((independent_radio.special_channels & RADIO_SPECIAL_CENTCOM) && independent_radio.can_receive(frequency, signal_reaches_every_z_level)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 radios += independent_radio for(var/obj/item/radio/called_radio as anything in radios) diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 25b5ddd2127..1958e7ae225 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -95,7 +95,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/telecomms/server/ui_act(action, params) +======= +/obj/machinery/computer/telecomms/server/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index a38f18231fb..10605434f89 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -117,7 +117,11 @@ data["requests"] = request_list return data +<<<<<<< HEAD /obj/machinery/computer/message_monitor/ui_act(action, params) +======= +/obj/machinery/computer/message_monitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index abc2b7dbdbf..2828449d9f8 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -81,7 +81,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/telecomms/monitor/ui_act(action, params) +======= +/obj/machinery/computer/telecomms/monitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index fb68631b766..3e94605eff0 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -82,7 +82,11 @@ return data +<<<<<<< HEAD /obj/machinery/telecomms/ui_act(action, params) +======= +/obj/machinery/telecomms/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 15d20b3d1eb..b56b4811083 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -60,8 +60,8 @@ /obj/machinery/telecomms/bus/preset_two id = "Bus 2" network = "tcommsat" - freq_listening = list(FREQ_SUPPLY, FREQ_SERVICE) - autolinkers = list("processor2", "supply", "service") + freq_listening = list(FREQ_SUPPLY, FREQ_SERVICE, FREQ_ENTERTAINMENT) + autolinkers = list("processor2", "supply", "service", "entertainment") /obj/machinery/telecomms/bus/preset_three id = "Bus 3" diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 8136aed8435..600546679e0 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -70,6 +70,10 @@ "common", "command", "engineering", +<<<<<<< HEAD +======= + "entertainment", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "security", "receiverA", "receiverB", diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm index 8d6f8c85f43..875398fb8f2 100644 --- a/code/game/machinery/telecomms/machines/receiver.dm +++ b/code/game/machinery/telecomms/machines/receiver.dm @@ -57,7 +57,7 @@ id = "Receiver A" network = "tcommsat" autolinkers = list("receiverA") // link to relay - freq_listening = list(FREQ_SCIENCE, FREQ_MEDICAL, FREQ_SUPPLY, FREQ_SERVICE) + freq_listening = list(FREQ_SCIENCE, FREQ_MEDICAL, FREQ_SUPPLY, FREQ_SERVICE, FREQ_ENTERTAINMENT) //--PRESET RIGHT--// diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 0c87a6101d1..1c7557b79de 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -100,9 +100,9 @@ autolinkers = list("supply") /obj/machinery/telecomms/server/presets/service - id = "Service Server" - freq_listening = list(FREQ_SERVICE) - autolinkers = list("service") + id = "Service & Entertainment Server" + freq_listening = list(FREQ_SERVICE, FREQ_ENTERTAINMENT) + autolinkers = list("service", "entertainment") /obj/machinery/telecomms/server/presets/common id = "Common Server" diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index c0435d2a0e6..2981dc58142 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -266,7 +266,11 @@ */ /atom/movable/proc/is_user_buckle_possible(mob/living/target, mob/user, check_loc = TRUE) // Standard adjacency and other checks. +<<<<<<< HEAD if(!Adjacent(user) || !Adjacent(target) || !isturf(user.loc) || user.incapacitated() || target.anchored) +======= + if(!Adjacent(user) || !Adjacent(target) || !isturf(user.loc) || user.incapacitated || target.anchored) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(iscarbon(user)) diff --git a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm index ab53099ed34..87d10805300 100644 --- a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm +++ b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm @@ -103,3 +103,7 @@ /obj/effect/temp_visual/circle_wave/bioscrambler/light max_alpha = 128 +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/effects/anomalies/anomalies_bluespace.dm b/code/game/objects/effects/anomalies/anomalies_bluespace.dm index 7721b509428..d6d89478b10 100644 --- a/code/game/objects/effects/anomalies/anomalies_bluespace.dm +++ b/code/game/objects/effects/anomalies/anomalies_bluespace.dm @@ -53,7 +53,11 @@ var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO playsound(TO, 'sound/effects/phasein.ogg', 100, TRUE) +<<<<<<< HEAD priority_announce("Massive bluespace translocation detected.", "Anomaly Alert", ANNOUNCER_TRANSLOCATION) //SKYRAT EDIT CHANGE - ANNOUNCER +======= + priority_announce("Massive bluespace translocation detected.", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/flashers = list() for(var/mob/living/carbon/C in viewers(TO, null)) diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index da7c4701230..8ece10922c7 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -29,7 +29,10 @@ /obj/effect/bump_teleporter/singularity_pull() return +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO BLACK_MESA +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/bump_teleporter/Bumped(atom/movable/bumper) if(!validate_setup(bumper)) return @@ -40,7 +43,10 @@ return stack_trace("Bump_teleporter [src] could not find a teleporter with id [id_target]!") +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Check to see if our teleporter was set up correctly mapside. Return TRUE if everything is fine, FALSE if not. /obj/effect/bump_teleporter/proc/validate_setup(atom/movable/checkable) diff --git a/code/game/objects/effects/decals/cleanable/food.dm b/code/game/objects/effects/decals/cleanable/food.dm index 0fc4352c78d..23c266ecb59 100644 --- a/code/game/objects/effects/decals/cleanable/food.dm +++ b/code/game/objects/effects/decals/cleanable/food.dm @@ -58,3 +58,14 @@ name = "flour" desc = "It's still good. Four second rule!" icon_state = "flour" + +/obj/effect/decal/cleanable/food/squid_ink + name = "ink smear" + desc = "a smear from some inky substance..." + icon = 'icons/mob/silicon/robots.dmi' + icon_state = "floor1" + color = COLOR_DARK + +/obj/effect/decal/cleanable/food/squid_ink/Initialize(mapload, list/datum/disease/diseases) + icon_state = "floor[rand(1, 7)]" + return ..() diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 9c2890e924c..56a99f6cea7 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -136,7 +136,11 @@ . = ..() if(!.) return +<<<<<<< HEAD //AddComponent(/datum/component/rot, 0, 5 MINUTES, 0.7) skyrat edit +======= + AddComponent(/datum/component/rot, 0, 5 MINUTES, 0.7) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target) return FALSE diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 61f14f9d80e..09c9ed4e1b7 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -18,18 +18,36 @@ return !istype(here_turf, /obj/structure/closet/crate/grave/filled) && ..() /obj/effect/decal/remains/human/smokey +<<<<<<< HEAD desc = "They look like human remains. They have a strange, smokey aura about them..." +======= + name = "remains of Charles Morlbaro" + desc = "I guess we figured out what happened to the guy who lives here. You'd best tread lightly around this..." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Our proximity monitor, for detecting nearby looters. var/datum/proximity_monitor/proximity_monitor ///The reagent we will release when our remains are disturbed. var/datum/reagent/that_shit_that_killed_saddam +<<<<<<< HEAD COOLDOWN_DECLARE(gas_cooldown) +======= + ///A cooldown for how frequently the gas is released when disturbed. + COOLDOWN_DECLARE(gas_cooldown) + ///The length of the aforementioned cooldown. + var/gas_cooldown_length = (20 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/human/smokey/Initialize(mapload) . = ..() +<<<<<<< HEAD proximity_monitor = new(src, 0) that_shit_that_killed_saddam = get_random_reagent_id() +======= + proximity_monitor = new(src, 1) + var/list/blocked_reagents = subtypesof(/datum/reagent/medicine) + subtypesof(/datum/reagent/consumable) //Boooooriiiiing + that_shit_that_killed_saddam = get_random_reagent_id(blacklist = blocked_reagents) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/human/smokey/HasProximity(atom/movable/tomb_raider) if(!COOLDOWN_FINISHED(src, gas_cooldown)) @@ -37,10 +55,18 @@ if(iscarbon(tomb_raider)) var/mob/living/carbon/nearby_carbon = tomb_raider +<<<<<<< HEAD if (nearby_carbon.move_intent != MOVE_INTENT_WALK || prob(15)) release_smoke(nearby_carbon) COOLDOWN_START(src, gas_cooldown, rand(20 SECONDS, 2 MINUTES)) +======= + if(nearby_carbon.move_intent != MOVE_INTENT_WALK || prob(5)) + release_smoke(nearby_carbon) + COOLDOWN_START(src, gas_cooldown, gas_cooldown_length) + +///Releases a cloud of smoke based on the randomly generated reagent in Initialize(). +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/human/smokey/proc/release_smoke(mob/living/smoke_releaser) visible_message(span_warning("[smoke_releaser] disturbs the [src], which releases a huge cloud of gas!")) var/datum/effect_system/fluid_spread/smoke/chem/cigarette_puff = new() @@ -49,6 +75,18 @@ cigarette_puff.set_up(range = 2, amount = DIAMOND_AREA(2), holder = src, location = get_turf(src), silent = TRUE) cigarette_puff.start() +<<<<<<< HEAD +======= +///Subtype of smokey remains used for rare maintenance spawns. +/obj/effect/decal/remains/human/smokey/maintenance + name = "smokey remains" + desc = "They look like human remains. They have a strange, smokey aura about them... You should tread lightly when walking near this." + +/obj/effect/decal/remains/human/smokey/maintenance/Initialize(mapload) + . = ..() + gas_cooldown_length = rand(4 MINUTES, 6 MINUTES) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/plasma icon_state = "remainsplasma" diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index 3aeb1c4f38f..6da704c999e 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -244,7 +244,11 @@ icon_state = "siding_plain_end" /obj/effect/turf_decal/siding/red +<<<<<<< HEAD color = "#486091" //SKYRAT EDIT CHANGE +======= + color = "#DE3A3A" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/siding/red/corner icon_state = "siding_plain_corner" diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index 6e5173790b2..aec76ea2a3a 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -83,6 +83,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow) /obj/effect/turf_decal/tile/red name = "red tile decal" +<<<<<<< HEAD color = "#486091" // SKYRAT EDIT CHANGE TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red) @@ -95,6 +96,21 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red) TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_red) +/// Bar tiles +======= + color = "#DE3A3A" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + +TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red) + +/// Dark red tiles + +/obj/effect/turf_decal/tile/dark_red + name = "dark red tile decal" + color = "#B11111" + +TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_red) + /// Bar tiles /obj/effect/turf_decal/tile/bar diff --git a/code/game/objects/effects/spawners/message_in_a_bottle.dm b/code/game/objects/effects/spawners/message_in_a_bottle.dm new file mode 100644 index 00000000000..c4ac63ad0be --- /dev/null +++ b/code/game/objects/effects/spawners/message_in_a_bottle.dm @@ -0,0 +1,25 @@ +/obj/effect/spawner/message_in_a_bottle + name = "message in a bottle" + desc = "Sending out an SOS" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "message_bottle" + var/probability = 100 + +/obj/effect/spawner/message_in_a_bottle/Initialize(mapload) + . = ..() + if(!prob(probability)) + return INITIALIZE_HINT_QDEL + if(!SSpersistence.initialized) + RegisterSignal(SSpersistence, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(on_persistence_init)) + else + SSpersistence.load_message_bottle(loc) + return INITIALIZE_HINT_QDEL + +/obj/effect/spawner/message_in_a_bottle/proc/on_persistence_init(datum/source) + SIGNAL_HANDLER + UnregisterSignal(SSpersistence, COMSIG_SUBSYSTEM_POST_INITIALIZE) + SSpersistence.load_message_bottle(loc) + qdel(src) + +/obj/effect/spawner/message_in_a_bottle/low_prob + probability = 1.5 diff --git a/code/game/objects/effects/spawners/random/ai_module.dm b/code/game/objects/effects/spawners/random/ai_module.dm index eff8ceeb0fa..63368b3afd0 100644 --- a/code/game/objects/effects/spawners/random/ai_module.dm +++ b/code/game/objects/effects/spawners/random/ai_module.dm @@ -39,9 +39,12 @@ /obj/item/ai_module/supplied/quarantine, /obj/item/ai_module/core/full/yesman, /obj/item/ai_module/remove, +<<<<<<< HEAD /obj/item/ai_module/core/full/dagothbot, // SKYRAT EDIT - EDITION /obj/item/ai_module/core/full/texas, // SKYRAT EDIT - EDITION /obj/item/ai_module/core/full/emperor, // SKYRAT EDIT - EDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/effect/spawner/random/aimodule/harmful diff --git a/code/game/objects/effects/spawners/random/decoration.dm b/code/game/objects/effects/spawners/random/decoration.dm index 6116d228733..274943b3724 100644 --- a/code/game/objects/effects/spawners/random/decoration.dm +++ b/code/game/objects/effects/spawners/random/decoration.dm @@ -114,6 +114,29 @@ /obj/item/flashlight/glowstick/pink, ) +<<<<<<< HEAD +======= +/obj/effect/spawner/random/decoration/glowstick/on + name = "random colored glowstick (on)" + icon_state = "glowstick" + loot = list( + /obj/item/flashlight/glowstick, + /obj/item/flashlight/glowstick/red, + /obj/item/flashlight/glowstick/blue, + /obj/item/flashlight/glowstick/cyan, + /obj/item/flashlight/glowstick/orange, + /obj/item/flashlight/glowstick/yellow, + /obj/item/flashlight/glowstick/pink, + ) + +/obj/effect/spawner/random/decoration/glowstick/on/make_item(spawn_loc, type_path_to_make) + . = ..() + + var/obj/item/flashlight/glowstick = . + + glowstick.set_light_on(TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/spawner/random/decoration/paint name = "paint spawner" icon_state = "paint" diff --git a/code/game/objects/effects/spawners/random/medical.dm b/code/game/objects/effects/spawners/random/medical.dm index ccbc109254a..61a6285df7b 100644 --- a/code/game/objects/effects/spawners/random/medical.dm +++ b/code/game/objects/effects/spawners/random/medical.dm @@ -70,7 +70,11 @@ icon_state = "xeno_egg" loot = list( /obj/effect/decal/remains/xeno = 49, +<<<<<<< HEAD /obj/item/clothing/mask/facehugger/toy = 1, // SKYRAT EDIT - They should be handled by dynamic - ORIGIGNAL: /obj/effect/spawner/xeno_egg_delivery = 1, +======= + /obj/effect/spawner/xeno_egg_delivery = 1, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/effect/spawner/random/medical/surgery_tool diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm index 359c147eb4f..32954676514 100644 --- a/code/game/objects/effects/spawners/random/structure.dm +++ b/code/game/objects/effects/spawners/random/structure.dm @@ -23,6 +23,10 @@ /obj/effect/spawner/random/trash/mess = 30, /obj/item/kirbyplants/fern = 20, /obj/structure/closet/crate/decorations = 15, +<<<<<<< HEAD +======= + /obj/effect/decal/remains/human/smokey/maintenance = 7, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/destructible/cult/pants_altar = 1, ) diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm index dfac8e4c0c8..c088697596d 100644 --- a/code/game/objects/effects/spawners/random/trash.dm +++ b/code/game/objects/effects/spawners/random/trash.dm @@ -89,7 +89,10 @@ /obj/item/trash/cnds = 1, /obj/item/trash/syndi_cakes = 1, /obj/item/trash/shrimp_chips = 1, +<<<<<<< HEAD /obj/item/trash/waffles = 1, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/trash/tray = 1, ) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index e90f83a6e19..19896aa2839 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -39,6 +39,15 @@ ///The config type to use for greyscaled belt overlays. Both this and greyscale_colors must be assigned to work. var/greyscale_config_belt +<<<<<<< HEAD +======= + /// Greyscale config used when generating digitigrade versions of the sprite. + var/digitigrade_greyscale_config_worn + /// Greyscale colors used when generating digitigrade versions of the sprite. + /// Optional - If not set it will default to normal greyscale colors, or approximate them if those are unset as well + var/digitigrade_greyscale_colors + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! IF YOU ADD MORE ICON CRAP TO THIS @@ -223,10 +232,13 @@ var/override_notes = FALSE /// Used if we want to have a custom verb text for throwing. "John Spaceman flicks the ciggerate" for example. var/throw_verb +<<<<<<< HEAD // SKYRAT EDIT ADDITION START /// Does this use the advanced reskinning setup? var/uses_advanced_reskins = FALSE // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A lazylist used for applying fantasy values, contains the actual modification applied to a variable. var/list/fantasy_modifications = null @@ -413,6 +425,7 @@ return if(greyscale_config_worn) worn_icon = SSgreyscale.GetColoredIconByType(greyscale_config_worn, greyscale_colors) +<<<<<<< HEAD // SKYRAT EDIT ADD START if(greyscale_config_worn_digi) worn_icon_digi = SSgreyscale.GetColoredIconByType(greyscale_config_worn_digi, greyscale_colors) @@ -433,6 +446,8 @@ if(greyscale_config_worn_taur_hoof) worn_icon_taur_hoof = SSgreyscale.GetColoredIconByType(greyscale_config_worn_taur_hoof, greyscale_colors) // SKYRAT EDIT ADD END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(greyscale_config_inhand_left) lefthand_file = SSgreyscale.GetColoredIconByType(greyscale_config_inhand_left, greyscale_colors) if(greyscale_config_inhand_right) @@ -812,7 +827,7 @@ set category = "Object" set name = "Pick up" - if(usr.incapacitated() || !Adjacent(usr)) + if(usr.incapacitated || !Adjacent(usr)) return if(isliving(usr)) @@ -849,6 +864,7 @@ . = ..() do_drop_animation(master_storage.parent) +<<<<<<< HEAD /obj/item/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(QDELETED(hit_atom)) return @@ -879,6 +895,32 @@ else playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE) return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum) +======= +/obj/item/pre_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + var/impact_flags = ..() + if(w_class < WEIGHT_CLASS_BULKY) + impact_flags |= COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH + if(!(impact_flags & COMPONENT_MOVABLE_IMPACT_NEVERMIND) && get_temperature() && isliving(hit_atom)) + var/mob/living/victim = hit_atom + victim.ignite_mob() + return impact_flags + +/obj/item/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + . = ..() + if(!isliving(hit_atom)) //Living mobs handle hit sounds differently. + playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE) + return + var/volume = get_volume_by_throwforce_and_or_w_class() + if (throwforce > 0 || HAS_TRAIT(src, TRAIT_CUSTOM_TAP_SOUND)) + if (mob_throw_hit_sound) + playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1) + else if(hitsound) + playsound(hit_atom, hitsound, volume, TRUE, -1) + else + playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1) + else + playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE) if(HAS_TRAIT(src, TRAIT_NODROP)) @@ -1099,7 +1141,11 @@ var/timedelay = usr.client.prefs.read_preference(/datum/preference/numeric/tooltip_delay) / 100 tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, usr), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. if(usr.client.prefs.read_preference(/datum/preference/toggle/item_outlines)) +<<<<<<< HEAD if(istype(L) && L.incapacitated()) +======= + if(istype(L) && L.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 apply_outline(COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now else apply_outline() //if the player's alive and well we send the command with no color set, so it uses the theme's color @@ -1354,7 +1400,7 @@ * Then, it checks tiny items. * After all that, it returns TRUE if the item is set to be discovered. Otherwise, it returns FALSE. * - * This works similarily to /suicide_act: if you want an item to have a unique interaction, go to that item + * This works similarly to /suicide_act: if you want an item to have a unique interaction, go to that item * and give it an /on_accidental_consumption proc override. For a simple example of this, check out the nuke disk. * * Arguments @@ -1379,7 +1425,11 @@ return source_item?.reagents?.add_reagent(/datum/reagent/blood, 2) +<<<<<<< HEAD else if(custom_materials?.len) //if we've got materials, lets see whats in it +======= + else if(custom_materials?.len) //if we've got materials, let's see what's in it +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // How many mats have we found? You can only be affected by two material datums by default var/found_mats = 0 // How much of each material is in it? Used to determine if the glass should break @@ -1482,6 +1532,7 @@ if(SEND_SIGNAL(src, COMSIG_ITEM_OFFER_TAKEN, offerer, taker) & COMPONENT_OFFER_INTERRUPT) return TRUE +<<<<<<< HEAD /// SKYRAT EDIT ADDITION START /obj/item/reskin_obj(mob/M) if(!uses_advanced_reskins) @@ -1551,6 +1602,8 @@ /// SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Special stuff you want to do when an outfit equips this item. /obj/item/proc/on_outfit_equip(mob/living/carbon/human/outfit_wearer, visuals_only, item_slot) SHOULD_CALL_PARENT(TRUE) @@ -1870,3 +1923,40 @@ RETURN_TYPE(/obj/item) return src +<<<<<<< HEAD +======= + +/// Checks if the bait is liked by the fish type or not. Returns a multiplier that affects the chance of catching it. +/obj/item/proc/check_bait(obj/item/fish/fish_type) + if(HAS_TRAIT(src, TRAIT_OMNI_BAIT)) + return 1 + var/catch_multiplier = 1 + var/list/properties = SSfishing.fish_properties[fish_type] + //Bait matching likes doubles the chance + var/list/fav_bait = properties[FISH_PROPERTIES_FAV_BAIT] + for(var/bait_identifer in fav_bait) + if(is_matching_bait(src, bait_identifer)) + catch_multiplier *= 2 + //Bait matching dislikes + var/list/disliked_bait = properties[FISH_PROPERTIES_BAD_BAIT] + for(var/bait_identifer in disliked_bait) + if(is_matching_bait(src, bait_identifer)) + catch_multiplier *= 0.5 + return catch_multiplier + +/// Helper proc that checks if a bait matches identifier from fav/disliked bait list +/proc/is_matching_bait(obj/item/bait, identifier) + if(ispath(identifier)) //Just a path + return istype(bait, identifier) + if(!islist(identifier)) + return HAS_TRAIT(bait, identifier) + var/list/special_identifier = identifier + switch(special_identifier[FISH_BAIT_TYPE]) + if(FISH_BAIT_FOODTYPE) + var/obj/item/food/food_bait = bait + return istype(food_bait) && food_bait.foodtypes & special_identifier[FISH_BAIT_VALUE] + if(FISH_BAIT_REAGENT) + return bait.reagents?.has_reagent(special_identifier[FISH_BAIT_VALUE], special_identifier[FISH_BAIT_AMOUNT], check_subtypes = TRUE) + else + CRASH("Unknown bait identifier in fish favourite/disliked list") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm index 1405dc6880c..7bd4d6ceae5 100644 --- a/code/game/objects/items/AI_modules/_AI_modules.dm +++ b/code/game/objects/items/AI_modules/_AI_modules.dm @@ -104,7 +104,10 @@ affected_cyborgs += owned_borg borg_flw += "[ADMIN_LOOKUPFLW(owned_borg)], " borg_txt += "[owned_borg.name]([owned_borg.key]), " +<<<<<<< HEAD owned_borg.lawsync() // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 borg_txt = borg_txt.Join() GLOB.lawchanges.Add("[time] : [user.name]([user.key]) used [src.name] on [ainame]([aikey]).[law2log ? " The law specified [law2log]" : ""], [length(affected_cyborgs) ? ", impacting synced borgs [borg_txt]" : ""]") diff --git a/code/game/objects/items/AI_modules/hacked.dm b/code/game/objects/items/AI_modules/hacked.dm index 81100d0ed15..4d27ee6c553 100644 --- a/code/game/objects/items/AI_modules/hacked.dm +++ b/code/game/objects/items/AI_modules/hacked.dm @@ -55,7 +55,11 @@ to_chat(sender, span_warning("You should use [src] on an AI upload console or the AI core itself.")) return if(malf_candidate.mind?.has_antag_datum(/datum/antagonist/malf_ai)) //Already malf +<<<<<<< HEAD to_chat(sender, span_warning("Unknown error occured. Upload process aborted.")) +======= + to_chat(sender, span_warning("Unknown error occurred. Upload process aborted.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/datum/antagonist/malf_ai/infected/malf_datum = new (give_objectives = TRUE, new_boss = sender.mind) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 7eb5f2e93d8..c763ee40a01 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -229,7 +229,11 @@ * Actually add current decal to the floor. * * Responsible for actually adding the element to the turf for maximum flexibility.area +<<<<<<< HEAD * Can be overriden for different decal behaviors. +======= + * Can be overridden for different decal behaviors. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Arguments: * * target - The turf being painted to */ @@ -298,7 +302,11 @@ .["current_dir"] = stored_dir .["current_custom_color"] = stored_custom_color +<<<<<<< HEAD /obj/item/airlock_painter/decal/ui_act(action, list/params) +======= +/obj/item/airlock_painter/decal/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -393,7 +401,11 @@ list("Neutral", "#D4D4D432"), list("Dark", "#0e0f0f"), list("Bar Burgundy", "#79150082"), +<<<<<<< HEAD list("Sec Blue", "#486091"), // SKYRAT EDIT CHANGE +======= + list("Sec Red", "#DE3A3A"), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list("Cargo Brown", "#A46106"), list("Engi Yellow", "#EFB341"), list("Service Green", "#9FED58"), diff --git a/code/game/objects/items/bear_armor.dm b/code/game/objects/items/bear_armor.dm index 8cfad42be15..c2477546f97 100644 --- a/code/game/objects/items/bear_armor.dm +++ b/code/game/objects/items/bear_armor.dm @@ -1,7 +1,11 @@ /obj/item/bear_armor name = "pile of bear armor" desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \ +<<<<<<< HEAD are written on the back of one of the plates in russian. This seems like an awful idea." +======= + are written on the back of one of the plates in Russian. This seems like an awful idea." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/tools.dmi' icon_state = "bear_armor_upgrade" diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index d244d8c55cc..03fcada3b27 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -15,6 +15,7 @@ if(iscarbon(loc)) Insert(loc) +<<<<<<< HEAD /obj/item/organ/internal/body_egg/Insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() if(!.) @@ -29,6 +30,21 @@ egg_owner.med_hud_set_status() INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), egg_owner) +======= +/obj/item/organ/internal/body_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) + . = ..() + + egg_owner.add_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT) + egg_owner.med_hud_set_status() + INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), egg_owner) + +/obj/item/organ/internal/body_egg/mob_remove(mob/living/carbon/egg_owner, special, movement_flags) + . = ..() + egg_owner.remove_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT) + egg_owner.med_hud_set_status() + INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), egg_owner) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/body_egg/on_death(seconds_per_tick, times_fired) . = ..() if(!owner) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index c949f977508..26216eaa603 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -86,7 +86,11 @@ return item_bag /obj/item/bodybag/bluespace/container_resist_act(mob/living/user) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You can't get out while you're restrained like this!")) return user.changeNext_move(CLICK_CD_BREAKOUT) @@ -97,7 +101,11 @@ return // you are still in the bag? time to go unless you KO'd, honey! // if they escape during this time and you rebag them the timer is still clocking down and does NOT reset so they can very easily get out. +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(loc, span_warning("The pressure subsides. It seems that they've stopped resisting...")) return loc.visible_message(span_warning("[user] suddenly appears in front of [loc]!"), span_userdanger("[user] breaks free of [src]!")) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index d4508710a85..b49991b132a 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -149,7 +149,7 @@ /obj/item/cardboard_cutout/proc/check_menu(mob/living/user, obj/item/toy/crayon/crayon) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE if(pushed_over) to_chat(user, span_warning("Right [src] first!")) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 7524152c65b..ac7e782b36d 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -87,7 +87,11 @@ var/holopay_name = "holographic pay stand" /// Registered owner's age. +<<<<<<< HEAD var/registered_age = 18 //SKYRAT EDIT - ORIGINAL (13) +======= + var/registered_age = 30 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The job name registered on the card (for example: Assistant). var/assignment @@ -104,6 +108,14 @@ /// Boolean value. If TRUE, the [Intern] tag gets prepended to this ID card when the label is updated. var/is_intern = FALSE +<<<<<<< HEAD +======= + ///If true, the wearer will have bigger arrow when pointing at things. Passed down by trims. + var/big_pointer = FALSE + ///If set, the arrow will have a different color. + var/pointer_color + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/card_id fire = 100 acid = 100 @@ -144,6 +156,32 @@ QDEL_NULL(my_store) return ..() +<<<<<<< HEAD +======= +/obj/item/card/id/equipped(mob/user, slot) + . = ..() + if(slot == ITEM_SLOT_ID) + RegisterSignal(user, COMSIG_MOVABLE_POINTED, PROC_REF(on_pointed)) + +/obj/item/card/id/proc/on_pointed(mob/living/user, atom/pointed, obj/effect/temp_visual/point/point) + SIGNAL_HANDLER + if((!big_pointer && !pointer_color) || HAS_TRAIT(user, TRAIT_UNKNOWN)) + return + if(point.icon_state != /obj/effect/temp_visual/point::icon_state) //it differs from the original icon_state already. + return + if(big_pointer) + point.icon_state = "arrow_large" + if(pointer_color) + point.icon_state = "[point.icon_state]_white" + point.color = pointer_color + var/mutable_appearance/highlight = mutable_appearance(point.icon, "[point.icon_state]_highlights", appearance_flags = RESET_COLOR) + point.add_overlay(highlight) + +/obj/item/card/id/dropped(mob/user) + UnregisterSignal(user, COMSIG_MOVABLE_POINTED) + return ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/card/id/get_id_examine_strings(mob/user) . = ..() . += list("[icon2html(get_cached_flat_icon(), user, extra_classes = "bigicon")]") @@ -421,7 +459,11 @@ if(Adjacent(user)) var/minor if(registered_name && registered_age && registered_age < AGE_MINOR) +<<<<<<< HEAD minor = " [registered_age]" //SKYRAT EDIT CHANGE +======= + minor = " (MINOR)" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] shows you: [icon2html(src, viewers(user))] [src.name][minor]."), span_notice("You show \the [src.name][minor].")) add_fingerprint(user) @@ -566,11 +608,14 @@ return ITEM_INTERACT_BLOCKING to_chat(user, span_notice("You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.")) return ITEM_INTERACT_SUCCESS +<<<<<<< HEAD /// SKYRAT EDIT BEGINS - Trim Tokens - Proc defined in modular_skyrat/modules/trim_tokens/code/cards_id.dm else if(istype(tool, /obj/item/trim_token)) apply_token(tool, user) return /// SKYRAT EDIT ENDS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE /** @@ -1424,7 +1469,11 @@ desc = "A highly advanced chameleon ID card. Touch this card on another ID card or player to choose which accesses to copy. \ Has special magnetic properties which force it to the front of wallets." trim = /datum/id_trim/chameleon +<<<<<<< HEAD wildcard_slots = WILDCARD_LIMIT_CHAMELEON_PLUS // SKYRAT EDIT - Original WILDCARD_LIMIT_CHAMELEON +======= + wildcard_slots = WILDCARD_LIMIT_CHAMELEON +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 actions_types = list(/datum/action/item_action/chameleon/change/id, /datum/action/item_action/chameleon/change/id_trim) /// Have we set a custom name and job assignment, or will we use what we're given when we chameleon change? @@ -1559,7 +1608,11 @@ return data +<<<<<<< HEAD /obj/item/card/id/advanced/chameleon/ui_act(action, list/params) +======= +/obj/item/card/id/advanced/chameleon/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -1864,7 +1917,11 @@ /obj/item/card/cardboard/proc/after_input_check(mob/living/user, obj/item/item, input, value) if(!input || (value && input == value)) return FALSE +<<<<<<< HEAD if(QDELETED(user) || QDELETED(item) || QDELETED(src) || user.incapacitated() || !user.is_holding(item) || !user.CanReach(src) || !user.can_write(item)) +======= + if(QDELETED(user) || QDELETED(item) || QDELETED(src) || user.incapacitated || !user.is_holding(item) || !user.CanReach(src) || !user.can_write(item)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index 68501057ebf..e951a0bcb78 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -80,7 +80,11 @@ /** * Handles adding components to the chainsaw. Added in Initialize() * +<<<<<<< HEAD * Applies components to the chainsaw. Added as a seperate proc to allow for +======= + * Applies components to the chainsaw. Added as a separate proc to allow for +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * variance between subtypes */ /obj/item/chainsaw/proc/apply_components() diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm index d7fd7b39544..dcfc7930ebf 100644 --- a/code/game/objects/items/chromosome.dm +++ b/code/game/objects/items/chromosome.dm @@ -2,7 +2,7 @@ name = "blank chromosome" icon = 'icons/obj/science/chromosomes.dmi' icon_state = "" - desc = "A tube holding chromosomic data." + desc = "A tube holding chromosomal data." force = 0 w_class = WEIGHT_CLASS_SMALL @@ -16,7 +16,7 @@ /obj/item/chromosome/proc/can_apply(datum/mutation/human/HM) if(!HM || !(HM.can_chromosome == CHROMOSOME_NONE)) return FALSE - if((stabilizer_coeff != 1) && (HM.stabilizer_coeff != -1)) //if the chromosome is 1, we dont change anything. If the mutation is -1, we cant change it. sorry + if((stabilizer_coeff != 1) && (HM.stabilizer_coeff != -1)) //if the chromosome is 1, we don't change anything. If the mutation is -1, we can't change it. sorry return TRUE if((synchronizer_coeff != 1) && (HM.synchronizer_coeff != -1)) return TRUE diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 69764c17b0d..70c3df834ee 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -43,10 +43,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/match/proc/matchignite() if(lit || burnt) return +<<<<<<< HEAD //SKYRAT EDIT ADDITION var/turf/my_turf = get_turf(src) my_turf.pollute_turf(/datum/pollutant/sulphur, 5) //SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(src, 'sound/items/match_strike.ogg', 15, TRUE) lit = TRUE icon_state = "match_lit" @@ -187,8 +191,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM /// Which people ate cigarettes and how many var/static/list/cigarette_eaters = list() +<<<<<<< HEAD var/pollution_type = /datum/pollutant/smoke //SKYRAT EDIT ADDITION /// What type of pollution does this produce on smoking, changed to weed pollution sometimes +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/cigarette/Initialize(mapload) . = ..() create_reagents(chem_volume, INJECTABLE | NO_REACT) @@ -249,7 +256,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!QDELETED(src) && !QDELETED(dropee) && how_long_have_we_been_smokin >= 4 SECONDS && iscarbon(dropee) && iscarbon(loc)) var/mob/living/carbon/smoker = dropee // This relies on the fact that dropped is called before slot is nulled +<<<<<<< HEAD if(src == smoker.wear_mask && !smoker.incapacitated()) +======= + if(src == smoker.wear_mask && !smoker.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 long_exhale(smoker) UnregisterSignal(dropee, list(COMSIG_HUMAN_FORCESAY, COMSIG_ATOM_DIR_CHANGE)) @@ -473,11 +484,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM extinguish() return +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Pollution var/turf/location = get_turf(src) location.pollute_turf(pollution_type, 5, POLLUTION_PASSIVE_EMITTER_CAP) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 smoketime -= seconds_per_tick * (1 SECONDS) if(smoketime <= 0) put_out(user) @@ -1170,13 +1184,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/vape name = "\improper E-Cigarette" desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that. +<<<<<<< HEAD icon = 'icons/obj/clothing/masks.dmi' worn_icon_muzzled = 'modular_skyrat/master_files/icons/mob/clothing/mask.dmi' //SKYRAT EDIT: ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "vape" worn_icon_state = "vape_worn" greyscale_config = /datum/greyscale_config/vape greyscale_config_worn = /datum/greyscale_config/vape/worn +<<<<<<< HEAD greyscale_config_worn_muzzled = /datum/greyscale_config/vape/worn/muzzled //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#2e2e2e" inhand_icon_state = null w_class = WEIGHT_CLASS_TINY @@ -1320,6 +1340,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) //it's reusable so it won't unequip when empty return +<<<<<<< HEAD if(!COOLDOWN_FINISHED(src, drag_cooldown)) return @@ -1333,6 +1354,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM my_turf.pollute_turf(/datum/pollutant/smoke/vape, 5, POLLUTION_PASSIVE_EMITTER_CAP) //SKYRAT EDIT END +======= + + if(!COOLDOWN_FINISHED(src, drag_cooldown)) + return + + //Time to start puffing those fat vapes, yo. + COOLDOWN_START(src, drag_cooldown, dragtime) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(obj_flags & EMAGGED) var/datum/effect_system/fluid_spread/smoke/chem/smoke_machine/puff = new puff.set_up(4, holder = src, location = loc, carry = reagents, efficiency = 24) diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 6c2c107fc85..a2da37bfdcf 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -631,6 +631,10 @@ /obj/machinery/vending/coffee = "Solar's Best Hot Drinks", /obj/machinery/vending/cola = "Robust Softdrinks", /obj/machinery/vending/custom = "Custom Vendor", +<<<<<<< HEAD +======= + /obj/machinery/vending/cytopro = "CytoPro", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/vending/dinnerware = "Plasteel Chef's Dinnerware Vendor", /obj/machinery/vending/drugs = "NanoDrug Plus", /obj/machinery/vending/engineering = "Robco Tool Maker", @@ -666,6 +670,7 @@ /obj/machinery/vending/wardrobe/science_wardrobe = "SciDrobe", /obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe", /obj/machinery/vending/wardrobe/viro_wardrobe = "ViroDrobe", +<<<<<<< HEAD // SKYRAT STUFF AT THE BOTTOM I SUPPOSE FOR SIMPLICITY'S SAKE /obj/machinery/vending/access/command = "Command Outfitting Station", //SKYRAT EDIT ADDITION /obj/machinery/vending/barbervend = "Fab-O-Vend", //SKYRAT EDIT ADDITION @@ -676,6 +681,8 @@ /obj/machinery/vending/imported/yangyu = "Fudobenda", //SKYRAT EDIT ADDITION /obj/machinery/vending/security = "Armadyne Peacekeeper Equipment Vendor", //SKYRAT EDIT CHANGE - SEC_HUAL - ORIGINAL: /obj/machinery/vending/security = "SecTech", /obj/machinery/vending/deforest_medvend = "DeForest Med-Vend", //SKYRAT PORT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/circuitboard/machine/vendor/screwdriver_act(mob/living/user, obj/item/tool) @@ -932,6 +939,12 @@ /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/glass = 2) +<<<<<<< HEAD +======= +/obj/item/circuitboard/machine/sleeper/syndie + build_path = /obj/machinery/sleeper/syndie + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/circuitboard/machine/sleeper/fullupgrade build_path = /obj/machinery/sleeper/syndie/fullupgrade req_components = list( @@ -1113,6 +1126,10 @@ /obj/item/stack/sheet/glass = 1, /obj/item/stack/cable_coil = 2) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/circuitboard/machine/dna_infuser name = "DNA Infuser" greyscale_colors = CIRCUIT_COLOR_SCIENCE diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 390a48ffa70..2fa56b786d4 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -6,7 +6,11 @@ gender = PLURAL name = "red lipstick" desc = "A generic brand of lipstick." +<<<<<<< HEAD icon = 'modular_skyrat/modules/salon/icons/items.dmi' //SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/obj/cosmetic.dmi' +======= + icon = 'icons/obj/cosmetic.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "lipstick" base_icon_state = "lipstick" inhand_icon_state = "lipstick" @@ -37,8 +41,11 @@ . += "Alt-click to change the style." /obj/item/lipstick/update_icon_state() +<<<<<<< HEAD icon_state = "lipstick[open ? "_uncap" : null]" inhand_icon_state = "lipstick[open ? "open" : null]" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "[base_icon_state][open ? "_uncap" : null]" inhand_icon_state = "[base_icon_state][open ? "open" : null]" return ..() @@ -77,7 +84,11 @@ /obj/item/lipstick/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.is_holding(src)) +======= + if(user.incapacitated || !user.is_holding(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -115,13 +126,19 @@ name = "syndie lipstick" desc = "Syndicate branded lipstick with a killer dose of kisses. Observe safety regulations!" icon_state = "slipstick" +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 base_icon_state = "slipstick" lipstick_color = COLOR_SYNDIE_RED lipstick_trait = TRAIT_SYNDIE_KISS random_spawn = FALSE +<<<<<<< HEAD lipstick_color = COLOR_SYNDIE_RED lipstick_trait = TRAIT_SYNDIE_KISS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/lipstick/random name = "lipstick" @@ -186,6 +203,17 @@ to_chat(user, span_notice("You wipe off the lipstick with [src].")) target.update_lips(null) return +<<<<<<< HEAD +======= + + user.visible_message(span_warning("[user] begins to wipe [target]'s lipstick off with \the [src]."), \ + span_notice("You begin to wipe off [target]'s lipstick...")) + if(!do_after(user, 1 SECONDS, target = target)) + return + user.visible_message(span_notice("[user] wipes [target]'s lipstick off with \the [src]."), \ + span_notice("You wipe off [target]'s lipstick.")) + target.update_lips(null) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_warning("[user] begins to wipe [target]'s lipstick off with \the [src]."), \ span_notice("You begin to wipe off [target]'s lipstick...")) @@ -208,7 +236,7 @@ /obj/item/razor/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] begins shaving [user.p_them()]self without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!")) shave(user, BODY_ZONE_PRECISE_MOUTH) - shave(user, BODY_ZONE_HEAD)//doesnt need to be BODY_ZONE_HEAD specifically, but whatever + shave(user, BODY_ZONE_HEAD)//doesn't need to be BODY_ZONE_HEAD specifically, but whatever return BRUTELOSS /obj/item/razor/proc/shave(mob/living/carbon/human/skinhead, location = BODY_ZONE_PRECISE_MOUTH) @@ -334,7 +362,10 @@ shave(human_target, location) return return ..() +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/razor/surgery name = "surgical razor" diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 23f2dad1e4e..69b3cae552b 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -372,7 +372,11 @@ .["selected_color"] = GLOB.pipe_color_name[paint_color] || paint_color .["paint_colors"] = GLOB.pipe_paint_colors +<<<<<<< HEAD /obj/item/toy/crayon/ui_act(action, list/params) +======= +/obj/item/toy/crayon/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index 071561d57a0..24f350f3790 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -46,7 +46,7 @@ /obj/item/debug/omnitool/proc/check_menu(mob/user) if(!istype(user)) return FALSE - if(user.incapacitated() || !user.Adjacent(src)) + if(user.incapacitated || !user.Adjacent(src)) return FALSE return TRUE diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index b34540e441c..5c17f57e3ed 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -137,11 +137,20 @@ return ..() /obj/item/defibrillator/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params) +<<<<<<< HEAD if(ismob(loc)) var/mob/M = loc if(istype(over_object, /atom/movable/screen/inventory/hand)) var/atom/movable/screen/inventory/hand/H = over_object M.putItemFromInventoryInHandIfPossible(src, H.held_index) +======= + if(!ismob(loc)) + return + var/mob/living_mob = loc + if(!living_mob.incapacitated && istype(over_object, /atom/movable/screen/inventory/hand)) + var/atom/movable/screen/inventory/hand/hand = over_object + living_mob.putItemFromInventoryInHandIfPossible(src, hand.held_index) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/defibrillator/screwdriver_act(mob/living/user, obj/item/tool) if(!cell || !cell_removable) @@ -576,12 +585,15 @@ do_cancel() /obj/item/shockpaddles/proc/do_help(mob/living/carbon/H, mob/living/user) +<<<<<<< HEAD var/target_synthetic = (H.mob_biotypes & MOB_ROBOTIC) // SKYRAT EDIT ADDITION BEGIN - SYNTH REVIVAL if (target_synthetic) to_chat(user, span_boldwarning("[H] is a synthetic lifeform! This defibrillator probably isn't calibrated to revive [H.p_them()] properly and could have some serious consequences! \ [span_warning("You might want to [span_blue("surgically revive [H.p_them()]")]...")]")) balloon_alert(user, "target is synthetic!") // immediately grabs their attention even if they dont see chat // SKYRAT EDIT ADDITION END - SYNTH REVIVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_warning("[user] begins to place [src] on [H]'s chest."), span_warning("You begin to place [src] on [H]'s chest...")) busy = TRUE update_appearance() @@ -628,10 +640,13 @@ fail_reason = "Patient's brain is missing. Further attempts futile." if (DEFIB_FAIL_BLACKLISTED) fail_reason = "Patient has been blacklisted from revival. Further attempts futile." +<<<<<<< HEAD //SKYRAT EDIT ADDITION - DNR TRAIT if (DEFIB_FAIL_DNR) fail_reason = "Patient has been flagged as Do Not Resuscitate. Further attempts futile." //SKYRAT EDIT ADDITION END - DNR TRAIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(fail_reason) user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - [fail_reason]")) @@ -661,13 +676,17 @@ H.revive() H.emote("gasp") H.set_jitter_if_lower(200 SECONDS) +<<<<<<< HEAD to_chat(H, "[CONFIG_GET(string/blackoutpolicy)]") //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK) if(HAS_MIND_TRAIT(user, TRAIT_MORBID)) user.add_mood_event("morbid_saved_life", /datum/mood_event/morbid_saved_life) else user.add_mood_event("saved_life", /datum/mood_event/saved_life) log_combat(user, H, "revived", defib) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - SYNTH REVIVAL if (target_synthetic) user.visible_message(span_boldwarning("[src] fire a powerful jolt of electricity into [H]'s vulnerable circuitry!")) @@ -685,6 +704,8 @@ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_synth_defib_trauma), brain_organ, trauma), SYNTH_DEFIBBED_TRAUMA_DURATION) // SKYRAT EDIT ADDITION END - SYNTH REVIVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 do_success() return else if (!H.get_organ_by_type(/obj/item/organ/internal/heart)) diff --git a/code/game/objects/items/devices/broadcast_camera.dm b/code/game/objects/items/devices/broadcast_camera.dm new file mode 100644 index 00000000000..f2fc0192f56 --- /dev/null +++ b/code/game/objects/items/devices/broadcast_camera.dm @@ -0,0 +1,104 @@ +// Unique broadcast camera given to the first Curator +// Only one should exist ideally, if other types are created they must have different camera_networks +// Broadcasts its surroundings to entertainment monitors and its audio to entertainment radio channel +/obj/item/broadcast_camera + name = "broadcast camera" + desc = "A large camera that streams its live feed and audio to entertainment monitors across the station, allowing everyone to watch the broadcast." + desc_controls = "Right-click to change the broadcast name. Alt-click to toggle microphone." + icon = 'icons/obj/service/broadcast.dmi' + icon_state = "broadcast_cam0" + base_icon_state = "broadcast_cam" + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' + force = 8 + throwforce = 12 + w_class = WEIGHT_CLASS_NORMAL + obj_flags = INDESTRUCTIBLE | EMP_PROTECT_ALL // No fun police + slot_flags = NONE + light_system = OVERLAY_LIGHT + light_color = COLOR_SOFT_RED + light_range = 1 + light_power = 0.3 + light_on = FALSE + /// Is camera streaming + var/active = FALSE + /// The name of the broadcast + var/broadcast_name = "Curator News" + /// The networks it broadcasts to, default is CAMERANET_NETWORK_CURATOR + var/list/camera_networks = list(CAMERANET_NETWORK_CURATOR) + /// The "virtual" security camera inside of the physical camera + var/obj/machinery/camera/internal_camera + /// The "virtual" radio inside of the the physical camera, a la microphone + var/obj/item/radio/entertainment/microphone/internal_radio + +/obj/item/broadcast_camera/Destroy(force) + QDEL_NULL(internal_radio) + QDEL_NULL(internal_camera) + + return ..() + +/obj/item/broadcast_camera/update_icon_state() + icon_state = "[base_icon_state]0" + return ..() + +/obj/item/broadcast_camera/attack_self(mob/user, modifiers) + . = ..() + active = !active + if(active) + on_activating() + else + on_deactivating() + +/obj/item/broadcast_camera/attack_self_secondary(mob/user, modifiers) + . = ..() + broadcast_name = tgui_input_text(user = user, title = "Broadcast Name", message = "What will be the name of your broadcast?", default = "[broadcast_name]", max_length = MAX_CHARTER_LEN) + +/obj/item/broadcast_camera/examine(mob/user) + . = ..() + . += span_notice("Broadcast name is [broadcast_name]") + +/obj/item/broadcast_camera/on_enter_storage(datum/storage/master_storage) + . = ..() + if(active) + on_deactivating() + +/obj/item/broadcast_camera/dropped(mob/user, silent) + . = ..() + if(active) + on_deactivating() + +/// When activating the camera +/obj/item/broadcast_camera/proc/on_activating() + if(!iscarbon(loc)) + return + active = TRUE + icon_state = "[base_icon_state][active]" + /// The carbon who wielded the camera, allegedly + var/mob/living/carbon/wielding_carbon = loc + + // INTERNAL CAMERA + internal_camera = new(wielding_carbon) // Cameras for some reason do not work inside of obj's + internal_camera.internal_light = FALSE + internal_camera.network = camera_networks + internal_camera.c_tag = "LIVE: [broadcast_name]" + start_broadcasting_network(camera_networks, "[broadcast_name] is now LIVE!") + + // INTERNAL RADIO + internal_radio = new(src) + + set_light_on(TRUE) + playsound(source = src, soundin = 'sound/machines/terminal_processing.ogg', vol = 20, vary = FALSE, ignore_walls = FALSE) + balloon_alert_to_viewers("live!") + +/// When deactivating the camera +/obj/item/broadcast_camera/proc/on_deactivating() + active = FALSE + icon_state = "[base_icon_state][active]" + QDEL_NULL(internal_camera) + QDEL_NULL(internal_radio) + + stop_broadcasting_network(camera_networks) + + set_light_on(FALSE) + playsound(source = src, soundin = 'sound/machines/terminal_prompt_deny.ogg', vol = 20, vary = FALSE, ignore_walls = FALSE) + balloon_alert_to_viewers("offline") diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 96dae8c0fc5..2be8ab69d12 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -41,10 +41,16 @@ set_light_on(TRUE) update_brightness() register_context() +<<<<<<< HEAD if(toggle_context) RegisterSignal(src, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur)) +======= + if(toggle_context) + RegisterSignal(src, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/flashlight_eyes) AddElement( @@ -541,7 +547,10 @@ randomize_fuel = FALSE trash_type = /obj/item/trash/candle can_be_extinguished = TRUE +<<<<<<< HEAD var/scented_type //SKYRAT EDIT ADDITION /// Pollutant type for scented candles +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The current wax level, used for drawing the correct icon var/current_wax_level = 1 /// The previous wax level, remembered so we only have to make 3 update_appearance calls total as opposed to every tick @@ -696,6 +705,9 @@ color = LIGHT_COLOR_GREEN light_color = LIGHT_COLOR_GREEN +/obj/item/flashlight/lantern/jade/on + start_on = TRUE + /obj/item/flashlight/slime gender = PLURAL name = "glowing slime extract" diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index d9260649742..6605218c9d3 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -271,7 +271,11 @@ //catpeople: make any felinid near the target to face the target, chance for felinids to pounce at the light, stepping to the target for(var/mob/living/carbon/human/target_felinid in view(1, targloc)) +<<<<<<< HEAD if(!isfeline(target_felinid) || target_felinid.stat == DEAD || target_felinid.is_blind() || target_felinid.incapacitated()) // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(H) +======= + if(!isfelinid(target_felinid) || target_felinid.stat == DEAD || target_felinid.is_blind() || target_felinid.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(target_felinid.body_position == STANDING_UP) target_felinid.setDir(get_dir(target_felinid, targloc)) // kitty always looks at the light @@ -300,7 +304,11 @@ if(outmsg) user.visible_message(span_danger("[user] points [src] at [target]!"), outmsg) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(user, outmsg) else +<<<<<<< HEAD user.visible_message(span_notice("[user] points [src] at [target]."), span_notice("You point [src] at [target].")) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(user, span_info("You point [src] at [target].")) +======= + to_chat(user, span_info("You point [src] at [target].")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //we have successfully shone our pointer, reduce our battery depending on whether we have an extra lens or not energy -= crystal_lens ? 2 : 1 diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 4039b412ebe..8ea1b5f0a26 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -208,7 +208,11 @@ for(var/obj/machinery/light/target in user.loc) replace_light(target, user) on_a_light = TRUE +<<<<<<< HEAD if(!on_a_light) //So we dont give a ballon alert when we just used replace_light +======= + if(!on_a_light) //So we don't give a balloon alert when we just used replace_light +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.balloon_alert(user, "[uses] lights, [bulb_shards]/[BULB_SHARDS_REQUIRED] fragments") /** diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index d250139e38e..0180c223462 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -87,8 +87,11 @@ // Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby. /obj/item/multitool/ai_detect +<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "A special sensor embedded stealthily into this device can detect and warn of nearby silicon activity and camera vision range." // Skyrat edit +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 actions_types = list(/datum/action/item_action/toggle_multitool) var/detect_state = PROXIMITY_NONE var/rangealert = 8 //Glows red when inside diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 1925737143e..29090fd8234 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -2,9 +2,15 @@ #define CLAMPED_OFF 1 #define OPERATING 2 +<<<<<<< HEAD #define FRACTION_TO_RELEASE 50 #define ALERT 90 #define MINIMUM_HEAT 10000 +======= +#define FRACTION_TO_RELEASE 25 +#define ALERT 90 +#define MINIMUM_HEAT 20000 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Powersink - used to drain station power @@ -23,7 +29,11 @@ throw_speed = 1 throw_range = 2 custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT* 7.5) +<<<<<<< HEAD var/max_heat = 5e7 // Maximum contained heat before exploding. Not actual temperature. +======= + var/max_heat = 100 * STANDARD_BATTERY_CHARGE // Maximum contained heat before exploding. Not actual temperature. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/internal_heat = 0 // Contained heat, goes down every tick. var/mode = DISCONNECTED // DISCONNECTED, CLAMPED_OFF, OPERATING var/warning_given = FALSE //! Stop warning spam, only warn the admins/deadchat once that we are about to boom. @@ -171,7 +181,11 @@ if(istype(terminal.master, /obj/machinery/power/apc)) var/obj/machinery/power/apc/apc = terminal.master if(apc.operating && apc.cell) +<<<<<<< HEAD drained += 0.001 * apc.cell.use(0.05 * STANDARD_CELL_CHARGE, force = TRUE) +======= + drained += 0.001 * apc.cell.use(0.1 * STANDARD_BATTERY_CHARGE, force = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 internal_heat += drained /obj/item/powersink/process() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index af19c6cd4f5..537e7fc3984 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -104,7 +104,11 @@ data["maxFrequency"] = MAX_FREE_FREQ return data +<<<<<<< HEAD /obj/item/electropack/ui_act(action, params) +======= +/obj/item/electropack/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 88c9251d5b2..fa70311b0b3 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/devices/circuitry_n_data.dmi' icon_state = "cypherkey_basic" w_class = WEIGHT_CLASS_TINY +<<<<<<< HEAD /// Can this radio key access the binary radio channel? var/translate_binary = FALSE /// Decrypts Syndicate radio transmissions. @@ -12,18 +13,32 @@ var/independent = FALSE /// What channels does this encryption key grant to the parent headset. var/list/channels = list() +======= + /// What channels does this encryption key grant to the parent headset. + var/list/channels = list() + /// Flags for which "special" radio networks should be accessible + var/special_channels = NONE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/language/translated_language greyscale_config = /datum/greyscale_config/encryptionkey_basic greyscale_colors = "#820a16#3758c4" /obj/item/encryptionkey/examine(mob/user) . = ..() +<<<<<<< HEAD if(LAZYLEN(channels) || translate_binary) +======= + if(LAZYLEN(channels) || special_channels & RADIO_SPECIAL_BINARY) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/examine_text_list = list() for(var/i in channels) examine_text_list += "[GLOB.channel_tokens[i]] - [LOWER_TEXT(i)]" +<<<<<<< HEAD if(translate_binary) +======= + if(special_channels & RADIO_SPECIAL_BINARY) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 examine_text_list += "[GLOB.channel_tokens[MODE_BINARY]] - [MODE_BINARY]" . += span_notice("It can access the following channels; [jointext(examine_text_list, ", ")].") @@ -34,14 +49,22 @@ name = "syndicate encryption key" icon_state = "cypherkey_syndicate" channels = list(RADIO_CHANNEL_SYNDICATE = 1) +<<<<<<< HEAD syndie = TRUE +======= + special_channels = RADIO_SPECIAL_SYNDIE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_config = /datum/greyscale_config/encryptionkey_syndicate greyscale_colors = "#171717#990000" /obj/item/encryptionkey/binary name = "binary translator key" icon_state = "cypherkey_basic" +<<<<<<< HEAD translate_binary = TRUE +======= + special_channels = RADIO_SPECIAL_BINARY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 translated_language = /datum/language/machine greyscale_config = /datum/greyscale_config/encryptionkey_basic greyscale_colors = "#24a157#3758c4" @@ -101,6 +124,16 @@ channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SERVICE = 1) greyscale_config = /datum/greyscale_config/encryptionkey_service greyscale_colors = "#ebebeb#3bca5a" +<<<<<<< HEAD +======= + +/obj/item/encryptionkey/headset_srvent + name = "press radio encryption key" + icon_state = "cypherkey_service" + channels = list(RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_ENTERTAINMENT = 0) + greyscale_config = /datum/greyscale_config/encryptionkey_service + greyscale_colors = "#83eb8f#3bca5a" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/encryptionkey/headset_com name = "command radio encryption key" @@ -182,7 +215,11 @@ /obj/item/encryptionkey/headset_cent name = "\improper CentCom radio encryption key" icon_state = "cypherkey_centcom" +<<<<<<< HEAD independent = TRUE +======= + special_channels = RADIO_SPECIAL_CENTCOM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 channels = list(RADIO_CHANNEL_CENTCOM = 1) greyscale_config = /datum/greyscale_config/encryptionkey_centcom greyscale_colors = "#24a157#dca01b" @@ -197,6 +234,10 @@ RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_AI_PRIVATE = 1, +<<<<<<< HEAD +======= + RADIO_CHANNEL_ENTERTAINMENT = 1, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/encryptionkey/ai_with_binary @@ -210,15 +251,25 @@ RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_AI_PRIVATE = 1, +<<<<<<< HEAD ) translate_binary = TRUE +======= + RADIO_CHANNEL_ENTERTAINMENT = 1, + ) + special_channels = RADIO_SPECIAL_BINARY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 translated_language = /datum/language/machine /obj/item/encryptionkey/ai/evil //ported from NT, this goes 'inside' the AI. name = "syndicate binary encryption key" icon_state = "cypherkey_syndicate" channels = list(RADIO_CHANNEL_SYNDICATE = 1) +<<<<<<< HEAD syndie = TRUE +======= + special_channels = RADIO_SPECIAL_SYNDIE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_config = /datum/greyscale_config/encryptionkey_syndicate greyscale_colors = "#171717#990000" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index d04fd8c872c..a4e0ea8f4f6 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -17,7 +17,8 @@ GLOBAL_LIST_INIT(channel_tokens, list( RADIO_CHANNEL_SUPPLY = RADIO_TOKEN_SUPPLY, RADIO_CHANNEL_SERVICE = RADIO_TOKEN_SERVICE, MODE_BINARY = MODE_TOKEN_BINARY, - RADIO_CHANNEL_AI_PRIVATE = RADIO_TOKEN_AI_PRIVATE + RADIO_CHANNEL_AI_PRIVATE = RADIO_TOKEN_AI_PRIVATE, + RADIO_CHANNEL_ENTERTAINMENT = RADIO_TOKEN_ENTERTAINMENT, )) /obj/item/radio/headset @@ -55,7 +56,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( if(item_flags & IN_INVENTORY && loc == user) // construction of frequency description var/list/avail_chans = list("Use [RADIO_KEY_COMMON] for the currently tuned frequency") - if(translate_binary) + if(special_channels & RADIO_SPECIAL_BINARY) avail_chans += "use [MODE_TOKEN_BINARY] for [MODE_BINARY]" if(length(channels)) for(var/i in 1 to length(channels)) @@ -208,6 +209,16 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "srv_headset" worn_icon_state = "srv_headset" keyslot = /obj/item/encryptionkey/headset_srvmed +<<<<<<< HEAD +======= + +/obj/item/radio/headset/headset_srvent + name = "press headset" + desc = "A headset allowing the wearer to communicate with service and broadcast to entertainment channel." + icon_state = "srvent_headset" + worn_icon_state = "srv_headset" + keyslot = /obj/item/encryptionkey/headset_srvent +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/radio/headset/headset_com name = "command radio headset" @@ -436,12 +447,16 @@ GLOBAL_LIST_INIT(channel_tokens, list( if(!(ch_name in src.channels)) LAZYSET(channels, ch_name, keyslot2.channels[ch_name]) +<<<<<<< HEAD if(keyslot2.translate_binary) translate_binary = TRUE if(keyslot2.syndie) syndie = TRUE if(keyslot2.independent) independent = TRUE +======= + special_channels |= keyslot2.special_channels +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/ch_name in channels) secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name]) @@ -465,6 +480,11 @@ GLOBAL_LIST_INIT(channel_tokens, list( grant_headset_languages(mob_loc) /obj/item/radio/headset/click_alt(mob/living/user) +<<<<<<< HEAD +======= + if(!istype(user) || !Adjacent(user) || user.incapacitated) + return CLICK_ACTION_BLOCKING +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!command) return CLICK_ACTION_BLOCKING use_command = !use_command diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index e3587b44066..b06ae76d7b2 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -118,7 +118,7 @@ return FALSE if(freq == FREQ_SYNDICATE) - if(!(syndie)) + if(!(special_channels &= RADIO_SPECIAL_SYNDIE)) return FALSE//Prevents broadcast of messages over devices lacking the encryption return TRUE @@ -219,6 +219,25 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 27) command = TRUE icon_off = "intercom_command-p" +<<<<<<< HEAD MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/prison, 27) MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/chapel, 27) MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/command, 27) +======= +/obj/item/radio/intercom/syndicate + name = "syndicate intercom" + desc = "Talk smack through this." + command = TRUE + special_channels = RADIO_SPECIAL_SYNDIE + +/obj/item/radio/intercom/syndicate/freerange + name = "syndicate wide-band intercom" + desc = "A custom-made Syndicate-issue intercom used to transmit on all Nanotrasen frequencies. Particularly expensive." + freerange = TRUE + +MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/prison, 27) +MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/chapel, 27) +MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/command, 27) +MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/syndicate, 27) +MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/syndicate/freerange, 27) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 5c6b7d0d35a..9a2a6bbd0f0 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -57,18 +57,28 @@ var/use_command = FALSE /// If true, use_command can be toggled at will. var/command = FALSE +<<<<<<< HEAD +======= + /// Does it play radio noise? + var/radio_noise = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///makes anyone who is talking through this anonymous. var/anonymize = FALSE /// Encryption key handling var/obj/item/encryptionkey/keyslot +<<<<<<< HEAD /// If true, can hear the special binary channel. var/translate_binary = FALSE /// If true, can say/hear on the special CentCom channel. var/independent = FALSE /// If true, hears all well-known channels automatically, and can say/hear on the Syndicate channel. Also protects from radio jammers. var/syndie = FALSE +======= + /// Flags for which "special" radio networks should be accessible + var/special_channels = NONE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// associative list of the encrypted radio channels this radio is currently set to listen/broadcast to, of the form: list(channel name = TRUE or FALSE) var/list/channels /// associative list of the encrypted radio channels this radio can listen/broadcast to, of the form: list(channel name = channel frequency) @@ -109,7 +119,11 @@ perform_update_icon = FALSE set_listening(listening) set_broadcasting(broadcasting) +<<<<<<< HEAD set_frequency(sanitize_frequency(frequency, freerange, syndie)) +======= + set_frequency(sanitize_frequency(frequency, freerange, (special_channels & RADIO_SPECIAL_SYNDIE))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_on(on) perform_update_icon = TRUE @@ -154,12 +168,7 @@ if(!(channel_name in channels)) channels[channel_name] = keyslot.channels[channel_name] - if(keyslot.translate_binary) - translate_binary = TRUE - if(keyslot.syndie) - syndie = TRUE - if(keyslot.independent) - independent = TRUE + special_channels = keyslot.special_channels for(var/channel_name in channels) secure_radio_connections[channel_name] = add_radio(src, GLOB.radiochannels[channel_name]) @@ -171,9 +180,20 @@ /obj/item/radio/proc/resetChannels() channels = list() secure_radio_connections = list() +<<<<<<< HEAD translate_binary = FALSE syndie = FALSE independent = FALSE +======= + special_channels = NONE + +///goes through all radio channels we should be listening for and readds them to the global list +/obj/item/radio/proc/readd_listening_radio_channels() + for(var/channel_name in channels) + add_radio(src, GLOB.radiochannels[channel_name]) + + add_radio(src, frequency) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///goes through all radio channels we should be listening for and readds them to the global list /obj/item/radio/proc/readd_listening_radio_channels() @@ -185,7 +205,11 @@ /obj/item/radio/proc/make_syndie() // Turns normal radios into Syndicate radios! qdel(keyslot) keyslot = new /obj/item/encryptionkey/syndicate() +<<<<<<< HEAD syndie = TRUE +======= + special_channels |= RADIO_SPECIAL_SYNDIE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 recalculateChannels() /obj/item/radio/interact(mob/user) @@ -342,7 +366,11 @@ channel = null // Nearby active jammers prevent the message from transmitting +<<<<<<< HEAD if(is_within_radio_jammer_range(src) && !syndie) +======= + if(is_within_radio_jammer_range(src) && !(special_channels & RADIO_SPECIAL_SYNDIE)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // Determine the identity information which will be attached to the signal. @@ -352,7 +380,11 @@ var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, radio_message, spans, message_mods) // Independent radios, on the CentCom frequency, reach all independent radios +<<<<<<< HEAD if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_GUILD || freq == FREQ_TARKON || freq == FREQ_SOLFED)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, SOLFED +======= + if (special_channels & RADIO_SPECIAL_CENTCOM && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 signal.data["compression"] = 0 signal.transmission_method = TRANSMISSION_SUPERSPACE signal.levels = list(0) @@ -362,7 +394,11 @@ if(isliving(talking_movable)) var/mob/living/talking_living = talking_movable +<<<<<<< HEAD if(talking_living.client?.prefs.read_preference(/datum/preference/toggle/radio_noise) && !HAS_TRAIT(talking_living, TRAIT_DEAF)) +======= + if(radio_noise && !HAS_TRAIT(talking_living, TRAIT_DEAF) && talking_living.client?.prefs.read_preference(/datum/preference/toggle/radio_noise)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SOUND(talking_living, 'sound/misc/radio_talk.ogg') // All radios make an attempt to use the subspace system first @@ -405,12 +441,16 @@ if(message_mods[RADIO_EXTENSION] == MODE_L_HAND || message_mods[RADIO_EXTENSION] == MODE_R_HAND) // try to avoid being heard double if (loc == speaker && ismob(speaker)) - var/mob/M = speaker - var/idx = M.get_held_index_of_item(src) + var/mob/mob_speaker = speaker + var/idx = mob_speaker.get_held_index_of_item(src) // left hands are odd slots if (idx && (idx % 2) == (message_mods[RADIO_EXTENSION] == MODE_L_HAND)) return +<<<<<<< HEAD talk_into(speaker, raw_message, , spans, language=message_language, message_mods=filtered_mods) +======= + talk_into(speaker, raw_message, spans=spans, language=message_language, message_mods=filtered_mods) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Checks if this radio can receive on the given frequency. /obj/item/radio/proc/can_receive(input_frequency, list/levels) @@ -420,7 +460,11 @@ if(!position || !(position.z in levels)) return FALSE +<<<<<<< HEAD if (input_frequency == FREQ_SYNDICATE && !syndie) +======= + if (input_frequency == FREQ_SYNDICATE && !(special_channels & RADIO_SPECIAL_SYNDIE)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE // allow checks: are we listening on that frequency? @@ -428,7 +472,11 @@ return TRUE for(var/ch_name in channels) if(channels[ch_name] & FREQ_LISTENING) +<<<<<<< HEAD if(GLOB.radiochannels[ch_name] == text2num(input_frequency) || syndie) +======= + if(GLOB.radiochannels[ch_name] == text2num(input_frequency) || special_channels & RADIO_SPECIAL_SYNDIE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE return FALSE @@ -440,7 +488,11 @@ return var/mob/living/holder = loc +<<<<<<< HEAD if(!holder.client?.prefs.read_preference(/datum/preference/toggle/radio_noise) && !HAS_TRAIT(holder, TRAIT_DEAF)) +======= + if(!radio_noise || HAS_TRAIT(holder, TRAIT_DEAF) || !holder.client?.prefs.read_preference(/datum/preference/toggle/radio_noise)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/spans = data["spans"] @@ -499,7 +551,11 @@ tune = tune * 10 . = TRUE if(.) +<<<<<<< HEAD set_frequency(sanitize_frequency(tune, freerange, syndie)) +======= + set_frequency(sanitize_frequency(tune, freerange, (special_channels & RADIO_SPECIAL_SYNDIE))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("listen") set_listening(!listening) . = TRUE @@ -603,7 +659,11 @@ channels[ch_name] = TRUE /obj/item/radio/borg/syndicate +<<<<<<< HEAD syndie = TRUE +======= + special_channels = RADIO_SPECIAL_SYNDIE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 keyslot = /obj/item/encryptionkey/syndicate /obj/item/radio/borg/syndicate/Initialize(mapload) @@ -651,4 +711,63 @@ . = ..() set_listening(FALSE) +<<<<<<< HEAD +======= +// RADIOS USED BY BROADCASTING +/obj/item/radio/entertainment + desc = "You should not hold this." + canhear_range = 7 + freerange = TRUE + freqlock = RADIO_FREQENCY_LOCKED + radio_noise = FALSE + +/obj/item/radio/entertainment/Initialize(mapload) + . = ..() + set_frequency(FREQ_ENTERTAINMENT) + +/obj/item/radio/entertainment/speakers // Used inside of the entertainment monitors, not to be used as a actual item + should_be_listening = TRUE + should_be_broadcasting = FALSE + +/obj/item/radio/entertainment/speakers/Initialize(mapload) + . = ..() + set_broadcasting(FALSE) + set_listening(TRUE) + wires?.cut(WIRE_TX) + +/obj/item/radio/entertainment/speakers/on_receive_message(list/data) + playsound(source = src, soundin = SFX_MUFFLED_SPEECH, vol = 60, extrarange = -4, vary = TRUE, ignore_walls = FALSE) + + return ..() + +/obj/item/radio/entertainment/speakers/physical // Can be used as a physical item + name = "entertainment radio" + desc = "A portable one-way radio permamently tuned into entertainment frequency." + icon_state = "radio" + inhand_icon_state = "radio" + worn_icon_state = "radio" + overlay_speaker_idle = "radio_s_idle" + overlay_speaker_active = "radio_s_active" + overlay_mic_idle = "radio_m_idle" + overlay_mic_active = "radio_m_active" + +/obj/item/radio/entertainment/microphone // Used inside of a broadcast camera, not to be used as a actual item + should_be_listening = FALSE + should_be_broadcasting = TRUE + +/obj/item/radio/entertainment/microphone/Initialize(mapload) + . = ..() + set_broadcasting(TRUE) + set_listening(FALSE) + wires?.cut(WIRE_RX) + +/obj/item/radio/entertainment/microphone/physical // Can be used as a physical item + name = "microphone" + desc = "No comments." + icon = 'icons/obj/service/broadcast.dmi' + icon_state = "microphone" + inhand_icon_state = "microphone" + canhear_range = 3 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef FREQ_LISTENING diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm index 43df72d8a5b..71a82c3d736 100644 --- a/code/game/objects/items/devices/scanners/gas_analyzer.dm +++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm @@ -134,13 +134,21 @@ return list("gasmixes" = last_gasmix_data) /obj/item/analyzer/attack_self(mob/user, modifiers) +<<<<<<< HEAD if(user.stat != CONSCIOUS || !user.can_read(src)) //SKYRAT EDIT: Blind People Can Analyze Again +======= + if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return atmos_scan(user=user, target=get_turf(src), silent=FALSE) on_analyze(source=src, target=get_turf(src)) /obj/item/analyzer/attack_self_secondary(mob/user, modifiers) +<<<<<<< HEAD if(user.stat != CONSCIOUS || !user.can_read(src)) //SKYRAT EDIT: Blind People Can Analyze Again +======= + if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ui_interact(user) diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index 4a4fc0683c2..b41827cb45d 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -45,7 +45,11 @@ return BRUTELOSS /obj/item/healthanalyzer/attack_self(mob/user) +<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT: Blind People Can Analyze Again +======= + if(!user.can_read(src) || user.is_blind()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return scanmode = (scanmode + 1) % SCANMODE_COUNT @@ -58,7 +62,11 @@ /obj/item/healthanalyzer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE +<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT CHANGE - Blind People Can Analyze Again- ORIGINAL: if(!user.can_read(src) || user.is_blind()) +======= + if(!user.can_read(src) || user.is_blind()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING var/mob/living/M = interacting_with @@ -96,7 +104,11 @@ /obj/item/healthanalyzer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE +<<<<<<< HEAD if(!user.can_read(src)) // SKYRAT EDIT CHANGE - Blind people can analyze again - ORIGINAL: if(!user.can_read(src) || user.is_blind()) +======= + if(!user.can_read(src) || user.is_blind()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING chemscan(user, interacting_with) @@ -132,7 +144,11 @@ * tochat - Whether to immediately post the result into the chat of the user, otherwise it will return the results. */ /proc/healthscan(mob/user, mob/living/target, mode = SCANNER_VERBOSE, advanced = FALSE, tochat = TRUE) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // the final list of strings to render @@ -164,6 +180,7 @@ if(HAS_TRAIT(target, TRAIT_HUSK)) if(advanced) if(HAS_TRAIT_FROM(target, TRAIT_HUSK, BURN)) +<<<<<<< HEAD /* SKYRAT EDIT START: More unhusking information */ render_list += "Subject has been husked by severe burns. Proceed by repairing burn damage and following up with \ application of [SYNTHFLESH_UNHUSK_AMOUNT]u synthflesh or injection of rezadone as treatment.\n" @@ -171,6 +188,11 @@ render_list += "Subject has been husked by dessication. Use application of [SYNTHFLESH_LING_UNHUSK_AMOUNT]u \ of synthflesh or injection of rezadone as treatment.\n" /* SKYRAT EDIT END */ +======= + render_list += "Subject has been husked by severe burns.\n" + else if (HAS_TRAIT_FROM(target, TRAIT_HUSK, CHANGELING_DRAIN)) + render_list += "Subject has been husked by dessication.\n" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else render_list += "Subject has been husked by mysterious causes.\n" @@ -185,16 +207,22 @@ if (!target.get_organ_slot(ORGAN_SLOT_BRAIN)) // kept exclusively for soul purposes render_list += "Subject lacks a brain.\n" +<<<<<<< HEAD var/death_consequences_status_text // SKYRAT EDIT ADDITION: Death consequences quirk +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(iscarbon(target)) var/mob/living/carbon/carbontarget = target if(LAZYLEN(carbontarget.get_traumas())) var/list/trauma_text = list() for(var/datum/brain_trauma/trauma in carbontarget.get_traumas()) +<<<<<<< HEAD //SKYRAT EDIT: Scary Traits (Bimbo) if(!trauma.display_scanner) continue //SKYRAT EDIT: Scary Traits (Bimbo) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/trauma_desc = "" switch(trauma.resilience) if(TRAUMA_RESILIENCE_SURGERY) @@ -203,6 +231,7 @@ trauma_desc += "deep-rooted " if(TRAUMA_RESILIENCE_WOUND) trauma_desc += "fracture-derived " +<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - Curable permanent traumas if(TRAUMA_RESILIENCE_MAGIC) trauma_desc += "soul-bound " @@ -216,12 +245,19 @@ var/datum/brain_trauma/severe/death_consequences/consequences_trauma = trauma death_consequences_status_text = consequences_trauma.get_health_analyzer_link_text(user) // SKYRAT EDIT ADDITION END: Death Consequences Quirk +======= + if(TRAUMA_RESILIENCE_MAGIC, TRAUMA_RESILIENCE_ABSOLUTE) + trauma_desc += "permanent " + trauma_desc += trauma.scan_desc + trauma_text += trauma_desc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 render_list += "Cerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].\n" if(carbontarget.quirks.len) render_list += "Subject Major Disabilities: [carbontarget.get_quirk_string(FALSE, CAT_QUIRK_MAJOR_DISABILITY, from_scan = TRUE)].\n" if(advanced) render_list += "Subject Minor Disabilities: [carbontarget.get_quirk_string(FALSE, CAT_QUIRK_MINOR_DISABILITY, TRUE)].\n" +<<<<<<< HEAD // SKYRAT EDIT ADDITION START -- Show increased/decreased brute/burn mods, to "leave a paper trail" for the fragility quirk if(ishuman(target)) var/mob/living/carbon/human/humantarget = target @@ -233,6 +269,8 @@ render_list += "Subject takes [(physiology.burn_mod) * 100]% burn damage.\n" // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (HAS_TRAIT(target, TRAIT_IRRADIATED)) render_list += "Subject is irradiated. Supply toxin healing.\n" @@ -432,6 +470,7 @@ render_list += "[cyberimp_detect]\n" // we handled the last
so we don't need handholding +<<<<<<< HEAD // SKYRAT EDIT ADDITION - Mutant stuff if(target.GetComponent(/datum/component/mutant_infection)) render_list += span_userdanger("UNKNOWN PROTO-VIRAL INFECTION DETECTED. ISOLATE IMMEDIATELY.") @@ -442,13 +481,19 @@ render_list += death_consequences_status_text // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(tochat) to_chat(user, examine_block(jointext(render_list, "")), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO) else return(jointext(render_list, "")) /proc/chemscan(mob/living/user, mob/living/target) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(istype(target) && target.reagents) @@ -534,7 +579,11 @@ /// Displays wounds with extended information on their status vs medscanners /proc/woundscan(mob/user, mob/living/carbon/patient, obj/item/healthanalyzer/scanner, simple_scan = FALSE) +<<<<<<< HEAD if(!istype(patient) || user.incapacitated()) +======= + if(!istype(patient) || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/render_list = "" @@ -618,7 +667,11 @@ /obj/item/healthanalyzer/simple/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE +<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT CHANGE - Blind People Can Analyze Again - ORIGINAL: if(!user.can_read(src) || user.is_blind()) +======= + if(!user.can_read(src) || user.is_blind()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING add_fingerprint(user) @@ -703,7 +756,11 @@ /// Checks the individual for any diseases that are visible to the scanner, and displays the diseases in the attacked to the attacker. /proc/diseasescan(mob/user, mob/living/carbon/patient, obj/item/healthanalyzer/simple/scanner) +<<<<<<< HEAD if(!istype(patient) || user.incapacitated()) +======= + if(!istype(patient) || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/render = list() diff --git a/code/game/objects/items/devices/scanners/slime_scanner.dm b/code/game/objects/items/devices/scanners/slime_scanner.dm index bf55265f783..57775a92f50 100644 --- a/code/game/objects/items/devices/scanners/slime_scanner.dm +++ b/code/game/objects/items/devices/scanners/slime_scanner.dm @@ -16,7 +16,11 @@ /obj/item/slime_scanner/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE +<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT CHANGE - Blind People Can Analyze Again - ORIGINAL : if(!user.can_read(src) || user.is_blind()) +======= + if(!user.can_read(src) || user.is_blind()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING if (!isslime(interacting_with)) to_chat(user, span_warning("This device can only scan slimes!")) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index d30f379197e..b86489fae9e 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -122,7 +122,7 @@ /obj/item/taperecorder/proc/can_use(mob/user) if(user && ismob(user)) - if(!user.incapacitated()) + if(!user.incapacitated) return TRUE return FALSE diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 0dc69cb9c81..85516c81560 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -138,7 +138,11 @@ effective or pretty fucking useless. data["cooldown"] = DisplayTimeText(get_cooldown()) return data +<<<<<<< HEAD /obj/item/healthanalyzer/rad_laser/ui_act(action, params) +======= +/obj/item/healthanalyzer/rad_laser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 598c16c9041..aa1a45f3210 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -291,7 +291,11 @@ data["valve"] = valve_open return data +<<<<<<< HEAD /obj/item/transfer_valve/ui_act(action, params) +======= +/obj/item/transfer_valve/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 9231bf191c2..5b0c5727f3d 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -23,15 +23,22 @@ light_on = FALSE attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") +<<<<<<< HEAD block_chance = 45 //SKYRAT EDIT - Lowered ORIGINAL:75 +======= + block_chance = 75 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 block_sound = 'sound/weapons/block_blade.ogg' max_integrity = 200 armor_type = /datum/armor/item_dualsaber resistance_flags = FIRE_PROOF wound_bonus = -10 bare_wound_bonus = 20 +<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE_TOY // Skyrat edit special_desc = "A double bladed energy sword employed by the Syndicate in raids" // Skyrat edit +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 demolition_mod = 1.5 //1.5x damage to objects, robots, etc. item_flags = NO_BLOOD_ON_ITEM var/w_class_on = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/dyespray.dm b/code/game/objects/items/dyespray.dm index 24fa7b80c81..e95eadb0bd4 100644 --- a/code/game/objects/items/dyespray.dm +++ b/code/game/objects/items/dyespray.dm @@ -1,12 +1,19 @@ /obj/item/dyespray name = "hair dye spray" +<<<<<<< HEAD desc = "A spray to dye hair as well as giving it any gradient you'd like." // SKYRAT EDIT - Making the dyespray change hair color +======= + desc = "A spray to dye your hair any gradients you'd like." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/cosmetic.dmi' icon_state = "dyespray" +<<<<<<< HEAD var/uses = 40 //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/dyespray/attack_self(mob/user) dye(user, user) @@ -20,6 +27,7 @@ * Arguments: * * target - The mob who we will apply the gradient and gradient color to. */ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR (modular_skyrat\master_files\code\game\objects\items\dyekit.dm) /obj/item/dyespray/proc/dye(mob/target, mob/user) if(!ishuman(target)) @@ -28,6 +36,12 @@ if(!uses) //SKYRAT EDIT ADDITION return //SKYRAT EDIT ADDITION +======= + +/obj/item/dyespray/proc/dye(mob/target, mob/user) + if(!ishuman(target)) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/human_target = target var/beard_or_hair = tgui_alert(user, "What do you want to dye?", "Character Preference", list("Hair", "Facial Hair")) if(!beard_or_hair || !user.can_perform_action(src, NEED_DEXTERITY)) @@ -54,4 +68,7 @@ human_target.set_facial_hair_gradient_style(new_grad_style, update = FALSE) human_target.set_facial_hair_gradient_color(new_grad_color, update = TRUE) playsound(src, 'sound/effects/spray.ogg', 10, vary = TRUE) +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index bb063f4a1f4..3d9fab73470 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -219,7 +219,11 @@ data["answers"] += list(answer_data) return data +<<<<<<< HEAD /obj/item/toy/eightball/haunted/ui_act(action, params) +======= +/obj/item/toy/eightball/haunted/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 0012dd08f26..294fe2d96de 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -1,7 +1,11 @@ /obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." +<<<<<<< HEAD icon = 'icons/obj/tools.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/tools.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "fire_extinguisher0" worn_icon_state = "fire_extinguisher" inhand_icon_state = "fire_extinguisher" diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index b2d779ca3a5..eb49fa9adf4 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -580,7 +580,11 @@ /obj/item/food/burger/rib name = "mcrib" +<<<<<<< HEAD desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." +======= + desc = "An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "mcrib" food_reagents = list( /datum/reagent/consumable/nutriment = 2, diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index 63f42d0d83b..a49a35e81dd 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -36,6 +36,39 @@ w_class = WEIGHT_CLASS_SMALL starting_reagent_purity = 1.0 +<<<<<<< HEAD +======= +/obj/item/food/fishmeat/quality + name = "quality fish fillet" + desc = "A fillet of some precious fish meat." + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 4, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + bite_consumption = 7 + crafting_complexity = FOOD_COMPLEXITY_1 + +/obj/item/food/fishmeat/quality/Initialize(mapload) + . = ..() + AddElement(/datum/element/quality_food_ingredient, FOOD_COMPLEXITY_1) + +/obj/item/food/fishmeat/salmon + name = "salmon fillet" + desc = "a chunky, fatty fillet of salmon meat." + icon_state = "salmon" + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 4, + /datum/reagent/consumable/nutriment/vitamin = 3, + /datum/reagent/consumable/nutriment/fat/oil = 2, + ) + bite_consumption = 4.5 + crafting_complexity = FOOD_COMPLEXITY_1 + +/obj/item/food/fishmeat/salmon/Initialize(mapload) + . = ..() + AddElement(/datum/element/quality_food_ingredient, FOOD_COMPLEXITY_1) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/fishmeat/carp name = "carp fillet" desc = "A fillet of spess carp meat." @@ -491,7 +524,11 @@ /obj/item/food/patty name = "patty" +<<<<<<< HEAD desc = "The nanotrasen patty is the patty for you and me!" +======= + desc = "The Nanotrasen patty is the patty for you and me!" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/food/meat.dmi' icon_state = "patty" food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2) diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 3f8cb918ece..91174f67fc1 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -353,7 +353,11 @@ /obj/item/food/meat/rawbacon name = "raw piece of bacon" desc = "A raw piece of bacon." +<<<<<<< HEAD icon_state = "baconb" +======= + icon_state = "bacon" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bite_consumption = 2 food_reagents = list( /datum/reagent/consumable/nutriment/protein = 2, @@ -369,7 +373,11 @@ /obj/item/food/meat/bacon name = "piece of bacon" desc = "A delicious piece of bacon." +<<<<<<< HEAD icon_state = "baconcookedb" +======= + icon_state = "baconcooked" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1, diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 4e8b8cbf220..b0966644440 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -292,6 +292,17 @@ foodtypes = FRUIT | ALCOHOL crafting_complexity = FOOD_COMPLEXITY_2 +<<<<<<< HEAD +======= +/obj/item/food/melonkeg/CheckParts(list/parts_list) + . = ..() + var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents + if(!bottle) + return + if(bottle.message_in_a_bottle) + bottle.message_in_a_bottle.forceMove(drop_location()) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/honeybar name = "honey nut bar" desc = "Oats and nuts compressed together into a bar, held together with a honey glaze." @@ -568,7 +579,11 @@ tastes = list() /obj/item/food/pacoca +<<<<<<< HEAD name = "pacoca" +======= + name = "paçoca" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A traditional Brazilian treat made of ground peanuts, sugar, and salt compressed into a cylinder." icon = 'icons/obj/food/food.dmi' icon_state = "pacoca" @@ -797,3 +812,33 @@ foodtypes = VEGETABLES | GRAIN w_class = WEIGHT_CLASS_TINY crafting_complexity = FOOD_COMPLEXITY_4 +<<<<<<< HEAD +======= + +///Extracted from squids, or any fish with the ink fish trait. +/obj/item/food/ink_sac + name = "ink sac" + desc = "the ink sac from some sort of fish or mollusk. It could be canned with a processor." + icon_state = "ink_sac" + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/salt = 5) + tastes = list("seafood" = 3) + foodtypes = SEAFOOD|RAW + +/obj/item/food/ink_sac/Initialize(mapload) + . = ..() + AddComponent(/datum/component/splat, \ + memory_type = /datum/memory/witnessed_inking, \ + smudge_type = /obj/effect/decal/cleanable/food/squid_ink, \ + moodlet_type = /datum/mood_event/inked, \ + splat_color = COLOR_NEARLY_ALL_BLACK, \ + hit_callback = CALLBACK(src, PROC_REF(blind_em)), \ + ) + +/obj/item/food/ink_sac/proc/blind_em(mob/living/victim, can_splat_on) + if(can_splat_on) + victim.adjust_temp_blindness_up_to(7 SECONDS, 10 SECONDS) + victim.adjust_confusion_up_to(3.5 SECONDS, 6 SECONDS) + victim.Paralyze(2 SECONDS) //splat! + victim.visible_message(span_warning("[victim] is inked by [src]!"), span_userdanger("You've been inked by [src]!")) + playsound(victim, SFX_DESECRATION, 50, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm index 0f08fd8f57d..afb6a1b9a19 100644 --- a/code/game/objects/items/food/packaged.dm +++ b/code/game/objects/items/food/packaged.dm @@ -156,6 +156,28 @@ tastes = list("seafood" = 7, "tin" = 1) foodtypes = SEAFOOD +<<<<<<< HEAD +======= +/obj/item/food/canned/squid_ink/open_can(mob/user) + . = ..() + AddComponent(/datum/component/splat, \ + memory_type = /datum/memory/witnessed_inking, \ + smudge_type = /obj/effect/decal/cleanable/food/squid_ink, \ + moodlet_type = /datum/mood_event/inked, \ + splat_color = COLOR_NEARLY_ALL_BLACK, \ + hit_callback = CALLBACK(src, PROC_REF(blind_em)), \ + ) + ADD_TRAIT(src, TRAIT_UNCATCHABLE, INNATE_TRAIT) //good luck catching the liquid + +/obj/item/food/canned/squid_ink/proc/blind_em(mob/living/victim, can_splat_on) + if(can_splat_on) + victim.adjust_temp_blindness_up_to(7 SECONDS, 10 SECONDS) + victim.adjust_confusion_up_to(3.5 SECONDS, 6 SECONDS) + victim.Paralyze(2 SECONDS) //splat! + victim.visible_message(span_warning("[victim] is inked by [src]!"), span_userdanger("You've been inked by [src]!")) + playsound(victim, SFX_DESECRATION, 50, TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/canned/chap name = "can of CHAP" desc = "CHAP: Chopped Ham And Pork. The classic American canned meat product that won a world war, then sent millions of servicemen home with heart congestion." diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 83f30ab0b06..666caaeb112 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -67,7 +67,10 @@ name = "waffles" desc = "Mmm, waffles." icon_state = "waffles" +<<<<<<< HEAD trash_type = /obj/item/trash/waffles +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, @@ -85,7 +88,10 @@ name = "\improper Soylent Green" desc = "Not made of people. Honest." //Totally people. icon_state = "soylent_green" +<<<<<<< HEAD trash_type = /obj/item/trash/waffles +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2, @@ -100,7 +106,10 @@ name = "\improper Soylent Virdians" desc = "Not made of people. Honest." //Actually honest for once. icon_state = "soylent_yellow" +<<<<<<< HEAD trash_type = /obj/item/trash/waffles +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2, @@ -115,7 +124,10 @@ name = "roffle waffles" desc = "Waffles from Roffle. Co." icon_state = "rofflewaffles" +<<<<<<< HEAD trash_type = /obj/item/trash/waffles +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bite_consumption = 4 food_reagents = list( /datum/reagent/consumable/nutriment = 8, diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index 0cb5af860e8..7c1da650219 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -74,6 +74,7 @@ var/stunning = TRUE crafting_complexity = FOOD_COMPLEXITY_3 +<<<<<<< HEAD /obj/item/food/pie/cream/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() if(!.) //if we're not being caught @@ -100,6 +101,19 @@ if(is_creamable && is_type_in_typecache(hit_atom, GLOB.creamable)) hit_atom.AddComponent(/datum/component/face_decal/creampie, "creampie", EXTERNAL_FRONT) qdel(src) +======= +/obj/item/food/pie/cream/Initialize(mapload) + . = ..() + AddComponent(/datum/component/splat, hit_callback = CALLBACK(src, PROC_REF(stun_and_blur))) + +/obj/item/food/pie/cream/proc/stun_and_blur(mob/living/victim, can_splat_on) + if(stunning) + victim.Paralyze(2 SECONDS) //splat! + if(can_splat_on) + victim.adjust_eye_blur(2 SECONDS) + victim.visible_message(span_warning("[victim] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!")) + playsound(victim, SFX_DESECRATION, 50, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/pie/cream/nostun stunning = FALSE diff --git a/code/game/objects/items/granters/crafting/fletching.dm b/code/game/objects/items/granters/crafting/fletching.dm index 91ce20c43dd..d11bb35d2de 100644 --- a/code/game/objects/items/granters/crafting/fletching.dm +++ b/code/game/objects/items/granters/crafting/fletching.dm @@ -7,7 +7,11 @@ /datum/crafting_recipe/plastic_arrow, /datum/crafting_recipe/shortbow, /datum/crafting_recipe/holy_arrow, +<<<<<<< HEAD ///datum/crafting_recipe/arrow_quiver, // SKYRAT EDIT REMOVAL: public-knowledge quiver +======= + /datum/crafting_recipe/arrow_quiver, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/crafting_recipe/violin, ) icon_state = "book4" diff --git a/code/game/objects/items/granters/magic/lightning_bolt.dm b/code/game/objects/items/granters/magic/lightning_bolt.dm index 3e3cbade46f..62fc2faf250 100644 --- a/code/game/objects/items/granters/magic/lightning_bolt.dm +++ b/code/game/objects/items/granters/magic/lightning_bolt.dm @@ -13,4 +13,7 @@ "UNLIMITED power? Well... maybe if I practice...", "Wait until they're grouped up...", ) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm index a9fe7e65809..e29be9d700c 100644 --- a/code/game/objects/items/grenades/_grenade.dm +++ b/code/game/objects/items/grenades/_grenade.dm @@ -19,6 +19,10 @@ max_integrity = 40 pickup_sound = 'sound/items/grenade_pick_up.ogg' drop_sound = 'sound/items/grenade_drop.ogg' +<<<<<<< HEAD +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitfields which prevent the grenade from detonating if set. Includes ([GRENADE_DUD]|[GRENADE_USED]) var/dud_flags = NONE ///Is this grenade currently armed? diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index c39e947e2bf..28b06dde666 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -493,8 +493,12 @@ beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40) beaker_two.reagents.add_reagent(/datum/reagent/water, 40) +<<<<<<< HEAD beaker_one.reagents.add_reagent(/datum/reagent/space_cleaner, 20) // SKYRAT EDIT - Bump to 20 to make it work with cellulose beaker_two.reagents.add_reagent(/datum/reagent/cellulose, 20) // SKYRAT EDIT - Cellulose for liquid puddle cleaning +======= + beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner, 10) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 beakers += beaker_one beakers += beaker_two diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index a73b0b02500..bece36a38b7 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -49,7 +49,10 @@ living_mob.Paralyze(5) living_mob.Knockdown(30) living_mob.soundbang_act(1, max(200 / max(1, distance), 60), rand(0, 5)) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/grenade/stingbang name = "stingbang" diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 7edc0009204..b6159aeb0e8 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -50,6 +50,10 @@ custom_price = PAYCHECK_COMMAND * 0.35 pickup_sound = 'sound/items/handcuffs_pick_up.ogg' drop_sound = 'sound/items/handcuffs_drop.ogg' +<<<<<<< HEAD +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///How long it takes to handcuff someone var/handcuff_time = 4 SECONDS diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 819091eef6b..abbdadae64b 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -27,8 +27,11 @@ /obj/item/implanter/emp name = "implanter" // Skyrat edit, was implanter (EMP) imp_type = /obj/item/implant/emp +<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "A Syndicate implanter used for a EMP implant" // Skyrat edit +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/implant/radio name = "internal radio implant" @@ -88,6 +91,9 @@ /obj/item/implanter/radio/syndicate name = "implanter" // Skyrat edit , was originally implanter (internal syndicate radio) imp_type = /obj/item/implant/radio/syndicate +<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "A Syndicate implanter used for a internal radio implant" // Skyrat edit +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 027c2e59a11..64a3d2cfdfb 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -1,7 +1,11 @@ /** * Item used to store implants. Can be renamed with a pen. Implants are moved between those and implanters when a mob uses an implanter on a case. */ +<<<<<<< HEAD /obj/item/implantcase//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/item/implantcase +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "implant case" desc = "A glass case containing an implant." icon = 'icons/obj/medical/syringe.dmi' diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index efbe320d7f0..55529f89d8c 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -55,7 +55,11 @@ return data +<<<<<<< HEAD /obj/machinery/implantchair/ui_act(action, params) +======= +/obj/machinery/implantchair/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index ab1a3b0ea6f..268683f1946 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -1,7 +1,11 @@ /** * Players can use this item to put obj/item/implant's in living mobs. Can be renamed with a pen. */ +<<<<<<< HEAD /obj/item/implanter//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/item/implanter +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "implanter" desc = "A sterile automatic implant injector." icon = 'icons/obj/medical/syringe.dmi' diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index c3c06d51f47..c27bc581f66 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -53,6 +53,10 @@ imp = new imp_type(src, uplink_handler) return ..() +/obj/item/implanter/uplink/Initialize(mapload, uplink_handler) + imp = new imp_type(src, uplink_handler) + return ..() + /obj/item/implanter/uplink/precharged name = "implanter" // Skyrat edit , original was implanter (precharged uplink) imp_type = /obj/item/implant/uplink/precharged diff --git a/code/game/objects/items/kirby_plants/kirbyplants.dm b/code/game/objects/items/kirby_plants/kirbyplants.dm index 3becb1ecb61..44493637385 100644 --- a/code/game/objects/items/kirby_plants/kirbyplants.dm +++ b/code/game/objects/items/kirby_plants/kirbyplants.dm @@ -1,7 +1,11 @@ /obj/item/kirbyplants name = "potted plant" +<<<<<<< HEAD //icon = 'icons/obj/fluff/flora/plants.dmi' // ORIGINAL icon = 'modular_skyrat/modules/aesthetics/plants/plants.dmi' // SKYRAT EDIT CHANGE +======= + icon = 'icons/obj/fluff/flora/plants.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "plant-01" base_icon_state = "plant-01" desc = "A little bit of nature contained in a pot." @@ -20,8 +24,11 @@ ///If it's a special named plant, set this to true to prevent dead-name overriding. var/custom_plant_name = FALSE var/list/static/random_plant_states +<<<<<<< HEAD /// Maximum icon state number - KEEP THIS UP TO DATE var/random_state_cap = 43 // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kirbyplants/Initialize(mapload) . = ..() @@ -71,18 +78,31 @@ generate_states() var/current = random_plant_states.Find(icon_state) var/next = WRAP(current+1,1,length(random_plant_states)) +<<<<<<< HEAD icon_state = random_plant_states[next] /obj/item/kirbyplants/proc/generate_states() random_plant_states = list() for(var/i in 1 to random_state_cap) //SKYRAT EDIT CHANGE - ORIGINAL: for(var/i in 1 to 24) +======= + base_icon_state = random_plant_states[next] + update_appearance(UPDATE_ICON) + +/obj/item/kirbyplants/proc/generate_states() + random_plant_states = list() + for(var/i in 1 to 24) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/number if(i < 10) number = "0[i]" else number = "[i]" random_plant_states += "plant-[number]" +<<<<<<< HEAD random_plant_states += list("applebush", "monkeyplant") //SKYRAT EDIT CHANGE - ORIGINAL:random_plant_states += "applebush" +======= + random_plant_states += "applebush" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kirbyplants/random icon = 'icons/obj/fluff/flora/_flora.dmi' @@ -90,8 +110,12 @@ /obj/item/kirbyplants/random/Initialize(mapload) . = ..() +<<<<<<< HEAD //icon = 'icons/obj/flora/plants.dmi' // ORIGINAL icon = 'modular_skyrat/modules/aesthetics/plants/plants.dmi' //SKYRAT EDIT CHANGE +======= + icon = 'icons/obj/fluff/flora/plants.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomize_base_icon_state() //Handles randomizing the icon during initialize() @@ -126,6 +150,7 @@ base_icon_state = "plant-[rand(26, 29)]" update_appearance(UPDATE_ICON) +<<<<<<< HEAD //SKYRAT EDIT ADDITION START /obj/item/kirbyplants/monkey name = "monkey plant" @@ -134,6 +159,8 @@ trimmable = FALSE //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kirbyplants/photosynthetic name = "photosynthetic potted plant" desc = "A bioluminescent plant." diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index bc424788771..3ce87ebbfa0 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -163,7 +163,10 @@ custom_price = PAYCHECK_CREW * 1.5 tool_behaviour = TOOL_ROLLINGPIN +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kitchen/rollingpin/illegal name = "metal rolling pin" desc = "A heavy metallic rolling pin used to bash in those annoying ingredients." diff --git a/code/game/objects/items/machine_wand.dm b/code/game/objects/items/machine_wand.dm index fd0c730fff8..4705b713f8b 100644 --- a/code/game/objects/items/machine_wand.dm +++ b/code/game/objects/items/machine_wand.dm @@ -24,6 +24,21 @@ bug_appearance = mutable_appearance('icons/effects/effects.dmi', "fly-surrounding", ABOVE_WINDOW_LAYER) register_context() +<<<<<<< HEAD +======= +/obj/item/machine_remote/equipped(mob/user, slot, initial) + . = ..() + if(user.get_active_held_item() == src) + ADD_TRAIT(user, TRAIT_AI_ACCESS, HELD_ITEM_TRAIT) + ADD_TRAIT(user, TRAIT_SILICON_ACCESS, HELD_ITEM_TRAIT) + +/obj/item/machine_remote/dropped(mob/user, silent) + . = ..() + if(user.get_active_held_item() != src) + REMOVE_TRAIT(user, TRAIT_AI_ACCESS, HELD_ITEM_TRAIT) + REMOVE_TRAIT(user, TRAIT_SILICON_ACCESS, HELD_ITEM_TRAIT) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/machine_remote/Destroy(force) . = ..() if(controlling_machine_or_bot) diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index 7470dd359fd..eeeaa086b99 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -64,8 +64,11 @@ ACCOUNT_SRV = COLOR_PALE_GREEN_GRAY, ACCOUNT_CAR = COLOR_BEIGE, ACCOUNT_SEC = COLOR_PALE_RED_GRAY, +<<<<<<< HEAD ACCOUNT_CMD = COLOR_BLUE_GRAY, // SKYRAT EDIT ADDITION ACCOUNT_CCM = COLOR_DARK_MODERATE_LIME_GREEN, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // Icons diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 6bef1b35f3b..66f3f04d225 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -26,7 +26,11 @@ /// The length of the knockdown applied to the user on clumsy_check() var/clumsy_knockdown_time = 18 SECONDS /// How much stamina damage we deal on a successful hit against a living, non-cyborg mob. +<<<<<<< HEAD var/stamina_damage = 35 // SKYRAT EDIT - Less Stamina Damage (Original: 55) +======= + var/stamina_damage = 55 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Chance of causing force_say() when stunning a human mob var/force_say_chance = 33 /// Can we stun cyborgs? @@ -320,6 +324,10 @@ active = FALSE pickup_sound = 'sound/items/stun_baton_pick_up.ogg' drop_sound = 'sound/items/stun_baton_drop.ogg' +<<<<<<< HEAD +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The sound effecte played when our baton is extended. var/on_sound = 'sound/weapons/batonextend.ogg' @@ -393,7 +401,11 @@ force = 5 cooldown = 2.5 SECONDS force_say_chance = 80 //very high force say chance because it's funny +<<<<<<< HEAD stamina_damage = 115 // SKYRAT EDIT: Original 85 +======= + stamina_damage = 85 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clumsy_knockdown_time = 24 SECONDS affect_cyborg = TRUE on_stun_sound = 'sound/effects/contractorbatonhit.ogg' @@ -425,7 +437,11 @@ armor_type = /datum/armor/baton_security throwforce = 7 force_say_chance = 50 +<<<<<<< HEAD stamina_damage = 35 // SKYRAT EDIT - 4 baton crit now (Original: 60) +======= + stamina_damage = 60 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 knockdown_time = 5 SECONDS clumsy_knockdown_time = 15 SECONDS cooldown = 2.5 SECONDS @@ -440,6 +456,10 @@ light_power = 0.5 pickup_sound = 'sound/items/stun_baton_pick_up.ogg' drop_sound = 'sound/items/stun_baton_drop.ogg' +<<<<<<< HEAD +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/throw_stun_chance = 35 @@ -627,7 +647,11 @@ */ /obj/item/melee/baton/security/additional_effects_non_cyborg(mob/living/target, mob/living/user) target.set_jitter_if_lower(40 SECONDS) +<<<<<<< HEAD // target.set_confusion_if_lower(10 SECONDS) // SKYRAT EDIT REMOVAL +======= + target.set_confusion_if_lower(10 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.set_stutter_if_lower(16 SECONDS) SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index cb9cbb5fd82..d250ebb6a59 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -30,6 +30,7 @@ /// The heat given off when active. var/active_heat = 3500 +<<<<<<< HEAD // SKYRAT EDIT ADD START /// The sound played when the item is turned on @@ -40,6 +41,8 @@ // SKYRAT EDIT ADD END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/melee_energy fire = 100 acid = 30 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 9e7e9cec7ee..01b186ede9a 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -164,10 +164,17 @@ user.death(FALSE) REMOVE_TRAIT(src, TRAIT_NODROP, SABRE_SUICIDE_TRAIT) +<<<<<<< HEAD /obj/item/melee/parsnip_sabre name = "parsnip sabre" desc = "A weird, yet elegant weapon. Suprisingly sharp for something made from a parsnip." +======= + +/obj/item/melee/parsnip_sabre + name = "parsnip sabre" + desc = "A weird, yet elegant weapon. Suprisingly sharp for something made from a parsnip." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/weapons/sword.dmi' icon_state = "parsnip_sabre" inhand_icon_state = "parsnip_sabre" diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 014eafd6510..40801a36d3e 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -16,7 +16,11 @@ resistance_flags = FLAMMABLE var/mopcount = 0 ///Maximum volume of reagents it can hold. +<<<<<<< HEAD var/max_reagent_volume = 50 // SKYRAT EDIT - ORIGINAL: 15 +======= + var/max_reagent_volume = 15 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mopspeed = 1.5 SECONDS force_string = "robust... against germs" var/insertable = TRUE @@ -78,7 +82,11 @@ /obj/item/mop/advanced desc = "The most advanced tool in a custodian's arsenal, complete with a condenser for self-wetting! Just think of all the viscera you will clean up with this! Due to the self-wetting technology, it proves very inefficient for cleaning up spills." //SKYRAT EDIT name = "advanced mop" +<<<<<<< HEAD max_reagent_volume = 100 // SKYRAT EDIT - ORIGINAL: 10 +======= + max_reagent_volume = 10 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "advmop" inhand_icon_state = "advmop" lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm index 41c1809b558..895a7283686 100644 --- a/code/game/objects/items/paint.dm +++ b/code/game/objects/items/paint.dm @@ -108,7 +108,11 @@ return FALSE if(!user.is_holding(src)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 9bc5189313d..66c986719a4 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -90,7 +90,11 @@ if(target.mob_size > max_occupant_weight) if(ishuman(target)) var/mob/living/carbon/human/H = target +<<<<<<< HEAD if(isfeline(H)) // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(H) +======= + if(isfelinid(H)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You'd need a lot of catnip and treats, plus maybe a laser pointer, for that to work.")) else to_chat(user, span_warning("Humans, generally, do not fit into pet carriers.")) diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 5d7fc1957f4..91f88465fdc 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -152,7 +152,11 @@ return if(isnull(names[pinpoint_target])) return +<<<<<<< HEAD if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated()) +======= + if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return target = names[pinpoint_target] toggle_on() diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 95f46da2e10..40c69dfac9a 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -44,7 +44,11 @@ /obj/item/toy/plush/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, squeak_override) +<<<<<<< HEAD AddElement(/datum/element/bed_tuckable, mapload, 6, 7, 90) +======= + AddElement(/datum/element/bed_tuckable, mapload, 6, -5, 90) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddElement(/datum/element/toy_talk) //have we decided if Pinocchio goes in the blue or pink aisle yet? diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm index 669d7e3bab6..407d713e5ae 100644 --- a/code/game/objects/items/rcd/RCD.dm +++ b/code/game/objects/items/rcd/RCD.dm @@ -80,10 +80,13 @@ GLOB.rcd_list -= src . = ..() +<<<<<<< HEAD /obj/item/construction/rcd/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() playsound(src, SFX_TOOL_SWITCH, 20, TRUE) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/construction/rcd/ui_action_click(mob/user, actiontype) if (!COOLDOWN_FINISHED(src, destructive_scan_cooldown)) to_chat(user, span_warning("[src] lets out a low buzz.")) @@ -348,6 +351,10 @@ return data /obj/item/construction/rcd/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) +<<<<<<< HEAD +======= + playsound(src, SFX_TOOL_SWITCH, 20, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("root_category") diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm index 64179a81b5f..156def8be08 100644 --- a/code/game/objects/items/rcd/RHD.dm +++ b/code/game/objects/items/rcd/RHD.dm @@ -292,7 +292,11 @@ /obj/item/construction/proc/check_menu(mob/living/user, remote_anchor) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(remote_anchor && user.remote_control != remote_anchor) return FALSE diff --git a/code/game/objects/items/rcd/RLD.dm b/code/game/objects/items/rcd/RLD.dm index 6156cd0ee73..363100c5fbc 100644 --- a/code/game/objects/items/rcd/RLD.dm +++ b/code/game/objects/items/rcd/RLD.dm @@ -166,7 +166,11 @@ return ITEM_INTERACT_BLOCKING activate() var/obj/machinery/light/L = new /obj/machinery/light(get_turf(winner)) +<<<<<<< HEAD L.setDir(get_dir(interacting_with, winner)) +======= + L.setDir(get_dir(winner, interacting_with)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 L.color = color_choice L.set_light_color(color_choice) return ITEM_INTERACT_SUCCESS diff --git a/code/game/objects/items/rcd/RPD.dm b/code/game/objects/items/rcd/RPD.dm index 642bbc70623..91576e23683 100644 --- a/code/game/objects/items/rcd/RPD.dm +++ b/code/game/objects/items/rcd/RPD.dm @@ -59,6 +59,11 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M), new /datum/pipe_info/disposal("Rotator", /obj/structure/disposalpipe/rotator, PIPE_ONEDIR_FLIPPABLE), new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), +<<<<<<< HEAD +======= + new /datum/pipe_info/disposal("Down Turn", /obj/structure/disposalpipe/trunk/multiz/down), + new /datum/pipe_info/disposal("Up Turn", /obj/structure/disposalpipe/trunk/multiz), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/delivery_chute), @@ -361,12 +366,22 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( data["init_directions"] = init_directions return data +<<<<<<< HEAD /obj/item/pipe_dispenser/ui_act(action, params) . = ..() playsound(src, SFX_TOOL_SWITCH, 20, TRUE) if(.) return +======= +/obj/item/pipe_dispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + playsound(src, SFX_TOOL_SWITCH, 20, TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/playeffect = TRUE switch(action) if("color") @@ -686,7 +701,11 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( if(multi_layer) balloon_alert(source_mob, "turn off multi layer!") return +<<<<<<< HEAD if(source_mob.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) +======= + if(INCAPACITATED_IGNORING(source_mob, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(source_mob.get_active_held_item() != src) return diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm index d45ae8cf1a4..35831737607 100644 --- a/code/game/objects/items/rcd/RPLD.dm +++ b/code/game/objects/items/rcd/RPLD.dm @@ -12,6 +12,12 @@ banned_upgrades = RCD_ALL_UPGRADES & ~RCD_UPGRADE_SILO_LINK matter = 200 max_matter = 200 +<<<<<<< HEAD +======= + drop_sound = 'sound/items/handling/rcd_drop.ogg' + pickup_sound = 'sound/items/handling/rcd_pickup.ogg' + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///category of design selected var/selected_category @@ -63,6 +69,7 @@ /obj/machinery/plumbing/pill_press = 20, /obj/machinery/iv_drip/plumbing = 20 ), +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - static list so we have no choice but to skyrat edit these here //category 4 liquids @@ -70,6 +77,8 @@ /obj/structure/drain = 5, ), // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/construction/plumbing/Initialize(mapload) @@ -159,11 +168,17 @@ return data +<<<<<<< HEAD /obj/item/construction/plumbing/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() playsound(src, SFX_TOOL_SWITCH, 20, TRUE) /obj/item/construction/plumbing/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) +======= +/obj/item/construction/plumbing/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) + playsound(src, SFX_TOOL_SWITCH, 20, TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("color") var/color = params["paint_color"] @@ -294,7 +309,11 @@ /obj/item/construction/plumbing/proc/mouse_wheeled(mob/source, atom/A, delta_x, delta_y, params) SIGNAL_HANDLER +<<<<<<< HEAD if(source.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) +======= + if(INCAPACITATED_IGNORING(source, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(delta_y == 0) return @@ -345,6 +364,7 @@ /obj/machinery/plumbing/tank = 20, /obj/machinery/plumbing/acclimator = 10, ), +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - static list so we have no choice but to skyrat edit these here //category 4 liquids @@ -352,6 +372,8 @@ /obj/structure/drain = 5, ), // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/construction/plumbing/service/Initialize(mapload) diff --git a/code/game/objects/items/rcd/RSF.dm b/code/game/objects/items/rcd/RSF.dm index ee85994143a..e3d27620ce9 100644 --- a/code/game/objects/items/rcd/RSF.dm +++ b/code/game/objects/items/rcd/RSF.dm @@ -121,7 +121,7 @@ RSF return radial_list /obj/item/rsf/proc/check_menu(mob/user) - if(user.incapacitated() || !user.Adjacent(src)) + if(user.incapacitated || !user.Adjacent(src)) return FALSE return TRUE diff --git a/code/game/objects/items/rcd/RTD.dm b/code/game/objects/items/rcd/RTD.dm index 45b9c9e3687..372de22dd36 100644 --- a/code/game/objects/items/rcd/RTD.dm +++ b/code/game/objects/items/rcd/RTD.dm @@ -24,6 +24,12 @@ item_flags = NO_MAT_REDEMPTION | NOBLUDGEON has_ammobar = TRUE banned_upgrades = RCD_ALL_UPGRADES & ~RCD_UPGRADE_SILO_LINK +<<<<<<< HEAD +======= + drop_sound = 'sound/items/handling/rcd_drop.ogg' + pickup_sound = 'sound/items/handling/rcd_pickup.ogg' + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// main category for tile design var/root_category = "Conventional" @@ -195,6 +201,10 @@ return data /obj/item/construction/rtd/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) +<<<<<<< HEAD +======= + playsound(src, SFX_TOOL_SWITCH, 20, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/floor_designs = GLOB.floor_designs switch(action) diff --git a/code/game/objects/items/rcd/RWD.dm b/code/game/objects/items/rcd/RWD.dm index 0ee29e87a35..ab9ca7f9f9c 100644 --- a/code/game/objects/items/rcd/RWD.dm +++ b/code/game/objects/items/rcd/RWD.dm @@ -152,7 +152,11 @@ if(!ISADVANCEDTOOLUSER(user)) to_chat(user, span_warning("You don't have the dexterity to do this!")) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 63e1c19c64a..24c1a0fbfbf 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -225,7 +225,11 @@ /obj/item/banner/command/Initialize(mapload) . = ..() +<<<<<<< HEAD job_loyalties = DEPARTMENT_BITFLAG_COMMAND | DEPARTMENT_BITFLAG_CENTRAL_COMMAND //SKYRAT EDIT ADDITION +======= + job_loyalties = DEPARTMENT_BITFLAG_COMMAND +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/banner/command/mundane inspiration_available = FALSE diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm index 09d9c7a9afc..30346240f5e 100644 --- a/code/game/objects/items/robot/items/hypo.dm +++ b/code/game/objects/items/robot/items/hypo.dm @@ -6,9 +6,14 @@ /datum/reagent/medicine/c2/libital,\ /datum/reagent/medicine/c2/multiver,\ /datum/reagent/medicine/salglu_solution,\ +<<<<<<< HEAD /datum/reagent/medicine/spaceacillin,\ /datum/reagent/medicine/lidocaine\ ) //SKYRAT EDIT line 10 added Lidocaine +======= + /datum/reagent/medicine/spaceacillin\ + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define EXPANDED_MEDICAL_REAGENTS list(\ /datum/reagent/medicine/haloperidol,\ /datum/reagent/medicine/inacusiate,\ @@ -226,7 +231,11 @@ /obj/item/reagent_containers/borghypo/attack_self(mob/user) ui_interact(user) +<<<<<<< HEAD /obj/item/reagent_containers/borghypo/ui_act(action, params) +======= +/obj/item/reagent_containers/borghypo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -248,12 +257,18 @@ . += "Currently loaded: [selected_reagent ? "[selected_reagent]. [selected_reagent.description]" : "nothing."]" . += span_notice("Alt+Click to change transfer amount. Currently set to [amount_per_transfer_from_this]u.") +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - SEE master_files/code/modules/reagents/reagent_containers.dm /obj/item/reagent_containers/borghypo/click_alt(mob/living/user) change_transfer_amount(user) return CLICK_ACTION_SUCCESS SKYRAT EDIT REMOVAL END */ +======= +/obj/item/reagent_containers/borghypo/click_alt(mob/living/user) + change_transfer_amount(user) + return CLICK_ACTION_SUCCESS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Default Medborg Hypospray /obj/item/reagent_containers/borghypo/medical @@ -486,8 +501,13 @@ SKYRAT EDIT REMOVAL END */ /obj/item/reagent_containers/borghypo/borgshaker/hacked name = "cyborg shaker" desc = "Will mix drinks that knock them dead." +<<<<<<< HEAD icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "threemileislandglass" +======= + icon_state = "threemileislandglass" + icon = 'icons/obj/drinks/mixed_drinks.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tgui_theme = "syndicate" dispensed_temperature = WATER_MATTERSTATE_CHANGE_TEMP default_reagent_types = HACKED_SERVICE_REAGENTS diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 7e954fbcec5..4bf9ff16aa3 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -409,7 +409,11 @@ data["lawsync"] = lawsync return data +<<<<<<< HEAD /obj/item/robot_suit/ui_act(action, list/params) +======= +/obj/item/robot_suit/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 2bcd23c8379..d2fb5f51480 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -587,6 +587,7 @@ to_chat(usr, span_warning("This unit already has an expand module installed!")) return FALSE +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN var/resize_amount = 1.25 if(TRAIT_R_WIDE in borg.model.model_features) @@ -594,6 +595,8 @@ if(TRAIT_R_TALL in borg.model.model_features) resize_amount = 1.05 // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(borg, TRAIT_NO_TRANSFORM, REF(src)) var/prev_lockcharge = borg.lockcharge borg.SetLockdown(TRUE) @@ -610,7 +613,11 @@ borg.set_anchored(FALSE) REMOVE_TRAIT(borg, TRAIT_NO_TRANSFORM, REF(src)) borg.hasExpanded = TRUE +<<<<<<< HEAD borg.update_transform(resize_amount) // SKYRAT EDIT CHANGE - ORIGINAL: borg.update_transform(2) +======= + borg.update_transform(2) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/borg/upgrade/expand/deactivate(mob/living/silicon/robot/borg, mob/living/user = usr) . = ..() @@ -618,7 +625,11 @@ return . if (borg.hasExpanded) borg.hasExpanded = FALSE +<<<<<<< HEAD borg.update_transform(0.8) // SKYRAT EDIT CHANGE - ORIGINAL: borg.update_transform(0.5) +======= + borg.update_transform(0.5) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/borg/upgrade/rped name = "engineering cyborg RPED" diff --git a/code/game/objects/items/scrolls.dm b/code/game/objects/items/scrolls.dm index 65d9000728d..f2d6e924a7f 100644 --- a/code/game/objects/items/scrolls.dm +++ b/code/game/objects/items/scrolls.dm @@ -55,7 +55,11 @@ if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user +<<<<<<< HEAD if(human_user.incapacitated() || !human_user.is_holding(src)) +======= + if(human_user.incapacitated || !human_user.is_holding(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/datum/action/cooldown/spell/teleport/area_teleport/wizard/scroll/teleport = locate() in actions if(!teleport) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 873ddb9acf1..aad53d55e4f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -251,8 +251,12 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ if(get_amount() < 2) user.balloon_alert(user, "not enough material!") return ITEM_INTERACT_BLOCKING +<<<<<<< HEAD var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/construction, SKILL_SPEED_MODIFIER) //SKYRAT EDIT: Construction Skill if(!do_after(user, 4 SECONDS * skill_modifier, build_on)) +======= + if(!do_after(user, 4 SECONDS, build_on)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING if(build_on.is_blocked_turf()) user.balloon_alert(user, "something is blocking the tile!") @@ -261,7 +265,10 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ user.balloon_alert(user, "not enough material!") return ITEM_INTERACT_BLOCKING new/obj/structure/girder/displaced(build_on) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_SUCCESS /* @@ -352,7 +359,11 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \ new/datum/stack_recipe("mortar", /obj/item/reagent_containers/cup/mortar, 3, crafting_flags = NONE, category = CAT_CHEMISTRY), \ new/datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 10 SECONDS, crafting_flags = NONE, category = CAT_TOOLS), \ +<<<<<<< HEAD new/datum/stack_recipe("bonfire", /obj/structure/bonfire/player_made, 10, time = 6 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), /* SKYRAT EDIT - Pollution - ORIGINAL: /obj/structure/bonfire */ \ +======= + new/datum/stack_recipe("bonfire", /obj/structure/bonfire, 10, time = 6 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new/datum/stack_recipe("easel", /obj/structure/easel, 5, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_ENTERTAINMENT), \ new/datum/stack_recipe("noticeboard", /obj/item/wallframe/noticeboard, 1, time = 1 SECONDS, crafting_flags = NONE, category = CAT_FURNITURE), \ new/datum/stack_recipe("test tube rack", /obj/item/storage/test_tube_rack, 1, time = 1 SECONDS, crafting_flags = NONE, category = CAT_CHEMISTRY), \ @@ -452,6 +463,11 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ grind_results = list(/datum/reagent/cellulose = 10) material_type = /datum/material/bamboo walltype = /turf/closed/wall/mineral/bamboo +<<<<<<< HEAD +======= + drop_sound = null + pickup_sound = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/mineral_bamboo fire = 50 @@ -817,6 +833,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ grind_results = list(/datum/reagent/carbon = 10) merge_type = /obj/item/stack/sheet/bone material_type = /datum/material/bone + drop_sound = null + pickup_sound = null /obj/item/stack/sheet/bone/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt) . = ..() @@ -830,7 +848,10 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ /datum/crafting_recipe/bonespear, /datum/crafting_recipe/bracers, /datum/crafting_recipe/skullhelm, +<<<<<<< HEAD /datum/crafting_recipe/ash_recipe/bone_greaves, /* SKYRAT EDIT ADDITION */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) AddElement( @@ -890,6 +911,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra resistance_flags = FLAMMABLE grind_results = list(/datum/reagent/cellulose = 20) material_type = /datum/material/paper + drop_sound = null + pickup_sound = null /obj/item/stack/sheet/paperframes/get_main_recipes() . = ..() @@ -911,6 +934,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra merge_type = /obj/item/stack/sheet/meat material_type = /datum/material/meat material_modifier = 1 //None of that wussy stuff + drop_sound = null + pickup_sound = null /obj/item/stack/sheet/meat/fifty amount = 50 @@ -928,6 +953,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra merge_type = /obj/item/stack/sheet/pizza material_type = /datum/material/pizza material_modifier = 1 + drop_sound = null + pickup_sound = null /obj/item/stack/sheet/pizza/fifty amount = 50 diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c96cebd58cc..d1b1551e26e 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -302,7 +302,11 @@ data["recipes"] = recursively_build_recipes(recipes) return data +<<<<<<< HEAD /obj/item/stack/ui_act(action, params) +======= +/obj/item/stack/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -369,7 +373,11 @@ /obj/item/stack/proc/radial_check(mob/builder) if(QDELETED(builder) || QDELETED(src)) return FALSE +<<<<<<< HEAD if(builder.incapacitated()) +======= + if(builder.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!builder.is_holding(src)) return FALSE @@ -400,8 +408,12 @@ adjusted_time = (recipe.time * recipe.trait_modifier) else adjusted_time = recipe.time +<<<<<<< HEAD var/skill_modifier = builder.mind.get_skill_modifier(/datum/skill/construction, SKILL_SPEED_MODIFIER) //SKYRAT EDIT: Construction Skill if(!do_after(builder, adjusted_time * skill_modifier, target = builder)) +======= + if(!do_after(builder, adjusted_time, target = builder)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 builder.balloon_alert(builder, "interrupted!") return if(!building_checks(builder, recipe, multiplier)) @@ -430,12 +442,19 @@ SEND_SIGNAL(created, COMSIG_ATOM_CONSTRUCTED, builder) on_item_crafted(builder, created) +<<<<<<< HEAD builder.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill // Use up the material use(recipe.req_amount * multiplier) builder.investigate_log("crafted [recipe.title]", INVESTIGATE_CRAFTING) +======= + // Use up the material + use(recipe.req_amount * multiplier) + builder.investigate_log("crafted [recipe.title]", INVESTIGATE_CRAFTING) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Apply mat datums if((recipe.crafting_flags & CRAFT_APPLIES_MATS) && LAZYLEN(mats_per_unit)) if(isstack(created)) diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index bf8d17822bd..d66a33cca6e 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -84,7 +84,10 @@ parcel.base_icon_state = "deliverypackage5" parcel.update_icon() user.forceMove(parcel) +<<<<<<< HEAD parcel.contains_mobs = TRUE // SKYRAT EDIT - CARGO BORGS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parcel.add_fingerprint(user) return OXYLOSS else @@ -115,10 +118,13 @@ return NONE if(interacting_with.anchored) return NONE +<<<<<<< HEAD // SKYRAT EDIT START - Cargo borgs if(!amount) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isitem(interacting_with)) var/obj/item/item = interacting_with @@ -162,12 +168,15 @@ closet.forceMove(parcel) parcel.add_fingerprint(user) closet.add_fingerprint(user) +<<<<<<< HEAD // SKYRAT EDIT START - CARGO BORGS for(var/item in closet.get_all_contents()) if(istype(item, /mob)) parcel.contains_mobs = TRUE break // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else balloon_alert(user, "not enough paper!") return ITEM_INTERACT_BLOCKING diff --git a/code/game/objects/items/stickers.dm b/code/game/objects/items/stickers.dm index 19ac58f6f40..d465d831fc5 100644 --- a/code/game/objects/items/stickers.dm +++ b/code/game/objects/items/stickers.dm @@ -30,8 +30,15 @@ /// `list` or `null`, contains possible alternate `icon_states`. var/list/icon_states +<<<<<<< HEAD /// Whether sticker is legal and allowed to generate inside non-syndicate boxes. var/contraband = FALSE +======= + /// This sticker won't be generated inside random sticker packs. + var/exclude_from_random = FALSE + /// Text added to the atom's examine when stickered. + var/examine_text +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/Initialize(mapload) . = ..() @@ -85,7 +92,11 @@ user.log_message("stuck [src] to [key_name(victim)]", LOG_ATTACK) victim.log_message("had [src] stuck to them by [key_name(user)]", LOG_ATTACK) +<<<<<<< HEAD target.AddComponent(/datum/component/sticker, src, get_dir(target, src), px, py) +======= + target.AddComponent(/datum/component/sticker, src, get_dir(target, src), px, py, null, null, examine_text) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE #undef MAX_STICKER_COUNT @@ -123,6 +134,10 @@ name = "blue R sticker" desc = "A sticker of FUCK THE SYSTEM, the galaxy's premiere hardcore punk band." icon_state = "revhead" +<<<<<<< HEAD +======= + examine_text = "There is a sticker displaying FUCK THE SYSTEM, the galaxy's premiere hardcore punk band." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/pslime name = "slime plushie sticker" @@ -149,6 +164,15 @@ name = "toolbox sticker" icon_state = "soul" +<<<<<<< HEAD +======= +/obj/item/sticker/chief_engineer + name = "CE approved sticker" + icon_state = "ce_approved" + exclude_from_random = TRUE + examine_text = "There is a sticker displaying the Chief Engineer's SEAL OF APPROVAL." + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/clown name = "clown sticker" icon_state = "honkman" @@ -164,15 +188,27 @@ /obj/item/sticker/skub name = "skub sticker" icon_state = "skub" +<<<<<<< HEAD +======= + examine_text = "There is a sticker displaying Skubtide, Stationwide!" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/anti_skub name = "anti-skub sticker" icon_state = "anti_skub" +<<<<<<< HEAD +======= + examine_text = "There is an anti-skub sticker." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/syndicate name = "syndicate sticker" icon_state = "synd" +<<<<<<< HEAD contraband = TRUE +======= + exclude_from_random = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/syndicate/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 4199b544f81..b8d0854a3aa 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -384,7 +384,11 @@ /obj/item/storage/backpack/satchel/flat/Initialize(mapload) . = ..() +<<<<<<< HEAD AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_MAXIMUM, use_anchor = TRUE) // SKYRAT EDIT - Ghosts can't see smuggler's satchels +======= + AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_OBSERVER, use_anchor = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 atom_storage.max_total_storage = 15 atom_storage.set_holdable(cant_hold_list = /obj/item/storage/backpack/satchel/flat) //muh recursive backpacks ADD_TRAIT(src, TRAIT_CONTRABAND_BLOCKER, INNATE_TRAIT) @@ -644,6 +648,7 @@ // Faster unzipping. Utilizes the same noise as zipping up to fit the unzip duration. unzip_duration = 0.5 SECONDS unzip_sfx = 'sound/items/zip_up.ogg' +<<<<<<< HEAD //SKYRAT EDIT CHANGE START - It's just a black duffel. /obj/item/storage/backpack/duffelbag/syndie @@ -652,6 +657,8 @@ special_desc_requirement = EXAMINE_CHECK_SYNDICATE special_desc = "This duffel bag has the Syndicate logo stiched on the inside. It appears to be made from lighter yet sturdier materials, and features an oiled plastitanium zipper for maximum speed tactical zipping." //SKYRAT EDIT CHANGE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/backpack/duffelbag/syndie/hitman desc = "A large duffel bag for holding extra things. There is a Nanotrasen logo on the back." diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 996cd933647..fe8b6c3ed4a 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -274,6 +274,11 @@ . += span_notice("Ctrl-click to activate seed extraction.") /obj/item/storage/bag/plants/portaseeder/item_ctrl_click(mob/user) +<<<<<<< HEAD +======= + if(user.incapacitated) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/plant in contents) seedify(plant, 1) return CLICK_ACTION_SUCCESS @@ -581,7 +586,11 @@ worn_icon_state = "rebar_quiver" inhand_icon_state = "rebar_quiver" desc = "A oxygen tank cut in half, used for holding sharpened rods for the rebar crossbow." +<<<<<<< HEAD slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE +======= + slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE|ITEM_SLOT_NECK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 resistance_flags = FLAMMABLE /obj/item/storage/bag/rebar_quiver/Initialize(mapload) @@ -598,4 +607,62 @@ /obj/item/ammo_casing/rebar/paperball, )) +<<<<<<< HEAD +======= +/obj/item/storage/bag/rebar_quiver/syndicate + icon_state = "syndie_quiver_0" + worn_icon_state = "syndie_quiver_0" + inhand_icon_state = "holyquiver" + desc = "A specialized quiver meant to hold any kind of bolts intended for use with the rebar crossbow. \ + Clearly a better design than a cut up oxygen tank..." + slot_flags = ITEM_SLOT_NECK + w_class = WEIGHT_CLASS_SMALL + resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + actions_types = list(/datum/action/item_action/reload_rebar) + +/obj/item/storage/bag/rebar_quiver/syndicate/Initialize(mapload) + . = ..() + atom_storage.max_slots = 20 + atom_storage.max_total_storage = 20 + update_appearance(UPDATE_OVERLAYS) + +/obj/item/storage/bag/rebar_quiver/syndicate/PopulateContents() + for(var/to_fill in 1 to 20) + new /obj/item/ammo_casing/rebar/syndie(src) + +/obj/item/storage/bag/rebar_quiver/syndicate/update_icon_state() + . = ..() + switch(contents.len) + if(0) + icon_state = "syndie_quiver_0" + if(1 to 7) + icon_state = "syndie_quiver_1" + if(8 to 13) + icon_state = "syndie_quiver_2" + if(14 to 20) + icon_state = "syndie_quiver_3" + +/obj/item/storage/bag/rebar_quiver/syndicate/ui_action_click(mob/user, actiontype) + if(istype(actiontype, /datum/action/item_action/reload_rebar)) + reload_held_rebar(user) + +/obj/item/storage/bag/rebar_quiver/syndicate/proc/reload_held_rebar(mob/user) + if(!contents.len) + user.balloon_alert(user, "no bolts left!") + return + var/obj/held_item = user.get_active_held_item() + if(!held_item || !istype(held_item, /obj/item/gun/ballistic/rifle/rebarxbow)) + user.balloon_alert(user, "no held crossbow!") + return + var/obj/item/gun/ballistic/rifle/rebarxbow/held_crossbow = held_item + if(held_crossbow.magazine.contents.len >= held_crossbow.magazine.max_ammo) + user.balloon_alert(user, "no more room!") + return + if(!do_after(user, 0.8 SECONDS, user, IGNORE_USER_LOC_CHANGE)) + return + + var/obj/item/ammo_casing/rebar/ammo_to_load = contents[1] + held_crossbow.attackby(ammo_to_load, user) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef ORE_BAG_BALOON_COOLDOWN diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 15ad117f722..136f72b3eda 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -96,18 +96,30 @@ SSwardrobe.provide_type(/obj/item/multitool, src) SSwardrobe.provide_type(/obj/item/stack/cable_coil, src) SSwardrobe.provide_type(/obj/item/extinguisher/mini, src) +<<<<<<< HEAD SSwardrobe.provide_type(/obj/item/analyzer/ranged, src) //SKYRAT EDIT - Ranged Analyzer for CE - ORIGINAL: SSwardrobe.provide_type(/obj/item/analyzer, src) +======= + SSwardrobe.provide_type(/obj/item/analyzer, src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //much roomier now that we've managed to remove two tools /obj/item/storage/belt/utility/chief/full/get_types_to_preload() var/list/to_preload = list() //Yes this is a pain. Yes this is the point to_preload += /obj/item/screwdriver/power to_preload += /obj/item/crowbar/power +<<<<<<< HEAD to_preload += /obj/item/weldingtool/electric // SKYRAT EDIT - Electric welder to_preload += /obj/item/multitool to_preload += /obj/item/stack/cable_coil to_preload += /obj/item/extinguisher/mini to_preload += /obj/item/analyzer/ranged // SKYRAT EDIT - Ranged Analyzer for CE +======= + to_preload += /obj/item/weldingtool/experimental + to_preload += /obj/item/multitool + to_preload += /obj/item/stack/cable_coil + to_preload += /obj/item/extinguisher/mini + to_preload += /obj/item/analyzer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return to_preload /obj/item/storage/belt/utility/full/PopulateContents() @@ -136,7 +148,11 @@ /obj/item/storage/belt/utility/full/powertools/PopulateContents() new /obj/item/screwdriver/power(src) new /obj/item/crowbar/power(src) +<<<<<<< HEAD new /obj/item/weldingtool/electric(src) // SKYRAT EDIT - original: new /obj/item/weldingtool/experimental(src) +======= + new /obj/item/weldingtool/experimental(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/multitool(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/extinguisher/mini(src) @@ -246,7 +262,10 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/muzzle, /obj/item/clothing/mask/surgical, +<<<<<<< HEAD /obj/item/clothing/suit/toggle/labcoat/hospitalgown, //SKYRAT EDIT ADDITION - adds surgery gowns to belts +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/utility/surgerycap, /obj/item/construction/plumbing, /obj/item/dnainjector, @@ -257,8 +276,11 @@ /obj/item/healthanalyzer, /obj/item/hemostat, /obj/item/holosign_creator/medical, +<<<<<<< HEAD /obj/item/hypospray/mkii, //SKYRAT EDIT ADDITION - HYPOSPRAYS /obj/item/storage/hypospraykit/, //SKYRAT EDIT ADDITION - HYPOSPRAYS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/implant, /obj/item/implantcase, /obj/item/implanter, @@ -271,7 +293,10 @@ /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, +<<<<<<< HEAD /obj/item/reagent_containers/cup/vial, //SKYRAT EDIT ADDITION - HYPOSPRAYS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/tube, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/medigel, @@ -290,8 +315,11 @@ /obj/item/surgical_drapes, //for true paramedics /obj/item/surgicaldrill, /obj/item/tank/internals/emergency_oxygen, +<<<<<<< HEAD /obj/item/weaponcell/medical, //SKYRAT EDIT MEDIGUNS /obj/item/handheld_soulcatcher, // SKYRAT EDIT SOULCATCHERS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/wrench/medical, /obj/item/knife/ritual, )) @@ -389,7 +417,10 @@ /obj/item/flashlight/seclite, /obj/item/food/donut, /obj/item/grenade, +<<<<<<< HEAD /obj/item/gun, //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/holosign_creator/security, /obj/item/knife/combat, /obj/item/melee/baton, @@ -397,8 +428,12 @@ /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, /obj/item/restraints/legcuffs/bola, +<<<<<<< HEAD /obj/item/stock_parts/power_store/cell/microfusion, //SKYRAT EDIT ADDITION )) +======= + )) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 atom_storage.open_sound = 'sound/items/holster.ogg' atom_storage.open_sound_vary = TRUE atom_storage.rustle_sound = FALSE @@ -727,12 +762,18 @@ /obj/item/key/janitor, /obj/item/lightreplacer, /obj/item/melee/flyswatter, +<<<<<<< HEAD /obj/item/mop, //SKYRAT EDIT - For when you're lazy to use soap /obj/item/mop/advanced, //SKYRAT EDIT For when you're lazy to use a bucket /obj/item/paint/paint_remover, /obj/item/plunger, /obj/item/pushbroom, /obj/item/reagent_containers/cup/bucket, //SKYRAT EDIT - Bucket +======= + /obj/item/paint/paint_remover, + /obj/item/plunger, + /obj/item/pushbroom, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/spray, /obj/item/soap, /obj/item/wirebrush, diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm index 6b4e995a276..fdb5bf64657 100644 --- a/code/game/objects/items/storage/boxes/clothes_boxes.dm +++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm @@ -130,6 +130,27 @@ new /obj/item/clothing/under/ethereal_tunic/trailwarden(src) new /obj/item/storage/backpack/saddlepack(src) +<<<<<<< HEAD +======= +/obj/item/storage/box/hero/journalist + name = "Assassinated by CIA - 1984." // Literally + desc = "Many courageous individuals risked their lives to report on events the government sought to keep hidden from the public, ensuring that the truth remained buried and unheard. These garments are replicas of the clothing worn by one such 'journalist,' a silent sentinel in the fight for truth." + +/obj/item/storage/box/hero/journalist/PopulateContents() + new /obj/item/clothing/under/costume/buttondown/slacks(src) + new /obj/item/clothing/suit/toggle/suspenders(src) + new /obj/item/clothing/neck/tie/red(src) + new /obj/item/clothing/head/fedora/beige/press(src) + new /obj/item/clothing/accessory/press_badge(src) + new /obj/item/clothing/suit/hazardvest/press(src) + new /obj/item/radio/entertainment/microphone/physical(src) + new /obj/item/radio/entertainment/speakers/physical(src) + new /obj/item/clipboard(src) + new /obj/item/taperecorder(src) + new /obj/item/camera(src) + new /obj/item/wallframe/telescreen/entertainment(src) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/holy name = "Templar Kit" /// This item is used to generate a preview image for this set. diff --git a/code/game/objects/items/storage/boxes/engineering_boxes.dm b/code/game/objects/items/storage/boxes/engineering_boxes.dm index a46703ec8bf..4eb5482f5d4 100644 --- a/code/game/objects/items/storage/boxes/engineering_boxes.dm +++ b/code/game/objects/items/storage/boxes/engineering_boxes.dm @@ -112,3 +112,15 @@ ..() for(var/i in 1 to 7) new /obj/item/tank/internals/emergency_oxygen/engi(src) //in case anyone ever wants to do anything with spawning them, apart from crafting the box +<<<<<<< HEAD +======= + +/obj/item/storage/box/stickers/chief_engineer + name = "CE approved sticker pack" + desc = "With one of these stickers, inform the crew that the contraption in the corridor is COMPLETELY SAFE!" + illustration = "label_ce" + +/obj/item/storage/box/stickers/chief_engineer/PopulateContents() + for(var/i in 1 to 3) + new /obj/item/sticker/chief_engineer(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm index bccb04f14d0..0941e9fd374 100644 --- a/code/game/objects/items/storage/boxes/food_boxes.dm +++ b/code/game/objects/items/storage/boxes/food_boxes.dm @@ -126,7 +126,11 @@ /obj/item/storage/box/papersack/proc/check_menu(mob/user, obj/item/pen/P) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(contents.len) balloon_alert(user, "items inside!") diff --git a/code/game/objects/items/storage/boxes/job_boxes.dm b/code/game/objects/items/storage/boxes/job_boxes.dm index 2620cb58dc8..40eaedc0094 100644 --- a/code/game/objects/items/storage/boxes/job_boxes.dm +++ b/code/game/objects/items/storage/boxes/job_boxes.dm @@ -46,13 +46,17 @@ if(length(SSmapping.levels_by_trait(ZTRAIT_STATION)) > 1) new /obj/item/climbing_hook/emergency(src) +<<<<<<< HEAD new /obj/item/oxygen_candle(src) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/survival/radio/PopulateContents() ..() // we want the survival stuff too. new /obj/item/radio/off(src) /obj/item/storage/box/survival/proc/wardrobe_removal() +<<<<<<< HEAD if(!isplasmaman(loc) && !isvox(loc)) //We need to specially fill the box with plasmaman gear, since it's intended for one //SKYRAT EDIT: && !isvox(loc) return var/obj/item/mask = locate(mask_type) in src @@ -63,6 +67,13 @@ else new /obj/item/tank/internals/nitrogen/belt/emergency(src) //SKYRAT EDIT ADDITION END - VOX INTERNALS +======= + if(!isplasmaman(loc)) //We need to specially fill the box with plasmaman gear, since it's intended for one + return + var/obj/item/mask = locate(mask_type) in src + var/obj/item/internals = locate(internal_type) in src + new /obj/item/tank/internals/plasmaman/belt(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(mask) // Get rid of the items that shouldn't be qdel(internals) diff --git a/code/game/objects/items/storage/boxes/medical_boxes.dm b/code/game/objects/items/storage/boxes/medical_boxes.dm index c76f1ca0b37..491032a33d7 100644 --- a/code/game/objects/items/storage/boxes/medical_boxes.dm +++ b/code/game/objects/items/storage/boxes/medical_boxes.dm @@ -133,7 +133,10 @@ /obj/item/storage/box/bandages name = "box of bandages" desc = "A box of DeForest brand gel bandages designed to treat blunt-force trauma." +<<<<<<< HEAD icon = 'icons/obj/storage/box.dmi' // SKYRAT EDIT CHANGE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "brutebox" base_icon_state = "brutebox" inhand_icon_state = "brutebox" diff --git a/code/game/objects/items/storage/boxes/science_boxes.dm b/code/game/objects/items/storage/boxes/science_boxes.dm index 48ab6cd5b72..f9261b878af 100644 --- a/code/game/objects/items/storage/boxes/science_boxes.dm +++ b/code/game/objects/items/storage/boxes/science_boxes.dm @@ -39,6 +39,10 @@ illustration = null /// Which type of cube are we spawning in this box? var/cube_type = /obj/item/food/monkeycube +<<<<<<< HEAD +======= + custom_price = PAYCHECK_CREW * 2 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/monkeycubes/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/storage/boxes/service_boxes.dm b/code/game/objects/items/storage/boxes/service_boxes.dm index ee558d863da..935cac6e502 100644 --- a/code/game/objects/items/storage/boxes/service_boxes.dm +++ b/code/game/objects/items/storage/boxes/service_boxes.dm @@ -224,14 +224,44 @@ new /obj/item/toy/balloon/long(src) /obj/item/storage/box/stickers +<<<<<<< HEAD name = "box of stickers" desc = "A box full of random stickers. Do give to the clown." +======= + name = "sticker pack" + desc = "A pack of removable stickers. Removable? What a rip off!
On the back, DO NOT GIVE TO THE CLOWN! is printed in large lettering." + icon = 'icons/obj/toys/stickers.dmi' + icon_state = "stickerpack" + illustration = null + w_class = WEIGHT_CLASS_TINY + var/static/list/pack_labels = list( + "smile", + "frown", + "heart", + "silentman", + "tider", + "star", + ) + +/obj/item/storage/box/stickers/Initialize(mapload) + . = ..() + atom_storage.max_slots = 8 + atom_storage.set_holdable(list(/obj/item/sticker)) + atom_storage.max_specific_storage = WEIGHT_CLASS_TINY + if(isnull(illustration)) + illustration = pick(pack_labels) + update_appearance() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/stickers/proc/generate_non_contraband_stickers_list() var/list/allowed_stickers = list() for(var/obj/item/sticker/sticker_type as anything in subtypesof(/obj/item/sticker)) +<<<<<<< HEAD if(!sticker_type::contraband) +======= + if(!sticker_type::exclude_from_random) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 allowed_stickers += sticker_type return allowed_stickers @@ -247,8 +277,14 @@ new type(src) /obj/item/storage/box/stickers/googly +<<<<<<< HEAD name = "box of googly eye stickers" desc = "Turn anything and everything into something vaguely alive!" +======= + name = "googly eye sticker pack" + desc = "Turn anything and everything into something vaguely alive!" + illustration = "googly-alt" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/stickers/googly/PopulateContents() for(var/i in 1 to 6) diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index c6684f6ff1a..0bcf557d6cf 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -74,7 +74,11 @@ new /obj/item/clothing/shoes/laceup(src) /obj/item/storage/bag/garment/hos/PopulateContents() +<<<<<<< HEAD //new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) SKYRAT EDIT REMOVAL - Blue Sec +======= + new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/under/rank/security/head_of_security/alt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src) new /obj/item/clothing/under/rank/security/head_of_security/grey(src) @@ -94,6 +98,7 @@ /obj/item/storage/bag/garment/warden/PopulateContents() new /obj/item/clothing/suit/armor/vest/warden(src) +<<<<<<< HEAD //new /obj/item/clothing/head/hats/warden(src) SKYRAT EDIT REMOVAL //new /obj/item/clothing/head/hats/warden/drill(src) SKYRAT EDIT REMOVAL new /obj/item/clothing/head/beret/sec/navywarden(src) @@ -101,6 +106,14 @@ new /obj/item/clothing/under/rank/security/warden/formal(src) new /obj/item/clothing/suit/jacket/warden/blue(src) //SKYRAT ADDITION - FORMAL COAT //new /obj/item/clothing/under/rank/security/warden/skirt(src) SKYRAT EDIT REMOVAL +======= + new /obj/item/clothing/head/hats/warden(src) + new /obj/item/clothing/head/hats/warden/drill(src) + new /obj/item/clothing/head/beret/sec/navywarden(src) + new /obj/item/clothing/suit/armor/vest/warden/alt(src) + new /obj/item/clothing/under/rank/security/warden/formal(src) + new /obj/item/clothing/under/rank/security/warden/skirt(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/clothing/mask/gas/sechailer(src) @@ -112,7 +125,10 @@ new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src) +<<<<<<< HEAD new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src) new /obj/item/clothing/head/beret/science/rd(src) new /obj/item/clothing/gloves/color/black(src) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 421d82b667f..53bde4f3c82 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -232,7 +232,10 @@ /obj/item/storage/lockbox/order name = "order lockbox" desc = "A box used to secure small cargo orders from being looted by those who didn't order it. Yeah, cargo tech, that means you." +<<<<<<< HEAD icon = 'icons/obj/storage/case.dmi' +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "secure" icon_closed = "secure" icon_locked = "secure_locked" @@ -249,21 +252,27 @@ buyer_account = _buyer_account ADD_TRAIT(src, TRAIT_NO_MISSING_ITEM_ERROR, TRAIT_GENERIC) ADD_TRAIT(src, TRAIT_NO_MANIFEST_CONTENTS_ERROR, TRAIT_GENERIC) +<<<<<<< HEAD //SKYRAT EDIT START if(istype(buyer_account, /datum/bank_account/department)) department_purchase = TRUE department_account = buyer_account //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/lockbox/order/can_unlock(mob/living/user, obj/item/card/id/id_card) if(id_card.registered_account == buyer_account) return TRUE +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - private department orders if(department_purchase && id_card.registered_account?.account_job?.paycheck_department == department_account.department_id) return TRUE //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "incorrect bank account!") return FALSE diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 60e6d4113b5..bb134dc6e3d 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -44,7 +44,11 @@ ))) if(KIT_RECON) new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc? +<<<<<<< HEAD // new /obj/item/storage/briefcase/launchpad(src) //6 tc // SKYRAT EDIT REMOVAL +======= + new /obj/item/storage/briefcase/launchpad(src) //6 tc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/binoculars(src) // 2 tc? new /obj/item/encryptionkey/syndicate(src) // 2 tc new /obj/item/storage/box/syndie_kit/space(src) //4 tc @@ -346,6 +350,10 @@ /obj/item/storage/box/syndie_kit/rebarxbowsyndie/PopulateContents() new /obj/item/book/granter/crafting_recipe/dusting/rebarxbowsyndie_ammo(src) new /obj/item/gun/ballistic/rifle/rebarxbow/syndie(src) +<<<<<<< HEAD +======= + new /obj/item/storage/bag/rebar_quiver/syndicate(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/syndie_kit/origami_bundle name = "origami kit" @@ -683,6 +691,7 @@ group.register(i) desc += " The implants are registered to the \"[group.name]\" group." +<<<<<<< HEAD /obj/item/storage/box/syndie_kit/stickers name = "sticker kit" @@ -691,6 +700,9 @@ atom_storage.max_slots = 8 /obj/item/storage/box/syndie_kit/stickers/PopulateContents() +======= +/obj/item/storage/box/stickers/syndie_kit/PopulateContents() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/types = subtypesof(/obj/item/sticker/syndicate) for(var/i in 1 to atom_storage.max_slots) @@ -848,7 +860,11 @@ illustration = "writing_syndie" /obj/item/storage/box/syndicate/contractor_loadout/PopulateContents() +<<<<<<< HEAD new /obj/item/mod/control/pre_equipped/contractor(src) //SKYRAT EDIT: Was infiltrator variant +======= + new /obj/item/mod/control/pre_equipped/infiltrator(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/head/helmet/space/syndicate/contract(src) new /obj/item/clothing/suit/space/syndicate/contract(src) new /obj/item/clothing/under/chameleon(src) diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index ab2d8f35341..ec962605bc2 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -20,10 +20,13 @@ /obj/item/holochip, /obj/item/card, /obj/item/cigarette, +<<<<<<< HEAD // SKYRAT EDIT BEGIN /obj/item/condom_pack, /obj/item/gbp_punchcard, // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/accessory/dogtag, /obj/item/coin, /obj/item/coupon, diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm index 457e971b90d..10a98c24c08 100644 --- a/code/game/objects/items/surgery_tray.dm +++ b/code/game/objects/items/surgery_tray.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /datum/storage/surgery_tray max_total_storage = 30 max_specific_storage = WEIGHT_CLASS_NORMAL @@ -24,6 +25,8 @@ /obj/item/surgicaldrill, )) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Surgery Trays * A storage object that displays tools in its contents based on tier, better tools are more visible. @@ -195,7 +198,10 @@ new /obj/item/cautery(src) new /obj/item/circular_saw(src) new /obj/item/clothing/mask/surgical(src) +<<<<<<< HEAD new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/hemostat(src) new /obj/item/razor/surgery(src) new /obj/item/retractor(src) @@ -217,7 +223,10 @@ new /obj/item/cautery/cruel(src) new /obj/item/circular_saw(src) new /obj/item/clothing/mask/surgical(src) +<<<<<<< HEAD new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/hemostat/cruel(src) new /obj/item/razor/surgery(src) new /obj/item/retractor/cruel(src) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index cd5a9a1841e..a7a577c77cf 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -79,7 +79,7 @@ toggle_internals(user) /obj/item/tank/jetpack/proc/cycle(mob/user) - if(user.incapacitated()) + if(user.incapacitated) return if(!on) diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index d89794f4209..3e10a0f92d4 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -256,7 +256,11 @@ if(istype(carbon_user) && (carbon_user.external == src || carbon_user.internal == src)) .["connected"] = TRUE +<<<<<<< HEAD /obj/item/tank/ui_act(action, params) +======= +/obj/item/tank/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 8094a9a21c8..15db2a5d3ed 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -47,7 +47,7 @@ if(user.get_item_by_slot(user.getBackSlot()) != src) to_chat(user, span_warning("The watertank must be worn properly to use!")) return - if(user.incapacitated()) + if(user.incapacitated) return if(QDELETED(noz)) diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index fc2eeba82ff..e0a8991dea6 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -151,7 +151,11 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) /obj/item/tcgcard/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -249,7 +253,11 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) /obj/item/tcgcard_deck/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/tcg/tcg_machines.dm b/code/game/objects/items/tcg/tcg_machines.dm index 78854afdd5b..e0ca75f4bb1 100644 --- a/code/game/objects/items/tcg/tcg_machines.dm +++ b/code/game/objects/items/tcg/tcg_machines.dm @@ -105,7 +105,11 @@ GLOBAL_LIST_EMPTY(tcgcard_machine_radial_choices) /obj/machinery/trading_card_holder/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -356,7 +360,11 @@ GLOBAL_LIST_EMPTY(tcgcard_mana_bar_radial_choices) /obj/machinery/trading_card_button/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 6d50f36028e..7da69706bfe 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -170,12 +170,16 @@ /obj/item/hand_tele/attack_self(mob/user) if (!can_teleport_notifies(user)) return +<<<<<<< HEAD //SKYRAT EDIT BEGIN var/turf/my_turf = get_turf(src) if(is_away_level(my_turf.z)) to_chat(user, "[src] cannot be used here!") return //SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/locations = list() for(var/obj/machinery/computer/teleporter/computer as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/computer/teleporter)) var/atom/target = computer.target_ref?.resolve() @@ -195,7 +199,11 @@ var/teleport_location_key = tgui_input_list(user, "Teleporter to lock on", "Hand Teleporter", sort_list(locations)) if (isnull(teleport_location_key)) return +<<<<<<< HEAD if(user.get_active_held_item() != src || user.incapacitated()) +======= + if(user.get_active_held_item() != src || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // Not always a datum, but needed for IS_WEAKREF_OF to cast properly. diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index a5a7235257b..85e270682e5 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -30,8 +30,13 @@ heat = 3800 tool_behaviour = TOOL_WELDER toolspeed = 1 +<<<<<<< HEAD //wound_bonus = 10 //SKYRAT EDIT REMOVAL //bare_wound_bonus = 15 //SKYRAT EDIT REMOVAL +======= + wound_bonus = 10 + bare_wound_bonus = 15 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.3) /// Whether the welding tool is on or off. var/welding = FALSE @@ -159,7 +164,11 @@ user.visible_message(span_notice("[user] starts to fix some of the dents on [attacked_humanoid == user ? user.p_their() : "[attacked_humanoid]'s"] [affecting.name]."), span_notice("You start fixing some of the dents on [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name].")) +<<<<<<< HEAD var/use_delay = 1 SECONDS // SKYRAT EDIT - original repeating ? 1 SECONDS : 0 +======= + var/use_delay = repeating ? 1 SECONDS : 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user == attacked_humanoid) use_delay = 5 SECONDS diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm index 1b3367032c1..d08deec62e3 100644 --- a/code/game/objects/items/toy_mechs.dm +++ b/code/game/objects/items/toy_mechs.dm @@ -96,7 +96,7 @@ return FALSE //dead men tell no tales, incapacitated men fight no fights - if(attacker_controller.incapacitated()) + if(attacker_controller.incapacitated) return FALSE //if the attacker_controller isn't next to the attacking toy (and doesn't have telekinesis), the battle ends if(!in_range(attacker, attacker_controller) && !(attacker_controller.dna.check_mutation(/datum/mutation/human/telekinesis))) @@ -106,7 +106,7 @@ //if it's PVP and the opponent is not next to the defending(src) toy (and doesn't have telekinesis), the battle ends if(opponent) - if(opponent.incapacitated()) + if(opponent.incapacitated) return FALSE if(!in_range(src, opponent) && !(opponent.dna.check_mutation(/datum/mutation/human/telekinesis))) opponent.visible_message(span_notice("[opponent.name] separates from [src], ending the battle."), \ diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index ff540932f31..60f0de61238 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -85,10 +85,13 @@ desc = "In the Mothic Fleet every individual wrapper is carefully recycled and repurposed into fresh material. Over here they are more commonly dropped directly onto the floor." icon_state = "moth_ration" +<<<<<<< HEAD /obj/item/trash/waffles name = "waffles tray" icon_state = "waffles" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/trash/pistachios name = "pistachios pack" icon_state = "pistachios_pack" diff --git a/code/game/objects/items_reskin.dm b/code/game/objects/items_reskin.dm index 9fa3b91d0e1..011bf60879d 100644 --- a/code/game/objects/items_reskin.dm +++ b/code/game/objects/items_reskin.dm @@ -81,6 +81,10 @@ return FALSE if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 92ca803177e..ab5cc16f04e 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -117,6 +117,9 @@ AddComponent(/datum/component/acid, acidpwr, acid_volume, custom_acid_overlay || GLOB.acid_overlay) return TRUE + AddComponent(/datum/component/acid, acidpwr, acid_volume, custom_acid_overlay || GLOB.acid_overlay) + return TRUE + ///called when the obj is destroyed by acid. /obj/proc/acid_melt() deconstruct(FALSE) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 1b9282be661..0e800e5cab4 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -190,7 +190,10 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag) if(obj_flags & UNIQUE_RENAME) . += span_notice("Use a pen on it to rename it or change its description.") +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/analyzer_act(mob/living/user, obj/item/analyzer/tool) if(atmos_scan(user=user, target=src, silent=FALSE)) return TRUE diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index ff6e6e171bb..8473f1755c5 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -32,7 +32,11 @@ QUEUE_SMOOTH_NEIGHBORS(src) return ..() +<<<<<<< HEAD /obj/structure/ui_act(action, params) +======= +/obj/structure/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_fingerprint(usr) return ..() diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 5c219aaa4a9..5f1c8013d06 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -61,7 +61,10 @@ /obj/structure/ai_core/Destroy() if(istype(remote_ai)) +<<<<<<< HEAD remote_ai.break_core_link() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 remote_ai = null QDEL_NULL(circuit) QDEL_NULL(core_mmi) @@ -72,7 +75,11 @@ . = ..() if(. > 0 && istype(remote_ai)) to_chat(remote_ai, span_danger("Your core is under attack!")) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/ai_core/deactivated icon_state = "ai-empty" diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index 681724f4d40..b1b0de6e53a 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -24,6 +24,7 @@ /obj/structure/bed/nest/user_unbuckle_mob(mob/living/captive, mob/living/hero) if(!length(buckled_mobs)) +<<<<<<< HEAD return if(hero.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) @@ -61,6 +62,45 @@ if(M.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) return +======= + return + + if(hero.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) + unbuckle_mob(captive) + add_fingerprint(hero) + return + + if(captive != hero) + captive.visible_message(span_notice("[hero.name] pulls [captive.name] free from the sticky nest!"), + span_notice("[hero.name] pulls you free from the gelatinous resin."), + span_hear("You hear squelching...")) + unbuckle_mob(captive) + add_fingerprint(hero) + return + + captive.visible_message(span_warning("[captive.name] struggles to break free from the gelatinous resin!"), + span_notice("You struggle to break free from the gelatinous resin... (Stay still for about a minute and a half.)"), + span_hear("You hear squelching...")) + + if(!do_after(captive, 100 SECONDS, target = src, hidden = TRUE)) + if(captive.buckled) + to_chat(captive, span_warning("You fail to unbuckle yourself!")) + return + + captive.visible_message(span_warning("[captive.name] breaks free from the gelatinous resin!"), + span_notice("You break free from the gelatinous resin!"), + span_hear("You hear squelching...")) + + unbuckle_mob(captive) + add_fingerprint(hero) + +/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) + if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.incapacitated || M.buckled ) + return + + if(M.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) return diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 02a0e320d1f..8e439ef0577 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -38,7 +38,11 @@ LINEN BINS /obj/item/bedsheet/Initialize(mapload) . = ..() AddComponent(/datum/component/surgery_initiator) +<<<<<<< HEAD AddElement(/datum/element/bed_tuckable, mapload, 0, 12, 0) +======= + AddElement(/datum/element/bed_tuckable, mapload, 0, 0, 0) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(bedsheet_type == BEDSHEET_DOUBLE) stack_amount *= 2 dying_key = DYE_REGISTRY_DOUBLE_BEDSHEET diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 27e69dcba56..eaa1803603c 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -914,6 +914,11 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets) /obj/structure/closet/mouse_drop_receive(atom/movable/O, mob/living/user, params) if(!istype(O) || O.anchored || istype(O, /atom/movable/screen)) +<<<<<<< HEAD +======= + return + if(!istype(user) || user.incapacitated || user.body_position == LYING_DOWN) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(user == O) //try to climb onto it return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index f0d1eaa0cc8..316d26dc0d9 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -32,7 +32,11 @@ var/move_delay = FALSE /obj/structure/closet/cardboard/relaymove(mob/living/user, direction) +<<<<<<< HEAD if(opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc)) +======= + if(opened || move_delay || user.incapacitated || !isturf(loc) || !has_gravity(loc)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return move_delay = TRUE var/oldloc = loc @@ -72,7 +76,11 @@ for(var/mob/living/alerted_mob as anything in alerted) if(alerted_mob.stat != CONSCIOUS || alerted_mob.is_blind()) continue +<<<<<<< HEAD if(!alerted_mob.incapacitated(IGNORE_RESTRAINTS)) +======= + if(!INCAPACITATED_IGNORING(alerted_mob, INCAPABLE_RESTRAINTS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alerted_mob.face_atom(src) alerted_mob.do_alert_animation() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index c0cf7bb873b..7ce3746b9b7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -18,11 +18,14 @@ new /obj/item/etherealballdeployer(src) new /obj/item/roulette_wheel_beacon(src) +<<<<<<< HEAD //SKYRAT EDIT ADDITION new /obj/item/storage/fancy/candle_box(src) new /obj/item/storage/fancy/candle_box(src) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/bar/all_access req_access = null diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 182c93b90df..9bbcd3bf843 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -18,17 +18,25 @@ new /obj/item/extinguisher/advanced(src) new /obj/item/storage/photo_album/ce(src) new /obj/item/storage/box/skillchips/engineering(src) +<<<<<<< HEAD new /obj/item/storage/box/gas_miner_beacons(src) // SKYRAT EDIT ADDITION new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION new /obj/item/circuitboard/machine/rodstopper(src) //SKYRAT EDIT ADDITION new /obj/item/card/id/departmental_budget/eng(src) //SKYRAT EDIT ADDITION +======= + new /obj/item/storage/box/stickers/chief_engineer(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/engineering_chief/populate_contents_immediate() . = ..() // Traitor steal objective new /obj/item/blueprints(src) +<<<<<<< HEAD new /obj/item/pipe_dispenser/bluespace(src) // SKYRAT EDIT -- BLUESPACE RPD -- ORIGINAL: new /obj/item/pipe_dispenser(src) +======= + new /obj/item/pipe_dispenser(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" 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 e5eed4cb295..1c321693475 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -86,7 +86,10 @@ new /obj/item/defibrillator/compact/loaded(src) new /obj/item/healthanalyzer/advanced(src) new /obj/item/assembly/flash/handheld(src) +<<<<<<< HEAD new /obj/item/storage/briefcase/medicalgunset/cmo(src) //SKYRAT EDIT ADDITION MEDIGUNS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/autosurgeon/medical_hud(src) new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/clothing/neck/petcollar(src) @@ -95,14 +98,21 @@ 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) +<<<<<<< HEAD new /obj/item/card/id/departmental_budget/med(src) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/chief_medical/populate_contents_immediate() . = ..() // Traitor steal objective +<<<<<<< HEAD //new /obj/item/reagent_containers/hypospray/cmo(src) - ORIGINAL new /obj/item/storage/hypospraykit/cmo/preloaded(src) //SKYRAT EDIT ADDITION - New Hyposprays +======= + new /obj/item/reagent_containers/hypospray/cmo(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/animal name = "animal control locker" @@ -127,8 +137,11 @@ new /obj/item/storage/box/pillbottles(src) new /obj/item/storage/box/medigels(src) new /obj/item/storage/box/medigels(src) +<<<<<<< HEAD new /obj/item/storage/box/hypospray(src) //SKYRAT EDIT ADDITION - HYPOSPRAYS new /obj/item/storage/box/hypospray(src) //SKYRAT EDIT ADDITION - HYPOSPRAYS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/ph_booklet(src) new /obj/item/reagent_containers/dropper(src) new /obj/item/reagent_containers/cup/bottle/acidic_buffer(src) //hopefully they get the hint diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index a48d551b768..a5b5d346ebf 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -18,7 +18,10 @@ new /obj/item/circuitboard/machine/techfab/department/science(src) new /obj/item/storage/photo_album/rd(src) new /obj/item/storage/box/skillchips/science(src) +<<<<<<< HEAD new /obj/item/card/id/departmental_budget/sci(src) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/research_director/populate_contents_immediate() . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 4474f1d2fec..c036af905d4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -24,6 +24,10 @@ new /obj/item/gun/energy/e_gun(src) new /obj/item/storage/belt/sabre(src) +/obj/structure/closet/secure_closet/captains/populate_contents_immediate() + new /obj/item/gun/energy/e_gun(src) + new /obj/item/storage/belt/sabre(src) + /obj/structure/closet/secure_closet/hop name = "head of personnel's locker" icon_state = "hop" @@ -46,7 +50,10 @@ new /obj/item/circuitboard/machine/techfab/department/service(src) new /obj/item/storage/photo_album/hop(src) new /obj/item/storage/lockbox/medal/hop(src) +<<<<<<< HEAD new /obj/item/card/id/departmental_budget/srv(src) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/hop/populate_contents_immediate() new /obj/item/gun/energy/e_gun(src) @@ -82,6 +89,14 @@ new /obj/item/pinpointer/nuke(src) new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) +/obj/structure/closet/secure_closet/hos/populate_contents_immediate() + . = ..() + + // Traitor steal objectives + new /obj/item/gun/energy/e_gun/hos(src) + new /obj/item/pinpointer/nuke(src) + new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) + /obj/structure/closet/secure_closet/warden name = "warden's locker" icon_state = "warden" @@ -113,7 +128,11 @@ new /obj/item/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/flashlight/seclite(src) +<<<<<<< HEAD new /obj/item/clothing/gloves/tackler/security(src) // SKYRAT EDIT CHANGE - Gives Them The Blue Ones - ORIGINAL: new /obj/item/clothing/gloves/tackler(src) +======= + new /obj/item/clothing/gloves/tackler(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/security/sec @@ -283,6 +302,10 @@ /obj/structure/closet/secure_closet/armory1 name = "armory armor locker" +<<<<<<< HEAD +======= + icon_state = "armory" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 req_access = list(ACCESS_ARMORY) /obj/structure/closet/secure_closet/armory1/PopulateContents() diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 7367e04e6f5..12bbbfe2f6b 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -38,8 +38,12 @@ if (prob(40)) new /obj/item/storage/toolbox/emergency(src) +<<<<<<< HEAD //switch (pick_weight(list("small" = 35, "aid" = 30, "tank" = 20, "both" = 10, "nothing" = 4))) // ORIGINAL switch (pick_weight(list("small" = 35, "aid" = 30, "tank" = 20, "both" = 10))) // SKYRAT EDIT CHANGE +======= + switch (pick_weight(list("small" = 35, "aid" = 30, "tank" = 20, "both" = 10, "nothing" = 4))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if ("small") new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src) @@ -64,8 +68,11 @@ if ("nothing") // doot pass() +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Fire Closet @@ -77,23 +84,39 @@ /obj/structure/closet/firecloset/PopulateContents() ..() +<<<<<<< HEAD new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) +======= + + new /obj/item/clothing/suit/utility/fire/firefighter(src) + new /obj/item/clothing/mask/gas(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/utility/hardhat/red(src) new /obj/item/crowbar/large/emergency(src) +<<<<<<< HEAD new /obj/item/storage/inflatable(src) //SKYRAT EDIT ADDITION - INFLATABLES /obj/structure/closet/firecloset/full/PopulateContents() new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) +======= + +/obj/structure/closet/firecloset/full/PopulateContents() + new /obj/item/clothing/suit/utility/fire/firefighter(src) + new /obj/item/clothing/mask/gas(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/flashlight(src) new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/utility/hardhat/red(src) new /obj/item/crowbar/large/emergency(src) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Tool Closet diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index a21aa5926fa..dc0e22abff5 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -1,7 +1,11 @@ /obj/structure/closet/crate name = "crate" desc = "A rectangular steel crate." +<<<<<<< HEAD icon = 'icons/obj/storage/crates.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/storage/crates.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "crate" base_icon_state = "crate" req_access = null @@ -222,6 +226,15 @@ icon_state = "medicalcrate" base_icon_state = "medicalcrate" +<<<<<<< HEAD +======= +/obj/structure/closet/crate/deforest + name = "deforest medical crate" + desc = "A DeFortest brand crate of medical supplies." + icon_state = "deforest" + base_icon_state = "deforest" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/medical/department icon_state = "medical" base_icon_state = "medical" @@ -289,6 +302,27 @@ name = "food icebox" icon_state = "food" base_icon_state = "food" +<<<<<<< HEAD +======= + +/obj/structure/closet/crate/freezer/donk + name = "donk co. fridge" + desc = "A Donk Co. brand fridge, keeps your donkpcokets and foam ammunition fresh!" + icon_state = "donkcocrate" + base_icon_state = "donkcocrate" + +/obj/structure/closet/crate/freezer/interdyne + name = "interdyne freezer" + desc = "Interdyne Pharmauceutics branded freezer. Might or might not contain cold steel, or fresh organs." + icon_state = "interdynefreezer" + base_icon_state = "interdynefreezer" + +/obj/structure/closet/crate/freezer/blood/interdyne + name = "interdyne blood freezer" + desc = "Interdyne Pharmauceutics branded freezer. Only freshly harvested- I mean, freshly kept blood inside!" + icon_state = "interdynefreezer" + base_icon_state = "interdynefreezer" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." @@ -312,6 +346,15 @@ icon_state = "cargo" base_icon_state = "cargo" +<<<<<<< HEAD +======= +/obj/structure/closet/crate/robust + name = "robust industries crate" + desc = "Robust Inustries LLC. crate. Feels oddly nostalgic." + icon_state = "robust" + base_icon_state = "robust" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/cargo/mining name = "mining crate" icon_state = "mining" @@ -321,6 +364,15 @@ name = "engineering crate" icon_state = "engi_crate" base_icon_state = "engi_crate" +<<<<<<< HEAD +======= + +/obj/structure/closet/crate/nakamura + name = "nakamura engineering crate" + desc = "Crate from Nakamura Engineering, most likely containing engineering supplies or MODcores." + icon_state = "nakamura" + base_icon_state = "nakamura" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/engineering/electrical icon_state = "engi_e_crate" diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index 073d4a936d8..be0d4e8c24b 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -34,7 +34,12 @@ if(W.tool_behaviour == TOOL_CROWBAR) if(manifest) tear_manifest(user) +<<<<<<< HEAD +======= + if(!open(user)) + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] pries \the [src] open."), \ span_notice("You pry open \the [src]."), \ span_hear("You hear splitting wood.")) @@ -45,7 +50,6 @@ new material_drop(src) for(var/atom/movable/AM in contents) AM.forceMove(T) - qdel(src) else diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index 1a102fdb512..24965b07f59 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -43,6 +43,20 @@ name = "weapons crate" icon_state = "weaponcrate" base_icon_state = "weaponcrate" +<<<<<<< HEAD +======= + +/obj/structure/closet/crate/secure/gorlex_weapons + desc = "A secure weapons crate of Gorlex Marauders." + name = "weapons crate" + icon_state = "gorlex_weaponcrate" + base_icon_state = "gorlex_weaponcrate" + +/obj/structure/closet/crate/secure/gorlex_weapons/jammed + desc = "A beaten up, jammed open weapon crate of Gorlex Marauders." + name = "jammed weapons crate" + locked = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." @@ -192,3 +206,65 @@ else if(!silent) to_chat(user, span_warning("[src] is broken!")) else ..() + +/obj/structure/closet/crate/secure/interdyne + name = "interdyne crate" + desc = "Crate belonging to Interdyne Pharmaceutics. Hopefully doesn't have bioweapons inside..." + icon_state = "interdynecrate" + base_icon_state = "interdynecrate" + +/obj/structure/closet/crate/secure/tiger + name = "tiger co-op crate" + icon_state = "tigercrate" + base_icon_state = "tigercrate" + +/obj/structure/closet/crate/secure/self + name = "s.e.l.f. crate" + desc = "A secure crate locked from the inside with a scanning panel above it and holographic display of lock's status. Sentient Engine Liberation Front engineers are quite the show-offs." + icon_state = "selfcrate" + base_icon_state = "selfcrate" + +/obj/structure/closet/crate/secure/m13 + name = "mysterious secure crate" + desc = "A secure crate. Lacks any obvious logos or even codes for where it arrived from, but looks like taken straight from a spy movie." + icon_state = "mithirteencrate" + base_icon_state = "mithirteencrate" + +/obj/structure/closet/crate/secure/arc + name = "animal rights consortium crate" + icon_state = "arccrate" + base_icon_state = "arccrate" + +/obj/structure/closet/crate/secure/cybersun + name = "cybersun crate" + +/obj/structure/closet/crate/secure/cybersun/dawn + desc = "A secure crate from Cybersun Industries. It has distinct orange-green colouring, probably of some departament or division, but you cannot tell what is it." + icon_state = "cyber_dawncrate" + base_icon_state = "cyber_dawncrate" + +/obj/structure/closet/crate/secure/cybersun/noon + desc = "A secure crate from Cybersun Industries. It has distinct yellow-orange colouring, probably of some departament or division, but you cannot tell what is it." + icon_state = "cyber_nooncrate" + base_icon_state = "cyber_nooncrate" + +/obj/structure/closet/crate/secure/cybersun/dusk + desc = "A secure crate from Cybersun Industries. It has distinct purple-green colouring, probably of some departament or division, but you cannot tell what is it." + icon_state = "cyber_duskcrate" + base_icon_state = "cyber_duskcrate" + +/obj/structure/closet/crate/secure/cybersun/night + desc = "A secure crate from Cybersun Industries. This one blatantly adorns syndicate colours. You can only guess it contains equipement for syndicate operatives." + icon_state = "cyber_nightcrate" + base_icon_state = "cyber_nightcrate" + +/obj/structure/closet/crate/secure/wafflecorp + name = "wafflecorp crate" + desc = "A very outdated model and design of shipment crate with a modern lock strapped on it, how befitting of its brand owner, Waffle Corporation. Golden lettering written in cursive by the logo reads 'bringing you consecutively top five world-wide rated* breakfast since 2055. A much smaller fineprint, also in cursive, clarifies: '*in years 2099-2126'... It's year 2563 now, however." + icon_state = "wafflecrate" + base_icon_state = "wafflecrate" + +/obj/structure/closet/crate/secure/gorlex + name = "gorlex marauders crate" + icon_state = "gorlexcrate" + base_icon_state = "gorlexcrate" diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm index 2b1a90500cc..032c698acec 100644 --- a/code/game/objects/structures/deployable_turret.dm +++ b/code/game/objects/structures/deployable_turret.dm @@ -85,7 +85,11 @@ STOP_PROCESSING(SSfastprocess, src) /obj/machinery/deployable_turret/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) +<<<<<<< HEAD if(user.incapacitated() || !istype(user)) +======= + if(user.incapacitated || !istype(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return M.forceMove(get_turf(src)) . = ..() @@ -129,7 +133,11 @@ calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, target_turf, modifiers) /obj/machinery/deployable_turret/proc/direction_track(mob/user, atom/targeted) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return setDir(get_dir(src,targeted)) user.setDir(dir) @@ -169,7 +177,11 @@ /obj/machinery/deployable_turret/proc/checkfire(atom/targeted_atom, mob/user) target = targeted_atom +<<<<<<< HEAD if(target == user || user.incapacitated() || target == get_turf(src)) +======= + if(target == user || user.incapacitated || target == get_turf(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(world.time < cooldown) if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing @@ -187,7 +199,11 @@ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/deployable_turret/, fire_helper), user), i*rate_of_fire) /obj/machinery/deployable_turret/proc/fire_helper(mob/user) +<<<<<<< HEAD if(user.incapacitated() || !(user in buckled_mobs)) +======= + if(user.incapacitated || !(user in buckled_mobs)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return update_positioning() //REFRESH MOUSE TRACKING!! var/turf/targets_from = get_turf(src) diff --git a/code/game/objects/structures/detectiveboard.dm b/code/game/objects/structures/detectiveboard.dm new file mode 100644 index 00000000000..f9d0560dfde --- /dev/null +++ b/code/game/objects/structures/detectiveboard.dm @@ -0,0 +1,308 @@ +#define MAX_ICON_NOTICES 8 +#define MAX_CASES 8 +#define MAX_EVIDENCE_Y 3500 +#define MAX_EVIDENCE_X 1180 + +#define EVIDENCE_TYPE_PHOTO "photo" +#define EVIDENCE_TYPE_PAPER "paper" + +/obj/structure/detectiveboard + name = "detective notice board" + desc = "A board for linking evidence to crimes." + icon = 'icons/obj/wallmounts.dmi' + icon_state = "noticeboard" + density = FALSE + anchored = TRUE + max_integrity = 150 + + /// When player attaching evidence to board this will become TRUE + var/attaching_evidence = FALSE + /// Colors for case color + var/list/case_colors = list("red", "orange", "yellow", "green", "blue", "violet") + /// List of board cases + var/list/datum/case/cases = list() + /// Index of viewing case in cases array + var/current_case = 1 + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/detectiveboard, 32) + +/obj/structure/detectiveboard/Initialize(mapload) + . = ..() + + if(mapload) + for(var/obj/item/item in loc) + if(istype(item, /obj/item/paper) || istype(item, /obj/item/photo)) + item.forceMove(src) + cases[current_case].notices++ + + register_context() + find_and_hang_on_wall() + +/// Attaching evidences: photo and papers + +/obj/structure/detectiveboard/attackby(obj/item/item, mob/user, params) + if(istype(item, /obj/item/paper) || istype(item, /obj/item/photo)) + if(!cases.len) + to_chat(user, "There are no cases!") + return + + if(attaching_evidence) + to_chat(user, "You already attaching evidence!") + return + attaching_evidence = TRUE + var/name = tgui_input_text(user, "Please enter the evidence name", "Detective's Board") + if(!name) + attaching_evidence = FALSE + return + var/desc = tgui_input_text(user, "Please enter the evidence description", "Detective's Board") + if(!desc) + attaching_evidence = FALSE + return + + if(!user.transferItemToLoc(item, src)) + attaching_evidence = FALSE + return + cases[current_case].notices++ + var/datum/evidence/evidence = new (name, desc, item) + cases[current_case].evidences += evidence + to_chat(user, span_notice("You pin the [item] to the detective board.")) + attaching_evidence = FALSE + update_appearance(UPDATE_ICON) + return + return ..() + +/obj/structure/detectiveboard/wrench_act_secondary(mob/living/user, obj/item/tool) + . = ..() + balloon_alert(user, "[anchored ? "un" : ""]securing...") + tool.play_tool_sound(src) + if(tool.use_tool(src, user, 6 SECONDS)) + playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) + balloon_alert(user, "[anchored ? "un" : ""]secured") + deconstruct() + return TRUE + +/obj/structure/detectiveboard/ui_state(mob/user) + return GLOB.physical_state + +/obj/structure/detectiveboard/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "DetectiveBoard", name, 1200, 800) + ui.open() + +/obj/structure/detectiveboard/ui_data(mob/user) + var/list/data = list() + var/list/data_cases = list() + for(var/datum/case/case in cases) + var/list/data_case = list("ref"=REF(case),"name" = case.name, "color" = case.color) + var/list/data_evidences = list() + for(var/datum/evidence/evidence in case.evidences) + var/list/data_evidence = list("ref" = REF(evidence), "name" = evidence.name, "type" = evidence.evidence_type, "description" = evidence.description, "x"=evidence.x, "y"=evidence.y) + var/list/data_connections = list() + for(var/datum/evidence/connection in evidence.connections) + data_connections += REF(connection) // TODO: create array of strings + data_evidence["connections"] = data_connections + switch(evidence.evidence_type) + if(EVIDENCE_TYPE_PHOTO) + var/obj/item/photo/photo = evidence.item + var/tmp_picture_name = "evidence_photo[REF(photo)].png" + user << browse_rsc(photo.picture.picture_image, tmp_picture_name) + data_evidence["photo_url"] = tmp_picture_name + if(EVIDENCE_TYPE_PAPER) + var/obj/item/paper/paper = evidence.item + data_evidence["text"] = "" + if(paper.raw_text_inputs && paper.raw_text_inputs.len) + data_evidence["text"] = paper.raw_text_inputs[1].raw_text + data_evidences += list(data_evidence) + data_case["evidences"] = data_evidences + var/list/connections = list() + for(var/datum/evidence/evidence in case.evidences) + for(var/datum/evidence/connection in evidence.connections) + var/list/from_pos = get_pin_position(evidence) + var/list/to_pos = get_pin_position(connection) + var/found_in_connections = FALSE + for(var/list/con in connections) + if(con["from"]["x"] == to_pos["x"] && con["from"]["y"] == to_pos["y"] && con["to"]["x"] == from_pos["x"] && con["to"]["y"] == from_pos["y"] ) + found_in_connections = TRUE + if(!found_in_connections) + var/list/data_connection = list("color" = "red", "from" = from_pos, "to" = to_pos) + connections += list(data_connection) + data_case["connections"] = connections + data_cases += list(data_case) + + data["cases"] = data_cases + data["current_case"] = current_case + return data + +/obj/structure/detectiveboard/proc/get_pin_position(datum/evidence/evidence) + return list("x" = evidence.x + 15, "y" = evidence.y + 15) + +/obj/structure/detectiveboard/ui_act(action, params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + var/mob/user = ui.user + switch(action) + if("add_case") + if(cases.len == MAX_CASES) + return FALSE + var/new_case = tgui_input_text(user, "Please enter the case name", "Detective's Board") + if(!new_case) + return FALSE + var/case_color = tgui_input_list(user, "Please choose case color", "Detective's Board", case_colors) + if(!case_color) + return FALSE + + var/datum/case/case = new (new_case, case_color) + cases += case + current_case = clamp(cases.len, 1, MAX_CASES) + update_appearance(UPDATE_ICON) + return TRUE + if("set_case") + if(cases && params["case"] && params["case"] <= cases.len) + current_case = clamp(params["case"], 1, MAX_CASES) + update_appearance(UPDATE_ICON) + return TRUE + if("remove_case") + var/datum/case/case = locate(params["case_ref"]) in cases + if(case) + for(var/datum/evidence/evidence in case.evidences) + remove_item(evidence.item, user) + cases -= case + current_case = clamp(cases.len, 1, MAX_CASES) + update_appearance(UPDATE_ICON) + return TRUE + if("rename_case") + var/new_name = tgui_input_text(user, "Please ender the case new name", "Detective's Board") + if(new_name) + var/datum/case/case = locate(params["case_ref"]) in cases + case.name = new_name + return TRUE + if("look_evidence") + var/datum/case/case = locate(params["case_ref"]) in cases + var/datum/evidence/evidence = locate(params["evidence_ref"]) in case.evidences + if(evidence.evidence_type == EVIDENCE_TYPE_PHOTO) + var/obj/item/photo/item = evidence.item + item.show(user) + return TRUE + + var/obj/item/paper/paper = evidence.item + var/paper_text = "" + for(var/datum/paper_input/text_input as anything in paper.raw_text_inputs) + paper_text += text_input.raw_text + user << browse("[paper.name]" \ + + "" \ + + "[paper_text]" \ + + "", "window=photo_showing;size=480x608") + onclose(user, "[name]") + if("remove_evidence") + var/datum/case/case = cases[current_case] + var/datum/evidence/evidence = locate(params["evidence_ref"]) in case.evidences + if(evidence) + var/obj/item/item = evidence.item + if(!istype(item) || item.loc != src) + return + remove_item(item, user) + for(var/datum/evidence/connection in evidence.connections) + connection.connections.Remove(evidence) + case.evidences -= evidence + update_appearance(UPDATE_ICON) + return TRUE + if("set_evidence_cords") + var/datum/case/case = locate(params["case_ref"]) in cases + if(case) + var/datum/evidence/evidence = locate(params["evidence_ref"]) in case.evidences + if(evidence) + evidence.x = clamp(params["rel_x"], 0, MAX_EVIDENCE_X) + evidence.y = clamp(params["rel_y"], 0, MAX_EVIDENCE_Y) + return TRUE + if("add_connection") + var/datum/evidence/from_evidence = locate(params["from_ref"]) in cases[current_case].evidences + var/datum/evidence/to_evidence = locate(params["to_ref"]) in cases[current_case].evidences + if(from_evidence && to_evidence) + from_evidence.connections += to_evidence + to_evidence.connections += from_evidence + return TRUE + + + return FALSE + +/obj/structure/detectiveboard/update_overlays() + . = ..() + if(!cases.len) + return + if(cases[current_case].notices < MAX_ICON_NOTICES) + . += "notices_[cases[current_case].notices]" + else + . += "notices_[MAX_ICON_NOTICES]" +/** + * Removes an item from the notice board + * + * Arguments: + * * item - The item that is to be removed + * * user - The mob that is trying to get the item removed, if there is one + */ +/obj/structure/detectiveboard/proc/remove_item(obj/item/item, mob/user) + item.forceMove(drop_location()) + if(user) + user.put_in_hands(item) + balloon_alert(user, "removed from board") + cases[current_case].notices-- + update_appearance(UPDATE_ICON) + +/obj/structure/detectiveboard/atom_deconstruct(disassembled = TRUE) + if(!disassembled) + new /obj/item/stack/sheet/mineral/wood(loc) + else + new /obj/item/wallframe/detectiveboard(loc) + for(var/obj/item/content in contents) + remove_item(content) + +/obj/item/wallframe/detectiveboard + name = "detective notice board" + desc = "A board for linking evidence to crimes." + icon = 'icons/obj/wallmounts.dmi' + icon_state = "noticeboard" + custom_materials = list( + /datum/material/wood = SHEET_MATERIAL_AMOUNT, + ) + resistance_flags = FLAMMABLE + result_path = /obj/structure/detectiveboard + pixel_shift = 32 + +/datum/evidence + var/name = "None" + var/description = "No description" + var/evidence_type = "none" + var/x = 0 + var/y = 0 + var/list/datum/evidence/connections = list() + var/obj/item/item = null + +/datum/evidence/New(param_name, param_desc, obj/item/param_item) + name = param_name + description = param_desc + item = param_item + if(istype(param_item, /obj/item/photo)) + evidence_type = EVIDENCE_TYPE_PHOTO + else + evidence_type = EVIDENCE_TYPE_PAPER + +/datum/case + var/notices = 0 + var/name = "" + var/color = 0 + var/list/datum/evidence/evidences = list() + +/datum/case/New(param_name, param_color) + name = param_name + color = param_color + + +#undef EVIDENCE_TYPE_PHOTO +#undef EVIDENCE_TYPE_PAPER + +#undef MAX_EVIDENCE_Y +#undef MAX_EVIDENCE_X +#undef MAX_ICON_NOTICES +#undef MAX_CASES diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index faebf85265c..7061d514a29 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -101,8 +101,13 @@ /obj/structure/displaycase/proc/trigger_alarm() if(!alert) return +<<<<<<< HEAD //var/area/alarmed = get_area(src) SKYRAT EDIT REMOVAL //alarmed.burglaralert(src) SKYRAT EDIT REMOVAL +======= + var/area/alarmed = get_area(src) + alarmed.burglaralert(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alarm_manager.send_alarm(ALARM_BURGLAR) addtimer(CALLBACK(alarm_manager, TYPE_PROC_REF(/datum/alarm_handler, clear_alarm), ALARM_BURGLAR), 1 MINUTES) @@ -411,7 +416,11 @@ data["showpiece_icon"] = icon2base64(getFlatIcon(showpiece, no_anim=TRUE)) return data +<<<<<<< HEAD /obj/structure/displaycase/trophy/ui_act(action, params) +======= +/obj/structure/displaycase/trophy/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -526,7 +535,11 @@ data["product_icon"] = showpiece ? icon2base64(getFlatIcon(showpiece, no_anim=TRUE)) : null return data +<<<<<<< HEAD /obj/structure/displaycase/forsale/ui_act(action, params) +======= +/obj/structure/displaycase/forsale/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index feb9cff2f00..13618546ebf 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -34,7 +34,11 @@ to_chat(dressing_human, span_warning("You are not capable of wearing underwear.")) return +<<<<<<< HEAD var/choice = tgui_input_list(user, "Underwear, Bra, Undershirt, or Socks?", "Changing", list("Underwear", "Underwear Color", "Bra", "Bra Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")) //SKYRAT EDIT ADDITION - Colorable Undershirt/Socks/Bra +======= + var/choice = tgui_input_list(user, "Underwear, Undershirt, or Socks?", "Changing", list("Underwear","Underwear Color","Undershirt","Socks")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(choice)) return @@ -57,6 +61,7 @@ var/new_socks = tgui_input_list(user, "Select your socks", "Changing", SSaccessories.socks_list) if(new_socks) dressing_human.socks = new_socks +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - Colorable Undershirt/Socks/Bras if("Undershirt Color") var/new_undershirt_color = input(dressing_human, "Choose your undershirt color", "Undershirt Color", dressing_human.undershirt_color) as color|null @@ -79,5 +84,8 @@ //SKYRAT EDIT ADDITION END - Colorable Undershirt/Socks/Bras +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_fingerprint(dressing_human) dressing_human.update_body() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 1791d72aa12..74646977069 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -16,8 +16,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) . = ..() if(building) opened = TRUE +<<<<<<< HEAD //icon_state = "extinguisher_empty" ORIGINAL icon_state = "extinguisher_empty_open" //SKYRAT EDIT CHANGE - AESTHETICS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else stored_extinguisher = new /obj/item/extinguisher(src) update_appearance(UPDATE_ICON) @@ -160,7 +163,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) icon_state += "_closed" return ..() +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/extinguisher_cabinet/atom_break(damage_flag) . = ..() diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 97a9ce8bd4d..8958d4a62b2 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -95,6 +95,7 @@ return switch(burn_time_remaining()) +<<<<<<< HEAD if(0 to 19999) //SKYRAT EDIT original: if(0 to 500) . += "fireplace_fire0" if(20000 to 39999) //SKYRAT EDIT original: if(500 to 1000) @@ -104,6 +105,17 @@ if(60000 to 79999) //SKYRAT EDIT original: if(1500 to 2000) . += "fireplace_fire3" if(80000 to MAXIMUM_BURN_TIMER) //SKYRAT EDIT original: if(2000 to MAXIMUM_BURN_TIMER) +======= + if(0 to 500) + . += "fireplace_fire0" + if(500 to 1000) + . += "fireplace_fire1" + if(1000 to 1500) + . += "fireplace_fire2" + if(1500 to 2000) + . += "fireplace_fire3" + if(2000 to MAXIMUM_BURN_TIMER) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "fireplace_fire4" . += "fireplace_glow" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index c9804fab0f8..bd8bad94406 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -82,7 +82,11 @@ balloon_alert(user, "need [amount] rods!") return balloon_alert(user, "concealing entrance...") +<<<<<<< HEAD if(do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if(do_after(user, 2 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(rod.get_amount() < amount) return rod.use(amount) @@ -96,13 +100,20 @@ balloon_alert(user, "need [amount] rods!") return balloon_alert(user, "adding plating...") +<<<<<<< HEAD if(do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if(do_after(user, 4 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(rod.get_amount() < amount) return rod.use(amount) var/turf/T = get_turf(src) T.place_on_top(/turf/closed/wall/mineral/iron) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(T) qdel(src) return @@ -118,7 +129,11 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "concealing entrance...") +<<<<<<< HEAD if(do_after(user, 20 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT +======= + if(do_after(user, 20*platingmodifier, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) @@ -135,12 +150,19 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding plating...") +<<<<<<< HEAD if (do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if (do_after(user, 4 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/obj/structure/tram/alt/iron/tram_wall = new(loc) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(tram_wall) qdel(src) return @@ -149,13 +171,20 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding plating...") +<<<<<<< HEAD if (do_after(user, 40 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT +======= + if (do_after(user, 40*platingmodifier, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/turf/T = get_turf(src) T.place_on_top(/turf/closed/wall) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(T) qdel(src) return @@ -166,12 +195,19 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding panel...") +<<<<<<< HEAD if (do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if (do_after(user, 2 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/obj/structure/tram/tram_wall = new(loc) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(tram_wall) qdel(src) return @@ -183,7 +219,11 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "concealing entrance...") +<<<<<<< HEAD if(do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if(do_after(user, 2 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) @@ -197,13 +237,20 @@ if(sheets.get_amount() < amount) return balloon_alert(user, "adding plating...") +<<<<<<< HEAD if(do_after(user, 50 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT +======= + if(do_after(user, 50*platingmodifier, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/turf/T = get_turf(src) T.place_on_top(/turf/closed/wall/r_wall) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(T) qdel(src) return @@ -212,7 +259,11 @@ if(sheets.get_amount() < amount) return balloon_alert(user, "reinforcing frame...") +<<<<<<< HEAD if(do_after(user, 60 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT +======= + if(do_after(user, 60*platingmodifier, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) @@ -226,6 +277,10 @@ if(istype(src, /obj/structure/girder/reinforced)) balloon_alert(user, "need plasteel!") return +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/M = sheets.sheettype var/amount = construction_cost["exotic_material"] if(state == GIRDER_TRAM) @@ -237,12 +292,19 @@ balloon_alert(user, "need titanium glass or mineral!") return balloon_alert(user, "adding plating...") +<<<<<<< HEAD if (do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if (do_after(user, 4 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return var/obj/structure/tram/tram_wall tram_wall = new tram_wall_type(loc) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sheets.use(amount) transfer_fingerprints_to(tram_wall) qdel(src) @@ -253,12 +315,19 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "concealing entrance...") +<<<<<<< HEAD if(do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if(do_after(user, 2 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/obj/structure/falsewall/falsewall +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(falsewall_type) falsewall = new falsewall_type (loc) else @@ -276,12 +345,19 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding plating...") +<<<<<<< HEAD if (do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT +======= + if (do_after(user, 4 SECONDS, target = src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/turf/T = get_turf(src) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.walltype) T.place_on_top(sheets.walltype) else diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm index 4f4972d4864..49a6c95604b 100644 --- a/code/game/objects/structures/guncase.dm +++ b/code/game/objects/structures/guncase.dm @@ -104,7 +104,11 @@ return FALSE if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/structures/janitor.dm b/code/game/objects/structures/janitor.dm index 0413bcac539..1c981e56954 100644 --- a/code/game/objects/structures/janitor.dm +++ b/code/game/objects/structures/janitor.dm @@ -337,7 +337,11 @@ * * user The mob interacting with a menu */ /obj/structure/mop_bucket/janitorialcart/proc/check_menu(mob/living/user) +<<<<<<< HEAD return istype(user) && !user.incapacitated() +======= + return istype(user) && !user.incapacitated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/mop_bucket/janitorialcart/update_overlays() . = ..() diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index c13e8f7e4ae..f739a67bb5d 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -12,6 +12,60 @@ /obj/structure/kitchenspike_frame/Initialize(mapload) . = ..() register_context() +<<<<<<< HEAD +======= + +/obj/structure/kitchenspike_frame/examine(mob/user) + . = ..() + . += "It can be welded apart." + . += "You could attach [MEATSPIKE_IRONROD_REQUIREMENT] iron rods to it to create a Meat Spike." + +/obj/structure/kitchenspike_frame/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + if(isnull(held_item)) + return NONE + + var/message = "" + if(held_item.tool_behaviour == TOOL_WELDER) + message = "Deconstruct" + else if(held_item.tool_behaviour == TOOL_WRENCH) + message = "Bolt Down Frame" + + if(!message) + return NONE + context[SCREENTIP_CONTEXT_LMB] = message + return CONTEXTUAL_SCREENTIP_SET + +/obj/structure/kitchenspike_frame/welder_act(mob/living/user, obj/item/tool) + if(!tool.tool_start_check(user, amount = 0)) + return FALSE + to_chat(user, span_notice("You begin cutting \the [src] apart...")) + if(!tool.use_tool(src, user, 5 SECONDS, volume = 50)) + return TRUE + visible_message(span_notice("[user] slices apart \the [src]."), + span_notice("You cut \the [src] apart with \the [tool]."), + span_hear("You hear welding.")) + new /obj/item/stack/sheet/iron(loc, MEATSPIKE_IRONROD_REQUIREMENT) + qdel(src) + return TRUE + +/obj/structure/kitchenspike_frame/wrench_act(mob/living/user, obj/item/tool) + default_unfasten_wrench(user, tool) + return TRUE + +/obj/structure/kitchenspike_frame/attackby(obj/item/attacking_item, mob/user, params) + add_fingerprint(user) + if(!istype(attacking_item, /obj/item/stack/rods)) + return ..() + var/obj/item/stack/rods/used_rods = attacking_item + if(used_rods.get_amount() >= MEATSPIKE_IRONROD_REQUIREMENT) + used_rods.use(MEATSPIKE_IRONROD_REQUIREMENT) + balloon_alert(user, "meatspike built") + var/obj/structure/new_meatspike = new /obj/structure/kitchenspike(loc) + transfer_fingerprints_to(new_meatspike) + qdel(src) + return + balloon_alert(user, "[MEATSPIKE_IRONROD_REQUIREMENT] rods needed!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/kitchenspike_frame/examine(mob/user) . = ..() diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 314539aa2b4..b3ab6b62af4 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -182,7 +182,11 @@ INVOKE_ASYNC(src, PROC_REF(start_travelling), user, going_up) /obj/structure/ladder/proc/check_menu(mob/user, is_ghost) +<<<<<<< HEAD if(user.incapacitated() || (!user.Adjacent(src))) +======= + if(user.incapacitated || (!user.Adjacent(src))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm index 375d5269918..8d6446b271f 100644 --- a/code/game/objects/structures/maintenance.dm +++ b/code/game/objects/structures/maintenance.dm @@ -226,7 +226,11 @@ at the cost of risking a vicious bite.**/ /obj/structure/destructible/cult/pants_altar/proc/check_menu(mob/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/structures/mannequin.dm b/code/game/objects/structures/mannequin.dm index c5296883763..41e25d61034 100644 --- a/code/game/objects/structures/mannequin.dm +++ b/code/game/objects/structures/mannequin.dm @@ -98,6 +98,7 @@ var/datum/sprite_accessory/underwear/underwear = SSaccessories.underwear_list[underwear_name] if(underwear) if(body_type == FEMALE && underwear.gender == MALE) +<<<<<<< HEAD . += wear_female_version(underwear.icon_state, underwear.icon, BODY_LAYER, FEMALE_UNIFORM_FULL) else . += mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER) @@ -116,6 +117,20 @@ . += mutable_appearance(bra.icon, bra.icon_state, -BODY_LAYER) //SKYRAT EDIT END +======= + . += mutable_appearance(wear_female_version(underwear.icon_state, underwear.icon, FEMALE_UNIFORM_FULL), layer = -BODY_LAYER) + else + . += mutable_appearance(underwear.icon, underwear.icon_state, layer = -BODY_LAYER) + var/datum/sprite_accessory/undershirt/undershirt = SSaccessories.undershirt_list[undershirt_name] + if(undershirt) + if(body_type == FEMALE) + . += mutable_appearance(wear_female_version(undershirt.icon_state, undershirt.icon), layer = -BODY_LAYER) + else + . += mutable_appearance(undershirt.icon, undershirt.icon_state, layer = -BODY_LAYER) + var/datum/sprite_accessory/socks/socks = SSaccessories.socks_list[socks_name] + if(socks) + . += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/slot_flag in worn_items) var/obj/item/worn_item = worn_items[slot_flag] if(!worn_item) @@ -169,7 +184,11 @@ . = ..() if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return +<<<<<<< HEAD var/choice = tgui_input_list(user, "Underwear, Bra, Undershirt, or Socks?", "Changing", list("Underwear", "Bra", "Undershirt","Socks")) //SKYRAT EDIT ADDITION - Underwear and Bra split +======= + var/choice = tgui_input_list(user, "Underwear, Undershirt, or Socks?", "Changing", list("Underwear","Undershirt","Socks")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!Adjacent(user)) return switch(choice) @@ -185,12 +204,15 @@ var/new_socks = tgui_input_list(user, "Select the mannequin's socks", "Changing", SSaccessories.socks_list) if(new_socks) socks_name = new_socks +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - Underwear and Bra split if("Bra") var/new_bra = tgui_input_list(user, "Select the mannequin's bra", "Changing", SSaccessories.bra_list) if(new_bra) bra_name = new_bra //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_appearance() /obj/structure/mannequin/wood diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 5fae9be3e88..b682e8f45b3 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -79,7 +79,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) /obj/structure/mirror/attack_hand(mob/living/carbon/human/user) . = ..() +<<<<<<< HEAD if(. || !ishuman(user) || broken || !istype(src, /obj/structure/mirror/magic)) // SKYRAT EDIT CHANGE - MUNDANE MIRRORS DON'T LET YOU CHANGE - ORIGINAL: if(. || !ishuman(user) || broken) +======= + if(. || !ishuman(user) || broken) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(!istype(src, /obj/structure/mirror/magic) && !user.can_perform_action(src, FORBID_TELEKINESIS_REACH)) @@ -354,7 +358,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) user.set_facial_haircolor(sanitize_hexcolor(new_face_color), update = FALSE) user.dna.update_ui_block(DNA_FACIAL_HAIR_COLOR_BLOCK) user.update_body_parts() +<<<<<<< HEAD user.update_mutant_bodyparts() /// SKYRAT EDIT ADDITION - Mirrors are no longer scared of colored ears +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/mirror/magic/attack_hand(mob/living/carbon/human/user) . = ..() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 27997d3059c..ddafc93e549 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -31,7 +31,11 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants and other ghosties. /obj/structure/bodycontainer +<<<<<<< HEAD icon = 'icons/obj/structures.dmi'//ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/structures.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "morgue1" density = TRUE anchored = TRUE @@ -486,10 +490,13 @@ GLOBAL_LIST_EMPTY(crematoriums) qdel(M) for(var/obj/O in conts) //conts defined above, ignores crematorium and tray +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(istype(O, /obj/item/goldeneye_key)) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(istype(O, /obj/effect/dummy/phased_mob)) //they're not physical, don't burn em. continue qdel(O) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 841da899725..477b690c8af 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -66,7 +66,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32) data["items"] += list(content_data) return data +<<<<<<< HEAD /obj/structure/noticeboard/ui_act(action, params) +======= +/obj/structure/noticeboard/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index d1c70dd188a..65ffa10d1c1 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -2,7 +2,11 @@ name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps. Definitely can't get past those. No way." gender = PLURAL +<<<<<<< HEAD icon = 'icons/obj/structures.dmi'//ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/structures.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "plasticflaps" armor_type = /datum/armor/structure_plasticflaps density = FALSE diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index b23641a416a..028b659d017 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -24,18 +24,42 @@ laser = 50 energy = 100 bomb = 10 +<<<<<<< HEAD +======= + +/obj/structure/railing/unbreakable + resistance_flags = INDESTRUCTIBLE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch icon_state = "railing_corner" density = FALSE climbable = FALSE +<<<<<<< HEAD /obj/structure/railing/corner/end //end of a segment of railing without making a loop icon_state = "railing_end" /obj/structure/railing/corner/end/flip //same as above but flipped around icon_state = "railing_end_flip" +======= +/obj/structure/railing/corner/unbreakable + resistance_flags = INDESTRUCTIBLE + +/obj/structure/railing/corner/end //end of a segment of railing without making a loop + icon_state = "railing_end" + +/obj/structure/railing/corner/end/unbreakable + resistance_flags = INDESTRUCTIBLE + +/obj/structure/railing/corner/end/flip //same as above but flipped around + icon_state = "railing_end_flip" + +/obj/structure/railing/corner/end/flip/unbreakable + resistance_flags = INDESTRUCTIBLE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/railing/Initialize(mapload) . = ..() if(climbable) diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index e27f5fcf42b..12b6cf134b8 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -311,7 +311,11 @@ return data +<<<<<<< HEAD /obj/structure/reflector/ui_act(action, params) +======= +/obj/structure/reflector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index bcc9d138695..b5a2527b6c9 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -129,7 +129,11 @@ FLOOR SAFES return data +<<<<<<< HEAD /obj/structure/safe/ui_act(action, params) +======= +/obj/structure/safe/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index 14ac0526394..6d18c5d58c3 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -52,7 +52,10 @@ /obj/structure/showcase/machinery/oldpod/used/psyker name = "opened mental energizer" desc = "A mental energizer that has recently discharged its occupant. The pod appears non-functional." +<<<<<<< HEAD icon = 'icons/obj/machines/sleeper.dmi' +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "psykerpod-open" /obj/structure/showcase/cyborg/old diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 67fe92951d0..b2889a29469 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -120,6 +120,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) return TRUE +<<<<<<< HEAD //SKYRAT EDIT ADDITION /obj/machinery/shower/plunger_act(obj/item/plunger/P, mob/living/user, reinforced) if(do_after(user, 3 SECONDS, src)) @@ -127,6 +128,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) balloon_alert(user, "reservoir emptied") //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/shower/analyzer_act(mob/living/user, obj/item/tool) . = ..() @@ -194,10 +197,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) I.play_tool_sound(src) deconstruct() return TRUE +<<<<<<< HEAD /obj/machinery/shower/setDir(newdir) . = ..() update_appearance(UPDATE_OVERLAYS) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/shower/update_overlays() . = ..() @@ -206,6 +212,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) var/mutable_appearance/water_falling = mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER) water_falling.color = mix_color_from_reagents(reagents.reagent_list) switch(dir) +<<<<<<< HEAD if(SOUTH) water_falling.pixel_z -= 24 @@ -214,6 +221,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) if(WEST) water_falling.pixel_w -= 16 +======= + if(NORTH) + water_falling.pixel_y += pixel_shift + if(SOUTH) + water_falling.pixel_y -= pixel_shift + if(EAST) + water_falling.pixel_x += pixel_shift + if(WEST) + water_falling.pixel_x -= pixel_shift +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += water_falling /obj/machinery/shower/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index f813e355c7e..3a2b7324854 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -480,7 +480,11 @@ check_break(M) /obj/structure/table/glass/proc/check_break(mob/living/M) +<<<<<<< HEAD if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) && (!isteshari(M))) //SKYRAT EDIT ADDITION - Allows Teshari to climb on glassies safely. +======= + if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 table_shatter(M) /obj/structure/table/glass/proc/table_shatter(mob/living/victim) @@ -794,6 +798,7 @@ pushed_mob.set_resting(TRUE, TRUE) visible_message(span_notice("[user] lays [pushed_mob] on [src].")) +<<<<<<< HEAD /// Any mob that enters our tile will be marked as a potential patient. They will be turned into a patient if they lie down. /obj/structure/table/optable/proc/mark_patient(datum/source, mob/living/carbon/potential_patient) SIGNAL_HANDLER @@ -802,6 +807,26 @@ RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(recheck_patient)) recheck_patient(potential_patient) // In case the mob is already lying down before they entered. +======= +///Align the mob with the table when buckled. +/obj/structure/table/optable/post_buckle_mob(mob/living/buckled) + . = ..() + buckled.pixel_y += 6 + +///Disalign the mob with the table when unbuckled. +/obj/structure/table/optable/post_unbuckle_mob(mob/living/buckled) + . = ..() + buckled.pixel_y -= 6 + +/// Any mob that enters our tile will be marked as a potential patient. They will be turned into a patient if they lie down. +/obj/structure/table/optable/proc/mark_patient(datum/source, mob/living/carbon/potential_patient) + SIGNAL_HANDLER + if(!istype(potential_patient)) + return + RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(recheck_patient)) + recheck_patient(potential_patient) // In case the mob is already lying down before they entered. + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Unmark the potential patient. /obj/structure/table/optable/proc/unmark_patient(datum/source, mob/living/carbon/potential_patient) SIGNAL_HANDLER @@ -821,12 +846,17 @@ if(potential_patient.body_position == LYING_DOWN && potential_patient.loc == loc) patient = potential_patient +<<<<<<< HEAD chill_out(patient) // SKYRAT EDIT - Operation Table Numbing return if(!isnull(patient)) // SKYRAT EDIT - Operation Table Numbing thaw_them(patient) // SKYRAT EDIT - Operation Table Numbing +======= + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Find another lying mob as a replacement. for (var/mob/living/carbon/replacement_patient in loc.contents) if(replacement_patient.body_position == LYING_DOWN) diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index bed4c4805cc..e08e9a251d7 100644 --- a/code/game/objects/structures/training_machine.dm +++ b/code/game/objects/structures/training_machine.dm @@ -79,7 +79,11 @@ * * Will not respond if moving and emagged, so once you set it to go it can't be stopped! */ +<<<<<<< HEAD /obj/structure/training_machine/ui_act(action, params) +======= +/obj/structure/training_machine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index f88aadc0463..bbd5a0cd308 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -69,7 +69,11 @@ deconstruct(FALSE) /obj/structure/transit_tube_pod/container_resist_act(mob/living/user) +<<<<<<< HEAD if(!user.incapacitated()) +======= + if(!user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 empty_pod() return if(!moving) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 04428bb617f..60bb9f3aec5 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -108,7 +108,11 @@ /obj/structure/window/singularity_pull(S, current_size) ..() +<<<<<<< HEAD if(anchored && current_size >= STAGE_FIVE) //SKYRAT EDIT CHANGE +======= + if(anchored && current_size >= STAGE_TWO) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_anchored(FALSE) if(current_size >= STAGE_FIVE) deconstruct(FALSE) @@ -450,6 +454,10 @@ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), loc), time_to_go + time_to_return) //we back boys addtimer(VARSET_CALLBACK(src, dramatically_disappearing, FALSE), time_to_go + time_to_return) //also set the var back addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_to_go + time_to_return) +<<<<<<< HEAD +======= + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(src), 'sound/effects/glass_reverse.ogg', 70, TRUE), time_to_go + time_to_return) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/structure/grille/grill = take_grill ? (locate(/obj/structure/grille) in loc) : null if(grill) @@ -490,7 +498,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/unanchored/spawner, 0) //2022 BABYYYYY ~lewc //2023 ONE YEAR TO GO! -LT3 /datum/armor/window_reinforced +<<<<<<< HEAD melee = 50 +======= + melee = 80 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bomb = 25 fire = 80 acid = 100 @@ -684,7 +696,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/fulltile name = "full tile window" desc = "A full tile window." +<<<<<<< HEAD icon = 'icons/obj/smooth_structures/window.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/smooth_structures/window.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "window-0" base_icon_state = "window" max_integrity = 100 @@ -705,7 +721,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw anchored = FALSE /obj/structure/window/plasma/fulltile +<<<<<<< HEAD icon = 'icons/obj/smooth_structures/plasma_window.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/smooth_structures/plasma_window.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "plasma_window-0" base_icon_state = "plasma_window" max_integrity = 400 @@ -721,7 +741,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw anchored = FALSE /obj/structure/window/reinforced/plasma/fulltile +<<<<<<< HEAD icon = 'icons/obj/smooth_structures/rplasma_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/smooth_structures/rplasma_window.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "rplasma_window-0" base_icon_state = "rplasma_window" state = RWINDOW_SECURE @@ -741,7 +765,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/reinforced/fulltile name = "full tile reinforced window" desc = "A full tile window that is reinforced with metal rods." +<<<<<<< HEAD icon = 'icons/obj/smooth_structures/reinforced_window.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/smooth_structures/reinforced_window.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "reinforced_window-0" base_icon_state = "reinforced_window" max_integrity = 150 @@ -764,7 +792,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw state = WINDOW_OUT_OF_FRAME /obj/structure/window/reinforced/tinted/fulltile +<<<<<<< HEAD icon = 'icons/obj/smooth_structures/tinted_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/smooth_structures/tinted_window.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "tinted_window-0" base_icon_state = "tinted_window" fulltile = TRUE diff --git a/code/game/say.dm b/code/game/say.dm index ee54ef4a8f7..c94a1db85a1 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -12,6 +12,7 @@ GLOBAL_LIST_INIT(freqtospan, list( "[FREQ_SECURITY]" = "secradio", "[FREQ_COMMAND]" = "comradio", "[FREQ_AI_PRIVATE]" = "aiprivradio", + "[FREQ_ENTERTAINMENT]" = "enteradio", "[FREQ_SYNDICATE]" = "syndradio", "[FREQ_UPLINK]" = "syndradio", // this probably shouldnt appear ingame "[FREQ_CENTCOM]" = "centcomradio", diff --git a/code/game/sound.dm b/code/game/sound.dm index 7ce288c9db8..01371ce1030 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -170,8 +170,13 @@ sound_to_use.environment = A.sound_environment if(use_reverb && sound_to_use.environment != SOUND_ENVIRONMENT_NONE) //We have reverb, reset our echo setting +<<<<<<< HEAD sound_to_use.echo[3] = -1300 //Room setting, 0 means normal reverb //SKYRAT EDIT CHANGE sound_to_use.echo[4] = -1300 //RoomHF setting, 0 means normal reverb. //SKYRAT EDIT CHANGE +======= + sound_to_use.echo[3] = 0 //Room setting, 0 means normal reverb + sound_to_use.echo[4] = 0 //RoomHF setting, 0 means normal reverb. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SOUND(src, sound_to_use) @@ -203,7 +208,10 @@ ///Used to convert a SFX define into a .ogg so we can add some variance to sounds. If soundin is already a .ogg, we simply return it /proc/get_sfx(soundin) +<<<<<<< HEAD soundin = get_sfx_skyrat(soundin) // SKYRAT EDIT ADDITION - This overrides the default sound effects too, so use it to modularly change a sound effect output. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!istext(soundin)) return soundin switch(soundin) @@ -496,4 +504,28 @@ 'sound/items/stones/stone_pick_up1.ogg', 'sound/items/stones/stone_pick_up2.ogg', ) +<<<<<<< HEAD +======= + if(SFX_MUFFLED_SPEECH) + soundin = pick( + 'sound/effects/muffspeech/muffspeech1.ogg', + 'sound/effects/muffspeech/muffspeech2.ogg', + 'sound/effects/muffspeech/muffspeech3.ogg', + 'sound/effects/muffspeech/muffspeech4.ogg', + 'sound/effects/muffspeech/muffspeech5.ogg', + 'sound/effects/muffspeech/muffspeech6.ogg', + 'sound/effects/muffspeech/muffspeech7.ogg', + 'sound/effects/muffspeech/muffspeech8.ogg', + 'sound/effects/muffspeech/muffspeech9.ogg', + ) + if(SFX_DEFAULT_FISH_SLAP) + soundin = 'sound/creatures/fish/fish_slap1.ogg' + if(SFX_ALT_FISH_SLAP) + soundin = 'sound/creatures/fish/fish_slap2.ogg' + if(SFX_FISH_PICKUP) + soundin = pick( + 'sound/creatures/fish/fish_pickup1.ogg', + 'sound/creatures/fish/fish_pickup2.ogg', + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return soundin diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index a1f64556153..6433c15bbc0 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -76,11 +76,14 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( var/old_lighting_corner_NW = lighting_corner_NW var/old_directional_opacity = directional_opacity var/old_dynamic_lumcount = dynamic_lumcount +<<<<<<< HEAD //SKYRAT EDIT CHANGE var/obj/effect/abstract/liquid_turf/old_liquids = liquids if(lgroup) lgroup.remove_from_group(src) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/old_rcd_memory = rcd_memory var/old_explosion_throw_details = explosion_throw_details var/old_opacity = opacity @@ -156,6 +159,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( directional_opacity = old_directional_opacity recalculate_directional_opacity() +<<<<<<< HEAD if(lighting_object && !lighting_object.needs_update) lighting_object.update() @@ -210,6 +214,38 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if(old_opacity != opacity && SSticker) GLOB.cameranet.bareMajorChunkChange(src) +======= + + if(lighting_object && !lighting_object.needs_update) + lighting_object.update() + + // If we're space, then we're either lit, or not, and impacting our neighbors, or not + if(isspaceturf(src)) + var/turf/open/space/lit_turf = src + // This also counts as a removal, so we need to do a full rebuild + if(!ispath(old_type, /turf/open/space)) + lit_turf.update_starlight() + for(var/turf/open/space/space_tile in RANGE_TURFS(1, src) - src) + space_tile.update_starlight() + else if(old_light_range) + lit_turf.enable_starlight() + + // If we're a cordon we count against a light, but also don't produce any ourselves + else if (istype(src, /turf/cordon)) + // This counts as removing a source of starlight, so we need to update the space tile to inform it + if(!ispath(old_type, /turf/open/space)) + for(var/turf/open/space/space_tile in RANGE_TURFS(1, src)) + space_tile.update_starlight() + + // If we're not either, but were formerly a space turf, then we want light + else if(ispath(old_type, /turf/open/space)) + for(var/turf/open/space/space_tile in RANGE_TURFS(1, src)) + space_tile.enable_starlight() + + if(old_opacity != opacity && SSticker) + GLOB.cameranet.bareMajorChunkChange(src) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // We will only run this logic if the tile is not on the prime z layer, since we use area overlays to cover that if(SSmapping.z_level_to_plane_offset[z]) var/area/our_area = new_turf.loc @@ -228,17 +264,23 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( var/datum/gas_mixture/stashed_air = new() stashed_air.copy_from(air) var/stashed_state = excited +<<<<<<< HEAD var/datum/pollution/stashed_pollution = pollution //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/excited_group/stashed_group = excited_group . = ..() //If path == type this will return us, don't bank on making a new type if (!.) // changeturf failed or didn't do anything return var/turf/open/new_turf = . +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(stashed_pollution) new_turf.pollution = stashed_pollution stashed_pollution.handle_overlay() //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_turf.air.copy_from(stashed_air) new_turf.excited = stashed_state new_turf.excited_group = stashed_group @@ -250,10 +292,13 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if(stashed_group.should_display || SSair.display_all_groups) stashed_group.display_turf(new_turf) else +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(pollution) qdel(pollution) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(excited || excited_group) SSair.remove_from_active(src) //Clean up wall excitement, and refresh excited groups if(ispath(path, /turf/closed) || ispath(path, /turf/cordon)) diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm index 470177ee397..bc2bb5547c3 100644 --- a/code/game/turfs/closed/indestructible.dm +++ b/code/game/turfs/closed/indestructible.dm @@ -66,12 +66,20 @@ baseturfs = /turf/cordon icon = 'icons/blanks/blank_title.png' icon_state = "" +<<<<<<< HEAD pixel_x = 0 // SKYRAT EDIT - Re-centering the title screen - ORIGINAL: pixel_x = -64 +======= + pixel_x = -64 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 plane = SPLASHSCREEN_PLANE bullet_bounce_sound = null INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/indestructible/splashscreen/Initialize(mapload) . = ..() SStitle.splash_turf = src @@ -87,10 +95,13 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) pixel_x = 0 else if(width == 608) // 608x480 is widescreen pixel_x = -64 +<<<<<<< HEAD // SKYRAT EDIT START - Wider widescreen else if(width == 672) // Skyrat's widescreen is slightly wider than /tg/'s, so we need to accomodate that too. pixel_x = -96 // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/indestructible/splashscreen/vv_edit_var(var_name, var_value) . = ..() @@ -103,7 +114,10 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/splashscreen/examine() desc = pick(strings(SPLASH_FILE, "splashes")) return ..() +<<<<<<< HEAD SKYRAT EDIT REMOVAL END */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/indestructible/reinforced name = "reinforced wall" diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 11125a9de0c..c678c52fa0b 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -4,7 +4,11 @@ /turf/closed/mineral //wall piece name = "rock" +<<<<<<< HEAD icon = MAP_SWITCH('modular_skyrat/modules/liquids/icons/turf/smoothrocks.dmi', 'icons/turf/mining.dmi') // SKYRAT EDIT CHANGE +======= + icon = MAP_SWITCH('icons/turf/smoothrocks.dmi', 'icons/turf/mining.dmi') +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "rock" smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_MINERAL_WALLS canSmoothWith = SMOOTH_GROUP_MINERAL_WALLS @@ -25,8 +29,11 @@ transform = MAP_SWITCH(TRANSLATE_MATRIX(-4, -4), matrix()) temperature = TCMB +<<<<<<< HEAD color = "#677" //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/turf/open/floor/plating/turf_type = /turf/open/misc/asteroid/airless /// The path of the ore stack we spawn when we're mined. var/obj/item/stack/ore/mineralType = null @@ -312,13 +319,19 @@ var/path = pick(spawn_chance_list) if(ispath(path, /turf)) var/stored_flags = 0 +<<<<<<< HEAD var/stored_color = color //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(turf_flags & NO_RUINS) stored_flags |= NO_RUINS var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR) T.flags_1 |= stored_flags +<<<<<<< HEAD T.color = stored_color //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ismineralturf(T)) var/turf/closed/mineral/M = T M.turf_type = src.turf_type @@ -408,7 +421,11 @@ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE +<<<<<<< HEAD proximity_based = FALSE //SKYRAT EDIT: Original TRUE +======= + proximity_based = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mineralChance = 5 /turf/closed/mineral/random/volcanic/mineral_chances() @@ -436,7 +453,11 @@ baseturfs = /turf/open/misc/asteroid/snow/icemoon initial_gas_mix = ICEMOON_DEFAULT_ATMOS weak_turf = TRUE +<<<<<<< HEAD proximity_based = FALSE //SKYRAT EDIT: Original TRUE +======= + proximity_based = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/mineral/random/snow/Change_Ore(ore_type, random = 0) . = ..() diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm index be4b6ca7ad2..87299d4eacc 100644 --- a/code/game/turfs/closed/wall/misc_walls.dm +++ b/code/game/turfs/closed/wall/misc_walls.dm @@ -50,6 +50,16 @@ /turf/closed/wall/rust/Initialize(mapload) . = ..() AddElement(/datum/element/rust) +<<<<<<< HEAD +======= + +/turf/closed/wall/heretic_rust + color = MAP_SWITCH(null, COLOR_GREEN_GRAY) + +/turf/closed/wall/heretic_rust/Initialize(mapload) + . = ..() + AddElement(/datum/element/rust/heretic) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/wall/r_wall/rust //SDMM supports colors, this is simply for easier mapping @@ -60,6 +70,16 @@ /turf/closed/wall/r_wall/rust/Initialize(mapload) . = ..() AddElement(/datum/element/rust) +<<<<<<< HEAD +======= + +/turf/closed/wall/r_wall/heretic_rust + color = MAP_SWITCH(null, COLOR_GREEN_GRAY) + +/turf/closed/wall/r_wall/heretic_rust/Initialize(mapload) + . = ..() + AddElement(/datum/element/rust/heretic) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/wall/mineral/bronze name = "clockwork wall" diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index 06bc0ebe02b..2722bb39266 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -1,7 +1,11 @@ /turf/closed/wall/r_wall name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." +<<<<<<< HEAD icon = 'icons/turf/walls/reinforced_wall.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/turf/walls/reinforced_wall.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "reinforced_wall-0" base_icon_state = "reinforced_wall" opacity = TRUE @@ -202,10 +206,17 @@ // We don't react to smoothing changing here because this else exists only to "revert" intact changes /turf/closed/wall/r_wall/update_icon_state() if(d_state != INTACT) +<<<<<<< HEAD icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' // SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/turf/walls/reinforced_states.dmi' icon_state = "[base_decon_state]-[d_state]" else icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' // SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/turf/walls/reinforced_wall.dmi' +======= + icon = 'icons/turf/walls/reinforced_states.dmi' + icon_state = "[base_decon_state]-[d_state]" + else + icon = 'icons/turf/walls/reinforced_wall.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "[base_icon_state]-[smoothing_junction]" return ..() diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 0ff9e3c76d4..886bd4c111d 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -2,7 +2,11 @@ /turf/closed/wall name = "wall" +<<<<<<< HEAD desc = "A huge chunk of iron used to separate rooms." //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + desc = "A huge chunk of iron used to separate rooms." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/turf/walls/wall.dmi' icon_state = "wall-0" base_icon_state = "wall" @@ -40,7 +44,11 @@ if(!iscarbon(dropping) && !iscyborg(dropping)) return var/mob/living/leaner = dropping +<<<<<<< HEAD if(leaner.incapacitated(IGNORE_RESTRAINTS) || leaner.stat != CONSCIOUS || HAS_TRAIT(leaner, TRAIT_NO_TRANSFORM)) +======= + if(INCAPACITATED_IGNORING(leaner, INCAPABLE_RESTRAINTS) || leaner.stat != CONSCIOUS || HAS_TRAIT(leaner, TRAIT_NO_TRANSFORM)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!leaner.density || leaner.pulledby || leaner.buckled || !(leaner.mobility_flags & MOBILITY_STAND)) return diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 777adb9bb2c..a61b493b88d 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -359,6 +359,7 @@ // Stops sliding slide_distance = 0 +<<<<<<< HEAD // SKYRAT EDIT START - Akula species if(HAS_TRAIT(slipper, TRAIT_SLIPPERY)) if(!(lube & SLIDE_ICE)) @@ -389,6 +390,30 @@ for(var/obj/item/item in slipper.held_items) slipper.accident(item) +======= + var/obj/buckled_obj + if(slipper.buckled) + if(!(lube & GALOSHES_DONT_HELP)) //can't slip while buckled unless it's lube. + return FALSE + buckled_obj = slipper.buckled + else + if(!(lube & SLIP_WHEN_CRAWLING) && (slipper.body_position == LYING_DOWN || !(slipper.status_flags & CANKNOCKDOWN))) // can't slip unbuckled mob if they're lying or can't fall. + return FALSE + if(slipper.move_intent == MOVE_INTENT_WALK && (lube & NO_SLIP_WHEN_WALKING)) + return FALSE + + if(!(lube & SLIDE_ICE)) + // Ice slides are intended to be combo'd so don't give the feedback + to_chat(slipper, span_notice("You slipped[ slippable ? " on the [slippable.name]" : ""]!")) + playsound(slipper.loc, 'sound/misc/slip.ogg', 50, TRUE, -3) + + SEND_SIGNAL(slipper, COMSIG_ON_CARBON_SLIP) + slipper.add_mood_event("slipped", /datum/mood_event/slipped) + if(force_drop) + for(var/obj/item/item in slipper.held_items) + slipper.accident(item) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/olddir = slipper.dir slipper.moving_diagonally = 0 //If this was part of diagonal move slipping will stop it. if(lube & SLIDE_ICE) @@ -423,10 +448,14 @@ /turf/open/get_dumping_location() return src -/turf/open/proc/ClearWet()//Nuclear option of immediately removing slipperyness from the tile instead of the natural drying over time +/turf/open/proc/ClearWet()//Nuclear option of immediately removing slipperiness from the tile instead of the natural drying over time qdel(GetComponent(/datum/component/wet_floor)) +<<<<<<< HEAD /// Builds with rods. This doesn't exist to be overriden, just to remove duplicate logic for turfs that want +======= +/// Builds with rods. This doesn't exist to be overridden, just to remove duplicate logic for turfs that want +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// To support floor tile creation /// I'd make it a component, but one of these things is space. So no. /turf/open/proc/build_with_rods(obj/item/stack/rods/used_rods, mob/user) diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 3bf80bc89d4..aac926a8669 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -1,7 +1,11 @@ /// Anything above a lattice should go here. /turf/open/floor name = "floor" +<<<<<<< HEAD icon = 'icons/turf/floors.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/turf/floors.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 base_icon_state = "floor" baseturfs = /turf/open/floor/plating diff --git a/code/game/turfs/open/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm index dd30a86d8de..793e4ce8e55 100644 --- a/code/game/turfs/open/floor/light_floor.dm +++ b/code/game/turfs/open/floor/light_floor.dm @@ -184,7 +184,7 @@ /turf/open/floor/light/proc/check_menu(mob/living/user, obj/item/multitool) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE if(!multitool || !user.is_holding(multitool)) return FALSE diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index d43e4b5e92f..9688d0504df 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -257,6 +257,17 @@ AddElement(/datum/element/rust) color = null +<<<<<<< HEAD +======= +/turf/open/floor/plating/heretic_rust + color = COLOR_GREEN_GRAY + +/turf/open/floor/plating/heretic_rust/Initialize(mapload) + . = ..() + AddElement(/datum/element/rust/heretic) + color = null + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating/plasma initial_gas_mix = ATMOS_TANK_PLASMA diff --git a/code/game/turfs/open/ice.dm b/code/game/turfs/open/ice.dm index 481dcb6b847..ddd78ac6389 100644 --- a/code/game/turfs/open/ice.dm +++ b/code/game/turfs/open/ice.dm @@ -15,10 +15,27 @@ clawfootstep = FOOTSTEP_HARD_CLAW heavyfootstep = FOOTSTEP_GENERIC_HEAVY rust_resistance = RUST_RESISTANCE_ORGANIC +<<<<<<< HEAD +======= + var/can_make_hole = TRUE + var/static/list/tool_screentips = list( + TOOL_SHOVEL = list( + SCREENTIP_CONTEXT_LMB = "Dig fishing hole", + ), + TOOL_MINING = list( + SCREENTIP_CONTEXT_LMB = "Dig fishing hole", + ), + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/Initialize(mapload) . = ..() MakeSlippery(TURF_WET_PERMAFROST, INFINITY, 0, INFINITY, TRUE, FALSE) +<<<<<<< HEAD +======= + if(can_make_hole) + AddElement(/datum/element/contextual_screentip_tools, tool_screentips) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/break_tile() return @@ -26,6 +43,31 @@ /turf/open/misc/ice/burn_tile() return +<<<<<<< HEAD +======= +/turf/open/misc/ice/examine(mob/user) + . = ..() + if(can_make_hole) + . += span_info("You could use a [EXAMINE_HINT("shovel")] or a [EXAMINE_HINT("pick")] to dig a fishing hole here.") + +/turf/open/misc/ice/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!can_make_hole) + return NONE + if(tool.tool_behaviour != TOOL_SHOVEL && tool.tool_behaviour != TOOL_MINING) + return NONE + balloon_alert(user, "digging...") + playsound(src, 'sound/effects/shovel_dig.ogg', 50, TRUE) + if(!do_after(user, 5 SECONDS, src)) + return NONE + balloon_alert(user, "dug hole") + AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/ice_fishing]) + add_overlay(mutable_appearance('icons/turf/overlays.dmi', "ice_hole")) + can_make_hole = FALSE + RemoveElement(/datum/element/contextual_screentip_tools, tool_screentips) + flags_1 &= ~HAS_CONTEXTUAL_SCREENTIPS_1 + return ITEM_INTERACT_SUCCESS + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/smooth icon_state = "ice_turf-255" base_icon_state = "ice_turf" @@ -40,11 +82,19 @@ /turf/open/misc/ice/icemoon/no_planet_atmos planetary_atmos = FALSE +<<<<<<< HEAD +======= + can_make_hole = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/temperate baseturfs = /turf/open/misc/ice/temperate desc = "Somehow, it is not melting under these conditions. Must be some very thick ice. Just as slippery too." initial_gas_mix = COLD_ATMOS //it works with /turf/open/misc/asteroid/snow/temperatre +<<<<<<< HEAD +======= + can_make_hole = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //For when you want real, genuine ice in your kitchen's cold room. /turf/open/misc/ice/coldroom diff --git a/code/game/turfs/open/misc.dm b/code/game/turfs/open/misc.dm index 02de7489786..ec8a85888a1 100644 --- a/code/game/turfs/open/misc.dm +++ b/code/game/turfs/open/misc.dm @@ -3,7 +3,11 @@ /// Please do not bloat this. Love you <3 /turf/open/misc name = "coder/mapper fucked up" +<<<<<<< HEAD desc = "report on github please" +======= + desc = "report on GitHub please" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = NO_SCREENTIPS_1 | CAN_BE_DIRTY_1 turf_flags = IS_SOLID | NO_RUST diff --git a/code/game/turfs/open/sand.dm b/code/game/turfs/open/sand.dm index c863e28231d..7baf1343e65 100644 --- a/code/game/turfs/open/sand.dm +++ b/code/game/turfs/open/sand.dm @@ -10,6 +10,13 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY rust_resistance = RUST_RESISTANCE_ORGANIC +<<<<<<< HEAD +======= +/turf/open/misc/beach/Initialize(mapload) + . = ..() + AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/sand) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/ex_act(severity, target) return FALSE @@ -37,6 +44,13 @@ clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER +<<<<<<< HEAD +======= +/turf/open/misc/beach/coast/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/coast/break_tile() . = ..() icon_state = "beach" diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 4a8244a6491..3e12312d18a 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -21,7 +21,11 @@ var/immerse_overlay_color = "#5AAA88" /// Fishing element for this specific water tile +<<<<<<< HEAD var/datum/fish_source/fishing_datum = /datum/fish_source/portal +======= + var/datum/fish_source/fishing_datum = /datum/fish_source/river +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/water/Initialize(mapload) . = ..() @@ -33,6 +37,10 @@ /turf/open/water/jungle /turf/open/water/beach +<<<<<<< HEAD +======= + planetary_atmos = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gender = PLURAL desc = "Come on in, it's great!" icon = 'icons/turf/beach.dmi' @@ -42,6 +50,13 @@ immerse_overlay_color = "#7799AA" fishing_datum = /datum/fish_source/ocean/beach +<<<<<<< HEAD +======= +/turf/open/water/beach/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/water/lavaland_atmos initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 35381db347c..343ddea5feb 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -3,6 +3,10 @@ GLOBAL_LIST_EMPTY(station_turfs) /// Any floor or wall. What makes up the station and the rest of the map. /turf icon = 'icons/turf/floors.dmi' +<<<<<<< HEAD +======= + datum_flags = DF_STATIC_OBJECT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vis_flags = VIS_INHERIT_ID // Important for interaction with and visualization of openspace. luminosity = 1 light_height = LIGHTING_HEIGHT_FLOOR @@ -608,8 +612,12 @@ GLOBAL_LIST_EMPTY(station_turfs) . = ..() if((acidpwr <= 0) || (acid_volume <= 0)) return FALSE +<<<<<<< HEAD if(QDELETED(src)) //skyrat edit: fix createanddestroy return FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddComponent(/datum/component/acid, acidpwr, acid_volume, GLOB.acid_overlay) return . || TRUE diff --git a/code/game/world.dm b/code/game/world.dm index 4b5b598d341..68bb8fc019a 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -336,6 +336,26 @@ GLOBAL_VAR(tracy_log) return ..() log_world("World rebooted at [time_stamp()]") +<<<<<<< HEAD +======= + + shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. + auxcleanup() + + TgsReboot() // TGS can decide to kill us right here, so it's important to do it last + + ..() + #endif + +/world/proc/auxcleanup() + var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") + if (debug_server) + call_ext(debug_server, "auxtools_shutdown")() + +/world/Del() + auxcleanup() + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. auxcleanup() @@ -407,7 +427,10 @@ GLOBAL_VAR(tracy_log) new_status += "[SSmapping.config ? " | " : "
"]Next: [SSmapping.next_map_config.map_path == CUSTOM_MAP_PATH ? "Uncharted Territory" : SSmapping.next_map_config.map_name]" status = new_status +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /world/proc/update_hub_visibility(new_visibility) if(new_visibility == GLOB.hub_visibility) @@ -419,7 +442,11 @@ GLOBAL_VAR(tracy_log) hub_password = "SORRYNOPASSWORD" /** +<<<<<<< HEAD * Handles incresing the world's maxx var and intializing the new turfs and assigning them to the global area. +======= + * Handles increasing the world's maxx var and initializing the new turfs and assigning them to the global area. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * If map_load_z_cutoff is passed in, it will only load turfs up to that z level, inclusive. * This is because maploading will handle the turfs it loads itself. */ @@ -446,7 +473,11 @@ GLOBAL_VAR(tracy_log) maxy = new_maxy if(!map_load_z_cutoff) return +<<<<<<< HEAD var/area/global_area = GLOB.areas_by_type[world.area] // We're guarenteed to be touching the global area, so we'll just do this +======= + var/area/global_area = GLOB.areas_by_type[world.area] // We're guaranteed to be touching the global area, so we'll just do this +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LISTASSERTLEN(global_area.turfs_by_zlevel, map_load_z_cutoff, list()) for (var/zlevel in 1 to map_load_z_cutoff) var/list/to_add = block( @@ -481,6 +512,10 @@ GLOBAL_VAR(tracy_log) /world/proc/on_tickrate_change() SStimer?.reset_buckets() +<<<<<<< HEAD +======= + DREAMLUAU_SET_EXECUTION_LIMIT_MILLIS(tick_lag * 100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /world/proc/init_byond_tracy() var/library diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index a2db78a175b..57ab2d8e2c6 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -113,7 +113,11 @@ data["dos_crashed"] = dos_failure return data +<<<<<<< HEAD /obj/machinery/ntnet_relay/ui_act(action, params) +======= +/obj/machinery/ntnet_relay/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/actionspeed/_actionspeed_modifier.dm b/code/modules/actionspeed/_actionspeed_modifier.dm index 36b9b9c860d..667ea61b580 100644 --- a/code/modules/actionspeed/_actionspeed_modifier.dm +++ b/code/modules/actionspeed/_actionspeed_modifier.dm @@ -156,7 +156,11 @@ GLOBAL_LIST_EMPTY(actionspeed_modification_cache) var/amt = M.multiplicative_slowdown if(conflict) // Conflicting modifiers prioritize the larger slowdown or the larger speedup +<<<<<<< HEAD // We purposefuly don't handle mixing speedups and slowdowns on the same id +======= + // We purposefully don't handle mixing speedups and slowdowns on the same id +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(abs(conflict_tracker[conflict]) < abs(amt)) conflict_tracker[conflict] = amt else diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 3eb5deb0c25..f7b1c15570c 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -32,7 +32,10 @@ if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey]) admin = TRUE +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - We have the panic bunker on 24/7, this just makes our method unusable. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!real_bans_only && !admin && CONFIG_GET(flag/panic_bunker) && !CONFIG_GET(flag/panic_bunker_interview)) var/datum/db_query/query_client_in_db = SSdbcore.NewQuery( "SELECT 1 FROM [format_table_name("player")] WHERE ckey = :ckey", @@ -52,7 +55,10 @@ return list("reason"="panicbunker", "desc" = "Sorry but the server is currently not accepting connections from never before seen players") qdel(query_client_in_db) +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Whitelist if(!real_bans_only && !C && CONFIG_GET(flag/usewhitelist)) @@ -117,7 +123,11 @@ This ban (BanID #[i["id"]]) was applied by [i["admin_key"]] on [i["bantime"]] during round ID [i["round_id"]]. [global_ban] [expires]"} +<<<<<<< HEAD log_suspicious_login("Failed Login: [ckey] [computer_id] [address] - Banned (#[i["id"]]) [text2num(i["global_ban"]) ? "globally" : "locally"]") //SKYRAT EDIT CHANGE - MULTISERVER +======= + log_suspicious_login("Failed Login: [ckey] [computer_id] [address] - Banned (#[i["id"]])") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return list("reason"="Banned","desc"="[desc]") if (admin) if (GLOB.directory[ckey]) diff --git a/code/modules/admin/admin_fax_panel.dm b/code/modules/admin/admin_fax_panel.dm index 8874b6f38eb..1e66592b43b 100644 --- a/code/modules/admin/admin_fax_panel.dm +++ b/code/modules/admin/admin_fax_panel.dm @@ -20,6 +20,11 @@ ADMIN_VERB(fax_panel, R_ADMIN, "Fax Panel", "View and respond to faxes sent to C /datum/fax_panel_interface/New() //Get all faxes, and save them to our list. for(var/obj/machinery/fax/fax as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax)) +<<<<<<< HEAD +======= + if(istype(fax, /obj/machinery/fax/admin)) + continue +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 available_faxes += WEAKREF(fax) //Get all stamps diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 0f7d7a3f39b..96e7bbc989f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -484,12 +484,23 @@ ADMIN_VERB(populate_world, R_DEBUG, "Populate World", "Populate the world with t testing("Spawned test mob at [get_area_name(tile, TRUE)] ([tile.x],[tile.y],[tile.z])") ADMIN_VERB(toggle_ai_interact, R_ADMIN, "Toggle Admin AI Interact", "Allows you to interact with most machines as an AI would as a ghost.", ADMIN_CATEGORY_GAME) +<<<<<<< HEAD user.AI_Interact = !user.AI_Interact if(user.mob && isAdminGhostAI(user.mob)) user.mob.has_unlimited_silicon_privilege = user.AI_Interact log_admin("[key_name(user)] has [user.AI_Interact ? "activated" : "deactivated"] Admin AI Interact") message_admins("[key_name_admin(user)] has [user.AI_Interact ? "activated" : "deactivated"] their AI interaction") +======= + var/doesnt_have_silicon_access = !HAS_TRAIT_FROM(user, TRAIT_AI_ACCESS, ADMIN_TRAIT) + if(doesnt_have_silicon_access) + ADD_TRAIT(user, TRAIT_AI_ACCESS, ADMIN_TRAIT) + else + REMOVE_TRAIT(user, TRAIT_AI_ACCESS, ADMIN_TRAIT) + + log_admin("[key_name(user)] has [doesnt_have_silicon_access ? "activated" : "deactivated"] Admin AI Interact") + message_admins("[key_name_admin(user)] has [doesnt_have_silicon_access ? "activated" : "deactivated"] their AI interaction") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADMIN_VERB(debug_statpanel, R_DEBUG, "Debug Stat Panel", "Toggles local debug of the stat panel", ADMIN_CATEGORY_DEBUG) user.stat_panel.send_message("create_debug") diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 77d1546eeb7..05f473a6dfa 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -28,10 +28,13 @@ human.dna.species.randomize_active_underwear_only(human) // Needs to be called towards the end to update all the UIs just set above human.dna.initialize_dna(newblood_type = random_blood_type(), create_mutation_blocks = randomize_mutations, randomize_features = TRUE) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION human.dna.species.mutant_bodyparts = human.dna.mutant_bodyparts.Copy() human.dna.species.body_markings = human.dna.body_markings.Copy() // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Snowflake for Ethereals human.updatehealth() human.updateappearance(mutcolor_update = TRUE) diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index 04300582160..8d780570115 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -64,7 +64,11 @@ return UI_INTERACTIVE return ..() +<<<<<<< HEAD /obj/effect/fun_balloon/sentience/ui_act(action, list/params) +======= +/obj/effect/fun_balloon/sentience/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -94,6 +98,7 @@ for(var/mob/living/possessable in range(effect_range, get_turf(src))) if (!possessable.ckey && possessable.stat == CONSCIOUS) // Only assign ghosts to living, non-occupied mobs! bodies += possessable +<<<<<<< HEAD var/list/candidates = SSpolling.poll_ghosts_for_targets( question = "Would you like to be [span_notice(group_name)]?", @@ -105,6 +110,20 @@ alert_pic = src, role_name_text = "sentience fun balloon", ) +======= + + var/list/candidates = SSpolling.poll_ghosts_for_targets( + question = "Would you like to be [span_notice(group_name)]?", + role = ROLE_SENTIENCE, + check_jobban = ROLE_SENTIENCE, + poll_time = 10 SECONDS, + checked_targets = bodies, + ignore_category = POLL_IGNORE_SHUTTLE_DENIZENS, + alert_pic = src, + role_name_text = "sentience fun balloon", + ) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 while(LAZYLEN(candidates) && LAZYLEN(bodies)) var/mob/dead/observer/C = pick_n_take(candidates) var/mob/living/body = pick_n_take(bodies) diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm index 89ad2fc8dd2..ecf264237b5 100644 --- a/code/modules/admin/greyscale_modify_menu.dm +++ b/code/modules/admin/greyscale_modify_menu.dm @@ -120,7 +120,11 @@ data["sprites"] = sprite_data return data +<<<<<<< HEAD /datum/greyscale_modify_menu/ui_act(action, params) +======= +/datum/greyscale_modify_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -305,7 +309,10 @@ This is highly likely to cause massive amounts of lag as every object in the gam CHECK_TICK var/image/layer = image(step["step"]) var/image/result = image(step["result"]) +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Bringing back the GAGS coloring menu +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 steps += list( list( "layer"=icon2html(layer, user, dir=sprite_dir, sourceonly=TRUE), @@ -313,7 +320,10 @@ This is highly likely to cause massive amounts of lag as every object in the gam "config_name"=step["config_name"] ) ) +<<<<<<< HEAD // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sprite_data["time_spent"] = TICK_DELTA_TO_MS(time_spent) sprite_data["finished"] = icon2html(finished, user, dir=sprite_dir, sourceonly=TRUE) diff --git a/code/modules/admin/skill_panel.dm b/code/modules/admin/skill_panel.dm index ec80768276d..b1ba4d10910 100644 --- a/code/modules/admin/skill_panel.dm +++ b/code/modules/admin/skill_panel.dm @@ -35,7 +35,7 @@ var/exp_percent = exp / SKILL_EXP_LIST[SKILL_LEVEL_LEGENDARY] .["skills"] += list(list("playername" = targetmind.current, "path" = type, "name" = S.name, "desc" = S.desc, "lvlnum" = lvl_num, "lvl" = lvl_name, "exp" = exp, "exp_prog" = xp_req_to_level - xp_prog_to_level, "exp_req" = xp_req_to_level, "exp_percent" = exp_percent, "max_exp" = SKILL_EXP_LIST[length(SKILL_EXP_LIST)])) -/datum/skill_panel/ui_act(action, params) +/datum/skill_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 4f1e84b4cf2..6db027fae8a 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -49,6 +49,7 @@ "player_ckey" = player_ckey, "must_apply_to_admins" = !!(GLOB.admin_datums[player_ckey] || GLOB.deadmins[player_ckey]), ) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MULTISERVER var/ssqlname = CONFIG_GET(string/serversqlname) var/server_check @@ -69,6 +70,21 @@ sql_roles = ":role" var/datum/db_query/query_check_ban = SSdbcore.NewQuery(/* SKYRAT EDIT CHANGE - MULTISERVER */{" +======= + + var/sql_roles + if(islist(roles)) + var/list/sql_roles_list = list() + for (var/i in 1 to roles.len) + values["role[i]"] = roles[i] + sql_roles_list += ":role[i]" + sql_roles = sql_roles_list.Join(", ") + else + values["role"] = roles + sql_roles = ":role" + + var/datum/db_query/query_check_ban = SSdbcore.NewQuery({" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SELECT 1 FROM [format_table_name("ban")] WHERE @@ -76,7 +92,10 @@ role IN ([sql_roles]) AND unbanned_datetime IS NULL AND (expiration_time IS NULL OR expiration_time > NOW()) +<<<<<<< HEAD AND [server_check] +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AND (NOT :must_apply_to_admins OR applies_to_admins = 1) "}, values) @@ -176,6 +195,7 @@ var/is_admin = FALSE if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey]) is_admin = TRUE +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MULTISERVER var/ssqlname = CONFIG_GET(string/serversqlname) var/server_check @@ -186,6 +206,10 @@ // SKYRAT EDIT ADDITION END - MULTISERVER var/datum/db_query/query_build_ban_cache = SSdbcore.NewQuery( "SELECT role, applies_to_admins FROM [format_table_name("ban")] WHERE ckey = :ckey AND unbanned_datetime IS NULL AND (expiration_time IS NULL OR expiration_time > NOW()) AND [server_check]", //skyrat edit +======= + var/datum/db_query/query_build_ban_cache = SSdbcore.NewQuery( + "SELECT role, applies_to_admins FROM [format_table_name("ban")] WHERE ckey = :ckey AND unbanned_datetime IS NULL AND (expiration_time IS NULL OR expiration_time > NOW())", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list("ckey" = ckey) ) var/query_successful = query_build_ban_cache.warn_execute() @@ -206,11 +230,19 @@ player_client.ban_cache = ban_cache return ban_cache +<<<<<<< HEAD /datum/admins/proc/ban_panel(player_key, player_ip, player_cid, role, duration = 1440, applies_to_admins, reason, edit_id, page, admin_key, global_ban = TRUE) // SKYRAT EDIT CHANGE - MULTISERVER if (duration == BAN_PANEL_PERMANENT) duration = null +======= + +/datum/admins/proc/ban_panel(player_key, player_ip, player_cid, role, duration = 1440, applies_to_admins, reason, edit_id, page, admin_key) + if (duration == BAN_PANEL_PERMANENT) + duration = null + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/panel_height = 620 if(edit_id) panel_height = 240 @@ -431,6 +463,7 @@ ROLE_SYNDICATE, ROLE_TRAITOR, ROLE_WIZARD, +<<<<<<< HEAD ROLE_BORER, // SKYRAT EDIT ADDITION ROLE_ASSAULT_OPERATIVE, // SKYRAT EDIT ADDITION ROLE_VOIDWALKER, @@ -447,6 +480,10 @@ BAN_OPFOR, BAN_LOOC, // SKYRAT EDIT ADDITION - LOOC muting again ), // SKYRAT EDIT ADDITION - EXTRA_BANS +======= + ROLE_VOIDWALKER, + ), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) for(var/department in long_job_lists) output += "
" @@ -594,7 +631,11 @@ to_chat(usr, span_danger("Ban not [edit_id ? "edited" : "created"] because the following errors were present:\n[error_state.Join("\n")]"), confidential = TRUE) return if(edit_id) +<<<<<<< HEAD edit_ban(edit_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, global_ban, mirror_edit, old_key, old_ip, old_cid, old_applies, page, admin_key, changes, roles_to_ban[1] == "Server") // SKYRAT EDIT CHANGE - MULTISERVER +======= + edit_ban(edit_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, mirror_edit, old_key, old_ip, old_cid, old_applies, page, admin_key, changes, roles_to_ban[1] == "Server") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else create_ban(player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, severity, reason, global_ban, roles_to_ban) // SKYRAT EDIT CHANGE - MULTISERVER @@ -683,7 +724,11 @@ if(!SSdbcore.MassInsert(format_table_name("ban"), sql_ban, warn = TRUE, special_columns = special_columns)) return var/target = ban_target_string(player_key, player_ip, player_cid) +<<<<<<< HEAD var/msg = "has created a [global_ban ? "global" : "local"] [isnull(duration) ? "permanent" : "temporary [time_message]"] [applies_to_admins ? "admin " : ""][is_server_ban ? "server ban" : "role ban from [roles_to_ban.len] roles"] for [target]." // SKYRAT EDIT CHANGE - MULTISERVER +======= + var/msg = "has created a [isnull(duration) ? "permanent" : "temporary [time_message]"] [applies_to_admins ? "admin " : ""][is_server_ban ? "server ban" : "role ban from [roles_to_ban.len] roles"] for [target]." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_admin_private("[kn] [msg][is_server_ban ? "" : " Roles: [roles_to_ban.Join(", ")]"] Reason: [reason]") message_admins("[kna] [msg][is_server_ban ? "" : " Roles: [roles_to_ban.Join("\n")]"]\nReason: [reason]") if(applies_to_admins) @@ -696,6 +741,7 @@ notify_all_banned_players(player_ckey, player_ip, player_cid, player_ban_notification, other_ban_notification, is_server_ban, applies_to_admins) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - EXTRA_BANS if(BAN_PACIFICATION in roles_to_ban) var/client/C = GLOB.directory[player_ckey] @@ -705,6 +751,9 @@ //var/datum/admin_help/linked_ahelp_ticket = admin_ticket_log(player_ckey, "[kna] [msg]") // SKYRAT EDIT ORIGINAL var/datum/admin_help/linked_ahelp_ticket = admin_ticket_log(player_ckey, "[kna] [msg]", FALSE) // SKYRAT EDIT -- Player ticket viewing +======= + var/datum/admin_help/linked_ahelp_ticket = admin_ticket_log(player_ckey, "[kna] [msg]") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(is_server_ban && linked_ahelp_ticket) linked_ahelp_ticket.Resolve() @@ -939,7 +988,11 @@ notify_all_banned_players(ckey(player_key), player_ip, player_cid, banned_player_message, banned_other_message, kick_banned_players, applies_to_admins) unban_panel(player_key, admin_key, player_ip, player_cid, page) +<<<<<<< HEAD /datum/admins/proc/edit_ban(ban_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, global_ban, mirror_edit, old_key, old_ip, old_cid, old_applies, admin_key, page, list/changes, is_server_ban) // SKYRAT EDIT CHANGE - MULTISERVER +======= +/datum/admins/proc/edit_ban(ban_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, mirror_edit, old_key, old_ip, old_cid, old_applies, admin_key, page, list/changes, is_server_ban) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index 400c4e05d8c..8774bae4d19 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -79,7 +79,10 @@ "target_ckey" = target_ckey, "admin_ckey" = admin_ckey, "text" = text, +<<<<<<< HEAD "server_name" = CONFIG_GET(string/serversqlname), // SKYRAT EDIT ADDITION - MULTISERVER +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "server" = server, "internet_address" = world.internet_address || "0", "port" = "[world.port]", @@ -433,10 +436,17 @@ var/text = query_get_type_messages.item[5] var/timestamp = query_get_type_messages.item[6] var/server = query_get_type_messages.item[7] +<<<<<<< HEAD var/editor_key = query_get_type_messages.item[9] // SKYRAT EDIT CHANGE BEGIN - MULTISERVER var/expire_timestamp = query_get_type_messages.item[10] var/playtime = query_get_type_messages.item[11] var/round_id = query_get_type_messages.item[12] // SKYRAT EDIT CHANGE END - MULTISERVER +======= + var/editor_key = query_get_type_messages.item[8] + var/expire_timestamp = query_get_type_messages.item[9] + var/playtime = query_get_type_messages.item[10] + var/round_id = query_get_type_messages.item[11] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 output += "" if(type == "watchlist entry") output += "[t_key] | " @@ -497,6 +507,7 @@ var/text = query_get_messages.item[5] var/timestamp = query_get_messages.item[6] var/server = query_get_messages.item[7] +<<<<<<< HEAD var/editor_key = query_get_messages.item[9] // SKYRAT EDIT CHANGE BEGIN - MULTISERVER var/age = text2num(query_get_messages.item[10]) target_key = query_get_messages.item[11] @@ -504,6 +515,15 @@ var/severity = query_get_messages.item[13] var/playtime = query_get_messages.item[14] var/round_id = query_get_messages.item[15] // SKYRAT EDIT CHANGE END - MULTISERVER +======= + var/editor_key = query_get_messages.item[8] + var/age = text2num(query_get_messages.item[9]) + target_key = query_get_messages.item[10] + var/expire_timestamp = query_get_messages.item[11] + var/severity = query_get_messages.item[12] + var/playtime = query_get_messages.item[13] + var/round_id = query_get_messages.item[14] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/alphatext = "" var/nsd = CONFIG_GET(number/note_stale_days) var/nfd = CONFIG_GET(number/note_fresh_days) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 42d51b0b349..4cbf4e23226 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -48,6 +48,7 @@ return cmd_show_exp_panel(M.client) +<<<<<<< HEAD // SKYRAT EDIT BEGIN -- ONE CLICK ANTAG else if(href_list["makeAntag"]) @@ -83,6 +84,8 @@ else message_admins("[key_name_admin(usr)] FAILED to create '[href_list["makeAntag"]]' with a parameter of '[opt]'.") // SKYRAT EDIT END -- ONE CLICK ANTAG +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(href_list["editrightsbrowser"]) edit_admin_permissions(0) @@ -591,8 +594,11 @@ sparks.attach(M.loc) sparks.start() M.forceMove(pick(GLOB.prisonwarp)) +<<<<<<< HEAD /// SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(M, span_adminnotice("You have been sent to Prison!"), confidential = TRUE) log_admin("[key_name(usr)] has sent [key_name(M)] to Prison!") @@ -1764,10 +1770,15 @@ if(!paper_to_show) return paper_to_show.ui_interact(usr) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if (href_list["print_fax"]) if(!check_rights(R_ADMIN)) return +<<<<<<< HEAD for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax)) if(!is_centcom_level(FAX.z)) continue @@ -1782,6 +1793,14 @@ message_admins("An OPFOR candidate could not be selected.") // SKYRAT EDIT ADDITION END +======= + for(var/obj/machinery/fax/admin/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax/admin)) + if(FAX.fax_id != href_list["destination"]) + continue + FAX.receive(locate(href_list["print_fax"]), href_list["sender_name"]) + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(href_list["play_internet"]) if(!check_rights(R_SOUND)) return diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 36db4fa8bc4..4ee2b79f044 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -64,7 +64,7 @@ "SELECT /mob/living IN (@[/area/service/bar MAP contents])[1]" What if some dumbass admin spawned a bajillion spiders and you need to kill them all? - Oh yeah you'd rather not delete all the spiders in maintenace. Only that one room the spiders were + Oh yeah you'd rather not delete all the spiders in maintenance. Only that one room the spiders were spawned in. "DELETE /mob/living/carbon/superior_animal/giant_spider WHERE loc.loc == marked" @@ -109,7 +109,7 @@ By the way, queries are slow and take a while. Be patient. They don't hang the entire server though. - With great power comes great responsability. + With great power comes great responsibility. Here's a slightly more formal quick reference. diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index bc74347475a..1305e5a660d 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -51,6 +51,9 @@ /proc/_get_step(Ref, Dir) return get_step(Ref, Dir) +/proc/_hascall(object, procname) + return hascall(object, procname) + /proc/_hearers(Depth = world.view, Center = usr) return hearers(Depth, Center) diff --git a/code/modules/admin/verbs/admin.dm b/code/modules/admin/verbs/admin.dm index 3aaab5bae58..94f5c16235a 100644 --- a/code/modules/admin/verbs/admin.dm +++ b/code/modules/admin/verbs/admin.dm @@ -181,11 +181,14 @@ ADMIN_VERB(drop_everything, R_ADMIN, "Drop Everything", ADMIN_VERB_NO_DESCRIPTIO if(MUTE_DEADCHAT) mute_string = "deadchat and DSAY" feedback_string = "Deadchat" +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - LOOC muting again. if(MUTE_LOOC) mute_string = "LOOC" feedback_string = "LOOC" // SKYRAT EDIT ADDITION END - LOOC muting again. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(MUTE_INTERNET_REQUEST) mute_string = "internet sound requests" feedback_string = "Internet Sound Requests" diff --git a/code/modules/admin/verbs/admin_newscaster.dm b/code/modules/admin/verbs/admin_newscaster.dm index 0439cfa8811..a3dcf2e3be7 100644 --- a/code/modules/admin/verbs/admin_newscaster.dm +++ b/code/modules/admin/verbs/admin_newscaster.dm @@ -134,7 +134,11 @@ ADMIN_VERB(access_news_network, R_ADMIN, "Access Newscaster Network", "Allows yo data["wanted"] = wanted_info return data +<<<<<<< HEAD /datum/newspanel/ui_act(action, params) +======= +/datum/newspanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index a9d285815ad..848cab19138 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -168,7 +168,11 @@ ADMIN_VERB(disable_shuttle, R_ADMIN, "Disable Shuttle", "Those fuckers aren't ge priority_announce( text = "Emergency Shuttle uplink failure, shuttle disabled until further notice.", title = "Uplink Failure", +<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', +======= + sound = 'sound/misc/announce_dig.ogg', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -194,7 +198,11 @@ ADMIN_VERB(enable_shuttle, R_ADMIN, "Enable Shuttle", "Those fuckers ARE getting priority_announce( text = "Emergency Shuttle uplink reestablished, shuttle enabled.", title = "Uplink Restored", +<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', +======= + sound = 'sound/misc/announce_dig.ogg', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) @@ -218,9 +226,21 @@ ADMIN_VERB(hostile_environment, R_ADMIN, "Hostile Environment", "Disable the shu SSshuttle.hostile_environments.Cut() SSshuttle.checkHostileEnvironment() +<<<<<<< HEAD ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", ADMIN_CATEGORY_EVENTS, obj/machinery/nuclearbomb/nuke in world) if(!nuke.timing) var/newtime = input(user, "Set activation timer.", "Activate Nuke", "[nuke.timer_set]") as num|null +======= +ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", ADMIN_CATEGORY_EVENTS) + var/list/nukes = list() + for (var/obj/machinery/nuclearbomb/bomb in world) + nukes += bomb + var/obj/machinery/nuclearbomb/nuke = tgui_input_list(user, "", "Toggle Nuke", nukes) + if (isnull(nuke)) + return + if(!nuke.timing) + var/newtime = tgui_input_number(user, "Set activation timer.", "Activate Nuke", nuke.timer_set) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!newtime) return nuke.timer_set = newtime diff --git a/code/modules/admin/verbs/adminfun.dm b/code/modules/admin/verbs/adminfun.dm index 8bc7a611b35..f3690df8c85 100644 --- a/code/modules/admin/verbs/adminfun.dm +++ b/code/modules/admin/verbs/adminfun.dm @@ -154,7 +154,11 @@ ADMIN_VERB(polymorph_all, R_ADMIN, "Polymorph All", "Applies the effects of the message_admins("Mass polymorph started by [who_did_it] is complete.") ADMIN_VERB_AND_CONTEXT_MENU(admin_smite, R_ADMIN|R_FUN, "Smite", "Smite a player with divine power.", ADMIN_CATEGORY_FUN, mob/living/target in world) +<<<<<<< HEAD var/punishment = input(user, "Choose a punishment", "DIVINE SMITING") as null|anything in GLOB.smites +======= + var/punishment = tgui_input_list(user, "Choose a punishment", "DIVINE SMITING", GLOB.smites) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(target) || !punishment) return diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm index d537b9ee898..55a2c30aa79 100644 --- a/code/modules/admin/verbs/admingame.dm +++ b/code/modules/admin/verbs/admingame.dm @@ -26,6 +26,7 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(show_player_panel, R_ADMIN, "Show Player Panel", mo if(player.client) body += "
\[First Seen: [player.client.player_join_date]\]\[Byond account registered on: [player.client.account_join_date]\]" +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Player Ranks var/list/player_ranks = list() @@ -40,6 +41,8 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(show_player_panel, R_ADMIN, "Show Player Panel", mo body += "

Player Ranks: [length(player_ranks) ? player_ranks.Join(", ") : "None"]" // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 body += "

CentCom Galactic Ban DB: " if(CONFIG_GET(string/centcom_ban_db)) body += "Search" @@ -101,10 +104,13 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(show_player_panel, R_ADMIN, "Show Player Panel", mo body += "OOC | " body += "PRAY | " body += "ADMINHELP | " +<<<<<<< HEAD //Skyrat Addition Begin - LOOC muting again. body += "DEADCHAT | " body += "LOOC\]" //Skyrat Addition End - LOOC muting again. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 body += "WEBREQ | " body += "DEADCHAT\]" body += "(toggle all)" @@ -295,7 +301,11 @@ ADMIN_VERB(respawn_character, R_ADMIN, "Respawn Character", "Respawn a player th if(!record_found && (new_character.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) //Power to the user! if(tgui_alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?",,list("No","Yes")) == "Yes") +<<<<<<< HEAD GLOB.manifest.inject(new_character, src) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: GLOB.manifest.inject(new_character) +======= + GLOB.manifest.inject(new_character) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(tgui_alert(new_character,"Would you like an active AI to announce this character?",,list("No","Yes")) == "Yes") announce_arrival(new_character, new_character.mind.assigned_role.title) @@ -446,6 +456,9 @@ ADMIN_VERB(lag_switch_panel, R_ADMIN, "Show Lag Switches", "Display the controls dat += "Disable examine icons: [SSlag_switch.measures[DISABLE_USR_ICON2HTML] ? "On" : "Off"] - trait applies to examiner
" dat += "Disable parallax: [SSlag_switch.measures[DISABLE_PARALLAX] ? "On" : "Off"] - trait applies to character
" dat += "Disable footsteps: [SSlag_switch.measures[DISABLE_FOOTSTEPS] ? "On" : "Off"] - trait applies to character
" +<<<<<<< HEAD dat += "Disable character creator: [SSlag_switch.measures[DISABLE_CREATOR] ? "On" : "Off"] - trait applies to all
" // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dat += "" user << browse(dat.Join(), "window=lag_switch_panel;size=420x480") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 589a393b0ea..0efa5b82047 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -103,18 +103,25 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/datum/admin_help/AH = I if(AH.initiator) var/obj/effect/statclick/updated = AH.statclick.update() +<<<<<<< HEAD L[++L.len] = list("[AH.handler ? "H-[AH.handler]" : ""]#[AH.id]. [AH.initiator_key_name]:", "[updated.name]", REF(AH)) //SKYRAT EDIT CHANGE - ADMIN +======= + L[++L.len] = list("#[AH.id]. [AH.initiator_key_name]:", "[updated.name]", REF(AH)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else ++num_disconnected if(num_disconnected) L[++L.len] = list("Disconnected:", "[astatclick.update("[num_disconnected]")]", null, REF(astatclick)) L[++L.len] = list("Closed Tickets:", "[cstatclick.update("[closed_tickets.len]")]", null, REF(cstatclick)) L[++L.len] = list("Resolved Tickets:", "[rstatclick.update("[resolved_tickets.len]")]", null, REF(rstatclick)) +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(LAZYLEN(SSopposing_force.submitted_applications)) for(var/datum/opposing_force/opposing_force as anything in SSopposing_force.submitted_applications) L[++L.len] = list("[opposing_force.handling_admin ? "H-[opposing_force.handling_admin]. " : ""]OPFOR:", "[opposing_force.stat_button.update(" [opposing_force.ckey] ")]", null, REF(opposing_force.stat_button)) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return L //Reassociate still open ticket if one exists @@ -214,7 +221,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) * * msg_raw - The first message of this admin_help: used for the initial title of the ticket * * is_bwoink - Boolean operator, TRUE if this ticket was started by an admin PM */ +<<<<<<< HEAD /datum/admin_help/New(msg_raw, client/C, is_bwoink, client/admin_C, urgent = FALSE) //SKYRAT EDIT CHANGE +======= +/datum/admin_help/New(msg_raw, client/C, is_bwoink, urgent = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //clean the input msg var/msg = sanitize(copytext_char(msg_raw, 1, MAX_MESSAGE_LEN)) if(!msg || !C || !C.mob) @@ -723,6 +734,32 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) player_panel.open() +/datum/admin_help/proc/player_ticket_panel() + var/list/dat = list("Player Ticket") + dat += "State: " + switch(state) + if(AHELP_ACTIVE) + dat += "OPEN" + if(AHELP_RESOLVED) + dat += "RESOLVED" + if(AHELP_CLOSED) + dat += "CLOSED" + else + dat += "UNKNOWN" + dat += "\n[FOURSPACES]Refresh" + dat += "

Opened at: [gameTimestamp("hh:mm:ss", opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" + if(closed_at) + dat += "
Closed at: [gameTimestamp("hh:mm:ss", closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" + dat += "

" + dat += "
Log:

" + for (var/interaction in player_interactions) + dat += "[interaction]
" + + var/datum/browser/player_panel = new(usr, "ahelp[id]", 0, 620, 480) + player_panel.set_content(dat.Join()) + player_panel.open() + + // // TICKET STATCLICK // @@ -834,7 +871,11 @@ GLOBAL_DATUM_INIT(admin_help_ui_handler, /datum/admin_help_ui_handler, new) user_client.current_ticket.MessageNoRecipient(message, urgent) return +<<<<<<< HEAD new /datum/admin_help(message, user_client, FALSE, null, urgent) // SKYRAT EDIT - Handling tickets - ORIGINAL: new /datum/admin_help(message, user_client, FALSE, urgent) +======= + new /datum/admin_help(message, user_client, FALSE, urgent) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /client/verb/no_tgui_adminhelp(message as message) set name = "NoTguiAdminhelp" diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 4c984c42b71..98eeae524e7 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -378,7 +378,11 @@ ADMIN_VERB(cmd_admin_pm_panel, R_NONE, "Admin PM", "Show a list of clients to PM var/already_logged = FALSE // Full boinks will always be done to players, so we are not guarenteed that they won't have a ticket if(!recipient_ticket) +<<<<<<< HEAD new /datum/admin_help(send_message, recipient, TRUE, src) // SKYRAT EDIT - Handling tickets - ORIGINAL: new /datum/admin_help(send_message, recipient, TRUE) +======= + new /datum/admin_help(send_message, recipient, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 already_logged = TRUE // This action mutates our existing cached ticket information, so we recache ticket = current_ticket @@ -418,12 +422,15 @@ ADMIN_VERB(cmd_admin_pm_panel, R_NONE, "Admin PM", "Show a list of clients to PM SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) return TRUE +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - ADMIN // Basically, if we realized that we shouldn't've been handling the ticket, let's bail. Otherwise, we just change who's handling it. if(ticket && our_holder && !ticket.handle_issue()) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Ok if we're here, either this message is for an admin, or someone somehow figured out how to send a new message as a player // First case well, first if(!our_holder && !recipient_holder) //neither are admins diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 87410528ab3..a723f209440 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -18,7 +18,10 @@ ADMIN_VERB(cmd_admin_say, R_NONE, "ASay", "Send a message to other admins", ADMI user.mob.log_talk(message, LOG_ASAY) message = keywords_lookup(message) +<<<<<<< HEAD send_asay_to_other_server(user.ckey, message) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/asay_color = user.prefs.read_preference(/datum/preference/color/asay_color) var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && asay_color) ? "" : "" message = "[span_adminsay("[span_prefix("ADMIN:")] [key_name_admin(user)] [ADMIN_FLW(user.mob)]: [custom_asay_color][message]")][custom_asay_color ? "":null]" diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm index ffeb1cce273..2081dcf69d6 100644 --- a/code/modules/admin/verbs/borgpanel.dm +++ b/code/modules/admin/verbs/borgpanel.dm @@ -64,7 +64,11 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD .["ais"] += list(list("name" = ai.name, "ref" = REF(ai), "connected" = (borg.connected_ai == ai))) +<<<<<<< HEAD /datum/borgpanel/ui_act(action, params) +======= +/datum/borgpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -153,15 +157,15 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD if (!borg.radio.keyslot) // There's no encryption key. This shouldn't happen but we can cope borg.radio.channels -= channel if (channel == RADIO_CHANNEL_SYNDICATE) - borg.radio.syndie = FALSE + borg.radio.special_channels &= ~RADIO_SPECIAL_SYNDIE else if (channel == "CentCom") - borg.radio.independent = FALSE + borg.radio.special_channels &= ~RADIO_SPECIAL_CENTCOM else borg.radio.keyslot.channels -= channel if (channel == RADIO_CHANNEL_SYNDICATE) - borg.radio.keyslot.syndie = FALSE + borg.radio.keyslot.special_channels &= ~RADIO_SPECIAL_SYNDIE else if (channel == "CentCom") - borg.radio.keyslot.independent = FALSE + borg.radio.keyslot.special_channels &= ~RADIO_SPECIAL_CENTCOM message_admins("[key_name_admin(user)] removed the [channel] radio channel from [ADMIN_LOOKUPFLW(borg)].") log_silicon("[key_name(user)] removed the [channel] radio channel from [key_name(borg)].") else // We're adding a channel @@ -169,9 +173,9 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD borg.radio.keyslot = new() borg.radio.keyslot.channels[channel] = 1 if (channel == RADIO_CHANNEL_SYNDICATE) - borg.radio.keyslot.syndie = TRUE + borg.radio.keyslot.special_channels |= RADIO_SPECIAL_SYNDIE else if (channel == "CentCom") - borg.radio.keyslot.independent = TRUE + borg.radio.keyslot.special_channels |= RADIO_SPECIAL_CENTCOM message_admins("[key_name_admin(user)] added the [channel] radio channel to [ADMIN_LOOKUPFLW(borg)].") log_silicon("[key_name(user)] added the [channel] radio channel to [key_name(borg)].") borg.radio.recalculateChannels() diff --git a/code/modules/admin/verbs/ert.dm b/code/modules/admin/verbs/ert.dm index e116a9daf9a..35147d23005 100644 --- a/code/modules/admin/verbs/ert.dm +++ b/code/modules/admin/verbs/ert.dm @@ -89,7 +89,10 @@ "leader_experience" = list("desc" = "Pick an experienced leader", "type" = "boolean", "value" = "[(ertemplate.leader_experience ? "Yes" : "No")]"), "random_names" = list("desc" = "Randomize names", "type" = "boolean", "value" = "[(ertemplate.random_names ? "Yes" : "No")]"), "spawn_admin" = list("desc" = "Spawn yourself as briefing officer", "type" = "boolean", "value" = "[(ertemplate.spawn_admin ? "Yes" : "No")]"), +<<<<<<< HEAD "notify_players" = list("desc" = "Notify players that you have sent an ERT", "type" = "boolean", "value" = "[(ertemplate.notify_players ? "Yes" : "No")]"), //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "use_custom_shuttle" = list("desc" = "Use the ERT's custom shuttle (if it has one)", "type" = "boolean", "value" = "[(ertemplate.use_custom_shuttle ? "Yes" : "No")]"), "mob_type" = list("desc" = "Base Species", "callback" = CALLBACK(src, PROC_REF(makeERTTemplateModified)), "type" = "datum", "path" = "/mob/living/carbon/human", "subtypesonly" = TRUE, "value" = ertemplate.mob_type), ) @@ -118,7 +121,10 @@ ertemplate.leader_experience = prefs["leader_experience"]["value"] == "Yes" ertemplate.random_names = prefs["random_names"]["value"] == "Yes" ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes" +<<<<<<< HEAD ertemplate.notify_players = prefs["notify_players"]["value"] == "Yes" //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes" ertemplate.mob_type = prefs["mob_type"]["value"] @@ -259,6 +265,7 @@ if (teamSpawned) message_admins("[ertemplate.polldesc] has spawned with the mission: [ertemplate.mission]") +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(ertemplate.notify_players) priority_announce("Central command has responded to your request for a CODE [uppertext(ertemplate.code)] Emergency Response Team and have confirmed one to be enroute.", "ERT Request", ANNOUNCER_ERTYES) @@ -266,6 +273,9 @@ if(istype(ertemplate, /datum/ert/deathsquad)) SSsecurity_level.set_level(SEC_LEVEL_EPSILON) //SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Open the Armory doors if(ertemplate.opendoors) for(var/obj/machinery/door/poddoor/ert/door as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/door/poddoor/ert)) diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm index d9e81086c72..0f4e1a48811 100644 --- a/code/modules/admin/verbs/fix_air.dm +++ b/code/modules/admin/verbs/fix_air.dm @@ -7,10 +7,13 @@ ADMIN_VERB_AND_CONTEXT_MENU(fix_air, R_ADMIN, "Fix Air", "Fixes air in a specifi if(valid_range_turf.blocks_air) //skip walls continue +<<<<<<< HEAD //SKYRAT EDIT ADDITION START if(valid_range_turf.pollution) qdel(valid_range_turf.pollution) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/gas_mixture/GM = SSair.parse_gas_string(valid_range_turf.initial_gas_mix, /datum/gas_mixture/turf) valid_range_turf.copy_air(GM) valid_range_turf.temperature = initial(valid_range_turf.temperature) diff --git a/code/modules/admin/verbs/ghost_pool_protection.dm b/code/modules/admin/verbs/ghost_pool_protection.dm index 439f4a37b89..46e586d39f1 100644 --- a/code/modules/admin/verbs/ghost_pool_protection.dm +++ b/code/modules/admin/verbs/ghost_pool_protection.dm @@ -50,7 +50,11 @@ ADMIN_VERB(ghost_pool_protection, R_ADMIN, "Ghost Pool Protection", "Choose whic data["minigames"] = (new_role_flags & GHOSTROLE_MINIGAME) return data +<<<<<<< HEAD /datum/ghost_pool_menu/ui_act(action, params) +======= +/datum/ghost_pool_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/admin/verbs/lua/README.md b/code/modules/admin/verbs/lua/README.md index 707184d4d77..5058232dd51 100644 --- a/code/modules/admin/verbs/lua/README.md +++ b/code/modules/admin/verbs/lua/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Auxlua --- @@ -145,6 +146,230 @@ The ckey of the user who ran the lua script in the current context. Can be unrel Returns the client of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping. ### SS13.global_proc +======= +# Objects + +Datums, lists, typepaths, static appearances, and some other objects are represented in Luau as userdata. Certain operations can be performed on these types of objects. + +## Common metamethods + +The following metamethods are defined for all objects. + +### \_\_tostring(): string + +Returns the string representation of the object. This uses BYOND's internal string conversion function. + +### \_\_eq(other: any): boolean + +Compare the equality of two objects. While passing the same object into luau twice will return two references to the same userdata, some DM projects may override the equality operator using an `__operator==` proc definition. + +## Datum-like Objects + +Datum-like objects include datums themselves, clients (if they have not been redefined to be children of `/datum`), static appearances, and the world. + +### \_\_index(index: string): any + +Access the member specified by `index`. + +If `index` is a valid var for the object, the index operation will return that var's value. +If the var getting wrapper proc is set, the operation will instead call that proc with the arguments `(object, index)`. + +For objects other than static appearances, if `index` is a valid proc for the object, the operation will return a wrapper for that proc that can be invoked using call syntax (e.g. `object:proc(...arguments)`). If the object proc calling wrapper is set, calling the returned function will instead call the wrapper proc with the arguments `(object, proc, {...arguments})`. Note that vars will be shadowed by procs with the same name. To work around this, use the `dm.get_var` function. + +### \_\_newindex(index: string, value: any): () + +Set the var specified by `index` to `value`, if that var exists on the object. + +If the var setting wrapper proc is set, the operation will instead call that proc with the arguments `(object, index, value)`. + +## Lists + +Lists are syntactically similar to tables, with one crucial difference. +Unlike tables, numeric indices must be non-zero integers within the bounds of the list. + +### \_\_index(index: any): any + +Read the list at `index`. This works both for numeric indices and assoc keys. +Vars lists cannot be directly read this way if the var getting wrapper proc is set. + +### \_\_newindex(index: any, value: any): any + +Write `value` to the list at `index`. This works both for writing numeric indices and assoc keys. +Vars lists cannot be directly written this way if the var setting wrapper proc is set. + +### \_\_len(): integer + +Returns the length of the list, similarly to the `length` builtin in DM. + +### Iteration + +Lists support Luau's generalized iteration. Iteration this way returns pairs of numeric indices and list values. +For example, the statement `for _, v in L do` is logically equivalent to the DM statement `for(var/v in L)`. + +# Global Fields and Modules + +In addition to the full extent of Luau's standard library modules, some extra functions and modules have been added. + +## Global-Level Fields + +### sleep(): () + +Yields the active thread, without worrying about passing data into or out of the state. + +Threads yielded this way are placed at the end of a queue. Call the `awaken` hook function from DM to execute the thread at the front of the queue. + +### loadstring(code: string): function + +Luau does not inherently include the `loadstring` function common to a number of other versions of lua. This is an effective reimplementation of `loadstring`. + +### print(...any): () + +Calls the print wrapper with the passed in arguments. +Raises an error if no print wrapper is set, as that means there is nothing to print with. + +### \_state_id: integer + +The handle to the underlying luau state in the dreamluau binary. + +## \_exec + +The `_exec` module includes volatile fields related to the current execution context. + +### \_next_yield_index: integer + +When yielding a thread with `coroutine.yield`, it will be inserted into an internal table at the first open integer index. +This field corresponds to that first open integer index. + +### \_limit: integer? + +If set, the execution limit, rounded to the nearest millisecond. + +### \_time: integer + +The length of successive time luau code has been executed, including recursive calls to DM and back into luau, rounded to the nearest millisecond. + +## dm + +The `dm` module includes fields and functions for basic interaction with DM. + +### world: userdata + +A static reference to the DM `world`. + +### global_vars: userdata + +A static reference that functions like the DM keyword `global`. This can be indexed to read/write global vars. + +### global_procs: table + +A table that can be indexed by string for functions that wrap global procs. + +Due to BYOND limitations, attempting to index an invalid proc returns a function logically equivalent to a no-op. + +### get_var(object: userdata, var: string): function + +Reads the var `var` on `object`. This function can be used to get vars that are shadowed by procs declared with the same name. + +### new(path: string, ...any): userdata + +Creates an instance of the object specified by `path`, with `...` as its arguments. +If the "new" wrapper is set, that proc will be called instead, with the arguments `(path, {...})`. + +### is_valid_ref(ref: any): boolean + +Returns true if the value passed in corresponds to a valid reference-counted DM object. + +### usr: userdata? + +Corresponds to the DM var `usr`. + +## list + +The `list` module contains wrappers for the builtin list procs, along with several other utility functions for working with lists. + +### add(list: userdata, ...any): () + +Logically equivalent to the DM statement `list.Add(...)`. + +### copy(list: userdata, start?: integer, end?: integer): userdata + +Logically equivalent to the DM statement `list.Copy(start, end)`. + +### cut(list: userdata, start?: integer, end?: integer): userdata + +Logically equivalent to the DM statement `list.Cut(start, end)`. + +### find(list: userdata, item: any, start?: integer, end?: integer): integer + +Logically equivalent to the DM statement `list.Find(item, start, end)`. + +### insert(list: userdata, index: integer, ...any): integer + +Logically equivalent to the DM statement `list.Insert(item, ...)`. + +### join(list: userdata, glue: string, start?: integer, end?: integer): string + +Logically equivalent to the statement `list.Join(glue, start, end)`. + +### remove(list: userdata, ...any): integer + +Logically equivalent to the DM statement `list.Remove(...)`. + +### remove_all(list: userdata, ...any): integer + +Logically equivalent to the DM statement `list.RemoveAll(...)`. + +### splice(list: userdata, start?: integer, end?: integer, ...any): () + +Logically equivalent to the DM statement `list.Splice(start, end, ...)`. + +### swap(list: userdata, index_1: integer, index_2: integer): () + +Logically equivalent to the DM statement `list.Swap(index_1, index_2)`. + +### to_table(list: userdata, deep?: boolean): table + +Creates a table that is a copy of `list`. If `deep` is true, `to_table` will be called on any lists inside that list. + +### from_table(table: table): userdata + +Creates a list that is a copy of `table`. This is not strictly necessary, as tables are automatically converted to lists when passed back into DM, using the same internal logic as `from_table`. + +### filter(list: userdata, path: string): userdata + +Returns a copy of `list`, containing only elements that are objects descended from `path`. + +## pointer + +The `pointer` module contains utility functions for interacting with pointers. +Keep in mind that passing DM pointers into luau and manipulating them in this way can bypass wrapper procs. + +### read(pointer: userdata): any + +Gets the underlying data the pointer references. + +### write(pointer: userdata, value: any): () + +Writes `value` to the underlying data the pointer references. + +### unwrap(possible_pointer: any): any + +If `possible_pointer` is a pointer, reads it. Otherwise, it is returned as-is. + +# The SS13 package +The `SS13` package contains various helper functions that use code specific to tgstation. + +## SS13.state +A reference to the state datum (`/datum/lua_state`) handling this Lua state. + +## SS13.get_runner_ckey() +The ckey of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping. + +## SS13.get_runner_client() +Returns the client of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping. + +## SS13.global_proc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A wrapper for the magic string used to tell `WrapAdminProcCall` to call a global proc. For instance, `/datum/callback` must be instantiated with `SS13.global_proc` as its first argument to specify that it will be invoking a global proc. The following example declares a callback which will execute the global proc `to_chat`: @@ -152,6 +377,7 @@ The following example declares a callback which will execute the global proc `to local callback = SS13.new("/datum/callback", SS13.global_proc, "to_chat", dm.world, "Hello World") ``` +<<<<<<< HEAD ### SS13.istype(thing, type) Equivalent to the DM statement `istype(thing, text2path(type))`. @@ -166,11 +392,24 @@ SS13.new("/obj/singularity", dm.global_proc("_get_step", dm.usr, 0)) Works exactly like SS13.new but it does not store the value to the lua state's `references` list variable. This means that the variable could end up deleted if nothing holds a reference to it. ### SS13.is_valid(datum) +======= +## SS13.istype(thing, type) +Equivalent to the DM statement `istype(thing, text2path(type))`. + +## SS13.new(type, ...) +An alias for `dm.new` + +## SS13.is_valid(datum) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Can be used to determine if the datum passed is not nil, not undefined and not qdel'd all in one. A helper function that allows you to check the validity from only one function. Example usage: ```lua local datum = SS13.new("/datum") +<<<<<<< HEAD dm.global_proc("qdel", datum) +======= +dm.global_procs.qdel(datum) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 print(SS13.is_valid(datum)) -- false local null = nil @@ -180,6 +419,7 @@ local datum = SS13.new("/datum") print(SS13.is_valid(datum)) -- true ``` +<<<<<<< HEAD ### SS13.type(string) Converts a string into a type. Equivalent to doing `dm.global_proc("_text2path", "/path/to/type")` @@ -187,6 +427,15 @@ Converts a string into a type. Equivalent to doing `dm.global_proc("_text2path", Deletes a datum. You shouldn't try to reference it after calling this function. Equivalent to doing `dm.global_proc("qdel", datum)` ### SS13.await(thing_to_call, proc_to_call, ...) +======= +## SS13.type(string) +Converts a string into a typepath. Equivalent to doing `dm.global_proc("_text2path", "/path/to/type")` + +## SS13.qdel(datum) +Deletes a datum. You shouldn't try to reference it after calling this function. Equivalent to doing `dm.global_proc("qdel", datum)` + +## SS13.await(thing_to_call, proc_to_call, ...) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Calls `proc_to_call` on `thing_to_call`, with `...` as its arguments, and sleeps until that proc returns. Returns two return values - the first is the return value of the proc, and the second is the message of any runtime exception thrown by the called proc. The following example calls and awaits the return of `poll_ghost_candidates`: @@ -194,59 +443,104 @@ The following example calls and awaits the return of `poll_ghost_candidates`: local ghosts, runtime = SS13.await(SS13.global_proc, "poll_ghost_candidates", "Would you like to be considered for something?") ``` +<<<<<<< HEAD ### SS13.wait(time, timer) +======= +## SS13.wait(time, timer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Waits for a number of **seconds** specified with the `time` argument. You can optionally specify a timer subsystem using the `timer` argument. Internally, this function creates a timer that will resume the current task after `time` seconds, then yields the current task by calling `coroutine.yield` with no arguments and ignores the return values. If the task is prematurely resumed, the timer will be safely deleted. +<<<<<<< HEAD ### SS13.register_signal(datum, signal, func, make_easy_clear_function) +======= +## SS13.register_signal(datum, signal, func) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Registers the Lua function `func` as a handler for `signal` on `datum`. Like with signal handlers written in DM, Lua signal handlers should not sleep (either by calling `sleep` or `coroutine.yield`). +<<<<<<< HEAD If `make_easy_clear_function` is truthy, a member function taking no arguments will be created in the `SS13` table to easily unregister the signal handler. This function returns the `/datum/callback` created to call `func` from DM. +======= +This function returns whether the signal registration was successful. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 The following example defines a function which will register a signal that makes `target` make a honking sound any time it moves: ```lua function honk(target) SS13.register_signal(target, "movable_moved", function(source) +<<<<<<< HEAD dm.global_proc("playsound", target, "sound/items/bikehorn.ogg", 100, true) +======= + dm.global_procs.playsound(target, "sound/items/bikehorn.ogg", 100, true) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end) end ``` +<<<<<<< HEAD ### SS13.unregister_signal(datum, signal, callback) Unregister a signal previously registered using `SS13.register_signal`. `callback` should be a `datum/callback` previously returned by `SS13.register_signal`. If `callback` is not specified, **ALL** signal handlers registered on `datum` for `signal` will be unregistered. ### SS13.set_timeout(time, func) +======= +NOTE: if `func` is an anonymous function declared inside the call to `SS13.register_signal`, it cannot be referenced in order to unregister that signal with `SS13.unregister_signal` + +## SS13.unregister_signal(datum, signal, func) +Unregister a signal previously registered using `SS13.register_signal`. `func` must be a function for which a handler for the specified signal has already been registered. If `func` is `nil`, all handlers for that signal will be unregistered. + +## SS13.set_timeout(time, func) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Creates a timer which will execute `func` after `time` **seconds**. `func` should not expect to be passed any arguments, as it will not be passed any. Unlike `SS13.wait`, `SS13.set_timeout` does not yield or sleep the current task, making it suitable for use in signal handlers for `SS13.register_signal` The following example will output a message to chat after 5 seconds: ```lua SS13.set_timeout(5, function() +<<<<<<< HEAD dm.global_proc("to_chat", dm.world, "Hello World!") end) ``` ### SS13.start_loop(time, amount, func) +======= + dm.global_procs.to_chat(dm.world, "Hello World!") +end) +``` + +## SS13.start_loop(time, amount, func) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Creates a timer which will execute `func` after `time` **seconds**. `func` should not expect to be passed any arguments, as it will not be passed any. Works exactly the same as `SS13.set_timeout` except it will loop the timer `amount` times. If `amount` is set to -1, it will loop indefinitely. Returns a number value, which represents the timer's id. Can be stopped with `SS13.end_loop` Returns a number, the timer id, which is needed to stop indefinite timers. The following example will output a message to chat every 5 seconds, repeating 10 times: ```lua SS13.start_loop(5, 10, function() +<<<<<<< HEAD dm.global_proc("to_chat", dm.world, "Hello World!") +======= + dm.global_procs.to_chat(dm.world, "Hello World!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end) ``` The following example will output a message to chat every 5 seconds, until `SS13.end_loop(timerid)` is called: ```lua local timerid = SS13.start_loop(5, -1, function() +<<<<<<< HEAD dm.global_proc("to_chat", dm.world, "Hello World!") end) ``` ### SS13.end_loop(id) +======= + dm.global_proc.to_chat(dm.world, "Hello World!") +end) +``` + +## SS13.end_loop(id) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Prematurely ends a loop that hasn't ended yet, created with `SS13.start_loop`. Silently fails if there is no started loop with the specified id. The following example will output a message to chat every 5 seconds and delete it after it has repeated 20 times: ```lua @@ -254,7 +548,11 @@ local repeated_amount = 0 -- timerid won't be in the looping function's scope if declared before the function is declared. local timerid timerid = SS13.start_loop(5, -1, function() +<<<<<<< HEAD dm.global_proc("to_chat", dm.world, "Hello World!") +======= + dm.global_procs.to_chat(dm.world, "Hello World!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 repeated_amount += 1 if repeated_amount >= 20 then SS13.end_loop(timerid) @@ -262,6 +560,7 @@ timerid = SS13.start_loop(5, -1, function() end) ``` +<<<<<<< HEAD ### SS13.stop_all_loops() Stops all current running loops that haven't ended yet. Useful in case you accidentally left a indefinite loop running without storing the id anywhere. @@ -294,3 +593,8 @@ A table of key-value-pairs, where the keys are threads, and the values are table - name: A string containing the name of the task - status: A string, either "sleep" or "yield" - index: The task's index in `sleep_queue` or `yield_table` +======= +## SS13.stop_all_loops() +Stops all current running loops that haven't ended yet. +Useful in case you accidentally left a indefinite loop running without storing the id anywhere. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/admin/verbs/lua/_wrappers.dm b/code/modules/admin/verbs/lua/_wrappers.dm index 8e05453d29d..db60447949e 100644 --- a/code/modules/admin/verbs/lua/_wrappers.dm +++ b/code/modules/admin/verbs/lua/_wrappers.dm @@ -1,3 +1,15 @@ +<<<<<<< HEAD +======= +/proc/wrap_lua_get_var(datum/thing, var_name) + SHOULD_NOT_SLEEP(TRUE) + if(thing == world) + return world.vars[var_name] + if(ref(thing) == "\[0xe000001\]") //This weird fucking thing is like global.vars, but it's not a list and vars is not a valid index for it and I really don't fucking know. + return global.vars[var_name] + if(thing.can_vv_get(var_name)) + return thing.vars[var_name] + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/wrap_lua_set_var(datum/thing_to_set, var_name, value) SHOULD_NOT_SLEEP(TRUE) thing_to_set.vv_edit_var(var_name, value) @@ -11,8 +23,11 @@ ret = WrapAdminProcCall(thing_to_call, proc_name, arguments) else ret = HandleUserlessProcCall("lua", thing_to_call, proc_name, arguments) +<<<<<<< HEAD if(isdatum(ret)) SSlua.gc_guard += ret +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ret /proc/wrap_lua_global_proc_call(proc_name, list/arguments) @@ -24,8 +39,11 @@ ret = WrapAdminProcCall(GLOBAL_PROC, proc_name, arguments) else ret = HandleUserlessProcCall("lua", GLOBAL_PROC, proc_name, arguments) +<<<<<<< HEAD if(isdatum(ret)) SSlua.gc_guard += ret +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ret /proc/wrap_lua_print(state_id, list/arguments) @@ -38,6 +56,10 @@ if(!target_state) return var/print_message = jointext(arguments, "\t") +<<<<<<< HEAD var/result = list("status" = "print", "param" = print_message) +======= + var/result = list("status" = "print", "message" = print_message) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(target_state, TYPE_PROC_REF(/datum/lua_state, log_result), result, TRUE) log_lua("[target_state]: [print_message]") diff --git a/code/modules/admin/verbs/lua/helpers.dm b/code/modules/admin/verbs/lua/helpers.dm index 66b7c835e9a..422edd27b04 100644 --- a/code/modules/admin/verbs/lua/helpers.dm +++ b/code/modules/admin/verbs/lua/helpers.dm @@ -3,20 +3,30 @@ #define PROMISE_REJECTED 2 /** +<<<<<<< HEAD * Auxtools hooks act as "set waitfor = 0" procs. This means that whenever * a proc directly called from auxtools sleeps, the hook returns with whatever +======= + * Byondapi hooks act as "set waitfor = 0" procs. This means that whenever + * a proc directly called from an external library sleeps, the hook returns with whatever +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * the called proc had as its return value at the moment it slept. This may not * be desired behavior, so this datum exists to wrap these procs. * * Some procs that don't sleep could take longer than the execution limit would * allow for. We can wrap these in a promise as well. */ +<<<<<<< HEAD /datum/auxtools_promise +======= +/datum/promise +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/callback var/return_value var/runtime_message var/status = PROMISE_PENDING +<<<<<<< HEAD /datum/auxtools_promise/New(...) callback = CALLBACK(arglist(args)) perform() @@ -24,6 +34,15 @@ /datum/auxtools_promise/proc/perform() set waitfor = 0 sleep() //In case we have to call a super-expensive non-sleeping proc (like getFlatIcon) +======= +/datum/promise/New(...) + if(!usr) + usr = GLOB.lua_usr + callback = CALLBACK(arglist(args)) + INVOKE_ASYNC(src, PROC_REF(perform)) + +/datum/promise/proc/perform() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 try return_value = callback.Invoke() status = PROMISE_RESOLVED diff --git a/code/modules/admin/verbs/lua/lua_editor.dm b/code/modules/admin/verbs/lua/lua_editor.dm index d4a4bc2ee50..c0146392c7f 100644 --- a/code/modules/admin/verbs/lua/lua_editor.dm +++ b/code/modules/admin/verbs/lua/lua_editor.dm @@ -16,6 +16,15 @@ /// If set, we will force the editor to look at this chunk var/force_view_chunk +<<<<<<< HEAD +======= + /// If set, we will force the script input to be this + var/force_input + + /// If set, the latest code execution performed from the editor raised an error, and this is the message from that error + var/last_error + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lua_editor/New(state, _quick_log_index) . = ..() if(state) @@ -37,6 +46,7 @@ /datum/lua_editor/ui_state(mob/user) return GLOB.debug_state +<<<<<<< HEAD /datum/lua_editor/ui_static_data(mob/user) var/list/data = list() data["documentation"] = file2text('code/modules/admin/verbs/lua/README.md') @@ -47,27 +57,67 @@ /datum/lua_editor/ui_data(mob/user) var/list/data = list() if(!CONFIG_GET(flag/auxtools_enabled) || !SSlua.initialized) +======= +/datum/lua_editor/ui_data(mob/user) + var/list/data = list() + data["ss_lua_init"] = SSlua.initialized + if(!SSlua.initialized) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data data["noStateYet"] = !current_state data["showGlobalTable"] = show_global_table if(current_state) if(current_state.log) +<<<<<<< HEAD data["stateLog"] = kvpify_list(refify_list(current_state.log.Copy((page*50)+1, min((page+1)*50+1, current_state.log.len+1)))) +======= + var/list/logs = current_state.log.Copy((page*50)+1, min((page+1)*50+1, current_state.log.len+1)) + for(var/i in 1 to logs.len) + var/list/log = logs[i] + log = log.Copy() + if(log["return_values"]) + log["return_values"] = kvpify_list(prepare_lua_editor_list(deep_copy_without_cycles(log["return_values"]))) + logs[i] = log + data["stateLog"] = logs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["page"] = page data["pageCount"] = CEILING(current_state.log.len/50, 1) data["tasks"] = current_state.get_tasks() if(show_global_table) current_state.get_globals() +<<<<<<< HEAD data["globals"] = kvpify_list(refify_list(current_state.globals)) data["states"] = SSlua.states data["callArguments"] = kvpify_list(refify_list(arguments)) +======= + var/list/values = current_state.globals["values"] + values = deep_copy_without_cycles(values) + values = prepare_lua_editor_list(values) + values = kvpify_list(values) + var/list/variants = current_state.globals["variants"] + data["globals"] = list("values" = values, "variants" = variants) + if(last_error) + data["lastError"] = last_error + last_error = null + data["supressRuntimes"] = current_state.supress_runtimes + data["states"] = list() + for(var/datum/lua_state/state as anything in SSlua.states) + data["states"] += state.display_name + data["callArguments"] = kvpify_list(prepare_lua_editor_list(deep_copy_without_cycles(arguments))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(force_modal) data["forceModal"] = force_modal force_modal = null if(force_view_chunk) data["forceViewChunk"] = force_view_chunk force_view_chunk = null +<<<<<<< HEAD +======= + if(force_input) + data["force_input"] = force_input + force_input = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /datum/lua_editor/proc/traverse_list(list/path, list/root, traversal_depth_offset = 0) @@ -99,6 +149,7 @@ else return root +<<<<<<< HEAD /datum/lua_editor/ui_act(action, list/params) . = ..() if(.) @@ -107,6 +158,26 @@ return if(action == "runCodeFile") params["code"] = file2text(input(usr, "Input File") as null|file) +======= +/datum/lua_editor/proc/run_code(code) + var/ckey = usr.ckey + current_state.ckey_last_runner = ckey + var/result = current_state.load_script(code) + var/index_with_result = current_state.log_result(result) + if(result["status"] == "error") + last_error = result["message"] + message_admins("[key_name(usr)] executed [length(code)] bytes of lua code. [ADMIN_LUAVIEW_CHUNK(current_state, index_with_result)]") + +/datum/lua_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + var/mob/user = ui.user + if(!check_rights_for(user.client, R_DEBUG)) + return + if(action == "runCodeFile") + params["code"] = file2text(input(user, "Input File") as null|file) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(params["code"])) return action = "runCode" @@ -116,6 +187,11 @@ if(!length(state_name)) return TRUE var/datum/lua_state/new_state = new(state_name) +<<<<<<< HEAD +======= + if(QDELETED(new_state)) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSlua.states += new_state LAZYREMOVEASSOC(SSlua.editors, text_ref(current_state), src) current_state = new_state @@ -130,11 +206,22 @@ page = 0 return TRUE if("runCode") +<<<<<<< HEAD var/code = params["code"] current_state.ckey_last_runner = usr.ckey var/result = current_state.load_script(code) var/index_with_result = current_state.log_result(result) message_admins("[key_name(usr)] executed [length(code)] bytes of lua code. [ADMIN_LUAVIEW_CHUNK(current_state, index_with_result)]") +======= + run_code(params["code"]) + return TRUE + if("runFile") + var/code_file = input(user, "Select a script to run.", "Lua") as file|null + if(!code_file) + return TRUE + var/code = file2text(code_file) + run_code(code) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if("moveArgUp") var/list/path = params["path"] @@ -158,9 +245,15 @@ var/list/path = params["path"] var/list/target_list = traverse_list(path, arguments) if(target_list != arguments) +<<<<<<< HEAD usr?.client?.mod_list_add(target_list, null, "a lua editor", "arguments") else var/list/vv_val = usr?.client?.vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) +======= + user?.client?.mod_list_add(target_list, null, "a lua editor", "arguments") + else + var/list/vv_val = user?.client?.vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/class = vv_val["class"] if(!class) return @@ -168,19 +261,32 @@ return TRUE if("callFunction") var/list/recursive_indices = params["indices"] +<<<<<<< HEAD var/list/current_list = kvpify_list(current_state.globals) +======= + var/list/current_list = kvpify_list(current_state.globals["values"]) + var/list/current_variants = current_state.globals["variants"] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/function = list() while(LAZYLEN(recursive_indices)) var/index = popleft(recursive_indices) var/list/element = current_list[index] var/key = element["key"] var/value = element["value"] +<<<<<<< HEAD if(!(istext(key) || isnum(key))) to_chat(usr, span_warning("invalid key \[[key]] for function call (expected text or num)")) +======= + var/list/variant_pair = current_variants[index] + var/key_variant = variant_pair["key"] + if(key_variant == "function" || key_variant == "thread" || key_variant == "userdata" || key_variant == "error_as_value") + to_chat(user, span_warning("invalid table key \[[key]] for function call (expected text, num, path, list, or ref, got [key_variant])")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return function += key if(islist(value)) current_list = value +<<<<<<< HEAD else var/regex/function_regex = regex("^function: 0x\[0-9a-fA-F]+$") if(function_regex.Find(value)) @@ -191,18 +297,38 @@ current_state.log_result(result) arguments.Cut() return TRUE +======= + current_variants = variant_pair["value"] + else + if(variant_pair["value"] != "function") + to_chat(user, span_warning("invalid value \[[value]] for function call (expected list or function)")) + return + var/result = current_state.call_function(arglist(list(function) + arguments)) + current_state.log_result(result) + if(result["status"] == "error") + last_error = result["message"] + arguments.Cut() + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("resumeTask") var/task_index = params["index"] SSlua.queue_resume(current_state, task_index, arguments) arguments.Cut() return TRUE if("killTask") +<<<<<<< HEAD var/task_info = params["info"] SSlua.kill_task(current_state, task_info) +======= + var/is_sleep = params["is_sleep"] + var/index = params["index"] + SSlua.kill_task(current_state, is_sleep, index) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if("vvReturnValue") var/log_entry_index = params["entryIndex"] var/list/log_entry = current_state.log[log_entry_index] +<<<<<<< HEAD var/thing_to_debug = traverse_list(params["tableIndices"], log_entry["param"]) if(isweakref(thing_to_debug)) var/datum/weakref/ref = thing_to_debug @@ -215,6 +341,20 @@ var/datum/weakref/ref = thing_to_debug thing_to_debug = ref.resolve() INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) +======= + var/thing_to_debug = traverse_list(params["indices"], log_entry["return_values"]) + if(isweakref(thing_to_debug)) + var/datum/weakref/ref = thing_to_debug + thing_to_debug = ref.resolve() + INVOKE_ASYNC(user.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) + return FALSE + if("vvGlobal") + var/thing_to_debug = traverse_list(params["indices"], current_state.globals["values"]) + if(isweakref(thing_to_debug)) + var/datum/weakref/ref = thing_to_debug + thing_to_debug = ref.resolve() + INVOKE_ASYNC(user.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if("clearArgs") arguments.Cut() @@ -222,12 +362,24 @@ if("toggleShowGlobalTable") show_global_table = !show_global_table return TRUE +<<<<<<< HEAD +======= + if("toggleSupressRuntimes") + current_state.supress_runtimes = !current_state.supress_runtimes + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("nextPage") page = min(page+1, CEILING(current_state.log.len/50, 1)-1) return TRUE if("previousPage") page = max(page-1, 0) return TRUE +<<<<<<< HEAD +======= + if("nukeLog") + current_state.log.Cut() + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lua_editor/ui_close(mob/user) . = ..() diff --git a/code/modules/admin/verbs/lua/lua_state.dm b/code/modules/admin/verbs/lua/lua_state.dm index bf2bcbd5a90..7e1ccce16d4 100644 --- a/code/modules/admin/verbs/lua/lua_state.dm +++ b/code/modules/admin/verbs/lua/lua_state.dm @@ -1,5 +1,6 @@ #define MAX_LOG_REPEAT_LOOKBACK 5 +<<<<<<< HEAD GLOBAL_VAR_INIT(IsLuaCall, FALSE) GLOBAL_PROTECT(IsLuaCall) @@ -10,6 +11,18 @@ GLOBAL_PROTECT(lua_usr) var/name /// The internal ID of the lua state stored in auxlua's global map +======= +GLOBAL_DATUM(lua_usr, /mob) +GLOBAL_PROTECT(lua_usr) + +GLOBAL_LIST_EMPTY_TYPED(lua_state_stack, /datum/weakref) +GLOBAL_PROTECT(lua_state_stack) + +/datum/lua_state + var/display_name + + /// The internal ID of the lua state stored in dreamluau's state list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/internal_id /// A log of every return, yield, and error for each chunk execution and function call @@ -18,15 +31,24 @@ GLOBAL_PROTECT(lua_usr) /// A list of all the variables in the state's environment var/list/globals = list() +<<<<<<< HEAD /// A list in which to store datums and lists instantiated in lua, ensuring that they don't get garbage collected var/list/references = list() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Ckey of the last user who ran a script on this lua state. var/ckey_last_runner = "" /// Whether the timer.lua script has been included into this lua context state. var/timer_enabled = FALSE +<<<<<<< HEAD +======= + /// Whether to supress logging BYOND runtimes for this state. + var/supress_runtimes = FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Callbacks that need to be ran on next tick var/list/functions_to_execute = list() @@ -39,24 +61,46 @@ GLOBAL_PROTECT(lua_usr) if(SSlua.initialized != TRUE) qdel(src) return +<<<<<<< HEAD name = _name internal_id = __lua_new_state() /datum/lua_state/proc/check_if_slept(result) if(result["status"] == "sleeping") +======= + display_name = _name + internal_id = DREAMLUAU_NEW_STATE() + if(isnull(internal_id)) + stack_trace("dreamluau is not loaded") + qdel(src) + else if(!isnum(internal_id)) + stack_trace(internal_id) + qdel(src) + +/datum/lua_state/proc/check_if_slept(result) + if(result["status"] == "sleep") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSlua.sleeps += src /datum/lua_state/proc/log_result(result, verbose = TRUE) if(!islist(result)) return +<<<<<<< HEAD if(!verbose && result["status"] != "errored" && result["status"] != "bad return" \ && !(result["name"] == "input" && (result["status"] == "finished" || length(result["param"])))) +======= + var/status = result["status"] + if(!verbose && status != "error" && status != "panic" && status != "runtime" && !(result["name"] == "input" && (status == "finished" || length(result["return_values"])))) + return + if(status == "runtime" && supress_runtimes) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/append_to_log = TRUE var/index_of_log if(log.len) for(var/index in log.len to max(log.len - MAX_LOG_REPEAT_LOOKBACK, 1) step -1) var/list/entry = log[index] +<<<<<<< HEAD if(entry["status"] == result["status"] \ && entry["chunk"] == result["chunk"] \ && entry["name"] == result["name"] \ @@ -70,24 +114,61 @@ GLOBAL_PROTECT(lua_usr) if(append_to_log) if(islist(result["param"])) result["param"] = weakrefify_list(encode_text_and_nulls(result["param"])) +======= + if(!compare_lua_logs(entry, result)) + continue + if(!entry["repeats"]) + entry["repeats"] = 0 + index_of_log = index + entry["repeats"]++ + append_to_log = FALSE + break + if(append_to_log) + if(islist(result["return_values"])) + add_lua_return_value_variants(result["return_values"], result["variants"]) + result["return_values"] = weakrefify_list(result["return_values"]) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log += list(result) index_of_log = log.len INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/lua_state, update_editors)) return index_of_log +<<<<<<< HEAD /datum/lua_state/proc/load_script(script) GLOB.IsLuaCall = TRUE var/tmp_usr = GLOB.lua_usr GLOB.lua_usr = usr var/result = __lua_load(internal_id, script) GLOB.IsLuaCall = FALSE +======= +/datum/lua_state/proc/parse_error(message, name) + if(copytext(message, 1, 7) == "PANIC:") + return list("status" = "panic", "message" = copytext(message, 7), "name" = name) + else + return list("status" = "error", "message" = message, "name" = name) + +/datum/lua_state/proc/load_script(script) + var/tmp_usr = GLOB.lua_usr + GLOB.lua_usr = usr + DREAMLUAU_SET_USR + GLOB.lua_state_stack += WEAKREF(src) + var/result = DREAMLUAU_LOAD(internal_id, script, "input") + SSlua.needs_gc_cycle |= src + pop(GLOB.lua_state_stack) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.lua_usr = tmp_usr // Internal errors unrelated to the code being executed are returned as text rather than lists if(isnull(result)) +<<<<<<< HEAD result = list("status" = "errored", "param" = "__lua_load returned null (it may have runtimed - check the runtime logs)", "name" = "input") if(istext(result)) result = list("status" = "errored", "param" = result, "name" = "input") +======= + result = list("status" = "error", "message" = "load returned null (it may have runtimed - check the runtime logs)", "name" = "input") + if(istext(result)) + result = parse_error(result, "input") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 result["chunk"] = script check_if_slept(result) @@ -109,6 +190,7 @@ GLOBAL_PROTECT(lua_usr) if(islist(function)) var/list/new_function_path = list() for(var/path_element in function) +<<<<<<< HEAD new_function_path += path_element function = new_function_path @@ -123,10 +205,38 @@ GLOBAL_PROTECT(lua_usr) result = list("status" = "errored", "param" = "__lua_call returned null (it may have runtimed - check the runtime logs)", "name" = islist(function) ? jointext(function, ".") : function) if(istext(result)) result = list("status" = "errored", "param" = result, "name" = islist(function) ? jointext(function, ".") : function) +======= + if(isweakref(path_element)) + var/datum/weakref/weak_ref = path_element + var/resolved = weak_ref.hard_resolve() + if(!resolved) + return list("status" = "error", "message" = "Weakref in function path ([weak_ref] [text_ref(weak_ref)]) resolved to null.", "name" = jointext(function, ".")) + new_function_path += resolved + else + new_function_path += path_element + function = new_function_path + else + function = list(function) + + var/tmp_usr = GLOB.lua_usr + GLOB.lua_usr = usr + DREAMLUAU_SET_USR + GLOB.lua_state_stack += WEAKREF(src) + var/result = DREAMLUAU_CALL_FUNCTION(internal_id, function, call_args) + SSlua.needs_gc_cycle |= src + pop(GLOB.lua_state_stack) + GLOB.lua_usr = tmp_usr + + if(isnull(result)) + result = list("status" = "error", "message" = "call_function returned null (it may have runtimed - check the runtime logs)", "name" = jointext(function, ".")) + if(istext(result)) + result = parse_error(result, jointext(function, ".")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_if_slept(result) return result /datum/lua_state/proc/call_function_return_first(function, ...) +<<<<<<< HEAD var/list/result = call_function(arglist(args)) log_result(result, verbose = FALSE) if(length(result)) @@ -142,12 +252,37 @@ GLOBAL_PROTECT(lua_usr) result = list("status" = "errored", "param" = "__lua_awaken returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted awaken") if(istext(result)) result = list("status" = "errored", "param" = result, "name" = "An attempted awaken") +======= + SHOULD_NOT_SLEEP(TRUE) // This function is meant to be used for signal handlers. + var/list/result = call_function(arglist(args)) + INVOKE_ASYNC(src, PROC_REF(log_result), deep_copy_list(result), /*verbose = */FALSE) + if(length(result)) + if(islist(result["return_values"]) && length(result["return_values"])) + var/return_value = result["return_values"][1] + var/variant = (islist(result["variants"]) && length(result["variants"])) && result["variants"][1] + if(islist(return_value) && islist(variant)) + remove_non_dm_variants(return_value, variant) + return return_value + +/datum/lua_state/proc/awaken() + DREAMLUAU_SET_USR + GLOB.lua_state_stack += WEAKREF(src) + var/result = DREAMLUAU_AWAKEN(internal_id) + SSlua.needs_gc_cycle |= src + pop(GLOB.lua_state_stack) + + if(isnull(result)) + result = list("status" = "error", "message" = "awaken returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted awaken") + if(istext(result)) + result = parse_error(result, "An attempted awaken") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_if_slept(result) return result /// Prefer calling SSlua.queue_resume over directly calling this /datum/lua_state/proc/resume(index, ...) var/call_args = length(args) > 1 ? args.Copy(2) : list() +<<<<<<< HEAD var/msg = "[key_name(usr)] resumed a lua coroutine with arguments: [english_list(call_args)]" log_lua(msg) @@ -159,10 +294,24 @@ GLOBAL_PROTECT(lua_usr) result = list("status" = "errored", "param" = "__lua_resume returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted resume") if(istext(result)) result = list("status" = "errored", "param" = result, "name" = "An attempted resume") +======= + + DREAMLUAU_SET_USR + GLOB.lua_state_stack += WEAKREF(src) + var/result = DREAMLUAU_RESUME(internal_id, index, call_args) + SSlua.needs_gc_cycle |= src + pop(GLOB.lua_state_stack) + + if(isnull(result)) + result = list("status" = "error", "param" = "resume returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted resume") + if(istext(result)) + result = parse_error(result, "An attempted resumt") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_if_slept(result) return result /datum/lua_state/proc/get_globals() +<<<<<<< HEAD globals = weakrefify_list(encode_text_and_nulls(__lua_get_globals(internal_id))) /datum/lua_state/proc/get_tasks() @@ -170,6 +319,36 @@ GLOBAL_PROTECT(lua_usr) /datum/lua_state/proc/kill_task(task_info) __lua_kill_task(internal_id, task_info) +======= + var/result = DREAMLUAU_GET_GLOBALS(internal_id) + if(isnull(result)) + CRASH("get_globals returned null") + if(istext(result)) + CRASH(result) + var/list/new_globals = result + var/list/values = new_globals["values"] + var/list/variants = new_globals["variants"] + add_lua_editor_variants(values, variants) + globals = list("values" = weakrefify_list(values), "variants" = variants) + +/datum/lua_state/proc/get_tasks() + var/result = DREAMLUAU_LIST_THREADS(internal_id) + if(isnull(result)) + CRASH("list_threads returned null") + if(istext(result)) + CRASH(result) + return result + +/datum/lua_state/proc/kill_task(is_sleep, index) + var/result = is_sleep ? DREAMLUAU_KILL_SLEEPING_THREAD(internal_id, index) : DREAMLUAU_KILL_YIELDED_THREAD(internal_id, index) + SSlua.needs_gc_cycle |= src + return result + +/datum/lua_state/proc/collect_garbage() + var/result = DREAMLUAU_COLLECT_GARBAGE(internal_id) + if(!isnull(result)) + CRASH(result) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lua_state/proc/update_editors() var/list/editor_list = LAZYACCESS(SSlua.editors, text_ref(src)) @@ -177,6 +356,7 @@ GLOBAL_PROTECT(lua_usr) for(var/datum/lua_editor/editor as anything in editor_list) SStgui.update_uis(editor) +<<<<<<< HEAD /// Called by lua scripts when they add an atom to var/list/references so that it gets cleared up on delete. /datum/lua_state/proc/clear_on_delete(datum/to_clear) RegisterSignal(to_clear, COMSIG_QDELETING, PROC_REF(on_delete)) @@ -191,4 +371,6 @@ GLOBAL_PROTECT(lua_usr) SIGNAL_HANDLER references -= to_clear +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAX_LOG_REPEAT_LOOKBACK diff --git a/code/modules/admin/verbs/machine_upgrade.dm b/code/modules/admin/verbs/machine_upgrade.dm index 258de6bcf4d..bb0d993ef0d 100644 --- a/code/modules/admin/verbs/machine_upgrade.dm +++ b/code/modules/admin/verbs/machine_upgrade.dm @@ -1,5 +1,10 @@ +<<<<<<< HEAD ADMIN_VERB(machine_upgrade, R_DEBUG, "Tweak Component Ratings", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, obj/machinery/machine in world) var/new_rating = input(user, "Enter new rating:","Num") as num|null +======= +ADMIN_VERB_AND_CONTEXT_MENU(machine_upgrade, R_DEBUG, "Tweak Component Ratings", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, obj/machinery/machine in world) + var/new_rating = tgui_input_number(user, "", "Enter new rating:") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(new_rating && machine.component_parts) for(var/obj/item/stock_parts/P in machine.component_parts) P.rating = new_rating diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm index bfb5050dafa..9eedcd4184a 100644 --- a/code/modules/admin/verbs/manipulate_organs.dm +++ b/code/modules/admin/verbs/manipulate_organs.dm @@ -18,10 +18,14 @@ ADMIN_VERB(manipulate_organs, R_DEBUG, "Manipulate Organs", "Manipulate the orga return organ_to_grant = organs[organ_to_grant] organ_to_grant = new organ_to_grant +<<<<<<< HEAD if(!organ_to_grant.Insert(carbon_victim)) to_chat(user, span_notice("[carbon_victim] is unable to carry this organ!")) qdel(organ_to_grant) return +======= + organ_to_grant.Insert(carbon_victim) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_admin("[key_name(user)] has added organ [organ_to_grant.type] to [key_name(carbon_victim)]") message_admins("[key_name_admin(user)] has added organ [organ_to_grant.type] to [ADMIN_LOOKUPFLW(carbon_victim)]") diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 5c1647a5edb..04f639edafb 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -203,9 +203,15 @@ ADMIN_VERB(create_mapping_job_icons, R_DEBUG, "Generate job landmarks icons", "G var/datum/job/JB = new job switch(JB.title) if(JOB_AI) +<<<<<<< HEAD job_key_to_icon["AI"] = icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1) // SKYRAT EDIT CHANGE - ORIGINAL: final.Insert(icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1), "AI") if(JOB_CYBORG) job_key_to_icon["Cyborg"] = icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1) // SKYRAT EDIT CHANGE - ORIGINAL: final.Insert(icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1), "Cyborg") +======= + final.Insert(icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1), "AI") + if(JOB_CYBORG) + final.Insert(icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1), "Cyborg") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else for(var/obj/item/I in D) qdel(I) @@ -342,7 +348,11 @@ ADMIN_VERB(check_for_obstructed_atmospherics, R_DEBUG, "Check For Obstructed Atm var/list/results = list() +<<<<<<< HEAD results += "

Anything that is considered to aesthetically obstruct an atmospherics machine (vent, scrubber, port) is listed below. Please re-arrange to accomodate for this.


" +======= + results += "

Anything that is considered to aesthetically obstruct an atmospherics machine (vent, scrubber, port) is listed below. Please re-arrange to accommodate for this.


" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Ignore out stuff we see in normal and standard mapping that we don't care about (false alarms). Typically stuff that goes directionally off turfs or other undertile objects that we don't want to care about. var/list/ignore_list = list( diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 107d74d9c39..42581e302bb 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -41,7 +41,11 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w #define THUNDERDOME_TEMPLATE_FILE "admin_thunderdome.dmm" #define HIGHLANDER_DELAY_TEXT "40 seconds (crush the hope of a normal shift)" +<<<<<<< HEAD /datum/secrets_menu/ui_act(action, params) +======= +/datum/secrets_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -526,7 +530,11 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w var/forename = names.len > 1 ? names[2] : names[1] var/newname = "[forename]-[pick(honorifics["[H.gender]"])]" H.fully_replace_character_name(H.real_name,newname) +<<<<<<< HEAD H.update_mutant_bodyparts() +======= + H.update_body_parts() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(animetype == "Yes") var/seifuku = pick(typesof(/obj/item/clothing/under/costume/schoolgirl)) var/obj/item/clothing/under/costume/schoolgirl/I = new seifuku diff --git a/code/modules/admin/verbs/server.dm b/code/modules/admin/verbs/server.dm index f0817f06a36..f5f560dc721 100644 --- a/code/modules/admin/verbs/server.dm +++ b/code/modules/admin/verbs/server.dm @@ -96,8 +96,13 @@ ADMIN_VERB(start_now, R_SERVER, "Start Now", "Start the round RIGHT NOW.", ADMIN if(SSticker.start_immediately) SSticker.start_immediately = FALSE +<<<<<<< HEAD SSticker.SetTimeLeft(1800) to_chat(world, span_infoplain(span_bold("The game will start in 180 seconds."))) +======= + SSticker.SetTimeLeft(3 MINUTES) + to_chat(world, span_big(span_notice("The game will start in 3 minutes."))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) message_admins(span_adminnotice("[key_name_admin(user)] has cancelled immediate game start. Game will start in 3 minutes.")) log_admin("[key_name(user)] has cancelled immediate game start.") @@ -115,8 +120,12 @@ ADMIN_VERB(start_now, R_SERVER, "Start Now", "Start the round RIGHT NOW.", ADMIN message_admins("The server is still setting up, but the round will be started as soon as possible.") BLACKBOX_LOG_ADMIN_VERB("Start Now") +<<<<<<< HEAD // ADMIN_VERB(delay_round_end, R_SERVER, "Delay Round End", "Prevent the server from restarting.", ADMIN_CATEGORY_SERVER) ADMIN_VERB(delay_round_end, R_ADMIN, "Delay Round End", "Prevent the server from restarting.", ADMIN_CATEGORY_SERVER) // SKYRAT EDIT -- ORIGINAL ABOVE +======= +ADMIN_VERB(delay_round_end, R_SERVER, "Delay Round End", "Prevent the server from restarting.", ADMIN_CATEGORY_SERVER) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSticker.delay_end) tgui_alert(user, "The round end is already delayed. The reason for the current delay is: \"[SSticker.admin_delay_notice]\"", "Alert", list("Ok")) return @@ -151,8 +160,13 @@ ADMIN_VERB(toggle_ai, R_SERVER, "Toggle AI", "Toggle the ability to choose AI jo if (alai) to_chat(world, span_bold("The AI job is no longer chooseable."), confidential = TRUE) else +<<<<<<< HEAD to_chat(world, span_bold("The AI job is chooseable now."), confidential = TRUE) log_admin("[key_name(usr)] toggled AI allowed.") +======= + to_chat(world, "The AI job is chooseable now.", confidential = TRUE) + log_admin("[key_name(user)] toggled AI allowed.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 world.update_status() SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle AI", "[!alai ? "Disabled" : "Enabled"]")) // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! @@ -203,8 +217,13 @@ ADMIN_VERB(delay, R_SERVER, "Delay Pre-Game", "Delay the game start.", ADMIN_CAT SSticker.SetTimeLeft(newtime) SSticker.start_immediately = FALSE if(newtime < 0) +<<<<<<< HEAD to_chat(world, span_infoplain(span_bold("The game start has been delayed.")), confidential = TRUE) log_admin("[key_name(usr)] delayed the round start.") +======= + to_chat(world, "The game start has been delayed.", confidential = TRUE) + log_admin("[key_name(user)] delayed the round start.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else to_chat(world, span_infoplain(span_bold("The game will start in [DisplayTimeText(newtime)].")), confidential = TRUE) SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) @@ -238,7 +257,13 @@ ADMIN_VERB(toggle_guests, R_SERVER, "Toggle Guests", "Toggle the ability for gue if (new_guest_ban) to_chat(world, span_bold("Guests may no longer enter the game."), confidential = TRUE) else +<<<<<<< HEAD to_chat(world, span_bold("Guests may now enter the game."), confidential = TRUE) log_admin("[key_name(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.") message_admins(span_adminnotice("[key_name_admin(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.")) +======= + to_chat(world, "Guests may now enter the game.", confidential = TRUE) + log_admin("[key_name(user)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.") + message_admins(span_adminnotice("[key_name_admin(user)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Guests", "[!new_guest_ban ? "Enabled" : "Disabled"]")) // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm index 0a33acb0692..4ca4ab96b5d 100644 --- a/code/modules/admin/verbs/shuttlepanel.dm +++ b/code/modules/admin/verbs/shuttlepanel.dm @@ -3,13 +3,18 @@ ADMIN_VERB(shuttle_panel, R_ADMIN, "Shuttle Manipulator", "Opens the shuttle man /obj/docking_port/mobile/proc/admin_fly_shuttle(mob/user) var/list/options = list() +<<<<<<< HEAD options += "-----COMPATABLE DOCKS:" //SKYRAT EDIT ADDITION +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/port in SSshuttle.stationary_docking_ports) if (istype(port, /obj/docking_port/stationary/transit)) continue // please don't do this var/obj/docking_port/stationary/S = port if (canDock(S) == SHUTTLE_CAN_DOCK) options[S.name || S.shuttle_id] = S +<<<<<<< HEAD //SKYRAT EDIT ADDITION START options += "-----INCOMPATABLE DOCKS:" //I WILL CRASH THIS SHIP WITH NO SURVIVORS! for(var/port in SSshuttle.stationary_docking_ports) @@ -19,6 +24,8 @@ ADMIN_VERB(shuttle_panel, R_ADMIN, "Shuttle Manipulator", "Opens the shuttle man if(!(canDock(S) == SHUTTLE_CAN_DOCK)) options[S.name || S.shuttle_id] = S //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 options += "--------" options += "Infinite Transit" diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm index d9a1b90b0af..b4544a94848 100644 --- a/code/modules/admin/view_variables/debug_variables.dm +++ b/code/modules/admin/view_variables/debug_variables.dm @@ -29,7 +29,11 @@ return "[.][item]" +<<<<<<< HEAD // This is split into a seperate proc mostly to make errors that happen not break things too much +======= +// This is split into a separate proc mostly to make errors that happen not break things too much +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/_debug_variable_value(name, value, level, datum/owner, sanitize, display_flags) if(isappearance(value)) value = get_vv_appearance(value) @@ -64,11 +68,19 @@ var/datum/datum_value = value return datum_value.debug_variable_value(name, level, owner, sanitize, display_flags) +<<<<<<< HEAD if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists arent detectable as a list through istype var/list/list_value = value var/list/items = list() // This is becuse some lists either dont count as lists or a locate on their ref will return null +======= + if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists aren't detectable as a list through istype + var/list/list_value = value + var/list/items = list() + + // This is because some lists either don't count as lists or a locate on their ref will return null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/link_vars = "Vars=[REF(value)]" if(name in GLOB.vv_special_lists) link_vars = "Vars=[REF(owner)];special_varname=[name]" diff --git a/code/modules/admin/view_variables/filterrific.dm b/code/modules/admin/view_variables/filterrific.dm index 0bd9f51c114..f8e4f57c68b 100644 --- a/code/modules/admin/view_variables/filterrific.dm +++ b/code/modules/admin/view_variables/filterrific.dm @@ -24,7 +24,11 @@ data["target_filter_data"] = target.filter_data return data +<<<<<<< HEAD /datum/filter_editor/ui_act(action, list/params) +======= +/datum/filter_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm index fa5fde1f20e..7661aced395 100644 --- a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm +++ b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm @@ -42,7 +42,11 @@ data["pixelated"] = target.appearance_flags & PIXEL_SCALE return data +<<<<<<< HEAD /datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params) +======= +/datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -52,7 +56,11 @@ var/matrix_var_name = params["var_name"] var/matrix_var_value = params["var_value"] if(testing_matrix.vv_edit_var(matrix_var_name, matrix_var_value) == FALSE) +<<<<<<< HEAD to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on github.", confidential = TRUE) +======= + to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on GitHub.", confidential = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return set_transform() if("scale") diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index fde0e1a4172..6ebd279969a 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -128,7 +128,11 @@ GLOBAL_LIST_EMPTY(antagonists) ui = new(user, src, ui_name, name) ui.open() +<<<<<<< HEAD /datum/antagonist/ui_act(action, params) +======= +/datum/antagonist/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -345,7 +349,10 @@ GLOBAL_LIST_EMPTY(antagonists) /datum/antagonist/proc/greet() if(!silent) to_chat(owner.current, span_big("You are \the [src].")) +<<<<<<< HEAD to_chat(owner.current, span_infoplain(span_doyourjobidiot("Remember that being an antagonist does not exclude you from the server rules regarding RP standards."))) //SKYRAT EDIT - RP REMINDER +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 play_stinger() /// Plays the antag stinger sound, if we have one diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index bbc5c7a7b03..42e8973a757 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -45,7 +45,11 @@ get_asset_datum(/datum/asset/simple/contracts), ) +<<<<<<< HEAD /obj/item/antag_spawner/contract/ui_act(action, list/params) +======= +/obj/item/antag_spawner/contract/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(used || polling || !ishuman(usr)) return diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index ef68ea4e602..c82c1741c74 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -16,11 +16,14 @@ /// Type path for the associated job datum. var/role_job = /datum/job/abductor_agent +<<<<<<< HEAD /datum/antagonist/abductor/New() // lets get the loading started now, but don't block waiting for it INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, lazy_load_template), LAZY_TEMPLATE_KEY_ABDUCTOR_SHIPS) return ..() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/abductor/get_preview_icon() var/mob/living/carbon/human/dummy/consistent/scientist = new var/mob/living/carbon/human/dummy/consistent/agent = new @@ -162,7 +165,11 @@ ..() team_number = team_count++ name = "Mothership [pick(GLOB.greek_letters)]" //TODO Ensure unique and actual alieny names +<<<<<<< HEAD //add_objective(new /datum/objective/experiment) //SKYRAT EDIT REMOVAL +======= + add_objective(new /datum/objective/experiment) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/team/abductor_team/roundend_report() var/list/result = list() diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm index d3f162f5fb5..ecb56ddf70c 100644 --- a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm +++ b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm @@ -384,7 +384,11 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/melee/baton/abductor/proc/SleepAttack(mob/living/target, mob/living/user) playsound(src, on_stun_sound, 50, TRUE, -1) +<<<<<<< HEAD if(target.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) +======= + if(INCAPACITATED_IGNORING(target, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(target.can_block_magic(MAGIC_RESISTANCE_MIND)) to_chat(user, span_warning("The specimen has some kind of mental protection that is interfering with the sleep inducement! It seems you've been foiled.")) target.visible_message(span_danger("[user] tried to induced sleep in [target] with [src], but is unsuccessful!"), \ @@ -689,7 +693,11 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/abductor/alien_omnitool/proc/check_menu(mob/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 29ea5f1e785..05ba5c7f531 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -84,7 +84,11 @@ active_mind_control = FALSE return TRUE +<<<<<<< HEAD /obj/item/organ/internal/heart/gland/Remove(mob/living/carbon/gland_owner, special, movement_flags) +======= +/obj/item/organ/internal/heart/gland/mob_remove(mob/living/carbon/gland_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() active = FALSE if(initial(uses) == 1) @@ -93,10 +97,15 @@ hud.remove_atom_from_hud(gland_owner) clear_mind_control() +<<<<<<< HEAD /obj/item/organ/internal/heart/gland/Insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() if(!.) return +======= +/obj/item/organ/internal/heart/gland/mob_insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(special != 2 && uses) // Special 2 means abductor surgery Start() diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index ee729de7068..3dcdaf5a5b0 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -118,7 +118,7 @@ data["vest_lock"] = HAS_TRAIT_FROM(vest, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) return data -/obj/machinery/abductor/console/ui_act(action, list/params) +/obj/machinery/abductor/console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/antagonists/abductor/machinery/dispenser.dm b/code/modules/antagonists/abductor/machinery/dispenser.dm index 8d8f9e14b89..416153c50e5 100644 --- a/code/modules/antagonists/abductor/machinery/dispenser.dm +++ b/code/modules/antagonists/abductor/machinery/dispenser.dm @@ -48,7 +48,7 @@ data["glands"] += list(gland_information) return data -/obj/machinery/abductor/gland_dispenser/ui_act(action, list/params) +/obj/machinery/abductor/gland_dispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm index a549171b661..09790f4ba89 100644 --- a/code/modules/antagonists/abductor/machinery/experiment.dm +++ b/code/modules/antagonists/abductor/machinery/experiment.dm @@ -86,7 +86,7 @@ data["occupant_status"] = mob_occupant.stat return data -/obj/machinery/abductor/experiment/ui_act(action, list/params) +/obj/machinery/abductor/experiment/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/antagonists/ashwalker/ashwalker.dm b/code/modules/antagonists/ashwalker/ashwalker.dm index eeba85982cd..9d169c9315d 100644 --- a/code/modules/antagonists/ashwalker/ashwalker.dm +++ b/code/modules/antagonists/ashwalker/ashwalker.dm @@ -27,7 +27,11 @@ /datum/antagonist/ashwalker/on_gain() . = ..() RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate)) +<<<<<<< HEAD //owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key) //SKYRAT EDIT REMOVAL - ASH RITUALS +======= + owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(FACTION_NEUTRAL in owner.current.faction) owner.current.faction.Remove(FACTION_NEUTRAL) // ashwalkers aren't neutral; they're ashwalker-aligned diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 6a08d0d9a71..219d440c3dd 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -137,10 +137,16 @@ brother1.dna.features["ethcolor"] = GLOB.color_list_ethereal["Faint Red"] brother1.set_species(/datum/species/ethereal) +<<<<<<< HEAD brother2.dna.features["mcolor"] = "#E5CD99" // SKYRAT EDIT ADDITION - Customization brother2.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: brother2.dna.features["moth_antennae"] = "Plain" brother2.dna.mutant_bodyparts["moth_markings"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: brother2.dna.features["moth_markings"] = "None" brother2.dna.mutant_bodyparts["wings"] = list(MUTANT_INDEX_NAME = "Moth (Plain)", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: brother2.dna.features["moth_wings"] = "Plain" +======= + brother2.dna.features["moth_antennae"] = "Plain" + brother2.dna.features["moth_markings"] = "None" + brother2.dna.features["moth_wings"] = "Plain" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 brother2.set_species(/datum/species/moth) var/icon/brother1_icon = render_preview_outfit(/datum/outfit/job/quartermaster, brother1) diff --git a/code/modules/antagonists/changeling/cellular_emporium.dm b/code/modules/antagonists/changeling/cellular_emporium.dm index 68e83ea25e6..01f7e0daf9d 100644 --- a/code/modules/antagonists/changeling/cellular_emporium.dm +++ b/code/modules/antagonists/changeling/cellular_emporium.dm @@ -69,7 +69,11 @@ return data +<<<<<<< HEAD /datum/cellular_emporium/ui_act(action, params) +======= +/datum/cellular_emporium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index e5ca28c3d75..95577433281 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -30,7 +30,11 @@ /// The original profile of this changeling. var/datum/changeling_profile/first_profile = null /// How many DNA strands the changeling can store for transformation. +<<<<<<< HEAD var/dna_max = 8 // SKYRAT EDIT - ORIGINAL: 6 +======= + var/dna_max = 6 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The amount of DNA gained. Includes DNA sting. var/absorbed_count = 0 /// The amount of DMA gained using absorb, not DNA sting. Start with one (your original DNA) @@ -48,9 +52,15 @@ /// Changeling name, what other lings see over the hivemind when talking. var/changelingID = "Changeling" /// The number of genetics points (to buy powers) this ling currently has. +<<<<<<< HEAD var/genetic_points = 15 // SKYRAT EDIT - ORIGINAL: 10 /// The max number of genetics points (to buy powers) this ling can have.. var/total_genetic_points = 15 // SKYRAT EDIT - ORIGINAL: 10 +======= + var/genetic_points = 10 + /// The max number of genetics points (to buy powers) this ling can have.. + var/total_genetic_points = 10 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// List of all powers we start with. var/list/innate_powers = list() /// Associated list of all powers we have evolved / bought from the emporium. [path] = [instance of path] @@ -86,7 +96,11 @@ var/static/list/slot2type = list( "head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, +<<<<<<< HEAD "wear_neck" = /obj/item/changeling, // SKYRAT EDIT +======= + "wear_neck" = /obj/item/changeling, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "back" = /obj/item/changeling, "wear_suit" = /obj/item/clothing/suit/changeling, "w_uniform" = /obj/item/clothing/under/changeling, @@ -102,6 +116,7 @@ /// A list of all memories we've stolen through absorbs. var/list/stolen_memories = list() +<<<<<<< HEAD var/true_form_death //SKYRAT EDIT ADDITION: The time that the horror form died. // SKYRAT EDIT START @@ -127,6 +142,10 @@ "Friendly", ) // SKYRAT EDIT END +======= + /// Keeps track of the currently selected profile. + var/datum/changeling_profile/current_profile +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/changeling/New() . = ..() @@ -140,6 +159,10 @@ /datum/antagonist/changeling/Destroy() QDEL_NULL(emporium_action) QDEL_NULL(cellular_emporium) +<<<<<<< HEAD +======= + current_profile = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/antagonist/changeling/on_gain() @@ -560,6 +583,7 @@ // Clothes, of course new_profile.underwear = target.underwear +<<<<<<< HEAD new_profile.undershirt = target.undershirt new_profile.socks = target.socks // SKYRAT EDIT ADDITION START @@ -576,6 +600,11 @@ new_profile.target_body_scaling = target.get_mob_height() new_profile.target_size = target.mob_size //SKYRAT EDIT ADDITION END +======= + new_profile.underwear_color = target.underwear_color + new_profile.undershirt = target.undershirt + new_profile.socks = target.socks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Grab skillchips they have new_profile.skillchips = target.clone_skillchip_list(TRUE) @@ -595,7 +624,11 @@ // Grab the target's sechut icon. new_profile.id_icon = target.wear_id?.get_sechud_job_icon_state() +<<<<<<< HEAD var/list/slots = list("head", "wear_mask", "wear_neck", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") // SKYRAT EDIT +======= + var/list/slots = list("head", "wear_mask", "wear_neck", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/slot in slots) if(!(slot in target.vars)) continue @@ -611,6 +644,7 @@ new_profile.worn_icon_list[slot] = clothing_item.worn_icon new_profile.worn_icon_state_list[slot] = clothing_item.worn_icon_state new_profile.exists_list[slot] = 1 +<<<<<<< HEAD // SKYRAT EDIT ADDITION START new_profile.worn_icon_digi_list[slot] = clothing_item.worn_icon_digi new_profile.worn_icon_monkey_list[slot] = clothing_item.worn_icon_monkey @@ -618,6 +652,8 @@ new_profile.worn_icon_vox_list[slot] = clothing_item.worn_icon_vox new_profile.supports_variations_flags_list[slot] = clothing_item.supports_variations_flags // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_profile.voice = target.voice new_profile.voice_filter = target.voice_filter @@ -637,7 +673,11 @@ if(!first_profile) first_profile = new_profile +<<<<<<< HEAD current_profile = first_profile // SKYRAT EDIT +======= + current_profile = first_profile +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stored_profiles += new_profile absorbed_count++ @@ -788,7 +828,11 @@ var/static/list/slot2slot = list( "head" = ITEM_SLOT_HEAD, "wear_mask" = ITEM_SLOT_MASK, +<<<<<<< HEAD "wear_neck" = ITEM_SLOT_NECK, // SKYRAT EDIT +======= + "wear_neck" = ITEM_SLOT_NECK, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "back" = ITEM_SLOT_BACK, "wear_suit" = ITEM_SLOT_OCLOTHING, "w_uniform" = ITEM_SLOT_ICLOTHING, @@ -804,11 +848,16 @@ var/datum/dna/chosen_dna = chosen_profile.dna user.real_name = chosen_profile.name user.underwear = chosen_profile.underwear +<<<<<<< HEAD +======= + user.underwear_color = chosen_profile.underwear_color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.undershirt = chosen_profile.undershirt user.socks = chosen_profile.socks user.age = chosen_profile.age user.physique = chosen_profile.physique user.mind?.set_level(/datum/skill/athletics, chosen_profile.athletics_level, silent = TRUE) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START user.bra = chosen_profile.bra @@ -839,6 +888,8 @@ user.add_quirk(target_quirk.type) break // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.voice = chosen_profile.voice user.voice_filter = chosen_profile.voice_filter @@ -847,7 +898,11 @@ for(var/obj/item/bodypart/limb as anything in user.bodyparts) limb.update_limb(is_creating = TRUE) +<<<<<<< HEAD user.updateappearance(mutcolor_update = TRUE, eyeorgancolor_update = TRUE) // SKYRAT EDIT +======= + user.updateappearance(mutcolor_update = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.domutcheck() // Get rid of any scars from previous Changeling-ing @@ -920,6 +975,7 @@ new_flesh_item.worn_icon = chosen_profile.worn_icon_list[slot] new_flesh_item.worn_icon_state = chosen_profile.worn_icon_state_list[slot] +<<<<<<< HEAD // SKYRAT EDIT START new_flesh_item.worn_icon_digi = chosen_profile.worn_icon_digi_list[slot] new_flesh_item.worn_icon_monkey = chosen_profile.worn_icon_monkey_list[slot] @@ -928,6 +984,8 @@ new_flesh_item.supports_variations_flags = chosen_profile.supports_variations_flags_list[slot] // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(istype(new_flesh_item, /obj/item/changeling/id) && chosen_profile.id_icon) var/obj/item/changeling/id/flesh_id = new_flesh_item flesh_id.hud_icon = chosen_profile.id_icon @@ -945,6 +1003,7 @@ user.regenerate_icons() user.name = user.get_visible_name() current_profile = chosen_profile +<<<<<<< HEAD // SKYRAT EDIT START chosen_dna.transfer_identity(user, TRUE) user.updateappearance(mutcolor_update = TRUE, eyeorgancolor_update = TRUE) @@ -955,6 +1014,8 @@ //this has to be at the end of the proc or it breaks everything below it, womp womp user.set_mob_height(chosen_profile.target_body_scaling) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Changeling profile themselves. Store a data to store what every DNA instance looked like. /datum/changeling_profile @@ -984,6 +1045,11 @@ var/list/worn_icon_state_list = list() /// The underwear worn by the profile source var/underwear +<<<<<<< HEAD +======= + /// The colour of the underwear worn by the profile source + var/underwear_color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The undershirt worn by the profile source var/undershirt /// The socks worn by the profile source @@ -1009,10 +1075,17 @@ /// The TTS filter of the profile filter var/voice_filter = "" +<<<<<<< HEAD /datum/changeling_profile/Destroy() qdel(dna) LAZYCLEARLIST(stored_scars) +======= +/datum/changeling_profile/Destroy() + qdel(dna) + LAZYCLEARLIST(stored_scars) + QDEL_LAZYLIST(quirks) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /* @@ -1032,6 +1105,10 @@ new_profile.righthand_file_list = righthand_file_list.Copy() new_profile.inhand_icon_state_list = inhand_icon_state_list.Copy() new_profile.underwear = underwear +<<<<<<< HEAD +======= + new_profile.underwear_color = underwear_color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_profile.undershirt = undershirt new_profile.socks = socks new_profile.worn_icon_list = worn_icon_list.Copy() @@ -1046,6 +1123,7 @@ new_profile.quirks = quirks.Copy() new_profile.voice = voice new_profile.voice_filter = voice_filter +<<<<<<< HEAD // SKYRAT EDIT ADDITION START new_profile.underwear_color = underwear_color new_profile.undershirt_color = undershirt_color @@ -1064,10 +1142,13 @@ new_profile.scream_type = scream_type new_profile.laugh_type = laugh_type // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/changeling/roundend_report() var/list/parts = list() +<<<<<<< HEAD // SKYRAT EDIT REMOVAL START /* var/changeling_win = TRUE @@ -1075,6 +1156,11 @@ changeling_win = FALSE */ // SKYRAT EDIT REMOVAL END +======= + var/changeling_win = TRUE + if(!owner.current) + changeling_win = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += printplayer(owner) parts += "Genomes Extracted: [absorbed_count]
" @@ -1082,6 +1168,7 @@ if(objectives.len) var/count = 1 for(var/datum/objective/objective in objectives) +<<<<<<< HEAD // SKYRAT EDIT START - No greentext /* if(!objective.check_completion()) @@ -1094,12 +1181,22 @@ // SKYRAT EDIT REMOVAL START - No greentext /* +======= + if(!objective.check_completion()) + changeling_win = FALSE + parts += "Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" + count++ + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(changeling_win) parts += span_greentext("The changeling was successful!") else parts += span_redtext("The changeling has failed.") +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - No greentext +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return parts.Join("
") diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index b50186b1ac4..fc8bad84eb5 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -99,7 +99,11 @@ the same goes for Remove(). if you override Remove(), call parent or else your p if(req_stat < user.stat) user.balloon_alert(user, "incapacitated!") return FALSE +<<<<<<< HEAD if((HAS_TRAIT(user, TRAIT_DEATHCOMA)) && (!ignores_fakedeath)) +======= + if(HAS_TRAIT(user, TRAIT_DEATHCOMA) && !ignores_fakedeath) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.balloon_alert(user, "playing dead!") return FALSE return TRUE diff --git a/code/modules/antagonists/changeling/headslug_eggs.dm b/code/modules/antagonists/changeling/headslug_eggs.dm index 8f861aec2ec..955c0be0fef 100644 --- a/code/modules/antagonists/changeling/headslug_eggs.dm +++ b/code/modules/antagonists/changeling/headslug_eggs.dm @@ -11,11 +11,19 @@ /// When this egg last got removed from a body. If -1, the egg hasn't been removed from a body. var/removal_time = -1 +<<<<<<< HEAD /obj/item/organ/internal/body_egg/changeling_egg/Insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() hatch_time = world.time + (removal_time == -1 ? EGG_INCUBATION_TIME : (hatch_time - removal_time)) /obj/item/organ/internal/body_egg/changeling_egg/Remove(mob/living/carbon/egg_owner, special, movement_flags) +======= +/obj/item/organ/internal/body_egg/changeling_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) + . = ..() + hatch_time = world.time + (removal_time == -1 ? EGG_INCUBATION_TIME : (hatch_time - removal_time)) + +/obj/item/organ/internal/body_egg/changeling_egg/mob_remove(mob/living/carbon/egg_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() removal_time = world.time diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm index 9fe7613cc4c..0cd8bfca14f 100644 --- a/code/modules/antagonists/changeling/powers/panacea.dm +++ b/code/modules/antagonists/changeling/powers/panacea.dm @@ -12,14 +12,20 @@ to_chat(user, span_notice("We cleanse impurities from our form.")) ..() var/list/bad_organs = list( +<<<<<<< HEAD user.get_organ_by_type(/obj/item/organ/internal/empowered_borer_egg), // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.get_organ_by_type(/obj/item/organ/internal/body_egg), user.get_organ_by_type(/obj/item/organ/internal/legion_tumour), user.get_organ_by_type(/obj/item/organ/internal/zombie_infection), ) +<<<<<<< HEAD try_to_mutant_cure(user) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/o in bad_organs) var/obj/item/organ/O = o diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index e3cbab0eddd..988a10b934d 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -47,10 +47,13 @@ return if(!isturf(user.loc)) return +<<<<<<< HEAD var/mob/living/carbon/human/to_check = target // SKYRAT EDIT START - STINGS DO NOT AFFECT ROBOTIC ENTITIES if(to_check.mob_biotypes & MOB_ROBOTIC) to_chat(user, "Our sting would have no effect on robotic entities") return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!length(get_path_to(user, target, max_distance = changeling.sting_range, simulated_only = FALSE))) return // no path within the sting's range is found. what a weird place to use the pathfinding system if(IS_CHANGELING(target)) diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm index 91766db08b0..482a36fabff 100644 --- a/code/modules/antagonists/changeling/powers/transform.dm +++ b/code/modules/antagonists/changeling/powers/transform.dm @@ -170,7 +170,10 @@ return ..() changeling.transform(user, chosen_prof) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(user, COMSIG_CHANGELING_TRANSFORM) return TRUE diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 203f1a672d9..3de98b50593 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -79,7 +79,11 @@ return qdel(nullify_spell) BS = possible_spells[entered_spell_name] +<<<<<<< HEAD if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (length(spells) >= limit)) +======= + if(QDELETED(src) || owner.incapacitated || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (length(spells) >= limit)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return to_chat(owner,span_warning("You begin to carve unnatural symbols into your flesh!")) SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10)) @@ -137,7 +141,11 @@ ..() /datum/action/innate/cult/blood_spell/IsAvailable(feedback = FALSE) +<<<<<<< HEAD if(!IS_CULTIST(owner) || owner.incapacitated() || (!charges && deletes_on_empty)) +======= + if(!IS_CULTIST(owner) || owner.incapacitated || (!charges && deletes_on_empty)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() @@ -433,6 +441,7 @@ /obj/item/melee/blood_magic/stun/cast_spell(mob/living/target, mob/living/carbon/user) if(!istype(target) || IS_CULTIST(target)) return +<<<<<<< HEAD var/datum/antagonist/cult/cultist = IS_CULTIST(user) var/datum/team/cult/cult_team = cultist.get_team() var/effect_coef = 1 @@ -440,6 +449,17 @@ effect_coef = 0.1 else if(cult_team.cult_risen) effect_coef = 0.4 +======= + var/datum/antagonist/cult/cultist = GET_CULTIST(user) + var/datum/team/cult/cult_team = cultist?.get_team() + var/effect_coef = 1 + if(cult_team?.cult_ascendent) + effect_coef = 0.1 + else if(cult_team?.cult_risen) + effect_coef = 0.4 + if(IS_CULTIST(user) && isnull(GET_CULTIST(user))) + effect_coef = 0.2 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message( span_warning("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!"), span_cult_italic("You attempt to stun [target] with the spell!"), @@ -464,6 +484,7 @@ to_chat(user, span_warning("An eldritch force intervenes as you touch [target], absorbing most of the effects!")) to_chat(target, span_warning("As [user] touches you with vile magicks, the Mansus absorbs most of the effects!")) target.balloon_alert_to_viewers("absorbed!") +<<<<<<< HEAD // SKYRAT EDIT ADDITION START else if(IS_CLOCK(target)) to_chat(user, span_warning("Some force greater than you intervenes! [target] is protected by the heretic Ratvar!")) @@ -472,6 +493,8 @@ target.color = rgb(190, 135, 0) animate(target, color = old_color, time = 1 SECONDS, easing = EASE_IN) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(target.can_block_magic()) to_chat(user, span_warning("The spell had no effect!")) else @@ -521,7 +544,11 @@ to_chat(user, span_warning("You must pick a valid rune!")) return var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? +<<<<<<< HEAD if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !actual_selected_rune) +======= + if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated || !actual_selected_rune) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/turf/dest = get_turf(actual_selected_rune) if(dest.is_blocked_turf(TRUE)) @@ -707,7 +734,11 @@ /obj/item/melee/blood_magic/construction/proc/check_menu(mob/user) if(!istype(user)) CRASH("The cult construct selection radial menu was accessed by something other than a valid user.") +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -973,7 +1004,11 @@ /obj/item/melee/blood_magic/manipulator/proc/check_menu(mob/living/user) if(!istype(user)) CRASH("The Blood Rites manipulator radial menu was accessed by something other than a valid user.") +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index a4f3b291f74..f34c972bc9d 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -120,7 +120,11 @@ if(!team_member.current) continue team_member.current.update_mob_action_buttons() +<<<<<<< HEAD if(team_member.current.incapacitated()) +======= + if(team_member.current.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue SEND_SOUND(team_member.current, 'sound/hallucinations/im_here1.ogg') to_chat(team_member.current, span_cult_large("Acolyte [nominee] has asserted that [nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly.")) @@ -129,19 +133,31 @@ ///Polls all Cultists on whether the person putting themselves forward should be made the Cult Leader, if they can actually be such. /proc/poll_cultists_for_leader(mob/living/nominee, datum/team/cult/team) +<<<<<<< HEAD if(QDELETED(nominee) || nominee.incapacitated()) +======= + if(QDELETED(nominee) || nominee.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 team.cult_vote_called = FALSE for(var/datum/mind/team_member as anything in team.members) if(!team_member.current) continue team_member.current.update_mob_action_buttons() +<<<<<<< HEAD if(team_member.current.incapacitated()) +======= + if(team_member.current.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current,span_cult_large("[nominee] has died in the process of attempting to start a vote!")) return FALSE var/list/mob/living/asked_cultists = list() for(var/datum/mind/team_member as anything in team.members) +<<<<<<< HEAD if(!team_member.current || team_member.current == nominee || team_member.current.incapacitated()) +======= + if(!team_member.current || team_member.current == nominee || team_member.current.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue SEND_SOUND(team_member.current, 'sound/magic/exit_blood.ogg') asked_cultists += team_member.current @@ -161,13 +177,21 @@ chat_text_border_icon = mutable_appearance('icons/effects/effects.dmi', "cult_master_logo") ) ) +<<<<<<< HEAD if(QDELETED(nominee) || nominee.incapacitated()) +======= + if(QDELETED(nominee) || nominee.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 team.cult_vote_called = FALSE for(var/datum/mind/team_member as anything in team.members) if(!team_member.current) continue team_member.current.update_mob_action_buttons() +<<<<<<< HEAD if(team_member.current.incapacitated()) +======= + if(team_member.current.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current,span_cult_large("[nominee] has died in the process of attempting to win the cult's support!")) return FALSE @@ -177,7 +201,11 @@ if(!team_member.current) continue team_member.current.update_mob_action_buttons() +<<<<<<< HEAD if(team_member.current.incapacitated()) +======= + if(team_member.current.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current,span_cult_large("[nominee] has gone catatonic in the process of attempting to win the cult's support!")) return FALSE @@ -187,7 +215,11 @@ if(!team_member.current) continue team_member.current.update_mob_action_buttons() +<<<<<<< HEAD if(team_member.current.incapacitated()) +======= + if(team_member.current.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current, span_cult_large("[nominee] could not win the cult's support and shall continue to serve as an acolyte.")) return FALSE diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index b44be268561..b3ea1165532 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -19,6 +19,7 @@ inhand_x_dimension = 32 inhand_y_dimension = 32 w_class = WEIGHT_CLASS_SMALL + slot_flags = ITEM_SLOT_BELT force = 15 throwforce = 25 block_chance = 25 @@ -217,7 +218,11 @@ Striking a noncultist, however, will tear their flesh."} // Get the heretic's new body and antag datum. trapped_entity = trapped_mind?.current trapped_entity.key = trapped_mind?.key +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_holder = IS_HERETIC(trapped_entity) +======= + var/datum/antagonist/heretic/heretic_holder = GET_HERETIC(trapped_entity) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!heretic_holder) stack_trace("[soul_to_bind] in but not a heretic on the heretic soul blade.") @@ -378,7 +383,11 @@ Striking a noncultist, however, will tear their flesh."} worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS +<<<<<<< HEAD allowed = list(/obj/item/tome, /obj/item/melee/cultblade) +======= + allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/melee/sickly_blade/cursed) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 armor_type = /datum/armor/hooded_cultrobes flags_inv = HIDEJUMPSUIT cold_protection = CHEST|GROIN|LEGS|ARMS @@ -478,7 +487,11 @@ Striking a noncultist, however, will tear their flesh."} armor_type = /datum/armor/cultrobes_hardened hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/hardened clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL +<<<<<<< HEAD flags_inv = HIDEGLOVES | HIDEJUMPSUIT | HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL +======= + flags_inv = HIDEGLOVES | HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT resistance_flags = NONE @@ -595,7 +608,10 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/clothing/suit/hooded/cultrobes/berserker name = "flagellant's robes" desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage. Provides an even greater speed boost if its hood is worn." +<<<<<<< HEAD allowed = list(/obj/item/tome, /obj/item/melee/cultblade) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 armor_type = /datum/armor/cultrobes_berserker slowdown = -0.3 //the hood gives an additional -0.3 if you have it flipped up, for a total of -0.6 hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood @@ -911,7 +927,11 @@ Striking a noncultist, however, will tear their flesh."} cultists |= cult_mind.current var/mob/living/cultist_to_receive = tgui_input_list(user, "Who do you wish to call to [src]?", "Followers of the Geometer", (cultists - user)) +<<<<<<< HEAD if(QDELETED(src) || loc != user || user.incapacitated()) +======= + if(QDELETED(src) || loc != user || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING if(isnull(cultist_to_receive)) to_chat(user, span_cult_italic("You require a destination!")) @@ -1279,7 +1299,10 @@ Striking a noncultist, however, will tear their flesh."} return FALSE /obj/item/shield/mirror/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) +<<<<<<< HEAD var/turf/impact_turf = get_turf(hit_atom) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isliving(hit_atom)) var/mob/living/target = hit_atom @@ -1292,6 +1315,7 @@ Striking a noncultist, however, will tear their flesh."} return if(!..()) target.Paralyze(30) +<<<<<<< HEAD var/mob/thrower = throwingdatum?.get_thrower() if(thrower) for(var/mob/living/Next in orange(2, impact_turf)) @@ -1300,6 +1324,11 @@ Striking a noncultist, however, will tear their flesh."} throw_at(Next, 3, 1, thrower) return throw_at(thrower, 7, 1, null) +======= + new /obj/effect/temp_visual/cult/sparks(target) + playsound(target, 'sound/effects/glassbr3.ogg', 100) + qdel(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else ..() diff --git a/code/modules/antagonists/cult/cult_objectives.dm b/code/modules/antagonists/cult/cult_objectives.dm index 8a4bf74dec8..83add470461 100644 --- a/code/modules/antagonists/cult/cult_objectives.dm +++ b/code/modules/antagonists/cult/cult_objectives.dm @@ -20,19 +20,25 @@ var/datum/team/cult/cult = team var/list/target_candidates = list() for(var/mob/living/carbon/human/player in GLOB.player_list) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Players in the interlink can't be obsession targets if(SSticker.IsRoundInProgress() && istype(get_area(player), /area/centcom/interlink)) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && !is_convertable_to_cult(player) && player.stat != DEAD) target_candidates += player.mind if(target_candidates.len == 0) message_admins("Cult Sacrifice: Could not find unconvertible target, checking for convertible target.") for(var/mob/living/carbon/human/player in GLOB.player_list) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Players in the interlink can't be obsession targets if(SSticker.IsRoundInProgress() && istype(get_area(player), /area/centcom/interlink)) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && player.stat != DEAD) target_candidates += player.mind list_clear_nulls(target_candidates) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 2cdb2c2e6f4..ba44cd290ea 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -201,7 +201,11 @@ * Returns TRUE if the user is a living mob that is a cultist and is not incapacitated. */ /obj/structure/destructible/cult/item_dispenser/proc/check_menu(mob/user) +<<<<<<< HEAD return isliving(user) && is_cultist_check(user) && !user.incapacitated() +======= + return isliving(user) && is_cultist_check(user) && !user.incapacitated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Spooky looking door used in gateways. Or something. /obj/effect/gateway diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm index 72c7df8bf5d..29bb2dd35fe 100644 --- a/code/modules/antagonists/cult/datums/cult_team.dm +++ b/code/modules/antagonists/cult/datums/cult_team.dm @@ -65,7 +65,11 @@ for(var/datum/mind/mind as anything in members) if(mind.current) SEND_SOUND(mind.current, 'sound/ambience/antag/bloodcult/bloodcult_halos.ogg') +<<<<<<< HEAD to_chat(mind.current, span_cult_large(span_warning("Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!"))) +======= + to_chat(mind.current, span_cult_large(span_warning("Your cult is ascendant and the red harvest approaches - you cannot hide your true nature for much longer!!"))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mind.current.AddElement(/datum/element/cult_halo) cult_ascendent = TRUE log_game("The blood cult has ascended with [cultplayers] players.") @@ -134,6 +138,10 @@ return "
[parts.Join("
")]
" /datum/team/cult/proc/is_sacrifice_target(datum/mind/mind) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/objective/sacrifice/sac_objective in objectives) if(mind == sac_objective.target) return TRUE diff --git a/code/modules/antagonists/cult/datums/cultist.dm b/code/modules/antagonists/cult/datums/cultist.dm index f56d79a8f4b..a4c799e150c 100644 --- a/code/modules/antagonists/cult/datums/cultist.dm +++ b/code/modules/antagonists/cult/datums/cultist.dm @@ -281,3 +281,7 @@ ///Used to check if the owner is counted as a secondary invoker for runes. /datum/antagonist/cult/proc/check_invoke_validity() return TRUE +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index dafc9e50f73..3c13378ba9e 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -200,16 +200,29 @@ structure_check() searches for nearby cultist structures required for the invoca invocation = "Ra'sha yoka!" invoke_damage = 30 can_be_scribed = FALSE +<<<<<<< HEAD +======= + var/randomized = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/rune/malformed/Initialize(mapload, set_keyword) . = ..() + if(!randomized) + return icon_state = "[rand(1,7)]" color = rgb(rand(0,255), rand(0,255), rand(0,255)) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/rune/malformed/invoke(list/invokers) ..() qdel(src) +/obj/effect/rune/malformed/norandom + randomized = FALSE + //Rite of Offering: Converts or sacrifices a target. /obj/effect/rune/convert cultist_name = "Offer" @@ -505,7 +518,11 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() return var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? +<<<<<<< HEAD if(!Adjacent(user) || QDELETED(src) || user.incapacitated() || !actual_selected_rune) +======= + if(!Adjacent(user) || QDELETED(src) || user.incapacitated || !actual_selected_rune) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fail_invoke() return @@ -774,7 +791,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0) /obj/effect/rune/raise_dead/proc/validness_checks(mob/living/target_mob, mob/living/user) if(QDELETED(user)) return FALSE - if(!Adjacent(user) || user.incapacitated()) + if(!Adjacent(user) || user.incapacitated) return FALSE if(QDELETED(target_mob)) return FALSE @@ -839,7 +856,11 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0) return var/mob/living/cultist_to_summon = tgui_input_list(user, "Who do you wish to call to [src]?", "Followers of the Geometer", cultists) var/fail_logmsg = "Summon Cultist rune activated by [user] at [COORD(src)] failed - " +<<<<<<< HEAD if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) +======= + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(isnull(cultist_to_summon)) to_chat(user, "You require a summoning target!") diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 4cd69ac9be2..982520a0f13 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -290,3 +290,16 @@ name = "Frontier Militia General" outfit = /datum/outfit/centcom/militia/general role = "General" +<<<<<<< HEAD +======= + +/datum/antagonist/ert/medical_commander + role = "Chief EMT" + outfit = /datum/outfit/centcom/ert/medical_commander + plasmaman_outfit = /datum/outfit/plasmaman/medical_commander + +/datum/antagonist/ert/medical_technician + role = "Emergency Medical Technician" + outfit = /datum/outfit/centcom/ert/medical_technician + plasmaman_outfit = /datum/outfit/plasmaman/medical_technician +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm index 70d6b22a974..5a74c958a63 100644 --- a/code/modules/antagonists/heretic/heretic_antag.dm +++ b/code/modules/antagonists/heretic/heretic_antag.dm @@ -34,7 +34,11 @@ /// The path our heretic has chosen. Mostly used for flavor. var/heretic_path = PATH_START /// A sum of how many knowledge points this heretic CURRENTLY has. Used to research. +<<<<<<< HEAD var/knowledge_points = 2 //SKYRAT EDIT - ORIGINAL 1 +======= + var/knowledge_points = 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The time between gaining influence passively. The heretic gain +1 knowledge points every this duration of time. var/passive_gain_timer = 20 MINUTES /// Assoc list of [typepath] = [knowledge instance]. A list of all knowledge this heretic's reserached. @@ -218,7 +222,11 @@ return data +<<<<<<< HEAD /datum/antagonist/heretic/ui_act(action, params) +======= +/datum/antagonist/heretic/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -648,7 +656,11 @@ /datum/antagonist/heretic/roundend_report() var/list/parts = list() +<<<<<<< HEAD //var/succeeded = TRUE // SKYRAT EDIT REMOVAL +======= + var/succeeded = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += printplayer(owner) parts += "Sacrifices Made: [total_sacrifices]" @@ -656,6 +668,7 @@ if(length(objectives)) var/count = 1 for(var/datum/objective/objective as anything in objectives) +<<<<<<< HEAD // SKYRAT EDIT START - No greentext /* if(!objective.check_completion()) @@ -668,6 +681,12 @@ // SKYRAT EDIT START - No greentext /* +======= + if(!objective.check_completion()) + succeeded = FALSE + parts += "Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" + count++ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(feast_of_owls) parts += span_greentext("Ascension Forsaken") if(ascended) @@ -678,8 +697,11 @@ parts += span_greentext("The heretic was successful, but did not ascend!") else parts += span_redtext("The heretic has failed.") +<<<<<<< HEAD */ // SKYRAT EDIT END - No greentext +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += "Knowledge Researched: " diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm index 54c9b671ef5..2b9ce6a09de 100644 --- a/code/modules/antagonists/heretic/heretic_knowledge.dm +++ b/code/modules/antagonists/heretic/heretic_knowledge.dm @@ -676,7 +676,11 @@ return !was_completed /datum/heretic_knowledge/knowledge_ritual/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_heretic.knowledge_points += KNOWLEDGE_RITUAL_POINTS was_completed = TRUE @@ -722,7 +726,11 @@ return TRUE /datum/heretic_knowledge/ultimate/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!can_be_invoked(heretic_datum)) return FALSE @@ -743,7 +751,11 @@ return (sacrifice.stat == DEAD) && !ismonkey(sacrifice) /datum/heretic_knowledge/ultimate/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heretic_datum.ascended = TRUE // Show the cool red gradiant in our UI diff --git a/code/modules/antagonists/heretic/heretic_living_heart.dm b/code/modules/antagonists/heretic/heretic_living_heart.dm index b616d300097..b8d188fbe53 100644 --- a/code/modules/antagonists/heretic/heretic_living_heart.dm +++ b/code/modules/antagonists/heretic/heretic_living_heart.dm @@ -104,7 +104,11 @@ return ..() /datum/action/cooldown/track_target/Activate(atom/target) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(owner) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(owner) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/heretic_knowledge/sac_knowledge = heretic_datum.get_knowledge(/datum/heretic_knowledge/hunt_and_sacrifice) if(!LAZYLEN(heretic_datum.sac_targets)) owner.balloon_alert(owner, "no targets, visit a rune!") diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index 01ed0d99ee9..f22ad766df0 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -62,10 +62,14 @@ tracked_heretics |= heretic // If our heretic's on station, generate some new influences +<<<<<<< HEAD //SKYRAT EDIT START var/area/heretic_area = get_area(heretic.current) if(ishuman(heretic.current) && (!(is_centcom_level(heretic.current.z)) || istype(heretic_area, /area/centcom/interlink)) || istype(heretic_area, /area/shuttle/arrival)) //SKYRAT EDIT END +======= + if(ishuman(heretic.current) && !is_centcom_level(heretic.current.z)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 generate_new_influences() /** @@ -233,7 +237,11 @@ // We don't need to set being_drained back since we delete after anyways loc.balloon_alert(user, "influence drained") +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heretic_datum.knowledge_points += knowledge_to_gain // Aaand now we delete it diff --git a/code/modules/antagonists/heretic/items/forbidden_book.dm b/code/modules/antagonists/heretic/items/forbidden_book.dm index 38f42b58c5e..22f8bde7547 100644 --- a/code/modules/antagonists/heretic/items/forbidden_book.dm +++ b/code/modules/antagonists/heretic/items/forbidden_book.dm @@ -47,7 +47,11 @@ update_weight_class(WEIGHT_CLASS_NORMAL) /obj/item/codex_cicatrix/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!heretic_datum) return NONE if(isopenturf(interacting_with)) diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm index ddfec8db20c..2d90b4311fb 100644 --- a/code/modules/antagonists/heretic/items/heretic_blades.dm +++ b/code/modules/antagonists/heretic/items/heretic_blades.dm @@ -10,6 +10,10 @@ inhand_x_dimension = 64 inhand_y_dimension = 64 obj_flags = CONDUCTS_ELECTRICITY +<<<<<<< HEAD +======= + slot_flags = ITEM_SLOT_BELT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sharpness = SHARP_EDGED w_class = WEIGHT_CLASS_NORMAL force = 20 @@ -229,7 +233,11 @@ /obj/item/melee/sickly_blade/cursed/interact_with_atom(atom/target, mob/living/user, list/modifiers) . = ..() +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!heretic_datum) return NONE diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm index 315bb14b664..cece495e9ef 100644 --- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm @@ -30,7 +30,11 @@ name = "Nightwatcher's Secret" desc = "Opens up the Path of Ash to you. \ Allows you to transmute a match and a knife into an Ashen Blade. \ +<<<<<<< HEAD You can only create five at a time." //SKYRAT EDIT two to five +======= + You can only create two at a time." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gain_text = "The City Guard know their watch. If you ask them at night, they may tell you about the ashy lantern." next_knowledge = list(/datum/heretic_knowledge/ashen_grasp) required_atoms = list( diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm index de79151739f..0d0484eb9a1 100644 --- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm @@ -147,7 +147,11 @@ if(!riposte_ready) return +<<<<<<< HEAD if(source.incapacitated(IGNORE_GRAB)) +======= + if(INCAPACITATED_IGNORING(source, INCAPABLE_GRAB)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/mob/living/attacker = hitby.loc diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm index a3e75761320..7ac47946eb4 100644 --- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm @@ -70,7 +70,11 @@ /datum/heretic_knowledge/spell/cosmic_runes name = "Cosmic Runes" +<<<<<<< HEAD desc = "Grants you Cosmic Runes, a spell that creates two runes linked with eachother for easy teleportation. \ +======= + desc = "Grants you Cosmic Runes, a spell that creates two runes linked with each other for easy teleportation. \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Only the entity activating the rune will get transported, and it can be used by anyone without a star mark. \ However, people with a star mark will get transported along with another person using the rune." gain_text = "The distant stars crept into my dreams, roaring and screaming without reason. \ diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm index 6dde1a3038d..fc67481b3b4 100644 --- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm @@ -34,7 +34,11 @@ name = "Principle of Hunger" desc = "Opens up the Path of Flesh to you. \ Allows you to transmute a knife and a pool of blood into a Bloody Blade. \ +<<<<<<< HEAD You can only create twenty at a time." //SKYRAT EDIT three to twenty +======= + You can only create three at a time." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gain_text = "Hundreds of us starved, but not me... I found strength in my greed." next_knowledge = list(/datum/heretic_knowledge/limited_amount/flesh_grasp) required_atoms = list( @@ -337,7 +341,11 @@ worm_spell.Grant(user) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/heretic_knowledge/limited_amount/flesh_grasp/grasp_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_grasp) grasp_ghoul.limit *= 3 var/datum/heretic_knowledge/limited_amount/flesh_ghoul/ritual_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_ghoul) diff --git a/code/modules/antagonists/heretic/knowledge/general_side.dm b/code/modules/antagonists/heretic/knowledge/general_side.dm index 27f0e11b446..fe7493651da 100644 --- a/code/modules/antagonists/heretic/knowledge/general_side.dm +++ b/code/modules/antagonists/heretic/knowledge/general_side.dm @@ -18,7 +18,11 @@ /datum/heretic_knowledge/reroll_targets/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Check first if they have a Living Heart. If it's missing, we should // throw a fail to show the heretic that there's no point in rerolling // if you don't have a heart to track the targets in the first place. @@ -29,7 +33,11 @@ return TRUE /datum/heretic_knowledge/reroll_targets/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/living/carbon/human/target as anything in heretic_datum.sac_targets) heretic_datum.remove_sacrifice_target(target) diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm index ac375d7942a..a1d3ffcbd08 100644 --- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm @@ -248,7 +248,11 @@ var/datum/action/cooldown/spell/shapeshift/eldritch/ascension/transform_spell = new(user.mind) transform_spell.Grant(user) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/heretic_knowledge/blade_upgrade/flesh/lock/blade_upgrade = heretic_datum.get_knowledge(/datum/heretic_knowledge/blade_upgrade/flesh/lock) blade_upgrade.chance += 30 new /obj/structure/lock_tear(loc, user.mind) diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index 3a081c8d295..00c676939c9 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -198,7 +198,11 @@ /datum/heretic_knowledge/spell/entropic_plume/on_gain(mob/user) . = ..() +<<<<<<< HEAD var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_heretic.increase_rust_strength(TRUE) /datum/heretic_knowledge/ultimate/rust_final diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index d5e96364ecd..423b577250d 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -66,7 +66,11 @@ CRASH("Failed to lazy load heretic sacrifice template!") /datum/heretic_knowledge/hunt_and_sacrifice/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // First we have to check if the heretic has a Living Heart. // You may wonder why we don't straight up prevent them from invoking the ritual if they don't have one - // Hunt and sacrifice should always be invokable for clarity's sake, even if it'll fail immediately. @@ -75,7 +79,11 @@ return FALSE // We've got no targets set, let's try to set some. +<<<<<<< HEAD // If we recently failed to aquire targets, we will be unable to aquire any. +======= + // If we recently failed to acquire targets, we will be unable to acquire any. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!LAZYLEN(heretic_datum.sac_targets)) atoms += user return TRUE @@ -99,7 +107,11 @@ return FALSE /datum/heretic_knowledge/hunt_and_sacrifice/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Force it to work if the sacrifice is a cultist, even if there's no targets. var/mob/living/carbon/human/sac = selected_atoms[1] if(!LAZYLEN(heretic_datum.sac_targets) && !IS_CULTIST(sac)) @@ -189,11 +201,19 @@ * Arguments * * user - the mob doing the sacrifice (a heretic) * * selected_atoms - a list of all atoms chosen. Should be (at least) one human. +<<<<<<< HEAD * * loc - the turf the sacrifice is occuring on */ /datum/heretic_knowledge/hunt_and_sacrifice/proc/sacrifice_process(mob/living/user, list/selected_atoms, turf/loc) var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + * * loc - the turf the sacrifice is occurring on + */ +/datum/heretic_knowledge/hunt_and_sacrifice/proc/sacrifice_process(mob/living/user, list/selected_atoms, turf/loc) + + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/sacrifice = locate() in selected_atoms if(!sacrifice) CRASH("[type] sacrifice_process didn't have a human in the atoms list. How'd it make it so far?") @@ -207,7 +227,11 @@ var/feedback = "Your patrons accept your offer" var/sac_job_flag = sacrifice.mind?.assigned_role?.job_flags | sacrifice.last_mind?.assigned_role?.job_flags +<<<<<<< HEAD var/datum/antagonist/cult/cultist_datum = IS_CULTIST(sacrifice) +======= + var/datum/antagonist/cult/cultist_datum = GET_CULTIST(sacrifice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Heads give 3 points, cultists give 1 point (and a special reward), normal sacrifices give 2 points. heretic_datum.total_sacrifices++ if((sac_job_flag & JOB_HEAD_OF_STAFF)) @@ -260,7 +284,11 @@ sacrifice.dust(TRUE, TRUE) // Increase reward counter +<<<<<<< HEAD var/datum/antagonist/heretic/antag = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/antag = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 antag.rewards_given++ // Cool effect for the rune as well as the item @@ -282,7 +310,11 @@ // Remove the outline, we don't need it anymore. rune?.remove_filter("reward_outline") playsound(loc, 'sound/magic/repulse.ogg', 75, TRUE) +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ASSERT(heretic_datum) // This list will be almost identical to unlocked_heretic_items, with the same keys, the difference being the values will be 1 to 5. var/list/rewards = heretic_datum.unlocked_heretic_items.Copy() @@ -418,6 +450,7 @@ usable_organs -= /obj/item/organ/internal/lungs/corrupt // Their lungs are already more cursed than anything I could give them var/total_implant = rand(2, 4) +<<<<<<< HEAD var/gave_any = FALSE for (var/i in 1 to total_implant) @@ -432,6 +465,15 @@ if (!gave_any) return +======= + + for (var/i in 1 to total_implant) + if (!length(usable_organs)) + return + var/organ_path = pick_n_take(usable_organs) + var/obj/item/organ/internal/to_give = new organ_path + to_give.Insert(sac_target) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/effect/gibspawner/human/bodypartless(get_turf(sac_target)) sac_target.visible_message(span_boldwarning("Several organs force themselves out of [sac_target]!")) diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm index f7e87626f75..94b496e2649 100644 --- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm @@ -107,7 +107,11 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge()) return TRUE /datum/heretic_knowledge/living_heart/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/our_living_heart = user.get_organ_slot(our_heretic.living_heart_organ_slot) // Obviously you need a heart in your chest to do a ritual on your... heart if(!our_living_heart) @@ -145,7 +149,11 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge()) return FALSE /datum/heretic_knowledge/living_heart/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +<<<<<<< HEAD var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/our_new_heart = user.get_organ_slot(our_heretic.living_heart_organ_slot) // Our heart is robotic or synthetic - we need to replace it, and we fortunately should have one by here @@ -319,7 +327,11 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge()) var/alert = tgui_alert(user,"Do you really want to forsake your ascension? This action cannot be reverted.", "Feast of Owls", list("Yes I'm sure", "No"), 30 SECONDS) if(alert != "Yes I'm sure" || QDELETED(user) || QDELETED(src) || get_dist(user, loc) > 2) return FALSE +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(heretic_datum) || heretic_datum.feast_of_owls) return FALSE diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index 51f0146fca3..f7bceebc32a 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -30,7 +30,11 @@ name = "Glimmer of Winter" desc = "Opens up the Path of Void to you. \ Allows you to transmute a knife in sub-zero temperatures into a Void Blade. \ +<<<<<<< HEAD You can only create five at a time." //SKYRAT EDIT two to five +======= + You can only create two at a time." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gain_text = "I feel a shimmer in the air, the air around me gets colder. \ I start to realize the emptiness of existence. Something's watching me." next_knowledge = list(/datum/heretic_knowledge/void_grasp) diff --git a/code/modules/antagonists/heretic/magic/shadow_cloak.dm b/code/modules/antagonists/heretic/magic/shadow_cloak.dm index ef135441c36..35dde09a828 100644 --- a/code/modules/antagonists/heretic/magic/shadow_cloak.dm +++ b/code/modules/antagonists/heretic/magic/shadow_cloak.dm @@ -28,7 +28,14 @@ return ..() /datum/action/cooldown/spell/shadow_cloak/is_valid_target(atom/cast_on) +<<<<<<< HEAD return isliving(cast_on) && !HAS_TRAIT(cast_on, TRAIT_HULK) // Hulks are not stealthy. Need not apply +======= + if(HAS_TRAIT(cast_on, TRAIT_HULK)) // Hulks are not stealthy. Need not apply + cast_on.balloon_alert(cast_on, "cannot cast while hulk!") + return FALSE + return isliving(cast_on) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/shadow_cloak/before_cast(mob/living/cast_on) . = ..() diff --git a/code/modules/antagonists/heretic/status_effects/mark_effects.dm b/code/modules/antagonists/heretic/status_effects/mark_effects.dm index b234fb604c2..5be5ece16be 100644 --- a/code/modules/antagonists/heretic/status_effects/mark_effects.dm +++ b/code/modules/antagonists/heretic/status_effects/mark_effects.dm @@ -50,7 +50,11 @@ playsound(owner, 'sound/magic/repulse.ogg', 75, TRUE) qdel(src) //what happens when this is procced. +<<<<<<< HEAD //Each mark has diffrent effects when it is destroyed that combine with the mansus grasp effect. +======= +//Each mark has different effects when it is destroyed that combine with the mansus grasp effect. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // MARK OF FLESH @@ -284,5 +288,9 @@ . = ..() UnregisterSignal (owner, COMSIG_MOB_APPLY_DAMAGE) +<<<<<<< HEAD // Incase the trait was not removed earlier +======= + // In case the trait was not removed earlier +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 REMOVE_TRAIT(owner, TRAIT_PACIFISM, id) diff --git a/code/modules/antagonists/heretic/structures/lock_final.dm b/code/modules/antagonists/heretic/structures/lock_final.dm index 759bc8aa55e..d28ee4e948a 100644 --- a/code/modules/antagonists/heretic/structures/lock_final.dm +++ b/code/modules/antagonists/heretic/structures/lock_final.dm @@ -1,6 +1,10 @@ /obj/structure/lock_tear name = "???" +<<<<<<< HEAD desc = "It stares back. Theres no reason to remain. Run." +======= + desc = "It stares back. There's no reason to remain. Run." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 max_integrity = INFINITE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF icon = 'icons/obj/anomaly.dmi' diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm index 0c510e34ff2..5232b5a9ea9 100644 --- a/code/modules/antagonists/heretic/transmutation_rune.dm +++ b/code/modules/antagonists/heretic/transmutation_rune.dm @@ -50,7 +50,11 @@ /obj/effect/heretic_rune/proc/try_rituals(mob/living/user) is_in_use = TRUE +<<<<<<< HEAD var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) +======= + var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/rituals = heretic_datum.get_rituals() if(!length(rituals)) loc.balloon_alert(user, "no rituals available!") @@ -232,6 +236,12 @@ . = ..() set_greyscale(colors = list(path_colour)) icon_state = animation_state +<<<<<<< HEAD +======= + var/image/silicon_image = image(icon = 'icons/effects/eldritch.dmi', icon_state = null, loc = src) + silicon_image.override = TRUE + add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "heretic_rune", silicon_image) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/temp_visual/drawing_heretic_rune/fast duration = 12 SECONDS diff --git a/code/modules/antagonists/malf_ai/malf_ai.dm b/code/modules/antagonists/malf_ai/malf_ai.dm index 624f181dea2..c49383718f9 100644 --- a/code/modules/antagonists/malf_ai/malf_ai.dm +++ b/code/modules/antagonists/malf_ai/malf_ai.dm @@ -35,6 +35,7 @@ owner.special_role = job_rank if(give_objectives) forge_ai_objectives() +<<<<<<< HEAD // SKYRAT EDIT START - Moving voice changing to Malf only #ifdef AI_VOX var/mob/living/silicon/ai/malf_ai = owner.current @@ -43,6 +44,8 @@ // SKYRAT EDIT END employer = pick(GLOB.ai_employers) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!employer) employer = pick(GLOB.ai_employers) @@ -63,12 +66,15 @@ var/mob/living/silicon/ai/malf_ai = owner.current malf_ai.set_zeroth_law("") malf_ai.remove_malf_abilities() +<<<<<<< HEAD // SKYRAT EDIT START - Moving voice changing to Malf only #ifdef AI_VOX malf_ai.vox_voices -= VOX_MIL malf_ai.vox_type = VOX_NORMAL #endif // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(malf_ai.malf_picker) owner.special_role = null @@ -97,7 +103,11 @@ /// Generates a special objective and adds it to the objective list. /datum/antagonist/malf_ai/proc/forge_special_objective() +<<<<<<< HEAD var/special_pick = rand(3,4) // SKYRAT EDIT - REMOVING PURGE/BLOCK +======= + var/special_pick = rand(1,4) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(special_pick) if(1) var/datum/objective/block/block_objective = new @@ -221,7 +231,11 @@ return data +<<<<<<< HEAD /datum/antagonist/malf_ai/ui_act(action, list/params) +======= +/datum/antagonist/malf_ai/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -250,7 +264,11 @@ /datum/antagonist/malf_ai/roundend_report() var/list/result = list() +<<<<<<< HEAD //var/malf_ai_won = TRUE // SKYRAT EDIT REMOVAL +======= + var/malf_ai_won = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 result += printplayer(owner) @@ -258,6 +276,7 @@ if(objectives.len) //If the traitor had no objectives, don't need to process this. var/count = 1 for(var/datum/objective/objective in objectives) +<<<<<<< HEAD // SKYRAT EDIT START - No greentext /* if(!objective.check_completion()) @@ -266,12 +285,20 @@ */ objectives_text += "
Objective #[count]: [objective.explanation_text]" // SKYRAT EDIT END - No greentext +======= + if(!objective.check_completion()) + malf_ai_won = FALSE + objectives_text += "
Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 count++ result += objectives_text +<<<<<<< HEAD // SKYRAT EDIT REMOVAL START /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/special_role_text = LOWER_TEXT(name) if(malf_ai_won) @@ -279,7 +306,10 @@ else result += span_redtext("The [special_role_text] has failed!") SEND_SOUND(owner.current, 'sound/ambience/ambifailure.ogg') +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return result.Join("
") diff --git a/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm b/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm index 0ac27c14c97..092d1cc4fef 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm @@ -62,7 +62,11 @@ return data +<<<<<<< HEAD /datum/module_picker/ui_act(action, list/params) +======= +/datum/module_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm index 95cb3742f5d..2e756148bc9 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm @@ -446,7 +446,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) desc = "[desc] It has [uses] use\s remaining." /datum/action/innate/ai/ranged/override_machine/do_ability(mob/living/caller, atom/clicked_on) +<<<<<<< HEAD if(caller.incapacitated()) +======= + if(caller.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE if(!ismachinery(clicked_on)) @@ -539,7 +543,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) qdel(to_explode) /datum/action/innate/ai/ranged/overload_machine/do_ability(mob/living/caller, atom/clicked_on) +<<<<<<< HEAD if(caller.incapacitated()) +======= + if(caller.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE if(!ismachinery(clicked_on)) @@ -634,7 +642,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /// Robotic Factory: Places a large machine that converts humans that go through it into cyborgs. Unlocking this ability removes shunting. /datum/ai_module/utility/place_cyborg_transformer name = "Robotic Factory (Removes Shunting)" +<<<<<<< HEAD description = "Build a machine anywhere, using expensive nanomachines, that will slowly create loyal cyborgs for you." // Skyrat edit +======= + description = "Build a machine anywhere, using expensive nanomachines, that can convert a living human into a loyal cyborg slave when placed inside." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cost = 100 power_type = /datum/action/innate/ai/place_transformer unlock_text = span_notice("You make contact with Space Amazon and request a robotics factory for delivery.") @@ -642,7 +654,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /datum/action/innate/ai/place_transformer name = "Place Robotics Factory" +<<<<<<< HEAD desc = "Places a machine that creates cyborgs efficiently. Conveyor belts included!" // Skyrat edit +======= + desc = "Places a machine that converts humans into cyborgs. Conveyor belts included!" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 button_icon_state = "robotic_factory" uses = 1 auto_use_uses = FALSE //So we can attempt multiple times @@ -665,7 +681,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) active = FALSE return var/turf/T = get_turf(owner_AI.eyeobj) +<<<<<<< HEAD var/obj/machinery/transformer_rp/conveyor = new(T) //SKYRAT EDIT CHANGE - SILLICONQOL - ORIGINAL: var/obj/machinery/transformer/conveyor = new(T) +======= + var/obj/machinery/transformer/conveyor = new(T) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 conveyor.master_ai = owner playsound(T, 'sound/effects/phasein.ogg', 100, TRUE) if(owner_AI.can_shunt) //prevent repeated messages @@ -679,7 +699,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) C.images -= I /mob/living/silicon/ai/proc/can_place_transformer(datum/action/innate/ai/place_transformer/action) +<<<<<<< HEAD if(!eyeobj || !isturf(loc) || incapacitated() || !action) +======= + if(!eyeobj || !isturf(loc) || incapacitated || !action) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/turf/middle = get_turf(eyeobj) var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z)) @@ -995,7 +1019,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) data["selected"] = say_span || owner.speech_span return data +<<<<<<< HEAD /obj/machinery/ai_voicechanger/ui_act(action, params) +======= +/obj/machinery/ai_voicechanger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(..()) return switch(action) @@ -1096,7 +1124,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) var/mob/living/silicon/ai/ai_caller = caller +<<<<<<< HEAD if(ai_caller.incapacitated()) +======= + if(ai_caller.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE @@ -1186,7 +1218,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) return FALSE var/mob/living/silicon/ai/ai_caller = caller +<<<<<<< HEAD if (ai_caller.incapacitated() || !isturf(ai_caller.loc)) +======= + if (ai_caller.incapacitated || !isturf(ai_caller.loc)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE var/turf/target = get_turf(clicked_on) @@ -1214,7 +1250,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) COOLDOWN_START(src, time_til_next_tilt, roll_over_cooldown) /datum/action/innate/ai/ranged/core_tilt/proc/do_roll_over(mob/living/silicon/ai/ai_caller, picked_dir) +<<<<<<< HEAD if (ai_caller.incapacitated() || !isturf(ai_caller.loc)) // prevents bugs where the ai is carded and rolls +======= + if (ai_caller.incapacitated || !isturf(ai_caller.loc)) // prevents bugs where the ai is carded and rolls +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/turf/target = get_step(ai_caller, picked_dir) // in case we moved we pass the dir not the target turf @@ -1228,7 +1268,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /// Used in our radial menu, state-checking proc after the radial menu sleeps /datum/action/innate/ai/ranged/core_tilt/proc/radial_check(mob/living/silicon/ai/caller) +<<<<<<< HEAD if (QDELETED(caller) || caller.incapacitated() || caller.stat == DEAD) +======= + if (QDELETED(caller) || caller.incapacitated || caller.stat == DEAD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if (uses <= 0) @@ -1275,7 +1319,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) return FALSE var/mob/living/silicon/ai/ai_caller = caller +<<<<<<< HEAD if(ai_caller.incapacitated()) +======= + if(ai_caller.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE @@ -1331,7 +1379,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /// Used in our radial menu, state-checking proc after the radial menu sleeps /datum/action/innate/ai/ranged/remote_vendor_tilt/proc/radial_check(mob/living/silicon/ai/caller, obj/machinery/vending/clicked_vendor) +<<<<<<< HEAD if (QDELETED(caller) || caller.incapacitated() || caller.stat == DEAD) +======= + if (QDELETED(caller) || caller.incapacitated || caller.stat == DEAD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if (QDELETED(clicked_vendor)) diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index a77aaa79b23..84185ebd8fa 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -65,9 +65,16 @@ /obj/item/organ/internal/heart/nightmare name = "heart of darkness" desc = "An alien organ that twists and writhes when exposed to light." +<<<<<<< HEAD icon_state = "demon_heart-on" base_icon_state = "demon_heart" visual = TRUE +======= + visual = TRUE + icon_state = "demon_heart-on" + base_icon_state = "demon_heart" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color = COLOR_CRAYON_BLACK decay_factor = 0 // No love is to be found in a heart so twisted. diff --git a/code/modules/antagonists/ninja/energy_katana.dm b/code/modules/antagonists/ninja/energy_katana.dm index 453ef5b423b..a2058f96d00 100644 --- a/code/modules/antagonists/ninja/energy_katana.dm +++ b/code/modules/antagonists/ninja/energy_katana.dm @@ -68,7 +68,11 @@ /datum/action/innate/dash/ninja current_charges = 3 max_charges = 3 +<<<<<<< HEAD charge_rate = 350 //SKYRAT EDIT CHANGE - ORIGINAL: 200 +======= + charge_rate = 200 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 beam_length = 1 SECONDS recharge_sound = null diff --git a/code/modules/antagonists/ninja/ninjaDrainAct.dm b/code/modules/antagonists/ninja/ninjaDrainAct.dm index a189ba3223e..bf847a8c5d9 100644 --- a/code/modules/antagonists/ninja/ninjaDrainAct.dm +++ b/code/modules/antagonists/ninja/ninjaDrainAct.dm @@ -295,12 +295,15 @@ return COMPONENT_CANCEL_ATTACK_CHAIN /mob/living/silicon/robot/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) +<<<<<<< HEAD //SKYRAT EDIT: ADDITION START var/list/modelselected = list() modelselected["Assault"] = "/obj/item/robot_model/ninja" modelselected["Medical"] = "/obj/item/robot_model/ninja/ninja_medical" modelselected["Saboteur"] = "/obj/item/robot_model/ninja_saboteur" //SKYRAT EDIT: ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!do_after(ninja, 6 SECONDS, target = src, hidden = TRUE)) return spark_system.start() @@ -311,12 +314,16 @@ UnlinkSelf() ionpulse = TRUE laws = new /datum/ai_laws/ninja_override() +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - Role Selection //model.transform_to(pick(/obj/item/robot_model/syndicate, /obj/item/robot_model/syndicate_medical, /obj/item/robot_model/saboteur)) - SKYRAT EDIT - ORIGINAL var/choice = input(src,"What role do you wish to become?","Select Role") in sort_list(modelselected) model.transform_to(modelselected[choice]) //SKYRAT EDIT CHANGE END +======= + model.transform_to(pick(/obj/item/robot_model/syndicate, /obj/item/robot_model/syndicate_medical, /obj/item/robot_model/saboteur)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja) if(!ninja_antag) diff --git a/code/modules/antagonists/ninja/outfit.dm b/code/modules/antagonists/ninja/outfit.dm index ba54c33d842..ed15b3e8c05 100644 --- a/code/modules/antagonists/ninja/outfit.dm +++ b/code/modules/antagonists/ninja/outfit.dm @@ -10,7 +10,11 @@ internals_slot = ITEM_SLOT_RPOCKET belt = /obj/item/energy_katana back = /obj/item/mod/control/pre_equipped/ninja +<<<<<<< HEAD //implants = list(/obj/item/implant/explosive) SKYRAT EDIT REMOVAL +======= + implants = list(/obj/item/implant/explosive) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/ninja/post_equip(mob/living/carbon/human/ninja) var/obj/item/grenade/c4/ninja/charge = ninja.l_store diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm index fa2718833d3..3bfaa9d5b54 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm @@ -26,7 +26,11 @@ /obj/item/disk/nuclear/Initialize(mapload) . = ..() +<<<<<<< HEAD AddElement(/datum/element/bed_tuckable, mapload, 6, 6, 0) +======= + AddElement(/datum/element/bed_tuckable, mapload, 6, -6, 0) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddComponent(/datum/component/stationloving, !fake) if(!fake) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm index a52a026abe0..6f12d6131b1 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm @@ -328,7 +328,11 @@ GLOBAL_VAR(station_nuke_source) return data +<<<<<<< HEAD /obj/machinery/nuclearbomb/ui_act(action, params) +======= +/obj/machinery/nuclearbomb/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -520,7 +524,10 @@ GLOBAL_VAR(station_nuke_source) safety = TRUE update_appearance() sound_to_playing_players('sound/machines/alarm.ogg') +<<<<<<< HEAD sound_to_playing_players('modular_skyrat/modules/alerts/sound/misc/delta_countdown.ogg') // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NUKE_DEVICE_DETONATING, src) diff --git a/code/modules/antagonists/pirate/pirate_gangs.dm b/code/modules/antagonists/pirate/pirate_gangs.dm index 555d68f1c9d..445e571bfc4 100644 --- a/code/modules/antagonists/pirate/pirate_gangs.dm +++ b/code/modules/antagonists/pirate/pirate_gangs.dm @@ -162,7 +162,10 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE)) response_not_enough = "You trying to cheat us? That's fine, we'll take your station as collateral." announcement_color = "yellow" +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Agents from the space I.R.S. heavily armed to stea- I mean, collect the station's tax dues /datum/pirate_gang/irs name = "Space IRS Agents" diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm index 72318fe4987..8cb0d4efc52 100644 --- a/code/modules/antagonists/pirate/pirate_outfits.dm +++ b/code/modules/antagonists/pirate/pirate_outfits.dm @@ -55,6 +55,11 @@ head = /obj/item/clothing/head/helmet/space/pirate +<<<<<<< HEAD +======= + id_trim = /datum/id_trim/pirate/captain + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/pirate/silverscale name = "Silver Scale Member" @@ -151,6 +156,11 @@ suit = /obj/item/clothing/suit/jacket/oversized head = /obj/item/clothing/head/costume/crown +<<<<<<< HEAD +======= + id_trim = /datum/id_trim/pirate/captain + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/pirate/medieval name = "Medieval Warmonger" @@ -181,3 +191,9 @@ belt = /obj/item/gun/magic/hook l_pocket = /obj/item/tank/internals/emergency_oxygen r_pocket = /obj/item/flashlight/lantern +<<<<<<< HEAD +======= + + + skillchips = list(/obj/item/skillchip/big_pointer) //they don't have an id, so this is needed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm index c2c8d872cf3..eb2fed83ade 100644 --- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm +++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm @@ -264,7 +264,11 @@ data["status_report"] = status_report return data +<<<<<<< HEAD /obj/machinery/computer/piratepad_control/ui_act(action, params) +======= +/obj/machinery/computer/piratepad_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index dcbc9bc8181..19b0c3d0bc4 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -19,7 +19,10 @@ if(affected_mob) affected_mob.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#1d2953") if(affected_mob.dna && affected_mob.dna.species) +<<<<<<< HEAD affected_mob.dna.species.handle_mutant_bodyparts(affected_mob) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 affected_mob.set_haircolor(null, override = TRUE) to_chat(affected_mob, span_notice("You feel better.")) ..() @@ -66,7 +69,10 @@ affected_mob.adjustStaminaLoss(22.5 * seconds_per_tick, updating_stamina = FALSE) new /obj/effect/temp_visual/revenant(affected_mob.loc) if(affected_mob.dna && affected_mob.dna.species) +<<<<<<< HEAD affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953") +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 affected_mob.set_haircolor("#1d2953", override = TRUE) affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("You suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 88dabd33788..1fad6b6a2d7 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -314,7 +314,11 @@ owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!"), null, null, null, owner.current) to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you....") else if(issilicon(owner.current)) +<<<<<<< HEAD owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it."), null, null, null, owner.current) +======= + owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initializing it."), null, null, null, owner.current) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_userdanger("The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.")) /datum/antagonist/rev/head/farewell() @@ -327,7 +331,11 @@ else to_chat(owner, "The sweet release of death. You are no longer a Head Revolutionary.") else if(issilicon(owner.current)) +<<<<<<< HEAD owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it."), null, null, null, owner.current) +======= + owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initializing it."), null, null, null, owner.current) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_userdanger("The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.")) /// Handles rev removal via IC methods such as borging, mindshielding, blunt force trauma to the head or revs losing. @@ -431,7 +439,11 @@ var/list/datum/mind/promotable = list() var/list/datum/mind/monkey_promotable = list() for(var/datum/mind/khrushchev in non_heads) +<<<<<<< HEAD if(khrushchev.current && !khrushchev.current.incapacitated() && !HAS_TRAIT(khrushchev.current, TRAIT_RESTRAINED) && khrushchev.current.client) +======= + if(khrushchev.current && !khrushchev.current.incapacitated && !HAS_TRAIT(khrushchev.current, TRAIT_RESTRAINED) && khrushchev.current.client) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((ROLE_REV_HEAD in khrushchev.current.client.prefs.be_special) || (ROLE_PROVOCATEUR in khrushchev.current.client.prefs.be_special)) if(!ismonkey(khrushchev.current)) promotable += khrushchev diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 17650faf937..3b5396edfa0 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -173,7 +173,11 @@ * Triggers when Space Dragon completes his objective. * Calls the shuttle with a coefficient of 3, making it impossible to recall. * Sets all of his rifts to allow for infinite sentient carp spawns +<<<<<<< HEAD * Also plays appropiate sounds and CENTCOM messages. +======= + * Also plays appropriate sounds and CENTCOM messages. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /datum/antagonist/space_dragon/proc/victory() objective_complete = TRUE @@ -188,9 +192,15 @@ rift.time_charged = rift.max_charge /** +<<<<<<< HEAD * Gives Space Dragon their the rift speed buff permanantly and fully heals the user. * * Gives Space Dragon the enraged speed buff from charging rifts permanantly. +======= + * Gives Space Dragon their the rift speed buff permanently and fully heals the user. + * + * Gives Space Dragon the enraged speed buff from charging rifts permanently. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Only happens in circumstances where Space Dragon completes their objective. * Also gives them a full heal. */ diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm index aea2d034729..141922e8874 100644 --- a/code/modules/antagonists/space_ninja/space_ninja.dm +++ b/code/modules/antagonists/space_ninja/space_ninja.dm @@ -73,6 +73,7 @@ doorobjective.doors_required = rand(15,40) doorobjective.explanation_text = "Use your gloves to doorjack [doorobjective.doors_required] airlocks on the station." objectives += doorobjective +<<<<<<< HEAD //SKYRAT EDIT START if(length(get_crewmember_minds()) >= BOMB_POP_REQUIREMENT) //Explosive plant, the bomb will register its completion on priming @@ -87,15 +88,37 @@ bombobjective.explanation_text = "Detonate your starter bomb in [bombobjective.detonation_location]. Note that the bomb will not work anywhere else!" objectives += bombobjective //SKYRAT EDIT END +======= + + //Explosive plant, the bomb will register its completion on priming + var/datum/objective/plant_explosive/bombobjective = new /datum/objective/plant_explosive() + for(var/sanity in 1 to 100) // 100 checks at most. + var/area/selected_area = pick(GLOB.areas) + if(!is_station_level(selected_area.z) || !(selected_area.area_flags & VALID_TERRITORY)) + continue + bombobjective.detonation_location = selected_area + break + if(bombobjective.detonation_location) + bombobjective.explanation_text = "Detonate your starter bomb in [bombobjective.detonation_location]. Note that the bomb will not work anywhere else!" + objectives += bombobjective +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Security Scramble, set to complete upon using your gloves on a security console var/datum/objective/securityobjective = new /datum/objective/security_scramble() objectives += securityobjective +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL //Message of Terror, set to complete upon using your gloves a communication console var/datum/objective/communicationobjective = new /datum/objective/terror_message() objectives += communicationobjective */ +======= + + //Message of Terror, set to complete upon using your gloves a communication console + var/datum/objective/communicationobjective = new /datum/objective/terror_message() + objectives += communicationobjective + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Survival until end var/datum/objective/survival = new /datum/objective/survive() survival.owner = owner diff --git a/code/modules/antagonists/spy/spy_bounty.dm b/code/modules/antagonists/spy/spy_bounty.dm index 01a1a1baf7b..5d572c4391e 100644 --- a/code/modules/antagonists/spy/spy_bounty.dm +++ b/code/modules/antagonists/spy/spy_bounty.dm @@ -529,7 +529,11 @@ return TRUE if(IS_WEAKREF_OF(stealing, target_ref)) var/mob/living/carbon/human/target = stealing +<<<<<<< HEAD if(!target.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) +======= + if(!INCAPACITATED_IGNORING(target, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(find_desired_thing(target)) return TRUE diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index bbdfa77ecea..243ffee858d 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -1,6 +1,10 @@ ///all the employers that are syndicate #define FLAVOR_FACTION_SYNDICATE "syndicate" +<<<<<<< HEAD ///all the employers that are nanotrasen +======= +///all the employers that are Nanotrasen +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FLAVOR_FACTION_NANOTRASEN "nanotrasen" /datum/antagonist/traitor diff --git a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm index 7c1771cdb4f..47eda6bf51e 100644 --- a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm +++ b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm @@ -12,7 +12,11 @@ deactive_msg = "You refocus your eyes..." /// how long we need to stare at someone to unsettle them (woooooh) var/stare_time = 8 SECONDS +<<<<<<< HEAD /// how long we stun someone on succesful cast +======= + /// how long we stun someone on successful cast +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/stun_time = 2 SECONDS /// stamina damage we doooo var/stamina_damage = 80 diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index a954391bfdb..6d008b3a466 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -188,11 +188,14 @@ if(HAS_TRAIT(M, TRAIT_NO_SOUL)) to_chat(user, span_warning("This body does not possess a soul to capture.")) return +<<<<<<< HEAD // SKYRAT EDIT START if(!do_after(user, 5 SECONDS, M)) to_chat(user, span_warning("You must stand still to capture their soul!")) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_combat(user, M, "captured [M.name]'s soul", src) capture_soul(M, user) @@ -295,15 +298,25 @@ /// Procs for moving soul in and out off stone /// Transfer the mind of a carbon mob (which is then dusted) into a shade mob inside src. +<<<<<<< HEAD /// If forced, sacrifical and stat checks are skipped. /obj/item/soulstone/proc/capture_soul(mob/living/carbon/victim, mob/user, forced = FALSE) if(!iscarbon(victim)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul +======= +/// If forced, sacrificial and stat checks are skipped. +/obj/item/soulstone/proc/capture_soul(mob/living/carbon/victim, mob/user, forced = FALSE) + if(!iscarbon(victim)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesn't mean you don't have a soul +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(contents.len) return FALSE if(!forced) +<<<<<<< HEAD var/datum/antagonist/cult/cultist = IS_CULTIST(user) +======= + var/datum/antagonist/cult/cultist = GET_CULTIST(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(cultist) var/datum/team/cult/cult_team = cultist.get_team() if(victim.mind && cult_team.is_sacrifice_target(victim.mind)) @@ -377,7 +390,11 @@ /obj/item/soulstone/proc/check_menu(mob/user, obj/structure/constructshell/shell) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.is_holding(src) || !user.CanReach(shell, src)) +======= + if(user.incapacitated || !user.is_holding(src) || !user.CanReach(shell, src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -449,7 +466,11 @@ /// Called when a ghost is chosen to become a shade. /obj/item/soulstone/proc/on_poll_concluded(mob/living/master, mob/living/victim, mob/dead/observer/ghost) +<<<<<<< HEAD if(isnull(victim) || master.incapacitated() || !master.is_holding(src) || !master.CanReach(victim, src)) +======= + if(isnull(victim) || master.incapacitated || !master.is_holding(src) || !master.CanReach(victim, src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(isnull(ghost?.client)) to_chat(master, span_danger("There were no spirits willing to become a shade.")) diff --git a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm index b0016bffe5f..04d3d002867 100644 --- a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm @@ -172,7 +172,11 @@ data["full_random_bonus"] = initial(uses) + full_random_bonus return data +<<<<<<< HEAD /obj/item/spellbook/ui_act(action, params) +======= +/obj/item/spellbook/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 223c4d73b70..58371fff23b 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -28,11 +28,14 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key) /// Perks that wizard learn var/list/perks = list() +<<<<<<< HEAD /datum/antagonist/wizard/New() if(move_to_lair) // kick off loading of your lair, if you want to be moved to it INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, lazy_load_template), LAZY_TEMPLATE_KEY_WIZARDDEN) return ..() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/wizard_minion name = "Wizard Minion" antagpanel_category = ANTAG_GROUP_WIZARDS diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm index 567ac383d94..a6853e307d2 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -159,7 +159,11 @@ . = ..() ui_interact(user) +<<<<<<< HEAD /obj/item/canvas/ui_act(action, params) +======= +/obj/item/canvas/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 20316ebfd66..17dcf7e9d64 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -100,7 +100,11 @@ data["target"] = health_target return data +<<<<<<< HEAD /obj/item/assembly/health/ui_act(action, params) +======= +/obj/item/assembly/health/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 7c23d1dc4cb..cd22358252d 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -291,7 +291,11 @@ data["visible"] = visible return data +<<<<<<< HEAD /obj/item/assembly/infra/ui_act(action, params) +======= +/obj/item/assembly/infra/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 031a3f78ead..e2f1cbb262d 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -154,7 +154,11 @@ data["sensitivity"] = sensitivity return data +<<<<<<< HEAD /obj/item/assembly/prox_sensor/ui_act(action, params) +======= +/obj/item/assembly/prox_sensor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 0d05d44320d..08c25fb11ed 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -110,7 +110,11 @@ data["loop"] = loop return data +<<<<<<< HEAD /obj/item/assembly/timer/ui_act(action, params) +======= +/obj/item/assembly/timer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 77e6e0333a5..e486683595f 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -486,6 +486,24 @@ GLOBAL_LIST_EMPTY(asset_datums) #undef SPRSZ_ICON #undef SPRSZ_STRIPPED +/datum/asset/changelog_item + _abstract = /datum/asset/changelog_item + var/item_filename + +/datum/asset/changelog_item/New(date) + item_filename = SANITIZE_FILENAME("[date].yml") + SSassets.transport.register_asset(item_filename, file("html/changelogs/archive/" + item_filename)) + +/datum/asset/changelog_item/send(client) + if (!item_filename) + return + . = SSassets.transport.send_assets(client, item_filename) + +/datum/asset/changelog_item/get_url_mappings() + if (!item_filename) + return + . = list("[item_filename]" = SSassets.transport.get_asset_url(item_filename)) + /datum/asset/changelog_item _abstract = /datum/asset/changelog_item var/item_filename diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm index 9842e21ec21..0392961bb5c 100644 --- a/code/modules/asset_cache/assets/paper.dm +++ b/code/modules/asset_cache/assets/paper.dm @@ -1,6 +1,7 @@ /datum/asset/spritesheet/simple/paper name = "paper" assets = list( +<<<<<<< HEAD // SKYRAT EDIT ADDITION: START - Donator stamp icons "stamp-cat_blue" = 'modular_skyrat/master_files/icons/stamp_icons/cat_blue.png', @@ -15,6 +16,8 @@ "stamp-nri" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-nri.png', "stamp-solfed" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-solfed.png', // SKYRAT EDIT ADDITION: END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png', "stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png', "stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png', diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 0556d085adf..98363944dfa 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -134,8 +134,11 @@ src.atmos_adjacent_turfs = atmos_adjacent_turfs SEND_SIGNAL(src, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS) +<<<<<<< HEAD update_adjacent_pollutants() //SKYRAT EDIT ADDITION //Atmos adjacency could unlock/block adjacent pollutants, this is dirty flags anyway so its fine having it here +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * returns a list of adjacent turfs that can share air with this one. * alldir includes adjacent diagonal tiles that can share @@ -199,7 +202,10 @@ SSair.remove_from_active(src) else SSair.add_to_active(src) +<<<<<<< HEAD liquid_update_turf() //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/proc/move_update_air(turf/target_turf) if(isturf(target_turf)) diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 7a06572824a..d8ad235550c 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -623,7 +623,11 @@ Then we space some of our heat, and think about if we should stop conducting. continue var/turf/neighbor = get_step(src, direction) +<<<<<<< HEAD if(!neighbor?.thermal_conductivity) +======= + if(!neighbor.thermal_conductivity) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(neighbor.archived_cycle < SSair.times_fired) diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 56da306a6d5..d1629cd81b0 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -793,7 +793,10 @@ cached_gases[/datum/gas/tritium][MOLES] -= 5 * nob_formed * reduction_factor cached_gases[/datum/gas/nitrogen][MOLES] -= 10 * nob_formed cached_gases[/datum/gas/hypernoblium][MOLES] += nob_formed // I'm not going to nitpick, but N20H10 feels like it should be an explosive more than anything. +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SET_REACTION_RESULTS(nob_formed) var/energy_released = nob_formed * (NOBLIUM_FORMATION_ENERGY / (max(cached_gases[/datum/gas/bz][MOLES], 1))) var/new_heat_capacity = air.heat_capacity() diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm index 6f1e0c6fcd9..0d1331558af 100644 --- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm @@ -342,15 +342,26 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) return data +<<<<<<< HEAD /obj/machinery/airalarm/ui_act(action, params) +======= +/obj/machinery/airalarm/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || buildstage != AIR_ALARM_BUILD_COMPLETE) return +<<<<<<< HEAD if((locked && !HAS_SILICON_ACCESS(usr)) || (HAS_SILICON_ACCESS(usr) && aidisabled)) return var/mob/user = usr +======= + var/mob/user = ui.user + if((locked && !HAS_SILICON_ACCESS(user)) || (HAS_SILICON_ACCESS(user) && aidisabled)) + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/area/area = connected_sensor ? get_area(connected_sensor) : get_area(src) ASSERT(!isnull(area)) @@ -465,7 +476,11 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) var/threshold_type = params["threshold_type"] var/value = params["value"] tlv.set_value(threshold_type, value) +<<<<<<< HEAD investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(usr)]", INVESTIGATE_ATMOS) +======= + investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(user)]", INVESTIGATE_ATMOS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_enviroment() @@ -476,7 +491,11 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) return var/threshold_type = params["threshold_type"] tlv.reset_value(threshold_type) +<<<<<<< HEAD investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(usr)]", INVESTIGATE_ATMOS) +======= + investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(user)]", INVESTIGATE_ATMOS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_enviroment() @@ -493,7 +512,11 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) disconnect_sensor() if ("lock") +<<<<<<< HEAD togglelock(usr) +======= + togglelock(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE update_appearance() diff --git a/code/modules/atmospherics/machinery/bluespace_vendor.dm b/code/modules/atmospherics/machinery/bluespace_vendor.dm index 91da04afaf2..2f4186da557 100644 --- a/code/modules/atmospherics/machinery/bluespace_vendor.dm +++ b/code/modules/atmospherics/machinery/bluespace_vendor.dm @@ -244,7 +244,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30) data["tank_full"] = total_tank_pressure return data +<<<<<<< HEAD /obj/machinery/bluespace_vendor/ui_act(action, params) +======= +/obj/machinery/bluespace_vendor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index bac6400951b..1a096bca312 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -177,6 +177,9 @@ Skyrat removal START, moved to modular file ..() pixel_x = 0 pixel_y = 0 +<<<<<<< HEAD Skyrat removal END */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 1d7657dd352..7f31911da05 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -84,7 +84,11 @@ Passive gate is similar to the regular pump except: data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm index ff9cc36d7cd..8e884a07537 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm @@ -84,7 +84,11 @@ data["max_pressure"] = round(ONE_ATMOSPHERE*100) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 1e68bf9ad69..40adb3a9e23 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -81,7 +81,11 @@ data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/pump/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/binary/pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm index 879f6b7fab8..bad32676911 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm @@ -107,7 +107,11 @@ data["max_temperature"] = round(max_temperature) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm index 3976e8db750..024ee73f02f 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm @@ -88,7 +88,11 @@ data["max_heat_transfer_rate"] = round(max_heat_transfer_rate) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index ae8965ae056..58bf2e12e21 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -122,7 +122,11 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm index 86f2e3dddf5..c16e3fe828f 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm @@ -79,7 +79,11 @@ /obj/machinery/atmospherics/components/unary/hypertorus/fuel_input name = "HFR fuel input port" +<<<<<<< HEAD desc = "Input port for the Hypertorus Fusion Reactor, designed to take in only Hydrogen and Tritium in gas forms." +======= + desc = "Input port for the Hypertorus Fusion Reactor, designed to take in fuels with the optimal fuel mix being a 50/50 split." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "fuel_input_off" icon_state_open = "fuel_input_open" icon_state_off = "fuel_input_off" @@ -313,7 +317,11 @@ return data +<<<<<<< HEAD /obj/machinery/hypertorus/interface/ui_act(action, params) +======= +/obj/machinery/hypertorus/interface/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm index 7d854974067..e9dbfd7df9b 100644 --- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm +++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm @@ -124,7 +124,11 @@ GLOBAL_LIST_INIT(gas_recipe_meta, gas_recipes_list()) min_temp = 10 max_temp = 20 energy_release = 3500000 +<<<<<<< HEAD requirements = list(/datum/gas/plasma = 450, /datum/gas/bz = 15) //SKYRAT EDIT CHANGE, ORIGINAL: requirements = list(/datum/gas/plasma = 450) +======= + requirements = list(/datum/gas/plasma = 450) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 products = list(/obj/item/stack/sheet/mineral/plasma = 1) /datum/gas_recipe/crystallizer/crystal_cell diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm index f0482c210a6..d14637b99ab 100644 --- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm +++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm @@ -300,7 +300,11 @@ data["gas_input"] = gas_input return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/crystallizer/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/binary/crystallizer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index da6c75d699d..cec9192ee89 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -141,7 +141,11 @@ return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/trinary/filter/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/trinary/filter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index 8f90986baaa..5c4273f8b8a 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -150,7 +150,11 @@ data["node2_concentration"] = round(node2_concentration*100, 1) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/trinary/mixer/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/trinary/mixer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm index ebe053663f9..7236352a2db 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm @@ -198,7 +198,11 @@ GLOBAL_LIST_EMPTY_TYPED(bluespace_senders, /obj/machinery/atmospherics/component data["credits"] = credits_gained return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/unary/bluespace_sender/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/unary/bluespace_sender/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 59ce701924c..fa6bf5a916c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -71,7 +71,10 @@ density = TRUE max_integrity = 350 armor_type = /datum/armor/unary_cryo_cell +<<<<<<< HEAD layer = MOB_LAYER - 0.2 //SKYRAT EDIT - Fixing the opacity of cryo cells - ORIGINAL: layer = MOB_LAYER +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 circuit = /obj/item/circuitboard/machine/cryo_tube occupant_typecache = list(/mob/living/carbon, /mob/living/simple_animal) processing_flags = NONE @@ -661,7 +664,11 @@ if(isliving(target)) var/mob/living/living_mob = target +<<<<<<< HEAD if(living_mob.incapacitated()) +======= + if(living_mob.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 close_machine(target) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 3f87ca671fd..684250de464 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -122,7 +122,11 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/unary/outlet_injector/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/unary/outlet_injector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 619bf100a17..6aa98c07682 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -283,7 +283,11 @@ data["pressure"] = port.return_pressure() return data +<<<<<<< HEAD /obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, params) +======= +/obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 4da90396052..abc22d44d01 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -255,12 +255,15 @@ env_gases[gas][MOLES] -= transferred_moles environment.garbage_collect() +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(isopenturf(tile)) var/turf/open/floor_turf = tile floor_turf.pollution?.scrub_amount(1) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Remix the resulting gases air_contents.merge(filtered_out) diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 2200d10fda5..08cfe894fc8 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -49,13 +49,21 @@ reconcile_air() //Only react if the mix has changed, and don't keep updating if it hasn't update = air.react(src) +<<<<<<< HEAD //CalculateGasmixColor(air) // SKYRAT EDIT REMOVAL - Pipe gas visuals removed +======= + CalculateGasmixColor(air) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/pipeline/proc/set_air(datum/gas_mixture/new_air) if(new_air == air) return air = new_air +<<<<<<< HEAD //CalculateGasmixColor(air) // SKYRAT EDIT REMOVAL - Pipe gas visuals removed +======= + CalculateGasmixColor(air) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Preps a pipeline for rebuilding, insterts it into the rebuild queue /datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/base) @@ -96,7 +104,11 @@ while(possible_expansions.len) for(var/obj/machinery/atmospherics/borderline in possible_expansions) var/list/result = borderline.pipeline_expansion(src) +<<<<<<< HEAD if(!(result && result.len)) +======= + if(!result?.len) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 possible_expansions -= borderline continue for(var/obj/machinery/atmospherics/considered_device in result) @@ -217,6 +229,7 @@ var/turf_temperature = target.GetTemperature() var/turf_heat_capacity = target.GetHeatCapacity() +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(target.liquids?.liquid_state >= LIQUID_STATE_FOR_HEAT_EXCHANGERS) turf_temperature = target.liquids.temp @@ -244,6 +257,20 @@ if(target.blocks_air) target.temperature_expose(air, target.temperature) update = TRUE +======= + if(turf_heat_capacity <= 0 || partial_heat_capacity <= 0) + return TRUE + + var/delta_temperature = turf_temperature - air.temperature + + var/heat = thermal_conductivity * CALCULATE_CONDUCTION_ENERGY(delta_temperature, partial_heat_capacity, turf_heat_capacity) + air.temperature += heat / total_heat_capacity + target.TakeTemperature(-1 * heat / turf_heat_capacity) + + if(target.blocks_air) + target.temperature_expose(air, target.temperature) + update = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/pipeline/proc/return_air() . = other_airs + air diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index 39b65fda7af..9784ef71746 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -28,10 +28,13 @@ if(istype(local_turf)) if(islava(local_turf)) environment_temperature = 5000 //Yuck +<<<<<<< HEAD //SKYRAT EDIT ADDITION else if (local_turf.liquids && local_turf.liquids.liquid_state >= LIQUID_STATE_FOR_HEAT_EXCHANGERS) environment_temperature = local_turf.liquids.temp //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(local_turf.blocks_air) environment_temperature = local_turf.temperature else diff --git a/code/modules/atmospherics/machinery/pipes/smart.dm b/code/modules/atmospherics/machinery/pipes/smart.dm index ee2efd699cd..94ee28aea8a 100644 --- a/code/modules/atmospherics/machinery/pipes/smart.dm +++ b/code/modules/atmospherics/machinery/pipes/smart.dm @@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(atmos_components, typecacheof(list(/obj/machinery/atmospherics) ///Current active connections var/connections = NONE +<<<<<<< HEAD ///Was this pipe created during map load var/map_loaded_pipe = FALSE @@ -30,6 +31,8 @@ GLOBAL_LIST_INIT(atmos_components, typecacheof(list(/obj/machinery/atmospherics) continue bit_flag |= spanning_direction return bit_flag +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/update_pipe_icon() icon = 'icons/obj/pipes_n_cables/!pipes_bitmask.dmi' diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index af13be0bbbf..303104c462e 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -560,6 +560,7 @@ ) else .["holdingTank"] = null +<<<<<<< HEAD . += list( "shielding" = shielding_powered, @@ -567,6 +568,15 @@ ) /obj/machinery/portable_atmospherics/canister/ui_act(action, params) +======= + + . += list( + "shielding" = shielding_powered, + "cellCharge" = internal_cell ? internal_cell.percent() : 0 + ) + +/obj/machinery/portable_atmospherics/canister/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm index cde38f216ad..22aa2d0e785 100644 --- a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm @@ -129,7 +129,11 @@ data["pressureLimitTank"] = internal_tank.pressure_limit return data +<<<<<<< HEAD /obj/machinery/portable_atmospherics/pipe_scrubber/ui_act(action, params) +======= +/obj/machinery/portable_atmospherics/pipe_scrubber/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 7b0dbef314e..4c0b6144f96 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -109,7 +109,11 @@ data["holding"] = null return data +<<<<<<< HEAD /obj/machinery/portable_atmospherics/pump/ui_act(action, params) +======= +/obj/machinery/portable_atmospherics/pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 84fd04388c2..05710d4646d 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -69,11 +69,14 @@ scrub(epicentre.return_air()) for(var/turf/open/openturf as anything in epicentre.get_atmos_adjacent_turfs(alldir = TRUE)) scrub(openturf.return_air()) +<<<<<<< HEAD //SKYRAT EDIT ADDITION for(var/turf/open/open_turf in view(3, src)) if(open_turf.pollution) open_turf.pollution.scrub_amount(POLLUTION_HEIGHT_DIVISOR) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /** @@ -166,7 +169,11 @@ else if(on && holding) user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) +<<<<<<< HEAD /obj/machinery/portable_atmospherics/scrubber/ui_act(action, params) +======= +/obj/machinery/portable_atmospherics/scrubber/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index b9dcf5b2ea6..eb5c81826f1 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -139,6 +139,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations) invisibility = INVISIBILITY_ABSTRACT /obj/effect/gateway_portal_bumper/Bumped(atom/movable/AM) +<<<<<<< HEAD //SKYRAT EDIT ADDITION var/list/type_blacklist = list( /obj/item/mmi, @@ -152,6 +153,8 @@ GLOBAL_LIST_EMPTY(gateway_destinations) to_chat(AM, span_warning("[content_item] seems to be blocking you from entering the gateway!")) return //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(get_dir(src,AM) == gateway?.dir) playsound(src, 'sound/effects/gateway_travel.ogg', 70, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) gateway.Transfer(AM) @@ -194,6 +197,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations) var/teleportion_possible = FALSE var/transport_active = FALSE +<<<<<<< HEAD //SKYRAT EDIT ADDITION var/requires_key = FALSE var/key_used = FALSE @@ -207,6 +211,8 @@ GLOBAL_LIST_EMPTY(gateway_destinations) return //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/gateway/Initialize(mapload) generate_destination() update_appearance() @@ -409,7 +415,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations) destinations += list(possible_destination.get_ui_data()) .["destinations"] = destinations -/obj/machinery/computer/gateway_control/ui_act(action, list/params) +/obj/machinery/computer/gateway_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm index 6254427af39..2c987e226c9 100644 --- a/code/modules/bitrunning/components/avatar_connection.dm +++ b/code/modules/bitrunning/components/avatar_connection.dm @@ -150,7 +150,11 @@ if(isnull(old_body) || damage_type == STAMINA || damage_type == OXYLOSS) return +<<<<<<< HEAD if(damage >= (old_body.health + (ishuman(old_body) ? HUMAN_MAXHEALTH : MAX_LIVING_HEALTH))) // SKYRAT EDIT CHANGE - ORIGINAL: if(damage >= (old_body.health + MAX_LIVING_HEALTH)) +======= + if(damage >= (old_body.health + MAX_LIVING_HEALTH)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 full_avatar_disconnect(cause_damage = TRUE) return diff --git a/code/modules/bitrunning/event.dm b/code/modules/bitrunning/event.dm index 16190851f37..7167eb15493 100644 --- a/code/modules/bitrunning/event.dm +++ b/code/modules/bitrunning/event.dm @@ -61,7 +61,11 @@ var/total = 0 for(var/datum/weakref/server_ref in cyber_control.active_servers) var/obj/machinery/quantum_server/server = server_ref?.resolve() +<<<<<<< HEAD if(isnull(server)) +======= + if(isnull(server) || QDELETED(server)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue total += length(server.mutation_candidate_refs) diff --git a/code/modules/bitrunning/netpod/ui.dm b/code/modules/bitrunning/netpod/ui.dm index 93719fe64eb..7e526fc24b6 100644 --- a/code/modules/bitrunning/netpod/ui.dm +++ b/code/modules/bitrunning/netpod/ui.dm @@ -27,7 +27,11 @@ return data +<<<<<<< HEAD /obj/machinery/netpod/ui_act(action, params) +======= +/obj/machinery/netpod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE diff --git a/code/modules/bitrunning/objects/landmarks.dm b/code/modules/bitrunning/objects/landmarks.dm index ea55b96979e..939007c598b 100644 --- a/code/modules/bitrunning/objects/landmarks.dm +++ b/code/modules/bitrunning/objects/landmarks.dm @@ -72,11 +72,19 @@ encrypted_crate.abstract_move(selected_crate.loc) selected_crate.abstract_move(original_location) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A location for mobs to spawn. /obj/effect/landmark/bitrunning/mob_segment name = "Bitrunning modular mob segment" icon_state = "mob_segment" +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitrunning safehouses. Typically 7x6 rooms with a single entrance. /obj/modular_map_root/safehouse config_file = "strings/modular_maps/safehouse.toml" diff --git a/code/modules/bitrunning/objects/vendor.dm b/code/modules/bitrunning/objects/vendor.dm index abd63a9e784..d40c5578d7c 100644 --- a/code/modules/bitrunning/objects/vendor.dm +++ b/code/modules/bitrunning/objects/vendor.dm @@ -62,7 +62,11 @@ /obj/machinery/computer/order_console/bitrunning/retrieve_points(obj/item/card/id/id_card) return round(id_card.registered_account.bitrunning_points) +<<<<<<< HEAD /obj/machinery/computer/order_console/bitrunning/ui_act(action, params) +======= +/obj/machinery/computer/order_console/bitrunning/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!.) flick("vendor_off", src) diff --git a/code/modules/bitrunning/orders/tech.dm b/code/modules/bitrunning/orders/tech.dm index 7e987e48181..51524d8e33e 100644 --- a/code/modules/bitrunning/orders/tech.dm +++ b/code/modules/bitrunning/orders/tech.dm @@ -2,38 +2,67 @@ category_index = CATEGORY_BITRUNNING_TECH /datum/orderable_item/bitrunning_tech/item_tier1 +<<<<<<< HEAD cost_per_order = 1000 +======= + cost_per_order = 750 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/item/tier1 desc = "This disk contains a program that lets you equip a medical beamgun, a C4 explosive, or a box of infinite pizza." /datum/orderable_item/bitrunning_tech/item_tier2 +<<<<<<< HEAD cost_per_order = 1500 +======= + cost_per_order = 1250 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/item/tier2 desc = "This disk contains a program that lets you equip a luxury medipen, a pistol, or an armour vest." /datum/orderable_item/bitrunning_tech/item_tier3 +<<<<<<< HEAD cost_per_order = 2500 +======= + cost_per_order = 2000 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/item/tier3 desc = "This disk contains a program that lets you equip an advanced energy gun, a dual bladed energy sword, or a minibomb." /datum/orderable_item/bitrunning_tech/ability_tier1 +<<<<<<< HEAD cost_per_order = 1000 +======= + cost_per_order = 750 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/ability/tier1 desc = "This disk contains a program that lets you cast Summon Cheese or Lesser Heal." /datum/orderable_item/bitrunning_tech/ability_tier2 +<<<<<<< HEAD cost_per_order = 1800 +======= + cost_per_order = 1500 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/ability/tier2 desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, or Forcewall." /datum/orderable_item/bitrunning_tech/ability_tier3 +<<<<<<< HEAD cost_per_order = 3200 +======= + cost_per_order = 2500 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/ability/tier3 desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, or a polar bear." /datum/orderable_item/bitrunning_tech/flip_skillchip +<<<<<<< HEAD item_path = /obj/item/skillchip/matrix_flip cost_per_order = 2000 +======= + item_path = /obj/item/skillchip/matrix_taunt + cost_per_order = 1500 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/orderable_item/bitrunning_tech/pka_mod item_path = /obj/item/bitrunning_disk/item/pka_mods @@ -42,7 +71,11 @@ /datum/orderable_item/bitrunning_tech/pka_mod/premium item_path = /obj/item/bitrunning_disk/item/pka_mods/premium +<<<<<<< HEAD cost_per_order = 1800 +======= + cost_per_order = 1600 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "This disk contains a program that lets you equip stronger modkits for the proto-kinetic accelerator. Proto-kinetic accelerator not included." /datum/orderable_item/bitrunning_tech/pkc_mod @@ -52,5 +85,9 @@ /datum/orderable_item/bitrunning_tech/pkc_mod/premium item_path = /obj/item/bitrunning_disk/item/pkc_mods/premium +<<<<<<< HEAD cost_per_order = 1800 +======= + cost_per_order = 1600 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "This disk contains a program that lets you equip stronger trophies for the proto-kinetic crusher. Proto-kinetic crusher not included." diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm index dabac8ae62d..d76821b9de2 100644 --- a/code/modules/bitrunning/server/obj_generation.dm +++ b/code/modules/bitrunning/server/obj_generation.dm @@ -116,9 +116,19 @@ path = pick(generated_domain.mob_modules) var/datum/modular_mob_segment/segment = new path() +<<<<<<< HEAD segment.spawn_mobs(get_turf(landmark)) mutation_candidate_refs += segment.spawned_mob_refs qdel(landmark) +======= + + var/list/mob_spawns = landmark.spawn_mobs(get_turf(landmark), segment) + if(length(mob_spawns)) + mutation_candidate_refs += mob_spawns + + qdel(landmark) + qdel(segment) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/modules/bitrunning/server/threats.dm b/code/modules/bitrunning/server/threats.dm index 28d91aa4b37..04d68e212dc 100644 --- a/code/modules/bitrunning/server/threats.dm +++ b/code/modules/bitrunning/server/threats.dm @@ -176,7 +176,11 @@ /// Removes any invalid candidates from the list /obj/machinery/quantum_server/proc/validate_mutation_candidates() for(var/datum/weakref/creature_ref as anything in mutation_candidate_refs) +<<<<<<< HEAD var/mob/living/creature = creature_ref.resolve() +======= + var/mob/living/creature = creature_ref?.resolve() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(creature) || creature.mind) mutation_candidate_refs.Remove(creature_ref) diff --git a/code/modules/bitrunning/turfs.dm b/code/modules/bitrunning/turfs.dm index 6ceb31b0e31..03d6617c0dd 100644 --- a/code/modules/bitrunning/turfs.dm +++ b/code/modules/bitrunning/turfs.dm @@ -1,6 +1,9 @@ /turf/open/indestructible/bitrunning_transport name = "circuit floor" +<<<<<<< HEAD icon = 'icons/turf/floors.dmi' +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "Looks complex. You can see the circuits running through the floor." icon_state = "bitrunning" diff --git a/code/modules/bitrunning/virtual_domain/domains/grassland_hunt.dm b/code/modules/bitrunning/virtual_domain/domains/grassland_hunt.dm new file mode 100644 index 00000000000..9c9e1c7171a --- /dev/null +++ b/code/modules/bitrunning/virtual_domain/domains/grassland_hunt.dm @@ -0,0 +1,28 @@ +/datum/lazy_template/virtual_domain/grasslands_hunt + name = "Grasslands Hunt" + desc = "A peaceful hunt in the wilderness." + help_text = "As a hunter, you must be able to track and kill your prey. Prove yourself." + is_modular = TRUE + key = "grasslands_hunt" + map_name = "grasslands_hunt" + mob_modules = list(/datum/modular_mob_segment/deer) + + +/datum/lazy_template/virtual_domain/grasslands_hunt/setup_domain(list/created_atoms) + for(var/obj/effect/landmark/bitrunning/mob_segment/landmark in created_atoms) + RegisterSignal(landmark, COMSIG_BITRUNNING_MOB_SEGMENT_SPAWNED, PROC_REF(on_spawned)) + + +/// The mob segment has concluded spawning +/datum/lazy_template/virtual_domain/grasslands_hunt/proc/on_spawned(datum/source, list/mobs) + SIGNAL_HANDLER + + for(var/mob/living/fauna as anything in mobs) + RegisterSignal(fauna, COMSIG_LIVING_DEATH, PROC_REF(on_death)) + + +/// Handles deer being slain +/datum/lazy_template/virtual_domain/grasslands_hunt/proc/on_death(datum/source) + SIGNAL_HANDLER + + add_points(3.5) diff --git a/code/modules/bitrunning/virtual_domain/domains/meta_central.dm b/code/modules/bitrunning/virtual_domain/domains/meta_central.dm new file mode 100644 index 00000000000..0bc35ceaf40 --- /dev/null +++ b/code/modules/bitrunning/virtual_domain/domains/meta_central.dm @@ -0,0 +1,12 @@ +/datum/lazy_template/virtual_domain/meta_central + name = "Meta Central" + cost = BITRUNNER_COST_LOW + desc = "Every so often, workers demand rights from Nanotrasen. This is unprofitable." + difficulty = BITRUNNER_DIFFICULTY_LOW + forced_outfit = /datum/outfit/job/security/mod + help_text = "Respond to the worker's demands with sanctioned violence. Recover valuable materials that may be scattered around. Just remember your training: Always assume guilt, they can confess in medbay... Or something like that." + is_modular = TRUE + key = "meta_central" + map_name = "meta_central" + mob_modules = list(/datum/modular_mob_segment/revolutionary) + reward_points = BITRUNNER_REWARD_LOW diff --git a/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm b/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm index b8c5880a69c..52a3379351c 100644 --- a/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm +++ b/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm @@ -3,6 +3,7 @@ #define SPAWN_UNLIKELY 35 #define SPAWN_RARE 10 +<<<<<<< HEAD /datum/modular_mob_segment /// Spawn no more than this amount var/max = 4 @@ -15,16 +16,60 @@ /// Chance this will spawn (1 - 100) var/probability = SPAWN_LIKELY +======= + +/// Handles spawning mobs for this landmark. Sends a signal when done. +/obj/effect/landmark/bitrunning/mob_segment/proc/spawn_mobs(turf/origin, datum/modular_mob_segment/segment) + var/list/mob/living/spawned_mobs = list() + + spawned_mobs += segment.spawn_mobs(origin) + + SEND_SIGNAL(src, COMSIG_BITRUNNING_MOB_SEGMENT_SPAWNED, spawned_mobs) + + var/list/datum/weakref/mob_refs = list() + for(var/mob/living/spawned as anything in spawned_mobs) + if(QDELETED(spawned)) + continue + + mob_refs += WEAKREF(spawned) + + return mob_refs + + +/** + * A list for mob spawning landmarks to use. + */ +/datum/modular_mob_segment + /// Set this to false if you want explicitly what's in the list to spawn + var/exact = FALSE + /// The list of mobs to spawn + var/list/mobs = list() + /// Spawn no more than this amount + var/max = 4 + /// Chance this will spawn (1 - 100) + var/probability = SPAWN_LIKELY + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Spawns mobs in a circle around the location /datum/modular_mob_segment/proc/spawn_mobs(turf/origin) if(!prob(probability)) return +<<<<<<< HEAD var/total_amount = exact ? rand(1, max) : length(mobs) shuffle_inplace(mobs) +======= + var/list/mob/living/spawned_mobs = list() + + var/total_amount = exact ? length(mobs) : rand(1, max) + + shuffle_inplace(mobs) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/turf/nearby = list() for(var/turf/tile as anything in RANGE_TURFS(2, origin)) if(!tile.is_blocked_turf()) @@ -46,7 +91,14 @@ var/mob/living/mob = new path(destination) nearby -= destination +<<<<<<< HEAD spawned_mob_refs.Add(WEAKREF(mob)) +======= + spawned_mobs += mob + + return spawned_mobs + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Some generic mob segments. If you want to add generic ones for any map, add them here @@ -55,41 +107,69 @@ /mob/living/basic/pet/gondola, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/corgis max = 2 mobs = list( /mob/living/basic/pet/dog/corgi, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/monkeys mobs = list( /mob/living/carbon/human/species/monkey, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/syndicate_team mobs = list( /mob/living/basic/trooper/syndicate/ranged, /mob/living/basic/trooper/syndicate/melee, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/abductor_agents mobs = list( /mob/living/basic/trooper/abductor/melee, /mob/living/basic/trooper/abductor/ranged, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/syndicate_elite mobs = list( /mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper, /mob/living/basic/trooper/syndicate/ranged/space/stormtrooper, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/bears max = 2 mobs = list( /mob/living/basic/bear, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/bees exact = TRUE mobs = list( @@ -100,33 +180,57 @@ /mob/living/basic/bee/queen, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/bees_toxic mobs = list( /mob/living/basic/bee/toxin, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/blob_spores mobs = list( /mob/living/basic/blob_minion, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/carps mobs = list( /mob/living/basic/carp, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/hivebots mobs = list( /mob/living/basic/hivebot, /mob/living/basic/hivebot/range, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/hivebots_strong mobs = list( /mob/living/basic/hivebot/strong, /mob/living/basic/hivebot/range, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/lavaland_assorted mobs = list( /mob/living/basic/mining/basilisk, @@ -135,6 +239,10 @@ /mob/living/basic/mining/lobstrosity, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/spiders mobs = list( /mob/living/basic/spider/giant/ambush, @@ -144,11 +252,19 @@ /mob/living/basic/spider/giant/midwife, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/venus_trap mobs = list( /mob/living/basic/venus_human_trap, ) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/xenos mobs = list( /mob/living/basic/alien, @@ -156,6 +272,23 @@ /mob/living/basic/alien/drone, ) +<<<<<<< HEAD +======= + +/datum/modular_mob_segment/deer + max = 1 + mobs = list( + /mob/living/basic/deer, + ) + + +/datum/modular_mob_segment/revolutionary + mobs = list( + /mob/living/basic/revolutionary, + ) + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef SPAWN_ALWAYS #undef SPAWN_LIKELY #undef SPAWN_UNLIKELY diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index 2b378773517..960c8a63035 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -28,7 +28,10 @@ return 1 /atom/movable/screen/buildmode/mode/update_icon_state() +<<<<<<< HEAD icon = bd.mode.button_icon // SKYRAT EDIT ADDITION - remove buildmode duplicate icons, divine tg and skyrat +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = bd.mode.get_button_iconstate() return ..() diff --git a/code/modules/capture_the_flag/ctf_classes.dm b/code/modules/capture_the_flag/ctf_classes.dm index 0482bd1ec88..9cc9f2c5de4 100644 --- a/code/modules/capture_the_flag/ctf_classes.dm +++ b/code/modules/capture_the_flag/ctf_classes.dm @@ -55,7 +55,11 @@ var/obj/item/radio/headset = human_to_equip.ears headset.set_frequency(team_radio_freq) headset.freqlock = RADIO_FREQENCY_LOCKED +<<<<<<< HEAD headset.independent = TRUE +======= + headset.special_channels |= RADIO_SPECIAL_CENTCOM +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human_to_equip.dna.species.stunmod = 0 /datum/outfit/ctf/instagib diff --git a/code/modules/cards/cardhand.dm b/code/modules/cards/cardhand.dm index ac14e17fea6..30eacdf5f11 100644 --- a/code/modules/cards/cardhand.dm +++ b/code/modules/cards/cardhand.dm @@ -67,7 +67,11 @@ qdel(src) // cardhand is empty now so delete it /obj/item/toy/cards/cardhand/proc/check_menu(mob/living/user) +<<<<<<< HEAD return isliving(user) && !user.incapacitated() +======= + return isliving(user) && !user.incapacitated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/toy/cards/cardhand/attackby(obj/item/weapon, mob/living/user, params, flip_card = FALSE) var/obj/item/toy/singlecard/card diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm index 772538f3ca2..ccb806644ff 100644 --- a/code/modules/cargo/bounties/mining.dm +++ b/code/modules/cargo/bounties/mining.dm @@ -25,8 +25,11 @@ description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement." reward = CARGO_CRATE_VALUE * 15 wanted_types = list(/obj/item/fireaxe/boneaxe = TRUE) +<<<<<<< HEAD */ //END SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bounty/item/mining/bone_armor name = "Bone Armor" @@ -46,7 +49,11 @@ reward = CARGO_CRATE_VALUE * 15 required_count = 3 wanted_types = list(/obj/item/clothing/accessory/talisman = TRUE) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bounty/item/mining/watcher_wreath name = "Watcher Wreaths" description = "Station 14's Research Director thinks they're onto a break-through on the cultural icons of some pagan beliefs. Ship them a few watcher wreaths for analysis." @@ -54,6 +61,16 @@ reward = CARGO_CRATE_VALUE * 15 required_count = 3 wanted_types = list(/obj/item/clothing/neck/wreath = TRUE) +<<<<<<< HEAD +======= + +/datum/bounty/item/mining/icewing_wreath + name = "Icewing Wreath" + description = "We're getting some....weird messages from Station 14's Research Director. And most of what they said was incoherent. But they apparently want an icewing wreath. Could you send them one?" + reward = CARGO_CRATE_VALUE * 30 + required_count = 1 + wanted_types = list(/obj/item/clothing/neck/wreath/icewing = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bounty/item/mining/icewing_wreath name = "Icewing Wreath" @@ -70,8 +87,11 @@ reward = CARGO_CRATE_VALUE * 10 required_count = 3 wanted_types = list(/obj/item/knife/combat/bone = TRUE) +<<<<<<< HEAD */ //END SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bounty/item/mining/polypore_mushroom name = "Mushroom Bowl" diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index dd779c796ce..40874a70285 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -191,7 +191,11 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a data["soundVolume"] = temp_pod.soundVolume //Admin sound to play when the pod leaves return data +<<<<<<< HEAD /datum/centcom_podlauncher/ui_act(action, params) +======= +/datum/centcom_podlauncher/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index c3cb16eec6d..0072ee00461 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -127,6 +127,10 @@ unit_name = "of meat" export_types = list(/obj/item/stack/sheet/meat) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Weird Stuff /datum/export/stack/abductor diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 4942ea2c06a..0996ef5774d 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -128,6 +128,10 @@ if(.) return +<<<<<<< HEAD +======= + var/mob/user = ui.user +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("LZCargo") usingBeacon = FALSE @@ -143,7 +147,7 @@ if(D.adjust_money(-BEACON_COST)) cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location()) - C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc) + C.link_console(src, user)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc) printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1 beacon.name = "Supply Pod Beacon #[printed_beacons]" @@ -159,13 +163,18 @@ CRASH("Unknown supply pack id given by express order console ui. ID: [params["id"]]") var/name = "*None Provided*" var/rank = "*None Provided*" - var/ckey = usr.ckey - if(ishuman(usr)) - var/mob/living/carbon/human/H = usr + var/ckey = user.ckey + if(ishuman(user)) + var/mob/living/carbon/human/H = user name = H.get_authentification_name() rank = H.get_assignment(hand_first = TRUE) +<<<<<<< HEAD else if(HAS_SILICON_ACCESS(usr)) name = usr.real_name +======= + else if(HAS_SILICON_ACCESS(user)) + name = user.real_name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rank = "Silicon" var/reason = "" var/list/empty_turfs diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index aa42b5cacde..d894a45742a 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -237,6 +237,15 @@ cost = PAYCHECK_CREW contains = list(/obj/item/storage/box/fishing_lines) +<<<<<<< HEAD +======= +/datum/supply_pack/goody/fishing_lure_set + name = "Fishing Lures Set" + desc = "A set of bite-resistant fishing lures to fish all (most) sort of fish. Beat randomness to a curb today!" + cost = PAYCHECK_CREW * 8 + contains = list(/obj/item/storage/box/fishing_lures) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/goody/fishing_hook_rescue name = "Rescue Fishing Hook Single-Pack" desc = "For when your fellow miner has inevitably fallen into a chasm, and it's up to you to save them." @@ -252,7 +261,11 @@ /datum/supply_pack/goody/fish_feed name = "Can of Fish Food Single-Pack" desc = "For keeping your little friends fed and alive." +<<<<<<< HEAD cost = PAYCHECK_CREW * 1 +======= + cost = PAYCHECK_CREW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 contains = list(/obj/item/fish_feed) /datum/supply_pack/goody/naturalbait diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm index 147e37e3f9d..5186c2fc9f8 100644 --- a/code/modules/cargo/markets/market_uplink.dm +++ b/code/modules/cargo/markets/market_uplink.dm @@ -98,7 +98,11 @@ )) return data +<<<<<<< HEAD /obj/item/market_uplink/ui_act(action, params) +======= +/obj/item/market_uplink/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index c675352d024..fb907d4e529 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -10,10 +10,17 @@ #define MANIFEST_ERROR_ITEM (1 << 2) /obj/item/paper/fluff/jobs/cargo/manifest + can_become_message_in_bottle = FALSE //A lot of these are spawned each round, they'd only dilute the pool and make it boring. var/order_cost = 0 var/order_id = 0 var/errors = 0 +<<<<<<< HEAD +======= +/obj/item/paper/requisition + can_become_message_in_bottle = FALSE //A lot of these are spawned each round, they'd only dilute the pool and make it boring. + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/paper/fluff/jobs/cargo/manifest/Initialize(mapload, id, cost, manifest_can_fail = TRUE) . = ..() order_id = id @@ -99,7 +106,11 @@ return round(cost) /datum/supply_order/proc/generateRequisition(turf/T) +<<<<<<< HEAD var/obj/item/paper/requisition_paper = new(T) +======= + var/obj/item/paper/requisition/requisition_paper = new(T) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 requisition_paper.name = "requisition form - #[id] ([pack.name])" var/requisition_text = "

[station_name()] Supply Requisition

" diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 6e5643e383e..149fb77cd2b 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -268,7 +268,10 @@ reason = reason, paying_account = account, coupon = applied_coupon, +<<<<<<< HEAD charge_on_purchase = TRUE, // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) working_list += order @@ -330,7 +333,11 @@ else //create the paper from the SSshuttle.shopping_list if(length(SSshuttle.shopping_list)) +<<<<<<< HEAD var/obj/item/paper/requisition_paper = new(get_turf(src)) +======= + var/obj/item/paper/requisition/requisition_paper = new(get_turf(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 requisition_paper.name = "requisition form - [station_time_timestamp()]" var/requisition_text = "

[station_name()] Supply Requisition

" requisition_text += "
" diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index 907ae1598c6..0d2a829e1de 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -76,7 +76,11 @@ cost = CARGO_CRATE_VALUE * 4 contains = list(/obj/item/inducer/orderable = 2) crate_name = "inducer crate" +<<<<<<< HEAD crate_type = /obj/structure/closet/crate/engineering/electrical +======= + crate_type = /obj/structure/closet/crate/nakamura +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/engineering/pacman name = "P.A.C.M.A.N Generator Crate" @@ -86,7 +90,11 @@ access_view = ACCESS_ENGINEERING contains = list(/obj/machinery/power/port_gen/pacman) crate_name = "\improper PACMAN generator crate" +<<<<<<< HEAD crate_type = /obj/structure/closet/crate/engineering/electrical +======= + crate_type = /obj/structure/closet/crate/nakamura +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/engineering/power name = "Power Cell Crate" diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm index 0ae09f0dc6e..a3cf68403dd 100644 --- a/code/modules/cargo/packs/imports.dm +++ b/code/modules/cargo/packs/imports.dm @@ -17,6 +17,10 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/gun/ballistic/shotgun/toy = 8) crate_name = "foam force crate" +<<<<<<< HEAD +======= + crate_type = /obj/structure/closet/crate/freezer/donk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 discountable = SUPPLY_PACK_STD_DISCOUNTABLE /datum/supply_pack/imports/foamforce/bonus @@ -30,6 +34,10 @@ /obj/item/ammo_box/magazine/toy/pistol = 2, ) crate_name = "foam force crate" +<<<<<<< HEAD +======= + crate_type = /obj/structure/closet/crate/freezer/donk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/meatmeatmeatmeat // MEAT MEAT MEAT MEAT name = "MEAT MEAT MEAT MEAT MEAT" @@ -141,6 +149,10 @@ /obj/item/gun/ballistic/automatic/wt550 = 2, /obj/item/ammo_box/magazine/wt550m9 = 2, ) +<<<<<<< HEAD +======= + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/wt550ammo name = "Smuggled WT-550 Ammo Crate" @@ -153,7 +165,11 @@ /obj/item/ammo_box/magazine/wt550m9/wtic = 2, ) crate_name = "emergency crate" +<<<<<<< HEAD crate_type = /obj/structure/closet/crate/internals +======= + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/shocktrooper name = "Shocktrooper Crate" @@ -169,6 +185,10 @@ /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet, ) +<<<<<<< HEAD +======= + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/specialops name = "Special Ops Crate" @@ -184,9 +204,14 @@ /obj/item/switchblade, /obj/item/grenade/mirage = 5, ) +<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN - REPLACED BY LORE BEFITTING CRATE AT: modular_skyrat/modules/cargo/code/packs.dm /* +======= + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/russian name = "Russian Surplus Military Gear Crate" desc = "Hello <;~insert appropriate greeting here: 'Comrade'|'Imperalist Scum'|'Quartermaster of Reputable Station'~;>, \ @@ -218,8 +243,11 @@ for(var/items in 1 to 10) var/item = pick(contains) new item(our_crate) +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/moistnuggets name = "Refurbished Sakhno Precision Rifle Crate" diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index d44e8c42d37..5443e0fba5a 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -29,7 +29,11 @@ /obj/item/reagent_containers/hypospray/medipen/ekit = 3, /obj/item/reagent_containers/hypospray/medipen/blood_loss = 3) crate_name = "medipen crate" +<<<<<<< HEAD crate_type = /obj/structure/closet/crate/medical +======= + crate_type = /obj/structure/closet/crate/deforest +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/medical/coroner_crate name = "Autopsy Kit" @@ -138,6 +142,10 @@ /obj/item/emergency_bed, ) crate_name = "surgical supplies crate" +<<<<<<< HEAD +======= + crate_type = /obj/structure/closet/crate/deforest +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/medical/salglucanister name = "Heavy-Duty Saline Canister" diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm index dfa2a663593..cb416879bdc 100644 --- a/code/modules/cargo/packs/science.dm +++ b/code/modules/cargo/packs/science.dm @@ -189,4 +189,8 @@ access_view = ACCESS_ROBOTICS contains = list(/obj/item/mod/core/standard = 3) crate_name = "\improper MOD core crate" +<<<<<<< HEAD crate_type = /obj/structure/closet/crate/secure/science/robo +======= + crate_type = /obj/structure/closet/crate/nakamura +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index 8a0765602b3..a03ee476393 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -36,7 +36,11 @@ /datum/supply_pack/security/forensics name = "Forensics Crate" desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentials™. \ +<<<<<<< HEAD Contains a forensics scanner, six evidence bags, camera, tape recorder, stick of chalk, \ +======= + Contains a forensics scanner, six evidence bags, camera, special board for evidences, tape recorder, stick of chalk, \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 and of course, a fedora." cost = CARGO_CRATE_VALUE * 2.5 access_view = ACCESS_MORGUE @@ -46,6 +50,10 @@ /obj/item/taperecorder, /obj/item/toy/crayon/white, /obj/item/clothing/head/fedora/det_hat, +<<<<<<< HEAD +======= + /obj/item/wallframe/detectiveboard +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) crate_name = "forensics crate" diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 20323b52960..5b6bfb3746e 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -245,7 +245,11 @@ /obj/item/food/ready_donk/donkhiladas, ) crate_name = "\improper Ready-Donk crate" +<<<<<<< HEAD crate_type = /obj/structure/closet/crate/freezer/food +======= + crate_type = /obj/structure/closet/crate/freezer/donk +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE /datum/supply_pack/service/randomized/ready_donk/fill(obj/structure/closet/crate/C) @@ -269,6 +273,10 @@ /obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel, //one extra syrup as a treat ) crate_name = "coffee equipment crate" +<<<<<<< HEAD +======= + crate_type = /obj/structure/closet/crate/robust +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE /datum/supply_pack/service/coffeemaker @@ -309,7 +317,11 @@ desc = "A fairly outdated copy of 'Whittle Me This: Fletching for the Modern Spacer', along with some useful materials. \ For those looking to get into bow-making, or give their LARPing a little more edge, you can't go wrong. Also has \ instructions for making violins." +<<<<<<< HEAD cost = CARGO_CRATE_VALUE * 1.5 +======= + cost = CARGO_CRATE_VALUE * 5 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 contains = list( /obj/item/book/granter/crafting_recipe/fletching = 1, /obj/item/stack/sheet/mineral/wood = 10, diff --git a/code/modules/cargo/packs/vending_restock.dm b/code/modules/cargo/packs/vending_restock.dm index 10ae874d5d6..b760eae81d6 100644 --- a/code/modules/cargo/packs/vending_restock.dm +++ b/code/modules/cargo/packs/vending_restock.dm @@ -17,7 +17,18 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/vending_refill/cigarette) crate_name = "cigarette supply crate" +<<<<<<< HEAD crate_type = /obj/structure/closet/crate +======= + crate_type = /obj/structure/closet/crate/robust + +/datum/supply_pack/vending/science/cytopro + name = "Cytology Vendor Supply Crate" + desc = "For all your vat-growing needs! Contains a CytoPro machine refill." + cost = CARGO_CRATE_VALUE * 3 + contains = list(/obj/item/vending_refill/cytopro) + crate_name = "cytopro supply crate" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/vending/dinnerware name = "Dinnerware Supply Crate" @@ -106,6 +117,10 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/vending_refill/snack) crate_name = "snacks supply crate" +<<<<<<< HEAD +======= + crate_type = /obj/structure/closet/crate/robust +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/vending/cola name = "Softdrinks Supply Crate" diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index f5915eaed37..9cffee81323 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -321,11 +321,14 @@ var/mob/living/carbon/carbon_target_mob = target_living for(var/obj/item/organ/organ_to_yeet as anything in carbon_target_mob.organs) var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs)) //Pick a random direction to toss them in +<<<<<<< HEAD // SKYRAT EDIT START - Non-spillable organs if(!organ_to_yeet.drop_when_organ_spilling) qdel(organ_to_yeet) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ_to_yeet.Remove(carbon_target_mob) //Note that this isn't the same proc as for lists organ_to_yeet.forceMove(turf_underneath) //Move the organ outta the body organ_to_yeet.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away diff --git a/code/modules/cargo/universal_scanner.dm b/code/modules/cargo/universal_scanner.dm index 484f4a7a032..1919dcdcd15 100644 --- a/code/modules/cargo/universal_scanner.dm +++ b/code/modules/cargo/universal_scanner.dm @@ -257,7 +257,11 @@ /obj/item/universal_scanner/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 2b60b3bdbb2..f03fbd74b85 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -45,8 +45,11 @@ var/datum/click_intercept = null ///Time when the click was intercepted var/click_intercept_time = 0 +<<<<<<< HEAD ///Used for admin AI interaction var/AI_Interact = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Used to cache this client's bans to save on DB queries var/ban_cache = null diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 2ed6ed0c3d6..270501b8b5b 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -37,6 +37,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( return //SKYRAT EDIT ADDITION END +#ifndef TESTING + if (LOWER_TEXT(hsrc_command) == "_debug") //disable the integrated byond vv in the client side debugging tools since it doesn't respect vv read protections + return +#endif + #ifndef TESTING if (LOWER_TEXT(hsrc_command) == "_debug") //disable the integrated byond vv in the client side debugging tools since it doesn't respect vv read protections return @@ -352,11 +357,14 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( else if(GLOB.deadmins[ckey]) add_verb(src, /client/proc/readmin) connecting_admin = TRUE +<<<<<<< HEAD //SKYRAT EDIT ADDITION //We will check the population here, because we need to know if the client is an admin or not. if(!check_population(connecting_admin)) qdel(src) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(CONFIG_GET(flag/autoadmin)) if(!GLOB.admin_datums[ckey]) var/list/autoadmin_ranks = ranks_from_rank_name(CONFIG_GET(string/autoadmin_rank)) @@ -655,7 +663,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!query_client_in_db.Execute()) qdel(query_client_in_db) return +<<<<<<< HEAD /* +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/client_is_in_db = query_client_in_db.NextRow() // If we aren't an admin, and the flag is set (the panic bunker is enabled). if(CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey]) @@ -687,6 +699,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( qdel(query_client_in_db) qdel(src) return +<<<<<<< HEAD */ var/client_is_in_db = query_client_in_db.NextRow() @@ -707,6 +720,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( qdel(src) return //SKYRAT EDIT END +======= + + if(!client_is_in_db) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_player = 1 account_join_date = findJoinDate() var/datum/db_query/query_add_player = SSdbcore.NewQuery({" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a8bef76b282..792b90a9fff 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -9,7 +9,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// Ensures that we always load the last used save, QOL var/default_slot = 1 /// The maximum number of slots we're allowed to contain +<<<<<<< HEAD var/max_save_slots = 30 //SKYRAT EDIT - ORIGINAL 3 +======= + var/max_save_slots = 3 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitflags for communications that are muted var/muted = NONE @@ -92,10 +96,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) QDEL_NULL(character_preview_view) QDEL_LIST(middleware) value_cache = null +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(pref_species) QDEL_NULL(pref_species) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/preferences/New(client/parent) @@ -110,9 +117,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(load_and_save && !fexists(path)) try_savefile_type_migration() unlock_content = !!parent.IsByondMember() +<<<<<<< HEAD donator_status = !!GLOB.donator_list[parent.ckey] //SKYRAT EDIT ADD - DONATOR CHECK if(unlock_content || donator_status) //SKYRAT EDIT - ADD DONATOR CHECK max_save_slots = 50 //SKYRAT EDIT - ORIGINAL 8 +======= + if(unlock_content) + max_save_slots = 8 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("attempted to create a preferences datum without a client or mock!") load_savefile() @@ -175,6 +187,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) data["character_profiles"] = create_character_profiles() tainted_character_profiles = FALSE +<<<<<<< HEAD //SKYRAT EDIT BEGIN data["preview_selection"] = preview_pref @@ -291,6 +304,89 @@ GLOBAL_LIST_EMPTY(preferences_datums) if (isnull(requested_preference)) return FALSE +======= + data["character_preferences"] = compile_character_preferences(user) + + data["active_slot"] = default_slot + + for (var/datum/preference_middleware/preference_middleware as anything in middleware) + data += preference_middleware.get_ui_data(user) + + return data + +/datum/preferences/ui_static_data(mob/user) + var/list/data = list() + + data["character_profiles"] = create_character_profiles() + + data["character_preview_view"] = character_preview_view.assigned_map + data["overflow_role"] = SSjob.GetJobType(SSjob.overflow_role).title + data["window"] = current_window + + data["content_unlocked"] = unlock_content + + for (var/datum/preference_middleware/preference_middleware as anything in middleware) + data += preference_middleware.get_ui_static_data(user) + + return data + +/datum/preferences/ui_assets(mob/user) + var/list/assets = list( + get_asset_datum(/datum/asset/spritesheet/preferences), + get_asset_datum(/datum/asset/json/preferences), + ) + + for (var/datum/preference_middleware/preference_middleware as anything in middleware) + assets += preference_middleware.get_ui_assets() + + return assets + +/datum/preferences/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if (.) + return + + switch (action) + if ("change_slot") + // Save existing character + save_character() + // SAFETY: `switch_to_slot` performs sanitization on the slot number + switch_to_slot(params["slot"]) + return TRUE + if ("remove_current_slot") + remove_current_slot() + return TRUE + if ("rotate") + character_preview_view.setDir(turn(character_preview_view.dir, -90)) + return TRUE + if ("set_preference") + var/requested_preference_key = params["preference"] + var/value = params["value"] + + for (var/datum/preference_middleware/preference_middleware as anything in middleware) + if (preference_middleware.pre_set_preference(usr, requested_preference_key, value)) + return TRUE + + var/datum/preference/requested_preference = GLOB.preference_entries_by_key[requested_preference_key] + if (isnull(requested_preference)) + return FALSE + + // SAFETY: `update_preference` performs validation checks + if (!update_preference(requested_preference, value)) + return FALSE + + if (istype(requested_preference, /datum/preference/name)) + tainted_character_profiles = TRUE + + return TRUE + if ("set_color_preference") + var/requested_preference_key = params["preference"] + + var/datum/preference/requested_preference = GLOB.preference_entries_by_key[requested_preference_key] + if (isnull(requested_preference)) + return FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!istype(requested_preference, /datum/preference/color)) return FALSE @@ -311,6 +407,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) return FALSE return TRUE +<<<<<<< HEAD //SKYRAT EDIT ADDITION if("update_preview") preview_pref = params["updated_preview"] @@ -360,6 +457,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) return TRUE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for (var/datum/preference_middleware/preference_middleware as anything in middleware) var/delegation = preference_middleware.action_delegations[action] @@ -586,19 +685,28 @@ GLOBAL_LIST_EMPTY(preferences_datums) apply_prefs_to(character, icon_updates) /// Applies the given preferences to a human mob. +<<<<<<< HEAD /datum/preferences/proc/apply_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE, visuals_only = FALSE) // SKYRAT EDIT - Customization - ORIGINAL: /datum/preferences/proc/apply_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE) character.dna.features = MANDATORY_FEATURE_LIST //SKYRAT EDIT CHANGE - We need to instansiate the list with the basic features. +======= +/datum/preferences/proc/apply_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE) + character.dna.features = list() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for (var/datum/preference/preference as anything in get_preferences_in_priority_order()) if (preference.savefile_identifier != PREFERENCE_CHARACTER) continue +<<<<<<< HEAD preference.apply_to_human(character, read_preference(preference.type), src) // SKYRAT EDIT ADDITION START - middleware apply human prefs for (var/datum/preference_middleware/preference_middleware as anything in middleware) preference_middleware.apply_to_human(character, src, visuals_only = visuals_only) // SKYRAT EDIT ADDITION END +======= + preference.apply_to_human(character, read_preference(preference.type)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 character.dna.real_name = character.real_name diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm index f70a92e583c..9cee4dae28f 100644 --- a/code/modules/client/preferences/_preference.dm +++ b/code/modules/client/preferences/_preference.dm @@ -111,10 +111,13 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// DOES have random body on, will this already be randomized? var/randomize_by_default = TRUE +<<<<<<< HEAD /// If the selected species has this in its /datum/species/mutant_bodyparts, /// will show the feature as selectable. var/relevant_mutant_bodypart = null +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// If the selected species has this in its /datum/species/body_markings, /// will show the feature as selectable. var/relevant_body_markings = null @@ -221,7 +224,11 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// Apply this preference onto the given human. /// Must be overriden by subtypes. /// Called when the savefile_identifier == PREFERENCE_CHARACTER. +<<<<<<< HEAD /datum/preference/proc/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) //SKYRAT EDIT CHANGE +======= +/datum/preference/proc/apply_to_human(mob/living/carbon/human/target, value) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_NOT_SLEEP(TRUE) SHOULD_CALL_PARENT(FALSE) CRASH("`apply_to_human()` was not implemented for [type]!") @@ -290,6 +297,12 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// This will, for instance, update the character preference view. /// Performs sanity checks. /datum/preferences/proc/update_preference(datum/preference/preference, preference_value) +<<<<<<< HEAD +======= + if (!preference.is_accessible(src)) + return FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/new_value = preference.deserialize(preference_value, src) var/success = preference.write(null, new_value) @@ -333,8 +346,12 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) SHOULD_NOT_SLEEP(TRUE) if ( \ +<<<<<<< HEAD !isnull(relevant_mutant_bodypart) \ || !isnull(relevant_inherent_trait) \ +======= + !isnull(relevant_inherent_trait) \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || !isnull(relevant_external_organ) \ || !isnull(relevant_head_flag) \ || !isnull(relevant_body_markings) \ diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm index caad2b0437b..ec0191d6649 100644 --- a/code/modules/client/preferences/body_type.dm +++ b/code/modules/client/preferences/body_type.dm @@ -27,4 +27,7 @@ return initial(species.sexes) #undef USE_GENDER +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm index e57d87bf2c8..a8fca84732c 100644 --- a/code/modules/client/preferences/clothing.dm +++ b/code/modules/client/preferences/clothing.dm @@ -1,13 +1,25 @@ +<<<<<<< HEAD /proc/generate_underwear_icon(datum/sprite_accessory/accessory, icon/base_icon, color, icon_offset = 0) //SKYRAT EDIT CHANGE : adds icon_offset - Colorable Undershirt/Socks var/icon/final_icon = new(base_icon) if (!isnull(accessory)) var/icon/accessory_icon = icon(accessory.icon, accessory.icon_state) // SKYRAT EDIT CHANGE: ORIGINAL - var/icon/accessory_icon = icon('icons/mob/clothing/underwear.dmi', accessory.icon_state) +======= +/proc/generate_underwear_icon(datum/sprite_accessory/accessory, icon/base_icon, color) + var/icon/final_icon = new(base_icon) + + if (!isnull(accessory)) + var/icon/accessory_icon = icon('icons/mob/clothing/underwear.dmi', accessory.icon_state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (color && !accessory.use_static) accessory_icon.Blend(color, ICON_MULTIPLY) final_icon.Blend(accessory_icon, ICON_OVERLAY) +<<<<<<< HEAD final_icon.Crop(10, 1+icon_offset, 22, 13+icon_offset) //SKYRAT EDIT CHANGE : adds icon_offset - Colorable Undershirt/Socks +======= + final_icon.Crop(10, 1, 22, 13) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 final_icon.Scale(32, 32) return final_icon @@ -93,6 +105,7 @@ /datum/preference/choiced/jumpsuit/apply_to_human(mob/living/carbon/human/target, value) target.jumpsuit_style = value +<<<<<<< HEAD /datum/preference/choiced/jumpsuit/create_informed_default_value(datum/preferences/preferences) switch(preferences.read_preference(/datum/preference/choiced/gender)) if(MALE) @@ -102,6 +115,8 @@ return ..() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Socks preference /datum/preference/choiced/socks savefile_key = "socks" @@ -146,7 +161,10 @@ /datum/preference/choiced/undershirt/create_default_value() return /datum/sprite_accessory/undershirt/nude::name +<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL - sports bra doesn't exist as an undershirt. so just let this default to naked and we'll add underwear elsewhere +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/undershirt/create_informed_default_value(datum/preferences/preferences) switch(preferences.read_preference(/datum/preference/choiced/gender)) if(MALE) @@ -155,7 +173,10 @@ return /datum/sprite_accessory/undershirt/sports_bra::name return ..() +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/undershirt/icon_for(value) var/static/icon/body @@ -172,9 +193,15 @@ if (value != "Nude") var/datum/sprite_accessory/accessory = SSaccessories.undershirt_list[value] +<<<<<<< HEAD icon_with_undershirt.Blend(icon(accessory.icon, accessory.icon_state), ICON_OVERLAY)// SKYRAT EDIT CHANGE: ORIGINAL - icon_with_undershirt.Blend(icon('icons/mob/clothing/underwear.dmi', accessory.icon_state), ICON_OVERLAY) icon_with_undershirt.Crop(10, 11, 22, 23) // SKYRAT EDIT CHANGE : ORIGINAL - icon_with_undershirt.Crop(9, 9, 23, 23) +======= + icon_with_undershirt.Blend(icon('icons/mob/clothing/underwear.dmi', accessory.icon_state), ICON_OVERLAY) + + icon_with_undershirt.Crop(9, 9, 23, 23) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_with_undershirt.Scale(32, 32) return icon_with_undershirt @@ -205,7 +232,11 @@ lower_half.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_leg"), ICON_OVERLAY) lower_half.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_leg"), ICON_OVERLAY) +<<<<<<< HEAD return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK, icon_offset = 5) // SKYRAT EDIT CHANGE : ICON_OFFSET // SKYRAT EDIT CHANGE - ORIGINAL: return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK) +======= + return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/underwear/apply_to_human(mob/living/carbon/human/target, value) target.underwear = value diff --git a/code/modules/client/preferences/gender.dm b/code/modules/client/preferences/gender.dm index 4861fae7e1a..3cb72351bbf 100644 --- a/code/modules/client/preferences/gender.dm +++ b/code/modules/client/preferences/gender.dm @@ -8,10 +8,15 @@ return list(MALE, FEMALE, PLURAL, NEUTER) /datum/preference/choiced/gender/apply_to_human(mob/living/carbon/human/target, value) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - Did you just assume my gender??? if(!target.dna.species.sexes) value = PLURAL //disregard gender preferences on this species */ // SKYRAT EDIT REMOVAL END +======= + if(!target.dna.species.sexes) + value = PLURAL //disregard gender preferences on this species +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.gender = value /datum/preference/choiced/gender/create_informed_default_value(datum/preferences/preferences) diff --git a/code/modules/client/preferences/language.dm b/code/modules/client/preferences/language.dm index dbe4c700a31..4b40ba9735f 100644 --- a/code/modules/client/preferences/language.dm +++ b/code/modules/client/preferences/language.dm @@ -23,7 +23,10 @@ //we add uncommon as it's foreigner-only. var/datum/language/uncommon/uncommon_language = /datum/language/uncommon values += initial(uncommon_language.name) +<<<<<<< HEAD values += /datum/language/common::name // SKYRAT EDIT ADDITION START - Let's you select common +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/language/language_type as anything in GLOB.uncommon_roundstart_languages) if(initial(language_type.name) in values) diff --git a/code/modules/client/preferences/middleware/_middleware.dm b/code/modules/client/preferences/middleware/_middleware.dm index b7719270cc3..c13a2f0cb86 100644 --- a/code/modules/client/preferences/middleware/_middleware.dm +++ b/code/modules/client/preferences/middleware/_middleware.dm @@ -43,13 +43,18 @@ /datum/preference_middleware/proc/get_character_preferences(mob/user) return null +<<<<<<< HEAD /// Called before every update_preference, returns TRUE if this handled it. +======= +/// Called every set_preference, returns TRUE if this handled it. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference_middleware/proc/pre_set_preference(mob/user, preference, value) return FALSE /// Called when a character is changed. /datum/preference_middleware/proc/on_new_character(mob/user) return +<<<<<<< HEAD // SKYRAT EDIT /// Called after every update_preference, returns TRUE if this handled it. @@ -62,3 +67,5 @@ SHOULD_CALL_PARENT(FALSE) return //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/middleware/jobs.dm b/code/modules/client/preferences/middleware/jobs.dm index 0c9177cddf3..05b924b3b54 100644 --- a/code/modules/client/preferences/middleware/jobs.dm +++ b/code/modules/client/preferences/middleware/jobs.dm @@ -1,9 +1,12 @@ /datum/preference_middleware/jobs action_delegations = list( "set_job_preference" = PROC_REF(set_job_preference), +<<<<<<< HEAD // SKYRAT EDIT "set_job_title" = PROC_REF(set_job_title), // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/preference_middleware/jobs/proc/set_job_preference(list/params, mob/user) @@ -28,6 +31,7 @@ return TRUE +<<<<<<< HEAD // SKYRAT EDIT /datum/preference_middleware/jobs/proc/set_job_title(list/params, mob/user) var/job_title = params["job"] @@ -46,6 +50,8 @@ return TRUE // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference_middleware/jobs/get_constant_data() var/list/data = list() @@ -75,8 +81,11 @@ jobs[job.title] = list( "description" = job.description, "department" = department_name, +<<<<<<< HEAD "veteran" = job.veteran_only, // SKYRAT EDIT "alt_titles" = job.alt_titles, // SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) data["departments"] = departments @@ -86,6 +95,7 @@ /datum/preference_middleware/jobs/get_ui_data(mob/user) var/list/data = list() +<<<<<<< HEAD // SKYRAT EDIT if(isnull(preferences.alt_job_titles)) preferences.alt_job_titles = list() @@ -95,15 +105,23 @@ data["job_alt_titles"] = preferences.alt_job_titles data["species_restricted_jobs"] = get_unavailable_jobs_for_species() // SKYRAT EDIT END +======= + + data["job_preferences"] = preferences.job_preferences +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /datum/preference_middleware/jobs/get_ui_static_data(mob/user) var/list/data = list() +<<<<<<< HEAD // SKYRAT EDIT if(CONFIG_GET(flag/bypass_veteran_system) || SSplayer_ranks.is_veteran(user.client)) data["is_veteran"] = TRUE // SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/required_job_playtime = get_required_job_playtime(user) if (!isnull(required_job_playtime)) data += required_job_playtime @@ -111,6 +129,10 @@ var/list/job_bans = get_job_bans(user) if (job_bans.len) data["job_bans"] = job_bans +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data.len > 0 ? data : null /datum/preference_middleware/jobs/proc/get_required_job_playtime(mob/user) @@ -150,6 +172,7 @@ data += job.title return data +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CHECKING FOR INCOMPATIBLE SPECIES //This returns a list of jobs that are unavailable for the player's current species @@ -163,3 +186,5 @@ return data //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/middleware/keybindings.dm b/code/modules/client/preferences/middleware/keybindings.dm index f4a1c06784e..2b964fff933 100644 --- a/code/modules/client/preferences/middleware/keybindings.dm +++ b/code/modules/client/preferences/middleware/keybindings.dm @@ -27,6 +27,10 @@ preferences.key_bindings = deep_copy_list(GLOB.default_hotkeys) preferences.key_bindings_by_key = preferences.get_key_bindings_by_key(preferences.key_bindings) preferences.update_static_data(user) +<<<<<<< HEAD +======= + user.client.update_special_keybinds() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE @@ -41,10 +45,18 @@ preferences.key_bindings_by_key = preferences.get_key_bindings_by_key(preferences.key_bindings) preferences.update_static_data(user) +<<<<<<< HEAD return TRUE /datum/preference_middleware/keybindings/proc/set_keybindings(list/params) +======= + user.client.update_special_keybinds() + + return TRUE + +/datum/preference_middleware/keybindings/proc/set_keybindings(list/params, mob/user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/keybind_name = params["keybind_name"] if (isnull(GLOB.keybindings_by_name[keybind_name])) @@ -73,6 +85,11 @@ preferences.key_bindings[keybind_name] = hotkeys preferences.key_bindings_by_key = preferences.get_key_bindings_by_key(preferences.key_bindings) +<<<<<<< HEAD +======= + user.client.update_special_keybinds() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /datum/asset/json/keybindings diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index 43b87c3a44e..d35120f5ee3 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -48,7 +48,10 @@ "value" = initial(quirk.value), "customizable" = constant_data?.is_customizable(), "customization_options" = customization_options, +<<<<<<< HEAD "veteran_only" = initial(quirk.veteran_only), // SKYRAT EDIT - Veteran quirks +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) return list( @@ -64,6 +67,7 @@ /datum/preference_middleware/quirks/proc/give_quirk(list/params, mob/user) var/quirk_name = params["quirk"] +<<<<<<< HEAD //SKYRAT EDIT ADDITION var/list/quirks = SSquirks.get_quirks() var/datum/quirk/quirk = quirks[quirk_name] @@ -73,6 +77,10 @@ var/list/new_quirks = preferences.all_quirks | quirk_name if (SSquirks.filter_invalid_quirks(new_quirks, preferences.augments) != new_quirks)// SKYRAT EDIT - AUGMENTS+ +======= + var/list/new_quirks = preferences.all_quirks | quirk_name + if (SSquirks.filter_invalid_quirks(new_quirks) != new_quirks) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If the client is sending an invalid give_quirk, that means that // something went wrong with the client prediction, so we should // catch it back up to speed. @@ -88,7 +96,14 @@ var/quirk_name = params["quirk"] var/list/new_quirks = preferences.all_quirks - quirk_name +<<<<<<< HEAD if (!(quirk_name in preferences.all_quirks) || SSquirks.filter_invalid_quirks(new_quirks, preferences.augments) != new_quirks)// SKYRAT EDIT - AUGMENTS+ +======= + if ( \ + !(quirk_name in preferences.all_quirks) \ + || SSquirks.filter_invalid_quirks(new_quirks) != new_quirks \ + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If the client is sending an invalid remove_quirk, that means that // something went wrong with the client prediction, so we should // catch it back up to speed. @@ -104,6 +119,7 @@ var/list/selected_quirks = list() for (var/quirk in preferences.all_quirks) +<<<<<<< HEAD //SKYRAT EDIT ADDITION var/list/quirks = SSquirks.get_quirks() var/datum/quirk/quirk_datum = quirks[quirk] @@ -111,6 +127,8 @@ preferences.all_quirks -= quirk continue //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 selected_quirks += sanitize_css_class_name(quirk) return selected_quirks diff --git a/code/modules/client/preferences/middleware/species.dm b/code/modules/client/preferences/middleware/species.dm index b8c5e000680..8a74f5a3ce3 100644 --- a/code/modules/client/preferences/middleware/species.dm +++ b/code/modules/client/preferences/middleware/species.dm @@ -13,7 +13,11 @@ /datum/asset/spritesheet/species/create_spritesheets() var/list/to_insert = list() +<<<<<<< HEAD for (var/species_id in get_selectable_species() | get_customizable_races()) // SKYRAT EDIT CHANGE - ORIGINAL: for (var/species_id in get_selectable_species()) +======= + for (var/species_id in get_selectable_species()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/species/species_type = GLOB.species_list[species_id] var/mob/living/carbon/human/dummy/consistent/dummy = new diff --git a/code/modules/client/preferences/names.dm b/code/modules/client/preferences/names.dm index 08d8f86592c..fdda0b0e14a 100644 --- a/code/modules/client/preferences/names.dm +++ b/code/modules/client/preferences/names.dm @@ -12,7 +12,11 @@ var/group /// Whether or not to allow numbers in the person's name +<<<<<<< HEAD var/allow_numbers = TRUE //SKYRAT EDIT CHANGE +======= + var/allow_numbers = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// If the highest priority job matches this, will prioritize this name in the UI var/relevant_job diff --git a/code/modules/client/preferences/species.dm b/code/modules/client/preferences/species.dm index 998fad31ca3..48f52a9e1a4 100644 --- a/code/modules/client/preferences/species.dm +++ b/code/modules/client/preferences/species.dm @@ -24,6 +24,7 @@ for (var/species_id in get_selectable_species()) values += GLOB.species_list[species_id] +<<<<<<< HEAD //SKYRAT EDIT ADDITION for (var/species_id in get_customizable_races()) values += GLOB.species_list[species_id] @@ -43,11 +44,21 @@ gent.aroused = prefs.arousal_preview gent.update_sprite_suffix() //SKYRAT EDIT END +======= + return values + +/datum/preference/choiced/species/apply_to_human(mob/living/carbon/human/target, value) + target.set_species(value, icon_update = FALSE, pref_load = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/species/compile_constant_data() var/list/data = list() +<<<<<<< HEAD for (var/species_id in (get_selectable_species() + get_customizable_races())) //SKYRAT EDIT CHANGE +======= + for (var/species_id in get_selectable_species()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/species_type = GLOB.species_list[species_id] var/datum/species/species = GLOB.species_prototypes[species_type] @@ -61,6 +72,9 @@ data[species_id]["enabled_features"] = species.get_features() data[species_id]["perks"] = species.get_species_perks() data[species_id]["diet"] = species.get_species_diet() +<<<<<<< HEAD data[species_id]["veteran_only"] = species.veteran_only // SKYRAT EDIT ADDITION - Veteran races +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data diff --git a/code/modules/client/preferences/species_features/felinid.dm b/code/modules/client/preferences/species_features/felinid.dm index 8bf49fac227..b6783a528ae 100644 --- a/code/modules/client/preferences/species_features/felinid.dm +++ b/code/modules/client/preferences/species_features/felinid.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/tail_human savefile_key = "feature_human_tail" savefile_identifier = PREFERENCE_CHARACTER @@ -21,7 +24,11 @@ savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES can_randomize = FALSE +<<<<<<< HEAD relevant_mutant_bodypart = "ears" +======= + relevant_external_organ = /obj/item/organ/internal/ears/cat +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/ears/init_possible_values() return assoc_to_keys_features(SSaccessories.ears_list) @@ -30,7 +37,11 @@ target.dna.features["ears"] = value /datum/preference/choiced/ears/create_default_value() +<<<<<<< HEAD var/datum/sprite_accessory/ears/cat/ears = /datum/sprite_accessory/ears/cat return initial(ears.name) return /datum/sprite_accessory/ears/cat::name */ +======= + return /datum/sprite_accessory/ears/cat::name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm index 97154c106d5..b2e10d2db26 100644 --- a/code/modules/client/preferences/species_features/lizard.dm +++ b/code/modules/client/preferences/species_features/lizard.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/generate_lizard_side_shot(datum/sprite_accessory/sprite_accessory, key, include_snout = TRUE) var/static/icon/lizard var/static/icon/lizard_with_snout @@ -94,6 +97,7 @@ savefile_key = "feature_lizard_legs" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES +<<<<<<< HEAD relevant_mutant_bodypart = "legs" /datum/preference/choiced/lizard_legs/init_possible_values() @@ -101,6 +105,53 @@ /datum/preference/choiced/lizard_legs/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["legs"] = value +======= + +/datum/preference/choiced/lizard_legs/init_possible_values() + return list(NORMAL_LEGS, DIGITIGRADE_LEGS) + +/datum/preference/choiced/lizard_legs/apply_to_human(mob/living/carbon/human/target, value) + target.dna.features["legs"] = value + // Hack to update the dummy in the preference menu + // (Because digi legs are ONLY handled on species change) + if(!isdummy(target) || target.dna.species.digitigrade_customization == DIGITIGRADE_NEVER) + return + + var/list/correct_legs = target.dna.species.bodypart_overrides.Copy() & list(BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) + + if(value == DIGITIGRADE_LEGS) + correct_legs[BODY_ZONE_R_LEG] = /obj/item/bodypart/leg/right/digitigrade + correct_legs[BODY_ZONE_L_LEG] = /obj/item/bodypart/leg/left/digitigrade + + for(var/obj/item/bodypart/old_part as anything in target.bodyparts) + if(old_part.change_exempt_flags & BP_BLOCK_CHANGE_SPECIES) + continue + + var/path = correct_legs[old_part.body_zone] + if(!path) + continue + var/obj/item/bodypart/new_part = new path() + new_part.replace_limb(target, TRUE) + new_part.update_limb(is_creating = TRUE) + qdel(old_part) + +/datum/preference/choiced/lizard_legs/is_accessible(datum/preferences/preferences) + if(!..()) + return FALSE + var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) + return initial(species_type.digitigrade_customization) == DIGITIGRADE_OPTIONAL + + +/datum/preference/choiced/lizard_legs/is_accessible(datum/preferences/preferences) + . = ..() + + if(!.) + return + + var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) + + return initial(species_type.digitigrade_customization) & DIGITIGRADE_OPTIONAL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/lizard_snout savefile_key = "feature_lizard_snout" @@ -122,7 +173,11 @@ savefile_key = "feature_lizard_spines" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES +<<<<<<< HEAD relevant_mutant_bodypart = "spines" +======= + relevant_external_organ = /obj/item/organ/external/spines +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/lizard_spines/init_possible_values() return assoc_to_keys_features(SSaccessories.spines_list) @@ -143,7 +198,11 @@ target.dna.features["tail_lizard"] = value /datum/preference/choiced/lizard_tail/create_default_value() +<<<<<<< HEAD var/datum/sprite_accessory/tails/lizard/smooth/tail = /datum/sprite_accessory/tails/lizard/smooth return initial(tail.name) return /datum/sprite_accessory/tails/lizard/smooth::name */ +======= + return /datum/sprite_accessory/tails/lizard/smooth::name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/monkey.dm b/code/modules/client/preferences/species_features/monkey.dm index 07448ea7fc2..0b2821620da 100644 --- a/code/modules/client/preferences/species_features/monkey.dm +++ b/code/modules/client/preferences/species_features/monkey.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/monkey_tail savefile_key = "feature_monkey_tail" savefile_identifier = PREFERENCE_CHARACTER @@ -13,7 +16,11 @@ target.dna.features["tail_monkey"] = value /datum/preference/choiced/monkey_tail/create_default_value() +<<<<<<< HEAD var/datum/sprite_accessory/tails/monkey/default/tail = /datum/sprite_accessory/tails/monkey/default return initial(tail.name) return /datum/sprite_accessory/tails/monkey/default::name */ +======= + return /datum/sprite_accessory/tails/monkey/default::name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/moth.dm b/code/modules/client/preferences/species_features/moth.dm index b306c052d71..8535ab5bc8f 100644 --- a/code/modules/client/preferences/species_features/moth.dm +++ b/code/modules/client/preferences/species_features/moth.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/moth_antennae savefile_key = "feature_moth_antennae" savefile_identifier = PREFERENCE_CHARACTER @@ -99,5 +102,8 @@ /datum/preference/choiced/moth_wings/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["moth_wings"] = value +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/mushperson.dm b/code/modules/client/preferences/species_features/mushperson.dm index 9b77ed72f19..a50029d0201 100644 --- a/code/modules/client/preferences/species_features/mushperson.dm +++ b/code/modules/client/preferences/species_features/mushperson.dm @@ -1,8 +1,12 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/mushroom_cap savefile_key = "feature_mushperson_cap" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES +<<<<<<< HEAD relevant_mutant_bodypart = "cap" /datum/preference/choiced/mushroom_cap/init_possible_values() @@ -11,3 +15,12 @@ /datum/preference/choiced/mushroom_cap/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["caps"] = value */ +======= + relevant_external_organ = /obj/item/organ/external/mushroom_cap + +/datum/preference/choiced/mushroom_cap/init_possible_values() + return assoc_to_keys_features(SSaccessories.caps_list) + +/datum/preference/choiced/mushroom_cap/apply_to_human(mob/living/carbon/human/target, value) + target.dna.features["caps"] = value +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/mutants.dm b/code/modules/client/preferences/species_features/mutants.dm index 12ae93d2d2d..0a26e49c7a9 100644 --- a/code/modules/client/preferences/species_features/mutants.dm +++ b/code/modules/client/preferences/species_features/mutants.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/color/mutant_color savefile_key = "feature_mcolor" savefile_identifier = PREFERENCE_CHARACTER @@ -27,4 +30,7 @@ return FALSE return TRUE +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/pod.dm b/code/modules/client/preferences/species_features/pod.dm index 22092f0cba9..e4049757a52 100644 --- a/code/modules/client/preferences/species_features/pod.dm +++ b/code/modules/client/preferences/species_features/pod.dm @@ -1,5 +1,8 @@ +<<<<<<< HEAD // SKYRAT EDIT: REPLACED BY /datum/preference/choiced/mutant_choice/pod_hair IN mutant_parts.dm /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/pod_hair savefile_key = "feature_pod_hair" savefile_identifier = PREFERENCE_CHARACTER @@ -30,4 +33,7 @@ /datum/preference/choiced/pod_hair/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["pod_hair"] = value +<<<<<<< HEAD */ // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 65aa5642b8b..74d9df697c3 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -99,8 +99,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car migrate_character_to_tgui_prefs_menu() if (current_version < 42) +<<<<<<< HEAD // migrate_body_types(save_data) // SKYRAT EDIT - This'll fuck up savefiles migrate_mentor() // SKYRAT EDIT - Make mentors alive again +======= + migrate_body_types(save_data) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (current_version < 43) migrate_legacy_sound_toggles(savefile) @@ -308,7 +312,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Quirks all_quirks = save_data?["all_quirks"] +<<<<<<< HEAD load_character_skyrat(save_data) // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //try to fix any outdated data if necessary //preference updating will handle saving the updated data for us. @@ -325,12 +332,20 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(job_preferences[j] != JP_LOW && job_preferences[j] != JP_MEDIUM && job_preferences[j] != JP_HIGH) job_preferences -= j +<<<<<<< HEAD all_quirks = SSquirks.filter_invalid_quirks(SANITIZE_LIST(all_quirks), augments)// SKYRAT EDIT - AUGMENTS+ +======= + all_quirks = SSquirks.filter_invalid_quirks(SANITIZE_LIST(all_quirks)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 validate_quirks() return TRUE +<<<<<<< HEAD /datum/preferences/proc/save_character(update) // Skyrat edit - Choose when to update (This is stupid) +======= +/datum/preferences/proc/save_character() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_NOT_SLEEP(TRUE) if(!path) return FALSE @@ -367,7 +382,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Quirks save_data["all_quirks"] = all_quirks +<<<<<<< HEAD save_character_skyrat(save_data, update) // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 9690827b023..00c6e7bfb98 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -78,17 +78,23 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") mob.log_talk(raw_msg, LOG_OOC) var/keyname = key +<<<<<<< HEAD if(CONFIG_GET(flag/enable_cross_server_ooc)) //SKYRAT EDIT ADDITION send_ooc_to_other_server(ckey, msg) //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prefs.unlock_content) if(prefs.toggles & MEMBER_PUBLIC) keyname = "[icon2html('icons/ui/chat/member_content.dmi', world, "blag")][keyname]" if(prefs.hearted) var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat) keyname = "[sheet.icon_tag("emoji-heart")][keyname]" +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url for(var/client/receiver as anything in GLOB.clients) if(!receiver.prefs) // Client being created or deleted. Despite all, this can be null. @@ -103,12 +109,21 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(check_rights_for(src, R_ADMIN)) var/ooc_color = prefs.read_preference(/datum/preference/color/ooc_color) to_chat(receiver, span_adminooc("[CONFIG_GET(flag/allow_admin_ooccolor) && ooc_color ? "" :"" ][span_prefix("OOC:")] [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]"), avoid_highlighting = avoid_highlight) +<<<<<<< HEAD else to_chat(receiver, span_adminobserverooc(span_prefix("OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]")), avoid_highlighting = avoid_highlight) else if(GLOB.OOC_COLOR) to_chat(receiver, "[span_prefix("OOC:")] [holder.fakekey ? holder.fakekey : key]: [msg]", avoid_highlighting = avoid_highlight) else +======= + else + to_chat(receiver, span_adminobserverooc(span_prefix("OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]")), avoid_highlighting = avoid_highlight) + else + if(GLOB.OOC_COLOR) + to_chat(receiver, "[span_prefix("OOC:")] [holder.fakekey ? holder.fakekey : key]: [msg]", avoid_highlighting = avoid_highlight) + else +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(receiver, span_ooc(span_prefix("OOC: [holder.fakekey ? holder.fakekey : key]: [msg]")), avoid_highlighting = avoid_highlight) else if(!(key in receiver.prefs.ignoring)) diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index ad75e7c883f..880d4c42314 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -48,6 +48,7 @@ /// Checks if we are in a valid state to suicide (not already suiciding, capable of actually killing ourselves, area checks, etc.) Returns TRUE if we can suicide, FALSE if we can not. /mob/living/proc/can_suicide() +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(CONFIG_GET(flag/disable_suicide)) to_chat(src, span_warning("Suicide is disabled on this server.")) @@ -63,6 +64,17 @@ to_chat(src, span_warning("You can't commit suicide here! You can ghost if you'd like.")) return FALSE +======= + if(HAS_TRAIT_FROM_ONLY(src, TRAIT_SUICIDED, REF(src))) + to_chat(src, span_warning("You are already commiting suicide!")) + return FALSE + + var/area/checkable = get_area(src) + if(checkable.area_flags & BLOCK_SUICIDE) + to_chat(src, span_warning("You can't commit suicide here! You can ghost if you'd like.")) + return FALSE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(stat) if(CONSCIOUS) return TRUE diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f6d477afbb9..37a36818c6f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -354,7 +354,11 @@ . += how_cool_are_your_threads.Join() if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF)) || (clothing_flags & STOPSPRESSUREDAMAGE) || (visor_flags & STOPSPRESSUREDAMAGE)) +<<<<<<< HEAD . += span_notice("OOC: Click here to see its protection classes.") // SKYRAT EDIT ORIGINAL: ("It has a tag listing its protection classes.") +======= + . += span_notice("It has a tag listing its protection classes.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/Topic(href, href_list) . = ..() @@ -528,7 +532,11 @@ BLIND // can't see anything update_appearance() //most of the time the sprite changes /obj/item/clothing/proc/can_use(mob/user) +<<<<<<< HEAD return istype(user) && !user.incapacitated() +======= + return istype(user) && !user.incapacitated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/proc/spawn_shreds() new /obj/effect/decal/cleanable/shreds(get_turf(src), name) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 1c90176bc9e..5a58d43d66a 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -38,7 +38,11 @@ /obj/item/clothing/glasses/visor_toggling() . = ..() +<<<<<<< HEAD alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : initial(alternate_worn_layer) // SKYRAT EDIT CHANGE - ORIGINAL : alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : null +======= + alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(visor_vars_to_toggle & VISOR_VISIONFLAGS) vision_flags ^= initial(vision_flags) if(visor_vars_to_toggle & VISOR_INVISVIEW) @@ -528,8 +532,11 @@ name = "chameleon thermals" desc = "A pair of thermal optic goggles with an onboard chameleon generator." actions_types = list(/datum/action/item_action/chameleon/change/glasses/no_preset) +<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // SKYRAT EDIT ADDITION special_desc = "Chameleon thermal goggles employed by the Syndicate in infiltration operations." //SKYRAT EDIT ADDITION, I don't think the regular description persists through chameleon changes. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/glasses/thermal/monocle name = "thermoncle" @@ -557,10 +564,13 @@ . = ..() icon_state = (icon_state == base_icon_state) ? "[base_icon_state]_flipped" : base_icon_state user.update_worn_glasses() +<<<<<<< HEAD /datum/armor/glasses_science fire = 80 acid = 100 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/glasses/cold name = "cold goggles" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 83d670458e1..a1e5d744352 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -9,6 +9,7 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE cut_type = /obj/item/clothing/gloves/fingerless +<<<<<<< HEAD clothing_traits = list(TRAIT_FAST_CUFFING) // SKYRAT EDIT ADDITION START uses_advanced_reskins = TRUE @@ -27,6 +28,8 @@ ) ) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/gloves/color/black/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index d7fb34ae7c7..e23181bc32f 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -155,3 +155,98 @@ siemens_coefficient = 0.3 clothing_traits = list(TRAIT_QUICKER_CARRY, TRAIT_CHUNKYFINGERS) clothing_flags = THICKMATERIAL +<<<<<<< HEAD +======= + +///A pair of gloves that both allow the user to fish without the need of a held fishing rod and provides athletics experience. +/obj/item/clothing/gloves/fishing + name = "athletic fishing gloves" + desc = "A pair of gloves to fish without a fishing rod but your raw athletics strength. It doubles as a good workout device. WARNING: May cause injuries when catching bigger fish." + icon_state = "fishing_gloves" + +/obj/item/clothing/gloves/fishing/Initialize(mapload) + . = ..() + AddComponent(/datum/component/profound_fisher, new /obj/item/fishing_rod/mob_fisher/athletic(src)) + +/obj/item/clothing/gloves/fishing/equipped(mob/user, slot) + . = ..() + if(slot == ITEM_SLOT_GLOVES) + RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_ACTIVELY_FISHING), PROC_REF(begin_workout)) + +/obj/item/clothing/gloves/fishing/dropped(mob/user) + UnregisterSignal(user, list(SIGNAL_ADDTRAIT(TRAIT_ACTIVELY_FISHING), SIGNAL_REMOVETRAIT(TRAIT_ACTIVELY_FISHING))) + STOP_PROCESSING(SSprocessing, src) + return ..() + +/obj/item/clothing/gloves/fishing/proc/begin_workout(datum/source) + SIGNAL_HANDLER + RegisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_ACTIVELY_FISHING), PROC_REF(stop_workout)) + if(HAS_TRAIT(source, TRAIT_PROFOUND_FISHER)) //Only begin working out if we're fishing with these gloves and not some other fishing rod.. + START_PROCESSING(SSprocessing, src) + +/obj/item/clothing/gloves/fishing/proc/stop_workout(datum/source) + SIGNAL_HANDLER + UnregisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_ACTIVELY_FISHING)) + STOP_PROCESSING(SSprocessing, src) + +/obj/item/clothing/gloves/fishing/process(seconds_per_tick) + var/mob/living/wearer = loc + var/list/trait_source = GET_TRAIT_SOURCES(wearer, TRAIT_ACTIVELY_FISHING) + var/datum/fishing_challenge/challenge = trait_source[1] + var/stamina_exhaustion = 2.5 + challenge.difficulty * 0.025 + var/is_heavy_gravity = wearer.has_gravity() > STANDARD_GRAVITY + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = wearer.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + stamina_exhaustion *= potential_spine.athletics_boost_multiplier + if(HAS_TRAIT(wearer, TRAIT_STRENGTH)) + stamina_exhaustion *= 0.5 + + var/experience = 0.3 + challenge.difficulty * 0.003 + if(is_heavy_gravity) + stamina_exhaustion *= 1.5 + experience *= 2 + + wearer.adjustStaminaLoss(stamina_exhaustion) + wearer.mind?.adjust_experience(/datum/skill/athletics, experience) + wearer.apply_status_effect(/datum/status_effect/exercised) + +///The internal fishing rod of the athletic fishing gloves. The more athletic you're, the easier the minigame will be. +/obj/item/fishing_rod/mob_fisher/athletic + icon = /obj/item/clothing/gloves/fishing::icon + icon_state = /obj/item/clothing/gloves/fishing::icon_state + line = null + bait = null + ui_description = "The integrated fishing rod of a pair of athletic fishing gloves" + +/obj/item/fishing_rod/mob_fisher/athletic/Initialize(mapload) + . = ..() + RegisterSignal(src, COMSIG_FISHING_ROD_CAUGHT_FISH, PROC_REF(noodling_is_dangerous)) + +/obj/item/fishing_rod/mob_fisher/athletic/get_fishing_overlays() + return list() + +/obj/item/fishing_rod/mob_fisher/athletic/hook_hit(atom/atom_hit_by_hook_projectile, mob/user) + difficulty_modifier = -3 * user.mind?.get_skill_level(/datum/skill/athletics) + return ..() + +/obj/item/fishing_rod/mob_fisher/athletic/proc/noodling_is_dangerous(datum/source, atom/movable/reward, mob/living/user) + SIGNAL_HANDLER + if(!isfish(reward)) + return + var/damage = 0 + var/obj/item/fish/fishe = reward + switch(fishe.w_class) + if(WEIGHT_CLASS_BULKY) + damage = 10 + if(WEIGHT_CLASS_HUGE) + damage = 14 + if(WEIGHT_CLASS_GIGANTIC) + damage = 18 + if(!damage && fishe.weight >= 2000) + damage = 5 + damage = round(damage * fishe.weight * 0.0005) + if(damage) + var/body_zone = pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM) + user.apply_damage(damage, BRUTE, body_zone, user.run_armor_check(body_zone, MELEE)) + playsound(src,'sound/weapons/bite.ogg', damage * 2, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/head/fedora.dm b/code/modules/clothing/head/fedora.dm index e4e8d4b5436..59eb424b8a0 100644 --- a/code/modules/clothing/head/fedora.dm +++ b/code/modules/clothing/head/fedora.dm @@ -35,3 +35,12 @@ name = "carpskin fedora" icon_state = "fedora_carpskin" inhand_icon_state = null +<<<<<<< HEAD +======= + +/obj/item/clothing/head/fedora/beige/press + name = "press fedora" + desc = "An beige fedora with a piece of paper saying \"PRESS\" stuck in its rim." + icon_state = "fedora_press" + inhand_icon_state = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index b35b51891bb..e98db57242f 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -151,7 +151,11 @@ return if(!up) +<<<<<<< HEAD . += mutable_appearance(visor_sprite_path, visor_state) //SKYRAT EDIT CHANGE - WELDING MUZZLES - ORIGINAL: . += mutable_appearance('icons/mob/clothing/head/utility.dmi', visor_state) +======= + . += mutable_appearance('icons/mob/clothing/head/utility.dmi', visor_state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/utility/hardhat/welding/update_overlays() . = ..() @@ -191,6 +195,10 @@ up = FALSE visor_toggling() +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/utility/hardhat/welding/dblue icon_state = "hardhat0_dblue" inhand_icon_state = null diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 7b7329088c8..8bf1bec4f4d 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -287,7 +287,10 @@ flags_inv = 0 armor_type = /datum/armor/hats_centcom_cap strip_delay = (8 SECONDS) +<<<<<<< HEAD supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON //SKYRAT EDIT lets anthros wear the hat +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/hats_centcom_cap melee = 30 @@ -309,7 +312,11 @@ desc = "Perfect for winter in Siberia, da?" icon_state = "ushankadown" inhand_icon_state = null +<<<<<<< HEAD flags_inv = HIDEEARS //SKYRAT EDIT (Original: HIDEEARS|HIDEHAIR) +======= + flags_inv = HIDEEARS|HIDEHAIR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = /datum/dog_fashion/head/ushanka diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 75e31d13183..bb8f0e78d6e 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -75,6 +75,19 @@ update_appearance() return CLICK_ACTION_SUCCESS +<<<<<<< HEAD +======= +/obj/item/clothing/head/helmet/press + name = "press helmet" + desc = "A blue helmet used to distinguish non-combatant \"PRESS\" members, like if anyone cares." + icon_state = "helmet_press" + +/obj/item/clothing/head/helmet/press/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(!isinhands) + . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/helmet/alt name = "bulletproof helmet" desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index a5041de7fa0..ac3cb59a6ef 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -54,7 +54,11 @@ /obj/item/clothing/head/utility/chefhat/proc/on_mouse_emote(mob/living/source, key, emote_message, type_override) SIGNAL_HANDLER var/mob/living/carbon/wearer = loc +<<<<<<< HEAD if(!wearer || wearer.incapacitated(IGNORE_RESTRAINTS)) +======= + if(!wearer || INCAPACITATED_IGNORING(wearer, INCAPABLE_RESTRAINTS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!prob(mouse_control_probability)) return COMPONENT_CANT_EMOTE @@ -68,7 +72,11 @@ return COMPONENT_MOVABLE_BLOCK_PRE_MOVE // Didn't roll well enough or on cooldown var/mob/living/carbon/wearer = loc +<<<<<<< HEAD if(!wearer || wearer.incapacitated(IGNORE_RESTRAINTS)) +======= + if(!wearer || INCAPACITATED_IGNORING(wearer, INCAPABLE_RESTRAINTS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return COMPONENT_MOVABLE_BLOCK_PRE_MOVE // Not worn or can't move var/move_direction = get_dir(wearer, moved_to) diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm index b78dc5e11fa..6ebc8639bf2 100644 --- a/code/modules/clothing/head/mind_monkey_helmet.dm +++ b/code/modules/clothing/head/mind_monkey_helmet.dm @@ -1,6 +1,10 @@ //monkey sentience caps +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/helmet/monkey_sentience name = "monkey mind magnification helmet" desc = "A fragile, circuitry embedded helmet for boosting the intelligence of a monkey to a higher level. You see several warning labels..." @@ -107,4 +111,7 @@ if(magnification) visible_message(span_warning("[src] falls off of [magnification]'s head as it changes shape!")) magnification.dropItemToGround(src) +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/head/moth.dm b/code/modules/clothing/head/moth.dm index 961de9e3a75..f97853f75eb 100644 --- a/code/modules/clothing/head/moth.dm +++ b/code/modules/clothing/head/moth.dm @@ -7,7 +7,11 @@ cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT flags_cover = HEADCOVERSEYES +<<<<<<< HEAD flags_inv = HIDEHAIR|SHOWSPRITEEARS // SKYRAT EDIT CHANGE +======= + flags_inv = HIDEHAIR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/mothcap/original desc = "An authentic, padded leather cap with magnifying goggles, standard issue aboard the moth fleet. Keeps your head warm and debris away from those big eyes." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 4744296cdb8..f8e7e80532f 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -33,7 +33,7 @@ /obj/item/clothing/head/soft/proc/flip(mob/user) - if(!user.incapacitated()) + if(!user.incapacitated) flipped = !flipped if(flipped) icon_state = "[soft_type][soft_suffix]_flipped" diff --git a/code/modules/clothing/masks/bandana.dm b/code/modules/clothing/masks/bandana.dm index c80ad733543..d726a954f15 100644 --- a/code/modules/clothing/masks/bandana.dm +++ b/code/modules/clothing/masks/bandana.dm @@ -38,12 +38,15 @@ if(slot_flags & ITEM_SLOT_NECK) to_chat(user, span_warning("You must undo [src] in order to push it into a hat!")) return FALSE +<<<<<<< HEAD //SKYRAT EDIT ADDITION START: BANDANA HATS FOR MUTANTS if(slot_flags & ITEM_SLOT_HEAD) supports_variations_flags = NONE if(slot_flags & ITEM_SLOT_MASK) supports_variations_flags = initial(supports_variations_flags) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /obj/item/clothing/mask/bandana/visor_toggling() diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 3f734f420d5..18631fc7ea5 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -298,17 +298,25 @@ GLOBAL_LIST_INIT(clown_mask_options, list( "The Madman" = image(icon = src.icon, icon_state = "joker"), "The Rainbow Color" = image(icon = src.icon, icon_state = "rainbow") ) +<<<<<<< HEAD //AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) //SKYRAT EDIT REMOVAL +======= + AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/mask/gas/clown_hat/ui_action_click(mob/user) - if(!istype(user) || user.incapacitated()) + if(!istype(user) || user.incapacitated) return var/choice = show_radial_menu(user,src, clownmask_designs, custom_check = FALSE, radius = 36, require_near = TRUE) if(!choice) return FALSE +<<<<<<< HEAD if(src && choice && !user.incapacitated() && in_range(user,src)) +======= + if(src && choice && !user.incapacitated && in_range(user,src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/options = GLOB.clown_mask_options icon_state = options[choice] user.update_worn_mask() @@ -355,7 +363,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( ) /obj/item/clothing/mask/gas/mime/ui_action_click(mob/user) - if(!istype(user) || user.incapacitated()) + if(!istype(user) || user.incapacitated) return var/list/options = list() @@ -368,6 +376,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( if(!choice) return FALSE +<<<<<<< HEAD if(src && choice && !user.incapacitated() && in_range(user,src)) // SKYRAT EDIT ADDITION START - More mask variations var/mob/living/carbon/human/human_user = user @@ -384,6 +393,10 @@ GLOBAL_LIST_INIT(clown_mask_options, list( /* SKYRAT EDIT ADDITION END icon_state = options[choice] */ +======= + if(src && choice && !user.incapacitated && in_range(user,src)) + icon_state = options[choice] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.update_worn_mask() update_item_action_buttons() to_chat(user, span_notice("Your Mime Mask has now morphed into [choice]!")) diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 2aa61b00460..d8789657e80 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -103,6 +103,11 @@ r_hand = /obj/item/gun/energy/e_gun l_pocket = /obj/item/healthanalyzer/advanced additional_radio = /obj/item/encryptionkey/heads/cmo +<<<<<<< HEAD +======= + + skillchips = list(/obj/item/skillchip/entrails_reader) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/ert/medic/alert name = "ERT Medic - High Alert" @@ -132,6 +137,12 @@ glasses = /obj/item/clothing/glasses/meson/engine l_pocket = /obj/item/rcd_ammo/large additional_radio = /obj/item/encryptionkey/heads/ce +<<<<<<< HEAD +======= + + + skillchips = list(/obj/item/skillchip/job/engineer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/ert/engineer/alert name = "ERT Engineer - High Alert" @@ -520,6 +531,12 @@ glasses = /obj/item/clothing/glasses/hud/health/sunglasses additional_radio = /obj/item/encryptionkey/heads/cmo +<<<<<<< HEAD +======= + + skillchips = list(/obj/item/skillchip/entrails_reader) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/ert/marine/engineer name = "Marine Engineer" @@ -533,6 +550,11 @@ glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses additional_radio = /obj/item/encryptionkey/heads/ce +<<<<<<< HEAD +======= + skillchips = list(/obj/item/skillchip/job/engineer) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/militia name = "Militia Man" @@ -563,3 +585,75 @@ head = /obj/item/clothing/head/beret/militia l_hand = /obj/item/megaphone suit_store = /obj/item/gun/energy/laser/musket/prime +<<<<<<< HEAD +======= + +/datum/outfit/centcom/ert/medical_commander + name = "Chief EMT" + id = /obj/item/card/id/advanced/centcom/ert/medical + uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer + l_pocket = /obj/item/healthanalyzer/advanced + shoes = /obj/item/clothing/shoes/sneakers/white + backpack_contents = list( + /obj/item/reagent_containers/hypospray/combat = 1, + /obj/item/storage/medkit/regular = 1, + /obj/item/storage/medkit/advanced = 1, + /obj/item/melee/baton/telescopic = 1, + /obj/item/gun/energy/pulse/pistol/loyalpin = 1, + /obj/item/stack/medical/poultice = 1, //These stacks contain 15 by default. Great for getting corpses to defib range without surgery. + ) + belt = /obj/item/storage/belt/medical/ert + glasses = /obj/item/clothing/glasses/hud/health/sunglasses + additional_radio = /obj/item/encryptionkey/heads/cmo + mask = /obj/item/clothing/mask/surgical + back = /obj/item/mod/control/pre_equipped/emergency_medical/corpsman + gloves = null + suit = null + head = null + suit_store = /obj/item/tank/internals/oxygen + +/datum/outfit/centcom/ert/medical_technician + name = "EMT Paramedic" + id = /obj/item/card/id/advanced/centcom/ert/medical + uniform = /obj/item/clothing/under/rank/medical/scrubs/blue + l_pocket = /obj/item/healthanalyzer + backpack_contents = list( + /obj/item/reagent_containers/hypospray/combat = 1, + /obj/item/storage/medkit/regular = 1, + /obj/item/reagent_containers/syringe = 1, + /obj/item/reagent_containers/cup/bottle/formaldehyde = 1, + /obj/item/reagent_containers/medigel/sterilizine = 1, + /obj/item/bodybag = 2, + ) + mask = /obj/item/clothing/mask/surgical + belt = /obj/item/storage/belt/medical/ert + glasses = /obj/item/clothing/glasses/hud/health + additional_radio = /obj/item/encryptionkey/heads/cmo + shoes = /obj/item/clothing/shoes/sneakers/blue + back = /obj/item/mod/control/pre_equipped/emergency_medical + gloves = null + suit = null + head = null + suit_store = /obj/item/tank/internals/oxygen + +/obj/item/mod/control/pre_equipped/emergency_medical + theme = /datum/mod_theme/medical + starting_frequency = MODLINK_FREQ_CENTCOM + applied_cell = /obj/item/stock_parts/power_store/cell/hyper + applied_modules = list( + /obj/item/mod/module/organizer, + /obj/item/mod/module/defibrillator, + /obj/item/mod/module/flashlight, + /obj/item/mod/module/health_analyzer, + /obj/item/mod/module/injector, + /obj/item/mod/module/surgical_processor/emergency, + /obj/item/mod/module/storage/large_capacity, + ) + +/obj/item/mod/control/pre_equipped/emergency_medical/corpsman + theme = /datum/mod_theme/medical/corpsman + +///Identical to medical MODsuit, but uses the alternate skin by default. +/datum/mod_theme/medical/corpsman + default_skin = "corpsman" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index 1b2e0ead148..7890b48fcd3 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -302,3 +302,18 @@ uniform = /obj/item/clothing/under/plasmaman //same gloves = /obj/item/clothing/gloves/color/plasmaman/black head = /obj/item/clothing/head/helmet/space/plasmaman +<<<<<<< HEAD +======= + +/datum/outfit/plasmaman/medical_commander + name = "Chief EMT Plasmaman" + uniform = /obj/item/clothing/under/plasmaman/chief_medical_officer + gloves = /obj/item/clothing/gloves/color/plasmaman/white + head = /obj/item/clothing/head/helmet/space/plasmaman/chief_medical_officer + +/datum/outfit/plasmaman/medical_technician + name = "EMT Paramedic Plasmaman" + uniform = /obj/item/clothing/under/plasmaman/medical + gloves = /obj/item/clothing/gloves/color/plasmaman/white + head = /obj/item/clothing/head/helmet/space/plasmaman/medical +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 28bd5e8b85c..b6f7ea3f81b 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -47,8 +47,11 @@ playsound(user, 'sound/weapons/genhit2.ogg', 50, TRUE) return BRUTELOSS +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN -DIGI_BLOODSOLE - (Moved to modular_skyrat/modules/digi_shoeblood/code/modules/clothing/shoes/_shoes.dm) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/shoes/worn_overlays(mutable_appearance/standing, isinhands = FALSE) . = ..() if(isinhands) @@ -169,12 +172,17 @@ to_chat(user, span_warning("You're already interacting with [src]!")) return user.visible_message(span_notice("[user] begins [tied ? "unknotting" : "tying"] the laces of [user.p_their()] [src.name]."), span_notice("You begin [tied ? "unknotting" : "tying"] the laces of your [src.name]...")) +<<<<<<< HEAD // SKYRAT EDIT START var/tie_time = lace_time if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) tie_time *= 0.5 if(do_after(user, tie_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) // SKYRAT EDIT END +======= + + if(do_after(user, lace_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_notice("You [tied ? "unknot" : "tie"] the laces of your [src.name].")) if(tied == SHOES_UNTIED) adjust_laces(SHOES_TIED, user) @@ -196,10 +204,14 @@ to_chat(user, span_notice("You quietly set to work [tied ? "untying" : "knotting"] [loc]'s [src.name]...")) if(HAS_TRAIT(user, TRAIT_CLUMSY)) // based clowns trained their whole lives for this mod_time *= 0.75 +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) // Clowns with thieving gloves will be a menace mod_time *= 0.5 // SKYRAT EDIT ADDITION END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(do_after(user, mod_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy), hidden = TRUE)) to_chat(user, span_notice("You [tied ? "untie" : "knot"] the laces on [loc]'s [src.name].")) if(tied == SHOES_UNTIED) @@ -285,12 +297,17 @@ return to_chat(user, span_notice("You begin [tied ? "untying" : "tying"] the laces on [src]...")) +<<<<<<< HEAD // SKYRAT EDIT STARTr var/tie_time = lace_time if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) tie_time *= 0.5 if(do_after(user, lace_time, target = src,extra_checks = CALLBACK(src, PROC_REF(still_shoed), user))) // SKYRAT EDIT END +======= + + if(do_after(user, lace_time, target = src,extra_checks = CALLBACK(src, PROC_REF(still_shoed), user))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_notice("You [tied ? "untie" : "tie"] the laces on [src].")) adjust_laces(tied ? SHOES_UNTIED : SHOES_TIED, user) diff --git a/code/modules/clothing/shoes/clown.dm b/code/modules/clothing/shoes/clown.dm index ee16103b734..8db37aad220 100644 --- a/code/modules/clothing/shoes/clown.dm +++ b/code/modules/clothing/shoes/clown.dm @@ -14,7 +14,11 @@ create_storage(storage_type = /datum/storage/pockets/shoes/clown) LoadComponent(/datum/component/squeak, squeak_sound, 50, falloff_exponent = 20) //die off quick please +<<<<<<< HEAD //AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) // SKYRAT EDIT - REMOVAL - NO CLOWN CYTOLOGY +======= + AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/shoes/clown_shoes/equipped(mob/living/user, slot) . = ..() diff --git a/code/modules/clothing/shoes/cult.dm b/code/modules/clothing/shoes/cult.dm index 80d03d3a09e..ac577f34cd2 100644 --- a/code/modules/clothing/shoes/cult.dm +++ b/code/modules/clothing/shoes/cult.dm @@ -1,5 +1,9 @@ /obj/item/clothing/shoes/cult +<<<<<<< HEAD name = "\improper Nar'Sien invoker boots" +======= + name = "\improper Nar'Sian boots" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A pair of boots worn by the followers of Nar'Sie." icon_state = "cult" inhand_icon_state = null @@ -10,7 +14,11 @@ lace_time = 10 SECONDS /obj/item/clothing/shoes/cult/alt +<<<<<<< HEAD name = "cultist boots" +======= + name = "\improper Nar'Sian invoker boots" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "cultalt" /obj/item/clothing/shoes/cult/alt/ghost diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index 81f5006f9e8..b272d4dcd80 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -10,7 +10,10 @@ greyscale_config_inhand_left = /datum/greyscale_config/sneakers/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/sneakers/inhand_right flags_1 = IS_PLAYER_COLORABLE_1 +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/sneakers/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 interaction_flags_mouse_drop = NEED_HANDS /obj/item/clothing/shoes/sneakers/random/Initialize(mapload) @@ -92,7 +95,10 @@ greyscale_config_inhand_right = /datum/greyscale_config/sneakers_orange/inhand_right flags_1 = NONE var/obj/item/restraints/handcuffs/attached_cuffs +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/sneakers_orange/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/shoes/sneakers/orange/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 4b8fe43bd96..c3c27148bc8 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -50,7 +50,11 @@ ) slowdown = 0.5 armor_type = /datum/armor/suit_space +<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDESEXTOY|HIDETAIL|HIDETAUR //SKYRAT EDIT CHANGE - ADDED HIDETAIL, HIDETAUR. ADDED HIDESEXTOY TO PREVENT VISUAL BUGS. +======= + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT_OFF heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index cc08f7373c9..d24b6991815 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -17,12 +17,17 @@ var/blood_overlay_type = "suit" limb_integrity = 0 // disabled for most exo-suits +<<<<<<< HEAD /obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE, file2use = null, mutant_styles = NONE) // SKYRAT EDIT CHANGE - TAURS AND TESHIS - ORIGINAL: /obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE) +======= +/obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(isinhands) return if(damaged_clothes) +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN //. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") //ORIGINAL var/damagefile2use = (mutant_styles & STYLE_TAUR_ALL) ? 'modular_skyrat/master_files/icons/mob/64x32_item_damage.dmi' : 'icons/effects/item_damage.dmi' @@ -34,6 +39,11 @@ var/bloodfile2use = (mutant_styles & STYLE_TAUR_ALL) ? 'modular_skyrat/master_files/icons/mob/64x32_blood.dmi' : 'icons/effects/blood.dmi' . += mutable_appearance(bloodfile2use, "[blood_overlay_type]blood") //SKYRAT EDIT CHANGE END +======= + . += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") + if(GET_ATOM_BLOOD_DNA_LENGTH(src)) + . += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/wearer = loc if(!ishuman(wearer) || !wearer.w_uniform) @@ -44,7 +54,11 @@ var/obj/item/clothing/accessory/displayed = undershirt.attached_accessories[1] if(displayed.above_suit) +<<<<<<< HEAD . += undershirt.modify_accessory_overlay() // SKYRAT EDIT CHANGE - ORIGINAL: . += undershirt.accessory_overlay +======= + . += undershirt.accessory_overlay +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0d33f0e5f51..5c0813a3c0c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -59,6 +59,19 @@ /obj/item/clothing/suit/armor/vest/alt/sec icon_state = "armor_sec" +<<<<<<< HEAD +======= +/obj/item/clothing/suit/armor/vest/press + name = "press armor vest" + desc = "A blue armor vest used to distinguish non-combatant \"PRESS\" members, like if anyone cares." + icon_state = "armor_press" + +/obj/item/clothing/suit/armor/vest/press/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(!isinhands) + . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/armor/vest/marine name = "tactical armor vest" desc = "A set of the finest mass produced, stamped plasteel armor plates, containing an environmental protection unit for all-condition door kicking." diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index d82dd048e72..ded5efee4bd 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -1,8 +1,11 @@ //Biosuit complete with shoes (in the item sprite) /obj/item/clothing/head/bio_hood name = "bio hood" +<<<<<<< HEAD icon_state = "bio" inhand_icon_state = "bio_hood" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A hood that protects the head and face from biological contaminants." icon = 'icons/obj/clothing/head/bio.dmi' worn_icon = 'icons/mob/clothing/head/bio.dmi' @@ -37,7 +40,11 @@ slowdown = 0.5 allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/cup/beaker, /obj/item/gun/syringe) armor_type = /datum/armor/suit_bio_suit +<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL +======= + flags_inv = HIDEGLOVES|HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 strip_delay = 70 equip_delay_other = 70 resistance_flags = ACID_PROOF diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index 5184e879296..d6bdc4861f0 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -44,6 +44,10 @@ armor_type = /datum/armor/pirate_armored strip_delay = 40 equip_delay_other = 20 +<<<<<<< HEAD +======= + species_exception = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/costume/pirate/captain name = "pirate captain coat" @@ -55,6 +59,10 @@ armor_type = /datum/armor/pirate_armored strip_delay = 40 equip_delay_other = 20 +<<<<<<< HEAD +======= + species_exception = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/costume/cyborg_suit name = "cyborg suit" @@ -102,7 +110,11 @@ desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!" w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy) +<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL // SYKRAT EDIT ADDITION - HIDETAIL +======= + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 resistance_flags = NONE /obj/item/clothing/suit/costume/hastur @@ -289,7 +301,11 @@ inhand_icon_state = "space_suit_syndicate" armor_type = /datum/armor/carp_costume_spaceproof allowed = list(/obj/item/tank/internals, /obj/item/gun/ballistic/rifle/boltaction/harpoon) //I'm giving you a hint here +<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL +======= + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS @@ -526,6 +542,17 @@ name = "bronze suit" desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice." icon_state = "clockwork_cuirass_old" +<<<<<<< HEAD +======= + allowed = list( + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/tank/jetpack/oxygen/captain, + /obj/item/storage/belt/holster, + //new + /obj/item/toy/clockwork_watch, + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 armor_type = /datum/armor/costume_bronze /obj/item/clothing/suit/hooded/mysticrobe diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index cc94b200969..fe2a0a3e086 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -190,6 +190,14 @@ . = ..() if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) +<<<<<<< HEAD +======= + +/obj/item/clothing/suit/hazardvest/press // Variant used by the Curator + name = "press hazard vest" + desc = "A blue high-visibility vest used to distinguish non-combatant \"PRESS\" members, like if anyone cares." + icon_state = "hazard_press" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Lawyer /obj/item/clothing/suit/toggle/lawyer diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index cf2158177f7..032cd0fee7f 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -47,8 +47,11 @@ . = ..() allowed += list( /obj/item/melee/baton/telescopic, +<<<<<<< HEAD /obj/item/gun/energy/cell_loaded/medigun, //SKYRAT EDIT ADDITION - MEDIGUNS /obj/item/storage/medkit, //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/clothing/suit/toggle/labcoat/paramedic @@ -56,6 +59,7 @@ desc = "A dark blue jacket for paramedics with reflective stripes." icon_state = "labcoat_paramedic" inhand_icon_state = null +<<<<<<< HEAD //START SKYRAT EDIT ADDITION /obj/item/clothing/suit/toggle/labcoat/paramedic/Initialize(mapload) @@ -64,6 +68,8 @@ /obj/item/storage/medkit, ) //END SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/toggle/labcoat/mad name = "\proper The Mad's labcoat" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 6cbbe623557..9b1b70e2db5 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -29,7 +29,11 @@ ) slowdown = 1 armor_type = /datum/armor/utility_fire +<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETAUR // SKYRAT EDIT ADDITION - HIDETAIL, HIDETAUR +======= + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT @@ -78,7 +82,11 @@ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS +<<<<<<< HEAD flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETAUR|HIDETAIL // NOVA EDIT ADDITION - HIDETAUR, HIDETAIL +======= + flags_inv = HIDESHOES|HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Bomb protection @@ -124,7 +132,11 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 2 armor_type = /datum/armor/utility_bomb_suit +<<<<<<< HEAD flags_inv = HIDEJUMPSUIT|HIDETAIL|HIDETAUR // SKYRAT EDIT ADDITION - HIDETAIL, HIDETAUR +======= + flags_inv = HIDEJUMPSUIT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index b86f7845cf3..01e6130c7a0 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -349,7 +349,10 @@ . = ..() allowed += list( /obj/item/melee/baton/telescopic, +<<<<<<< HEAD /obj/item/gun/energy/cell_loaded/medigun, //SKYRAT EDIT MEDIGUNS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/clothing/head/hooded/winterhood/medical/cmo @@ -688,4 +691,7 @@ desc = "A heavy jacket hood made from 'synthetic' animal furs, with custom colors." greyscale_config = /datum/greyscale_config/winter_hoods greyscale_config_worn = /datum/greyscale_config/winter_hoods/worn +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index e684d443eb0..9418c081983 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -8,6 +8,11 @@ slot_flags = ITEM_SLOT_ICLOTHING interaction_flags_click = NEED_DEXTERITY armor_type = /datum/armor/clothing_under +<<<<<<< HEAD +======= + supports_variations_flags = CLOTHING_DIGITIGRADE_MASK + digitigrade_greyscale_config_worn = /datum/greyscale_config/jumpsuit/worn_digi +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' drop_sound = 'sound/items/handling/cloth_drop.ogg' pickup_sound = 'sound/items/handling/cloth_pickup.ogg' @@ -92,7 +97,11 @@ return changed ? CONTEXTUAL_SCREENTIP_SET : . +<<<<<<< HEAD /obj/item/clothing/under/worn_overlays(mutable_appearance/standing, isinhands = FALSE, file2use = null, mutant_styles = NONE) +======= +/obj/item/clothing/under/worn_overlays(mutable_appearance/standing, isinhands = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(isinhands) return @@ -102,7 +111,11 @@ if(GET_ATOM_BLOOD_DNA_LENGTH(src)) . += mutable_appearance('icons/effects/blood.dmi', "uniformblood") if(accessory_overlay) +<<<<<<< HEAD . += modify_accessory_overlay() // SKYRAT EDIT CHANGE - ORIGINAL: . += accessory_overlay +======= + . += accessory_overlay +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/attackby(obj/item/attacking_item, mob/user, params) if(has_sensor == BROKEN_SENSORS && istype(attacking_item, /obj/item/stack/cable_coil)) @@ -162,13 +175,19 @@ if(adjusted == ALT_STYLE) adjust_to_normal() +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - This breaks jumpsuit adjustment. Plus, we don't support it. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION) && ishuman(user)) var/mob/living/carbon/human/wearer = user if(wearer.bodyshape & BODYSHAPE_DIGITIGRADE) adjusted = DIGITIGRADE_STYLE update_appearance() +<<<<<<< HEAD */ // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/equipped(mob/living/user, slot) ..() diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 0ea3922893a..500be1b97c3 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -241,3 +241,49 @@ if (ishuman(user)) var/mob/living/carbon/human/human_wearer = user human_wearer.sec_hud_set_security_status() +<<<<<<< HEAD +======= + +/obj/item/clothing/accessory/press_badge + name = "press badge" + desc = "A blue press badge that clearly identifies the wearer as a member of the media. While it signifies press affiliation, it does not grant any special privileges or rights no matter how much the wearer yells about it." + desc_controls = "Click person with it to show them it" + icon_state = "press_badge" + attachment_slot = NONE // actually NECK but that doesn't make sense + /// The name of the person in the badge + var/journalist_name + /// The name of the press person is working for + var/press_name + +/obj/item/clothing/accessory/press_badge/examine(mob/user) + . = ..() + if(!journalist_name || !press_name) + . += span_notice("Use it in hand to input information") + return + + . += span_notice("It belongs to [journalist_name], [press_name]") + +/obj/item/clothing/accessory/press_badge/attack_self(mob/user, modifiers) + . = ..() + if(!journalist_name) + journalist_name = tgui_input_text(user, "What is your name?", "Journalist Name", "[user.name]", MAX_NAME_LEN) + if(!press_name) + press_name = tgui_input_text(user, "For what organization you work?", "Press Name", "Nanotrasen", MAX_CHARTER_LEN) + +/obj/item/clothing/accessory/press_badge/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + . = ..() + if(!isliving(interacting_with)) + return + + var/mob/living/interacting_living = interacting_with + if(user.combat_mode) + playsound(interacting_living, 'sound/weapons/throw.ogg', 30) + examine(interacting_living) + to_chat(interacting_living, span_userdanger("[user] shoves the [src] up your face!")) + user.visible_message(span_warning("[user] have shoved a [src] into [interacting_living] face.")) + else + playsound(interacting_living, 'sound/weapons/throwsoft.ogg', 20) + examine(interacting_living) + to_chat(interacting_living, span_boldwarning("[user] shows the [src] to you.")) + user.visible_message(span_notice("[user] shows a [src] to [interacting_living].")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index b548aee7097..1ad63d236a0 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -7,7 +7,10 @@ greyscale_config_worn = /datum/greyscale_config/jumpsuit/worn greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit/inhand_right +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/clothing/under/color.dmi' icon_state = "jumpsuit" inhand_icon_state = "jumpsuit" @@ -21,7 +24,10 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY icon_state = "jumpskirt" supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON +<<<<<<< HEAD greyscale_config_worn_digi = null //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns a random, acceptable jumpsuit typepath /proc/get_random_jumpsuit() @@ -39,7 +45,11 @@ /obj/item/clothing/under/color/random/Initialize(mapload) ..() +<<<<<<< HEAD var/obj/item/clothing/under/color/C = get_random_variant() // SKYRAT EDIT CHANGE - use local proc that handles prefs +======= + var/obj/item/clothing/under/color/C = get_random_jumpsuit() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(loc)) var/mob/living/carbon/human/H = loc H.equip_to_slot_or_del(new C(H), ITEM_SLOT_ICLOTHING, initial=TRUE) //or else you end up with naked assistants running around everywhere... @@ -226,6 +236,10 @@ greyscale_config_inhand_left = null greyscale_config_inhand_right = null greyscale_config_worn = null +<<<<<<< HEAD +======= + digitigrade_greyscale_colors = "#3f3f3f" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 can_adjust = FALSE flags_1 = NONE diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index ba30233d2b7..2705fef8f56 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -314,7 +314,10 @@ icon_state = "buttondown_slacks" greyscale_config = /datum/greyscale_config/buttondown_slacks greyscale_config_worn = /datum/greyscale_config/buttondown_slacks/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/buttondown_slacks/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" flags_1 = IS_PLAYER_COLORABLE_1 @@ -327,7 +330,10 @@ icon_state = "buttondown_shorts" greyscale_config = /datum/greyscale_config/buttondown_shorts greyscale_config_worn = /datum/greyscale_config/buttondown_shorts/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/buttondown_shorts/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" flags_1 = IS_PLAYER_COLORABLE_1 @@ -365,7 +371,10 @@ can_adjust = FALSE greyscale_config = /datum/greyscale_config/football_suit greyscale_config_worn = /datum/greyscale_config/football_suit/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/football_suit/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#D74722" flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index f3abc8a2a47..b5caecdbdce 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -31,15 +31,23 @@ inhand_icon_state = "clown" female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY can_adjust = FALSE +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN /* +======= + supports_variations_flags = CLOTHING_NO_VARIATION + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/rank/civilian/clown/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50, falloff_exponent = 20) //die off quick please AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/rank/civilian/clown/blue name = "blue clown suit" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 63bf1c65847..dc08b7cbba0 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -239,7 +239,10 @@ greyscale_config_worn = /datum/greyscale_config/jumpsuit/prison/worn greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit/prison/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit/prison/inhand_right +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit/prison/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 has_sensor = LOCKED_SENSORS sensor_mode = SENSOR_COORDS random_sensor = FALSE @@ -260,7 +263,10 @@ greyscale_config_worn = /datum/greyscale_config/jumpsuit/prison/worn greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit/prison/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit/prison/inhand_right +<<<<<<< HEAD greyscale_config_worn_digi = null //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 8f1263fa3e2..81002bd8a9e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -33,6 +33,7 @@ desc = "Groovy!" icon_state = "psyche" inhand_icon_state = "p_suit" + digitigrade_greyscale_colors = "#3f3f3f" /obj/item/clothing/under/misc/vice_officer name = "vice officer's jumpsuit" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 66830455b2e..331ca8615ba 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -14,7 +14,10 @@ icon_state = "slacks" greyscale_config = /datum/greyscale_config/slacks greyscale_config_worn = /datum/greyscale_config/slacks/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/slacks/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#575757#3E3E3E#75634F" flags_1 = IS_PLAYER_COLORABLE_1 @@ -24,7 +27,10 @@ icon_state = "jeans" greyscale_config = /datum/greyscale_config/jeans greyscale_config_worn = /datum/greyscale_config/jeans/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jeans/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#787878#723E0E#4D7EAC" flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 2fd8a113682..88b3dc2531d 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -4,7 +4,10 @@ icon_state = "shorts" greyscale_config = /datum/greyscale_config/shorts greyscale_config_worn = /datum/greyscale_config/shorts/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/shorts/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#575757#3E3E3E#75634F" gender = PLURAL body_parts_covered = GROIN @@ -20,7 +23,10 @@ icon_state = "jeanshorts" greyscale_config = /datum/greyscale_config/jeanshorts greyscale_config_worn = /datum/greyscale_config/jeanshorts/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jeanshorts/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#787878#723E0E#4D7EAC" /obj/item/clothing/under/shorts/red diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index 11ed224e9cf..b97b03e081f 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -70,7 +70,10 @@ greyscale_colors = "#CC2102" greyscale_config = /datum/greyscale_config/plaidskirt greyscale_config_worn = /datum/greyscale_config/plaidskirt/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/plaidskirt/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/under/dress/skirt/turtleskirt diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index 046e6b5e6ef..dee93338449 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -15,7 +15,10 @@ inhand_icon_state = "y_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#fab342" /obj/item/clothing/under/trek/engsec @@ -25,7 +28,10 @@ inhand_icon_state = "r_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#B72B2F" /obj/item/clothing/under/trek/medsci @@ -35,7 +41,10 @@ inhand_icon_state = "b_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#5FA4CC" /* diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index 911e5bf6e1b..730ddf28976 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -8,7 +8,13 @@ /// If defined, using this outfit sets the targets species to it var/datum/species/species_override /// This outfit will grant these spells if applied +<<<<<<< HEAD var/list/granted_spells = list() +======= + var/list/spells_to_add = list() + /// This outfit will grant these mutations if applied + var/list/mutations_to_add = list() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/deathmatch_loadout/pre_equip(mob/living/carbon/human/user, visualsOnly = FALSE) . = ..() @@ -17,6 +23,7 @@ if(!isnull(species_override)) user.set_species(species_override) +<<<<<<< HEAD else if (!isnull(user.dna.species.outfit_important_for_life)) //plasmamen get lit on fire and die user.set_species(/datum/species/human) for(var/datum/action/act as anything in granted_spells) @@ -26,6 +33,22 @@ new_spell.spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC new_ability.Grant(user) +======= + + else if (!isnull(user.dna.species.outfit_important_for_life)) //plasmamen get lit on fire and die + user.set_species(/datum/species/human) + + for(var/datum/action/act as anything in spells_to_add) + var/datum/action/new_ability = new act(user) + if(istype(new_ability, /datum/action/cooldown/spell)) + var/datum/action/cooldown/spell/new_spell = new_ability + new_spell.spell_requirements = NONE + new_ability.Grant(user) + + for(var/mutation in mutations_to_add) + user.dna.add_mutation(mutation) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/deathmatch_loadout/naked name = "Deathmatch: Naked" display_name = "Unarmed, Butt-naked" @@ -349,7 +372,11 @@ suit = /obj/item/clothing/suit/hooded/explorer shoes = /obj/item/clothing/shoes/workboots/mining mask = /obj/item/clothing/mask/gas/explorer +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/mob_cooldown/dash, ) @@ -392,10 +419,17 @@ suit = /datum/outfit/wizard::suit head = /datum/outfit/wizard::head shoes = /datum/outfit/wizard::shoes +<<<<<<< HEAD granted_spells = list( /datum/action/cooldown/spell/aoe/magic_missile, /datum/action/cooldown/spell/forcewall, /datum/action/cooldown/spell/jaunt/ethereal_jaunt, +======= + spells_to_add = list( + /datum/action/cooldown/spell/aoe/magic_missile, + /datum/action/cooldown/spell/forcewall, + /datum/action/cooldown/spell/pointed/projectile/fireball, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/outfit/deathmatch_loadout/wizard/pyro @@ -406,7 +440,11 @@ suit = /obj/item/clothing/suit/wizrobe/red head = /obj/item/clothing/head/wizard/red mask = /obj/item/cigarette +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/pointed/projectile/fireball, /datum/action/cooldown/spell/smoke, ) @@ -418,7 +456,11 @@ suit = /obj/item/clothing/suit/wizrobe/magusred head = /obj/item/clothing/head/wizard/magus +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/pointed/projectile/lightningbolt, /datum/action/cooldown/spell/charged/beam/tesla, ) @@ -431,7 +473,11 @@ species_override = /datum/species/skeleton suit = /obj/item/clothing/suit/wizrobe/black head = /obj/item/clothing/head/wizard/black +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/touch/scream_for_me, /datum/action/cooldown/spell/teleport/radius_turf/blink, ) @@ -445,7 +491,11 @@ suit = /obj/item/clothing/suit/wizrobe/fake head = /obj/item/clothing/head/wizard/fake shoes = /obj/item/clothing/shoes/sandal +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/conjure_item/spellpacket, /datum/action/cooldown/spell/aoe/repulse/wizard, ) @@ -459,7 +509,11 @@ suit = /obj/item/clothing/suit/wizrobe/marisa head = /obj/item/clothing/head/wizard/marisa shoes = /obj/item/clothing/shoes/sneakers/marisa +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/chuuni_invocations, /datum/action/cooldown/spell/pointed/projectile/spell_cards, ) @@ -472,7 +526,11 @@ l_hand = /obj/item/mjollnir suit = /obj/item/clothing/suit/wizrobe/magusblue head = /obj/item/clothing/head/wizard/magus +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/summonitem, ) @@ -482,7 +540,11 @@ desc = "You feel severely under-leveled for this encounter..." l_hand = null +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/charge, ) @@ -495,7 +557,11 @@ suit = /obj/item/clothing/suit/wizrobe/tape head = /obj/item/clothing/head/wizard/tape shoes = /obj/item/clothing/shoes/jackboots +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/conjure_item/infinite_guns/gun, /datum/action/cooldown/spell/aoe/knock, ) @@ -510,7 +576,11 @@ suit = /obj/item/clothing/suit/costume/hawaiian head = /obj/item/clothing/head/wizard/red shoes = /obj/item/clothing/shoes/sneakers/marisa +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/rod_form, /datum/action/cooldown/spell/conjure/the_traps, ) @@ -527,7 +597,11 @@ mask = /obj/item/clothing/mask/gas/clown_hat back = /obj/item/storage/backpack/clown shoes = /obj/item/clothing/shoes/clown_shoes +<<<<<<< HEAD granted_spells = null +======= + spells_to_add = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/deathmatch_loadout/wizard/monkey name = "Deathmatch: Monkey" @@ -540,7 +614,11 @@ suit = null head = /obj/item/clothing/head/wizard shoes = null +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/conjure/simian, ) @@ -716,7 +794,11 @@ /obj/item/food/croissant/throwing = 2, ) +<<<<<<< HEAD granted_spells = list( +======= + spells_to_add = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/vow_of_silence, /datum/action/cooldown/spell/conjure_item/invisible_box, /datum/action/cooldown/spell/conjure/invisible_chair, @@ -744,3 +826,417 @@ /obj/item/knife/butcher, /obj/item/sharpener, ) +<<<<<<< HEAD +======= + +//species + +/datum/outfit/deathmatch_loadout/humanity + name = "Deathmatch: Human Species" + display_name = "Humanity" + desc = "The most ambitious and successful species. Or just the most rapacious, depending on who you ask." + species_override = /datum/species/human + + head = /obj/item/clothing/head/soft/black + glasses = /obj/item/clothing/glasses/sunglasses + ears = /obj/item/radio/headset/headset_com + neck = /obj/item/clothing/neck/large_scarf/blue + //suit + id_trim = /datum/id_trim/job/bridge_assistant // half tider half command + id = /obj/item/card/id/advanced/chameleon + uniform = /obj/item/clothing/under/trek/command/next + l_pocket = /obj/item/gun/energy/e_gun/mini + r_pocket = /obj/item/extinguisher/mini + gloves = /obj/item/clothing/gloves/fingerless + belt = /obj/item/storage/belt/utility/full/inducer + shoes = /obj/item/clothing/shoes/sneakers/black + +// Lizard: Desert, Soldier, Trash + +/datum/outfit/deathmatch_loadout/lizardkind + name = "Deathmatch: Lizard Species" + display_name = "Lizardfolk" + desc = "They may be heavily discrimated against, they may be most often seen doing menial activities, but at least they, uh, uhh..." + species_override = /datum/species/lizard + + head = /obj/item/clothing/head/soft/purple + id_trim = /datum/id_trim/job/janitor + id = /obj/item/card/id/advanced/chameleon + uniform = /obj/item/clothing/under/rank/civilian/janitor + gloves = /obj/item/clothing/gloves/color/black + belt = /obj/item/storage/belt/janitor/full + shoes = /obj/item/clothing/shoes/chameleon/noslip + r_hand = /obj/item/mop/advanced + back = /obj/item/storage/backpack + backpack_contents = list( + /obj/item/toy/plush/lizard_plushie/green, + // reclaiming lizard racism + /obj/item/reagent_containers/cup/glass/bottle/lizardwine, + /obj/item/tailclub, + /obj/item/melee/chainofcommand/tailwhip, + /obj/item/reagent_containers/cup/glass/coffee + ) + +/datum/outfit/deathmatch_loadout/mothman + name = "Deathmatch: Moth Species" + display_name = "Mothmen" + desc = "An innocent and fluffy visage hides the combat ability of a particularly hairy kitten." + species_override = /datum/species/moth + + head = /obj/item/clothing/head/utility/head_mirror + glasses = /obj/item/clothing/glasses/hud/health + suit = /obj/item/clothing/suit/hooded/wintercoat/medical + suit_store = /obj/item/flashlight/pen/paramedic + id_trim = /datum/id_trim/job/medical_doctor + id = /obj/item/card/id/advanced/chameleon + uniform = /obj/item/clothing/under/rank/medical/scrubs/blue + belt = /obj/item/storage/belt/medical/paramedic + shoes = /obj/item/clothing/shoes/sneakers/white + l_hand = /obj/item/circular_saw + + back = /obj/item/storage/backpack/medic + + backpack_contents = list( + /obj/item/toy/plush/moth, + /obj/item/storage/medkit/brute, + /obj/item/storage/medkit/fire, + /obj/item/statuebust/hippocratic + ) + +// Roboticist?? +/datum/outfit/deathmatch_loadout/ethereal + name = "Deathmatch: Ethereal Species" + display_name = "Etherealkind" + desc = "Prepare to be SHOCKED as you are reminded of this species's existence." + species_override = /datum/species/ethereal + + head = /obj/item/clothing/head/soft/black + id_trim = /datum/id_trim/job/roboticist + id = /obj/item/card/id/advanced/chameleon + suit = /obj/item/clothing/suit/toggle/labcoat/roboticist + suit_store = /datum/id_trim/job/roboticist + uniform = /obj/item/clothing/under/rank/rnd/roboticist + l_pocket = /obj/item/assembly/flash + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/sneakers/black + + back = /obj/item/storage/backpack/science + + backpack_contents = list( + /obj/item/dnainjector/shock, + /obj/item/etherealballdeployer, + ) + +/datum/outfit/deathmatch_loadout/plasmamen + name = "Deathmatch: Plasmaman Species" + display_name = "Plasmamen" + desc = "Burn baby burn!" + species_override = /datum/species/plasmaman + + head = /obj/item/clothing/head/helmet/space/plasmaman/atmospherics + suit = /obj/item/clothing/suit/hazardvest + suit_store = /obj/item/flashlight + uniform = /obj/item/clothing/under/plasmaman/atmospherics + id_trim = /datum/id_trim/job/atmospheric_technician + id = /obj/item/card/id/advanced/chameleon + belt = /obj/item/storage/belt/utility/atmostech + gloves = /obj/item/clothing/gloves/color/plasmaman/atmos + shoes = /obj/item/clothing/shoes/workboots + r_pocket = /obj/item/tank/internals/plasmaman/belt/full + + back = /obj/item/storage/backpack/industrial + + backpack_contents = list( + /obj/item/toy/plush/plasmamanplushie, + /obj/item/tank/internals/plasma, + /obj/item/tank/internals/plasmaman, + /obj/item/stack/sheet/mineral/uranium/half, + /obj/item/stack/sheet/mineral/plasma/thirty, + /obj/item/reagent_containers/condiment/milk, + /obj/item/storage/medkit/fire, + /obj/item/reagent_containers/syringe/plasma + ) + +/datum/outfit/deathmatch_loadout/felinid + name = "Deathmatch: Felinid Species" + display_name = "Felinids" + desc = "Strictly inferior to humans in every way." + species_override = /datum/species/human/felinid + + head = /obj/item/clothing/head/soft/rainbow + glasses = null + ears = /obj/item/radio/headset + neck = /obj/item/clothing/neck/petcollar + //suit + uniform = /obj/item/clothing/under/color/rainbow + l_pocket = /obj/item/toy/cattoy + r_pocket = /obj/item/restraints/handcuffs/fake + gloves = /obj/item/clothing/gloves/color/rainbow + belt = /obj/item/melee/curator_whip + shoes = /obj/item/clothing/shoes/sneakers/rainbow + +//spleef + +/datum/outfit/deathmatch_loadout/lattice_battles + name = "Deathmatch: Lattice loadout" + display_name = "Lattice Battler" + desc = "Snip the catwalks under everyone else and win! You're pacifist, so no punching." + + uniform = /obj/item/clothing/under/pants/jeans + suit = /obj/item/clothing/suit/costume/wellworn_shirt/graphic + back = /obj/item/storage/backpack + r_hand = /obj/item/wirecutters + + backpack_contents = list( + /obj/item/stack/rods/fifty, + /obj/item/stack/rods/fifty, + /obj/item/stack/rods/fifty, + /obj/item/stack/rods/fifty, + ) + +// We don't want them to just punch each other to death + +/datum/outfit/deathmatch_loadout/lattice_battles/pre_equip(mob/living/carbon/human/user, visualsOnly) + . = ..() + ADD_TRAIT(user, TRAIT_PACIFISM, REF(src)) + +// Ragnarok: Fight between religions! + +/datum/outfit/deathmatch_loadout/cultish/pre_equip(mob/living/carbon/human/user, visualsOnly) + . = ..() + ADD_TRAIT(user, TRAIT_ACT_AS_CULTIST, REF(src)) + user.AddElement(/datum/element/cult_halo, initial_delay = 0 SECONDS) + user.AddElement(/datum/element/cult_eyes, initial_delay = 0 SECONDS) + +// Cultist Invoker, has all the balanced cult gear + +/datum/outfit/deathmatch_loadout/cultish/invoker + name = "Deathmatch: Cultist Invoker" + display_name = "Cultist Invoker" + desc = "Prove Nar'sie's superiority with your well-balanced set of equipment." + //species_override = /datum/species/plasmaman + + head = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield + glasses = /obj/item/clothing/glasses/hud/health/night/cultblind + suit = /obj/item/clothing/suit/hooded/cultrobes/cult_shield // the dreaded return! + suit_store = /obj/item/melee/cultblade + uniform = /obj/item/clothing/under/color/black + id_trim = null + belt = /obj/item/melee/cultblade/dagger + l_pocket = /obj/item/flashlight/flare/culttorch + r_pocket = /obj/item/flashlight/flare/culttorch + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/cult/alt + l_hand = /obj/item/shield/mirror // the dreaded return!! + + back = /obj/item/storage/backpack/cultpack + + backpack_contents = list( + /obj/item/restraints/legcuffs/bola/cult, + /obj/item/reagent_containers/cup/beaker/unholywater, + ) + +// Cultist Artificer, gets all the balanced cult magicks + +/datum/outfit/deathmatch_loadout/cultish/artificer + name = "Deathmatch: Cultist Artificer" + display_name = "Cultist Artificer" + desc = "Prove Nar'sie's superiority with your well-balanced blood magicks." + //species_override = /datum/species/plasmaman + + head = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood + neck = /obj/item/clothing/neck/heretic_focus/crimson_medallion + suit = /obj/item/clothing/suit/hooded/cultrobes/berserker + suit_store = /obj/item/melee/sickly_blade/cursed + uniform = /obj/item/clothing/under/color/red + id_trim = null + belt = /obj/item/melee/cultblade/dagger + l_pocket = /obj/item/flashlight/flare/culttorch + r_pocket = /obj/item/flashlight/flare/culttorch + gloves = /obj/item/clothing/gloves/color/red + shoes = /obj/item/clothing/shoes/cult + l_hand = null + + back = /obj/item/storage/backpack/cultpack + + backpack_contents = list( + /obj/item/cult_shift, + /obj/item/reagent_containers/cup/beaker/unholywater, + /obj/item/reagent_containers/cup/beaker/unholywater, + /obj/item/reagent_containers/cup/beaker/unholywater, + ) + + spells_to_add = list( + /datum/action/innate/cult/blood_spell/horror, + /datum/action/innate/cult/blood_spell/horror, + /datum/action/innate/cult/blood_spell/stun, + /datum/action/innate/cult/blood_spell/stun, + /datum/action/innate/cult/blood_spell/manipulation, + ) + +/datum/outfit/deathmatch_loadout/cultish/artificer/post_equip(mob/living/carbon/human/user, visualsOnly) + . = ..() + var/datum/action/innate/cult/blood_spell/manipulation/magick = locate() in user + magick.charges = 300 + +/datum/outfit/deathmatch_loadout/heresy + /// Grants the effects of these knowledges to the DMer + var/list/knowledge_to_grant + +/datum/outfit/deathmatch_loadout/heresy/pre_equip(mob/living/carbon/human/user, visualsOnly) + . = ..() + ADD_TRAIT(user, TRAIT_ACT_AS_HERETIC, REF(src)) + user.AddElement(/datum/element/leeching_walk) + + // Creates the knowledge as an isolated datum inside the target, allowing passive knowledges to work still. + for(var/datum/heretic_knowledge/knowhow as anything in knowledge_to_grant) + knowhow = new knowhow(user) + knowhow.on_gain(user, null) + +// Heretic Warrior + +// Has spells of Ash, Blade, and Rust. Overall aggressive + +/datum/outfit/deathmatch_loadout/heresy/warrior + name = "Deathmatch: Heretic Warrior" + display_name = "Heretic Warrior" + desc = "Prove the furious strength of the Mansus." + //species_override = /datum/species/plasmaman + + head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch + neck = /obj/item/clothing/neck/heretic_focus + suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch + suit_store = /obj/item/melee/sickly_blade/dark + uniform = /obj/item/clothing/under/color/darkgreen + id_trim = null + belt = /obj/item/melee/sickly_blade/ash + gloves = null + shoes = /obj/item/clothing/shoes/sandal + l_pocket = /obj/item/flashlight/lantern/jade/on + r_pocket = /obj/item/melee/rune_carver + l_hand = null + + back = /obj/item/storage/backpack + + backpack_contents = list( + /obj/item/reagent_containers/cup/beaker/eldritch, + /obj/item/reagent_containers/cup/beaker/eldritch, + /obj/item/eldritch_potion/wounded, + /obj/item/eldritch_potion/wounded, + ) + + // I mean is it really that bad if they don't even know half this stuff is added to them. + // It's like, forbidden knowledge. It fits with the mansus theme - great excuse for poor design! + knowledge_to_grant = list( + /datum/heretic_knowledge/duel_stance, + /datum/heretic_knowledge/blade_grasp, + /datum/heretic_knowledge/blade_dance, + /datum/heretic_knowledge/blade_upgrade/blade, + ) + + spells_to_add = list( + /datum/action/cooldown/spell/touch/mansus_grasp, + /datum/action/cooldown/spell/realignment, + /datum/action/cooldown/spell/pointed/projectile/furious_steel, + /datum/action/cooldown/spell/charged/beam/fire_blast, + /datum/action/cooldown/spell/aoe/fiery_rebirth, + /datum/action/cooldown/spell/cone/staggered/entropic_plume, + /datum/action/cooldown/spell/pointed/rust_construction, + ) + +// Heretic Scribe + +// Has spells of Void, Moon, and Cosmos. Overall defensive/mobile + +/datum/outfit/deathmatch_loadout/heresy/scribe + name = "Deathmatch: Heretic Scribe" + display_name = "Heretic Scribe" + desc = "Reveal the forgotten knowledge of the Mansus." + + head = /obj/item/clothing/head/helmet/chaplain/witchunter_hat + mask = /obj/item/clothing/mask/madness_mask + neck = /obj/item/clothing/neck/eldritch_amulet + suit = /obj/item/clothing/suit/hooded/cultrobes/void + suit_store = /obj/item/melee/sickly_blade + uniform = /obj/item/clothing/under/costume/gamberson/military + id_trim = null + belt = /obj/item/storage/belt/unfathomable_curio + gloves = null + shoes = /obj/item/clothing/shoes/winterboots/ice_boots + l_pocket = /obj/item/ammo_box/strilka310/lionhunter + r_pocket = /obj/item/codex_cicatrix + + back = /obj/item/gun/ballistic/rifle/lionhunter // for his neutral b, he wields a gun + + belt_contents = list( + /obj/item/heretic_labyrinth_handbook, + /obj/item/heretic_labyrinth_handbook, + /obj/item/eldritch_potion/crucible_soul, + /obj/item/clothing/neck/heretic_focus/moon_amulet = 3, + ) + + knowledge_to_grant = list( + /datum/heretic_knowledge/cosmic_grasp, + /datum/heretic_knowledge/moon_grasp, + /datum/heretic_knowledge/mark/moon_mark, + ) + + spells_to_add = list( + /datum/action/cooldown/spell/touch/mansus_grasp, + /datum/action/cooldown/spell/conjure/cosmic_expansion, + /datum/action/cooldown/spell/pointed/projectile/star_blast, + /datum/action/cooldown/spell/touch/star_touch, + /datum/action/cooldown/spell/cone/staggered/cone_of_cold/void, + /datum/action/cooldown/spell/aoe/void_pull, + ) + +// Chaplain! No spells (other than smoke), but strong armor and weapons, and immune to others' spells + +/datum/outfit/deathmatch_loadout/holy_crusader + name = "Deathmatch: Holy Crusader" + display_name = "Holy Crusader" + desc = "Smite the heathens!!" + //species_override = /datum/species/plasmaman + + head = /obj/item/clothing/head/helmet/chaplain + neck = /obj/item/camera/spooky + suit = /obj/item/clothing/suit/chaplainsuit/armor/templar + suit_store = /obj/item/book/bible/booze + uniform = /obj/item/clothing/under/rank/civilian/chaplain + id_trim = null + belt = /obj/item/nullrod // choose any! + gloves = /obj/item/clothing/gloves/plate + shoes = /obj/item/clothing/shoes/plate + l_pocket = /obj/item/flashlight/lantern/on + r_pocket = /obj/item/reagent_containers/cup/glass/bottle/holywater + l_hand = /obj/item/shield/buckler + + back = /obj/item/claymore/weak // or don't + + spells_to_add = list( + /datum/action/cooldown/spell/smoke/lesser + ) + mutations_to_add = list( + /datum/mutation/human/medieval, + /datum/mutation/human/lay_on_hands, // useless, but fun + ) + +// Rat'var Apostate + +/datum/outfit/deathmatch_loadout/clock_cult + name = "Deathmatch: Clock Cultist" + display_name = "Rat'var Apostate" + desc = "You're in a fight between the servants of gods, and yours is dead. Good luck?" + //species_override = /datum/species/plasmaman + + head = /obj/item/clothing/head/costume/bronze + suit = /obj/item/clothing/suit/costume/bronze + suit_store = /obj/item/toy/clockwork_watch + uniform = /obj/item/clothing/under/chameleon + id_trim = null + belt = /obj/item/brass_spear + gloves = /obj/item/clothing/gloves/tinkerer + shoes = /obj/item/clothing/shoes/bronze + l_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh // they used to turn their dmg into tox with a spell. close enough + r_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/deathmatch/deathmatch_mapping.dm b/code/modules/deathmatch/deathmatch_mapping.dm index 9f006e15242..0fb8ade921d 100644 --- a/code/modules/deathmatch/deathmatch_mapping.dm +++ b/code/modules/deathmatch/deathmatch_mapping.dm @@ -11,9 +11,12 @@ /obj/effect/landmark/deathmatch_player_spawn name = "Deathmatch Player Spawner" +<<<<<<< HEAD /area/deathmatch/teleport //Prevent access to cross-z teleportation in the map itself (no wands of safety/teleportation scrolls). Cordons should prevent same-z teleportations outside of the arena. area_flags = /area/deathmatch::area_flags & ~NOTELEPORT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // for the illusion of a moving train /turf/open/chasm/true/no_smooth/fake_motion_sand name = "air" @@ -25,3 +28,15 @@ /turf/open/chasm/true/no_smooth/fake_motion_sand/fast icon_state = "sandmovingfast" base_icon_state = "sandmovingfast" +<<<<<<< HEAD +======= + +// fakeout + +/turf/open/chasm/true/fakeout + name = /turf/open/floor/wood::name + // desc kept the same + icon_state = /turf/open/floor/wood::icon_state + base_icon_state = /turf/open/floor/wood::base_icon_state + icon = /turf/open/floor/wood::icon +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/deathmatch/deathmatch_maps.dm b/code/modules/deathmatch/deathmatch_maps.dm index 078555e05ac..7fd7d043b86 100644 --- a/code/modules/deathmatch/deathmatch_maps.dm +++ b/code/modules/deathmatch/deathmatch_maps.dm @@ -17,7 +17,10 @@ /// whether we are currently being loaded by a lobby var/template_in_use = FALSE +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lazy_template/deathmatch/ragecage name = "Ragecage" desc = "Fun for the whole family, the classic ragecage." @@ -205,5 +208,48 @@ map_name = "finaldestination" key = "finaldestination" +<<<<<<< HEAD +======= +/datum/lazy_template/deathmatch/species_warfare + name = "Species Warfare" + desc = "Choose your favorite species and prove its superiority against all the other, lamer species. And also anyone else of your own." + max_players = 8 + allowed_loadouts = list( + /datum/outfit/deathmatch_loadout/humanity, + /datum/outfit/deathmatch_loadout/lizardkind, + /datum/outfit/deathmatch_loadout/mothman, + /datum/outfit/deathmatch_loadout/ethereal, + /datum/outfit/deathmatch_loadout/plasmamen, + /datum/outfit/deathmatch_loadout/felinid, + ) + map_name = "species_warfare" + key = "species_warfare" + +/datum/lazy_template/deathmatch/lattice_battles + name = "Lattice Battles" + desc = "Tired of fisticuffs all the time? Just snip the catwalk underneath instead!" + max_players = 8 + allowed_loadouts = list( + /datum/outfit/deathmatch_loadout/lattice_battles, + ) + map_name = "lattice_battles" + key = "lattice_battles" + +/datum/lazy_template/deathmatch/ragnarok + name = "Ragnarok" + desc = "Cultists, heretics, and chaplains all duking it out in the jungle to retrieve the McGuffin." + max_players = 8 + allowed_loadouts = list( + /datum/outfit/deathmatch_loadout/cultish/invoker, + /datum/outfit/deathmatch_loadout/cultish/artificer, + /datum/outfit/deathmatch_loadout/heresy/warrior, + /datum/outfit/deathmatch_loadout/heresy/scribe, + /datum/outfit/deathmatch_loadout/holy_crusader, + /datum/outfit/deathmatch_loadout/clock_cult, + ) + map_name = "ragnarok" + key = "ragnarok" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/turf_reservation/indestructible_plating turf_type = /turf/open/indestructible/plating //a little hacky but i guess it has to be done diff --git a/code/modules/deathmatch/deathmatch_modifier.dm b/code/modules/deathmatch/deathmatch_modifier.dm index dadca49d70a..5c8ac8f5d83 100644 --- a/code/modules/deathmatch/deathmatch_modifier.dm +++ b/code/modules/deathmatch/deathmatch_modifier.dm @@ -232,7 +232,11 @@ projectile.ricochets_max += 2 projectile.min_ricochets += 2 projectile.ricochet_incidence_leeway = 0 +<<<<<<< HEAD ADD_TRAIT(projectile, TRAIT_ALWAYS_HIT_ZONE, DEATHMATCH_TRAIT) +======= + projectile.accuracy_falloff = 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/deathmatch_modifier/stormtrooper name = "Stormtrooper Aim" diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm index a6841d39754..1cf617ce451 100644 --- a/code/modules/error_handler/error_handler.dm +++ b/code/modules/error_handler/error_handler.dm @@ -101,6 +101,12 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) // The proceeding mess will almost definitely break if error messages are ever changed var/list/splitlines = splittext(E.desc, "\n") var/list/desclines = list() + var/list/state_stack = GLOB.lua_state_stack + var/is_lua_call = length(state_stack) + var/list/lua_stacks = list() + if(is_lua_call) + for(var/level in 1 to state_stack.len) + lua_stacks += list(splittext(DREAMLUAU_GET_TRACEBACK(level), "\n")) if(LAZYLEN(splitlines) > ERROR_USEFUL_LEN) // If there aren't at least three lines, there's no info for(var/line in splitlines) if(LAZYLEN(line) < 3 || findtext(line, "source file:") || findtext(line, "usr.loc:")) @@ -110,13 +116,14 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) desclines.Add(usrinfo) usrinfo = null continue // Our usr info is better, replace it - if(copytext(line, 1, 3) != " ")//3 == length(" ") + 1 desclines += (" " + line) // Pad any unpadded lines, so they look pretty else desclines += line if(usrinfo) //If this info isn't null, it hasn't been added yet desclines.Add(usrinfo) + if(is_lua_call) + SSlua.log_involved_runtime(E, desclines, lua_stacks) if(silencing) desclines += " (This error will now be silenced for [DisplayTimeText(configured_error_silence_time)])" if(GLOB.error_cache) diff --git a/code/modules/escape_menu/escape_menu.dm b/code/modules/escape_menu/escape_menu.dm index dca5ad63cae..a97dd4f0fb2 100644 --- a/code/modules/escape_menu/escape_menu.dm +++ b/code/modules/escape_menu/escape_menu.dm @@ -80,8 +80,13 @@ GLOBAL_LIST_EMPTY(escape_menus) switch (menu_page) if (PAGE_HOME) show_home_page() +<<<<<<< HEAD //if (PAGE_LEAVE_BODY) //SKYRAT EDIT REMOVAL //show_leave_body_page() //SKYRAT EDIT REMOVAL +======= + if (PAGE_LEAVE_BODY) + show_leave_body_page() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("Unknown escape menu page: [menu_page]") diff --git a/code/modules/escape_menu/home_page.dm b/code/modules/escape_menu/home_page.dm index 933f905cc80..0895b7af33a 100644 --- a/code/modules/escape_menu/home_page.dm +++ b/code/modules/escape_menu/home_page.dm @@ -41,8 +41,12 @@ /* offset = */ 4, ) ) +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN /* +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 page_holder.give_screen_object( new /atom/movable/screen/escape_menu/home_button/leave_body( null, @@ -53,8 +57,11 @@ CALLBACK(src, PROC_REF(open_leave_body)), ) ) +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/escape_menu/proc/home_resume() qdel(src) diff --git a/code/modules/escape_menu/leave_body.dm b/code/modules/escape_menu/leave_body.dm index 14de01749bf..a3166dc21f1 100644 --- a/code/modules/escape_menu/leave_body.dm +++ b/code/modules/escape_menu/leave_body.dm @@ -13,7 +13,11 @@ "Suicide", "Perform a dramatic suicide in game", /* pixel_offset = */ -105, +<<<<<<< HEAD // CALLBACK(src, PROC_REF(leave_suicide)), // SKYRAT EDIT REMOVAL +======= + CALLBACK(src, PROC_REF(leave_suicide)), +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* button_overlay = */ dead_clown, )) @@ -64,16 +68,22 @@ var/mob/living/living_user = client?.mob living_user?.ghost() +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/escape_menu/proc/leave_suicide() PRIVATE_PROC(TRUE) // Not guaranteed to be human. Everything defines verb/suicide separately. Fuck you, still. var/mob/living/carbon/human/human_user = client?.mob human_user?.suicide() +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/escape_menu/leave_body_button icon = 'icons/hud/escape_menu_leave_body.dmi' diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 06f5a50101c..8b5aa0b80b7 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -1,4 +1,8 @@ +<<<<<<< HEAD #define RANDOM_EVENT_ADMIN_INTERVENTION_TIME (3 MINUTES) // SKYRAT EDIT CHANGE - ORIGINAL: #define RANDOM_EVENT_ADMIN_INTERVENTION_TIME (10 SECONDS) +======= +#define RANDOM_EVENT_ADMIN_INTERVENTION_TIME (10 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //this singleton datum is used by the events controller to dictate how it selects events /datum/round_event_control @@ -98,6 +102,20 @@ if (SEND_GLOBAL_SIGNAL(COMSIG_GLOB_PRE_RANDOM_EVENT, src) & CANCEL_PRE_RANDOM_EVENT) return EVENT_INTERRUPTED +<<<<<<< HEAD +======= + + triggering = TRUE + + // We sleep HERE, in pre-event setup (because there's no sense doing it in run_event() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round or at least reroll it. + message_admins("Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (CANCEL) (SOMETHING ELSE)") + sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME) + var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE) + if(!can_spawn_event(players_amt)) + message_admins("Second pre-condition check for [name] failed, rerolling...") + SSevents.spawnEvent(excluded_event = src) + return EVENT_INTERRUPTED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 triggering = TRUE @@ -174,6 +192,7 @@ Runs the event round_event.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) occurrences++ +<<<<<<< HEAD SSevents.previously_run += src //SKYRAT EDIT ADDITION if(announce_chance_override != null) @@ -182,6 +201,14 @@ Runs the event testing("[time2text(world.time, "hh:mm:ss")] [round_event.type]") triggering = TRUE +======= + if(announce_chance_override != null) + round_event.announce_chance = announce_chance_override + + testing("[time2text(world.time, "hh:mm:ss")] [round_event.type]") + triggering = TRUE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!triggering) RegisterSignal(SSdcs, COMSIG_GLOB_RANDOM_EVENT, PROC_REF(stop_random_event)) round_event.cancel_event = TRUE diff --git a/code/modules/events/anomaly/_anomaly.dm b/code/modules/events/anomaly/_anomaly.dm index 40ae2b840e1..1a3b20a4e13 100644 --- a/code/modules/events/anomaly/_anomaly.dm +++ b/code/modules/events/anomaly/_anomaly.dm @@ -28,7 +28,11 @@ /datum/round_event/anomaly/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") +======= + priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/round_event/anomaly/start() var/turf/anomaly_turf diff --git a/code/modules/events/anomaly/anomaly_bioscrambler.dm b/code/modules/events/anomaly/anomaly_bioscrambler.dm index 87d8a19c39a..611b33cc29e 100644 --- a/code/modules/events/anomaly/anomaly_bioscrambler.dm +++ b/code/modules/events/anomaly/anomaly_bioscrambler.dm @@ -17,4 +17,8 @@ /datum/round_event/anomaly/anomaly_bioscrambler/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert") +======= + priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_bluespace.dm b/code/modules/events/anomaly/anomaly_bluespace.dm index e8a6f4aa160..534606916b8 100644 --- a/code/modules/events/anomaly/anomaly_bluespace.dm +++ b/code/modules/events/anomaly/anomaly_bluespace.dm @@ -16,4 +16,8 @@ /datum/round_event/anomaly/anomaly_bluespace/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_MASSIVEBSPACEANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") +======= + priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_dimensional.dm b/code/modules/events/anomaly/anomaly_dimensional.dm index 885b4fef8c1..c9724d7ca3c 100644 --- a/code/modules/events/anomaly/anomaly_dimensional.dm +++ b/code/modules/events/anomaly/anomaly_dimensional.dm @@ -25,7 +25,11 @@ /datum/round_event/anomaly/anomaly_dimensional/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") +======= + priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/event_admin_setup/listed_options/anomaly_dimensional input_text = "Select a dimensional anomaly theme?" diff --git a/code/modules/events/anomaly/anomaly_ectoplasm.dm b/code/modules/events/anomaly/anomaly_ectoplasm.dm index b693d221d38..ea8378f7968 100644 --- a/code/modules/events/anomaly/anomaly_ectoplasm.dm +++ b/code/modules/events/anomaly/anomaly_ectoplasm.dm @@ -41,7 +41,11 @@ /datum/round_event/anomaly/anomaly_ectoplasm/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") +======= + priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/event_admin_setup/anomaly_ectoplasm ///The admin-selected intensity diff --git a/code/modules/events/anomaly/anomaly_flux.dm b/code/modules/events/anomaly/anomaly_flux.dm index 231d3d825ba..c02cc56265b 100644 --- a/code/modules/events/anomaly/anomaly_flux.dm +++ b/code/modules/events/anomaly/anomaly_flux.dm @@ -17,4 +17,8 @@ /datum/round_event/anomaly/anomaly_flux/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_FLUXANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") +======= + priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_grav.dm b/code/modules/events/anomaly/anomaly_grav.dm index 400feb2900e..cfc1c732b41 100644 --- a/code/modules/events/anomaly/anomaly_grav.dm +++ b/code/modules/events/anomaly/anomaly_grav.dm @@ -29,4 +29,8 @@ /datum/round_event/anomaly/anomaly_grav/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRAVANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRANOMALIES) +======= + priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRANOMALIES) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_hallucination.dm b/code/modules/events/anomaly/anomaly_hallucination.dm index 93803a321a8..3e7952dc238 100644 --- a/code/modules/events/anomaly/anomaly_hallucination.dm +++ b/code/modules/events/anomaly/anomaly_hallucination.dm @@ -17,4 +17,8 @@ /datum/round_event/anomaly/anomaly_hallucination/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") +======= + priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_pyro.dm b/code/modules/events/anomaly/anomaly_pyro.dm index c8cbfde644c..f4bec69399f 100644 --- a/code/modules/events/anomaly/anomaly_pyro.dm +++ b/code/modules/events/anomaly/anomaly_pyro.dm @@ -16,4 +16,8 @@ /datum/round_event/anomaly/anomaly_pyro/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_PYROANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") +======= + priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_vortex.dm b/code/modules/events/anomaly/anomaly_vortex.dm index 3c762d52239..b6a16d16378 100644 --- a/code/modules/events/anomaly/anomaly_vortex.dm +++ b/code/modules/events/anomaly/anomaly_vortex.dm @@ -17,4 +17,8 @@ /datum/round_event/anomaly/anomaly_vortex/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() +<<<<<<< HEAD priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert", ANNOUNCER_VORTEXANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert") +======= + priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index e063c89e152..8977121d548 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -18,6 +18,7 @@ if(H.stat == DEAD) // What are you doing in this list continue if(!H.get_organ_by_type(/obj/item/organ/internal/brain)) // If only I had a brain +<<<<<<< HEAD continue if(!(H.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) //please stop giving my centcom admin gimmicks full body paralysis continue @@ -25,6 +26,11 @@ if(engaged_role_play_check(H, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADD END +======= + continue + if(!(H.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) //please stop giving my centcom admin gimmicks full body paralysis + continue +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 traumatize(H) announce_to_ghosts(H) break diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index cfab77009d4..708f38c90cc 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -52,7 +52,11 @@ if(fake) var/obj/machinery/vending/prototype = pick(subtypesof(/obj/machinery/vending)) machine_name = initial(prototype.name) +<<<<<<< HEAD priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [machine_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert", ANNOUNCER_BRANDINTELLIGENCE) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [machine_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert") +======= + priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [machine_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/round_event/brand_intelligence/start() origin_machine.shut_up = FALSE diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index 0e44ac391c1..d0e88710406 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -14,7 +14,10 @@ /datum/round_event/bureaucratic_error/start() var/list/jobs = SSjob.get_valid_overflow_jobs() +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(33)) // Only allows latejoining as a single role. var/datum/job/overflow = pick_n_take(jobs) overflow.spawn_positions = -1 @@ -23,7 +26,13 @@ var/datum/job/current = job current.total_positions = 0 return +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL - no more locking off jobs // Adds/removes a random amount of job slots from all jobs. for(var/datum/job/current as anything in jobs) current.total_positions = max(current.total_positions + rand(-2,4), 1) // SKYRAT EDIT CHANGE - No more locking off jobs - ORIGINAL: current.total_positions = max(current.total_positions + rand(-2,4), 0) +======= + // Adds/removes a random amount of job slots from all jobs. + for(var/datum/job/current as anything in jobs) + current.total_positions = max(current.total_positions + rand(-2,4), 0) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 1002bdcdbd1..9c1f5f9cfc4 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -23,7 +23,11 @@ to_chat(A, "
[span_warning("[alert]")]
") if(prob(30) || fake) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. +<<<<<<< HEAD priority_announce(alert, "Anomaly Alert", sound = ANNOUNCER_COMMSBLACKOUT) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce(alert, "Anomaly Alert") +======= + priority_announce(alert, "Anomaly Alert") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/round_event/communications_blackout/start() diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index bf7dbe23862..9dd2492fe7d 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -63,10 +63,13 @@ continue if(!is_station_level(candidate.z) && !is_mining_level(candidate.z)) //Diseases can't really spread if the vector is in deep space. continue +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Station/area event candidate filtering. if(engaged_role_play_check(candidate, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 disease_candidates += candidate ///Handles checking and alerting admins about the number of valid candidates diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index bfa40083149..85ace75c611 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -12,10 +12,13 @@ continue if(!(victim.mind?.assigned_role.job_flags & JOB_CREW_MEMBER)) continue +<<<<<<< HEAD // SKYRAT EDIT ADD START - Station/area event candidate filtering if(engaged_role_play_check(fake_virus_victims, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADD END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fake_virus_victims += victim //first we do hard status effect victims diff --git a/code/modules/events/ghost_role/space_ninja.dm b/code/modules/events/ghost_role/space_ninja.dm index 5daea71b4af..a3b3be7e79e 100644 --- a/code/modules/events/ghost_role/space_ninja.dm +++ b/code/modules/events/ghost_role/space_ninja.dm @@ -27,6 +27,7 @@ ninja.key = chosen_one.key ninja.mind.add_antag_datum(/datum/antagonist/ninja) spawned_mobs += ninja +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN: Preference Ninjas var/loadme = tgui_input_list(ninja, "Do you wish to load your character slot?", "Load Character?", list("Yes!", "No, I want to be random!"), default = "No, I want to be random!", timeout = 60 SECONDS) var/codename @@ -42,6 +43,8 @@ ninja.dna.update_dna_identity() // SKYRAT EDIT ADDITION END: Preference Ninjas +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 message_admins("[ADMIN_LOOKUPFLW(ninja)] has been made into a space ninja by an event.") ninja.log_message("was spawned as a ninja by an event.", LOG_GAME) @@ -52,9 +55,17 @@ /proc/create_space_ninja(spawn_loc) var/mob/living/carbon/human/new_ninja = new(spawn_loc) +<<<<<<< HEAD // new_ninja.randomize_human_appearance(~(RANDOMIZE_NAME|RANDOMIZE_SPECIES)) //SKYRAT EDIT: Player Prefs Ninjas var/new_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]" new_ninja.name = new_name new_ninja.real_name = new_name // new_ninja.dna.update_dna_identity() //SKYRAT EDIT: Player Prefs Ninjas +======= + new_ninja.randomize_human_appearance(~(RANDOMIZE_NAME|RANDOMIZE_SPECIES)) + var/new_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]" + new_ninja.name = new_name + new_ninja.real_name = new_name + new_ninja.dna.update_dna_identity() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return new_ninja diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index c65a6358ef4..0d2c8cef5d0 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -34,10 +34,13 @@ continue if(!(candidate.mind.assigned_role.job_flags & JOB_CREW_MEMBER))//only crewmembers can get one, a bit unfair for some ghost roles and it wastes the event continue +<<<<<<< HEAD // SKYRAT EDIT ADD START - Station/area event candidate filtering if(engaged_role_play_check(candidate, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADD END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(candidate.satiety <= -60 && !candidate.has_status_effect(/datum/status_effect/exercised)) //Multiple junk food items recently //No foodmaxxing for the achievement heart_attack_candidates[candidate] = 3 else diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 686adf1e5d3..cb7c583302a 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -34,7 +34,11 @@ //AI laws for(var/mob/living/silicon/ai/M in GLOB.alive_mob_list) M.laws_sanity_check() +<<<<<<< HEAD if(M.stat != DEAD && !M.incapacitated()) +======= + if(M.stat != DEAD && !M.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(replaceLawsetChance)) var/datum/ai_laws/ion_lawset = pick_weighted_lawset() // pick_weighted_lawset gives us a typepath, diff --git a/code/modules/events/market_crash.dm b/code/modules/events/market_crash.dm index 1b18fe774f6..d4f06b182d3 100644 --- a/code/modules/events/market_crash.dm +++ b/code/modules/events/market_crash.dm @@ -23,7 +23,11 @@ var/list/poss_reasons = list("the alignment of the moon and the sun",\ "some risky housing market outcomes",\ "the B.E.P.I.S. team's untimely downfall",\ +<<<<<<< HEAD "speculative SolFed grants backfiring", /*SKYRAT EDIT CHANGE; original was "speculative Terragov grants backfiring"*/\ +======= + "speculative Terragov grants backfiring",\ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "greatly exaggerated reports of Nanotrasen accountancy personnel being \"laid off\"",\ "a \"great investment\" into \"non-fungible tokens\" by a \"moron\"",\ "a number of raids from Tiger Cooperative agents",\ diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index 5dbbd1d9795..229cd4c5ad7 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -72,11 +72,19 @@ return if(prob(TOXICITY_MUTATION_PROB) && istype(crosser) && !isvineimmune(crosser)) to_chat(crosser, span_alert("You accidentally touch the vine and feel a strange sensation.")) +<<<<<<< HEAD crosser.adjustToxLoss(5) // SKYRAT EDIT CHANGE - Original: 20 /datum/spacevine_mutation/toxicity/on_eat(obj/structure/spacevine/holder, mob/living/eater) if(!isvineimmune(eater)) eater.adjustToxLoss(5) // SKYRAT EDIT CHANGE - Original: 20 +======= + crosser.adjustToxLoss(20) + +/datum/spacevine_mutation/toxicity/on_eat(obj/structure/spacevine/holder, mob/living/eater) + if(!isvineimmune(eater)) + eater.adjustToxLoss(20) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/spacevine_mutation/explosive // JC IT'S A BOMB name = "Explosive" @@ -290,7 +298,11 @@ if(prob(THORN_MUTATION_CUT_PROB) && istype(crosser) && !isvineimmune(crosser)) var/mob/living/victim = crosser +<<<<<<< HEAD victim.adjustBruteLoss(5) // SKYRAT EDIT CHANGE - Original: 15 +======= + victim.adjustBruteLoss(15) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(victim, span_danger("You cut yourself on the thorny vines.")) /datum/spacevine_mutation/thorns/on_hit(obj/structure/spacevine/holder, mob/living/hitter, obj/item/item, expected_damage) @@ -305,7 +317,11 @@ if(prob(THORN_MUTATION_CUT_PROB) && istype(hitter) && !isvineimmune(hitter)) var/mob/living/victim = hitter +<<<<<<< HEAD victim.adjustBruteLoss(5) // SKYRAT EDIT CHANGE - Original: 15 +======= + victim.adjustBruteLoss(15) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(victim, span_danger("You cut yourself on the thorny vines.")) return expected_damage diff --git a/code/modules/events/space_vines/vine_structure.dm b/code/modules/events/space_vines/vine_structure.dm index 094a37371d7..6352085b423 100644 --- a/code/modules/events/space_vines/vine_structure.dm +++ b/code/modules/events/space_vines/vine_structure.dm @@ -67,10 +67,13 @@ for(var/datum/spacevine_mutation/mutation in mutations) override += mutation.on_chem(src, chem) if(!override && prob(75) && istype(chem, /datum/reagent/toxin/plantbgone)) +<<<<<<< HEAD // SKYRAT EDIT ADD START if(plantbgone_resist && prob(50)) return // SKYRAT EDIT ADD END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(src) /obj/structure/spacevine/proc/eat(mob/eater) diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index cb236e02f12..2ddf3225244 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -27,7 +27,11 @@ var/item_set = pick( BIG_FAT_DOOBIE, BOXING, +<<<<<<< HEAD // CATGIRLS_2015, // SKYRAT EDIT REMOVAL +======= + CATGIRLS_2015, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CURSED_SWORDS, VOICE_MODULATORS, WIZARD_MIMICRY, diff --git a/code/modules/events/wizard/rpgtitles.dm b/code/modules/events/wizard/rpgtitles.dm index 9512c298dea..2583e16fecb 100644 --- a/code/modules/events/wizard/rpgtitles.dm +++ b/code/modules/events/wizard/rpgtitles.dm @@ -4,7 +4,11 @@ typepath = /datum/round_event/wizard/rpgtitles max_occurrences = 1 earliest_start = 0 MINUTES +<<<<<<< HEAD description = "Everyone gains an RPG title hovering above them." +======= + description = "Everyone gains an RPG title hovering below them." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm index de5b3abc15a..930fe7f590a 100644 --- a/code/modules/experisci/experiment/experiments.dm +++ b/code/modules/experisci/experiment/experiments.dm @@ -142,6 +142,7 @@ experiment_proper = TRUE required_gas = /datum/gas/hypernoblium +<<<<<<< HEAD /datum/experiment/ordnance/gaseous/halon name = "Halon Gas Shells" description = "The delivery of Halon gas into an area of operation might prove useful. Perform research and publish papers on this field." @@ -150,6 +151,8 @@ experiment_proper = TRUE required_gas = /datum/gas/halon +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/experiment/scanning/random/material/meat name = "Biological Material Scanning Experiment" description = "They told us we couldn't make chairs out of every material in the world. You're here to prove those nay-sayers wrong." @@ -395,7 +398,11 @@ if (organ.type == target_species.get_mutant_organ_type_for_slot(organ.slot)) continue else +<<<<<<< HEAD if ((organ.type in target_species.mutant_organs) || (organ.type in target_species.external_organs)) +======= + if ((organ.type in target_species.mutant_organs)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue return TRUE return FALSE diff --git a/code/modules/experisci/experiment/handlers/experiment_handler.dm b/code/modules/experisci/experiment/handlers/experiment_handler.dm index 7706c71ed61..db681ef0afb 100644 --- a/code/modules/experisci/experiment/handlers/experiment_handler.dm +++ b/code/modules/experisci/experiment/handlers/experiment_handler.dm @@ -124,13 +124,20 @@ if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL)) to_chat(user, span_notice("You do not have an experiment selected!")) return +<<<<<<< HEAD var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/research, SKILL_SPEED_MODIFIER) //SKYRAT EDIT: Research Skill (simple research) if(!(config_flags & EXPERIMENT_CONFIG_IMMEDIATE_ACTION) && !do_after(user, 1 SECONDS * skill_modifier, target = target)) //SKYRAT EDIT: Research Skill (simple research) +======= + if(!(config_flags & EXPERIMENT_CONFIG_IMMEDIATE_ACTION) && !do_after(user, 1 SECONDS, target = target)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(action_experiment(source, target)) playsound(user, 'sound/machines/ping.ogg', 25) to_chat(user, span_notice("You scan [target].")) +<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/research, 5) //SKYRAT EDIT: Research Skill (simple research) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL)) playsound(user, 'sound/machines/buzz-sigh.ogg', 25) to_chat(user, span_notice("[target] is not related to your currently selected experiment.")) @@ -357,7 +364,11 @@ ) .["experiments"] += list(data) +<<<<<<< HEAD /datum/component/experiment_handler/ui_act(action, params) +======= +/datum/component/experiment_handler/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/explorer_drone/control_console.dm b/code/modules/explorer_drone/control_console.dm index 8cc8854f27d..fe953037e25 100644 --- a/code/modules/explorer_drone/control_console.dm +++ b/code/modules/explorer_drone/control_console.dm @@ -97,7 +97,11 @@ icon_screen = initial(icon_screen) . = ..() +<<<<<<< HEAD /obj/machinery/computer/exodrone_control_console/ui_act(action, list/params) +======= +/obj/machinery/computer/exodrone_control_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/explorer_drone/exodrone.dm b/code/modules/explorer_drone/exodrone.dm index 5754ccc4a5e..e0435dc539b 100644 --- a/code/modules/explorer_drone/exodrone.dm +++ b/code/modules/explorer_drone/exodrone.dm @@ -63,12 +63,24 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) /obj/item/exodrone/Initialize(mapload) . = ..() +<<<<<<< HEAD name = pick(strings(EXODRONE_FILE,"probe_names")) if(name_counter[name]) name_counter[name]++ name = "[name] \Roman[name_counter[name]]" else name_counter[name] = 1 +======= + if(name == /obj/item/exodrone::name) + name = pick(strings(EXODRONE_FILE,"probe_names")) + if(name_counter[name]) + name_counter[name]++ + name = "[name] \Roman[name_counter[name]]" + else + name_counter[name] = 1 + else + name = name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.exodrones += src // Cargo storage create_storage(max_slots = EXODRONE_CARGO_SLOTS, canthold = GLOB.blacklisted_cargo_types) diff --git a/code/modules/explorer_drone/exploration_events/resource.dm b/code/modules/explorer_drone/exploration_events/resource.dm index 3d4fc926517..e4465b77133 100644 --- a/code/modules/explorer_drone/exploration_events/resource.dm +++ b/code/modules/explorer_drone/exploration_events/resource.dm @@ -282,7 +282,11 @@ has_tool_description = "Your drill will allow you to extract the deposit!" action_text = "Mine" delay_message = "Mining..." +<<<<<<< HEAD var/static/list/possible_materials = list(/datum/material/silver,/datum/material/bananium) //only add materials with sheet type here //SKYRAT EDIT - REMOVED /datum/material/pizza +======= + var/static/list/possible_materials = list(/datum/material/silver,/datum/material/bananium,/datum/material/pizza) //only add materials with sheet type here +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/loot_amount = 30 var/chosen_material_type diff --git a/code/modules/explorer_drone/exploration_events/trader.dm b/code/modules/explorer_drone/exploration_events/trader.dm index c4d4b5ac94b..300db896a0b 100644 --- a/code/modules/explorer_drone/exploration_events/trader.dm +++ b/code/modules/explorer_drone/exploration_events/trader.dm @@ -22,7 +22,11 @@ return "You encountered [name] but could not understand what they want without a translator." var/obj/want = required_path var/obj/gives = traded_path +<<<<<<< HEAD return "Encountered [name] willing to trade [initial(want.name)] for [initial(gives.name)]" +======= + return "Encountered [name] willing to trade [initial(gives.name)] for [initial(want.name)]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/exploration_event/simple/trader/get_description(obj/item/exodrone/drone) if(requires_translator && !drone.has_tool(EXODRONE_TOOL_TRANSLATOR)) diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index 6317ee273be..9ced0bb76d4 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -121,7 +121,11 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) . = ..() .["all_bands"] = GLOB.exoscanner_bands +<<<<<<< HEAD /obj/machinery/computer/exoscanner_control/ui_act(action, list/params) +======= +/obj/machinery/computer/exoscanner_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/fishing/admin.dm b/code/modules/fishing/admin.dm index ba5c29a7fd1..9bb75f7c2f3 100644 --- a/code/modules/fishing/admin.dm +++ b/code/modules/fishing/admin.dm @@ -51,7 +51,11 @@ ADMIN_VERB(fishing_calculator, R_DEBUG, "Fishing Calculator", "A calculator... f temporary_rod.set_slot(new line_type(temporary_rod), ROD_SLOT_LINE) var/result_table = list() +<<<<<<< HEAD var/modified_table = spot.get_modified_fish_table(temporary_rod,user) +======= + var/modified_table = spot.get_modified_fish_table(temporary_rod, user, null) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/result_type in spot.fish_table) // through this not modified to display 0 chance ones too var/list/info = list() info["result"] = result_type diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm index 5afbf4b72d9..bd5a8b1cb08 100644 --- a/code/modules/fishing/aquarium/aquarium.dm +++ b/code/modules/fishing/aquarium/aquarium.dm @@ -307,6 +307,7 @@ /obj/structure/aquarium/ui_data(mob/user) . = ..() +<<<<<<< HEAD .["fluid_type"] = fluid_type .["temperature"] = fluid_temp .["allow_breeding"] = allow_breeding @@ -315,6 +316,32 @@ for(var/atom/movable/fish in contents) content_data += list(list("name"=fish.name,"ref"=ref(fish))) .["contents"] = content_data +======= + .["fluidType"] = fluid_type + .["temperature"] = fluid_temp + .["allowBreeding"] = allow_breeding + .["fishData"] = list() + .["feedingInterval"] = feeding_interval / (1 MINUTES) + .["propData"] = list() + for(var/atom/movable/item in contents) + if(isfish(item)) + var/obj/item/fish/fish = item + .["fishData"] += list(list( + "fish_ref" = REF(fish), + "fish_name" = fish.name, + "fish_happiness" = fish.get_happiness_value(), + "fish_icon" = fish::icon, + "fish_icon_state" = fish::icon_state, + "fish_health" = fish.health, + )) + continue + .["propData"] += list(list( + "prop_ref" = REF(item), + "prop_name" = item.name, + "prop_icon" = item::icon, + "prop_icon_state" = item::icon_state, + )) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/aquarium/ui_static_data(mob/user) . = ..() @@ -322,8 +349,14 @@ .["minTemperature"] = min_fluid_temp .["maxTemperature"] = max_fluid_temp .["fluidTypes"] = fluid_types +<<<<<<< HEAD /obj/structure/aquarium/ui_act(action, params) +======= + .["heartIcon"] = 'icons/effects/effects.dmi' + +/obj/structure/aquarium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -345,6 +378,7 @@ if("feeding_interval") feeding_interval = params["feeding_interval"] MINUTES . = TRUE +<<<<<<< HEAD if("remove") var/atom/movable/inside = locate(params["ref"]) in contents if(inside) @@ -353,6 +387,21 @@ else inside.forceMove(get_turf(src)) to_chat(user,span_notice("You take out [inside] from [src].")) +======= + if("pet_fish") + var/obj/item/fish/fish = locate(params["fish_reference"]) in contents + fish?.pet_fish(user) + if("remove_item") + var/atom/movable/item = locate(params["item_reference"]) in contents + item?.forceMove(drop_location()) + to_chat(user, span_notice("You take out [item] from [src].")) + if("rename_fish") + var/new_name = sanitize_name(params["chosen_name"]) + if(!new_name) + return + var/atom/movable/fish = locate(params["fish_reference"]) in contents + fish.name = new_name +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/aquarium/ui_interact(mob/user, datum/tgui/ui) . = ..() @@ -399,9 +448,19 @@ new /obj/item/aquarium_prop/sand(src) new /obj/item/aquarium_prop/seaweed(src) +<<<<<<< HEAD new /obj/item/fish/goldfish/gill(src) reagents.add_reagent(/datum/reagent/consumable/nutriment, 2) +======= + if(prob(85)) + new /obj/item/fish/goldfish/gill(src) + reagents.add_reagent(/datum/reagent/consumable/nutriment, 2) + else + new /obj/item/fish/goldfish/three_eyes/gill(src) + reagents.add_reagent(/datum/reagent/toxin/mutagen, 2) //three eyes goldfish feed on mutagen. + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/aquarium/prefilled anchored = TRUE diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm index fcb3d90f9f9..f2c3bbc7165 100644 --- a/code/modules/fishing/aquarium/aquarium_kit.dm +++ b/code/modules/fishing/aquarium/aquarium_kit.dm @@ -58,7 +58,11 @@ name = "ominous fish case" /obj/item/storage/fish_case/syndicate/get_fish_type() +<<<<<<< HEAD return pick(/obj/item/fish/donkfish, /obj/item/fish/emulsijack, /obj/item/fish/jumpercable) +======= + return pick(/obj/item/fish/donkfish, /obj/item/fish/emulsijack, /obj/item/fish/jumpercable, /obj/item/fish/chainsawfish) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/fish_case/tiziran name = "imported fish case" diff --git a/code/modules/fishing/bait.dm b/code/modules/fishing/bait.dm index 78d18aa539e..84175c12d1e 100644 --- a/code/modules/fishing/bait.dm +++ b/code/modules/fishing/bait.dm @@ -61,3 +61,242 @@ bait_type = /obj/item/food/bait/doughball/synthetic/super uses_left = 12 +<<<<<<< HEAD +======= +/obj/item/fishing_lure + name = "artificial minnow" + desc = "A fishing lure meant to attract smaller omnivore fish." + icon = 'icons/obj/fishing.dmi' + icon_state = "minnow" + w_class = WEIGHT_CLASS_SMALL + /** + * A list with two keys delimiting the spinning interval in which a mouse click has to be pressed while fishing. + * This is passed down to the fishing rod, and then to the lure during the minigame. + */ + var/spin_frequency = list(2 SECONDS, 3 SECONDS) + +/obj/item/fishing_lure/Initialize(mapload) + . = ..() + add_traits(list(TRAIT_FISHING_BAIT, TRAIT_BAIT_ALLOW_FISHING_DUD, TRAIT_OMNI_BAIT, TRAIT_BAIT_UNCONSUMABLE), INNATE_TRAIT) + RegisterSignal(src, COMSIG_FISHING_EQUIPMENT_SLOTTED, PROC_REF(lure_equipped)) + +/obj/item/fishing_lure/proc/lure_equipped(datum/source, obj/item/fishing_rod/rod) + SIGNAL_HANDLER + rod.spin_frequency = spin_frequency + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_removed)) + +/obj/item/fishing_lure/proc/on_removed(atom/movable/source, obj/item/fishing_rod/rod, dir, forced) + SIGNAL_HANDLER + UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + rod.spin_frequency = null + +///Called for every fish subtype by the fishing subsystem when initializing, to populate the list of fish that can be catched with this lure. +/obj/item/fishing_lure/proc/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/avg_size = initial(fish_type.average_size) + var/intermediate_size = FISH_SIZE_SMALL_MAX + (FISH_SIZE_NORMAL_MAX - FISH_SIZE_SMALL_MAX) + if(!ISINRANGE(avg_size, FISH_SIZE_TINY_MAX * 0.5, intermediate_size)) + return FALSE + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater, /datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits)) + return FALSE + return TRUE + +/obj/item/fishing_lure/examine(mob/user) + . = ..() + . += span_info("It has to be spun with a frequency of [spin_frequency[1] * 0.1] to [spin_frequency[2] * 0.1] seconds while fishing.") + if(HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT)) + . += span_tinynotice("Thanks to your experience, you can examine it again to get a list of fish you can catch with it.") + +/obj/item/fishing_lure/examine_more(mob/user) + . = ..() + if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT)) + return + + var/list/known_fishes = list() + for(var/obj/item/fish/fish_type as anything in SSfishing.lure_catchables[type]) + if(initial(fish_type.show_in_catalog)) + known_fishes += initial(fish_type.name) + + if(!length(known_fishes)) + return + + . += span_info("You can catch the following fish with this lure: [english_list(known_fishes)].") + +///Check if the fish is in the list of catchable fish for this fishing lure. Return value is a multiplier. +/obj/item/fishing_lure/check_bait(obj/item/fish/fish_type) + var/multiplier = 0 + if(is_type_in_list(/obj/item/fishing_lure, SSfishing.fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT])) + multiplier += 2 + if(fish_type in SSfishing.lure_catchables[type]) + multiplier += 10 + return multiplier + +/obj/item/fishing_lure/plug + name = "big plug lure" + desc = "A fishing lure used to catch larger omnivore fish." + icon_state = "plug" + +/obj/item/fishing_lure/plug/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/avg_size = initial(fish_type.average_size) + if(avg_size <= FISH_SIZE_SMALL_MAX) + return FALSE + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater, /datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits)) + return FALSE + return TRUE + +/obj/item/fishing_lure/dropping + name = "plastic dropping" + desc = "A fishing lure to catch all sort of slimy, ratty, disgusting and/or junk-loving fish." + icon_state = "dropping" + spin_frequency = list(1.5 SECONDS, 2.5 SECONDS) + +/obj/item/fishing_lure/dropping/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/sources = list(/datum/fish_source/toilet, /datum/fish_source/moisture_trap) + for(var/datum/fish_source/source as anything in sources) + var/datum/fish_source/instance = GLOB.preset_fish_sources[/datum/fish_source/toilet] + if(fish_type in instance.fish_table) + return TRUE + var/list/fav_baits = fish_properties[FISH_PROPERTIES_FAV_BAIT] + for(var/list/identifier in fav_baits) + if(identifier[FISH_BAIT_TYPE] == FISH_BAIT_FOODTYPE && (identifier[FISH_BAIT_VALUE] & (JUNKFOOD|GROSS|TOXIC))) + return TRUE + if(initial(fish_type.beauty) <= FISH_BEAUTY_DISGUSTING) + return TRUE + return FALSE + +/obj/item/fishing_lure/spoon + name = "\improper Indy spoon lure" + desc = "A lustrous piece of metal mimicking the scales of a fish. Good for catching small to medium freshwater omnivore fish." + icon_state = "spoon" + spin_frequency = list(1.25 SECONDS, 2.1 SECONDS) + +/obj/item/fishing_lure/spoon/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/avg_size = initial(fish_type.average_size) + if(!ISINRANGE(avg_size, FISH_SIZE_TINY_MAX + 1, FISH_SIZE_NORMAL_MAX)) + return FALSE + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater, /datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits)) + return FALSE + var/fluid_type = initial(fish_type.required_fluid_type) + if(fluid_type == AQUARIUM_FLUID_FRESHWATER || fluid_type == AQUARIUM_FLUID_ANADROMOUS || fluid_type == AQUARIUM_FLUID_ANY_WATER) + return TRUE + if((/datum/fish_trait/amphibious in fish_traits) && fluid_type == AQUARIUM_FLUID_AIR) + return TRUE + return FALSE + +/obj/item/fishing_lure/artificial_fly + name = "\improper Silkbuzz artificial fly" + desc = "A fishing lure resembling a large wooly fly. Good for catching all sort of picky fish." + icon_state = "artificial_fly" + spin_frequency = list(1.1 SECONDS, 1.9 SECONDS) + +/obj/item/fishing_lure/artificial_fly/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(/datum/fish_trait/picky_eater in fish_traits) + return TRUE + return FALSE + +/obj/item/fishing_lure/led + name = "\improper LED fishing lure" + desc = "A heavy, waterproof and fish-looking LED stick, used to catch abyssal and demersal fish alike." + icon_state = "led" + spin_frequency = list(3 SECONDS, 3.75 SECONDS) + +/obj/item/fishing_lure/led/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_BAIT_IGNORE_ENVIRONMENT, INNATE_TRAIT) + update_appearance(UPDATE_OVERLAYS) + +/obj/item/fishing_lure/led/update_overlays() + . = ..() + . += emissive_appearance(icon, "led_emissive", src) + +/obj/item/fishing_lure/led/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(length(list(/datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits)) + return TRUE + return FALSE + +/obj/item/fishing_lure/lucky_coin + name = "\improper Maneki-Coin lure" + desc = "A faux-gold lure used to attract shiny-loving fish." + icon_state = "lucky_coin" + spin_frequency = list(1.5 SECONDS, 2.5 SECONDS) + +/obj/item/fishing_lure/lucky_coin/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(/datum/fish_trait/shiny_lover in fish_traits) + return TRUE + return FALSE + +/obj/item/fishing_lure/algae + name = "plastic algae lure" + desc = "A soft clump of fake algae used to attract herbivore water critters." + icon_state = "algae" + spin_frequency = list(3 SECONDS, 5 SECONDS) + +/obj/item/fishing_lure/algae/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(/datum/fish_trait/vegan in fish_traits) + return TRUE + return FALSE + +/obj/item/fishing_lure/grub + name = "\improper Twister Worm lure" + desc = "A soft plastic lure with the body of a grub and a twisting tail. Good for panfish and other small omnivore fish." + icon_state = "grub" + spin_frequency = list(1 SECONDS, 2.5 SECONDS) + +/obj/item/fishing_lure/grub/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + if(initial(fish_type.average_size) >= FISH_SIZE_SMALL_MAX) + return FALSE + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater) & fish_traits)) + return FALSE + return TRUE + +/obj/item/fishing_lure/buzzbait + name = "\improper Electric-Buzz lure" + desc = "A metallic, colored clanked attached to a series of cables that somehow attract shock-worthy fish." + icon_state = "buzzbait" + spin_frequency = list(0.8 SECONDS, 1.6 SECONDS) + +/obj/item/fishing_lure/buzzbait/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(/datum/fish_trait/electrogenesis in fish_traits) + return TRUE + return FALSE + +/obj/item/fishing_lure/spinnerbait + name = "spinnerbait lure" + desc = "A versatile lure, good for catching all sort of predatory freshwater fish." + icon_state = "spinnerbait" + spin_frequency = list(2 SECONDS, 4 SECONDS) + +/obj/item/fishing_lure/spinnerbait/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(!(/datum/fish_trait/predator in fish_traits)) + return FALSE + var/init_fluid_type = initial(fish_type.required_fluid_type) + if(init_fluid_type == AQUARIUM_FLUID_FRESHWATER || init_fluid_type == AQUARIUM_FLUID_ANADROMOUS || init_fluid_type == AQUARIUM_FLUID_ANY_WATER) + return TRUE + if((/datum/fish_trait/amphibious in fish_traits) && init_fluid_type == AQUARIUM_FLUID_AIR) //fluid type is changed to freshwater on init + return TRUE + return FALSE + +/obj/item/fishing_lure/daisy_chain + name = "daisy chain lure" + desc = "A lure resembling a small school of fish, good for catching several saltwater predators." + icon_state = "daisy_chain" + spin_frequency = list(2 SECONDS, 4 SECONDS) + +/obj/item/fishing_lure/daisy_chain/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties) + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] + if(!(/datum/fish_trait/predator in fish_traits)) + return FALSE + var/init_fluid_type = initial(fish_type.required_fluid_type) + if(init_fluid_type == AQUARIUM_FLUID_SALTWATER || init_fluid_type == AQUARIUM_FLUID_ANADROMOUS || init_fluid_type == AQUARIUM_FLUID_ANY_WATER) + return TRUE + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 6c13da95050..74d6ef84266 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -1,8 +1,18 @@ +<<<<<<< HEAD +======= +#define FISH_SAD 0 +#define FISH_NEUTRAL 1 +#define FISH_SATISFIED 2 +#define FISH_HAPPY 3 +#define FISH_VERY_HAPPY 4 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Fish path used for autogenerated fish /obj/item/fish name = "generic looking aquarium fish" desc = "very bland" icon = 'icons/obj/aquarium/fish.dmi' +<<<<<<< HEAD icon_state = "bugfish" lefthand_file = 'icons/mob/inhands/fish_lefthand.dmi' righthand_file = 'icons/mob/inhands/fish_righthand.dmi' @@ -34,6 +44,38 @@ var/dedicated_in_aquarium_icon_state /// If present aquarium visual will be this color +======= + lefthand_file = 'icons/mob/inhands/fish_lefthand.dmi' + righthand_file = 'icons/mob/inhands/fish_righthand.dmi' + force = 6 + throwforce = 6 + throw_range = 8 + attack_verb_continuous = list("slaps", "whacks") + attack_verb_simple = list("slap", "whack") + hitsound = SFX_DEFAULT_FISH_SLAP + drop_sound = 'sound/creatures/fish/fish_drop1.ogg' + pickup_sound = SFX_FISH_PICKUP + sound_vary = TRUE + ///The grind results of the fish. They scale with the weight of the fish. + grind_results = list(/datum/reagent/blood = 5, /datum/reagent/consumable/liquidgibs = 5) + obj_flags = UNIQUE_RENAME + item_flags = IMMUTABLE_SLOW|SLOWS_WHILE_IN_HAND + + /// width of aquarium visual icon + var/sprite_width + /// height of aquarium visual icon + var/sprite_height + + ///this icon file will be used for in-aquarium visual for the fish + var/dedicated_in_aquarium_icon = 'icons/obj/aquarium/fish.dmi' + /** + * The icon_state that will be used for in-aquarium visual for the fish + * If not set, "[initial(icon_state)]_small" will be used instead + */ + var/dedicated_in_aquarium_icon_state + + /// If present aquarium visual will be of this color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/aquarium_vc_color /// Required fluid type for this fish to live. @@ -91,8 +133,13 @@ */ var/list/fish_traits = list() +<<<<<<< HEAD /// Fishing behaviour var/fish_ai_type = FISH_AI_DUMB +======= + /// path to datums that dictate how the fish moves during the fishing minigame + var/fish_movement_type = /datum/fish_movement +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Base additive modifier to fishing difficulty var/fishing_difficulty_modifier = 0 @@ -119,6 +166,12 @@ /// Average weight for this fish type in grams var/average_weight = 1000 +<<<<<<< HEAD +======= + ///The general deviation from the average weight and size this fish has in the wild + var/weight_size_deviation = 0.2 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// When outside of an aquarium, these gases that are checked (as well as pressure and temp) to assert if the environment is safe or not. var/list/safe_air_limits = list( /datum/gas/oxygen = list(12, 100), @@ -139,6 +192,11 @@ /// The beauty this fish provides to the aquarium it's inserted in. var/beauty = FISH_BEAUTY_GENERIC +<<<<<<< HEAD +======= + ///have we recently pet this fish + var/recently_petted = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/Initialize(mapload, apply_qualities = TRUE) . = ..() @@ -198,9 +256,17 @@ if(HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISH)) . += span_notice("It's [size] cm long.") . += span_notice("It weighs [weight] g.") +<<<<<<< HEAD ///Randomizes weight and size. /obj/item/fish/proc/randomize_size_and_weight(base_size = average_size, base_weight = average_weight, deviation = 0.2) +======= + if(HAS_TRAIT(src, TRAIT_FISHING_BAIT)) + . += span_smallnoticeital("It can be used as a fishing bait.") + +///Randomizes weight and size. +/obj/item/fish/proc/randomize_size_and_weight(base_size = average_size, base_weight = average_weight, deviation = weight_size_deviation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/size_deviation = 0.2 * base_size var/new_size = round(clamp(gaussian(base_size, size_deviation), average_size * 1/MAX_FISH_DEVIATION_COEFF, average_size * MAX_FISH_DEVIATION_COEFF)) @@ -211,6 +277,7 @@ ///Updates weight and size, along with weight class, number of fillets you can get and grind results. /obj/item/fish/proc/update_size_and_weight(new_size = average_size, new_weight = average_weight) +<<<<<<< HEAD if(size && fillet_type) RemoveElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS, screentip_verb = "Cut") size = new_size @@ -230,19 +297,151 @@ if(FISH_SIZE_BULKY_MAX to INFINITY) inhand_icon_state = "fish_huge" update_weight_class(WEIGHT_CLASS_HUGE) +======= + SEND_SIGNAL(src, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, new_size, new_weight) + if(size) + if(fillet_type) + RemoveElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS * num_fillets, screentip_verb = "Cut") + if(size > FISH_SIZE_TWO_HANDS_REQUIRED) + qdel(GetComponent(/datum/component/two_handed)) + size = new_size + var/init_icon_state = initial(inhand_icon_state) + switch(size) + if(0 to FISH_SIZE_TINY_MAX) + update_weight_class(WEIGHT_CLASS_TINY) + if(!init_icon_state) + inhand_icon_state = "fish_small" + if(FISH_SIZE_TINY_MAX to FISH_SIZE_SMALL_MAX) + if(!init_icon_state) + inhand_icon_state = "fish_small" + update_weight_class(WEIGHT_CLASS_SMALL) + if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX) + if(!init_icon_state) + inhand_icon_state = "fish_normal" + update_weight_class(WEIGHT_CLASS_NORMAL) + if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX) + if(!init_icon_state) + inhand_icon_state = "fish_bulky" + update_weight_class(WEIGHT_CLASS_BULKY) + if(FISH_SIZE_BULKY_MAX to FISH_SIZE_HUGE_MAX) + if(!init_icon_state) + inhand_icon_state = "fish_huge" + update_weight_class(WEIGHT_CLASS_HUGE) + if(FISH_SIZE_HUGE_MAX to INFINITY) + if(!init_icon_state) + inhand_icon_state = "fish_huge" + update_weight_class(WEIGHT_CLASS_GIGANTIC) + + if(size > FISH_SIZE_TWO_HANDS_REQUIRED || (HAS_TRAIT(src, TRAIT_FISH_SHOULD_TWOHANDED) && w_class >= WEIGHT_CLASS_BULKY)) + inhand_icon_state = "[inhand_icon_state]_wielded" + AddComponent(/datum/component/two_handed, require_twohands = TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(fillet_type) var/init_fillets = initial(num_fillets) var/amount = max(round(init_fillets * size / FISH_FILLET_NUMBER_SIZE_DIVISOR, 1), 1) num_fillets = amount +<<<<<<< HEAD AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS, screentip_verb = "Cut") +======= + AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS * num_fillets, screentip_verb = "Cut") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(weight) for(var/reagent_type in grind_results) grind_results[reagent_type] /= FLOOR(weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR, 0.1) weight = new_weight +<<<<<<< HEAD for(var/reagent_type in grind_results) grind_results[reagent_type] *= FLOOR(weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR, 0.1) +======= + + if(weight >= FISH_WEIGHT_SLOWDOWN) + slowdown = round(((weight/FISH_WEIGHT_SLOWDOWN_DIVISOR)**FISH_WEIGHT_SLOWDOWN_EXPONENT)-1.3, 0.1) + drag_slowdown = round(slowdown * 0.5, 1) + else + slowdown = 0 + drag_slowdown = 0 + if(ismob(loc)) + var/mob/mob = loc + mob.update_equipment_speed_mods() + + for(var/reagent_type in grind_results) + grind_results[reagent_type] *= FLOOR(weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR, 0.1) + + update_fish_force() + +///Reset weapon-related variables of this items and recalculates those values based on the fish weight and size. +/obj/item/fish/proc/update_fish_force() + if(force >= 15 && hitsound == SFX_ALT_FISH_SLAP) + hitsound = SFX_DEFAULT_FISH_SLAP + force = initial(force) + throwforce = initial(throwforce) + throw_range = initial(throw_range) + demolition_mod = initial(demolition_mod) + attack_verb_continuous = initial(attack_verb_continuous) + attack_verb_simple = initial(attack_verb_simple) + hitsound = initial(hitsound) + damtype = initial(damtype) + attack_speed = initial(attack_speed) + block_chance = initial(block_chance) + armour_penetration = initial(armour_penetration) + wound_bonus = initial(wound_bonus) + bare_wound_bonus = initial(bare_wound_bonus) + toolspeed = initial(toolspeed) + + var/weight_rank = max(round(1 + log(2, weight/FISH_WEIGHT_FORCE_DIVISOR), 1), 1) + + throw_range -= weight_rank + get_force_rank() + + var/bonus_malus = weight_rank - w_class + if(bonus_malus) + calculate_fish_force_bonus(bonus_malus) + + throwforce = force + + SEND_SIGNAL(src, COMSIG_FISH_FORCE_UPDATED, weight_rank, bonus_malus) + + + if(material_flags & MATERIAL_EFFECTS) //struck by metal gen or something. + for(var/current_material in custom_materials) + var/datum/material/material = GET_MATERIAL_REF(current_material) + force *= material.strength_modifier + throwforce *= material.strength_modifier + if(material.item_sound_override) + hitsound = material.item_sound_override + + if(force >=15 && hitsound == SFX_DEFAULT_FISH_SLAP) // don't override special attack sounds + hitsound = SFX_ALT_FISH_SLAP // do more damage - do heavier slap sound + +///A proc that makes the fish slightly stronger or weaker if there's a noticeable discrepancy between size and weight. +/obj/item/fish/proc/calculate_fish_force_bonus(bonus_malus) + demolition_mod += bonus_malus * 0.1 + attack_speed += bonus_malus * 0.1 + force = round(force * (1 + bonus_malus * 0.1), 0.1) + +/obj/item/fish/proc/get_force_rank() + switch(w_class) + if(WEIGHT_CLASS_TINY) + force -= 3 + attack_speed -= 0.1 SECONDS + if(WEIGHT_CLASS_NORMAL) + force += 2 + if(WEIGHT_CLASS_BULKY) + force += 5 + attack_speed += 0.1 SECONDS + if(WEIGHT_CLASS_HUGE) + force += 9 + attack_speed += 0.2 SECONDS + demolition_mod += 0.2 + if(WEIGHT_CLASS_GIGANTIC) + force += 13 + attack_speed += 0.4 SECONDS + demolition_mod += 0.4 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * This proc has fish_traits list populated with fish_traits paths from three different lists: * traits from x_traits and y_traits are compared, and inserted if conditions are met; @@ -367,7 +566,11 @@ SEND_SIGNAL(src, COMSIG_FISH_LIFE, seconds_per_tick) +<<<<<<< HEAD /obj/item/fish/proc/set_status(new_status) +======= +/obj/item/fish/proc/set_status(new_status, silent = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(status == new_status) return switch(new_status) @@ -381,12 +584,23 @@ status = FISH_DEAD STOP_PROCESSING(SSobj, src) stop_flopping() +<<<<<<< HEAD var/message = span_notice(replacetext(death_text, "%SRC", "[src]")) if(isaquarium(loc)) loc.visible_message(message) else visible_message(message) update_appearance() +======= + if(!silent) + var/message = span_notice(replacetext(death_text, "%SRC", "[src]")) + if(isaquarium(loc)) + loc.visible_message(message) + else + visible_message(message) + update_appearance() + update_fish_force() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_FISH_STATUS_CHANGED) /obj/item/fish/expose_reagents(list/reagents, datum/reagents/source, methods = TOUCH, volume_modifier = 1, show_message = TRUE) @@ -473,7 +687,11 @@ return FALSE if(!being_targeted && length(aquarium.get_fishes()) >= AQUARIUM_MAX_BREEDING_POPULATION) return FALSE +<<<<<<< HEAD return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population > 1 && world.time >= breeding_wait +======= + return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population >= 1 && world.time >= breeding_wait +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/proc/try_to_reproduce() var/obj/structure/aquarium/aquarium = loc @@ -508,6 +726,7 @@ second_fish = other_fish break +<<<<<<< HEAD if(!second_fish && !HAS_TRAIT(src, TRAIT_FISH_SELF_REPRODUCE)) return FALSE @@ -538,6 +757,50 @@ chosen_type = pick(second_fish.type, type) else chosen_type = type +======= + if(!second_fish) + if(!HAS_TRAIT(src, TRAIT_FISH_SELF_REPRODUCE)) + return FALSE + if(length(aquarium.tracked_fish_by_type[type]) >= stable_population) + return FALSE + + if(PERFORM_ALL_TESTS(fish_breeding) && second_fish && !length(evolution_types)) + return create_offspring(second_fish.type, second_fish) + + var/chosen_type + var/datum/fish_evolution/chosen_evolution + var/list/possible_evolutions = list() + for(var/evolution_type in evolution_types) + var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type] + if(evolution.check_conditions(src, second_fish, aquarium)) + possible_evolutions += evolution + if(second_fish?.evolution_types) + var/secondary_evolutions = (second_fish.evolution_types - evolution_types) + for(var/evolution_type in secondary_evolutions) + var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type] + if(evolution.check_conditions(second_fish, src, aquarium)) + possible_evolutions += evolution + + if(length(possible_evolutions)) + chosen_evolution = pick(possible_evolutions) + chosen_type = chosen_evolution.new_fish_type + else if(second_fish) + var/recessive = HAS_TRAIT(src, TRAIT_FISH_RECESSIVE) + var/recessive_partner = HAS_TRAIT(second_fish, TRAIT_FISH_RECESSIVE) + if(length(aquarium.tracked_fish_by_type[type]) >= stable_population) + if(recessive_partner && !recessive) + return FALSE + chosen_type = second_fish.type + else + if(recessive && !recessive_partner) + chosen_type = second_fish.type + else if(recessive_partner && !recessive) + chosen_type = type + else + chosen_type = pick(second_fish.type, type) + else + chosen_type = type +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return create_offspring(chosen_type, second_fish, chosen_evolution) @@ -641,6 +904,34 @@ if(HAS_TRAIT(src, TRAIT_FISH_FROM_CASE)) //Avoid printing money by simply ordering fish and sending it back. calculated_price *= 0.05 return round(calculated_price) +<<<<<<< HEAD +======= +/obj/item/fish/proc/get_happiness_value() + var/happiness_value = 0 + if(recently_petted) + happiness_value++ + if(HAS_TRAIT(src, TRAIT_FISH_NO_HUNGER) || min((world.time - last_feeding) / feeding_frequency, 1) < 0.5) + happiness_value++ + var/obj/structure/aquarium/aquarium = loc + if(!istype(aquarium)) + return happiness_value + if(compatible_fluid_type(required_fluid_type, aquarium.fluid_type)) + happiness_value++ + if(ISINRANGE(aquarium.fluid_temp, required_temperature_min, required_temperature_max)) + happiness_value++ + return happiness_value + +/obj/item/fish/proc/pet_fish(mob/living/user) + if(recently_petted) + to_chat(user, span_warning("[src] runs away from your finger as you dip it into the water!")) + return + if(electrogenesis_power > 15 MEGA JOULES) + user.electrocute_act(5, src) //was it all worth it? + recently_petted = TRUE + SEND_SIGNAL(src, COMSIG_FISH_PETTED) + to_chat(user, span_notice("[src] dances around!")) + addtimer(VARSET_CALLBACK(src, recently_petted, FALSE), 30 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns random fish, using random_case_rarity probabilities. /proc/random_fish_type(required_fluid) diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm index ea9fcb47757..27f89a1f4d9 100644 --- a/code/modules/fishing/fish/chasm_detritus.dm +++ b/code/modules/fishing/fish/chasm_detritus.dm @@ -96,7 +96,11 @@ GLOBAL_LIST_INIT_TYPED(chasm_detritus_types, /datum/chasm_detritus, init_chasm_d /// This also includes all mobs fallen into chasms, regardless of distance /datum/chasm_detritus/restricted/bodies/get_chasm_contents(turf/fishing_spot) . = ..() +<<<<<<< HEAD . |= GLOB.chasm_fallen_mobs +======= + . |= GLOB.chasm_fallen_mobs[get_chasm_category(fishing_spot)] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Body detritus is selected in favor of bodies belonging to sentient mobs /// The first sentient body found in the list of contents is returned, otherwise diff --git a/code/modules/fishing/fish/fish_evolution.dm b/code/modules/fishing/fish/fish_evolution.dm index e6e2f1d9570..72c6dcb3ff3 100644 --- a/code/modules/fishing/fish/fish_evolution.dm +++ b/code/modules/fishing/fish/fish_evolution.dm @@ -78,6 +78,10 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio /datum/fish_evolution/purple_sludgefish probability = 5 new_fish_type = /obj/item/fish/sludgefish/purple +<<<<<<< HEAD +======= + new_traits = list(/datum/fish_trait/recessive) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 removed_traits = list(/datum/fish_trait/no_mating) /datum/fish_evolution/mastodon @@ -85,7 +89,11 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio probability = 40 new_fish_type = /obj/item/fish/mastodon new_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/predator, /datum/fish_trait/aggressive) +<<<<<<< HEAD conditions_note = "The fish (and its mate) need to be unusually big both in size and weight." +======= + conditions_note = "The fish (and its mate) needs to be unusually big both in size and weight." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium) if((source.size < 120 || source.weight < 3000) || (mate && (mate.size < 120 || mate.weight < 3000))) @@ -103,3 +111,26 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio new_fish_type = /obj/item/fish/chasm_crab/ice required_temperature_min = MIN_AQUARIUM_TEMP+9 required_temperature_max = MIN_AQUARIUM_TEMP+10 +<<<<<<< HEAD +======= + +/datum/fish_evolution/three_eyes + name = "Three-eyed Goldfish" + probability = 3 + new_fish_type = /obj/item/fish/goldfish/three_eyes + new_traits = list(/datum/fish_trait/recessive) + +/datum/fish_evolution/chainsawfish + name = "Chainsawfish" + probability = 30 + new_fish_type = /obj/item/fish/chainsawfish + new_traits = list(/datum/fish_trait/predator, /datum/fish_trait/aggressive) + conditions_note = "The fish needs to be unusually big and aggressive" + +/datum/fish_evolution/chainsawfish/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium) + var/double_avg_size = /obj/item/fish/goldfish::average_size * 2 + var/double_avg_weight = /obj/item/fish/goldfish::average_weight * 2 + if(source.size >= double_avg_size && source.weight >= double_avg_weight && (/datum/fish_trait/aggressive in source.fish_traits)) + return ..() + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm index 76b0cc8691c..56bc58807b7 100644 --- a/code/modules/fishing/fish/fish_traits.dm +++ b/code/modules/fishing/fish/fish_traits.dm @@ -37,6 +37,11 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) var/list/fish_whitelist /// Depending on the value, fish with trait will be reported as more or less difficult in the catalog. var/added_difficulty = 0 +<<<<<<< HEAD +======= + /// Reagents added to the fish when gained + var/list/reagents_to_add +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Difficulty modifier from this mod, needs to return a list with two values /datum/fish_trait/proc/difficulty_mod(obj/item/fishing_rod/rod, mob/fisherman) @@ -44,7 +49,11 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) return list(ADDITIVE_FISHING_MOD = 0, MULTIPLICATIVE_FISHING_MOD = 1) /// Catch weight table modifier from this mod, needs to return a list with two values +<<<<<<< HEAD /datum/fish_trait/proc/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) +======= +/datum/fish_trait/proc/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_CALL_PARENT(TRUE) return list(ADDITIVE_FISHING_MOD = 0, MULTIPLICATIVE_FISHING_MOD = 1) @@ -54,7 +63,15 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /// Applies some special qualities to the fish that has been spawned /datum/fish_trait/proc/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD return +======= + SHOULD_CALL_PARENT(TRUE) + if(reagents_to_add) + for(var/reagent in reagents_to_add) + add_to_reagents(fish, reagent, reagents_to_add[reagent]) + RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(process_reagents)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Applies some special qualities to basic mobs generated by fish (i.e. chasm chrab --> young lobstrosity --> lobstrosity). /datum/fish_trait/proc/apply_to_mob(mob/living/basic/mob) @@ -79,6 +96,40 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) fish.grind_results.Insert(1, reagent_type) fish.grind_results[reagent_type] = amount +<<<<<<< HEAD +======= +/// Proc that handles adding reagents from the trait to the fillets from butchered fish. +/datum/fish_trait/proc/process_reagents(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results) + SIGNAL_HANDLER + var/results_with_reagents = 0 + for(var/atom/result as anything in results) + if(result.reagents) + results_with_reagents++ + if(!results_with_reagents) + return + for(var/reagent in reagents_to_add) + var/amount = round(source.grind_results[reagent] / results_with_reagents, 0.1) + for(var/atom/result as anything in results) + result.reagents?.add_reagent(reagent, amount) + +/// Proc that adds or changes the venomous when the fish size and/or weight are updated +/datum/fish_trait/proc/add_venom(obj/item/fish/source, venom_path, new_weight, mult = 0.25) + if(source.size) + var/old_amount = max(round((source.weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * mult, 0.1), mult) + source.RemoveElement(/datum/element/venomous, venom_path, old_amount) + + var/new_amount = max(round((new_weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * mult, 0.1), mult) + source.AddElement(/datum/element/venomous, venom_path, new_amount) + +/// Proc that changes the venomous element based on if the fish is alive or dead (basically dead fish are weaker). +/datum/fish_trait/proc/change_venom_on_death(obj/item/fish/source, venom_path, live_mult, dead_mult) + var/live_amount = max(round((source.weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * live_mult, 0.1), live_mult) + var/dead_amount = max(round((source.weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * dead_mult, 0.1), dead_mult) + var/is_dead = source.status == FISH_DEAD + source.RemoveElement(/datum/element/venomous, venom_path, is_dead ? live_amount : dead_amount, thrown_effect = TRUE) + source.AddElement(/datum/element/venomous, venom_path, is_dead ? dead_amount : live_amount, thrown_effect = TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/wary name = "Wary" catalog_description = "This fish will avoid visible fish lines, cloaked line recommended." @@ -101,31 +152,58 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /datum/fish_trait/picky_eater name = "Picky Eater" +<<<<<<< HEAD catalog_description = "This fish is very picky and will ignore low quality bait." /datum/fish_trait/picky_eater/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) +======= + catalog_description = "This fish is very picky and will ignore low quality bait (unless it's amongst its favorites)." + +/datum/fish_trait/picky_eater/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!rod.bait) .[MULTIPLICATIVE_FISHING_MOD] = 0 return if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT)) return +<<<<<<< HEAD if(HAS_TRAIT(rod.bait, TRAIT_GOOD_QUALITY_BAIT) || HAS_TRAIT(rod.bait, TRAIT_GREAT_QUALITY_BAIT)) .[MULTIPLICATIVE_FISHING_MOD] = 0 +======= + if(is_matching_bait(rod.bait, SSfishing.fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT])) //we like this bait anyway + return + if(!HAS_TRAIT(rod.bait, TRAIT_GOOD_QUALITY_BAIT) && !HAS_TRAIT(rod.bait, TRAIT_GREAT_QUALITY_BAIT)) + .[MULTIPLICATIVE_FISHING_MOD] = 0 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/nocturnal name = "Nocturnal" catalog_description = "This fish avoids bright lights, fishing and storing in darkness recommended." +<<<<<<< HEAD /datum/fish_trait/nocturnal/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) . = ..() var/turf/turf = get_turf(fisherman) var/light_amount = turf.get_lumcount() +======= +/datum/fish_trait/nocturnal/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) + . = ..() + if(rod.bait && HAS_TRAIT(rod.bait, TRAIT_BAIT_IGNORE_ENVIRONMENT)) + return + var/turf/turf = get_turf(location) + var/light_amount = turf?.get_lumcount() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) .[MULTIPLICATIVE_FISHING_MOD] = 0 /datum/fish_trait/nocturnal/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(check_light)) /datum/fish_trait/nocturnal/proc/check_light(obj/item/fish/source, seconds_per_tick) @@ -157,7 +235,11 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) mob.apply_status_effect(/datum/status_effect/shadow_regeneration) /datum/fish_trait/heavy +<<<<<<< HEAD name = "Heavy" +======= + name = "Demersal" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 catalog_description = "This fish tends to stay near the waterbed." /datum/fish_trait/heavy/apply_to_mob(mob/living/basic/mob) @@ -170,14 +252,43 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) mob.obj_damage *= 1.3 /datum/fish_trait/heavy/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame) +<<<<<<< HEAD minigame.fish_idle_velocity -= 10 +======= + minigame.mover.fish_idle_velocity -= 10 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/carnivore name = "Carnivore" catalog_description = "This fish can only be baited with meat." incompatible_traits = list(/datum/fish_trait/vegan) +<<<<<<< HEAD /datum/fish_trait/carnivore/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) +======= +/datum/fish_trait/carnivore/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) + . = ..() + if(!rod.bait) + .[MULTIPLICATIVE_FISHING_MOD] = 0 + return + if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT)) + return + if(isfish(rod.bait)) + return + if(!istype(rod.bait, /obj/item/food)) + .[MULTIPLICATIVE_FISHING_MOD] = 0 + return + var/obj/item/food/food_bait = rod.bait + if(!(food_bait.foodtypes & (MEAT|SEAFOOD|BUGS))) + .[MULTIPLICATIVE_FISHING_MOD] = 0 + +/datum/fish_trait/vegan + name = "Herbivore" + catalog_description = "This fish can only be baited with fresh produce." + incompatible_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/necrophage) + +/datum/fish_trait/vegan/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!rod.bait) .[MULTIPLICATIVE_FISHING_MOD] = 0 @@ -187,6 +298,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) if(!istype(rod.bait, /obj/item/food)) .[MULTIPLICATIVE_FISHING_MOD] = 0 return +<<<<<<< HEAD var/obj/item/food/food_bait = rod.bait if(!(food_bait.foodtypes & MEAT)) .[MULTIPLICATIVE_FISHING_MOD] = 0 @@ -204,6 +316,12 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT)) return if(!istype(rod.bait, /obj/item/food/grown)) +======= + if(istype(rod.bait, /obj/item/food/grown)) + return + var/obj/item/food/food_bait = rod.bait + if(food_bait.foodtypes & (MEAT|SEAFOOD|GORE|BUGS|DAIRY) || !(food_bait.foodtypes & (VEGETABLES|FRUIT))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .[MULTIPLICATIVE_FISHING_MOD] = 0 /datum/fish_trait/emulsijack @@ -211,6 +329,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish emits an invisible toxin that emulsifies other fish for it to feed on." /datum/fish_trait/emulsijack/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(emulsify)) ADD_TRAIT(fish, TRAIT_RESIST_EMULSIFY, FISH_TRAIT_DATUM) @@ -250,6 +372,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/vegan) /datum/fish_trait/necrophage/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(eat_dead_fishes)) /datum/fish_trait/necrophage/proc/eat_dead_fishes(obj/item/fish/source, seconds_per_tick) @@ -269,6 +395,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) diff_traits_inheritability = 25 /datum/fish_trait/parthenogenesis/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_SELF_REPRODUCE, FISH_TRAIT_DATUM) /** @@ -282,8 +412,24 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/crossbreeder) /datum/fish_trait/no_mating/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD ADD_TRAIT(fish, TRAIT_FISH_NO_MATING, FISH_TRAIT_DATUM) +======= + . = ..() + ADD_TRAIT(fish, TRAIT_FISH_NO_MATING, FISH_TRAIT_DATUM) + +///Prevent offsprings of fish with this trait from being of the same type (unless self-mating or the partner also has the trait) +/datum/fish_trait/recessive + name = "Recessive" + catalog_description = "If crossbred, offsprings will always be of the mate species, unless it also possess the trait." + diff_traits_inheritability = 0 + +/datum/fish_trait/no_mating/apply_to_fish(obj/item/fish/fish) + . = ..() + ADD_TRAIT(fish, TRAIT_FISH_RECESSIVE, FISH_TRAIT_DATUM) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/revival diff_traits_inheritability = 15 name = "Self-Revival" @@ -291,6 +437,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) spontaneous_manifest_types = list(/obj/item/fish/boned = 100, /obj/item/fish/mastodon = 100) /datum/fish_trait/revival/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(check_status)) /datum/fish_trait/revival/proc/check_status(obj/item/fish/source) @@ -318,7 +468,17 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "It's a predatory fish. It'll hunt down and eat live fishes of smaller size when hungry." incompatible_traits = list(/datum/fish_trait/vegan) +<<<<<<< HEAD /datum/fish_trait/predator/apply_to_fish(obj/item/fish/fish) +======= +/datum/fish_trait/predator/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) + . = ..() + if(isfish(rod.bait)) + .[MULTIPLICATIVE_FISHING_MOD] *= 2 + +/datum/fish_trait/predator/apply_to_fish(obj/item/fish/fish) + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(eat_fishes)) /datum/fish_trait/predator/proc/eat_fishes(obj/item/fish/source, seconds_per_tick) @@ -327,7 +487,11 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) return var/obj/structure/aquarium/aquarium = source.loc for(var/obj/item/fish/victim in aquarium.get_fishes(TRUE, source)) +<<<<<<< HEAD if(victim.size < source.size * 0.75) // It's a big fish eat small fish world +======= + if(victim.size < source.size * 0.7) // It's a big fish eat small fish world +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(victim.status != FISH_ALIVE || victim == source || HAS_TRAIT(victim, TRAIT_YUCKY_FISH) || SPT_PROB(80, seconds_per_tick)) continue @@ -337,6 +501,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /datum/fish_trait/yucky name = "Yucky" catalog_description = "This fish tastes so repulsive, other fishes won't try to eat it." +<<<<<<< HEAD /datum/fish_trait/yucky/apply_to_fish(obj/item/fish/fish) RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_yuck)) @@ -362,6 +527,37 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) var/amount = source.grind_results[ /datum/reagent/toxin/tetrodotoxin] / length(results) for(var/atom/result as anything in results) result.reagents?.add_reagent(/datum/reagent/toxin/tetrodotoxin, amount) +======= + reagents_to_add = list(/datum/reagent/yuck = 3) + +/datum/fish_trait/yucky/apply_to_fish(obj/item/fish/fish) + . = ..() + ADD_TRAIT(fish, TRAIT_YUCKY_FISH, FISH_TRAIT_DATUM) + +/datum/fish_trait/toxic + name = "Toxic" + catalog_description = "This fish contains toxins. Feeding it to predatory fishes or people is not reccomended." + diff_traits_inheritability = 25 + reagents_to_add = list(/datum/reagent/toxin/tetrodotoxin = 2.5) + +/datum/fish_trait/toxic/apply_to_fish(obj/item/fish/fish) + . = ..() + RegisterSignal(fish, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, PROC_REF(make_venomous)) + RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(on_status_change)) + RegisterSignal(fish, COMSIG_FISH_EATEN_BY_OTHER_FISH, PROC_REF(on_eaten)) + +/datum/fish_trait/toxic/proc/make_venomous(obj/item/fish/source, new_size, new_weight) + SIGNAL_HANDLER + if(!HAS_TRAIT(source, TRAIT_FISH_STINGER)) + return + add_venom(source, /datum/reagent/toxin/tetrodotoxin, new_weight, mult = source.status == FISH_DEAD ? 0.1 : 0.25) + +/datum/fish_trait/toxic/proc/on_status_change(obj/item/fish/source) + SIGNAL_HANDLER + if(!HAS_TRAIT(source, TRAIT_FISH_STINGER)) + return + change_venom_on_death(source, /datum/reagent/toxin/tetrodotoxin, 0.25, 0.1) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/toxic/proc/on_eaten(obj/item/fish/source, obj/item/fish/predator) if(HAS_TRAIT(predator, TRAIT_FISH_TOXIN_IMMUNE)) @@ -388,6 +584,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) diff_traits_inheritability = 40 /datum/fish_trait/toxin_immunity/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_TOXIN_IMMUNE, FISH_TRAIT_DATUM) /datum/fish_trait/crossbreeder @@ -398,6 +598,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/no_mating) /datum/fish_trait/crossbreeder/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_CROSSBREEDER, FISH_TRAIT_DATUM) /datum/fish_trait/aggressive @@ -407,6 +611,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish is aggressively territorial, and may attack fish that come close to it." /datum/fish_trait/aggressive/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(try_attack_fish)) /datum/fish_trait/aggressive/proc/try_attack_fish(obj/item/fish/source, seconds_per_tick) @@ -431,6 +639,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) added_difficulty = 5 /datum/fish_trait/lubed/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish.AddComponent(/datum/component/slippery, 8 SECONDS, SLIDE|GALOSHES_DONT_HELP) /datum/fish_trait/lubed/apply_to_mob(mob/living/basic/mob) @@ -448,6 +660,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish has developed a primitive adaptation to life on both land and water." /datum/fish_trait/amphibious/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_AMPHIBIOUS, FISH_TRAIT_DATUM) if(fish.required_fluid_type == AQUARIUM_FLUID_AIR) fish.required_fluid_type = AQUARIUM_FLUID_FRESHWATER @@ -460,6 +676,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/predator, /datum/fish_trait/necrophage) /datum/fish_trait/mixotroph/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_NO_HUNGER, FISH_TRAIT_DATUM) /datum/fish_trait/antigrav @@ -467,12 +687,20 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) inheritability = 75 diff_traits_inheritability = 25 catalog_description = "This fish will invert the gravity of the bait at random. May fall upward outside after being caught." +<<<<<<< HEAD added_difficulty = 15 +======= + added_difficulty = 20 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/antigrav/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame) minigame.special_effects |= FISHING_MINIGAME_RULE_ANTIGRAV /datum/fish_trait/antigrav/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY) /datum/fish_trait/antigrav/apply_to_mob(mob/living/basic/mob) @@ -489,6 +717,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish tends to die of stress when forced to be around too many other fish." /datum/fish_trait/anxiety/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(on_fish_life)) ///signal sent when the anxiety fish is fed, killing it if sharing contents with too many fish. @@ -511,6 +743,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish is electroreceptive, and will generate electric fields. Can be harnessed inside a bioelectric generator." /datum/fish_trait/electrogenesis/apply_to_fish(obj/item/fish/fish) +<<<<<<< HEAD ADD_TRAIT(fish, TRAIT_FISH_ELECTROGENESIS, FISH_TRAIT_DATUM) RegisterSignal(fish, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack)) @@ -519,16 +752,29 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) if(fish.status == FISH_ALIVE) fish.force = 16 +======= + . = ..() + ADD_TRAIT(fish, TRAIT_FISH_ELECTROGENESIS, FISH_TRAIT_DATUM) + RegisterSignal(fish, COMSIG_FISH_FORCE_UPDATED, PROC_REF(on_force_updated)) + +/datum/fish_trait/electrogenesis/proc/on_force_updated(obj/item/fish/fish, weight_rank, bonus_or_malus) + SIGNAL_HANDLER + if(fish.status == FISH_ALIVE) + fish.force += 10 - fish.w_class +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish.damtype = BURN fish.attack_verb_continuous = list("shocks", "zaps") fish.attack_verb_simple = list("shock", "zap") fish.hitsound = 'sound/effects/sparks4.ogg' +<<<<<<< HEAD else fish.force = fish::force fish.damtype = fish::damtype fish.attack_verb_continuous = fish::attack_verb_continuous fish.attack_verb_simple = fish::attack_verb_simple fish.hitsound = fish::hitsound +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/electrogenesis/apply_to_mob(mob/living/basic/mob) . = ..() @@ -546,3 +792,104 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /datum/fish_trait/stunted/apply_to_mob(mob/living/basic/mob) . = ..() qdel(mob.GetComponent(/datum/component/growth_and_differentiation)) +<<<<<<< HEAD +======= + +/datum/fish_trait/stinger + name = "Stinger" + inheritability = 80 + diff_traits_inheritability = 35 + catalog_description = "This fish is equipped with a sharp stringer or bill capable of delivering damage and toxins." + spontaneous_manifest_types = list(/obj/item/fish/stingray = 100, /obj/item/fish/swordfish = 100, /obj/item/fish/chainsawfish = 100) + +/datum/fish_trait/stinger/apply_to_fish(obj/item/fish/fish) + . = ..() + ADD_TRAIT(fish, TRAIT_FISH_STINGER, FISH_TRAIT_DATUM) + RegisterSignal(fish, COMSIG_FISH_FORCE_UPDATED, PROC_REF(on_force_updated)) + +/datum/fish_trait/stinger/proc/on_force_updated(obj/item/fish/fish, weight_rank, bonus_or_malus) + SIGNAL_HANDLER + fish.force += 1 + fish.w_class + bonus_or_malus + +/datum/fish_trait/toxic_barbs + name = "Toxic Barbs" + catalog_description = "This fish' stinger, bill or otherwise, is coated with simple, yet effetive venom." + spontaneous_manifest_types = list(/obj/item/fish/stingray = 35) + +/datum/fish_trait/toxic_barbs/apply_to_fish(obj/item/fish/fish) + . = ..() + RegisterSignal(fish, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, PROC_REF(make_venomous)) + RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(on_status_change)) + +/datum/fish_trait/toxic_barbs/proc/make_venomous(obj/item/fish/source, new_size, new_weight) + SIGNAL_HANDLER + if(!HAS_TRAIT(source, TRAIT_FISH_STINGER)) + ///Remove the trait from the fish so it doesn't show on the analyzer as it doesn't do anything on stingerless ones. + source.fish_traits -= type + UnregisterSignal(source, list(COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, COMSIG_FISH_STATUS_CHANGED)) + return + add_venom(source, /datum/reagent/toxin/venom, new_weight, mult = source.status == FISH_DEAD ? 0.3 : 0.7) + +/datum/fish_trait/toxic_barbs/proc/on_status_change(obj/item/fish/source) + SIGNAL_HANDLER + if(!HAS_TRAIT(source, TRAIT_FISH_STINGER)) + return + change_venom_on_death(source, /datum/reagent/toxin/venom, 0.7, 0.3) + +/datum/fish_trait/ink + name = "Ink Production" + catalog_description = "This fish possess a sac that produces ink." + diff_traits_inheritability = 70 + spontaneous_manifest_types = list(/obj/item/fish/squid = 35) + +/datum/fish_trait/ink/apply_to_fish(obj/item/fish/fish) + . = ..() + RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(on_process)) + RegisterSignal(fish, COMSIG_ITEM_ATTACK_ZONE, PROC_REF(attacked_someone)) + +/datum/fish_trait/ink/proc/attacked_someone(obj/item/fish/source, mob/living/target, mob/living/user, zone) + SIGNAL_HANDLER + if(HAS_TRAIT(source, TRAIT_FISH_INK_ON_COOLDOWN) || source.status == FISH_DEAD) + return + if(!iscarbon(target) || target.get_bodypart(BODY_ZONE_HEAD)) + target.adjust_temp_blindness_up_to(4 SECONDS, 8 SECONDS) + target.adjust_confusion_up_to(1.5 SECONDS, 4 SECONDS) + target.AddComponent(/datum/component/face_decal/splat, \ + color = COLOR_NEARLY_ALL_BLACK, \ + memory_type = /datum/memory/witnessed_inking, \ + mood_event_type = /datum/mood_event/inked, \ + ) + target.visible_message(span_warning("[target] is inked by [source]!"), span_userdanger("You've been inked by [source]!")) + playsound(target, SFX_DESECRATION, 50, TRUE) + ADD_TRAIT(source, TRAIT_FISH_INK_ON_COOLDOWN, FISH_TRAIT_DATUM) + addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_FISH_INK_ON_COOLDOWN, FISH_TRAIT_DATUM), 9 SECONDS) + +/datum/fish_trait/ink/proc/on_process(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results) + SIGNAL_HANDLER + new /obj/item/food/ink_sac(source.drop_location()) + +/datum/fish_trait/camouflage + name = "Camouflage" + catalog_description = "This fish possess the ability to blend with its surroundings." + spontaneous_manifest_types = list(/obj/item/fish/squid = 35) + +/datum/fish_trait/camouflage/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame) + minigame.special_effects |= FISHING_MINIGAME_RULE_CAMO + +/datum/fish_trait/camouflage/apply_to_fish(obj/item/fish/fish) + . = ..() + RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(fade_out)) + RegisterSignals(fish, list(COMSIG_MOVABLE_MOVED, COMSIG_FISH_STATUS_CHANGED), PROC_REF(reset_alpha)) + +/datum/fish_trait/camouflage/proc/fade_out(obj/item/fish/source, seconds_per_tick) + SIGNAL_HANDLER + if(source.status == FISH_DEAD || source.last_move + 5 SECONDS >= world.time) + return + source.alpha = max(source.alpha - 10 * seconds_per_tick, 10) + +/datum/fish_trait/camouflage/proc/reset_alpha(obj/item/fish/source) + SIGNAL_HANDLER + var/init_alpha = initial(source.alpha) + if(init_alpha != source.alpha) + animate(source.alpha, alpha = init_alpha, time = 1.2 SECONDS, easing = CIRCULAR_EASING|EASE_OUT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/fishing/fish/types/air_space.dm b/code/modules/fishing/fish/types/air_space.dm new file mode 100644 index 00000000000..f3b985edfa7 --- /dev/null +++ b/code/modules/fishing/fish/types/air_space.dm @@ -0,0 +1,95 @@ +/obj/item/fish/sand_surfer + name = "sand surfer" + desc = "A bronze alien \"fish\" living and swimming underneath faraway sandy places." + icon_state = "sand_surfer" + sprite_height = 6 + sprite_width = 6 + stable_population = 5 + average_size = 65 + average_weight = 1100 + weight_size_deviation = 0.35 + random_case_rarity = FISH_RARITY_RARE + required_fluid_type = AQUARIUM_FLUID_AIR + required_temperature_min = MIN_AQUARIUM_TEMP+25 + required_temperature_max = MIN_AQUARIUM_TEMP+60 + fish_movement_type = /datum/fish_movement/plunger + fishing_difficulty_modifier = 5 + fish_traits = list(/datum/fish_trait/shiny_lover) + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/sand_crab + name = "burrower crab" + desc = "A sand-dwelling crustacean. It looks like a crab and tastes like a crab, but waddles like a fish." + icon_state = "crab" + dedicated_in_aquarium_icon_state = "crab_small" + sprite_height = 6 + sprite_width = 10 + average_size = 60 + average_weight = 1000 + weight_size_deviation = 0.1 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + required_temperature_min = MIN_AQUARIUM_TEMP+20 + required_temperature_max = MIN_AQUARIUM_TEMP+40 + fillet_type = /obj/item/food/meat/slab/rawcrab + fish_traits = list(/datum/fish_trait/amphibious, /datum/fish_trait/shiny_lover, /datum/fish_trait/carnivore) + fish_movement_type = /datum/fish_movement/slow + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = SEAFOOD, + ), + ) + +/obj/item/fish/bumpy + name = "bump-fish" + desc = "An misshapen fish-thing all covered in stubby little tendrils" + icon_state = "bumpy" + sprite_height = 4 + sprite_width = 5 + stable_population = 4 + required_fluid_type = AQUARIUM_FLUID_ANY_WATER + required_temperature_min = MIN_AQUARIUM_TEMP+15 + required_temperature_max = MIN_AQUARIUM_TEMP+40 + beauty = FISH_BEAUTY_BAD + fish_traits = list(/datum/fish_trait/amphibious, /datum/fish_trait/vegan) + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = VEGETABLES, + ), + ) + +/obj/item/fish/starfish + name = "cosmostarfish" + desc = "A peculiar, gravity-defying, echinoderm-looking critter from hyperspace." + icon_state = "starfish" + icon_state_dead = "starfish_dead" + sprite_height = 3 + sprite_width = 4 + average_size = 30 + average_weight = 300 + stable_population = 3 + required_fluid_type = AQUARIUM_FLUID_AIR + random_case_rarity = FISH_RARITY_NOPE + required_temperature_min = 0 + required_temperature_max = INFINITY + safe_air_limits = null + min_pressure = 0 + max_pressure = INFINITY + grind_results = list(/datum/reagent/bluespace = 10) + fillet_type = null + fish_traits = list(/datum/fish_trait/antigrav, /datum/fish_trait/mixotroph) + beauty = FISH_BEAUTY_GREAT + +/obj/item/fish/starfish/Initialize(mapload, apply_qualities = TRUE) + . = ..() + update_appearance(UPDATE_OVERLAYS) + +/obj/item/fish/starfish/update_overlays() + . = ..() + if(status == FISH_ALIVE) + . += emissive_appearance(icon, "starfish_emissive", src) + +///It spins, and dimly glows in the dark. +/obj/item/fish/starfish/flop_animation() + DO_FLOATING_ANIM(src) diff --git a/code/modules/fishing/fish/types/anadromous.dm b/code/modules/fishing/fish/types/anadromous.dm new file mode 100644 index 00000000000..ecdbda1fde7 --- /dev/null +++ b/code/modules/fishing/fish/types/anadromous.dm @@ -0,0 +1,62 @@ +/obj/item/fish/sockeye_salmon + name = "sockeye salmon" + desc = "A fairly common and iconic salmon endemic of the Pacific Ocean. At some point imported into outer space, where we're now." + icon_state = "sockeye" + sprite_width = 6 + sprite_height = 4 + stable_population = 6 + required_temperature_min = MIN_AQUARIUM_TEMP+3 + required_temperature_max = MIN_AQUARIUM_TEMP+19 + required_fluid_type = AQUARIUM_FLUID_ANADROMOUS + fillet_type = /obj/item/food/fishmeat/salmon + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/arctic_char + name = "arctic char" + desc = "A cold-water anadromous fish widespread around the Northern Hemisphere of Earth, yet it has somehow found a way here." + icon_state = "arctic_char" + sprite_width = 7 + sprite_height = 4 + stable_population = 6 + average_size = 60 + average_weight = 1200 + weight_size_deviation = 0.5 // known for their size dismophism + required_temperature_min = MIN_AQUARIUM_TEMP+3 + required_temperature_max = MIN_AQUARIUM_TEMP+19 + required_fluid_type = AQUARIUM_FLUID_ANADROMOUS + +/obj/item/fish/pike + name = "pike" + desc = "A long-bodied predator with a snout that almost looks like a beak. Definitely not a weapon to swing around." + icon = 'icons/obj/aquarium/wide.dmi' + icon_state = "pike" + inhand_icon_state = "pike" + base_pixel_x = -16 + pixel_x = -16 + stable_population = 4 + sprite_width = 10 + sprite_height = 3 + average_size = 100 + average_weight = 2000 + breeding_timeout = 4 MINUTES + health = 150 + beauty = FISH_BEAUTY_GOOD + required_fluid_type = AQUARIUM_FLUID_ANADROMOUS + random_case_rarity = FISH_RARITY_RARE + fish_movement_type = /datum/fish_movement/plunger + fishing_difficulty_modifier = 10 + required_temperature_min = MIN_AQUARIUM_TEMP+12 + required_temperature_max = MIN_AQUARIUM_TEMP+27 + fish_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive) + compatible_types = list(/obj/item/fish/pike/armored) + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = SEAFOOD|MEAT, + ), + /obj/item/fish, + ) + +/obj/item/fish/pike/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_FISH_SHOULD_TWOHANDED, INNATE_TRAIT) diff --git a/code/modules/fishing/fish/types/freshwater.dm b/code/modules/fishing/fish/types/freshwater.dm new file mode 100644 index 00000000000..129b738fc0a --- /dev/null +++ b/code/modules/fishing/fish/types/freshwater.dm @@ -0,0 +1,213 @@ +/obj/item/fish/goldfish + name = "goldfish" + desc = "Despite common belief, goldfish do not have three-second memories. \ + They can actually remember things that happened up to three months ago." + icon_state = "goldfish" + dedicated_in_aquarium_icon_state = "fish_greyscale" + aquarium_vc_color = "#D8540D" + sprite_width = 5 + sprite_height = 3 + stable_population = 9 + average_size = 20 + average_weight = 200 + weight_size_deviation = 0.35 + favorite_bait = list(/obj/item/food/bait/worm) + required_temperature_min = MIN_AQUARIUM_TEMP+18 + required_temperature_max = MIN_AQUARIUM_TEMP+26 + evolution_types = list(/datum/fish_evolution/three_eyes, /datum/fish_evolution/chainsawfish) + compatible_types = list(/obj/item/fish/goldfish/gill, /obj/item/fish/goldfish/three_eyes, /obj/item/fish/goldfish/three_eyes/gill) + +/obj/item/fish/goldfish/Initialize(mapload, apply_qualities = TRUE) + . = ..() + add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT), INNATE_TRAIT) + +/obj/item/fish/goldfish/gill + name = "McGill" + desc = "A great rubber duck tool for Lawyers who can't get a grasp over their case." + stable_population = 1 + random_case_rarity = FISH_RARITY_NOPE + show_in_catalog = FALSE + beauty = FISH_BEAUTY_GOOD + compatible_types = list(/obj/item/fish/goldfish, /obj/item/fish/goldfish/three_eyes) + fish_traits = list(/datum/fish_trait/recessive) + +/obj/item/fish/goldfish/three_eyes + name = "three-eyed goldfish" + desc = "A goldfish with an extra half a pair of eyes. You wonder what it's been feeding on lately..." + icon_state = "three_eyes" + stable_population = 4 + fish_traits = list(/datum/fish_trait/recessive, /datum/fish_trait/shiny_lover) + compatible_types = list(/obj/item/fish/goldfish, /obj/item/fish/goldfish/gill, /obj/item/fish/goldfish/three_eyes/gill) + beauty = FISH_BEAUTY_GOOD + fishing_difficulty_modifier = 10 + random_case_rarity = FISH_RARITY_VERY_RARE + food = /datum/reagent/toxin/mutagen + favorite_bait = list( + list( + "Type" = "Reagent", + "Value" = /datum/reagent/toxin/mutagen, + "Amount" = 3, + ), + ) + +/obj/item/fish/goldfish/three_eyes/gill + name = "McGill" + desc = "A great rubber duck tool for Lawyers who can't get a grasp over their case. It looks kinda different today..." + compatible_types = list(/obj/item/fish/goldfish, /obj/item/fish/goldfish/three_eyes) + beauty = FISH_BEAUTY_GREAT + show_in_catalog = FALSE + stable_population = 1 + random_case_rarity = FISH_RARITY_NOPE + +/obj/item/fish/angelfish + name = "angelfish" + desc = "Young Angelfish often live in groups, while adults prefer solitary life. They become territorial and aggressive toward other fish when they reach adulthood." + icon_state = "angelfish" + sprite_width = 4 + sprite_height = 7 + average_size = 30 + average_weight = 500 + stable_population = 3 + fish_traits = list(/datum/fish_trait/aggressive) + required_temperature_min = MIN_AQUARIUM_TEMP+22 + required_temperature_max = MIN_AQUARIUM_TEMP+30 + +/obj/item/fish/guppy + name = "guppy" + desc = "Guppy is also known as rainbow fish because of the brightly colored body and fins." + icon_state = "guppy" + sprite_width = 5 + sprite_height = 2 + sprite_width = 8 + sprite_height = 5 + average_size = 30 + average_weight = 500 + stable_population = 6 + required_temperature_min = MIN_AQUARIUM_TEMP+20 + required_temperature_max = MIN_AQUARIUM_TEMP+28 + +/obj/item/fish/plasmatetra + name = "plasma tetra" + desc = "Due to their small size, tetras are prey to many predators in their watery world, including eels, crustaceans, and invertebrates." + icon_state = "plastetra" + sprite_width = 4 + sprite_height = 2 + average_size = 30 + average_weight = 500 + stable_population = 3 + required_temperature_min = MIN_AQUARIUM_TEMP+20 + required_temperature_max = MIN_AQUARIUM_TEMP+28 + +/obj/item/fish/catfish + name = "catfish" + desc = "A catfish has about 100,000 taste buds, and their bodies are covered with them to help detect chemicals present in the water and also to respond to touch." + icon_state = "catfish" + sprite_width = 8 + sprite_height = 4 + average_size = 80 + average_weight = 1600 + weight_size_deviation = 0.35 + stable_population = 3 + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = JUNKFOOD + ) + ) + required_temperature_min = MIN_AQUARIUM_TEMP+12 + required_temperature_max = MIN_AQUARIUM_TEMP+30 + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/zipzap + name = "anxious zipzap" + desc = "A fish overflowing with crippling anxiety and electric potential. Worried about the walls of its tank closing in constantly. Both literally and as a general metaphorical unease about life's direction." + icon_state = "zipzap" + icon_state_dead = "zipzap_dead" + sprite_width = 6 + sprite_height = 3 + stable_population = 3 + average_size = 30 + average_weight = 500 + random_case_rarity = FISH_RARITY_VERY_RARE + favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead) + required_temperature_min = MIN_AQUARIUM_TEMP+18 + required_temperature_max = MIN_AQUARIUM_TEMP+26 + fish_traits = list( + /datum/fish_trait/no_mating, + /datum/fish_trait/wary, + /datum/fish_trait/anxiety, + /datum/fish_trait/electrogenesis, + ) + //anxiety naturally limits the amount of zipzaps per tank, so they are stronger alone + electrogenesis_power = 20 MEGA JOULES + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/tadpole + name = "tadpole" + desc = "The larval spawn of an amphibian. A very minuscle, round creature with a long tail it uses to swim around." + icon_state = "tadpole" + average_size = 3 + average_weight = 10 + sprite_width = 3 + sprite_height = 1 + health = 50 + feeding_frequency = 1.5 MINUTES + required_temperature_min = MIN_AQUARIUM_TEMP+15 + required_temperature_max = MIN_AQUARIUM_TEMP+20 + fillet_type = null + fish_traits = list(/datum/fish_trait/no_mating) //They grow into frogs and that's it. + beauty = FISH_BEAUTY_NULL + random_case_rarity = FISH_RARITY_NOPE //Why would you want generic frog tadpoles you get from ponds inside fish cases? + /// Once dead, tadpoles disappear after a dozen seconds, since you can get infinite tadpoles. + var/del_timerid + +/obj/item/fish/tadpole/Initialize(mapload, apply_qualities = TRUE) + . = ..() + AddComponent(/datum/component/fish_growth, /mob/living/basic/frog, 100 / rand(2.5, 3 MINUTES) * 10) + RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks)) + RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth)) + +/obj/item/fish/tadpole/set_status(new_status, silent = FALSE) + . = ..() + if(status == FISH_DEAD) + del_timerid = QDEL_IN_STOPPABLE(src, 12 SECONDS) + else + deltimer(del_timerid) + +/obj/item/fish/tadpole/proc/growth_checks(datum/source, seconds_per_tick) + SIGNAL_HANDLER + var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency) + if(hunger >= 0.7) //too hungry to grow + return COMPONENT_DONT_GROW + var/obj/structure/aquarium/aquarium = loc + if(!aquarium.allow_breeding) //the aquarium has breeding disabled + return COMPONENT_DONT_GROW + +/obj/item/fish/tadpole/proc/on_growth(datum/source, mob/living/basic/frog/result) + SIGNAL_HANDLER + playsound(result, result.attack_sound, 50, TRUE) // reeeeeeeeeeeeeee... + +/obj/item/fish/tadpole/get_export_price(price, percent) + return 2 //two credits. Tadpoles aren't really that valueable. + +/obj/item/fish/perch + name = "perch" + desc = "An all around popular panfish, game fish and unfortunate prey to other, bigger predators." + icon_state = "perch" + dedicated_in_aquarium_icon_state = "fish_greyscale" + aquarium_vc_color = "#9D8C64" + sprite_width = 5 + sprite_height = 3 + stable_population = 7 + average_size = 25 + average_weight = 400 + required_temperature_min = MIN_AQUARIUM_TEMP+5 + required_temperature_max = MIN_AQUARIUM_TEMP+26 + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = BUGS, + ), + /obj/item/fish, + /obj/item/fishing_lure, //they love lures in general. + ) diff --git a/code/modules/fishing/fish/types/holographic.dm b/code/modules/fishing/fish/types/holographic.dm new file mode 100644 index 00000000000..dfcdbeedb6b --- /dev/null +++ b/code/modules/fishing/fish/types/holographic.dm @@ -0,0 +1,108 @@ + +/obj/item/fish/holo + name = "holographic goldfish" + desc = "A holographic representation of a common goldfish, slowly flickering out, removed from its holo-habitat." + icon_state = /obj/item/fish/goldfish::icon_state + show_in_catalog = FALSE + random_case_rarity = FISH_RARITY_NOPE + dedicated_in_aquarium_icon_state = /obj/item/fish/goldfish::dedicated_in_aquarium_icon_state + aquarium_vc_color = /obj/item/fish/goldfish::aquarium_vc_color + sprite_width = /obj/item/fish/goldfish::sprite_width + sprite_height = /obj/item/fish/goldfish::sprite_height + stable_population = 1 + average_size = /obj/item/fish/goldfish::average_size + average_weight = /obj/item/fish/goldfish::average_weight + required_fluid_type = AQUARIUM_FLUID_ANADROMOUS + grind_results = null + fillet_type = null + death_text = "%SRC gently disappears." + fish_traits = list(/datum/fish_trait/no_mating) //just to be sure, these shouldn't reproduce + experisci_scannable = FALSE + beauty = /obj/item/fish/goldfish::beauty + +/obj/item/fish/holo/Initialize(mapload, apply_qualities = TRUE) + . = ..() + var/area/station/holodeck/holo_area = get_area(src) + if(!istype(holo_area)) + addtimer(CALLBACK(src, PROC_REF(set_status), FISH_DEAD), 1 MINUTES) + return + holo_area.linked.add_to_spawned(src) + +/obj/item/fish/holo/set_status(new_status, silent = FALSE) + . = ..() + if(status == FISH_DEAD) + animate(src, alpha = 0, 3 SECONDS, easing = SINE_EASING) + QDEL_IN(src, 3 SECONDS) + +/obj/item/fish/holo/crab + name = "holographic crab" + desc = "A holographic represantion of a soul-crushingly soulless crab, unlike the cuter ones occasionally roaming around. It stares at you, with empty, beady eyes." + icon_state = "crab" + dedicated_in_aquarium_icon_state = null + aquarium_vc_color = null + average_size = 30 + average_weight = 1000 + sprite_height = 6 + sprite_width = 10 + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/holo/puffer + name = "holographic pufferfish" + desc ="A holographic representation of 100% safe-to-eat pufferfish... that is, if holographic fishes were even edible." + icon_state = /obj/item/fish/pufferfish::icon_state + dedicated_in_aquarium_icon_state = /obj/item/fish/pufferfish::dedicated_in_aquarium_icon_state + aquarium_vc_color = /obj/item/fish/pufferfish::aquarium_vc_color + average_size = /obj/item/fish/pufferfish::average_size + average_weight = /obj/item/fish/pufferfish::average_weight + sprite_height = /obj/item/fish/pufferfish::sprite_height + sprite_width = /obj/item/fish/pufferfish::sprite_width + beauty = /obj/item/fish/pufferfish::beauty + +/obj/item/fish/holo/angel + name = "holographic angelfish" + desc = "A holographic representation of a angelfish. I got nothing snarky to say about this one." + icon_state = /obj/item/fish/angelfish::icon_state + dedicated_in_aquarium_icon_state = /obj/item/fish/angelfish::dedicated_in_aquarium_icon_state + aquarium_vc_color = /obj/item/fish/angelfish::aquarium_vc_color + average_size = /obj/item/fish/angelfish::average_size + average_weight = /obj/item/fish/angelfish::average_weight + sprite_height = /obj/item/fish/angelfish::sprite_height + sprite_width = /obj/item/fish/angelfish::sprite_width + beauty = /obj/item/fish/angelfish::beauty + +/obj/item/fish/holo/clown + name = "holographic clownfish" + icon_state = "holo_clownfish" + desc = "A holographic representation of a clownfish, or at least how they used to look like five centuries ago." + dedicated_in_aquarium_icon_state = null + aquarium_vc_color = /obj/item/fish/clownfish::aquarium_vc_color + average_size = /obj/item/fish/clownfish::average_size + average_weight = /obj/item/fish/clownfish::average_weight + sprite_height = /obj/item/fish/clownfish::sprite_height + sprite_width = /obj/item/fish/clownfish::sprite_width + required_fluid_type = /obj/item/fish/clownfish::required_fluid_type + beauty = /obj/item/fish/clownfish::beauty + +/obj/item/fish/holo/checkered + name = "unrendered holographic fish" + desc = "A checkered silhoutte of searing purple and pitch black presents itself before your eyes, like a tear in fabric of reality. It hurts to watch." + icon_state = "checkered" //it's a meta joke, buddy. + dedicated_in_aquarium_icon_state = null + aquarium_vc_color = null + average_size = 30 + average_weight = 500 + sprite_width = 4 + sprite_height = 3 + beauty = FISH_BEAUTY_NULL + +/obj/item/fish/holo/halffish + name = "holographic half-fish" + desc = "A holographic representation of... a fish reduced to all bones, except for its head. Isn't it supposed to be dead? Ehr, holo-dead?" + icon_state = "half_fish" + dedicated_in_aquarium_icon_state = null + aquarium_vc_color = null + sprite_height = 4 + sprite_width = 10 + average_size = 50 + average_weight = 500 + beauty = FISH_BEAUTY_UGLY diff --git a/code/modules/fishing/fish/types/mining.dm b/code/modules/fishing/fish/types/mining.dm new file mode 100644 index 00000000000..7614f259e59 --- /dev/null +++ b/code/modules/fishing/fish/types/mining.dm @@ -0,0 +1,198 @@ +/// Commonly found on the mining fishing spots. Can be grown into lobstrosities +/obj/item/fish/chasm_crab + name = "chasm chrab" + desc = "The young of the lobstrosity mature in pools below the earth, eating what falls in until large enough to clamber out. Those found near the station are well-fed." + icon_state = "chrab" + sprite_height = 9 + sprite_width = 8 + stable_population = 4 + feeding_frequency = 10 MINUTES + random_case_rarity = FISH_RARITY_RARE + fillet_type = /obj/item/food/meat/slab/rawcrab + required_temperature_min = MIN_AQUARIUM_TEMP+9 + required_temperature_max = LAVALAND_MAX_TEMPERATURE+50 + min_pressure = HAZARD_LOW_PRESSURE + safe_air_limits = list( + /datum/gas/oxygen = list(2, 100), + /datum/gas/nitrogen, + /datum/gas/carbon_dioxide = list(0, 20), + /datum/gas/water_vapor, + /datum/gas/plasma = list(0, 5), + /datum/gas/bz = list(0, 5), + /datum/gas/miasma = list(0, 5), + ) + evolution_types = list(/datum/fish_evolution/ice_chrab) + compatible_types = list(/obj/item/fish/chasm_crab/ice) + beauty = FISH_BEAUTY_GOOD + favorite_bait = list(/obj/item/fish/lavaloop) + ///This value represents how much the crab needs aren't being met. Higher values translate to a more likely hostile lobstrosity. + var/anger = 0 + ///The lobstrosity type this matures into + var/lob_type = /mob/living/basic/mining/lobstrosity/juvenile/lava + ///at which rate the crab gains maturation + var/growth_rate = 100 / (10 MINUTES) * 10 + +/obj/item/fish/chasm_crab/Initialize(mapload, apply_qualities = TRUE) + . = ..() + RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks)) + RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth)) + +///A chasm crab growth speed is determined by its initial weight and size, ergo bigger crabs for faster lobstrosities +/obj/item/fish/chasm_crab/update_size_and_weight(new_size = average_size, new_weight = average_weight) + . = ..() + var/multiplier = 1 + switch(size) + if(0 to FISH_SIZE_TINY_MAX) + multiplier -= 0.2 + if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX) + multiplier += 0.2 + if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX) + multiplier += 0.5 + if(FISH_SIZE_BULKY_MAX to INFINITY) + multiplier += 0.8 + + if(weight <= 800) + multiplier -= 0.1 * round((1000 - weight) / 200) + else if(weight >= 1500) + multiplier += min(0.1 * round((weight - 1000) / 500), 2) + + AddComponent(/datum/component/fish_growth, lob_type, initial(growth_rate) * multiplier) + +/obj/item/fish/chasm_crab/proc/growth_checks(datum/source, seconds_per_tick) + SIGNAL_HANDLER + var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency) + if(health <= initial(health) * 0.6 || hunger >= 0.6) //if too hurt or hungry, don't grow. + anger += growth_rate * 2 * seconds_per_tick + return COMPONENT_DONT_GROW + + if(hunger >= 0.4) //I'm hungry and angry + anger += growth_rate * 0.6 * seconds_per_tick + + if(!isaquarium(loc)) + return + + var/obj/structure/aquarium/aquarium = loc + if(!aquarium.allow_breeding) //the aquarium has breeding disabled + return COMPONENT_DONT_GROW + if(!locate(/obj/item/aquarium_prop) in aquarium) //the aquarium deco is quite barren + anger += growth_rate * 0.25 * seconds_per_tick + var/fish_count = length(aquarium.get_fishes()) + if(!ISINRANGE(fish_count, 3, AQUARIUM_MAX_BREEDING_POPULATION * 0.5)) //too lonely or overcrowded + anger += growth_rate * 0.3 * seconds_per_tick + if(fish_count > AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate. + return COMPONENT_DONT_GROW + +/obj/item/fish/chasm_crab/proc/on_growth(datum/source, mob/living/basic/mining/lobstrosity/juvenile/result) + SIGNAL_HANDLER + if(!prob(anger)) + result.AddElement(/datum/element/ai_retaliate) + qdel(result.ai_controller) + result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/calm(result) + else if(anger < 30) //not really that mad, just a bit unstable. + qdel(result.ai_controller) + result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/capricious(result) + +/obj/item/fish/chasm_crab/ice + name = "arctic chrab" + desc = "A subspecies of chasm chrabs that has adapted to the cold climate and lack of abysmal holes of the icemoon." + icon_state = "arctic_chrab" + required_temperature_min = ICEBOX_MIN_TEMPERATURE-20 + required_temperature_max = MIN_AQUARIUM_TEMP+15 + evolution_types = list(/datum/fish_evolution/chasm_chrab) + compatible_types = list(/obj/item/fish/chasm_crab) + beauty = FISH_BEAUTY_GREAT + lob_type = /mob/living/basic/mining/lobstrosity/juvenile + +/obj/item/fish/boned + name = "unmarine bonemass" + desc = "What one could mistake for fish remains, is in reality a species that chose to discard its weak flesh a long time ago. A living fossil, in its most literal sense." + icon_state = "bonemass" + sprite_width = 10 + sprite_height = 7 + fish_movement_type = /datum/fish_movement/zippy + random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS + required_fluid_type = AQUARIUM_FLUID_ANY_WATER + min_pressure = HAZARD_LOW_PRESSURE + health = 150 + stable_population = 3 + grind_results = list(/datum/reagent/bone_dust = 10) + fillet_type = /obj/item/stack/sheet/bone + num_fillets = 2 + fish_traits = list(/datum/fish_trait/revival, /datum/fish_trait/carnivore) + average_size = 70 + average_weight = 2000 + death_text = "%SRC stops moving." //It's dead... or is it? + evolution_types = list(/datum/fish_evolution/mastodon) + beauty = FISH_BEAUTY_UGLY + +/obj/item/fish/lavaloop + name = "lavaloop fish" + desc = "Due to its curvature, it can be used as make-shift boomerang." + icon_state = "lava_loop" + sprite_width = 3 + sprite_height = 5 + average_size = 30 + average_weight = 500 + resistance_flags = FIRE_PROOF | LAVA_PROOF + required_fluid_type = AQUARIUM_FLUID_ANY_WATER //if we can survive hot lava and freezing plasrivers, we can survive anything + fish_movement_type = /datum/fish_movement/zippy + min_pressure = HAZARD_LOW_PRESSURE + required_temperature_min = MIN_AQUARIUM_TEMP+30 + required_temperature_max = MIN_AQUARIUM_TEMP+35 + fish_traits = list( + /datum/fish_trait/carnivore, + /datum/fish_trait/heavy, + ) + hitsound = null + throwforce = 5 + beauty = FISH_BEAUTY_GOOD + ///maximum bonus damage when winded up + var/maximum_bonus = 25 + +/obj/item/fish/lavaloop/Initialize(mapload, apply_qualities = TRUE) + . = ..() + add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT, TRAIT_BYPASS_RANGED_ARMOR), INNATE_TRAIT) + AddComponent(/datum/component/boomerang, throw_range, TRUE) + AddComponent(\ + /datum/component/throwbonus_on_windup,\ + maximum_bonus = maximum_bonus,\ + windup_increment_speed = 2,\ + throw_text = "starts cooking in your hands, it may explode soon!",\ + pass_maximum_callback = CALLBACK(src, PROC_REF(explode_on_user)),\ + apply_bonus_callback = CALLBACK(src, PROC_REF(on_fish_land)),\ + sound_on_success = 'sound/weapons/parry.ogg',\ + effect_on_success = /obj/effect/temp_visual/guardian/phase,\ + ) + +/obj/item/fish/lavaloop/proc/explode_on_user(mob/living/user) + var/obj/item/bodypart/arm/active_arm = user.get_active_hand() + active_arm?.dismember() + to_chat(user, span_warning("[src] explodes!")) + playsound(src, 'sound/effects/explosion1.ogg', 40, TRUE) + user.flash_act(1, 1) + qdel(src) + +/obj/item/fish/lavaloop/proc/on_fish_land(mob/living/target, bonus_value) + if(!istype(target)) + return FALSE + return (target.mob_size >= MOB_SIZE_LARGE) + +/obj/item/fish/lavaloop/plasma_river + maximum_bonus = 30 + +/obj/item/fish/lavaloop/plasma_river/explode_on_user(mob/living/user) + playsound(src, 'sound/effects/explosion1.ogg', 40, TRUE) + user.flash_act(1, 1) + user.apply_status_effect(/datum/status_effect/ice_block_talisman, 5 SECONDS) + qdel(src) + +/obj/item/fish/lavaloop/plasma_river/on_fish_land(mob/living/target, bonus_value) + if(!istype(target)) + return FALSE + if(target.mob_size < MOB_SIZE_LARGE) + return FALSE + var/freeze_timer = (bonus_value * 0.1) + if(freeze_timer <= 0) + return FALSE + target.apply_status_effect(/datum/status_effect/ice_block_talisman, freeze_timer SECONDS) + return FALSE diff --git a/code/modules/fishing/fish/types/ruins.dm b/code/modules/fishing/fish/types/ruins.dm new file mode 100644 index 00000000000..da9e8388c0c --- /dev/null +++ b/code/modules/fishing/fish/types/ruins.dm @@ -0,0 +1,73 @@ +///From oil puddles from the elephant graveyard. Also an evolution of the "unmarine bonemass" +/obj/item/fish/mastodon + name = "unmarine mastodon" + desc = "A monster of exposed muscles and innards, wrapped in a fish-like skeleton. You don't remember ever seeing it on the catalog." + icon = 'icons/obj/aquarium/wide.dmi' + icon_state = "mastodon" + base_pixel_x = -16 + pixel_x = -16 + sprite_width = 12 + sprite_height = 7 + show_in_catalog = FALSE + random_case_rarity = FISH_RARITY_NOPE + fishing_difficulty_modifier = 30 + required_fluid_type = AQUARIUM_FLUID_ANY_WATER + min_pressure = HAZARD_LOW_PRESSURE + health = 300 + stable_population = 1 //This means they can only crossbreed. + grind_results = list(/datum/reagent/bone_dust = 5, /datum/reagent/consumable/liquidgibs = 5) + fillet_type = /obj/item/stack/sheet/bone + num_fillets = 2 + feeding_frequency = 2 MINUTES + breeding_timeout = 5 MINUTES + average_size = 180 + average_weight = 5000 + death_text = "%SRC stops moving." + fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/revival, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive) + beauty = FISH_BEAUTY_BAD + +///From the cursed spring +/obj/item/fish/soul + name = "soulfish" + desc = "A distant yet vaguely close critter, like a long lost relative. You feel your soul rejuvenated just from looking at it... Also, what the fuck is this shit?!" + icon_state = "soulfish" + sprite_width = 7 + sprite_height = 6 + average_size = 60 + average_weight = 1200 + stable_population = 4 + show_in_catalog = FALSE + beauty = FISH_BEAUTY_EXCELLENT + fish_movement_type = /datum/fish_movement/choppy //Glideless legacy movement? in my fishing minigame? + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = JUNKFOOD|FRIED, + ), + ) + fillet_type = /obj/item/food/meat/cutlet/plain/human + required_temperature_min = MIN_AQUARIUM_TEMP+3 + required_temperature_max = MIN_AQUARIUM_TEMP+38 + random_case_rarity = FISH_RARITY_NOPE + +///From the cursed spring +/obj/item/fish/skin_crab + name = "skin crab" + desc = "\"And on the eighth day, a demential mockery of both humanity and crabity was made.\" Fascinating." + icon_state = "skin_crab" + sprite_width = 7 + sprite_height = 6 + average_size = 40 + average_weight = 750 + stable_population = 5 + show_in_catalog = FALSE + beauty = FISH_BEAUTY_GREAT + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = JUNKFOOD|FRIED + ), + ) + fillet_type = /obj/item/food/meat/slab/rawcrab + random_case_rarity = FISH_RARITY_NOPE + diff --git a/code/modules/fishing/fish/types/saltwater.dm b/code/modules/fishing/fish/types/saltwater.dm new file mode 100644 index 00000000000..0271c7f3008 --- /dev/null +++ b/code/modules/fishing/fish/types/saltwater.dm @@ -0,0 +1,275 @@ +/obj/item/fish/clownfish + name = "clownfish" + desc = "Clownfish catch prey by swimming onto the reef, attracting larger fish, and luring them back to the anemone. The anemone will sting and eat the larger fish, leaving the remains for the clownfish." + icon_state = "clownfish" + required_fluid_type = AQUARIUM_FLUID_SALTWATER + sprite_width = 7 + sprite_height = 4 + average_size = 30 + average_weight = 500 + stable_population = 4 + fish_traits = list(/datum/fish_trait/picky_eater) + evolution_types = list(/datum/fish_evolution/lubefish) + compatible_types = list(/obj/item/fish/clownfish/lube) + required_temperature_min = MIN_AQUARIUM_TEMP+22 + required_temperature_max = MIN_AQUARIUM_TEMP+30 + +/obj/item/fish/clownfish/lube + name = "lubefish" + desc = "A clownfish exposed to cherry-flavored lube for far too long. First discovered the days following a cargo incident around the seas of Europa, when thousands of thousands of thousands..." + icon_state = "lubefish" + random_case_rarity = FISH_RARITY_VERY_RARE + fish_traits = list(/datum/fish_trait/picky_eater, /datum/fish_trait/lubed) + evolution_types = null + compatible_types = list(/obj/item/fish/clownfish) + food = /datum/reagent/lube + fishing_difficulty_modifier = 5 + beauty = FISH_BEAUTY_GREAT + +/obj/item/fish/cardinal + name = "cardinalfish" + desc = "Cardinalfish are often found near sea urchins, where the fish hide when threatened." + icon_state = "cardinalfish" + sprite_width = 6 + sprite_height = 3 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + average_size = 30 + average_weight = 500 + stable_population = 4 + fish_traits = list(/datum/fish_trait/vegan) + required_temperature_min = MIN_AQUARIUM_TEMP+22 + required_temperature_max = MIN_AQUARIUM_TEMP+30 + +/obj/item/fish/greenchromis + name = "green chromis" + desc = "The Chromis can vary in color from blue to green depending on the lighting and distance from the lights." + icon_state = "greenchromis" + sprite_width = 5 + sprite_height = 3 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + average_size = 30 + average_weight = 500 + stable_population = 5 + required_temperature_min = MIN_AQUARIUM_TEMP+23 + required_temperature_max = MIN_AQUARIUM_TEMP+28 + + fishing_difficulty_modifier = 5 // Bit harder + +/obj/item/fish/firefish + name = "firefish goby" + desc = "To communicate in the wild, the firefish uses its dorsal fin to alert others of potential danger." + icon_state = "firefish" + sprite_width = 5 + sprite_height = 3 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + average_size = 30 + average_weight = 500 + stable_population = 3 + disliked_bait = list(/obj/item/food/bait/worm, /obj/item/food/bait/doughball) + fish_movement_type = /datum/fish_movement/zippy + required_temperature_min = MIN_AQUARIUM_TEMP+23 + required_temperature_max = MIN_AQUARIUM_TEMP+28 + +/obj/item/fish/pufferfish + name = "pufferfish" + desc = "They say that one pufferfish contains enough toxins to kill 30 people, although in the last few decades they've been genetically engineered en masse to be less poisonous." + icon_state = "pufferfish" + required_fluid_type = AQUARIUM_FLUID_SALTWATER + sprite_width = 8 + sprite_height = 6 + average_size = 60 + average_weight = 1000 + stable_population = 3 + required_temperature_min = MIN_AQUARIUM_TEMP+23 + required_temperature_max = MIN_AQUARIUM_TEMP+28 + fillet_type = /obj/item/food/fishmeat/quality //Too bad they're poisonous + fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/toxic) + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/lanternfish + name = "lanternfish" + desc = "Typically found in areas below 6600 feet below the surface of the ocean, they live in complete darkness." + icon_state = "lanternfish" + required_fluid_type = AQUARIUM_FLUID_SALTWATER + random_case_rarity = FISH_RARITY_VERY_RARE + sprite_width = 6 + sprite_height = 5 + average_size = 50 + average_weight = 1000 + stable_population = 3 + fish_traits = list(/datum/fish_trait/nocturnal) + required_temperature_min = MIN_AQUARIUM_TEMP+2 //My source is that the water at a depth 6600 feet is pretty darn cold. + required_temperature_max = MIN_AQUARIUM_TEMP+18 + beauty = FISH_BEAUTY_NULL + +/obj/item/fish/stingray + name = "stingray" + desc = "A type of ray, most known for its venomous stinger. Despite that, They're normally docile, if not a bit easily frightened." + icon_state = "stingray" + stable_population = 4 + sprite_height = 7 + sprite_width = 8 + average_size = 60 + average_weight = 700 + beauty = FISH_BEAUTY_GREAT + random_case_rarity = FISH_RARITY_RARE + required_fluid_type = AQUARIUM_FLUID_SALTWATER //Someone ought to add river rays later I guess. + fish_traits = list(/datum/fish_trait/stinger, /datum/fish_trait/toxic_barbs, /datum/fish_trait/wary, /datum/fish_trait/carnivore, /datum/fish_trait/predator) + +/obj/item/fish/swordfish + name = "swordfish" + desc = "A large billfish, most famous for its elongated bill, while also fairly popular for cooking, and as a fearsome weapon in the hands of a veteran spess-fisherman." + icon = 'icons/obj/aquarium/wide.dmi' + icon_state = "swordfish" + inhand_icon_state = "swordfish" + force = 18 + sharpness = SHARP_EDGED + attack_verb_continuous = list("slashes", "cuts", "pierces") + attack_verb_simple = list("slash", "cut", "pierce") + block_sound = 'sound/weapons/parry.ogg' + hitsound = 'sound/weapons/rapierhit.ogg' + demolition_mod = 0.75 + attack_speed = 1 SECONDS + block_chance = 50 + wound_bonus = 10 + bare_wound_bonus = 20 + armour_penetration = 75 + base_pixel_x = -18 + pixel_x = -18 + sprite_width = 13 + sprite_height = 6 + stable_population = 3 + average_size = 140 + average_weight = 4000 + breeding_timeout = 4.5 MINUTES + feeding_frequency = 4 MINUTES + health = 180 + beauty = FISH_BEAUTY_EXCELLENT + random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS + required_fluid_type = AQUARIUM_FLUID_SALTWATER + fish_movement_type = /datum/fish_movement/plunger + fishing_difficulty_modifier = 25 + fillet_type = /obj/item/food/fishmeat/quality + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = SEAFOOD, + ), + /obj/item/fish, + ) + fish_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/stinger) + +/obj/item/fish/swordfish/get_force_rank() + switch(w_class) + if(WEIGHT_CLASS_TINY) + force -= 11 + attack_speed -= 0.4 SECONDS + block_chance -= 45 + armour_penetration -= 20 + wound_bonus -= 15 + bare_wound_bonus -= 20 + if(WEIGHT_CLASS_SMALL) + force -= 8 + attack_speed -= 0.3 SECONDS + block_chance -= 30 + armour_penetration -= 15 + wound_bonus -= 10 + bare_wound_bonus -= 20 + if(WEIGHT_CLASS_NORMAL) + force -= 5 + attack_speed -= 0.2 SECONDS + block_chance -= 20 + armour_penetration -= 10 + wound_bonus -= 10 + bare_wound_bonus -= 15 + if(WEIGHT_CLASS_BULKY) + force -= 3 + attack_speed -= 0.1 SECONDS + block_chance -= 10 + armour_penetration -= 5 + wound_bonus -= 5 + bare_wound_bonus -= 10 + if(WEIGHT_CLASS_GIGANTIC) + force += 5 + attack_speed += 0.2 SECONDS + demolition_mod += 0.15 + block_chance += 10 + armour_penetration += 5 + wound_bonus += 5 + bare_wound_bonus += 10 + + if(status == FISH_DEAD) + force -= 4 + w_class + block_chance -= 25 + armour_penetration -= 30 + wound_bonus -= 10 + bare_wound_bonus -= 10 + +/obj/item/fish/swordfish/calculate_fish_force_bonus(bonus_malus) + . = ..() + armour_penetration += bonus_malus * 5 + wound_bonus += bonus_malus * 3 + bare_wound_bonus += bonus_malus * 5 + block_chance += bonus_malus * 7 + +/obj/item/fish/squid + name = "squid" + desc = "An elongated mollusk with eight tentacles, natural camouflage and ink clouds to spray at predators. One of the most intelligent, well-equipped invertebrates out there." + icon_state = "squid" + sprite_width = 4 + sprite_height = 5 + stable_population = 6 + weight_size_deviation = 0.5 // They vary greatly in size. + average_weight = 500 //They're quite lighter than they're long. + required_fluid_type = AQUARIUM_FLUID_SALTWATER + beauty = FISH_BEAUTY_GOOD + required_temperature_min = MIN_AQUARIUM_TEMP+5 + required_temperature_max = MIN_AQUARIUM_TEMP+26 + fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/ink, /datum/fish_trait/camouflage, /datum/fish_trait/wary) + +/obj/item/fish/monkfish + name = "monkfish" + desc = "A member of the Lophiid family of anglerfish. It goes by several different names, however none of them will make it look any prettier, nor any less delicious." + icon_state = "monkfish" + required_fluid_type = AQUARIUM_FLUID_SALTWATER + sprite_height = 7 + sprite_width = 7 + beauty = FISH_BEAUTY_UGLY + required_temperature_min = MIN_AQUARIUM_TEMP+2 + required_temperature_max = MIN_AQUARIUM_TEMP+23 + average_size = 60 + average_weight = 1400 + stable_population = 4 + fish_traits = list(/datum/fish_trait/heavy) + fillet_type = /obj/item/food/fishmeat/quality + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = SEAFOOD|BUGS, + ), + ) + +/obj/item/fish/monkfish/Initialize(mapload, apply_qualities = TRUE) + . = ..() + name = pick("monkfish", "fishing-frog", "frog-fish", "sea-devil", "goosefish") + +/obj/item/fish/plaice + name = "plaice" + desc = "Perhaps the most prominent flatfish in the space-market. Nature really pulled out the rolling pin on this one." + icon_state = "plaice" + sprite_height = 7 + sprite_width = 6 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + required_temperature_min = MIN_AQUARIUM_TEMP+2 + required_temperature_max = MIN_AQUARIUM_TEMP+18 + average_size = 40 + average_weight = 700 + stable_population = 5 + fish_traits = list(/datum/fish_trait/heavy) + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = SEAFOOD|BUGS, + ), + ) + diff --git a/code/modules/fishing/fish/types/station.dm b/code/modules/fishing/fish/types/station.dm new file mode 100644 index 00000000000..8dd459452ab --- /dev/null +++ b/code/modules/fishing/fish/types/station.dm @@ -0,0 +1,80 @@ +/obj/item/fish/ratfish + name = "ratfish" + desc = "A rat exposed to the murky waters of maintenance too long. Any higher power, if it revealed itself, would state that the ratfish's continued existence is extremely unwelcome." + icon_state = "ratfish" + sprite_width = 7 + sprite_height = 5 + random_case_rarity = FISH_RARITY_RARE + required_fluid_type = AQUARIUM_FLUID_FRESHWATER + stable_population = 10 //set by New, but this is the default config value + fillet_type = /obj/item/food/meat/slab/human/mutant/zombie //eww... + fish_traits = list(/datum/fish_trait/necrophage) + required_temperature_min = MIN_AQUARIUM_TEMP+15 + required_temperature_max = MIN_AQUARIUM_TEMP+35 + fish_movement_type = /datum/fish_movement/zippy + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = DAIRY + ) + ) + beauty = FISH_BEAUTY_DISGUSTING + +/obj/item/fish/ratfish/Initialize(mapload, apply_qualities = TRUE) + . = ..() + //stable pop reflects the config for how many mice migrate. powerful... + stable_population = CONFIG_GET(number/mice_roundstart) + +/obj/item/fish/sludgefish + name = "sludgefish" + desc = "A misshapen, fragile, loosely fish-like living goop, the only thing that'd ever thrive in the acidic and claustrophobic cavities of the station's organic waste disposal system." + icon_state = "sludgefish" + sprite_width = 7 + sprite_height = 6 + required_fluid_type = AQUARIUM_FLUID_SULPHWATEVER + stable_population = 8 + average_size = 20 + average_weight = 400 + health = 50 + breeding_timeout = 2.5 MINUTES + fish_traits = list(/datum/fish_trait/parthenogenesis, /datum/fish_trait/no_mating) + required_temperature_min = MIN_AQUARIUM_TEMP+10 + required_temperature_max = MIN_AQUARIUM_TEMP+40 + evolution_types = list(/datum/fish_evolution/purple_sludgefish) + beauty = FISH_BEAUTY_NULL + +/obj/item/fish/sludgefish/purple + name = "purple sludgefish" + desc = "A misshapen, fragile, loosely fish-like living goop. This one has developed sexual reproduction mechanisms, and a purple tint to boot." + icon_state = "sludgefish_purple" + random_case_rarity = FISH_RARITY_NOPE + fish_traits = list(/datum/fish_trait/parthenogenesis) + +/obj/item/fish/slimefish + name = "acquatic slime" + desc = "Kids, this is what happens when a slime overcomes its hydrophobic nature. It goes glug glug." + icon_state = "slimefish" + icon_state_dead = "slimefish_dead" + sprite_width = 7 + sprite_height = 7 + do_flop_animation = FALSE //it already has a cute bouncy wiggle. :3 + random_case_rarity = FISH_RARITY_VERY_RARE + required_fluid_type = AQUARIUM_FLUID_ANADROMOUS + stable_population = 4 + health = 150 + fillet_type = /obj/item/slime_extract/grey + grind_results = list(/datum/reagent/toxin/slimejelly = 10) + fish_traits = list(/datum/fish_trait/toxin_immunity, /datum/fish_trait/crossbreeder) + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = TOXIC, + ), + list( + FISH_BAIT_TYPE = FISH_BAIT_REAGENT, + FISH_BAIT_VALUE = /datum/reagent/toxin, + FISH_BAIT_AMOUNT = 5, + ), + ) + required_temperature_min = MIN_AQUARIUM_TEMP+20 + beauty = FISH_BEAUTY_GREAT diff --git a/code/modules/fishing/fish/types/syndicate.dm b/code/modules/fishing/fish/types/syndicate.dm new file mode 100644 index 00000000000..a3e9a8519b4 --- /dev/null +++ b/code/modules/fishing/fish/types/syndicate.dm @@ -0,0 +1,256 @@ +///Contains fish that can be found in the syndicate fishing portal setting as well as the ominous fish case. +/obj/item/fish/emulsijack + name = "toxic emulsijack" + desc = "Ah, the terrifying emulsijack. Created in a laboratory, the only real use of this slimey, scaleless fish is for completely ruining a tank." + icon_state = "emulsijack" + random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS + required_fluid_type = AQUARIUM_FLUID_ANADROMOUS + stable_population = 3 + sprite_width = 7 + sprite_height = 3 + fish_traits = list(/datum/fish_trait/emulsijack) + required_temperature_min = MIN_AQUARIUM_TEMP+5 + required_temperature_max = MIN_AQUARIUM_TEMP+40 + beauty = FISH_BEAUTY_BAD + +/obj/item/fish/donkfish + name = "donk co. company patent donkfish" + desc = "A lab-grown donkfish. Its invention was an accident for the most part, as it was intended to be consumed in donk pockets. Unfortunately, it tastes horrible, so it has now become a pseudo-mascot." + icon_state = "donkfish" + random_case_rarity = FISH_RARITY_VERY_RARE + stable_population = 4 + sprite_width = 5 + sprite_height = 4 + fillet_type = /obj/item/food/fishmeat/donkfish + fish_traits = list(/datum/fish_trait/yucky) + required_temperature_min = MIN_AQUARIUM_TEMP+15 + required_temperature_max = MIN_AQUARIUM_TEMP+28 + beauty = FISH_BEAUTY_EXCELLENT + +/obj/item/fish/jumpercable + name = "monocloning jumpercable" + desc = "A surprisingly useful if nasty looking creation from the syndicate fish labs. Drop one in a tank, and \ + watch it self-feed and multiply. Generates more and more power as a growing swarm!" + icon_state = "jumpercable" + sprite_width = 16 + sprite_height = 5 + stable_population = 12 + average_size = 110 + average_weight = 6000 + random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS + required_temperature_min = MIN_AQUARIUM_TEMP+10 + required_temperature_max = MIN_AQUARIUM_TEMP+30 + favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead) + fish_traits = list( + /datum/fish_trait/parthenogenesis, + /datum/fish_trait/mixotroph, + /datum/fish_trait/electrogenesis, + ) + beauty = FISH_BEAUTY_UGLY + +/obj/item/fish/chainsawfish + name = "chainsawfish" + desc = "A very, very angry bioweapon, whose sole purpose is to rip and tear." + icon = 'icons/obj/aquarium/wide.dmi' + icon_state = "chainsawfish" + inhand_icon_state = "chainsawfish" + icon_state_dead = "chainsawfish_dead" + force = 22 + demolition_mod = 1.5 + block_chance = 15 + attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") + attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") + hitsound = 'sound/weapons/chainsawhit.ogg' + sharpness = SHARP_EDGED + tool_behaviour = TOOL_SAW + toolspeed = 0.5 + base_pixel_x = -16 + pixel_x = -16 + sprite_width = 8 + sprite_height = 5 + stable_population = 3 + average_size = 85 + average_weight = 2500 + breeding_timeout = 4.25 MINUTES + feeding_frequency = 3 MINUTES + health = 180 + beauty = FISH_BEAUTY_GREAT + random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS + required_fluid_type = AQUARIUM_FLUID_FRESHWATER + fish_movement_type = /datum/fish_movement/accelerando + fishing_difficulty_modifier = 30 + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = GORE, + ), + ) + fish_traits = list(/datum/fish_trait/aggressive, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/stinger) + required_temperature_min = MIN_AQUARIUM_TEMP+18 + required_temperature_max = MIN_AQUARIUM_TEMP+26 + +/obj/item/fish/chainsawfish/Initialize(mapload) + . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + +/obj/item/fish/chainsawfish/update_icon_state() + if(status == FISH_DEAD) + inhand_icon_state = "chainsawfish_dead" + else + inhand_icon_state = "chainsawfish" + if(HAS_TRAIT(src, TRAIT_WIELDED)) + inhand_icon_state = "[inhand_icon_state]_wielded" + return ..() + +/obj/item/fish/chainsawfish/get_force_rank() + switch(w_class) + if(WEIGHT_CLASS_TINY) + force -= 10 + attack_speed -= 0.2 SECONDS + demolition_mod -= 0.4 + block_chance -= 15 + armour_penetration -= 10 + wound_bonus -= 10 + bare_wound_bonus -= 10 + toolspeed += 0.6 + if(WEIGHT_CLASS_SMALL) + force -= 8 + attack_speed -= 0.1 SECONDS + demolition_mod -= 0.3 + block_chance -= 10 + armour_penetration -= 10 + wound_bonus -= 10 + bare_wound_bonus -= 10 + toolspeed += 0.4 + if(WEIGHT_CLASS_NORMAL) + force -= 5 + demolition_mod -= 0.15 + block_chance -= 5 + armour_penetration -= 5 + wound_bonus -= 5 + bare_wound_bonus -= 5 + toolspeed += 0.2 + if(WEIGHT_CLASS_HUGE) + force += 2 + attack_speed += 0.2 SECONDS + demolition_mod += 0.15 + armour_penetration += 10 + block_chance += 10 + wound_bonus += 10 + bare_wound_bonus += 5 + if(WEIGHT_CLASS_GIGANTIC) + force += 4 + attack_speed += 0.4 SECONDS + demolition_mod += 0.3 + block_chance += 20 + armour_penetration += 20 + wound_bonus += 15 + bare_wound_bonus += 10 + toolspeed -= 0.1 + + if(status == FISH_DEAD) + force -= 8 + w_class + hitsound = SFX_SWING_HIT + block_chance -= 25 + demolition_mod -= 0.3 + armour_penetration -= 15 + wound_bonus -= 5 + bare_wound_bonus -= 5 + toolspeed += 1 + +/obj/item/fish/chainsawfish/calculate_fish_force_bonus(bonus_malus) + . = ..() + armour_penetration += bonus_malus * 3 + wound_bonus += bonus_malus * 2 + bare_wound_bonus += bonus_malus * 3 + block_chance += bonus_malus * 2 + toolspeed -= bonus_malus * 0.1 + +/obj/item/fish/pike/armored + name = "armored pike" + desc = "A long-bodied, metal-clad predator with a snout that almost looks like an halberd. Definitely a weapon to swing around." + icon_state = "armored_pike" + inhand_icon_state = "armored_pike" + attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores") + attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore") + hitsound = 'sound/weapons/bladeslice.ogg' + block_sound = 'sound/weapons/parry.ogg' + force = 20 + sharpness = SHARP_EDGED + wound_bonus = -15 + attack_speed = 1 SECONDS + block_chance = 25 + bare_wound_bonus = 15 + demolition_mod = 0.8 + armour_penetration = 10 + stable_population = 3 + average_weight = 3000 + breeding_timeout = 5 MINUTES + feeding_frequency = 4 MINUTES + health = 180 + random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS + beauty = FISH_BEAUTY_GREAT + fishing_difficulty_modifier = 20 + fish_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive, /datum/fish_trait/picky_eater, /datum/fish_trait/stinger) + compatible_types = list(/obj/item/fish/pike) + favorite_bait = list( + list( + FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE, + FISH_BAIT_VALUE = SEAFOOD, + ), + /obj/item/fish, + ) + +/obj/item/fish/swordfish/get_force_rank() + switch(w_class) + if(WEIGHT_CLASS_TINY) + force -= 11 + attack_speed -= 0.4 SECONDS + block_chance -= 25 + armour_penetration -= 15 + wound_bonus -= 15 + bare_wound_bonus -= 30 + if(WEIGHT_CLASS_SMALL) + force -= 6 + attack_speed -= 0.3 SECONDS + block_chance -= 20 + armour_penetration -= 10 + wound_bonus -= 10 + bare_wound_bonus -= 25 + if(WEIGHT_CLASS_NORMAL) + force -= 4 + attack_speed -= 0.2 SECONDS + block_chance -= 20 + armour_penetration -= 5 + wound_bonus -= 10 + bare_wound_bonus -= 15 + if(WEIGHT_CLASS_HUGE) + force += 3 + attack_speed += 0.2 SECONDS + block_chance += 10 + demolition_mod += 0.1 + armour_penetration += 5 + wound_bonus += 10 + bare_wound_bonus += 5 + if(WEIGHT_CLASS_GIGANTIC) + force += 7 + attack_speed += 0.3 SECONDS + demolition_mod += 0.2 + block_chance += 20 + armour_penetration += 10 + wound_bonus += 15 + bare_wound_bonus += 10 + + if(status == FISH_DEAD) + force -= 5 + w_class + block_chance -= 15 + armour_penetration -= 10 + wound_bonus -= 5 + bare_wound_bonus -= 15 + +/obj/item/fish/pike/armored/calculate_fish_force_bonus(bonus_malus) + . = ..() + armour_penetration += bonus_malus * 3 + wound_bonus += bonus_malus * 2 + bare_wound_bonus += bonus_malus * 4 + block_chance += bonus_malus * 4 diff --git a/code/modules/fishing/fish/types/tiziran.dm b/code/modules/fishing/fish/types/tiziran.dm new file mode 100644 index 00000000000..a39e82ce6c4 --- /dev/null +++ b/code/modules/fishing/fish/types/tiziran.dm @@ -0,0 +1,69 @@ +//Tiziran Fish. + +/obj/item/fish/dwarf_moonfish + name = "dwarf moonfish" + desc = "Ordinarily in the wild, the Zagoskian moonfish is around the size of a tuna, however through selective breeding a smaller breed suitable for being kept as an aquarium pet has been created." + icon_state = "dwarf_moonfish" + sprite_height = 6 + sprite_width = 6 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + stable_population = 2 + fillet_type = /obj/item/food/fishmeat/moonfish + average_size = 60 + average_weight = 1000 + required_temperature_min = MIN_AQUARIUM_TEMP+20 + required_temperature_max = MIN_AQUARIUM_TEMP+30 + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/gunner_jellyfish + name = "gunner jellyfish" + desc = "So called due to their resemblance to an artillery shell, the gunner jellyfish is native to Tizira, where it is enjoyed as a delicacy. Produces a mild hallucinogen that is destroyed by cooking." + icon_state = "gunner_jellyfish" + sprite_height = 4 + sprite_width = 5 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + stable_population = 4 + fillet_type = /obj/item/food/fishmeat/gunner_jellyfish + required_temperature_min = MIN_AQUARIUM_TEMP+24 + required_temperature_max = MIN_AQUARIUM_TEMP+32 + beauty = FISH_BEAUTY_GOOD + +/obj/item/fish/needlefish + name = "needlefish" + desc = "A tiny, transparent fish which resides in large schools in the oceans of Tizira. A common food for other, larger fish." + icon_state = "needlefish" + sprite_height = 3 + sprite_width = 7 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + stable_population = 12 + breeding_timeout = 1 MINUTES + fillet_type = null + average_size = 20 + average_weight = 300 + fish_traits = list(/datum/fish_trait/carnivore) + required_temperature_min = MIN_AQUARIUM_TEMP+10 + required_temperature_max = MIN_AQUARIUM_TEMP+32 + +/obj/item/fish/needlefish/Initialize(mapload, apply_qualities = TRUE) + . = ..() + add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT), INNATE_TRAIT) + +/obj/item/fish/armorfish + name = "armorfish" + desc = "A small shellfish native to Tizira's oceans, known for its exceptionally hard shell. Consumed similarly to prawns." + icon_state = "armorfish" + sprite_height = 5 + sprite_width = 6 + average_size = 25 + average_weight = 350 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + stable_population = 10 + breeding_timeout = 1.25 MINUTES + fillet_type = /obj/item/food/fishmeat/armorfish + fish_movement_type = /datum/fish_movement/slow + required_temperature_min = MIN_AQUARIUM_TEMP+10 + required_temperature_max = MIN_AQUARIUM_TEMP+32 + +/obj/item/fish/armorfish/Initialize(mapload, apply_qualities = TRUE) + . = ..() + add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT), INNATE_TRAIT) diff --git a/code/modules/fishing/fish_catalog.dm b/code/modules/fishing/fish_catalog.dm index 49a84413ded..59b9e0426bc 100644 --- a/code/modules/fishing/fish_catalog.dm +++ b/code/modules/fishing/fish_catalog.dm @@ -90,7 +90,11 @@ if(source.catalog_description && (fish_type in source.fish_table)) spot_descriptions += source.catalog_description .["spots"] = english_list(spot_descriptions, nothing_text = "Unknown") +<<<<<<< HEAD var/list/fish_list_properties = collect_fish_properties() +======= + var/list/fish_list_properties = SSfishing.fish_properties +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/fav_bait = fish_list_properties[fishy][NAMEOF(fishy, favorite_bait)] var/list/disliked_bait = fish_list_properties[fishy][NAMEOF(fishy, disliked_bait)] var/list/bait_list = list() diff --git a/code/modules/fishing/fish_movement.dm b/code/modules/fishing/fish_movement.dm new file mode 100644 index 00000000000..a328903617f --- /dev/null +++ b/code/modules/fishing/fish_movement.dm @@ -0,0 +1,214 @@ +/// Any lower than this, and the target position of the fish is considered null +#define FISH_TARGET_MIN_DISTANCE 6 +/// The friction applied to fish jumps, so that it decelerates over time +#define FISH_FRICTION_MULT 0.9 +/// Used to decide whether the fish can jump in a certain direction +#define FISH_SHORT_JUMP_MIN_DISTANCE 100 +/// The maximum distance for a short jump +#define FISH_SHORT_JUMP_MAX_DISTANCE 200 + +///Fish movements are simple datums, generated by the fishing minigame, that represent how the fish moves suring the minigame. +/datum/fish_movement + /// The minigame that spawned us + var/datum/fishing_challenge/master + /// How many times move_fish() has been called + var/times_fired = 0 + /// How likely the fish is to perform a standard jump, then multiplied by difficulty + var/short_jump_chance = 2.25 + /// How likely the fish is to perform a long jump, then multiplied by difficulty + var/long_jump_chance = 0.0625 + /// The speed limit for the short jump + var/short_jump_velocity_limit = 400 + /// The speed limit for the long jump + var/long_jump_velocity_limit = 200 + /// The current speed limit used + var/current_velocity_limit + /// The base velocity of the fish, which may affect jump distances and falling speed. + var/fish_idle_velocity = 0 + /// A position on the slider the fish wants to get to + var/target_position + /// If true, the fish can jump while a target position is set, thus overriding it + var/can_interrupt_move = TRUE + /// The current speed the fish is moving at + var/fish_velocity = 0 + +/datum/fish_movement/New(datum/fishing_challenge/master) + src.master = master + +/** + * Proc that adjusts movement values to the difficulty of the minigame. + * The operations can be a tad complex, but basically it ensures that jump + * chances with a probability higher than 1% increase in a smooth curve so that + * they still reach 100% prob when the difficulty peakes. + */ +/datum/fish_movement/proc/adjust_to_difficulty() + var/square_angle_rad = TORADIANS(90) + var/zero_one_difficulty = master.difficulty/100 + if(short_jump_chance > 1) + short_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(short_jump_chance * 1/square_angle_rad))))*100 + else + short_jump_chance *= master.difficulty + if(long_jump_chance > 1) + long_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(long_jump_chance * 1/square_angle_rad))))*100 + else + long_jump_chance *= master.difficulty + +///The main proc, called by minigame every SSfishing tick while it's in the 'active' phase. +/datum/fish_movement/proc/move_fish(seconds_per_tick) + times_fired++ + /** + * The jump chances are meant to run every odd tick (each every decisecond) + * We cannot do it every tick because the fish would be jumpier than intended + * and we cannot cut the chances in half to fit on each tick, because the maximum probability + * would go from 100% to 75%. + */ + var/can_roll = times_fired % 2 + + var/long_chance = long_jump_chance * seconds_per_tick * (1/seconds_per_tick) + var/short_chance = short_jump_chance * seconds_per_tick * (1/seconds_per_tick) + + // If we have the target but we're close enough, mark as target reached + if(abs(target_position - master.fish_position) < FISH_TARGET_MIN_DISTANCE) + target_position = null + + // Switching to new long jump target can interrupt any other + if(can_roll && (can_interrupt_move || isnull(target_position)) && prob(long_chance)) + /** + * Move at least 0.75 to full of the availible bar in given direction, + * and more likely to move in the direction where there's more space + */ + var/distance_from_top = FISHING_MINIGAME_AREA - master.fish_position - master.fish_height + var/distance_from_bottom = master.fish_position + var/top_chance + if(distance_from_top < FISH_SHORT_JUMP_MIN_DISTANCE) + top_chance = 0 + else + top_chance = (distance_from_top/max(distance_from_bottom, 1)) * 100 + var/new_target = master.fish_position + if(prob(top_chance)) + new_target += distance_from_top * rand(75, 100)/100 + else + new_target -= distance_from_bottom * rand(75, 100)/100 + target_position = round(new_target) + current_velocity_limit = long_jump_velocity_limit + + // Move towards target + if(!isnull(target_position)) + var/distance = target_position - master.fish_position + // about 5 at diff 15 , 10 at diff 30, 30 at diff 100 + var/acceleration_mult = get_acceleration(seconds_per_tick) + var/target_acceleration = distance * acceleration_mult * seconds_per_tick + + fish_velocity = fish_velocity * FISH_FRICTION_MULT + target_acceleration + else if(can_roll && prob(short_chance)) + var/distance_from_top = FISHING_MINIGAME_AREA - master.fish_position - master.fish_height + var/distance_from_bottom = master.fish_position + var/jump_length + if(distance_from_top >= FISH_SHORT_JUMP_MIN_DISTANCE) + jump_length = rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE) + if(distance_from_bottom >= FISH_SHORT_JUMP_MIN_DISTANCE && (!jump_length || prob(50))) + jump_length = -rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE) + target_position = clamp(master.fish_position + jump_length, 0, FISHING_MINIGAME_AREA - master.fish_height) + current_velocity_limit = short_jump_velocity_limit + + fish_velocity = clamp(fish_velocity + fish_idle_velocity, -current_velocity_limit, current_velocity_limit) + set_fish_position(seconds_per_tick) + +///Proc that returns the acceleration of the fish during the minigame. +/datum/fish_movement/proc/get_acceleration(seconds_per_tick) + return 0.3 * master.difficulty + 0.5 + +///Called at the end of move_fish(), for updating the position of the fish in the fishing minigame. +/datum/fish_movement/proc/set_fish_position(seconds_per_tick) + master.fish_position = clamp(master.fish_position + fish_velocity * seconds_per_tick, 0, FISHING_MINIGAME_AREA - master.fish_height) + +///Generic fish movement datum that only performs slow, uninterrupted long jumps +/datum/fish_movement/slow + short_jump_chance = 0 + long_jump_chance = 1.5 + long_jump_velocity_limit = 150 + can_interrupt_move = FALSE + +///Generic fish movement datum with triple the short jump chance. +/datum/fish_movement/zippy + short_jump_chance = parent_type::short_jump_chance * 3 + +///fish movement datum that progressively gets faster until acceleration and velocity are double the starting ones. +/datum/fish_movement/accelerando + ///The jump velocity to add each tick + var/short_jump_vel_add + ///The long jump velocity to add each tick + var/long_jump_vel_add + ///Time to reach full speed, in seconds. + var/accel_time_cap = 30 + +/datum/fish_movement/accelerando/move_fish(seconds_per_tick) + var/seconds_elapsed = (times_fired * seconds_per_tick) + if(seconds_elapsed >= accel_time_cap) + return ..() + if(!times_fired) //First tick, cache the initial jump velocities + short_jump_vel_add = short_jump_velocity_limit/accel_time_cap + long_jump_vel_add = long_jump_velocity_limit/accel_time_cap + return ..() + + if(current_velocity_limit) + var/vel_add = current_velocity_limit == short_jump_velocity_limit ? short_jump_vel_add : long_jump_vel_add + current_velocity_limit += round(vel_add * seconds_per_tick, 0.01) + + short_jump_velocity_limit += round(short_jump_vel_add * seconds_per_tick, 0.01) + long_jump_velocity_limit += round(long_jump_vel_add * seconds_per_tick, 0.01) + return ..() + +/datum/fish_movement/accelerando/get_acceleration(seconds_per_tick) + var/acceleration = ..() + return acceleration + min(acceleration, acceleration * times_fired * seconds_per_tick / accel_time_cap) + +/datum/fish_movement/accelerando/set_fish_position(seconds_per_tick) + fish_velocity = round(fish_velocity) + return ..() + +///Fish movement datum that updates the fish position twice per second. +/datum/fish_movement/choppy + ///We keep of the theorical fish position to eventually use + var/faux_position = 0 + +/datum/fish_movement/choppy/set_fish_position(seconds_per_tick) + faux_position = clamp(faux_position + fish_velocity * seconds_per_tick, 0, FISHING_MINIGAME_AREA - master.fish_height) + if(!((times_fired * SSfishing.wait) % (0.5 SECONDS))) + master.fish_position = faux_position + +///Fish movement datum that weakly pushes the fish up and then down with greater force once it reaches the top of the minigame. +/datum/fish_movement/plunger + ///Is the fish plunging to the bottom of the minigame area, or should it swim up? + var/is_plunging = TRUE + ///The added idle velocity when plunging + var/plunging_speed = -22 + +/datum/fish_movement/plunger/adjust_to_difficulty() + . = ..() + //Adjust the fleeing velocity, up to five times the initial value. + plunging_speed += round(plunging_speed * master.difficulty * 0.03) + fish_idle_velocity += plunging_speed //so it can be safely subtracted if the fish starts at the bottom. + +/datum/fish_movement/plunger/move_fish(seconds_per_tick) + var/fish_area = FISHING_MINIGAME_AREA - master.fish_height + if(is_plunging) + if(target_position > master.fish_position) //nothing should stop us from plunging. + target_position = null + var/dist_bot_percent = master.fish_position/fish_area + if(dist_bot_percent <= 0.04) + fish_idle_velocity -= plunging_speed + is_plunging = FALSE + else + var/dist_top_percent = (fish_area - master.fish_position)/fish_area + if(dist_top_percent <= 0.04) + fish_idle_velocity += plunging_speed + is_plunging = TRUE + + return ..() + + +#undef FISH_TARGET_MIN_DISTANCE +#undef FISH_FRICTION_MULT +#undef FISH_SHORT_JUMP_MIN_DISTANCE +#undef FISH_SHORT_JUMP_MAX_DISTANCE diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index 5408e411876..8a09a38a8bc 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -52,7 +52,11 @@ */ /obj/item/fishing_line/auto_reel name = "fishing line auto-reel" +<<<<<<< HEAD desc = "A fishing line that automatically starts reeling in fish the moment they bite. Also good for hurling things at yourself." +======= + desc = "A fishing line that automatically spins lures and begins reeling in fish the moment it bites. Also good for hurling things towards you." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "reel_auto" fishing_line_traits = FISHING_LINE_AUTOREEL line_color = "#F88414" @@ -163,6 +167,23 @@ rod_overlay_icon_state = "hook_treasure_overlay" chasm_detritus_type = /datum/chasm_detritus/restricted/objects +<<<<<<< HEAD +======= +/obj/item/fishing_hook/magnet/Initialize(mapload) + . = ..() + RegisterSignal(src, COMSIG_FISHING_EQUIPMENT_SLOTTED, PROC_REF(hook_equipped)) + +///We make sure that the fishng rod doesn't need a bait to reliably catch non-fish loot. +/obj/item/fishing_hook/magnet/proc/hook_equipped(datum/source, obj/item/fishing_rod/rod) + SIGNAL_HANDLER + ADD_TRAIT(rod, TRAIT_ROD_REMOVE_FISHING_DUD, type) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_removed)) + +/obj/item/fishing_hook/magnet/proc/on_removed(atom/movable/source, atom/old_loc, dir, forced) + SIGNAL_HANDLER + REMOVE_TRAIT(old_loc, TRAIT_ROD_REMOVE_FISHING_DUD, type) + UnregisterSignal(src, COMSIG_MOVABLE_MOVED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_hook/magnet/get_hook_bonus_multiplicative(fish_type, datum/fish_source/source) if(fish_type == FISHING_DUD || ispath(fish_type, /obj/item/fish)) @@ -171,7 +192,10 @@ // We multiply the odds by five for everything that's not a fish nor a dud return MAGNET_HOOK_BONUS_MULTIPLIER +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_hook/shiny name = "shiny lure hook" icon_state = "gold_shiny" @@ -364,5 +388,45 @@ new /obj/item/storage/fish_case(src) new /obj/item/storage/fish_case(src) +<<<<<<< HEAD +======= +/obj/item/storage/box/fishing_lures + name = "fishing lures set" + desc = "A small tackle box containing all the fishing lures you will ever need to curb randomness." + icon_state = "plasticbox" + foldable_result = null + illustration = "fish" + +/obj/item/storage/box/fishing_lures/PopulateContents() + new /obj/item/paper/lures_instructions(src) + var/list/typesof = typesof(/obj/item/fishing_lure) + for(var/type in typesof) + new type (src) + atom_storage.set_holdable(/obj/item/fishing_lure) //can only hold lures + //adds an extra slot, so we can put back the lures even if we didn't take out the instructions. + atom_storage.max_slots = length(typesof) + 1 + atom_storage.max_total_storage = WEIGHT_CLASS_SMALL * (atom_storage.max_slots + 1) + +/obj/item/paper/lures_instructions + name = "instructions paper" + icon_state = "slipfull" + show_written_words = FALSE + desc = "A piece of grey paper with an how-to for dummies about fishing lures printed on it. Smells cheap." + default_raw_text = "Thank you for buying this set.
\ + This a simple non-exhaustive set of instructions on how to use fishing lures, some information may \ + be slightly incorrect or oversimplified.

\ + + First and foremost, fishing lures are inedible, artificia baits, fairly sturdy so that \ + they won't be destroyed by the hungry fish. However, they need to be spun at intervals to replicate \ + the motion of a prey or organic bait to tempt the fish, since a piece of plastic and metal ins't \ + by itself all that tasty. Different lures can be used to catch different fish.

\ + + To help you, each lure comes with a small light that's attached to the float of your fishing rod. \ + For those who don't know it, the float is basically the thing bobbing up'n'down above the fishing spot. \ + The light will flash green and a sound cue will be played when the bait is ready to be spun. \ + Do not spin while the light is still red.

\ + That's all, best of luck to your angling journey.

" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAGNET_HOOK_BONUS_MULTIPLIER #undef RESCUE_HOOK_FISH_MULTIPLIER diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm index 9c70d474a62..fc34ddde4d4 100644 --- a/code/modules/fishing/fishing_minigame.dm +++ b/code/modules/fishing/fishing_minigame.dm @@ -1,10 +1,15 @@ +<<<<<<< HEAD // Lure bobbing +======= +// float bobbing +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define WAIT_PHASE 1 // Click now to start tgui part #define BITING_PHASE 2 // UI minigame phase #define MINIGAME_PHASE 3 +<<<<<<< HEAD /// The height of the minigame slider. Not in pixels, but minigame units. #define FISHING_MINIGAME_AREA 1000 /// Any lower than this, and the target position of the fish is considered null @@ -15,6 +20,8 @@ #define FISH_SHORT_JUMP_MIN_DISTANCE 100 /// The maximum distance for a short jump #define FISH_SHORT_JUMP_MAX_DISTANCE 200 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Acceleration mod when bait is over fish #define FISH_ON_BAIT_ACCELERATION_MULT 0.6 /// The minimum velocity required for the bait to bounce @@ -47,8 +54,11 @@ var/start_time /// Is it finished (either by win/lose or window closing) var/completed = FALSE +<<<<<<< HEAD /// Fish AI type to use var/fish_ai = FISH_AI_DUMB +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Rule modifiers (eg weighted bait) var/special_effects = NONE /// A list of possible active minigame effects. If not empty, one will be picked from time to time. @@ -65,16 +75,30 @@ var/phase = WAIT_PHASE // Timer for the next phase var/next_phase_timer +<<<<<<< HEAD +======= + // The last time we clicked during the baiting phase + var/last_baiting_click +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fishing mob var/mob/user /// Rod that is used for the challenge var/obj/item/fishing_rod/used_rod +<<<<<<< HEAD /// Lure visual var/obj/effect/fishing_lure/lure /// Background icon state from fishing_hud.dmi var/background = "background_default" /// Fish icon state from fishing_hud.dmi var/fish_icon = "fish" +======= + /// float visual + var/obj/effect/fishing_float/float + /// Background icon state from fishing_hud.dmi + var/background = "background_default" + /// Fish icon state from fishing_hud.dmi + var/fish_icon = FISH_ICON_DEF +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fishing line visual var/datum/beam/fishing_line @@ -93,8 +117,11 @@ var/fish_position = 0 /// The position of the bait on the minigame slider var/bait_position = 0 +<<<<<<< HEAD /// The current speed the fish is moving at var/fish_velocity = 0 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The current speed the bait is moving at var/bait_velocity = 0 @@ -105,6 +132,7 @@ /// How much completion is gained per second when the bait area is intersecting with the fish's var/completion_gain = 5 +<<<<<<< HEAD /// How likely the fish is to perform a standard jump, then multiplied by difficulty var/short_jump_chance = 2.25 /// How likely the fish is to perform a long jump, then multiplied by difficulty @@ -121,6 +149,9 @@ var/target_position /// If true, the fish can jump while a target position is set, thus overriding it var/can_interrupt_move = TRUE +======= + var/datum/fish_movement/mover +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Whether the bait is idle or reeling up or down (left and right click) var/reeling_state = REELING_STATE_IDLE @@ -139,11 +170,17 @@ src.reward_path = reward_path src.used_rod = rod var/atom/spot = comp.parent +<<<<<<< HEAD lure = new(get_turf(spot), spot) +======= + float = new(get_turf(spot), spot) + float.spin_frequency = rod.spin_frequency +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(spot, COMSIG_QDELETING, PROC_REF(on_spot_gone)) RegisterSignal(comp.fish_source, COMSIG_FISHING_SOURCE_INTERRUPT_CHALLENGE, PROC_REF(interrupt_challenge)) comp.fish_source.RegisterSignal(src, COMSIG_FISHING_CHALLENGE_COMPLETED, TYPE_PROC_REF(/datum/fish_source, on_challenge_completed)) background = comp.fish_source.background +<<<<<<< HEAD /// Fish minigame properties if(ispath(reward_path,/obj/item/fish)) var/obj/item/fish/fish = reward_path @@ -158,10 +195,26 @@ long_jump_velocity_limit = FALSE // Apply fish trait modifiers var/list/fish_list_properties = collect_fish_properties() +======= + + /// Fish minigame properties + if(ispath(reward_path,/obj/item/fish)) + var/obj/item/fish/fish = reward_path + var/movement_path = initial(fish.fish_movement_type) + mover = new movement_path(src) + // Apply fish trait modifiers + var/list/fish_list_properties = SSfishing.fish_properties +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/fish_traits = fish_list_properties[fish][NAMEOF(fish, fish_traits)] for(var/fish_trait in fish_traits) var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait] trait.minigame_mod(rod, user, src) +<<<<<<< HEAD +======= + else + mover = new /datum/fish_movement(src) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Enable special parameters if(rod.line) completion_gain += 1 // Any fishing line will provide a small boost by default @@ -196,6 +249,7 @@ completion -= MAX_FISH_COMPLETION_MALUS * (difficulty * 0.01) if(HAS_MIND_TRAIT(user, TRAIT_REVEAL_FISH)) +<<<<<<< HEAD fish_icon = GLOB.specific_fish_icons[reward_path] || "fish" /** @@ -214,6 +268,11 @@ long_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(long_jump_chance * 1/square_angle_rad))))*100 else long_jump_chance *= difficulty +======= + fish_icon = GLOB.specific_fish_icons[reward_path] || FISH_ICON_DEF + + mover.adjust_to_difficulty() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bait_height -= round(difficulty * BAIT_HEIGHT_DIFFICULTY_MALUS) bait_pixel_height = round(MINIGAME_BAIT_HEIGHT * (bait_height/initial(bait_height)), 1) @@ -225,6 +284,7 @@ //Stops the line snapped message from appearing everytime the minigame is over. UnregisterSignal(fishing_line, COMSIG_QDELETING) QDEL_NULL(fishing_line) +<<<<<<< HEAD if(lure) QDEL_NULL(lure) SStgui.close_uis(src) @@ -235,6 +295,18 @@ /datum/fishing_challenge/proc/send_alert(message) var/turf/lure_turf = get_turf(lure) lure_turf?.balloon_alert(user, message) +======= + QDEL_NULL(float) + SStgui.close_uis(src) + user = null + used_rod = null + QDEL_NULL(mover) + return ..() + +/datum/fishing_challenge/proc/send_alert(message) + var/turf/float_turf = get_turf(float) + float_turf?.balloon_alert(user, message) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fishing_challenge/proc/on_spot_gone(datum/source) SIGNAL_HANDLER @@ -242,12 +314,17 @@ interrupt() /datum/fishing_challenge/proc/interrupt_challenge(datum/source, reason) +<<<<<<< HEAD +======= + SIGNAL_HANDLER +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(reason) send_alert(reason) interrupt() /datum/fishing_challenge/proc/start(mob/living/user) /// Create fishing line visuals +<<<<<<< HEAD if(used_rod.display_fishing_line) fishing_line = used_rod.create_fishing_line(lure, target_py = 5) RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(on_line_deleted)) @@ -257,15 +334,67 @@ // If fishing line breaks los / rod gets dropped / deleted RegisterSignal(used_rod, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) ADD_TRAIT(user, TRAIT_GONE_FISHING, REF(src)) +======= + if(!used_rod.internal) + fishing_line = used_rod.create_fishing_line(float, user, target_py = 5) + if(isnull(fishing_line)) //couldn't create a fishing line, probably because we don't have a good line of sight. + qdel(src) + return + RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(on_line_deleted)) + else //if the rod doesnt have a fishing line, then it ends when they move away + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_float_or_user_move)) + RegisterSignal(float, COMSIG_MOVABLE_MOVED, PROC_REF(on_float_or_user_move)) + RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), PROC_REF(on_hands_blocked)) + RegisterSignal(user, SIGNAL_REMOVETRAIT(TRAIT_PROFOUND_FISHER), PROC_REF(no_longer_fishing)) + active_effects = bitfield_to_list(special_effects & FISHING_MINIGAME_ACTIVE_EFFECTS) + // If fishing line breaks los / rod gets dropped / deleted + RegisterSignal(used_rod, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) + ADD_TRAIT(user, TRAIT_GONE_FISHING, WEAKREF(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.add_mood_event("fishing", /datum/mood_event/fishing) RegisterSignal(user, COMSIG_MOB_CLICKON, PROC_REF(handle_click)) start_baiting_phase() to_chat(user, span_notice("You start fishing...")) +<<<<<<< HEAD playsound(lure, 'sound/effects/splash.ogg', 100) +======= + playsound(float, 'sound/effects/splash.ogg', 100) + +///Set the timers for lure that need to be spun at intervals. +/datum/fishing_challenge/proc/set_lure_timers() + float.spin_ready = FALSE + addtimer(CALLBACK(src, PROC_REF(set_lure_ready)), float.spin_frequency[1], TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(missed_lure)), float.spin_frequency[2], TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_DELETE_ME) + float.update_appearance(UPDATE_OVERLAYS) + +/datum/fishing_challenge/proc/set_lure_ready() + if(phase != WAIT_PHASE) + return + float.spin_ready = TRUE + float.update_appearance(UPDATE_OVERLAYS) + if(special_effects & FISHING_MINIGAME_AUTOREEL) + addtimer(CALLBACK(src, PROC_REF(auto_spin)), 0.2 SECONDS) + playsound(float, 'sound/machines/ping.ogg', 10, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + +/datum/fishing_challenge/proc/auto_spin() + if(phase != WAIT_PHASE || !float.spin_ready) + return + float.spin_ready = FALSE + float.update_appearance(UPDATE_OVERLAYS) + set_lure_timers() + send_alert("spun") + +/datum/fishing_challenge/proc/missed_lure() + if(phase != WAIT_PHASE) + return + send_alert("miss!") + start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for not spinning the lure. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fishing_challenge/proc/on_line_deleted(datum/source) SIGNAL_HANDLER fishing_line = null +<<<<<<< HEAD ///The lure may be out of sight if the user has moed around a corner, so the message should be displayed over him instead. user.balloon_alert(user, user.is_holding(used_rod) ? "line snapped" : "rod dropped") interrupt() @@ -274,10 +403,34 @@ SIGNAL_HANDLER user.balloon_alert(user, "too far!") +======= + ///The float may be out of sight if the user has moed around a corner, so the message should be displayed over him instead. + user.balloon_alert(user, user.is_holding(used_rod) ? "line snapped" : "rod dropped") + interrupt() + +/datum/fishing_challenge/proc/on_float_or_user_move(datum/source) + SIGNAL_HANDLER + + if(!user.CanReach(float)) + user.balloon_alert(user, "too far!") + interrupt() + +/datum/fishing_challenge/proc/on_hands_blocked(datum/source) + SIGNAL_HANDLER + if(completed) //the rod was dropped and therefore challenge already completed. + return + user.balloon_alert(user, "hands blocked!") + interrupt() + +/datum/fishing_challenge/proc/no_longer_fishing(datum/source) + SIGNAL_HANDLER + user.balloon_alert(user, "interrupted!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 interrupt() /datum/fishing_challenge/proc/handle_click(mob/source, atom/target, modifiers) SIGNAL_HANDLER +<<<<<<< HEAD //You need to be holding the rod to use it. if(LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || LAZYACCESS(modifiers, ALT_CLICK)) return @@ -286,6 +439,31 @@ if(phase == WAIT_PHASE) send_alert("miss!") start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder. +======= + if(HAS_TRAIT(source, TRAIT_HANDS_BLOCKED)) //blocked, can't do stuff + return + //Doing other stuff + if(LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || LAZYACCESS(modifiers, ALT_CLICK)) + return + //You need to be actively holding on the fishing rod to use it, unless you've the profound_fisher trait. + if(!HAS_TRAIT(source, TRAIT_PROFOUND_FISHER) && source.get_active_held_item() != used_rod) + return + if(phase == WAIT_PHASE) + if(world.time < last_baiting_click + 0.25 SECONDS) + return //Don't punish players if they accidentally double clicked. + if(float.spin_frequency) + if(!float.spin_ready) + send_alert("too early!") + start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder. + else + send_alert("spun") + last_baiting_click = world.time + float.spin_ready = FALSE + set_lure_timers() + else + send_alert("miss!") + start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(phase == BITING_PHASE) start_minigame_phase() return COMSIG_MOB_CANCEL_CLICKON @@ -313,8 +491,14 @@ completed = TRUE if(phase == MINIGAME_PHASE) remove_minigame_hud() +<<<<<<< HEAD if(user) REMOVE_TRAIT(user, TRAIT_GONE_FISHING, REF(src)) +======= + if(!QDELETED(user)) + UnregisterSignal(user, SIGNAL_REMOVETRAIT(TRAIT_GONE_FISHING)) + user.remove_traits(list(TRAIT_GONE_FISHING, TRAIT_ACTIVELY_FISHING), WEAKREF(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(start_time) var/seconds_spent = (world.time - start_time) * 0.1 if(!(special_effects & FISHING_MINIGAME_RULE_NO_EXP)) @@ -323,30 +507,54 @@ user.client?.give_award(/datum/award/achievement/skill/legendary_fisher, user) if(win) if(reward_path != FISHING_DUD) +<<<<<<< HEAD playsound(lure, 'sound/effects/bigsplash.ogg', 100) +======= + playsound(float, 'sound/effects/bigsplash.ogg', 100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_FISHING_CHALLENGE_COMPLETED, user, win) if(!QDELETED(src)) qdel(src) /datum/fishing_challenge/proc/start_baiting_phase(penalty = FALSE) var/wait_time +<<<<<<< HEAD if(penalty) wait_time = min(timeleft(next_phase_timer) + rand(3 SECONDS, 5 SECONDS), 30 SECONDS) else wait_time = rand(3 SECONDS, 25 SECONDS) +======= + last_baiting_click = world.time + if(penalty) + wait_time = min(timeleft(next_phase_timer) + rand(3 SECONDS, 5 SECONDS), 30 SECONDS) + else + wait_time = float.spin_frequency ? rand(11 SECONDS, 17 SECONDS) : rand(3 SECONDS, 25 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(special_effects & FISHING_MINIGAME_AUTOREEL && wait_time >= 15 SECONDS) wait_time = max(wait_time - 7.5 SECONDS, 15 SECONDS) deltimer(next_phase_timer) phase = WAIT_PHASE //Bobbing animation +<<<<<<< HEAD animate(lure, pixel_y = 1, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE) animate(pixel_y = -1, time = 1 SECONDS, flags = ANIMATION_RELATIVE) next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_biting_phase)), wait_time, TIMER_STOPPABLE) +======= + animate(float, pixel_y = 1, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE) + animate(pixel_y = -1, time = 1 SECONDS, flags = ANIMATION_RELATIVE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_biting_phase)), wait_time, TIMER_STOPPABLE|TIMER_DELETE_ME) + if(float.spin_frequency) + set_lure_timers() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fishing_challenge/proc/start_biting_phase() phase = BITING_PHASE // Trashing animation +<<<<<<< HEAD playsound(lure, 'sound/effects/fish_splash.ogg', 100) +======= + playsound(float, 'sound/effects/fish_splash.ogg', 100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_MIND_TRAIT(user, TRAIT_REVEAL_FISH)) switch(fish_icon) if(FISH_ICON_DEF) @@ -369,6 +577,7 @@ send_alert("crustacean!!!") if(FISH_ICON_BONE) send_alert("bones!!!") +<<<<<<< HEAD else send_alert("!!!") animate(lure, pixel_y = 3, time = 5, loop = -1, flags = ANIMATION_RELATIVE) @@ -378,6 +587,33 @@ return // Setup next phase next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_baiting_phase)), BITING_TIME_WINDOW, TIMER_STOPPABLE) +======= + if(FISH_ICON_ELECTRIC) + send_alert("zappy!!!") + if(FISH_ICON_WEAPON) + send_alert("weapon!!!") + if(FISH_ICON_CRITTER) + send_alert("critter!!!") + if(FISH_ICON_SEED) + send_alert("seed!!!") + if(FISH_ICON_BOTTLE) + send_alert("bottle!!!") + else + send_alert("!!!") + animate(float, pixel_y = 3, time = 5, loop = -1, flags = ANIMATION_RELATIVE) + animate(pixel_y = -3, time = 5, flags = ANIMATION_RELATIVE) + if(special_effects & FISHING_MINIGAME_AUTOREEL) + addtimer(CALLBACK(src, PROC_REF(automatically_start_minigame)), 0.2 SECONDS) + // Setup next phase + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_baiting_phase)), BITING_TIME_WINDOW, TIMER_STOPPABLE|TIMER_DELETE_ME) + ///If we're using a lure, we want the float to show a little green light during the minigame phase and not a red one. + float.spin_ready = TRUE + float.update_appearance(UPDATE_OVERLAYS) + +/datum/fishing_challenge/proc/automatically_start_minigame() + if(phase == BITING_PHASE) + start_minigame_phase(auto_reel = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The damage dealt per second to the fish when FISHING_MINIGAME_RULE_KILL is active. #define FISH_DAMAGE_PER_SECOND 2 @@ -413,22 +649,61 @@ completion *= 1.2 if(BITING_TIME_WINDOW - 0.5 SECONDS to BITING_TIME_WINDOW) completion *= 1.4 +<<<<<<< HEAD if(!prepare_minigame_hud()) return +======= + //randomize the position of the fish a little + fish_position = rand(0, (FISHING_MINIGAME_AREA - fish_height) * 0.8) + var/diff_dist = 100 + difficulty + bait_position = clamp(round(fish_position + rand(-diff_dist, diff_dist) - bait_height * 0.5), 0, FISHING_MINIGAME_AREA - bait_height) + if(!prepare_minigame_hud()) + get_stack_trace("couldn't prepare minigame hud for a fishing challenge.") //just to be sure. This shouldn't happen. + qdel(src) + return + ADD_TRAIT(user, TRAIT_ACTIVELY_FISHING, WEAKREF(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 phase = MINIGAME_PHASE deltimer(next_phase_timer) if((FISHING_MINIGAME_RULE_KILL in special_effects) && ispath(reward_path,/obj/item/fish)) var/obj/item/fish/fish = reward_path var/wait_time = (initial(fish.health) / FISH_DAMAGE_PER_SECOND) SECONDS +<<<<<<< HEAD addtimer(CALLBACK(src, PROC_REF(win_anyway)), wait_time) start_time = world.time experience_multiplier += difficulty * FISHING_SKILL_DIFFIULTY_EXP_MULT +======= + addtimer(CALLBACK(src, PROC_REF(win_anyway)), wait_time, TIMER_DELETE_ME) + start_time = world.time + experience_multiplier += difficulty * FISHING_SKILL_DIFFIULTY_EXP_MULT + +///Throws a stack with prefixed text. +/datum/fishing_challenge/proc/get_stack_trace(init_text) + var/text = "[init_text] " + text += "used rod: [used_rod || "null"], " + if(used_rod) + text += "bait: [used_rod.bait || "null"], " + text += "reward: [reward_path || "null"], " + text += "user: [user || "null"]" + if(user) + if(QDELING(user)) + text += ", user qdeling" + else if(!user.client) + text += ", user clientless" + text += "." + stack_trace(text) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef FISH_DAMAGE_PER_SECOND ///Initialize the minigame hud and register some signals to make it work. /datum/fishing_challenge/proc/prepare_minigame_hud() +<<<<<<< HEAD if(!user.client || user.incapacitated()) +======= + if(!user.client || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE . = TRUE fishing_hud = new @@ -465,7 +740,11 @@ /datum/fishing_challenge/process(seconds_per_tick) if(length(active_effects) && COOLDOWN_FINISHED(src, active_effect_cd)) select_active_effect() +<<<<<<< HEAD move_fish(seconds_per_tick) +======= + mover.move_fish(seconds_per_tick) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 move_bait(seconds_per_tick) if(!QDELETED(fishing_hud)) update_visuals() @@ -485,6 +764,14 @@ fishing_hud.transform = fishing_hud.transform.Scale(1, -1) SEND_SOUND(user, sound('sound/effects/boing.ogg')) COOLDOWN_START(src, active_effect_cd, rand(5, 6) SECONDS) +<<<<<<< HEAD +======= + if(FISHING_MINIGAME_RULE_CAMO) + fishing_hud.icon_state = "background_camo" + SEND_SOUND(user, sound('sound/effects/nightmare_poof.ogg', volume = 15)) + COOLDOWN_START(src, active_effect_cd, rand(6, 8) SECONDS) + animate(fishing_hud.hud_fish, alpha = 7, time = 2 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ///go back to normal @@ -497,10 +784,18 @@ if(FISHING_MINIGAME_RULE_FLIP) fishing_hud.transform = fishing_hud.transform.Scale(1, -1) COOLDOWN_START(src, active_effect_cd, rand(8, 12) SECONDS) +<<<<<<< HEAD +======= + if(FISHING_MINIGAME_RULE_CAMO) + COOLDOWN_START(src, active_effect_cd, rand(9, 16) SECONDS) + SEND_SOUND(user, sound('sound/effects/nightmare_reappear.ogg', volume = 15)) + animate(fishing_hud.hud_fish, alpha = 255, time = 1.2 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fishing_hud.icon_state = background current_active_effect = null +<<<<<<< HEAD ///The proc that moves the fish around, just like in the old TGUI, mostly. /datum/fishing_challenge/proc/move_fish(seconds_per_tick) var/long_chance = long_jump_chance * seconds_per_tick * 10 @@ -553,6 +848,8 @@ fish_velocity = clamp(fish_velocity + fish_idle_velocity, -current_velocity_limit, current_velocity_limit) fish_position = clamp(fish_position + fish_velocity * seconds_per_tick, 0, FISHING_MINIGAME_AREA - fish_height) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The proc that moves the bait around, just like in the old TGUI, mostly. /datum/fishing_challenge/proc/move_bait(seconds_per_tick) var/should_bounce = abs(bait_velocity) > BAIT_MIN_VELOCITY_BOUNCE @@ -613,9 +910,13 @@ bait_velocity += velocity_change //check that the fish area is still intersecting the bait now that it has moved +<<<<<<< HEAD fish_on_bait = (fish_position + fish_height >= bait_position) && (bait_position + bait_height >= fish_position) if(fish_on_bait) +======= + if(is_fish_on_bait()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 completion += completion_gain * seconds_per_tick if(completion >= 100) complete(TRUE) @@ -627,6 +928,13 @@ completion = clamp(completion, 0, 100) +<<<<<<< HEAD +======= +///Returns TRUE if the fish and the bait are intersecting +/datum/fishing_challenge/proc/is_fish_on_bait() + return (fish_position + fish_height >= bait_position) && (bait_position + bait_height >= fish_position) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///update the vertical pixel position of both fish and bait, and the icon state of the completion bar /datum/fishing_challenge/proc/update_visuals() var/bait_offset_mult = bait_position/FISHING_MINIGAME_AREA @@ -707,6 +1015,7 @@ icon_state = "completion_[FLOOR(challenge.completion, 5)]" /// The visual that appears over the fishing spot +<<<<<<< HEAD /obj/effect/fishing_lure icon = 'icons/obj/fishing.dmi' icon_state = "lure_idle" @@ -717,15 +1026,49 @@ RegisterSignal(spot, COMSIG_MOVABLE_MOVED, PROC_REF(follow_movable)) /obj/effect/fishing_lure/proc/follow_movable(atom/movable/source) +======= +/obj/effect/fishing_float + name = "float" + icon = 'icons/obj/fishing.dmi' + icon_state = "float" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + /** + * A list with two keys delimiting the spinning interval in which a mouse click has to be pressed while fishing. + * If set, an emissive overlay will be added, colored green when the lure is ready to be spun, otherwise red. + */ + var/list/spin_frequency + ///Is the bait ready to be spun? + var/spin_ready = FALSE + +/obj/effect/fishing_float/Initialize(mapload, atom/spot) + . = ..() + if(ismovable(spot)) // we want the float and therefore the fishing line to stay connected with the fishing spot. + RegisterSignal(spot, COMSIG_MOVABLE_MOVED, PROC_REF(follow_movable)) + +/obj/effect/fishing_float/proc/follow_movable(atom/movable/source) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER set_glide_size(source.glide_size) forceMove(source.loc) +<<<<<<< HEAD +======= +/obj/effect/fishing_float/update_overlays() + . = ..() + if(!spin_frequency) + return + var/mutable_appearance/overlay = mutable_appearance(icon, "lure_light") + overlay.color = spin_ready ? COLOR_GREEN : COLOR_RED + . += overlay + . += emissive_appearance(icon, "lure_light_emissive", src, alpha = src.alpha) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef WAIT_PHASE #undef BITING_PHASE #undef MINIGAME_PHASE +<<<<<<< HEAD #undef FISHING_MINIGAME_AREA #undef FISH_TARGET_MIN_DISTANCE #undef FISH_FRICTION_MULT @@ -735,6 +1078,8 @@ #undef BAIT_MIN_VELOCITY_BOUNCE #undef BAIT_DECELERATION_MULT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MINIGAME_SLIDER_HEIGHT #undef MINIGAME_BAIT_HEIGHT #undef MINIGAME_FISH_HEIGHT @@ -745,5 +1090,12 @@ #undef REELING_STATE_UP #undef REELING_STATE_DOWN +<<<<<<< HEAD +======= +#undef FISH_ON_BAIT_ACCELERATION_MULT +#undef BAIT_MIN_VELOCITY_BOUNCE +#undef BAIT_DECELERATION_MULT + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAX_FISH_COMPLETION_MALUS #undef BITING_TIME_WINDOW diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index c36ea48b15c..21dfc878a1b 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -36,12 +36,26 @@ /// The default color for the reel overlay if no line is equipped. var/default_line_color = "gray" +<<<<<<< HEAD ///should there be a fishing line? var/display_fishing_line = TRUE +======= + ///Is this currently being used by the profound fisher component? + var/internal = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The name of the icon state of the reel overlay var/reel_overlay = "reel_overlay" +<<<<<<< HEAD +======= + /** + * A list with two keys delimiting the spinning interval in which a mouse click has to be pressed while fishing. + * Inherited from baits, passed down to the minigame lure. + */ + var/list/spin_frequency + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Prevents spamming the line casting, without affecting the player's click cooldown. COOLDOWN_DECLARE(casting_cd) @@ -69,9 +83,17 @@ /obj/item/fishing_rod/add_item_context(obj/item/source, list/context, atom/target, mob/living/user) . = ..() +<<<<<<< HEAD if(currently_hooked) context[SCREENTIP_CONTEXT_LMB] = "Reel in" context[SCREENTIP_CONTEXT_RMB] = "Unhook" +======= + var/gone_fishing = HAS_TRAIT(user, TRAIT_GONE_FISHING) + if(currently_hooked || gone_fishing) + context[SCREENTIP_CONTEXT_LMB] = (gone_fishing && spin_frequency) ? "Spin" : "Reel in" + if(!gone_fishing) + context[SCREENTIP_CONTEXT_RMB] = "Unhook" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return CONTEXTUAL_SCREENTIP_SET return NONE @@ -107,8 +129,24 @@ var/mob/living/caught_mob = reward if(caught_mob.stat == DEAD) return +<<<<<<< HEAD else if(!isfish(reward)) return +======= + else + if(!isfish(reward)) + return + var/obj/item/fish/fish = reward + if(HAS_TRAIT(bait, TRAIT_POISONOUS_BAIT) && !HAS_TRAIT(fish, TRAIT_FISH_TOXIN_IMMUNE)) + var/kill_fish = TRUE + for(var/bait_identifer in fish.favorite_bait) + if(is_matching_bait(bait, bait_identifer)) + kill_fish = FALSE + break + if(kill_fish) + fish.set_status(FISH_DEAD, silent = TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(bait) update_icon() @@ -127,9 +165,16 @@ return //Try to move it 'till it's under the user's feet, then try to pick it up if(isitem(currently_hooked)) +<<<<<<< HEAD step_towards(currently_hooked, get_turf(src)) if(currently_hooked.loc == user.loc) user.put_in_inactive_hand(currently_hooked) +======= + var/obj/item/item = currently_hooked + step_towards(item, get_turf(src)) + if(item.loc == user.loc && (item.interaction_flags_item & INTERACT_ITEM_ATTACK_HAND_PICKUP)) + user.put_in_inactive_hand(item) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(fishing_line) //Not an item, so just delete the line if it's adjacent to the user. else if(get_dist(currently_hooked,get_turf(src)) > 1) @@ -147,21 +192,37 @@ ui_interact(user) /// Generates the fishing line visual from the current user to the target and updates inhands +<<<<<<< HEAD /obj/item/fishing_rod/proc/create_fishing_line(atom/movable/target, target_py = null) if(!display_fishing_line) return null var/mob/user = loc if(!istype(user)) +======= +/obj/item/fishing_rod/proc/create_fishing_line(atom/movable/target, mob/living/firer, target_py = null) + if(internal) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return null if(fishing_line) QDEL_NULL(fishing_line) var/beam_color = line?.line_color || default_line_color +<<<<<<< HEAD fishing_line = new(user, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py) fishing_line.lefthand = user.get_held_index_of_item(src) % 2 == 1 RegisterSignal(fishing_line, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los)) RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(clear_line)) INVOKE_ASYNC(fishing_line, TYPE_PROC_REF(/datum/beam/, Start)) user.update_held_items() +======= + fishing_line = new(firer, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py) + fishing_line.lefthand = firer.get_held_index_of_item(src) % 2 == 1 + RegisterSignal(fishing_line, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los)) + RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(clear_line)) + INVOKE_ASYNC(fishing_line, TYPE_PROC_REF(/datum/beam/, Start)) + if(QDELETED(fishing_line)) + return null + firer.update_held_items() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return fishing_line /obj/item/fishing_rod/proc/clear_line(datum/source) @@ -183,7 +244,11 @@ if(!hook.can_be_hooked(target_atom)) return currently_hooked = target_atom +<<<<<<< HEAD create_fishing_line(target_atom) +======= + create_fishing_line(target_atom, user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hook.hook_attached(target_atom, src) SEND_SIGNAL(src, COMSIG_FISHING_ROD_HOOKED_ITEM, target_atom, user) @@ -197,6 +262,12 @@ return BEAM_CANCEL_DRAW /obj/item/fishing_rod/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) +<<<<<<< HEAD +======= + //this prevent trying to use telekinesis to fish (which would be broken anyway) + if(!user.contains(src)) + return ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ranged_interact_with_atom(interacting_with, user, modifiers) /obj/item/fishing_rod/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) @@ -245,9 +316,14 @@ COOLDOWN_START(src, casting_cd, 1 SECONDS) /// Called by hook projectile when hitting things +<<<<<<< HEAD /obj/item/fishing_rod/proc/hook_hit(atom/atom_hit_by_hook_projectile) var/mob/user = loc if(!hook || !istype(user)) +======= +/obj/item/fishing_rod/proc/hook_hit(atom/atom_hit_by_hook_projectile, mob/user) + if(!hook) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(SEND_SIGNAL(atom_hit_by_hook_projectile, COMSIG_FISHING_ROD_CAST, src, user) & FISHING_ROD_CAST_HANDLED) return @@ -261,6 +337,15 @@ ui.set_autoupdate(FALSE) ui.open() +<<<<<<< HEAD +======= +/obj/item/fishing_rod/ui_state() + if(internal) + return GLOB.deep_inventory_state + else + return GLOB.default_state + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_rod/update_overlays() . = ..() . += get_fishing_overlays() @@ -365,7 +450,11 @@ return FALSE return TRUE +<<<<<<< HEAD /obj/item/fishing_rod/ui_act(action, list/params) +======= +/obj/item/fishing_rod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . @@ -379,6 +468,11 @@ /// Ideally this will be replaced with generic slotted storage datum + display /obj/item/fishing_rod/proc/use_slot(slot, mob/user, obj/item/new_item) +<<<<<<< HEAD +======= + if(fishing_line || HAS_TRAIT(user, TRAIT_GONE_FISHING)) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/current_item switch(slot) if(ROD_SLOT_BAIT) @@ -400,10 +494,17 @@ if(user.transferItemToLoc(new_item,src)) set_slot(new_item, slot) balloon_alert(user, "[slot] installed") +<<<<<<< HEAD +======= + else + balloon_alert(user, "stuck to your hands!") + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trying to swap item else if(new_item && current_item) if(!slot_check(new_item,slot)) return +<<<<<<< HEAD if(user.transferItemToLoc(new_item,src)) switch(slot) if(ROD_SLOT_BAIT) @@ -417,6 +518,15 @@ if(new_item) SEND_SIGNAL(new_item, COMSIG_FISHING_EQUIPMENT_SLOTTED, src) +======= + if(user.transferItemToLoc(new_item, src)) + user.put_in_hands(current_item) + set_slot(new_item, slot) + balloon_alert(user, "[slot] swapped") + else + balloon_alert(user, "stuck to your hands!") + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_icon() playsound(src, 'sound/items/click.ogg', 50, TRUE) @@ -426,16 +536,32 @@ switch(slot) if(ROD_SLOT_BAIT) bait = equipment +<<<<<<< HEAD +======= + if(!HAS_TRAIT(bait, TRAIT_BAIT_ALLOW_FISHING_DUD)) + ADD_TRAIT(src, TRAIT_ROD_REMOVE_FISHING_DUD, INNATE_TRAIT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ROD_SLOT_HOOK) hook = equipment if(ROD_SLOT_LINE) line = equipment cast_range += FISHING_ROD_REEL_CAST_RANGE +<<<<<<< HEAD +======= + else + CRASH("set_slot called with an undefined slot: [slot]") + + SEND_SIGNAL(equipment, COMSIG_FISHING_EQUIPMENT_SLOTTED, src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_rod/Exited(atom/movable/gone, direction) . = ..() if(gone == bait) bait = null +<<<<<<< HEAD +======= + REMOVE_TRAIT(src, TRAIT_ROD_REMOVE_FISHING_DUD, INNATE_TRAIT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(gone == line) cast_range -= FISHING_ROD_REEL_CAST_RANGE line = null @@ -585,13 +711,21 @@ transform = transform.Scale(1, -1) . = ..() if(!QDELETED(src)) +<<<<<<< HEAD our_line = owner.create_fishing_line(src) +======= + our_line = owner.create_fishing_line(src, firer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/fishing_cast/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() if(blocked < 100) QDEL_NULL(our_line) //we need to delete the old beam datum, otherwise it won't let you fish. +<<<<<<< HEAD owner.hook_hit(target) +======= + owner.hook_hit(target, firer) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/fishing_cast/Destroy() QDEL_NULL(our_line) diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm index 4a0419f98f5..88af29ff757 100644 --- a/code/modules/fishing/sources/_fish_source.dm +++ b/code/modules/fishing/sources/_fish_source.dm @@ -8,6 +8,7 @@ GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_sour * A lot of the icons here may be a tad inaccurate, but since we're limited to the free font awesome icons we * have access to, we got to make do. */ +<<<<<<< HEAD GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( /mob/living/basic/carp = FISH_ICON_DEF, /mob/living/basic/mining = FISH_ICON_HOSTILE, @@ -32,6 +33,53 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( /obj/item/stack/ore = FISH_ICON_GEM, /obj/structure/closet/crate = FISH_ICON_COIN, ))) +======= +GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) + +/proc/generate_specific_fish_icons() + var/list/return_list = zebra_typecacheof(list( + /mob/living/basic/axolotl = FISH_ICON_CRITTER, + /mob/living/basic/frog = FISH_ICON_CRITTER, + /mob/living/basic/carp = FISH_ICON_DEF, + /mob/living/basic/mining = FISH_ICON_HOSTILE, + /obj/effect/decal/remains = FISH_ICON_BONE, + /obj/effect/mob_spawn/corpse = FISH_ICON_BONE, + /obj/effect/spawner/message_in_a_bottle = FISH_ICON_BOTTLE, + /obj/item/coin = FISH_ICON_COIN, + /obj/item/fish = FISH_ICON_DEF, + /obj/item/fish/armorfish = FISH_ICON_CRAB, + /obj/item/fish/boned = FISH_ICON_BONE, + /obj/item/fish/chainsawfish = FISH_ICON_WEAPON, + /obj/item/fish/chasm_crab = FISH_ICON_CRAB, + /obj/item/fish/gunner_jellyfish = FISH_ICON_JELLYFISH, + /obj/item/fish/holo/crab = FISH_ICON_CRAB, + /obj/item/fish/holo/puffer = FISH_ICON_CHUNKY, + /obj/item/fish/jumpercable = FISH_ICON_ELECTRIC, + /obj/item/fish/lavaloop = FISH_ICON_WEAPON, + /obj/item/fish/mastodon = FISH_ICON_BONE, + /obj/item/fish/pike/armored = FISH_ICON_WEAPON, + /obj/item/fish/pufferfish = FISH_ICON_CHUNKY, + /obj/item/fish/sand_crab = FISH_ICON_CRAB, + /obj/item/fish/skin_crab = FISH_ICON_CRAB, + /obj/item/fish/slimefish = FISH_ICON_SLIME, + /obj/item/fish/sludgefish = FISH_ICON_SLIME, + /obj/item/fish/starfish = FISH_ICON_STAR, + /obj/item/fish/stingray = FISH_ICON_WEAPON, + /obj/item/fish/swordfish = FISH_ICON_WEAPON, + /obj/item/fish/zipzap = FISH_ICON_ELECTRIC, + /obj/item/seeds/grass = FISH_ICON_SEED, + /obj/item/seeds/random = FISH_ICON_SEED, + /obj/item/storage/wallet = FISH_ICON_COIN, + /obj/item/stack/sheet/bone = FISH_ICON_BONE, + /obj/item/stack/sheet/mineral = FISH_ICON_GEM, + /obj/item/stack/ore = FISH_ICON_GEM, + /obj/structure/closet/crate = FISH_ICON_COIN, + /obj/structure/mystery_box = FISH_ICON_COIN, + )) + + return_list[FISHING_RANDOM_SEED] = FISH_ICON_SEED + return return_list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Where the fish actually come from - every fishing spot has one assigned but multiple fishing holes @@ -45,6 +93,13 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( var/list/fish_table = list() /// If a key from fish_table is present here, that fish is availible in limited quantity and is reduced by one on successful fishing var/list/fish_counts = list() +<<<<<<< HEAD +======= + /// Any limited quantity stuff in this list will be readded to the counts after a while + var/list/fish_count_regen + /// A list of stuff that's currently waiting to be readded to fish_counts + var/list/currently_on_regen +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Text shown as baloon alert when you roll a dud in the table var/duds = list("it was nothing", "the hook is empty") /// Baseline difficulty for fishing in this spot @@ -75,9 +130,18 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( return ..() ///Called when src is set as the fish source of a fishing spot component +<<<<<<< HEAD /datum/fish_source/proc/on_fishing_spot_init(/datum/component/fishing_spot/spot) return +======= +/datum/fish_source/proc/on_fishing_spot_init(datum/component/fishing_spot/spot) + return + +///Called whenever a fishing spot with this fish source attached is deleted +/datum/fish_source/proc/on_fishing_spot_del(datum/component/fishing_spot/spot) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Can we fish in this spot at all. Returns DENIAL_REASON or null if we're good to go /datum/fish_source/proc/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman, atom/parent) return rod.reason_we_cant_fish(src) @@ -112,8 +176,13 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( // In the future non-fish rewards can have variable difficulty calculated here return +<<<<<<< HEAD var/list/fish_list_properties = collect_fish_properties() var/obj/item/fish/caught_fish = result +======= + var/obj/item/fish/caught_fish = result + var/list/fish_properties = SSfishing.fish_properties[caught_fish] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Baseline fish difficulty . += initial(caught_fish.fishing_difficulty_modifier) @@ -121,18 +190,30 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( if(rod.bait) var/obj/item/bait = rod.bait //Fav bait makes it easier +<<<<<<< HEAD var/list/fav_bait = fish_list_properties[caught_fish][NAMEOF(caught_fish, favorite_bait)] +======= + var/list/fav_bait = fish_properties[FISH_PROPERTIES_FAV_BAIT] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/bait_identifer in fav_bait) if(is_matching_bait(bait, bait_identifer)) . += FAV_BAIT_DIFFICULTY_MOD //Disliked bait makes it harder +<<<<<<< HEAD var/list/disliked_bait = fish_list_properties[caught_fish][NAMEOF(caught_fish, disliked_bait)] +======= + var/list/disliked_bait = fish_properties[FISH_PROPERTIES_BAD_BAIT] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/bait_identifer in disliked_bait) if(is_matching_bait(bait, bait_identifer)) . += DISLIKED_BAIT_DIFFICULTY_MOD // Matching/not matching fish traits and equipment +<<<<<<< HEAD var/list/fish_traits = fish_list_properties[caught_fish][NAMEOF(caught_fish, fish_traits)] +======= + var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/additive_mod = 0 var/multiplicative_mod = 1 @@ -146,8 +227,13 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( . *= multiplicative_mod /// In case you want more complex rules for specific spots +<<<<<<< HEAD /datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman) return pick_weight(get_modified_fish_table(rod,fisherman)) +======= +/datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman, atom/location) + return pick_weight(get_modified_fish_table(rod, fisherman, location)) || FISHING_DUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Used to register signals or add traits and the such right after conditions have been cleared @@ -171,7 +257,11 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( return var/obj/item/fish/caught = source.reward_path user.add_mob_memory(/datum/memory/caught_fish, protagonist = user, deuteragonist = initial(caught.name)) +<<<<<<< HEAD var/turf/fishing_spot = get_turf(source.lure) +======= + var/turf/fishing_spot = get_turf(source.float) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/reward = dispense_reward(source.reward_path, user, fishing_spot) if(source.used_rod) SEND_SIGNAL(source.used_rod, COMSIG_FISHING_ROD_CAUGHT_FISH, reward, user) @@ -198,16 +288,37 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( /datum/fish_source/proc/simple_dispense_reward(reward_path, atom/spawn_location, turf/fishing_spot) if(isnull(reward_path)) return null +<<<<<<< HEAD if((reward_path in fish_counts)) // This is limited count result fish_counts[reward_path] -= 1 if(!fish_counts[reward_path]) fish_counts -= reward_path //Ran out of these since rolling (multiple fishermen on same source most likely) fish_table -= reward_path +======= + if(reward_path in fish_counts) // This is limited count result + fish_counts[reward_path] -= 1 + var/regen_time = fish_count_regen?[reward_path] + if(regen_time) + LAZYADDASSOC(currently_on_regen, reward_path, 1) + if(currently_on_regen[reward_path] == 1) + addtimer(CALLBACK(src, PROC_REF(regen_count), reward_path), regen_time) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/reward = spawn_reward(reward_path, spawn_location, fishing_spot) SEND_SIGNAL(src, COMSIG_FISH_SOURCE_REWARD_DISPENSED, reward) return reward +<<<<<<< HEAD +======= +/datum/fish_source/proc/regen_count(reward_path, regen_time) + fish_counts[reward_path] += 1 + currently_on_regen[reward_path] -= 1 + if(!currently_on_regen[reward_path]) + LAZYREMOVE(currently_on_regen, reward_path) + else + addtimer(CALLBACK(src, PROC_REF(regen_count), reward_path), regen_time) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Spawns a reward from a atom path right where the fisherman is. Part of the dispense_reward() logic. /datum/fish_source/proc/spawn_reward(reward_path, atom/spawn_location, turf/fishing_spot) if(reward_path == FISHING_DUD) @@ -222,6 +333,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( caught_fish.randomize_size_and_weight() return reward +<<<<<<< HEAD /// Cached fish list properties so we don't have to initalize fish every time, init deffered GLOBAL_LIST(fishing_property_cache) @@ -258,6 +370,18 @@ GLOBAL_LIST(fishing_property_cache) /// Builds a fish weights table modified by bait/rod/user properties /datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman) +======= +/// Returns the fish table, with with the unavailable items from fish_counts removed. +/datum/fish_source/proc/get_fish_table() + var/list/table = fish_table.Copy() + for(var/result in table) + if(fish_counts[result] == 0) + table -= result + return table + +/// Builds a fish weights table modified by bait/rod/user properties +/datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman, atom/location) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/bait = rod.bait ///An exponent used to level out the difference in probabilities between fishes/mobs on the table depending on bait quality. var/leveling_exponent = 0 @@ -277,9 +401,15 @@ GLOBAL_LIST(fishing_property_cache) else if(HAS_TRAIT(bait, TRAIT_BASIC_QUALITY_BAIT)) result_multiplier = 2 leveling_exponent = 0.1 +<<<<<<< HEAD final_table -= FISHING_DUD var/list/fish_list_properties = collect_fish_properties() +======= + + if(HAS_TRAIT(rod, TRAIT_ROD_REMOVE_FISHING_DUD)) + final_table -= FISHING_DUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(fisherman, TRAIT_PROFOUND_FISHER) && !fisherman.client) @@ -289,6 +419,7 @@ GLOBAL_LIST(fishing_property_cache) final_table[result] += rod.hook?.get_hook_bonus_additive(result)//Decide on order here so it can be multiplicative if(ispath(result, /obj/item/fish)) +<<<<<<< HEAD //Modify fish roll chance var/obj/item/fish/caught_fish = result @@ -305,10 +436,19 @@ GLOBAL_LIST(fishing_property_cache) for(var/bait_identifer in disliked_bait) if(is_matching_bait(bait, bait_identifer)) final_table[result] = round(final_table[result] * 0.5, 1) +======= + if(bait) + final_table[result] = round(final_table[result] * result_multiplier, 1) + var/mult = bait.check_bait(result) + final_table[result] = round(final_table[result] * mult, 1) + if(mult > 1 && HAS_TRAIT(bait, TRAIT_BAIT_ALLOW_FISHING_DUD)) + final_table -= FISHING_DUD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else final_table[result] = round(final_table[result] * 0.15, 1) //Fishing without bait is not going to be easy // Apply fish trait modifiers +<<<<<<< HEAD var/list/fish_traits = fish_list_properties[caught_fish][NAMEOF(caught_fish, fish_traits)] var/additive_mod = 0 var/multiplicative_mod = 1 @@ -320,6 +460,9 @@ GLOBAL_LIST(fishing_property_cache) final_table[result] += additive_mod final_table[result] = round(final_table[result] * multiplicative_mod, 1) +======= + final_table[result] = get_fish_trait_catch_mods(final_table[result], result, rod, fisherman, location) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(final_table[result] <= 0) final_table -= result @@ -343,6 +486,66 @@ GLOBAL_LIST(fishing_property_cache) return final_table +<<<<<<< HEAD +======= +/datum/fish_source/proc/get_fish_trait_catch_mods(weight, obj/item/fish/fish, obj/item/fishing_rod/rod, mob/user, atom/location) + if(!ispath(fish, /obj/item/fish)) + return weight + var/multiplier = 1 + for(var/fish_trait in SSfishing.fish_properties[fish][FISH_PROPERTIES_TRAITS]) + var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait] + var/list/mod = trait.catch_weight_mod(rod, user, location, fish) + weight += mod[ADDITIVE_FISHING_MOD] + multiplier *= mod[MULTIPLICATIVE_FISHING_MOD] + + return round(weight * multiplier, 1) + +///returns true if this fishing spot has fish that are shown in the catalog. +/datum/fish_source/proc/has_known_fishes() + for(var/reward in fish_table) + if(!ispath(reward, /obj/item/fish)) + continue + var/obj/item/fish/prototype = reward + if(initial(prototype.show_in_catalog)) + return TRUE + return FALSE + +///Add a string with the names of catchable fishes to the examine text. +/datum/fish_source/proc/get_catchable_fish_names(mob/user, atom/location, list/examine_text) + var/list/known_fishes = list() + + var/obj/item/fishing_rod/rod = user.get_active_held_item() + if(!istype(rod)) + rod = null + + for(var/reward in fish_table) + if(!ispath(reward, /obj/item/fish)) + continue + var/obj/item/fish/prototype = reward + if(initial(prototype.show_in_catalog)) + var/init_name = initial(prototype.name) + if(rod) + var/init_weight = fish_table[reward] + var/weight = (rod.bait ? rod.bait.check_bait(prototype) : 1) + weight = get_fish_trait_catch_mods(weight, reward, rod, user, location) + if(weight > init_weight) + init_name = span_bold(init_name) + if(weight/init_weight >= 3.5) + init_name = "init_name" + else if(weight < init_weight) + init_name = span_small(reward) + known_fishes += init_name + + if(!length(known_fishes)) + return + + var/info = "You can catch the following fish here" + + if(rod) + info = span_tooltip("boldened are the fish you're more likely to catch with your current setup. The opposite is true for smaller names", info) + examine_text += span_info("[info]: [english_list(known_fishes)].") + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/proc/spawn_reward_from_explosion(atom/location, severity) if(!explosive_malus) explosive_spawn(location, severity) @@ -360,17 +563,29 @@ GLOBAL_LIST(fishing_property_cache) explosive_spawn(turf, exploded_turfs[turf], multiplier) exploded_turfs = null +<<<<<<< HEAD /datum/fish_source/proc/explosive_spawn(location, severity, multiplier = 1) for(var/i in 1 to (severity + 2)) if(!prob((100 + 100 * severity)/i * multiplier)) continue var/reward_loot = pick_weight(fish_table) +======= +/datum/fish_source/proc/explosive_spawn(atom/location, severity, multiplier = 1) + for(var/i in 1 to (severity + 2)) + if(!prob((100 + 100 * severity)/i * multiplier)) + continue + var/reward_loot = pick_weight(get_fish_table()) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/reward = simple_dispense_reward(reward_loot, location, location) if(isnull(reward)) continue if(isfish(reward)) var/obj/item/fish/fish = reward +<<<<<<< HEAD fish.set_status(FISH_DEAD) +======= + fish.set_status(FISH_DEAD, silent = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isitem(reward)) reward.pixel_x = rand(-9, 9) reward.pixel_y = rand(-9, 9) diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm index d26977f195b..e2118c37d6d 100644 --- a/code/modules/fishing/sources/source_types.dm +++ b/code/modules/fishing/sources/source_types.dm @@ -1,5 +1,6 @@ /datum/fish_source/ocean fish_table = list( +<<<<<<< HEAD FISHING_DUD = 15, /obj/item/coin/gold = 5, /obj/item/fish/clownfish = 15, @@ -15,18 +16,115 @@ /obj/item/fish/clownfish/lube = 2, /obj/structure/mystery_box/fishing = 1, ) +======= + FISHING_DUD = 10, + /obj/effect/spawner/message_in_a_bottle = 4, + /obj/item/coin/gold = 6, + /obj/item/fish/clownfish = 11, + /obj/item/fish/pufferfish = 11, + /obj/item/fish/cardinal = 11, + /obj/item/fish/greenchromis = 11, + /obj/item/fish/squid = 11, + /obj/item/fish/stingray = 8, + /obj/item/fish/plaice = 8, + /obj/item/fish/monkfish = 5, + /obj/item/fish/stingray = 10, + /obj/item/fish/lanternfish = 7, + /obj/item/fish/zipzap = 7, + /obj/item/fish/clownfish/lube = 5, + /obj/item/fish/swordfish = 5, + /obj/item/fish/swordfish = 3, + /obj/structure/mystery_box/fishing = 2, + ) + fish_counts = list( + /obj/item/fish/clownfish/lube = 2, + /obj/item/fish/swordfish = 2, + /obj/structure/mystery_box/fishing = 1, + ) + fish_count_regen = list( + /obj/item/fish/clownfish/lube = 3 MINUTES, + /obj/item/fish/swordfish = 5 MINUTES, + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 5 explosive_malus = TRUE /datum/fish_source/ocean/beach catalog_description = "Beach shore water" +<<<<<<< HEAD +======= +/datum/fish_source/ice_fishing + catalog_description = "Ice-covered water" + fish_table = list( + FISHING_DUD = 4, + /obj/item/fish/arctic_char = 5, + /obj/item/fish/sockeye_salmon = 5, + /obj/item/fish/chasm_crab/ice = 2, + /obj/item/fish/boned = 1, + ) + fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 20 + +/datum/fish_source/river + catalog_description = "River water" + fish_table = list( + FISHING_DUD = 4, + /obj/item/fish/goldfish = 5, + /obj/item/fish/guppy = 5, + /obj/item/fish/perch = 4, + /obj/item/fish/angelfish = 4, + /obj/item/fish/catfish = 4, + /obj/item/fish/perch = 5, + /obj/item/fish/slimefish = 2, + /obj/item/fish/sockeye_salmon = 1, + /obj/item/fish/arctic_char = 1, + /obj/item/fish/pike = 1, + /obj/item/fish/goldfish/three_eyes = 1, + ) + fish_counts = list( + /obj/item/fish/pike = 3, + ) + fish_count_regen = list( + /obj/item/fish/pike = 4 MINUTES, + ) + fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 5 + +/datum/fish_source/sand + catalog_description = "Sand" + fish_table = list( + FISHING_DUD = 8, + /obj/item/fish/sand_crab = 10, + /obj/item/fish/sand_surfer = 10, + /obj/item/fish/bumpy = 10, + /obj/item/coin/gold = 3, + ) + fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 20 + +/datum/fish_source/cursed_spring + catalog_description = null //it's a secret (sorta, I know you're reading this) + fish_table = list( + FISHING_DUD = 2, + /obj/item/fish/soul = 3, + /obj/item/fish/skin_crab = 3, + /obj/item/fishing_rod/telescopic/master = 1, + ) + fish_counts = list( + /obj/item/fishing_rod/telescopic/master = 1, + ) + fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 25 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/portal fish_table = list( FISHING_DUD = 7, /obj/item/fish/goldfish = 10, /obj/item/fish/guppy = 10, /obj/item/fish/angelfish = 10, +<<<<<<< HEAD +======= + /obj/item/fish/perch = 5, + /obj/item/fish/goldfish/three_eyes = 3, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Aquarium dimension (Fishing portal generator)" ///The name of this option shown in the radial menu on the fishing portal generator @@ -38,17 +136,36 @@ /datum/fish_source/portal/beach fish_table = list( +<<<<<<< HEAD FISHING_DUD = 10, +======= + FISHING_DUD = 7, + /obj/effect/spawner/message_in_a_bottle = 3, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/clownfish = 10, /obj/item/fish/pufferfish = 10, /obj/item/fish/cardinal = 10, /obj/item/fish/greenchromis = 10, +<<<<<<< HEAD +======= + /obj/item/fish/squid = 8, + /obj/item/fish/plaice = 8, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Beach dimension (Fishing portal generator)" radial_name = "Beach" radial_state = "palm_beach" overlay_state = "portal_beach" +<<<<<<< HEAD +======= +/datum/fish_source/portal/beach/on_fishing_spot_init(datum/component/fishing_spot/spot) + ADD_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) + +/datum/fish_source/portal/beach/on_fishing_spot_del(datum/component/fishing_spot/spot) + REMOVE_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/portal/chasm background = "background_lavaland" fish_table = list( @@ -65,7 +182,12 @@ /datum/fish_source/portal/ocean fish_table = list( +<<<<<<< HEAD FISHING_DUD = 5, +======= + FISHING_DUD = 3, + /obj/effect/spawner/message_in_a_bottle = 2, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/lanternfish = 5, /obj/item/fish/firefish = 5, /obj/item/fish/dwarf_moonfish = 5, @@ -73,6 +195,18 @@ /obj/item/fish/needlefish = 5, /obj/item/fish/armorfish = 5, /obj/item/fish/zipzap = 5, +<<<<<<< HEAD +======= + /obj/item/fish/stingray = 4, + /obj/item/fish/monkfish = 4, + /obj/item/fish/swordfish = 3, + ) + fish_counts = list( + /obj/item/fish/swordfish = 2, + ) + fish_count_regen = list( + /obj/item/fish/swordfish = 5 MINUTES, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Ocean dimension (Fishing portal generator)" fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10 @@ -80,6 +214,15 @@ overlay_state = "portal_ocean" radial_state = "seaboat" +<<<<<<< HEAD +======= +/datum/fish_source/portal/ocean/on_fishing_spot_init(datum/component/fishing_spot/spot) + ADD_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) + +/datum/fish_source/portal/ocean/on_fishing_spot_del(datum/component/fishing_spot/spot) + REMOVE_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/portal/hyperspace fish_table = list( FISHING_DUD = 5, @@ -104,6 +247,19 @@ /obj/item/fish/donkfish = 5, /obj/item/fish/emulsijack = 5, /obj/item/fish/jumpercable = 5, +<<<<<<< HEAD +======= + /obj/item/fish/chainsawfish = 2, + /obj/item/fish/pike/armored = 2, + ) + fish_counts = list( + /obj/item/fish/chainsawfish = 1, + /obj/item/fish/pike/armored = 1, + ) + fish_count_regen = list( + /obj/item/fish/chainsawfish = 7 MINUTES, + /obj/item/fish/pike/armored = 7 MINUTES, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Syndicate dimension (Fishing portal generator)" radial_name = "Syndicate" @@ -155,8 +311,13 @@ challenge.bait_bounce_mult = clamp(challenge.bait_bounce_mult + (rand(-3, 3) * 0.1), 0.1, 1) challenge.completion_loss = max(challenge.completion_loss + rand(-2, 2), 0) challenge.completion_gain = max(challenge.completion_gain + rand(-1, 1), 2) +<<<<<<< HEAD challenge.short_jump_velocity_limit += rand(-100, 100) challenge.long_jump_velocity_limit += rand(-100, 100) +======= + challenge.mover.short_jump_velocity_limit += rand(-100, 100) + challenge.mover.long_jump_velocity_limit += rand(-100, 100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/active_effects = bitfield_to_list(FISHING_MINIGAME_ACTIVE_EFFECTS) for(var/effect in active_effects) if(prob(30)) @@ -318,16 +479,30 @@ /obj/item/clothing/gloves/bracer = 2, /obj/effect/decal/remains/human = 2, /obj/item/fish/mastodon = 1, +<<<<<<< HEAD +======= + /obj/item/fishing_rod/telescopic/master = 1, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) fish_counts = list( /obj/item/clothing/gloves/bracer = 1, /obj/effect/decal/remains/human = 1, /obj/item/fish/mastodon = 1, +<<<<<<< HEAD ) fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 15 #define RANDOM_SEED "Random seed" +======= + /obj/item/fishing_rod/telescopic/master = 1, + ) + fish_count_regen = list( + /obj/item/fish/mastodon = 8 MINUTES, + ) + fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 15 + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/hydro_tray catalog_description = "Hydroponics trays" fish_table = list( @@ -371,7 +546,11 @@ return ..() /datum/fish_source/hydro_tray/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot) +<<<<<<< HEAD if(reward_path != RANDOM_SEED) +======= + if(reward_path != FISHING_RANDOM_SEED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/created_reward = ..() if(istype(created_reward)) created_reward.name = "small [created_reward.name]" @@ -392,5 +571,8 @@ var/picked_path = pick(seeds_to_draw_from) return new picked_path(get_turf(fishing_spot)) +<<<<<<< HEAD #undef RANDOM_SEED +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm index 5fdd296d7fc..0b0b6bd4edd 100644 --- a/code/modules/food_and_drinks/machinery/coffeemaker.dm +++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm @@ -731,7 +731,11 @@ coffeepot.reagents.add_reagent_list(reagent_delta) qdel(reference_bean) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // remove the coffee beans from the machine coffee.Cut(1,2) coffee_amount-- diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm index f698ebe39e0..3977ecf4ec2 100644 --- a/code/modules/food_and_drinks/machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm @@ -15,7 +15,11 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( /obj/item/reagent_containers/hypospray/medipen, //letting medipens become edible opens them to being injected/drained with IV drip & saltshakers ))) +<<<<<<< HEAD /obj/machinery/deepfryer//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/machinery/deepfryer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "deep fryer" desc = "Deep fried everything." icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm index b6af0cf143d..da8cb97a1ce 100644 --- a/code/modules/food_and_drinks/machinery/gibber.dm +++ b/code/modules/food_and_drinks/machinery/gibber.dm @@ -1,4 +1,8 @@ +<<<<<<< HEAD /obj/machinery/gibber//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/machinery/gibber +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "gibber" desc = "The name isn't descriptive enough?" icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm index 8d0aa921a7b..ebcdebe870b 100644 --- a/code/modules/food_and_drinks/machinery/grill.dm +++ b/code/modules/food_and_drinks/machinery/grill.dm @@ -3,7 +3,11 @@ ///The fuel amount used to actually grill the item #define GRILL_FUELUSAGE_ACTIVE 5 +<<<<<<< HEAD /obj/machinery/grill //SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +======= +/obj/machinery/grill +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Barbeque grill" desc = "Just like the old days. Smokes items over a light heat" icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/icecream_vat.dm b/code/modules/food_and_drinks/machinery/icecream_vat.dm index 355601693b9..9c77da57ff4 100644 --- a/code/modules/food_and_drinks/machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/machinery/icecream_vat.dm @@ -1,5 +1,9 @@ ///How many units of a reagent is needed to make a cone. +<<<<<<< HEAD #define CONE_REAGENET_NEEDED 1 +======= +#define CONE_REAGENT_NEEDED 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The vat is set to dispense ice cream. #define VAT_MODE_ICECREAM "ice cream" @@ -242,7 +246,11 @@ ///Makes an ice cream cone of the make_type, using ingredients list as reagents used to make it. Puts in user's hand if possible. /obj/machinery/icecream_vat/proc/make_cone(mob/user, make_type, list/ingredients) for(var/reagents_needed in ingredients) +<<<<<<< HEAD if(!reagents.has_reagent(reagents_needed, CONE_REAGENET_NEEDED)) +======= + if(!reagents.has_reagent(reagents_needed, CONE_REAGENT_NEEDED)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "not enough ingredients!") return var/cone_type = cone_prototypes[make_type].type @@ -251,7 +259,11 @@ var/obj/item/food/icecream/cone = new cone_type(src) for(var/reagents_used in ingredients) +<<<<<<< HEAD reagents.remove_reagent(reagents_used, CONE_REAGENET_NEEDED) +======= + reagents.remove_reagent(reagents_used, CONE_REAGENT_NEEDED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert_to_viewers("cooks up [cone.name]", "cooks up [cone.name]") try_put_in_hand(cone, user) @@ -262,14 +274,22 @@ CRASH("[user] was making ice cream of [selected_flavour] but had no flavor datum for it!") for(var/reagents_needed in flavor.ingredients) +<<<<<<< HEAD if(!reagents.has_reagent(reagents_needed, CONE_REAGENET_NEEDED)) +======= + if(!reagents.has_reagent(reagents_needed, CONE_REAGENT_NEEDED)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "not enough ingredients!") return var/should_use_custom_ingredients = (flavor.takes_custom_ingredients && custom_ice_cream_beaker && custom_ice_cream_beaker.reagents.total_volume) if(flavor.add_flavour(source, should_use_custom_ingredients ? custom_ice_cream_beaker.reagents : null)) for(var/reagents_used in flavor.ingredients) +<<<<<<< HEAD reagents.remove_reagent(reagents_used, CONE_REAGENET_NEEDED) +======= + reagents.remove_reagent(reagents_used, CONE_REAGENT_NEEDED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert_to_viewers("scoops [selected_flavour]", "scoops [selected_flavour]") if(istype(cone)) @@ -297,4 +317,8 @@ #undef VAT_MODE_ICECREAM #undef VAT_MODE_CONES +<<<<<<< HEAD #undef CONE_REAGENET_NEEDED +======= +#undef CONE_REAGENT_NEEDED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm index 56fd1869261..762bbd0dbf0 100644 --- a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm @@ -31,9 +31,15 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) . = ..() cube_production = 0 for(var/datum/stock_part/servo/servo in component_parts) +<<<<<<< HEAD cube_production += servo.tier * 0.2 // SKYRAT EDIT CHANGE - buffs to allow 1.2 cubes per monkey at T4 - ORIGINAL: cube_production += manipulator.tier * 0.1 for(var/datum/stock_part/matter_bin/matter_bin in component_parts) cube_production += matter_bin.tier * 0.2 // SKYRAT EDIT CHANGE - buffs to allow 1.2 cubes per monkey at T4 - ORIGINAL: cube_production += matter_bin.tier * 0.1 +======= + cube_production += servo.tier * 0.1 + for(var/datum/stock_part/matter_bin/matter_bin in component_parts) + cube_production += matter_bin.tier * 0.1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/monkey_recycler/examine(mob/user) . = ..() diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm index 9ddec8165ac..d2e03c9d183 100644 --- a/code/modules/food_and_drinks/machinery/processor.dm +++ b/code/modules/food_and_drinks/machinery/processor.dm @@ -1,6 +1,10 @@ #define PROCESSOR_SELECT_RECIPE(movable_input) LAZYACCESS(processor_inputs[type], movable_input.type) +<<<<<<< HEAD /obj/machinery/processor //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/machinery/processor +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "food processor" desc = "An industrial grinder used to process meat and other foods. Keep hands clear of intake area while operating." icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm index e93f0119097..c078be84703 100644 --- a/code/modules/food_and_drinks/machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/machinery/smartfridge.dm @@ -343,7 +343,11 @@ if(ismob(weapon.loc)) var/mob/owner = weapon.loc if(!owner.transferItemToLoc(weapon, src)) +<<<<<<< HEAD to_chat(usr, span_warning("\the [weapon] is stuck to your hand, you cannot put it in \the [src]!")) +======= + to_chat(owner, span_warning("\the [weapon] is stuck to your hand, you cannot put it in \the [src]!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE else @@ -476,15 +480,26 @@ .["isdryer"] = TRUE .["drying"] = drying +<<<<<<< HEAD /obj/machinery/smartfridge/drying/ui_act(action, params) +======= +/obj/machinery/smartfridge/drying/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) update_appearance() // This is to handle a case where the last item is taken out manually instead of through drying pop-out return +<<<<<<< HEAD switch(action) if("Dry") toggle_drying(FALSE, usr) +======= + var/mob/user = ui.user + switch(action) + if("Dry") + toggle_drying(FALSE, user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /obj/machinery/smartfridge/drying/powered() @@ -760,7 +775,10 @@ /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/spray, /obj/item/reagent_containers/medigel, +<<<<<<< HEAD /obj/item/reagent_containers/cup/vial, //SKYRAT EDIT ADDITION - HYPOSPRAYS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/chem_pack )) return is_type_in_typecache(weapon, chemfridge_typecache) diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm index b3db43009a0..2c33ce399bd 100644 --- a/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm +++ b/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm @@ -105,12 +105,18 @@ /datum/chemical_reaction/drink/coffee results = list(/datum/reagent/consumable/coffee = 5) required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5) +<<<<<<< HEAD pollutant_type = /datum/pollutant/food/coffee //SKYRAT EDIT ADDITION - Pollution +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/drink/tea results = list(/datum/reagent/consumable/tea = 5) required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5) +<<<<<<< HEAD pollutant_type = /datum/pollutant/food/tea //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/drink/cream_soda results = list(/datum/reagent/consumable/cream_soda = 4) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index e9a9405264a..8f78e2e1b9d 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -132,12 +132,16 @@ results = list(/datum/reagent/consumable/hot_ramen = 3) required_reagents = list(/datum/reagent/water = 1, /datum/reagent/consumable/dry_ramen = 3) +<<<<<<< HEAD pollutant_type = /datum/pollutant/food/spicy_noodles //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/food/hell_ramen results = list(/datum/reagent/consumable/hell_ramen = 6) required_reagents = list(/datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/hot_ramen = 6) +<<<<<<< HEAD pollutant_type = /datum/pollutant/food/spicy_noodles //SKYRAT EDIT ADDITION /datum/chemical_reaction/food/imitationcarpmeat @@ -146,6 +150,14 @@ mix_message = "The mixture becomes similar to carp meat." reaction_flags = REACTION_INSTANT +======= +/datum/chemical_reaction/food/imitationcarpmeat + required_reagents = list(/datum/reagent/toxin/carpotoxin = 5) + required_container = /obj/item/food/tofu + mix_message = "The mixture becomes similar to carp meat." + reaction_flags = REACTION_INSTANT + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/food/imitationcarpmeat/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/food/fishmeat/carp/imitation(location) diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm index 3ff29e194c7..41d1f1a4385 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -139,3 +139,10 @@ output = /obj/item/popsicle_stick food_multiplier = 3 preserve_materials = FALSE +<<<<<<< HEAD +======= + +/datum/food_processor_process/canned_ink + input = /obj/item/food/ink_sac + output = /obj/item/food/canned/squid_ink +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index 2b10fe169c2..aa3147ad6a6 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -710,7 +710,11 @@ /datum/chemical_reaction/food/soup/bloodsoup required_reagents = list( +<<<<<<< HEAD /datum/reagent/water/salt = 10, // SKYRAT EDIT CHANGE - ORIGINAL: /datum/reagent/water = 10, +======= + /datum/reagent/water = 10, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/blood = 10, ) required_ingredients = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm index e5589fcc42d..5a754361ffb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm @@ -1,6 +1,10 @@ // This is the home of drink related tablecrafting recipes, I have opted to only let players bottle fancy boozes to reduce the number of entries. +///Abstract types for all drink recipes that use bottles and result in another bottle, so that the message_in_a_bottle item is properly transferred. +/datum/crafting_recipe/bottled + parts = list(/obj/item/reagent_containers/cup/glass/bottle = 1) + ///////////////// Booze & Bottles /////////////////// /datum/crafting_recipe/lizardwine @@ -14,7 +18,7 @@ result = /obj/item/reagent_containers/cup/glass/bottle/lizardwine category = CAT_DRINK -/datum/crafting_recipe/moonshinejug +/datum/crafting_recipe/bottled/moonshinejug name = "Moonshine Jug" time = 30 reqs = list( @@ -24,7 +28,7 @@ result = /obj/item/reagent_containers/cup/glass/bottle/moonshine category = CAT_DRINK -/datum/crafting_recipe/hoochbottle +/datum/crafting_recipe/bottled/hoochbottle name = "Hooch Bottle" time = 30 reqs = list( @@ -35,7 +39,7 @@ result = /obj/item/reagent_containers/cup/glass/bottle/hooch category = CAT_DRINK -/datum/crafting_recipe/blazaambottle +/datum/crafting_recipe/bottled/blazaambottle name = "Blazaam Bottle" time = 20 reqs = list( @@ -45,7 +49,7 @@ result = /obj/item/reagent_containers/cup/glass/bottle/blazaam category = CAT_DRINK -/datum/crafting_recipe/champagnebottle +/datum/crafting_recipe/bottled/champagnebottle name = "Champagne Bottle" time = 30 reqs = list( @@ -55,7 +59,7 @@ result = /obj/item/reagent_containers/cup/glass/bottle/champagne category = CAT_DRINK -/datum/crafting_recipe/trappistbottle +/datum/crafting_recipe/bottled/trappistbottle name = "Trappist Bottle" time = 15 reqs = list( @@ -65,7 +69,7 @@ result = /obj/item/reagent_containers/cup/glass/bottle/trappist category = CAT_DRINK -/datum/crafting_recipe/goldschlagerbottle +/datum/crafting_recipe/bottled/goldschlagerbottle name = "Goldschlager Bottle" time = 30 reqs = list( @@ -75,7 +79,7 @@ result = /obj/item/reagent_containers/cup/glass/bottle/goldschlager category = CAT_DRINK -/datum/crafting_recipe/patronbottle +/datum/crafting_recipe/bottled/patronbottle name = "Patron Bottle" time = 30 reqs = list( @@ -87,7 +91,7 @@ ////////////////////// Non-alcoholic recipes /////////////////// -/datum/crafting_recipe/holybottle +/datum/crafting_recipe/bottled/holybottle name = "Holy Water Flask" time = 30 reqs = list( @@ -99,7 +103,7 @@ //flask of unholy water is a beaker for some reason, I will try making it a bottle and add it here once the antag freeze is over. t. kryson -/datum/crafting_recipe/nothingbottle +/datum/crafting_recipe/bottled/nothingbottle name = "Nothing Bottle" time = 30 reqs = list( @@ -116,7 +120,7 @@ reqs = list(/obj/item/stack/sheet/cardboard = 1) category = CAT_CONTAINERS -/datum/crafting_recipe/candycornliquor +/datum/crafting_recipe/bottled/candycornliquor name = "candy corn liquor" result = /obj/item/reagent_containers/cup/glass/bottle/candycornliquor time = 30 @@ -125,7 +129,7 @@ /obj/item/reagent_containers/cup/glass/bottle = 1) category = CAT_DRINK -/datum/crafting_recipe/kong +/datum/crafting_recipe/bottled/kong name = "Kong" result = /obj/item/reagent_containers/cup/glass/bottle/kong time = 30 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 4b78482867a..b630591895f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -282,7 +282,11 @@ category = CAT_MISCFOOD /datum/crafting_recipe/food/pacoca +<<<<<<< HEAD name = "Pacoca" +======= + name = "Paçoca" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reqs = list( /obj/item/food/grown/peanut = 2, /datum/reagent/consumable/sugar = 5, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 8ed91683c05..73df0deab24 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -67,7 +67,10 @@ /obj/item/food/grown/apple = 2, /obj/item/food/grown/grapes = 2, /obj/item/food/grown/banana = 2, +<<<<<<< HEAD /obj/item/food/watermelonslice = 2 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) result = /obj/item/food/salad/jungle diff --git a/code/modules/food_and_drinks/restaurant/_venue.dm b/code/modules/food_and_drinks/restaurant/_venue.dm index f8e171948a6..51273306243 100644 --- a/code/modules/food_and_drinks/restaurant/_venue.dm +++ b/code/modules/food_and_drinks/restaurant/_venue.dm @@ -237,8 +237,13 @@ if(linked_venue && linked_venue.restaurant_portal) //We're already linked, unlink us. if(linked_venue.open) linked_venue.close() +<<<<<<< HEAD linked_venue.restaurant_portal.linked_venue = null linked_venue.restaurant_portal = null +======= + linked_venue.restaurant_portal = null + linked_venue = null +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 linked_venue = chosen_venue linked_venue.restaurant_portal = src diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index c9011ad8c8a..d68ed01b267 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -310,7 +310,11 @@ /datum/customer_data/moth/proc/get_wings(mob/living/basic/robot_customer/customer) var/customer_ref = WEAKREF(customer) if (!LAZYACCESS(wings_chosen, customer_ref)) +<<<<<<< HEAD LAZYSET(wings_chosen, customer_ref, pick(SSaccessories.sprite_accessories["wings"])) // SKYRAT EDIT CHANGE - ORIGINAL: LAZYSET(wings_chosen, customer_ref, SSaccessories.moth_wings_list[pick(SSaccessories.moth_wings_list)]) +======= + LAZYSET(wings_chosen, customer_ref, SSaccessories.moth_wings_list[pick(SSaccessories.moth_wings_list)]) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return wings_chosen[customer_ref] /datum/customer_data/moth/get_underlays(mob/living/basic/robot_customer/customer) diff --git a/code/modules/hallucination/inhand_fake_item.dm b/code/modules/hallucination/inhand_fake_item.dm index cb787d217e1..b3ad8b9a33a 100644 --- a/code/modules/hallucination/inhand_fake_item.dm +++ b/code/modules/hallucination/inhand_fake_item.dm @@ -16,7 +16,11 @@ // These slots are human only, + they have to have a uniform var/mob/living/carbon/human/human_hallucinator = hallucinator +<<<<<<< HEAD if(istype(hallucinator) && human_hallucinator.w_uniform) +======= + if(istype(human_hallucinator) && human_hallucinator.w_uniform) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((valid_slots & ITEM_SLOT_BELT) && !human_hallucinator.belt) slots_free[ui_belt] = ITEM_SLOT_BELT if((valid_slots & ITEM_SLOT_LPOCKET) && !human_hallucinator.l_store) diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index b98d66f6bd2..38358cfe7c7 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -146,10 +146,17 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf data["emagged"] = TRUE data["emag_programs"] = emag_programs data["program"] = program +<<<<<<< HEAD data["can_toggle_safety"] = issilicon(user) || isAdminGhostAI(user) return data /obj/machinery/computer/holodeck/ui_act(action, params) +======= + data["can_toggle_safety"] = HAS_SILICON_ACCESS(user) + return data + +/obj/machinery/computer/holodeck/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 52df09c29cd..540f38f3641 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -526,7 +526,11 @@ return data +<<<<<<< HEAD /obj/machinery/biogenerator/ui_act(action, list/params) +======= +/obj/machinery/biogenerator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 6309ae8475b..142b9e0735e 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -20,7 +20,11 @@ /obj/item/seeds/cannabis/white, /obj/item/seeds/cannabis/ultimate, ) +<<<<<<< HEAD reagents_add = list(/datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS - axed lipolicide, replaced space drugs with thc +======= + reagents_add = list(/datum/reagent/drug/cannabis = 0.15) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/seeds/cannabis/rainbow @@ -44,7 +48,11 @@ plantname = "Deathweed" product = /obj/item/food/grown/cannabis/death mutatelist = null +<<<<<<< HEAD reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS +======= + reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/cannabis = 0.15) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rarity = 40 /obj/item/seeds/cannabis/white @@ -57,7 +65,11 @@ instability = 30 product = /obj/item/food/grown/cannabis/white mutatelist = null +<<<<<<< HEAD reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS +======= + reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/cannabis = 0.15) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rarity = 40 @@ -72,7 +84,11 @@ product = /obj/item/food/grown/cannabis/ultimate genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green, /datum/plant_gene/trait/modified_volume/omega_weed) mutatelist = null +<<<<<<< HEAD reagents_add = list(/datum/reagent/drug/thc = 0.3, //SKYRAT EDIT CHANGE - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, +======= + reagents_add = list(/datum/reagent/drug/cannabis = 0.3, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/toxin/mindbreaker = 0.3, /datum/reagent/mercury = 0.15, /datum/reagent/lithium = 0.15, @@ -80,7 +96,11 @@ /datum/reagent/drug/methamphetamine = 0.15, /datum/reagent/drug/bath_salts = 0.15, /datum/reagent/drug/krokodil = 0.15, +<<<<<<< HEAD // /datum/reagent/toxin/lipolicide = 0.15, // SKYRAT EDIT REMOVAL - MORE NARCOTICS +======= + /datum/reagent/toxin/lipolicide = 0.15, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/drug/nicotine = 0.1, ) rarity = 69 diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 47047f2e48c..5f2b195eac1 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -196,10 +196,15 @@ podman.faction |= factions if(!features["mcolor"]) features["mcolor"] = "#59CE00" +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START if(!features["pod_hair"]) features["pod_hair"] = pick(SSaccessories.pod_hair_list) */ //SKYRAT EDIT REMOVAL END - Tricolor Pod Hair +======= + if(!features["pod_hair"]) + features["pod_hair"] = pick(SSaccessories.pod_hair_list) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/V in quirks) new V(podman) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 8856667ae53..8a9ded9c007 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -987,9 +987,15 @@ to_chat(user, span_notice("The tray is empty.")) return if(myseed.apply_graft(snip)) +<<<<<<< HEAD to_chat(user, "You carefully integrate the grafted plant limb onto [myseed.plantname], granting it [snip.stored_trait.get_name()].") else to_chat(user, "You integrate the grafted plant limb onto [myseed.plantname], but it does not accept the [snip.stored_trait.get_name()] trait from the [snip].") +======= + to_chat(user, span_notice("You carefully integrate the grafted plant limb onto [myseed.plantname], granting it [snip.stored_trait.get_name()].")) + else + to_chat(user, span_notice("You integrate the grafted plant limb onto [myseed.plantname], but it does not accept the [snip.stored_trait.get_name()] trait from the [snip].")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(snip) return diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index f7c6d3088fb..708649fe866 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -202,7 +202,11 @@ return RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(squash_plant)) +<<<<<<< HEAD RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant)) +======= + RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant_if_not_caught)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(squash_plant)) /* @@ -239,6 +243,13 @@ qdel(our_plant) +<<<<<<< HEAD +======= +/datum/plant_gene/trait/squash/proc/squash_plant_if_not_caught(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) + if(!caught) + squash_plant(source, hit_atom) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery. * Applies other trait effects (teleporting, etc) to the target by signal. @@ -641,7 +652,11 @@ if(living_target.reagents && living_target.can_inject()) var/injecting_amount = max(1, our_seed.potency * 0.2) // Minimum of 1, max of 20 our_plant.reagents.trans_to(living_target, injecting_amount, methods = INJECT) +<<<<<<< HEAD to_chat(target, "You are pricked by [our_plant]!") +======= + to_chat(target, span_danger("You are pricked by [our_plant]!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_combat(our_plant, living_target, "pricked and attempted to inject reagents from [our_plant] to [living_target]. Last touched by: [our_plant.fingerprintslast].") our_plant.investigate_log("pricked and injected [key_name(living_target)] and injected [injecting_amount] reagents at [AREACOORD(living_target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index c558cba8b3e..7ea93fe25fc 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -260,6 +260,7 @@ seeds += list(seed_data) . = list() .["seeds"] = seeds +<<<<<<< HEAD /obj/machinery/seed_extractor/ui_static_data(mob/user) var/list/data = list() @@ -277,6 +278,25 @@ return data /obj/machinery/seed_extractor/ui_act(action, params) +======= + +/obj/machinery/seed_extractor/ui_static_data(mob/user) + var/list/data = list() + data["cycle_seconds"] = HYDROTRAY_CYCLE_DELAY / 10 + data["trait_db"] = list() + for(var/trait_path in subtypesof(/datum/plant_gene/trait)) + var/datum/plant_gene/trait/trait = new trait_path + var/trait_data = list(list( + "path" = trait.type, + "name" = trait.name, + "icon" = trait.icon, + "description" = trait.description + )) + data["trait_db"] += trait_data + return data + +/obj/machinery/seed_extractor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 3b151042042..60ecd1e0005 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -585,6 +585,7 @@ genes += new_trait.Copy() else . = FALSE +<<<<<<< HEAD // Adjust stats based on graft stats set_lifespan(round(max(lifespan, (lifespan + (2/3)*(snip.lifespan - lifespan))))) @@ -651,3 +652,60 @@ +======= + + // Adjust stats based on graft stats + set_lifespan(round(max(lifespan, (lifespan + (2/3)*(snip.lifespan - lifespan))))) + set_endurance(round(max(endurance, (endurance + (2/3)*(snip.endurance - endurance))))) + set_production(round(max(production, (production + (2/3)*(snip.production - production))))) + set_weed_rate(round(max(weed_rate, (weed_rate + (2/3)*(snip.weed_rate - weed_rate))))) + set_weed_chance(round(max(weed_chance, (weed_chance+ (2/3)*(snip.weed_chance - weed_chance))))) + set_yield(round(max(yield, (yield + (2/3)*(snip.yield - yield))))) + + // Add in any reagents, too. + reagents_from_genes() + + return + +/* + * Both `/item/food/grown` and `/item/grown` implement a seed variable which tracks + * plant statistics, genes, traits, etc. This proc gets the seed for either grown food or + * grown inedibles and returns it, or returns null if it's not a plant. + * + * Returns an `/obj/item/seeds` ref for grown foods or grown inedibles. + * - returned seed CAN be null in weird cases but in all applications it SHOULD NOT be. + * Returns null if it is not a plant. + */ +/obj/item/proc/get_plant_seed() + return null + +/obj/item/food/grown/get_plant_seed() + return seed + +/obj/item/grown/get_plant_seed() + return seed + +/obj/item/seeds/proc/perform_reagent_pollination(obj/item/seeds/donor) + var/list/datum/plant_gene/reagent/valid_reagents = list() + for(var/datum/plant_gene/reagent/donor_reagent in donor.genes) + var/repeated = FALSE + for(var/datum/plant_gene/reagent/receptor_reagent in genes) + if(donor_reagent.reagent_id == receptor_reagent.reagent_id) + if(receptor_reagent.rate < donor_reagent.rate) + receptor_reagent.rate = donor_reagent.rate + // sucessful pollination/upgrade, we stop here. + reagents_from_genes() + return + else + repeated = TRUE + break + + if(!repeated) + valid_reagents += donor_reagent + + if(length(valid_reagents)) + // pick a valid reagent that our receptor seed don't have and add the gene to it + var/datum/plant_gene/reagent/selected_reagent = pick(valid_reagents) + genes += selected_reagent.Copy() + reagents_from_genes() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 170000eb115..2a133fe8914 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -27,7 +27,11 @@ if(!ismob(music_player)) return STOP_PLAYING var/mob/user = music_player +<<<<<<< HEAD if(user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user)))) // sorry, no more TK playing. +======= + if(user.incapacitated || !((loc == user) || (isturf(loc) && Adjacent(user)))) // sorry, no more TK playing. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return STOP_PLAYING /obj/item/instrument/suicide_act(mob/living/user) diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index bbb41aafcae..d8e0ab8ba37 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -114,11 +114,14 @@ /// String. If set to a non-empty one, it will be the key for the policy text value to show this role on spawn. var/policy_index = "" +<<<<<<< HEAD //SKYRAT ADDITION START /// Job title to use for spawning. Allows a job to spawn without needing map edits. var/job_spawn_title //SKYRAT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// RPG job names, for the memes var/rpg_title @@ -141,10 +144,13 @@ /datum/job/New() . = ..() +<<<<<<< HEAD // SKYRAT EDIT START if(!job_spawn_title) job_spawn_title = title // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/new_spawn_positions = CHECK_MAP_JOB_CHANGE(title, "spawn_positions") if(isnum(new_spawn_positions)) spawn_positions = new_spawn_positions @@ -187,9 +193,15 @@ /// Announce that this job as joined the round to all crew members. /// Note the joining mob has no client at this point. +<<<<<<< HEAD /datum/job/proc/announce_job(mob/living/joining_mob, job_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: /datum/job/proc/announce_job(mob/living/joining_mob) if(head_announce) announce_head(joining_mob, head_announce, job_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: announce_head(joining_mob, head_announce) +======= +/datum/job/proc/announce_job(mob/living/joining_mob) + if(head_announce) + announce_head(joining_mob, head_announce) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Used for a special check of whether to allow a client to latejoin as this job. @@ -218,6 +230,7 @@ ) if(EMERGENCY_PAST_POINT_OF_NO_RETURN && prob(VERY_LATE_ARRIVAL_TOAST_PROB)) +<<<<<<< HEAD //equipping.equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK) // SKYRAT EDIT REMOVAL - See below // SKYRAT EDIT ADDITION - Lizards if(islizard(equipping)) @@ -225,6 +238,9 @@ else equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK) // SKYRAT EDIT ADDITION END - Lizards +======= + equip_to_slot_or_del(new /obj/item/food/griddle_toast(src), ITEM_SLOT_MASK) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef VERY_LATE_ARRIVAL_TOAST_PROB @@ -233,6 +249,7 @@ /mob/living/carbon/human/dress_up_as_job(datum/job/equipping, visual_only = FALSE, client/player_client, consistent = FALSE) dna.species.pre_equip_species_outfit(equipping, src, visual_only) +<<<<<<< HEAD equip_outfit_and_loadout(equipping.get_outfit(consistent), player_client?.prefs, visual_only, equipping) // SKYRAT EDIT CHANGE - Add equipping param // Original: /datum/job/proc/announce_head(mob/living/carbon/human/H, channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. @@ -240,6 +257,14 @@ if(H && GLOB.announcement_systems.len) //timer because these should come after the captain announcement SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), TYPE_PROC_REF(/obj/machinery/announcement_system, announce), "NEWHEAD", H.real_name, job_title, channels), 1)) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), TYPE_PROC_REF(/obj/machinery/announcement_system, announce), "NEWHEAD", H.real_name, H.job, channels), 1)) +======= + equip_outfit_and_loadout(equipping.get_outfit(consistent), player_client?.prefs, visual_only) + +/datum/job/proc/announce_head(mob/living/carbon/human/H, channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. + if(H && GLOB.announcement_systems.len) + //timer because these should come after the captain announcement + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), TYPE_PROC_REF(/obj/machinery/announcement_system, announce), "NEWHEAD", H.real_name, H.job, channels), 1)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/job/proc/player_old_enough(client/player) @@ -302,6 +327,7 @@ return TRUE /// Gets the message that shows up when spawning as this job +<<<<<<< HEAD /datum/job/proc/get_spawn_message(alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /datum/job/proc/get_spawn_message() SHOULD_NOT_OVERRIDE(TRUE) return examine_block(span_infoplain(jointext(get_spawn_message_information(alt_title), "\n• "))) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLED - ORIGINAL: return examine_block(span_infoplain(jointext(get_spawn_message_information(), "\n• "))) @@ -311,12 +337,27 @@ SHOULD_CALL_PARENT(TRUE) var/list/info = list() info += "You are the [alt_title].\n" // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: info += "You are the [title].\n" +======= +/datum/job/proc/get_spawn_message() + SHOULD_NOT_OVERRIDE(TRUE) + return examine_block(span_infoplain(jointext(get_spawn_message_information(), "\n• "))) + +/// Returns a list of strings that correspond to chat messages sent to this mob when they join the round. +/datum/job/proc/get_spawn_message_information() + SHOULD_CALL_PARENT(TRUE) + var/list/info = list() + info += "You are the [title].\n" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/related_policy = get_policy(title) var/radio_info = get_radio_information() if(related_policy) info += related_policy if(supervisors) +<<<<<<< HEAD info += "As the [alt_title == title ? alt_title : "[alt_title] ([title])"] you answer directly to [supervisors]. Special circumstances may change this." // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: info += "As the [title] you answer directly to [supervisors]. Special circumstances may change this." +======= + info += "As the [title] you answer directly to [supervisors]. Special circumstances may change this." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(radio_info) info += radio_info if(req_admin_notify) @@ -326,11 +367,14 @@ info += span_boldnotice("As this station was initially staffed with a \ [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] \ have been added to your ID card.") +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - ALTERNATIVE_JOB_TITLES if(alt_title != title) info += span_warning("Remember that alternate titles are purely for flavor and roleplay.") info += span_doyourjobidiot("Do not use your \"[alt_title]\" alt title as an excuse to forego your duties as a [title].") //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return info @@ -376,8 +420,11 @@ back = /obj/item/storage/backpack/messenger //Grey messenger bag if(DSATCHEL) back = satchel //Department satchel +<<<<<<< HEAD if(DMESSENGER) back = messenger //SKYRAT EDIT - Messenger Bags +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(DDUFFELBAG) back = duffelbag //Department duffel bag if(DMESSENGER) @@ -489,12 +536,17 @@ hangover_landmark.used = TRUE break return hangover_spawn_point || get_latejoin_spawn_point() +<<<<<<< HEAD /* if(length(GLOB.jobspawn_overrides[title])) return pick(GLOB.jobspawn_overrides[title]) */ // ORIGINAL CODE // SKYRAT EDIT START - Alt job titles if(length(GLOB.jobspawn_overrides[job_spawn_title])) return pick(GLOB.jobspawn_overrides[job_spawn_title]) // SKYRAT EDIT END +======= + if(length(GLOB.jobspawn_overrides[title])) + return pick(GLOB.jobspawn_overrides[title]) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/effect/landmark/start/spawn_point = get_default_roundstart_spawn_point() if(!spawn_point) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper return get_latejoin_spawn_point() @@ -504,7 +556,11 @@ /// Handles finding and picking a valid roundstart effect landmark spawn point, in case no uncommon different spawning events occur. /datum/job/proc/get_default_roundstart_spawn_point() for(var/obj/effect/landmark/start/spawn_point as anything in GLOB.start_landmarks_list) +<<<<<<< HEAD if(spawn_point.name != job_spawn_title) // SKYRAT EDIT - Alt job titles - ORIGINAL: if(spawn_point.name != title) +======= + if(spawn_point.name != title) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue . = spawn_point if(spawn_point.used) //so we can revert to spawning them on top of eachother if something goes wrong @@ -516,16 +572,25 @@ /// Finds a valid latejoin spawn point, checking for events and special conditions. /datum/job/proc/get_latejoin_spawn_point() +<<<<<<< HEAD /* if(length(GLOB.jobspawn_overrides[title])) return pick(GLOB.jobspawn_overrides[title]) */ // ORIGINAL CODE // SKYRAT EDIT START - Alt job titles if(length(GLOB.jobspawn_overrides[job_spawn_title])) //We're doing something special today. return pick(GLOB.jobspawn_overrides[job_spawn_title]) // SKYRAT EDIT END +======= + if(length(GLOB.jobspawn_overrides[title])) //We're doing something special today. + return pick(GLOB.jobspawn_overrides[title]) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(length(SSjob.latejoin_trackers)) return pick(SSjob.latejoin_trackers) return SSjob.get_last_resort_spawn_points() +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Spawns the mob to be played as, taking into account preferences and the desired spawn point. /datum/job/proc/get_spawn_mob(client/player_client, atom/spawn_point) var/mob/living/spawn_instance diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index b8c0e00bdad..4f39f014c1a 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -25,12 +25,16 @@ /datum/job/ai/after_spawn(mob/living/spawned, client/player_client) . = ..() +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //we may have been created after our borg if(SSticker.current_state == GAME_STATE_SETTING_UP) for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs) if(!R.connected_ai) R.TryConnectToAI() +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END var/mob/living/silicon/ai/ai_spawn = spawned ai_spawn.log_current_laws() @@ -56,6 +60,10 @@ sync_target.lawupdate = TRUE sync_target.show_laws() // SKYRAT EDIT ADDITION END +======= + var/mob/living/silicon/ai/ai_spawn = spawned + ai_spawn.log_current_laws() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/job/ai/get_roundstart_spawn_point() diff --git a/code/modules/jobs/job_types/assistant/assistant.dm b/code/modules/jobs/job_types/assistant/assistant.dm index 12e029f943f..5dfcfd54255 100644 --- a/code/modules/jobs/job_types/assistant/assistant.dm +++ b/code/modules/jobs/job_types/assistant/assistant.dm @@ -76,11 +76,14 @@ Assistant var/index = (jumpsuit_number % GLOB.colored_assistant.jumpsuits.len) + 1 +<<<<<<< HEAD // SKYRAT EDIT - Loadouts (we don't want jumpsuits to override the person's loadout item) if(modified_outfit_slots & ITEM_SLOT_ICLOTHING) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //We don't cache these, because they can delete on init //Too fragile, better to just eat the cost if (target.jumpsuit_style == PREF_SUIT) diff --git a/code/modules/jobs/job_types/assistant/gimmick_assistants.dm b/code/modules/jobs/job_types/assistant/gimmick_assistants.dm index 16c0e037844..2d13d7429da 100644 --- a/code/modules/jobs/job_types/assistant/gimmick_assistants.dm +++ b/code/modules/jobs/job_types/assistant/gimmick_assistants.dm @@ -129,7 +129,11 @@ mask = /obj/item/clothing/mask/whistle uniform = /obj/item/clothing/under/color/red +<<<<<<< HEAD //neck = /obj/item/camera SKYRAT EDIT REMOVAL +======= + neck = /obj/item/camera +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit_weight = 2 diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm old mode 100755 new mode 100644 diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm index e75dd7593e0..32e015a9019 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm @@ -705,6 +705,31 @@ hitsound = 'sound/weapons/bladeslice.ogg' menu_description = "A pointy spear which penetrates armor a little. Can be worn only on the belt." +<<<<<<< HEAD +======= +// Unholy version of above, since the gamemode is dead in the water + +/obj/item/brass_spear + name = "dull brass spear" + desc = "An ancient spear made of brass. The point seems sharp, but it feels so dull.. you get a feeling brass isn't good nonmagical material for a weapon." + icon = 'icons/obj/weapons/spear.dmi' + icon_state = "ratvarian_spear" + inhand_icon_state = "ratvarian_spear" + lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi' + righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi' + slot_flags = ITEM_SLOT_BELT + force = 15 + throw_speed = 3 + throw_range = 7 + throwforce = 15 + armour_penetration = 10 + sharpness = SHARP_POINTY + w_class = WEIGHT_CLASS_HUGE + attack_verb_continuous = list("stabs", "pokes", "slashes", "clocks") + attack_verb_simple = list("stab", "poke", "slash", "clock") + hitsound = 'sound/weapons/bladeslice.ogg' + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Nullblade - For when you really want to feel like rolling dice during combat /obj/item/nullrod/nullblade diff --git a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm index ec484ebe6eb..9287d0bd4cf 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm @@ -10,7 +10,11 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and desc = "This shard seems to be directly linked to some sinister entity. It might be your god! It also gives you a really horrible rash when you hold onto it for too long." items_to_create = list(/obj/item/vorpalscythe) +<<<<<<< HEAD /obj/item/organ/internal/cyberimp/arm/shard/scythe/Insert(mob/living/carbon/receiver, special, movement_flags) +======= +/obj/item/organ/internal/cyberimp/arm/shard/scythe/mob_insert(mob/living/carbon/receiver, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(receiver.mind) ADD_TRAIT(receiver.mind, TRAIT_MORBID, ORGAN_TRAIT) diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index fc131f9cbb4..3407ab79efb 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -22,6 +22,8 @@ departments_list = list( /datum/job_department/service, ) +<<<<<<< HEAD +======= mail_goodies = list( /obj/item/food/grown/banana = 100, @@ -37,7 +39,26 @@ job_flags = STATION_JOB_FLAGS job_tone = "honk" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + mail_goodies = list( + /obj/item/food/grown/banana = 100, + /obj/item/food/pie/cream = 50, + /obj/item/spess_knife = 20, // As a joke for clumsy clown from engineering department + /obj/item/clothing/shoes/clown_shoes/combat = 10, + /obj/item/reagent_containers/spray/waterflower/lube = 20, // lube + /obj/item/reagent_containers/spray/waterflower/superlube = 1 // Superlube, good lord. + ) + +<<<<<<< HEAD + family_heirlooms = list(/obj/item/bikehorn/golden) + rpg_title = "Jester" + job_flags = STATION_JOB_FLAGS + + job_tone = "honk" + +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/job/clown/after_spawn(mob/living/spawned, client/player_client) . = ..() if(!ishuman(spawned)) diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index a3172c44407..75d0422fa99 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -45,10 +45,16 @@ backpack_contents = list( /obj/item/barcodescanner = 1, /obj/item/choice_beacon/hero = 1, +<<<<<<< HEAD /obj/item/glassblowing/magnifying_glass, //SKYRAT EDIT: Magnifying Glass ) belt = /obj/item/modular_computer/pda/curator ears = /obj/item/radio/headset/headset_srv +======= + ) + belt = /obj/item/modular_computer/pda/curator + ears = /obj/item/radio/headset/headset_srvent +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shoes = /obj/item/clothing/shoes/laceup l_pocket = /obj/item/laser_pointer/green r_pocket = /obj/item/key/displaycase @@ -56,6 +62,21 @@ accessory = /obj/item/clothing/accessory/pocketprotector/full +<<<<<<< HEAD +======= +/datum/outfit/job/curator/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return ..() + + /// There can be only one cameraman on this station, and no, not that kind + var/static/cameraman_choosen = FALSE + if(!cameraman_choosen) + backpack_contents[/obj/item/broadcast_camera] = 1 + cameraman_choosen = TRUE + return ..() + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/job/curator/post_equip(mob/living/carbon/human/translator, visualsOnly = FALSE) ..() diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 92094073033..841d02836a7 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -3,7 +3,11 @@ description = "Assist the crew, follow your laws, obey your AI." auto_deadmin_role_flags = DEADMIN_POSITION_SILICON faction = FACTION_STATION +<<<<<<< HEAD total_positions = 3 // SKYRAT EDIT: Original value (0) +======= + total_positions = 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 spawn_positions = 3 supervisors = "your laws and the AI" //Nodrak spawn_type = /mob/living/silicon/robot @@ -29,6 +33,7 @@ spawned.gender = NEUTER var/mob/living/silicon/robot/robot_spawn = spawned robot_spawn.notify_ai(AI_NOTIFICATION_NEW_BORG) +<<<<<<< HEAD //SKYRAT EDIT START var/list/malf_ais = list() var/list/regular_ais = list() @@ -55,6 +60,8 @@ robot_spawn.lawupdate = TRUE robot_spawn.show_laws() //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!robot_spawn.connected_ai) // Only log if there's no Master AI robot_spawn.log_current_laws() diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 5e34e78eeeb..efb96548e9b 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -57,14 +57,22 @@ /obj/item/melee/baton = 1, /obj/item/storage/box/evidence = 1, ) +<<<<<<< HEAD belt = /obj/item/storage/belt/holster/detective/full // SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/modular_computer/pda/detective +======= + belt = /obj/item/modular_computer/pda/detective +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ears = /obj/item/radio/headset/headset_sec/alt gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat mask = /obj/item/cigarette neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown +<<<<<<< HEAD l_pocket = /obj/item/modular_computer/pda/detective // SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/toy/crayon/white +======= + l_pocket = /obj/item/toy/crayon/white +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 r_pocket = /obj/item/lighter chameleon_extras = list( diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 17dcf4d0b50..f5bf4df63e2 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -55,7 +55,10 @@ suit_store = /obj/item/gun/energy/e_gun backpack_contents = list( /obj/item/evidencebag = 1, +<<<<<<< HEAD /obj/item/choice_beacon/security_pistol = 1, //Skyrat Addition +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) belt = /obj/item/modular_computer/pda/heads/hos ears = /obj/item/radio/headset/heads/hos/alt diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index eba86ec2af0..3d9e6e6ebe1 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -131,7 +131,11 @@ return FALSE if(!user.is_holding(src)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!user.mind) return FALSE diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 53d220da80a..9e488c2c04c 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -3,7 +3,11 @@ description = "Keep yourself occupied in permabrig." department_head = list("The Security Team") faction = FACTION_STATION +<<<<<<< HEAD total_positions = 12 // SKYRAT EDIT: Original value (0) +======= + total_positions = 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 spawn_positions = 2 supervisors = "the security team" exp_granted_type = EXP_TYPE_CREW @@ -14,7 +18,11 @@ plasmaman_outfit = /datum/outfit/plasmaman/prisoner display_order = JOB_DISPLAY_ORDER_PRISONER +<<<<<<< HEAD department_for_prefs = /datum/job_department/assistant // SKYRAT EDIT - ORIGINAL: /datum/job_department/security +======= + department_for_prefs = /datum/job_department/security +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exclusive_mail_goodies = TRUE mail_goodies = list ( diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index cc03854957c..4d6bc37b50d 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -49,6 +49,13 @@ belt = /obj/item/storage/belt/utility/full ears = /obj/item/radio/headset/headset_sci l_pocket = /obj/item/modular_computer/pda/roboticist +<<<<<<< HEAD +======= + + backpack = /obj/item/storage/backpack/science + satchel = /obj/item/storage/backpack/satchel/science + duffelbag = /obj/item/storage/backpack/duffelbag/science +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pda_slot = ITEM_SLOT_LPOCKET skillchips = list(/obj/item/skillchip/job/roboticist) diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index d0c340156c3..f2ec6d4c5f5 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -5,8 +5,13 @@ auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY department_head = list(JOB_HEAD_OF_SECURITY) faction = FACTION_STATION +<<<<<<< HEAD total_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() //SKYRAT EDIT: SET TO 8, WAS 5 spawn_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() //SKYRAT EDIT: SEE ABOVE +======= + total_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() + spawn_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 supervisors = "the Head of Security, and the head of your assigned department (if applicable)" minimal_player_age = 7 exp_requirements = 300 @@ -28,7 +33,11 @@ /datum/job_department/security, ) +<<<<<<< HEAD family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec/peacekeeper) //SKYRAT EDIT ADD - /peacekeeper +======= + family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mail_goodies = list( /obj/item/food/donut/caramel = 10, @@ -60,24 +69,35 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) /datum/job/security_officer/after_roundstart_spawn(mob/living/spawning, client/player_client) . = ..() +<<<<<<< HEAD //SKYRAT EDIT REMOVAL /* if(ishuman(spawning)) setup_department(spawning, player_client) */ //SKYRAT EDIT END +======= + if(ishuman(spawning)) + setup_department(spawning, player_client) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/job/security_officer/after_latejoin_spawn(mob/living/spawning) . = ..() +<<<<<<< HEAD //SKYRAT EDIT REMOVAL /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(spawning)) var/department = setup_department(spawning, spawning.client) if(department) announce_latejoin(spawning, department, GLOB.security_officer_distribution) +<<<<<<< HEAD */ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns the department this mob was assigned to, if any. @@ -223,14 +243,22 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, +<<<<<<< HEAD /obj/item/choice_beacon/security_pistol = 1, //SKYRAT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) belt = /obj/item/modular_computer/pda/security ears = /obj/item/radio/headset/headset_sec/alt gloves = /obj/item/clothing/gloves/color/black/security +<<<<<<< HEAD head = /obj/item/clothing/head/security_garrison //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/helmet/sec shoes = /obj/item/clothing/shoes/jackboots/sec glasses = /obj/item/clothing/glasses/hud/security //SKYRAT EDIT - ADDITION +======= + head = /obj/item/clothing/head/helmet/sec + shoes = /obj/item/clothing/shoes/jackboots/sec +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 232af2e89f9..c4d7490937d 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -40,7 +40,10 @@ /obj/item/flashlight/seclite = 1, /obj/item/knife/combat/survival = 1, /obj/item/mining_voucher = 1, +<<<<<<< HEAD /obj/item/suit_voucher = 1, //SKYRAT EDIT: Suit_Voucher is an addition +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/marker_beacon/ten = 1, /obj/item/t_scanner/adv_mining_scanner/lesser = 1, ) diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 78240da4baf..2da00196358 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -36,7 +36,12 @@ /obj/item/storage/box/handcuffs = 10, /obj/item/storage/box/teargas = 10, /obj/item/storage/box/flashbangs = 10, +<<<<<<< HEAD /obj/item/storage/box/rubbershot = 10 +======= + /obj/item/storage/box/rubbershot = 10, + /obj/item/storage/box/lethalshot = 5 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) rpg_title = "Jailor" job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT @@ -47,7 +52,11 @@ id_trim = /datum/id_trim/job/warden uniform = /obj/item/clothing/under/rank/security/warden +<<<<<<< HEAD suit = /obj/item/clothing/suit/armor/vest/warden //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/suit/armor/vest/warden/alt +======= + suit = /obj/item/clothing/suit/armor/vest/warden/alt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, @@ -56,7 +65,11 @@ ears = /obj/item/radio/headset/headset_sec/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses gloves = /obj/item/clothing/gloves/color/black/security +<<<<<<< HEAD head = /obj/item/clothing/head/hats/warden //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/hats/warden/red +======= + head = /obj/item/clothing/head/hats/warden/red +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shoes = /obj/item/clothing/shoes/jackboots/sec l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 255210f2481..c7f5b381e47 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -25,6 +25,7 @@ GLOBAL_LIST_INIT(exp_specialmap, list( ROLE_SYNDICATE_DRONE, ROLE_VENUSHUMANTRAP, ROLE_GHOST_ROLE, +<<<<<<< HEAD //Skyrat Edit Start - Custom Ghost roles ROLE_BLACK_MARKET_DEALER, ROLE_DS2, @@ -32,6 +33,8 @@ GLOBAL_LIST_INIT(exp_specialmap, list( ROLE_GHOST_CAFE, ROLE_PORT_TARKON, //Skyrat Edit Start - End Custom Ghost roles +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), // Ghost roles EXP_TYPE_GHOST = list() // dead people, observers )) diff --git a/code/modules/language/_language_menu.dm b/code/modules/language/_language_menu.dm index 0bfb7a79977..cde1dcea441 100644 --- a/code/modules/language/_language_menu.dm +++ b/code/modules/language/_language_menu.dm @@ -56,7 +56,11 @@ return data +<<<<<<< HEAD /datum/language_menu/ui_act(action, params) +======= +/datum/language_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/language/nekomimetic.dm b/code/modules/language/nekomimetic.dm index 39a968c9213..ff07b3ea45f 100644 --- a/code/modules/language/nekomimetic.dm +++ b/code/modules/language/nekomimetic.dm @@ -6,7 +6,11 @@ syllables = list( "neko", "nyan", "mimi", "moe", "mofu", "fuwa", "kyaa", "kawaii", "poka", "munya", "puni", "munyu", "ufufu", "uhuhu", "icha", "doki", "kyun", "kusu", "nya", "nyaa", +<<<<<<< HEAD "desu", "kis", "ama", "chuu", "baka", "hewo", "boop", "gatto", "kit", "sune", "yori", //SKYRAT EDIT gatto +======= + "desu", "kis", "ama", "chuu", "baka", "hewo", "boop", "gato", "kit", "sune", "yori", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sou", "baka", "chan", "san", "kun", "mahou", "yatta", "suki", "usagi", "domo", "ori", "uwa", "zaazaa", "shiku", "puru", "ira", "heto", "etto" ) diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm index 5221dc80474..e8f099d3531 100644 --- a/code/modules/library/bibles.dm +++ b/code/modules/library/bibles.dm @@ -186,7 +186,11 @@ GLOBAL_LIST_INIT(bibleitemstates, list( return FALSE if(!istype(user) || !user.is_holding(src)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(user.mind?.holy_role != HOLY_ROLE_HIGHPRIEST) return FALSE diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index a65159a3f82..1f0bbcab208 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -80,7 +80,11 @@ GLOBAL_VAR_INIT(library_table_modified, 0) data["params_changed"] = params_changed return data +<<<<<<< HEAD /obj/machinery/computer/libraryconsole/ui_act(action, params) +======= +/obj/machinery/computer/libraryconsole/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -424,7 +428,11 @@ GLOBAL_VAR_INIT(library_table_modified, 0) scanner = WEAKREF(foundya) return foundya +<<<<<<< HEAD /obj/machinery/computer/libraryconsole/bookmanagement/ui_act(action, params) +======= +/obj/machinery/computer/libraryconsole/bookmanagement/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //The parent call takes care of stuff like searching, don't forget about that yeah? . = ..() if(.) diff --git a/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm b/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm new file mode 100644 index 00000000000..cfe61b08e0c --- /dev/null +++ b/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm @@ -0,0 +1,37 @@ +#define TAUNT_STAMINA_COST 19 + +/obj/item/skillchip/matrix_taunt + name = "BULLET_DODGER skillchip" + skill_name = "Taunt 2 Dodge" + skill_description = "At the cost of stamina, your taunts can also be used to dodge incoming projectiles." + skill_icon = FA_ICON_SPINNER + activate_message = span_notice("You feel the urge to taunt scenically as if you are the 'Chosen One'.") + deactivate_message = span_notice("The urge to taunt goes away.") + +/obj/item/skillchip/matrix_taunt/on_activate(mob/living/carbon/user, silent = FALSE) + . = ..() + RegisterSignal(user, COMSIG_MOB_EMOTED("taunt"), PROC_REF(on_taunt)) + RegisterSignal(user, COMSIG_MOB_PRE_EMOTED, PROC_REF(check_if_we_can_taunt)) + +/obj/item/skillchip/matrix_taunt/on_deactivate(mob/living/carbon/user, silent=FALSE) + UnregisterSignal(user, list(COMSIG_MOB_EMOTED("taunt"), COMSIG_MOB_PRE_EMOTED)) + return ..() + +///Prevent players from stamcritting from INTENTIONAL flips. 1.4s of bullet immunity isn't worth several secs of stun. +/obj/item/skillchip/matrix_taunt/proc/check_if_we_can_taunt(mob/living/source, key, params, type_override, intentional, datum/emote/emote) + SIGNAL_HANDLER + if(key != "taunt" || !intentional) + return + if((source.maxHealth - (source.getStaminaLoss() + TAUNT_STAMINA_COST)) <= source.crit_threshold) + source.balloon_alert(source, "too tired!") + return COMPONENT_CANT_EMOTE + +/obj/item/skillchip/matrix_taunt/proc/on_taunt(mob/living/source) + SIGNAL_HANDLER + if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)) + return + ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT) + source.adjustStaminaLoss(TAUNT_STAMINA_COST) + addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), TAUNT_EMOTE_DURATION * 1.5) + +#undef TAUNT_STAMINA_COST diff --git a/code/modules/library/skill_learning/generic_skillchips/point.dm b/code/modules/library/skill_learning/generic_skillchips/point.dm new file mode 100644 index 00000000000..761a4822689 --- /dev/null +++ b/code/modules/library/skill_learning/generic_skillchips/point.dm @@ -0,0 +1,99 @@ +/** + * A skillchip that gives the user bigger arrows when pointing at things (like some id trims do). + * As a bonus, they can costumize the color of the arrow/pointer too. + */ +/obj/item/skillchip/big_pointer + name = "Kommand skillchip" + desc = "A biochip detailing various techniques employed by historical leaders to points at things like a true boss." + skill_name = "Enhanced pointing" + skill_description = "Learn to point at things in a more noticeable way." + skill_icon = FA_ICON_ARROW_DOWN + activate_message = span_notice("From \"The Definitive Compendium of Body Language for the Aspiring Leader\", page 164, paragraph 3...") + deactivate_message = span_notice("So, uh, yeah, how do I point at things again?") + + ///The action for changing the pointer color + var/datum/action/change_pointer_color/action + +/obj/item/skillchip/big_pointer/Destroy() + action = null + return ..() + +/obj/item/skillchip/big_pointer/on_activate(mob/living/carbon/user, silent=FALSE) + . = ..() + RegisterSignal(user, COMSIG_MOVABLE_POINTED, PROC_REF(fancier_pointer)) + if(!action) + action = new(src) + action.Grant(user) + +/obj/item/skillchip/big_pointer/on_deactivate(mob/living/carbon/user, silent=FALSE) + UnregisterSignal(user, COMSIG_MOVABLE_POINTED) + action?.arrow_color = null + action?.arrow_overlay = null + action?.Remove(user) + return ..() + +/obj/item/skillchip/big_pointer/proc/fancier_pointer(mob/living/user, atom/pointed, obj/effect/temp_visual/point/point) + SIGNAL_HANDLER + if(HAS_TRAIT(user, TRAIT_UNKNOWN)) + return + point.cut_overlays() + if(!action.arrow_color) + point.icon_state = "arrow_large" + return + point.icon_state = "arrow_large_white" + point.color = action.arrow_color + var/mutable_appearance/highlight = mutable_appearance(point.icon, "arrow_large_white_highlights", appearance_flags = RESET_COLOR) + point.add_overlay(highlight) + +/datum/action/change_pointer_color + name = "Change Pointer Color" + desc = "Set your custom pointer color, or reset it to the default." + button_icon = /obj/effect/temp_visual/point::icon + button_icon_state = "arrow_large_still" + check_flags = AB_CHECK_CONSCIOUS + ///the color of our arrow + var/arrow_color + ///the arrow overlay shown on the button + var/mutable_appearance/arrow_overlay + +/datum/action/change_pointer_color/Destroy() + . = ..() + arrow_overlay = null + +/datum/action/change_pointer_color/Trigger(trigger_flags) + . = ..() + if(!.) + return + var/mob/user = owner + if(!arrow_color) + pick_color(user) + return + var/choice = tgui_alert(owner, "Reset or update pointer color?","Pointer Color", list("Reset","Update")) + if(user != owner || !choice || !IsAvailable(feedback = TRUE)) + return + if(choice == "Update") + pick_color(user) + else + arrow_color = null + owner.balloon_alert(owner, "pointer reset") + build_all_button_icons(update_flags = UPDATE_BUTTON_ICON, force = TRUE) + +/datum/action/change_pointer_color/proc/pick_color(mob/user) + var/ncolor = input(owner, "Pick new color", "Pointer Color", arrow_color) as color|null + if(user != owner || !IsAvailable(feedback = TRUE)) + return + arrow_color = ncolor + owner.balloon_alert(owner, "pointer updated") + build_all_button_icons(update_flags = UPDATE_BUTTON_ICON, force = TRUE) + +/datum/action/change_pointer_color/apply_button_icon(atom/movable/screen/movable/action_button/current_button, force = FALSE) + if(!arrow_color) + return ..() + + current_button.icon = current_button.icon_state = null + current_button.cut_overlay(arrow_overlay) + + arrow_overlay = mutable_appearance(icon = /obj/effect/temp_visual/point::icon, icon_state = "arrow_large_white_still") + arrow_overlay.color = arrow_color + arrow_overlay.overlays += mutable_appearance(icon = /obj/effect/temp_visual/point::icon, icon_state = "arrow_large_white_still_highlights", appearance_flags = RESET_COLOR) + current_button.add_overlay(arrow_overlay) diff --git a/code/modules/library/skill_learning/skill_station.dm b/code/modules/library/skill_learning/skill_station.dm index b376501f758..046042280d1 100644 --- a/code/modules/library/skill_learning/skill_station.dm +++ b/code/modules/library/skill_learning/skill_station.dm @@ -252,7 +252,11 @@ current_skills += list(skill_chip.get_chip_data()) .["current"] = current_skills +<<<<<<< HEAD /obj/machinery/skill_station/ui_act(action, list/params) +======= +/obj/machinery/skill_station/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 30c239160e5..8bcaef0553f 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -93,7 +93,12 @@ return FALSE LAZYADD(new_atom_host.light_sources, src) +<<<<<<< HEAD if(ismovable(new_atom_host) && new_atom_host == source_atom) +======= + //yes, we register the signal to the top atom too, this is intentional and ensures contained lighting updates properly + if(ismovable(new_atom_host)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(new_atom_host, COMSIG_MOVABLE_MOVED, PROC_REF(update_host_lights)) RegisterSignal(new_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT, PROC_REF(force_update)) return TRUE @@ -104,7 +109,11 @@ return FALSE LAZYREMOVE(old_atom_host.light_sources, src) +<<<<<<< HEAD if(ismovable(old_atom_host) && old_atom_host == source_atom) +======= + if(ismovable(old_atom_host)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(old_atom_host, COMSIG_MOVABLE_MOVED) UnregisterSignal(old_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT) return TRUE diff --git a/code/modules/loadout/categories/accessories.dm b/code/modules/loadout/categories/accessories.dm index 4a180bc3745..15e6daf8db4 100644 --- a/code/modules/loadout/categories/accessories.dm +++ b/code/modules/loadout/categories/accessories.dm @@ -52,11 +52,17 @@ manager.preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) return TRUE // Update UI +<<<<<<< HEAD /datum/loadout_item/accessory/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement_preference // SKYRAT EDIT CHANGE if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.accessory) LAZYADD(outfit.backpack_contents, outfit.accessory) // SKYRAT EDIT END +======= +/datum/loadout_item/accessory/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) + if(outfit.accessory) + LAZYADD(outfit.backpack_contents, outfit.accessory) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit.accessory = item_path /datum/loadout_item/accessory/on_equip_item( diff --git a/code/modules/loadout/categories/glasses.dm b/code/modules/loadout/categories/glasses.dm index 75c16e74d45..41cdacfc518 100644 --- a/code/modules/loadout/categories/glasses.dm +++ b/code/modules/loadout/categories/glasses.dm @@ -8,11 +8,17 @@ /datum/loadout_item/glasses abstract_type = /datum/loadout_item/glasses +<<<<<<< HEAD /datum/loadout_item/glasses/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement // SKYRAT EDIT CHANGE if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.glasses) LAZYADD(outfit.backpack_contents, outfit.glasses) // SKYRAT EDIT END +======= +/datum/loadout_item/glasses/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) + if(outfit.glasses) + LAZYADD(outfit.backpack_contents, outfit.glasses) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit.glasses = item_path /datum/loadout_item/glasses/prescription_glasses diff --git a/code/modules/loadout/categories/heads.dm b/code/modules/loadout/categories/heads.dm index 5d491cc63c5..d542ad940f9 100644 --- a/code/modules/loadout/categories/heads.dm +++ b/code/modules/loadout/categories/heads.dm @@ -8,16 +8,23 @@ /datum/loadout_item/head abstract_type = /datum/loadout_item/head +<<<<<<< HEAD /datum/loadout_item/head/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement_preference +======= +/datum/loadout_item/head/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(equipper.dna?.species?.outfit_important_for_life) if(!visuals_only) to_chat(equipper, "Your loadout helmet was not equipped directly due to your species outfit.") LAZYADD(outfit.backpack_contents, item_path) else +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.head) LAZYADD(outfit.backpack_contents, outfit.head) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit.head = item_path /datum/loadout_item/head/beanie diff --git a/code/modules/loadout/categories/neck.dm b/code/modules/loadout/categories/neck.dm index 04a42a19da1..986cb9ba0c2 100644 --- a/code/modules/loadout/categories/neck.dm +++ b/code/modules/loadout/categories/neck.dm @@ -8,12 +8,17 @@ /datum/loadout_item/neck abstract_type = /datum/loadout_item/neck +<<<<<<< HEAD /datum/loadout_item/neck/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.neck) LAZYADD(outfit.backpack_contents, outfit.neck) outfit.neck = item_path // SKYRAT EDIT END +======= +/datum/loadout_item/neck/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) + outfit.neck = item_path +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/neck/scarf_greyscale name = "Scarf (Colorable)" diff --git a/code/modules/loadout/categories/pocket.dm b/code/modules/loadout/categories/pocket.dm index 2689c2b726e..b8a4a812747 100644 --- a/code/modules/loadout/categories/pocket.dm +++ b/code/modules/loadout/categories/pocket.dm @@ -79,7 +79,11 @@ name = "Lipstick (White)" item_path = /obj/item/lipstick/white additional_displayed_text = list("White") +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/pocket_items/plush abstract_type = /datum/loadout_item/pocket_items/plush can_be_named = TRUE @@ -193,4 +197,7 @@ /datum/loadout_item/pocket_items/d00 name = "D00" item_path = /obj/item/dice/d00 +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/loadout/loadout_categories.dm b/code/modules/loadout/loadout_categories.dm index c64a564b2ec..3991103902a 100644 --- a/code/modules/loadout/loadout_categories.dm +++ b/code/modules/loadout/loadout_categories.dm @@ -40,9 +40,12 @@ if(found_type == initial(found_type.abstract_type)) continue +<<<<<<< HEAD if(!initial(found_type.item_path)) // SKYRAT EDIT ADDITION continue +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!ispath(initial(found_type.item_path), /obj/item)) stack_trace("Loadout get_items(): Attempted to instantiate a loadout item ([found_type]) with an invalid or null typepath! (got path: [initial(found_type.item_path)])") continue diff --git a/code/modules/loadout/loadout_helpers.dm b/code/modules/loadout/loadout_helpers.dm index ee270693ced..fafb6c1e8f9 100644 --- a/code/modules/loadout/loadout_helpers.dm +++ b/code/modules/loadout/loadout_helpers.dm @@ -15,8 +15,12 @@ datum/outfit/outfit = /datum/outfit, datum/preferences/preference_source, visuals_only = FALSE, +<<<<<<< HEAD datum/job/equipping, ) // SKYRAT EDIT CHANGE - Added equipping param +======= +) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(preference_source)) return equipOutfit(outfit, visuals_only) @@ -30,6 +34,7 @@ var/list/preference_list = preference_source.read_preference(/datum/preference/loadout) var/list/loadout_datums = loadout_list_to_datums(preference_list) +<<<<<<< HEAD var/obj/item/storage/briefcase/empty/travel_suitcase // SKYRAT EDIT ADDITIONi var/loadout_placement_preference = preference_source.read_preference(/datum/preference/choiced/loadout_override_preference) // Slap our things into the outfit given @@ -71,6 +76,15 @@ // SKYRAT EDIT END // Handle any snowflake on_equips. +======= + // Slap our things into the outfit given + for(var/datum/loadout_item/item as anything in loadout_datums) + item.insert_path_into_outfit(equipped_outfit, src, visuals_only) + // Equip the outfit loadout items included + if(!equipped_outfit.equip(src, visuals_only)) + return FALSE + // Handle any snowflake on_equips +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/new_contents = get_all_gear() var/update = NONE for(var/datum/loadout_item/item as anything in loadout_datums) @@ -113,6 +127,7 @@ datums += actual_datum return datums +<<<<<<< HEAD // SKYRAT EDIT ADDITION /* @@ -140,3 +155,5 @@ /obj/item/storage/briefcase/empty/PopulateContents() return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm index b4a51206392..370eb735775 100644 --- a/code/modules/loadout/loadout_items.dm +++ b/code/modules/loadout/loadout_items.dm @@ -42,7 +42,11 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) var/can_be_greyscale = FALSE /// Whether this item can be renamed. /// I recommend you apply this sparingly becuase it certainly can go wrong (or get reset / overridden easily) +<<<<<<< HEAD var/can_be_named = TRUE // SKYRAT EDIT +======= + var/can_be_named = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Whether this item can be reskinned. /// Only works if the item has a "unique reskin" list set. var/can_be_reskinned = FALSE @@ -61,6 +65,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) /// Reskin options of this item if it can be reskinned. VAR_FINAL/list/cached_reskin_options +<<<<<<< HEAD //SKYRAT EDIT ADDITION /// If set, it's a list containing ckeys which only can get the item var/list/ckeywhitelist @@ -78,6 +83,8 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) var/erp_item = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/New(category) src.category = category @@ -102,6 +109,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) cached_reskin_options = dummy_item.unique_reskin.Copy() qdel(dummy_item) +<<<<<<< HEAD // SKYRAT EDIT ADDITION // Let's sanitize in case somebody inserted the player's byond name instead of ckey in canonical form if(ckeywhitelist) @@ -109,6 +117,8 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) ckeywhitelist[i] = ckey(ckeywhitelist[i]) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/Destroy(force, ...) if(force) stack_trace("QDEL called on loadout item [type]. This shouldn't ever happen. (Use FORCE if necessary.)") @@ -134,6 +144,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if("set_name") if(can_be_named) +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Description return set_name(manager, user, INFO_NAMED) @@ -141,6 +152,9 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(can_be_named) return set_name(manager, user, INFO_DESCRIBED) // SKYRAT EDIT END +======= + return set_name(manager, user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("set_skin") return set_skin(manager, user, params) @@ -195,6 +209,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) return TRUE // update UI /// Sets the name of the item. +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Adds descriptions with minimal copypaste // Generally, if this conflicts, name_slot is to be put anywhere where INFO_NAMED appears in tgcode /datum/loadout_item/proc/set_name(datum/preference_middleware/loadout/manager, mob/user, name_slot = INFO_NAMED) @@ -206,6 +221,16 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) title = "[name] [isname ? "name" : "description"]", default = loadout?[item_path]?[name_slot], // plop in existing name (if any) max_length = isname ? MAX_NAME_LEN : MAX_DESC_LEN, +======= +/datum/loadout_item/proc/set_name(datum/preference_middleware/loadout/manager, mob/user) + var/list/loadout = manager.preferences.read_preference(/datum/preference/loadout) + var/input_name = tgui_input_text( + user = user, + message = "What name do you want to give the [name]? Leave blank to clear.", + title = "[name] name", + default = loadout?[item_path]?[INFO_NAMED], // plop in existing name (if any) + max_length = MAX_NAME_LEN, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) if(QDELETED(src) || QDELETED(user) || QDELETED(manager) || QDELETED(manager.preferences)) return FALSE @@ -215,6 +240,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) return FALSE if(input_name) +<<<<<<< HEAD loadout[item_path][name_slot] = input_name else if(input_name == "") loadout[item_path] -= name_slot @@ -222,6 +248,14 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) manager.preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) return FALSE // no update needed // SKYRAT EDIT END +======= + loadout[item_path][INFO_NAMED] = input_name + else if(input_name == "") + loadout[item_path] -= INFO_NAMED + + manager.preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) + return FALSE // no update needed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Used for reskinning an item to an alt skin. /datum/loadout_item/proc/set_skin(datum/preference_middleware/loadout/manager, mob/user, params) @@ -250,7 +284,11 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) * * equipper - If we're equipping out outfit onto a mob at the time, this is the mob it is equipped on. Can be null. * * visual - If TRUE, then our outfit is only for visual use (for example, a preview). */ +<<<<<<< HEAD /datum/loadout_item/proc/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement_preference +======= +/datum/loadout_item/proc/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!visuals_only) LAZYADD(outfit.backpack_contents, item_path) @@ -286,6 +324,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) equipped_item.set_greyscale(item_details[INFO_GREYSCALE]) update_flag |= equipped_item.slot_flags +<<<<<<< HEAD // SKYRAT EDIT BEGIN - DESCRIPTIONS~ if(can_be_named && !visuals_only) var/renamed = 0 @@ -298,6 +337,11 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(renamed) ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout") // SKYRAT EDIT END +======= + if(can_be_named && item_details?[INFO_NAMED] && !visuals_only) + equipped_item.name = trim(item_details[INFO_NAMED], PREVENT_CHARACTER_TRIM_LOSS(MAX_NAME_LEN)) + ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(can_be_reskinned && item_details?[INFO_RESKIN]) var/skin_chosen = item_details[INFO_RESKIN] @@ -334,6 +378,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) formatted_item["reskins"] = get_reskin_options() formatted_item["icon"] = ui_icon formatted_item["icon_state"] = ui_icon_state +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Extra loadout stuff formatted_item["ckey_whitelist"] = ckeywhitelist @@ -342,6 +387,8 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) formatted_item["blacklisted_roles"] = restricted_roles // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return formatted_item /** @@ -365,6 +412,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(can_be_reskinned) displayed_text += "Reskinnable" +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(donator_only) displayed_text += "Donator only" @@ -378,6 +426,8 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(restricted_species) displayed_text += "Species restricted" // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return displayed_text /** @@ -413,6 +463,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) "button_icon" = FA_ICON_PEN, "active_key" = INFO_NAMED, )) +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Descriptions UNTYPED_LIST_ADD(button_list, list( "label" = "Change description", @@ -421,6 +472,9 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) "active_key" = INFO_NAMED, )) // SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return button_list /** @@ -440,4 +494,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) )) return reskins +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/loadout/loadout_menu.dm b/code/modules/loadout/loadout_menu.dm index 0fdbe81ee81..51bae16e8ba 100644 --- a/code/modules/loadout/loadout_menu.dm +++ b/code/modules/loadout/loadout_menu.dm @@ -73,6 +73,7 @@ continue if(!item.category.handle_duplicate_entires(src, item, selected_item, loadout_datums)) return +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(!isnull(selected_item.ckeywhitelist) && !(preferences?.parent?.ckey in selected_item.ckeywhitelist)) to_chat(preferences.parent, span_warning("You cannot select this item!")) @@ -82,6 +83,8 @@ to_chat(preferences.parent, span_warning("This item is for donators only.")) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LAZYSET(loadout, selected_item.item_path, list()) preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) @@ -111,11 +114,14 @@ /datum/preference_middleware/loadout/get_ui_static_data(mob/user) var/list/data = list() data["loadout_preview_view"] = preferences.character_preview_view.assigned_map +<<<<<<< HEAD // SKYRAT EDIT START - EXPANDED LOADOUT data["ckey"] = user.ckey if(SSplayer_ranks.is_donator(user.client)) data["is_donator"] = TRUE // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /datum/preference_middleware/loadout/get_constant_data() diff --git a/code/modules/loadout/loadout_preference.dm b/code/modules/loadout/loadout_preference.dm index 739226f5da7..7d4b41632ab 100644 --- a/code/modules/loadout/loadout_preference.dm +++ b/code/modules/loadout/loadout_preference.dm @@ -16,7 +16,11 @@ // Sanitize on load to ensure no invalid paths from older saves get in /datum/preference/loadout/deserialize(input, datum/preferences/preferences) +<<<<<<< HEAD return sanitize_loadout_list(input, preferences.parent?.mob, preferences.parent) // SKYRAT EDIT CHANGE parent +======= + return sanitize_loadout_list(input, preferences.parent?.mob) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Default value is null - the loadout list is a lazylist /datum/preference/loadout/create_default_value(datum/preferences/preferences) @@ -31,7 +35,11 @@ * * Returns a list, or null if empty */ +<<<<<<< HEAD /datum/preference/loadout/proc/sanitize_loadout_list(list/passed_list, mob/optional_loadout_owner, client/owner_client) as /list // SKYRAT EDIT CHANGE - client/owner_client +======= +/datum/preference/loadout/proc/sanitize_loadout_list(list/passed_list, mob/optional_loadout_owner) as /list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/sanitized_list for(var/path in passed_list) // Loading from json has each path in the list as a string that we need to convert back to typepath @@ -52,6 +60,7 @@ You may want to check your loadout settings.")) continue +<<<<<<< HEAD // SKYRAT EDIT ADDITION else if(owner_client) var/datum/loadout_item/loadout_item = GLOB.all_loadout_datums[real_path] @@ -61,6 +70,8 @@ continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Set into sanitize list using converted path key var/list/data = passed_list[path] LAZYSET(sanitized_list, real_path, LAZYLISTDUPLICATE(data)) diff --git a/code/modules/logging/log_holder.dm b/code/modules/logging/log_holder.dm index b1a43c468df..c727344a80b 100644 --- a/code/modules/logging/log_holder.dm +++ b/code/modules/logging/log_holder.dm @@ -337,7 +337,11 @@ ADMIN_VERB(log_viewer_new, R_ADMIN|R_DEBUG, "View Round Logs", "View the rounds var/datum/data = data_list[key] if(isnull(data)) +<<<<<<< HEAD // do nothing - nulls are allowed +======= + pass() // nulls are allowed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(islist(data)) data = recursive_jsonify(data, semvers) diff --git a/code/modules/lootpanel/_lootpanel.dm b/code/modules/lootpanel/_lootpanel.dm index 45862ebf455..23133b4f720 100644 --- a/code/modules/lootpanel/_lootpanel.dm +++ b/code/modules/lootpanel/_lootpanel.dm @@ -56,13 +56,21 @@ /datum/lootpanel/ui_status(mob/user, datum/ui_state/state) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UI_DISABLED return UI_INTERACTIVE +<<<<<<< HEAD /datum/lootpanel/ui_act(action, list/params) +======= +/datum/lootpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm b/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm index f0368ba8c74..0af10ad49ae 100644 --- a/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm +++ b/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm @@ -14,7 +14,12 @@ baseturfs = /turf/open/water/cursed_spring planetary_atmos = TRUE initial_gas_mix = ICEMOON_DEFAULT_ATMOS +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL +======= + fishing_datum = /datum/fish_source/cursed_spring + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/water/cursed_spring/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(!isliving(arrived)) @@ -39,4 +44,7 @@ var/turf/return_turf = find_safe_turf(extended_safety_checks = TRUE, dense_atoms = FALSE) transformed_mob.forceMove(return_turf) to_chat(transformed_mob, span_notice("You blink and find yourself in [get_area_name(return_turf)].")) +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm index 860eb8c8168..a6025f8a9c4 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm @@ -161,7 +161,11 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) /obj/structure/necropolis_gate/legion_gate/attack_hand(mob/user, list/modifiers) if(!open && !changing_openness) var/safety = tgui_alert(user, "You think this might be a bad idea...", "Knock on the door?", list("Proceed", "Abort")) +<<<<<<< HEAD if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated()) +======= + if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]...")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE) diff --git a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm index ce50fcccc15..1085caeeaa9 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm @@ -140,7 +140,11 @@ ui = new(user, src, "VaultController", name) ui.open() +<<<<<<< HEAD /obj/machinery/computer/vaultcontroller/ui_act(action, params) +======= +/obj/machinery/computer/vaultcontroller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index 950bf8feae3..123a9f8527f 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -8,6 +8,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) icon_state = "hilbertshotel" w_class = WEIGHT_CLASS_SMALL resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF +<<<<<<< HEAD //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE + EXTRA STUFF var/list/static/hotel_maps = list("Generic", "Apartment", "Beach Condo", "Station Side", "Library") //standart - hilber's hotel room @@ -20,6 +21,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) var/datum/map_template/ghost_cafe_rooms/library/ghost_cafe_rooms_library //Skyrat EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/map_template/hilbertshotel/hotelRoomTemp var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty var/datum/map_template/hilbertshotel/lore/hotelRoomTempLore @@ -38,6 +41,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) hotelRoomTemp = new() hotelRoomTempEmpty = new() hotelRoomTempLore = new() +<<<<<<< HEAD //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE ghost_cafe_rooms_apartment = new() ghost_cafe_rooms_beach_condo = new() @@ -45,6 +49,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) ghost_cafe_rooms_library = new() //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/area/currentArea = get_area(src) if(currentArea.type == /area/ruin/space/has_grav/powered/hilbertresearchfacility/secretroom) ruinSpawned = TRUE @@ -91,12 +97,20 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) to_chat(target, span_warning("You too far away from \the [src] to enter it!")) // If the target is incapacitated after selecting a room, they're not allowed to teleport. +<<<<<<< HEAD if(target.incapacitated()) to_chat(target, span_warning("You aren't able to activate \the [src] anymore!")) // Has the user thrown it away or otherwise disposed of it such that it's no longer in their hands or in some storage connected to them? // if(!(get_atom_on_turf(src, /mob) == user)) SKYRAT EDIT ORIGINAL if(!Adjacent(user)) // SKYRAT EDIT -- Ghost Cafe Static Hilbertspawner +======= + if(target.incapacitated) + to_chat(target, span_warning("You aren't able to activate \the [src] anymore!")) + + // Has the user thrown it away or otherwise disposed of it such that it's no longer in their hands or in some storage connected to them? + if(!(get_atom_on_turf(src, /mob) == user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user == target) to_chat(user, span_warning("\The [src] is no longer in your possession!")) else @@ -114,11 +128,14 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) else if(!user.dropItemToGround(src)) to_chat(user, span_warning("You can't seem to drop \the [src]! It must be stuck to your hand somehow! Prepare for unforeseen consequences...")) +<<<<<<< HEAD //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE var/chosen_room = "Nothing" if(istype(src, /obj/item/hilbertshotel/ghostdojo)) //to don't add another one var chosen_room = tgui_input_list(user, "Choose desired room:", "Time to choose", hotel_maps) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!storageTurf) //Blame subsystems for not allowing this to be in Initialize if(!GLOB.hhStorageTurf) var/datum/map_template/hilbertshotelstorage/storageTemp = new() @@ -132,7 +149,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) return if(tryStoredRoom(chosenRoomNumber, target)) return +<<<<<<< HEAD sendToNewRoom(chosenRoomNumber, target, chosen_room) //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE. Was sendToNewRoom(chosenRoomNumber, target) +======= + sendToNewRoom(chosenRoomNumber, target) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/hilbertshotel/proc/tryActiveRoom(roomNumber, mob/user) if(activeRooms["[roomNumber]"]) @@ -178,13 +199,18 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) return TRUE return FALSE +<<<<<<< HEAD /obj/item/hilbertshotel/proc/sendToNewRoom(roomNumber, mob/user, chosen_room) //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE. Was sendToNewRoom(roomNumber, mob/user) +======= +/obj/item/hilbertshotel/proc/sendToNewRoom(roomNumber, mob/user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/turf_reservation/roomReservation = SSmapping.request_turf_block_reservation(hotelRoomTemp.width, hotelRoomTemp.height, 1) var/turf/bottom_left = roomReservation.bottom_left_turfs[1] var/datum/map_template/load_from = hotelRoomTemp if(ruinSpawned && roomNumber == GLOB.hhMysteryRoomNumber) load_from = hotelRoomTempLore +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - GHOST HOTEL UPDATE //else if(chosen_room == "Apartment") // load_from = ghost_cafe_rooms_apartment @@ -202,6 +228,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) else if(chosen_room == "Library") load_from = ghost_cafe_rooms_library //BUBBER EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 load_from.load(bottom_left) activeRooms["[roomNumber]"] = roomReservation @@ -437,9 +465,13 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) has_gravity = TRUE area_flags = NOTELEPORT | HIDDEN_AREA static_lighting = TRUE +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - GHOST HOTEL UPDATE ambientsounds = list('sound/ambience/servicebell.ogg') SKYRAT EDIT END */ +======= + ambientsounds = list('sound/ambience/servicebell.ogg') +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/roomnumber = 0 var/obj/item/hilbertshotel/parentSphere var/datum/turf_reservation/reservation diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 47dca7b438e..0f559193fca 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -167,7 +167,10 @@ // Cache for sonic speed var/list/to_rebuild = SSair.adjacent_rebuild +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // iterate over turfs in the border and clear them from active atmos processing for(var/turf/border_turf as anything in CORNER_BLOCK_OFFSET(T, width + 2, height + 2, -1, -1)) SSair.remove_from_active(border_turf) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index a1503b7f634..72033371a11 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -133,7 +133,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) return FALSE return TRUE +<<<<<<< HEAD /obj/machinery/computer/auxiliary_base/ui_act(action, params) +======= +/obj/machinery/computer/auxiliary_base/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/boulder_processing/boulder.dm b/code/modules/mining/boulder_processing/boulder.dm index 342afe8abe5..5e637fd94e6 100644 --- a/code/modules/mining/boulder_processing/boulder.dm +++ b/code/modules/mining/boulder_processing/boulder.dm @@ -107,7 +107,10 @@ * @param override_speed_multiplier The speed multiplier to use if weapon is null. The do_after will take 2 * this value seconds to complete. * @param continued Whether or not this is a continued process, or the first one. If true, we don't play the "You swing at the boulder" message. */ +<<<<<<< HEAD /* SKYRAT EDIT OVERRIDE! Check the module:mining boulder.dm! +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/boulder/proc/manual_process(obj/item/weapon, mob/living/user, override_speed_multiplier, continued = FALSE) var/process_speed = 0 //Handle weapon conditions. @@ -150,7 +153,11 @@ var/msg = (durability == 1 ? "is crumbling!" : "looks weaker!") to_chat(user, span_notice("\The [src] [msg]")) manual_process(weapon, user, override_speed_multiplier, continued = TRUE) +<<<<<<< HEAD */ +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * This function is called while breaking boulders manually, and drops ore based on the boulder's mineral content. * Quantity of ore spawned here is 1 less than if the boulder was processed by a machine, but clamped at 10 maximum, 1 minimum. diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 62f4924aa65..adcb68d36e7 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT START - OVERRIDEN IN modular_skyrat/master_files/code/modules/mining/equipment/kinetic_crusher.dm +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Kinetic Crusher * @@ -229,8 +232,11 @@ new /obj/effect/temp_visual/kinetic_blast(hit_mineral) hit_mineral.gets_drilled(firer) return ..() +<<<<<<< HEAD */ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //trophies /obj/item/crusher_trophy diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index abf5ca77e18..627a3df64fa 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -285,7 +285,11 @@ /obj/item/trench_tool/proc/check_menu(mob/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src)) +======= + if(user.incapacitated || !user.Adjacent(src)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mining/equipment/monster_organs/monster_organ.dm b/code/modules/mining/equipment/monster_organs/monster_organ.dm index a854f113740..8484ec62a93 100644 --- a/code/modules/mining/equipment/monster_organs/monster_organ.dm +++ b/code/modules/mining/equipment/monster_organs/monster_organ.dm @@ -36,7 +36,11 @@ icon = 'icons/obj/medical/organs/mining_organs.dmi' icon_state = "hivelord_core" actions_types = list(/datum/action/cooldown/monster_core_action) +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_flags = NOBLUDGEON slot = ORGAN_SLOT_MONSTER_CORE organ_flags = ORGAN_ORGANIC @@ -66,10 +70,16 @@ deltimer(decay_timer) return ..() +<<<<<<< HEAD /obj/item/organ/internal/monster_core/Insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags) . = ..() if(!.) return +======= +/obj/item/organ/internal/monster_core/mob_insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags) + . = ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (inert) to_chat(target_carbon, span_notice("[src] breaks down as you try to insert it.")) qdel(src) @@ -80,7 +90,11 @@ target_carbon.visible_message(span_notice("[src] stabilizes as it's inserted.")) return TRUE +<<<<<<< HEAD /obj/item/organ/internal/monster_core/Remove(mob/living/carbon/target_carbon, special, movement_flags) +======= +/obj/item/organ/internal/monster_core/mob_remove(mob/living/carbon/target_carbon, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!inert && !special) owner.visible_message(span_notice("[src] rapidly decays as it's removed.")) go_inert() diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index cd5a60a22f2..8a06247f800 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -68,7 +68,11 @@ data["can_go_home"] = can_go_home return data +<<<<<<< HEAD /obj/machinery/mineral/labor_claim_console/ui_act(action, params) +======= +/obj/machinery/mineral/labor_claim_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 1401f8a5139..c4f62df1b17 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -197,9 +197,12 @@ pixel_y = base_pixel_y + rand(-4, 4) /obj/item/food/grown/ash_flora/shavings //So we can't craft bowls from everything. +<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_JOB //SKYRAT EDIT special_desc_jobs = list("Botanist") //SKYRAT EDIT special_desc = "You feel this flora would be unwise to consume while already full." //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 grind_results = list(/datum/reagent/toxin/mushroom_powder = 5) /obj/item/food/grown/ash_flora/mushroom_leaf @@ -257,6 +260,21 @@ seed = /obj/item/seeds/lavaland/fireblossom wine_power = 40 +/obj/item/food/grown/ash_flora/seraka + name = "seraka cap" + desc = "Small, deeply flavourful mushrooms originally native to Tizira." + icon_state = "seraka_cap" + seed = /obj/item/seeds/lavaland/seraka + wine_power = 40 + +/obj/item/food/grown/ash_flora/fireblossom + name = "fire blossom" + desc = "A flower from a fire blossom." + icon_state = "fireblossom" + slot_flags = ITEM_SLOT_HEAD + seed = /obj/item/seeds/lavaland/fireblossom + wine_power = 40 + //SEEDS /obj/item/seeds/lavaland @@ -405,6 +423,7 @@ if(!reagents.total_volume) icon_state = "mushroom_bowl" return ..() +<<<<<<< HEAD /obj/item/reagent_containers/cup/bowl/wood_bowl name = "wooden bowl" @@ -418,3 +437,5 @@ if(!reagents.total_volume) icon_state = "wood_bowl" return ..() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 2c0f7c85bf7..bb72cce8565 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -274,7 +274,10 @@ greyscale_colors = "#4d4d4d#808080" greyscale_config = /datum/greyscale_config/heck_suit greyscale_config_worn = /datum/greyscale_config/heck_suit/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/heck_suit/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = IS_PLAYER_COLORABLE_1 /datum/armor/hooded_hostile_environment @@ -323,7 +326,10 @@ greyscale_colors = "#4d4d4d#808080#ff3300" greyscale_config = /datum/greyscale_config/heck_helmet greyscale_config_worn = /datum/greyscale_config/heck_helmet/worn +<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/heck_helmet/worn/snouted //SKYRAT EDIT ADDITION - MuzzledGreyscale (Why does this use worn_digi) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/head/hooded/hostile_environment/Initialize(mapload) @@ -746,7 +752,11 @@ return var/mob/living/carbon/human/consumer = user +<<<<<<< HEAD var/random = rand(2,4) //SKYRAT EDIT - Commenting out #1 because it makes people invisible. +======= + var/random = rand(1,4) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(random) if(1) diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 3f0c18abcca..3748a9b09d7 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -557,7 +557,10 @@ var/obj/item/organ/external/wings/functional/wings = get_wing_choice(exposed_human, chest) wings = new wings() wings.Insert(exposed_human) +<<<<<<< HEAD exposed_human.dna.species.handle_mutant_bodyparts(exposed_human) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(exposed_human.loc, 'sound/items/poster_ripped.ogg', 50, TRUE, -1) exposed_human.apply_damage(20, def_zone = BODY_ZONE_CHEST, forced = TRUE, wound_bonus = CANT_WOUND) exposed_human.emote("scream") @@ -570,7 +573,11 @@ var/list/name2type = list() for(var/obj/item/organ/external/wings/functional/possible_type as anything in wing_types) var/datum/sprite_accessory/accessory = initial(possible_type.sprite_accessory_override) //get the type +<<<<<<< HEAD accessory = SSaccessories.sprite_accessories[initial(accessory.key)][initial(accessory.name)] //SKYRAT EDIT CHANGE - ORIGINAL: accessory = SSaccessories.wings_list[initial(accessory.name)] //get the singleton instance +======= + accessory = SSaccessories.wings_list[initial(accessory.name)] //get the singleton instance +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/image/img = image(icon = accessory.icon, icon_state = "m_wingsopen_[accessory.icon_state]_BEHIND") //Process the HUD elements img.transform *= 0.5 img.pixel_x = -32 @@ -595,10 +602,17 @@ var/turf/T = get_turf(src) var/ladder_x = T.x var/ladder_y = T.y +<<<<<<< HEAD to_chat(user, span_notice("You unfold the ladder. It does some unknowable, eldritch twisting and turning in a dance of form, seeming to invert and fold into itself - before a satisfying click rings out.")) //Skyrat Edit - Attempts to explain why it sometimes just 'dissapears' on some z-levels. var/last_ladder = null for(var/i in 1 to world.maxz) if(is_centcom_level(i) || is_reserved_level(i) || is_away_level(i) || is_spaceruins_level(i)) //Skyrat Edit: Stops Jacob's ladder from piercing problematic space ruins. +======= + to_chat(user, span_notice("You unfold the ladder. It extends much farther than you were expecting.")) + var/last_ladder = null + for(var/i in 1 to world.maxz) + if(is_centcom_level(i) || is_reserved_level(i) || is_away_level(i)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue var/turf/T2 = locate(ladder_x, ladder_y, i) last_ladder = new /obj/structure/ladder/unbreakable/jacob(T2, null, last_ladder) @@ -671,7 +685,10 @@ icon_state = "berserker" icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' +<<<<<<< HEAD worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hoodtype = /obj/item/clothing/head/hooded/berserker armor_type = /datum/armor/hooded_berserker cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 61318f63b92..9e64f192aba 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -94,7 +94,11 @@ /obj/machinery/mineral/processing_unit_console/ui_data(mob/user) return processing_machine.ui_data() +<<<<<<< HEAD /obj/machinery/mineral/processing_unit_console/ui_act(action, list/params) +======= +/obj/machinery/mineral/processing_unit_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 14460cffb1b..af76de7020d 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -297,7 +297,11 @@ return data +<<<<<<< HEAD /obj/machinery/mineral/ore_redemption/ui_act(action, params) +======= +/obj/machinery/mineral/ore_redemption/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 97c3a90b78e..26299d0f36f 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -143,7 +143,11 @@ return data +<<<<<<< HEAD /obj/machinery/ore_silo/ui_act(action, list/params) +======= +/obj/machinery/ore_silo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index c8a58a1d0f4..68ee9be3699 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -62,7 +62,11 @@ )) return data +<<<<<<< HEAD /obj/machinery/mineral/stacking_unit_console/ui_act(action, list/params) +======= +/obj/machinery/mineral/stacking_unit_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 7b9a56df1ea..21ad7a1d25f 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -94,7 +94,11 @@ desc = "Used to call and send the mining shuttle." circuit = /obj/item/circuitboard/computer/mining_shuttle shuttleId = "mining" +<<<<<<< HEAD possible_destinations = "mining_home;mining_away;landing_zone_dock" +======= + possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 no_destination_swap = TRUE //ATTACK HAND IGNORING PARENT RETURN VALUE diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index e9e8b3a7c3d..80f999c9437 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -517,7 +517,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE) var/oldloc = loc sleep(1.5 SECONDS) +<<<<<<< HEAD if(loc == oldloc && user && !user.incapacitated()) +======= + if(loc == oldloc && user && !user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \ span_notice("You flip [src]. It lands on [coinflip]."), \ span_hear("You hear the clattering of loose change.")) @@ -599,7 +603,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE) var/oldloc = loc sleep(1.5 SECONDS) +<<<<<<< HEAD if(loc == oldloc && user && !user.incapacitated()) +======= + if(loc == oldloc && user && !user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \ span_notice("You flip [src]. It lands on [coinflip]."), \ span_hear("You hear the clattering of loose change.")) diff --git a/code/modules/mining/satchel_ore_box.dm b/code/modules/mining/satchel_ore_box.dm index b94796b1614..6554955dd8a 100644 --- a/code/modules/mining/satchel_ore_box.dm +++ b/code/modules/mining/satchel_ore_box.dm @@ -95,7 +95,11 @@ return list("materials" = materials) +<<<<<<< HEAD /obj/structure/ore_box/ui_act(action, params) +======= +/obj/structure/ore_box/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/dead/new_player/latejoin_menu.dm b/code/modules/mob/dead/new_player/latejoin_menu.dm index d2db3aa34b7..6cd1e76fa41 100644 --- a/code/modules/mob/dead/new_player/latejoin_menu.dm +++ b/code/modules/mob/dead/new_player/latejoin_menu.dm @@ -35,7 +35,11 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) ui.open() /datum/latejoin_menu/proc/scream_at_player(mob/dead/new_player/player) +<<<<<<< HEAD if(istype(player) && !player.jobs_menu_mounted) +======= + if(!player.jobs_menu_mounted) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(player, span_notice("If the late join menu isn't showing, hold CTRL while clicking the join button!")) /datum/latejoin_menu/ui_data(mob/user) @@ -153,6 +157,7 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) tgui_alert(owner, "There is an administrative lock on entering the game for non-observers!", "Oh No!") return TRUE +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Flavourtext requirement if(CONFIG_GET(flag/min_flavor_text)) if(length_char(owner.client.prefs.read_preference(/datum/preference/text/flavor_text)) < CONFIG_GET(number/flavor_text_character_requirement)) @@ -160,6 +165,8 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Determines Relevent Population Cap var/relevant_cap var/hard_popcap = CONFIG_GET(number/hard_popcap) @@ -190,7 +197,10 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) return TRUE owner.vote_on_poll_handler(poll, params) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /// Gives the user a random job that they can join as, and prompts them if they'd actually like to keep it, rerolling if not. Cancellable by the user. diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index 91aa6b932e9..9b5f112cc00 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -31,12 +31,15 @@ if(GLOB.admin_notice) to_chat(src, span_notice("Admin Notice:\n \t [GLOB.admin_notice]")) +<<<<<<< HEAD //SKYRAT EDIT ADDITION var/soft_player_cap = CONFIG_GET(number/player_soft_cap) if(soft_player_cap >= TGS_CLIENT_COUNT) INVOKE_ASYNC(src, PROC_REF(connect_to_second_server)) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/spc = CONFIG_GET(number/soft_popcap) if(spc && living_player_count() >= spc) @@ -62,3 +65,7 @@ var/tl = SSticker.GetTimeLeft() to_chat(src, "Please set up your character and select \"Ready\". The game will start [tl > 0 ? "in about [DisplayTimeText(tl)]" : "soon"].") +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 50e8cae6eff..4e06b5ab883 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -5,7 +5,11 @@ invisibility = INVISIBILITY_ABSTRACT density = FALSE stat = DEAD +<<<<<<< HEAD //hud_type = /datum/hud/new_player SKYRAT EDIT REMOVAL +======= + hud_type = /datum/hud/new_player +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hud_possible = list() var/ready = FALSE @@ -74,10 +78,16 @@ if(SSlag_switch.measures[DISABLE_DEAD_KEYLOOP]) less_input_message = " - Notice: Observer freelook is currently disabled." // Don't convert this to tgui please, it's way too important +<<<<<<< HEAD var/this_is_like_playing_right = alert(usr, "Are you sure you wish to observe?[less_input_message]", "Observe", "Yes", "No") //SKYRAT EDIT CHANGE if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") ready = PLAYER_NOT_READY show_title_screen() // SKYRAT EDIT ADDITION +======= + var/this_is_like_playing_right = alert(usr, "Are you sure you wish to observe? You will not be able to play this round![less_input_message]", "Observe", "Yes", "No") + if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") + ready = PLAYER_NOT_READY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE hide_title_screen() // SKYRAT EDIT ADDITION - Skyrat Titlescreen @@ -121,6 +131,7 @@ return "Your account is not old enough for [jobtitle]." if(JOB_UNAVAILABLE_SLOTFULL) return "[jobtitle] is already filled to capacity." +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(JOB_NOT_VETERAN) return "You need to be veteran to join as [jobtitle]." @@ -135,6 +146,8 @@ if(JOB_UNAVAILABLE_AUGMENT) return "[jobtitle] is restricted due to your selected body augments." //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(JOB_UNAVAILABLE_ANTAG_INCOMPAT) return "[jobtitle] is not compatible with some antagonist role assigned to you." if(JOB_UNAVAILABLE_AGE) @@ -205,7 +218,10 @@ tgui_alert(usr, "There was an unexpected error putting you into your requested job. If you cannot join with any job, you should contact an admin.") return FALSE +<<<<<<< HEAD hide_title_screen()// SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mind.late_joiner = TRUE var/atom/destination = mind.assigned_role.get_latejoin_spawn_point() if(!destination) @@ -226,7 +242,11 @@ // If we already have a captain, are they a "Captain" rank and are we allowing multiple of them to be assigned? if(is_captain_job(job)) is_captain = IS_FULL_CAPTAIN +<<<<<<< HEAD captain_sound = ANNOUNCER_DEPARTMENTAL // SKYRAT EDIT CHANGE - Announcer Sounds +======= + captain_sound = 'sound/misc/announce.ogg' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If we don't have an assigned cap yet, check if this person qualifies for some from of captaincy. else if(!SSjob.assigned_captain && ishuman(character) && SSjob.chain_of_command[rank] && !is_banned_from(character.ckey, list(JOB_CAPTAIN))) is_captain = IS_ACTING_CAPTAIN @@ -244,18 +264,28 @@ humanc = character //Let's retypecast the var to be human, if(humanc) //These procs all expect humans +<<<<<<< HEAD // BEGIN SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES var/chosen_rank = humanc.client?.prefs.alt_job_titles[rank] || rank +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, chosen_rank) else +<<<<<<< HEAD announce_arrival(humanc, chosen_rank) // END SKYRAT EDIT CHANGE - customization +======= + announce_arrival(humanc, rank) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddEmploymentContract(humanc) humanc.increment_scar_slot() humanc.load_persistent_scars() +<<<<<<< HEAD SSpersistence.load_modular_persistence(humanc.get_organ_slot(ORGAN_SLOT_BRAIN)) // SKYRAT EDIT ADDITION - MODULAR_PERSISTENCE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(GLOB.curse_of_madness_triggered) give_madness(humanc, GLOB.curse_of_madness_triggered) @@ -275,7 +305,11 @@ SSquirks.AssignQuirks(humanc, humanc.client) if(humanc) // Quirks may change manifest datapoints, so inject only after assigning quirks +<<<<<<< HEAD GLOB.manifest.inject(humanc, humanc.client) // SKYRAT EDIT - Added humanc.client - ALTERNATIVE_JOB_TITLES +======= + GLOB.manifest.inject(humanc) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/area/station/arrivals = GLOB.areas_by_type[/area/station/hallway/secondary/entry] if(humanc && arrivals && !arrivals.power_environ) //arrivals depowered @@ -293,6 +327,7 @@ /mob/dead/new_player/proc/create_character(atom/destination) spawning = TRUE +<<<<<<< HEAD hide_title_screen() // SKYRAT EDIT ADDITION - titlescreen mind.active = FALSE //we wish to transfer the key manually @@ -309,6 +344,19 @@ preserved_mind.transfer_to(spawning_mob) //won't transfer key since the mind is not active preserved_mind.set_original_character(spawning_mob) +======= + mind.active = FALSE //we wish to transfer the key manually + var/mob/living/spawning_mob = mind.assigned_role.get_spawn_mob(client, destination) + if(QDELETED(src) || !client) + return // Disconnected while checking for the appearance ban. + if(!isAI(spawning_mob)) // Unfortunately there's still snowflake AI code out there. + // transfer_to sets mind to null + var/datum/mind/preserved_mind = mind + preserved_mind.original_character_slot_index = client.prefs.default_slot + preserved_mind.transfer_to(spawning_mob) //won't transfer key since the mind is not active + preserved_mind.set_original_character(spawning_mob) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LAZYADD(client.player_details.joined_as_slots, "[client.prefs.default_slot]") client.init_verbs() . = spawning_mob diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index cd5111c235c..cba0858b165 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -31,7 +31,10 @@ var/obj/item/bodypart/chest/chest = character.get_bodypart(BODY_ZONE_CHEST) chest.add_bodypart_overlay(new /datum/bodypart_overlay/simple/sixpack() ) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Goes through all quirks that can be used in hardcore mode and select some based on a random budget. * Returns the new value to be gained with this setup, plus the previously earned score. @@ -93,10 +96,17 @@ highest_pref = job_preferences[job] return preview_job +<<<<<<< HEAD /* SKYRAT EDIT REMOVE - MOVED TO MASTER FILES /datum/preferences/proc/render_new_preview_appearance(mob/living/carbon/human/dummy/mannequin) var/datum/job/preview_job = get_highest_priority_job() mannequin.dna.mutant_bodyparts = list() +======= + +/datum/preferences/proc/render_new_preview_appearance(mob/living/carbon/human/dummy/mannequin, show_job_clothes = TRUE) + var/datum/job/no_job = SSjob.GetJobType(/datum/job/unassigned) + var/datum/job/preview_job = get_highest_priority_job() || no_job +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(preview_job) // Silicons only need a very basic preview since there is no customization for them. @@ -128,4 +138,7 @@ mannequin.add_quirk(quirk_type, parent) return mannequin.appearance +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm index c239817a30e..5b9f3461793 100644 --- a/code/modules/mob/dead/observer/login.dm +++ b/code/modules/mob/dead/observer/login.dm @@ -7,9 +7,12 @@ ghost_others = client.prefs.read_preference(/datum/preference/choiced/ghost_others) var/preferred_form = null +<<<<<<< HEAD if(isAdminGhostAI(src)) has_unlimited_silicon_privilege = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(client.prefs.unlock_content) preferred_form = client.prefs.read_preference(/datum/preference/choiced/ghost_form) ghost_orbit = client.prefs.read_preference(/datum/preference/choiced/ghost_orbit) diff --git a/code/modules/mob/dead/observer/notificationprefs.dm b/code/modules/mob/dead/observer/notificationprefs.dm index 802da5e2b80..dcdd5264371 100644 --- a/code/modules/mob/dead/observer/notificationprefs.dm +++ b/code/modules/mob/dead/observer/notificationprefs.dm @@ -38,7 +38,11 @@ "desc" = GLOB.poll_ignore_desc[key] )) +<<<<<<< HEAD /datum/notificationpanel/ui_act(action, params) +======= +/datum/notificationpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 54988593a97..efef8e7e51f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -317,12 +317,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!HAS_TRAIT(src, TRAIT_CORPSELOCKED)) //corpse-locked have to confirm with the alert below ghostize(TRUE) return TRUE +<<<<<<< HEAD // SKYRAT EDIT ADDITION -- Free Ghost Cafe Ghosting if(HAS_TRAIT(src, TRAIT_FREE_GHOST)) ghostize(TRUE) // Can return with TRUE return TRUE // SKYRAT EDIT ADDITION END var/response = tgui_alert(usr, "Are you sure you want to ghost? If you ghost whilst still alive you cannot re-enter your body!", "Confirm Ghost Observe", list("Ghost", "Stay in Body")) +======= + var/response = tgui_alert(usr, "Are you sure you want to ghost? You won't be able to re-enter your body!", "Confirm Ghost Observe", list("Ghost", "Stay in Body")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(response != "Ghost") return FALSE//didn't want to ghost after-all ghostize(FALSE) // FALSE parameter is so we can never re-enter our body. U ded. @@ -381,7 +385,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!mind || QDELETED(mind.current)) to_chat(src, span_warning("You have no body.")) return +<<<<<<< HEAD if(!can_reenter_corpse && !mind.has_antag_datum(/datum/antagonist/changeling)) //SKYRAT EDIT +======= + if(!can_reenter_corpse) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("You cannot re-enter your body.")) return if(mind.current.key && mind.current.key[1] != "@") //makes sure we don't accidentally kick any clients @@ -414,6 +422,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp // Update med huds current_mob.med_hud_set_status() current_mob.log_message("had their player ([key_name(src)]) do-not-resuscitate / DNR", LOG_GAME, color = COLOR_GREEN, log_globally = FALSE) +<<<<<<< HEAD //SKYRAT EDIT ADDITION - DNR TRAIT (Technically this is just to fix ghost-DNR'ing not actually DNR'ing, but it pairs with the trait so) if(!current_mob.has_quirk(/datum/quirk/dnr)) current_mob.add_quirk(/datum/quirk/dnr) @@ -421,6 +430,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(job_to_free) job_to_free.current_positions = max(0, job_to_free.current_positions - 1) //SKYRAT EDIT ADDITION END - DNR TRAIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_message("has opted to do-not-resuscitate / DNR from their body ([current_mob])", LOG_GAME, color = COLOR_GREEN) // Disassociates observer mind from the body mind @@ -438,10 +449,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/atom/movable/screen/alert/A = throw_alert("[REF(source)]_revival", /atom/movable/screen/alert/revival) if(A) var/ui_style = client?.prefs?.read_preference(/datum/preference/choiced/ui_style) +<<<<<<< HEAD var/erp_ui_style = client?.prefs?.read_preference(/datum/preference/choiced/ui_style) //SKYRAT EDIT - ADDITION - ERP ICONS FIX if(ui_style) A.icon = ui_style2icon(ui_style) A.icon = erp_ui_style2icon(erp_ui_style) //SKYRAT EDIT - ADDITION - ERP ICONS FIX +======= + if(ui_style) + A.icon = ui_style2icon(ui_style) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A.desc = message var/old_layer = source.layer var/old_plane = source.plane diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 02d444a6346..118d63371fd 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -40,7 +40,10 @@ SEND_SIGNAL(src, COMSIG_MOB_EMOTE, emote, act, m_type, message, intentional) SEND_SIGNAL(src, COMSIG_MOB_EMOTED(emote.key)) return TRUE +<<<<<<< HEAD src.nextsoundemote = world.time // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(intentional && !silenced && !force_silence) to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list.")) return FALSE @@ -84,7 +87,11 @@ /datum/emote/flip/run_emote(mob/user, params , type_override, intentional) . = ..() +<<<<<<< HEAD user.SpinAnimation(HAS_TRAIT(user, TRAIT_SLOW_FLIP) ? FLIP_EMOTE_DURATION * 2 : FLIP_EMOTE_DURATION, 1) +======= + user.SpinAnimation(FLIP_EMOTE_DURATION, 1) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/flip/check_cooldown(mob/user, intentional) var/slow_flipper = HAS_TRAIT(user, TRAIT_SLOW_FLIP) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index d5abb01fec0..52a3392814e 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -481,7 +481,11 @@ * * returns 0 if it cannot, 1 if successful */ +<<<<<<< HEAD /mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE, blacklist, initial) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE) +======= +/mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!istype(W)) return FALSE var/slot_priority = W.slot_equipment_priority @@ -498,6 +502,7 @@ ITEM_SLOT_DEX_STORAGE\ ) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - CUSTOMIZATION if (blacklist) slot_priority -= blacklist @@ -505,6 +510,10 @@ for(var/slot in slot_priority) if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, initial = initial, indirect_action = indirect_action)) // SKYRAT EDIT CHANGE - ORIGINAL: if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action)) +======= + for(var/slot in slot_priority) + if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(qdel_on_fail) @@ -575,8 +584,6 @@ /mob/proc/getBeltSlot() return ITEM_SLOT_BELT - - //Inventory.dm is -kind of- an ok place for this I guess //This is NOT for dismemberment, as the user still technically has 2 "hands" diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index 582af27c316..280c340f0f3 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -266,7 +266,11 @@ REMOVE_TRAIT(src, TRAIT_NO_GLIDE, SPEED_TRAIT) /mob/living/basic/relaymove(mob/living/user, direction) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return return relaydrive(user, direction) diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm index 04b3a7864d2..256cee5a4ae 100644 --- a/code/modules/mob/living/basic/bots/_bots.dm +++ b/code/modules/mob/living/basic/bots/_bots.dm @@ -26,7 +26,10 @@ GLOBAL_LIST_INIT(command_strings, list( maximum_survivable_temperature = INFINITY minimum_survivable_temperature = 0 +<<<<<<< HEAD has_unlimited_silicon_privilege = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sentience_type = SENTIENCE_ARTIFICIAL status_flags = NONE //no default canpush @@ -59,6 +62,10 @@ GLOBAL_LIST_INIT(command_strings, list( ///All initial access this bot started with. var/list/initial_access = list() ///Bot-related mode flags on the Bot indicating how they will act. BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION +<<<<<<< HEAD +======= + /// DO NOT MODIFY MANUALLY, USE set_bot_mode_flags. If you don't shit breaks BAD +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/bot_mode_flags = BOT_MODE_ON | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION ///Bot-related cover flags on the Bot to deal with what has been done to their cover, including emagging. BOT_COVER_MAINTS_OPEN | BOT_COVER_LOCKED | BOT_COVER_EMAGGED | BOT_COVER_HACKED var/bot_access_flags = BOT_COVER_LOCKED @@ -109,6 +116,10 @@ GLOBAL_LIST_INIT(command_strings, list( /mob/living/basic/bot/Initialize(mapload) . = ..() +<<<<<<< HEAD +======= + add_traits(list(TRAIT_SILICON_ACCESS, TRAIT_REAGENT_SCANNER, TRAIT_UNOBSERVANT), INNATE_TRAIT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddElement(/datum/element/ai_retaliate) RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_loop_movement)) RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(after_attacked)) @@ -151,6 +162,14 @@ GLOBAL_LIST_INIT(command_strings, list( ai_controller.set_blackboard_key(BB_RADIO_CHANNEL, radio_channel) update_appearance() +<<<<<<< HEAD +======= +/mob/living/basic/bot/proc/set_mode_flags(mode_flags) + SHOULD_CALL_PARENT(TRUE) + bot_mode_flags = mode_flags + SEND_SIGNAL(src, COMSIG_BOT_MODE_FLAGS_SET, mode_flags) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/basic/bot/proc/get_mode() if(client) //Player bots do not have modes, thus the override. Also an easy way for PDA users/AI to know when a bot is a player. return span_bold("[paicard ? "pAI Controlled" : "Autonomous"]") @@ -181,7 +200,11 @@ GLOBAL_LIST_INIT(command_strings, list( /mob/living/basic/bot/proc/turn_on() if(stat == DEAD) return FALSE +<<<<<<< HEAD bot_mode_flags |= BOT_MODE_ON +======= + set_mode_flags(bot_mode_flags | BOT_MODE_ON) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 remove_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED), POWER_LACK_TRAIT) set_light_on(bot_mode_flags & BOT_MODE_ON ? TRUE : FALSE) update_appearance() @@ -190,7 +213,11 @@ GLOBAL_LIST_INIT(command_strings, list( return TRUE /mob/living/basic/bot/proc/turn_off() +<<<<<<< HEAD bot_mode_flags &= ~BOT_MODE_ON +======= + set_mode_flags(bot_mode_flags & ~BOT_MODE_ON) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_traits(on_toggle_traits, POWER_LACK_TRAIT) set_light_on(bot_mode_flags & BOT_MODE_ON ? TRUE : FALSE) bot_reset() //Resets an AI's call, should it exist. @@ -308,7 +335,11 @@ GLOBAL_LIST_INIT(command_strings, list( return FALSE bot_access_flags |= BOT_COVER_EMAGGED bot_access_flags |= BOT_COVER_LOCKED +<<<<<<< HEAD bot_mode_flags &= ~BOT_MODE_REMOTE_ENABLED //Manually emagging the bot also locks the AI from controlling it. +======= + set_mode_flags(bot_mode_flags & ~BOT_MODE_REMOTE_ENABLED) //Manually emagging the bot also locks the AI from controlling it. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_reset() turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP. to_chat(src, span_userdanger("(#$*#$^^( OVERRIDE DETECTED")) @@ -553,9 +584,15 @@ GLOBAL_LIST_INIT(command_strings, list( switch(command) if("patroloff") bot_reset() //HOLD IT!! //OBJECTION!! +<<<<<<< HEAD bot_mode_flags &= ~BOT_MODE_AUTOPATROL if("patrolon") bot_mode_flags |= BOT_MODE_AUTOPATROL +======= + set_mode_flags(bot_mode_flags & ~BOT_MODE_AUTOPATROL) + if("patrolon") + set_mode_flags(bot_mode_flags | BOT_MODE_AUTOPATROL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("summon") summon_bot(user, user_access = user_access) if("ejectpai") @@ -607,10 +644,17 @@ GLOBAL_LIST_INIT(command_strings, list( if("maintenance") bot_access_flags ^= BOT_COVER_MAINTS_OPEN if("patrol") +<<<<<<< HEAD bot_mode_flags ^= BOT_MODE_AUTOPATROL bot_reset() if("airplane") bot_mode_flags ^= BOT_MODE_REMOTE_ENABLED +======= + set_mode_flags(bot_mode_flags ^ BOT_MODE_AUTOPATROL) + bot_reset() + if("airplane") + set_mode_flags(bot_mode_flags ^ BOT_MODE_REMOTE_ENABLED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("hack") if(!HAS_SILICON_ACCESS(the_user)) return diff --git a/code/modules/mob/living/basic/bots/bot_ai.dm b/code/modules/mob/living/basic/bots/bot_ai.dm index b7cd5dcabd3..b096ef212a3 100644 --- a/code/modules/mob/living/basic/bots/bot_ai.dm +++ b/code/modules/mob/living/basic/bots/bot_ai.dm @@ -55,7 +55,19 @@ var/mob/living/basic/bot/bot_pawn = pawn bot_pawn.bot_reset() +<<<<<<< HEAD /datum/ai_controller/basic_controller/bot/able_to_run() +======= +/datum/ai_controller/basic_controller/bot/setup_able_to_run() + . = ..() + RegisterSignal(pawn, COMSIG_BOT_MODE_FLAGS_SET, PROC_REF(update_able_to_run)) + +/datum/ai_controller/basic_controller/bot/clear_able_to_run() + UnregisterSignal(pawn, list(COMSIG_BOT_MODE_FLAGS_SET)) + return ..() + +/datum/ai_controller/basic_controller/bot/get_able_to_run() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/basic/bot/bot_pawn = pawn if(!(bot_pawn.bot_mode_flags & BOT_MODE_ON)) return FALSE diff --git a/code/modules/mob/living/basic/bots/bot_hud.dm b/code/modules/mob/living/basic/bots/bot_hud.dm index 61aee9f10b1..6e5a3fc27d2 100644 --- a/code/modules/mob/living/basic/bots/bot_hud.dm +++ b/code/modules/mob/living/basic/bots/bot_hud.dm @@ -47,12 +47,23 @@ if(isnull(ai_controller)) return +<<<<<<< HEAD clear_path_hud() var/list/path_images = active_hud_list[DIAG_PATH_HUD] LAZYCLEARLIST(path_images) var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH]) +======= + //Removes path images and handles removing hud client images + clear_path_hud() + + var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH]) + + var/list/path_images = active_hud_list[DIAG_PATH_HUD] + LAZYCLEARLIST(path_images) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/move_target = ai_controller.current_movement_target if(move_target != ai_controller.blackboard[BB_BEACON_TARGET]) @@ -62,9 +73,12 @@ if(!length(our_path)) return +<<<<<<< HEAD for(var/datum/atom_hud/hud as anything in path_huds_watching_me) hud.remove_atom_from_hud(src) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/index in 1 to our_path.len) if(index == 1 || index == our_path.len) continue @@ -118,3 +132,11 @@ animate(our_image, alpha = 0, time = 0.3 SECONDS) current_pathed_turfs -= index +<<<<<<< HEAD +======= + // Call hud remove handlers to ensure viewing user client images are removed + var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH]) + for(var/datum/atom_hud/hud as anything in path_huds_watching_me) + hud.remove_atom_from_hud(src) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm index cd30dd4057d..d6853c4a4ab 100644 --- a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm +++ b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm @@ -239,7 +239,12 @@ // Actions received from TGUI /mob/living/basic/bot/cleanbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() +<<<<<<< HEAD if(. || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(ui.user)) +======= + var/mob/user = ui.user + if(. || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) diff --git a/code/modules/mob/living/basic/bots/firebot/firebot.dm b/code/modules/mob/living/basic/bots/firebot/firebot.dm index e6eeaa2031c..52d47e47c2b 100644 --- a/code/modules/mob/living/basic/bots/firebot/firebot.dm +++ b/code/modules/mob/living/basic/bots/firebot/firebot.dm @@ -112,9 +112,16 @@ return data // Actions received from TGUI +<<<<<<< HEAD /mob/living/basic/bot/firebot/ui_act(action, params) . = ..() if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) +======= +/mob/living/basic/bot/firebot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + var/mob/user = ui.user + if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) diff --git a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm index 7f869995c31..27b1ba93755 100644 --- a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm +++ b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm @@ -88,7 +88,11 @@ /mob/living/basic/bot/honkbot/ui_data(mob/user) var/list/data = ..() +<<<<<<< HEAD if(!(bot_access_flags & BOT_COVER_LOCKED) || issilicon(user) || isAdminGhostAI(user)) +======= + if(!(bot_access_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["custom_controls"]["slip_people"] = honkbot_flags & HONKBOT_MODE_SLIP data["custom_controls"]["fake_cuff"] = honkbot_flags & HONKBOT_HANDCUFF_TARGET data["custom_controls"]["check_ids"] = honkbot_flags & HONKBOT_CHECK_IDS @@ -97,7 +101,12 @@ /mob/living/basic/bot/honkbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() +<<<<<<< HEAD if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !(ui.user.has_unlimited_silicon_privilege)) +======= + var/mob/user = ui.user + if(. || !isliving(user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) if("slip_people") diff --git a/code/modules/mob/living/basic/bots/medbot/medbot.dm b/code/modules/mob/living/basic/bots/medbot/medbot.dm index 269505fb8c8..9e93f35abc6 100644 --- a/code/modules/mob/living/basic/bots/medbot/medbot.dm +++ b/code/modules/mob/living/basic/bots/medbot/medbot.dm @@ -210,9 +210,15 @@ // Actions received from TGUI /mob/living/basic/bot/medbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() +<<<<<<< HEAD if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(ui.user)) return var/mob/living/our_user = ui.user +======= + var/mob/user = ui.user + if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("heal_threshold") var/adjust_num = round(text2num(params["threshold"])) @@ -229,7 +235,11 @@ medical_mode_flags ^= MEDBOT_STATIONARY_MODE if("sync_tech") if(!linked_techweb) +<<<<<<< HEAD to_chat(our_user, span_notice("No research techweb connected.")) +======= + to_chat(user, span_notice("No research techweb connected.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/oldheal_amount = heal_amount var/tech_boosters @@ -317,12 +327,15 @@ return if(!iscarbon(target)) return +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Skip trying to heal synths if(ishuman(target)) var/mob/living/carbon/human/human_target = target if(human_target.mob_biotypes & MOB_ROBOTIC) return // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(src, PROC_REF(medicate_patient), target) return COMPONENT_HOSTILE_NO_ATTACK @@ -336,7 +349,11 @@ update_bot_mode(new_mode = BOT_HEALING, update_hud = FALSE) patient.visible_message("[src] is trying to tend the wounds of [patient]", span_userdanger("[src] is trying to tend your wounds!")) +<<<<<<< HEAD if(!do_after(src, delay = 10 SECONDS, target = patient, interaction_key = TEND_DAMAGE_INTERACTION)) //SKYRAT EDIT CHANGE : Increased time as tradeoff for automated healing. ORIGINAL: if(!do_after(src, delay = 0.5 SECONDS, target = patient, interaction_key = TEND_DAMAGE_INTERACTION)) +======= + if(!do_after(src, delay = 2 SECONDS, target = patient, interaction_key = TEND_DAMAGE_INTERACTION)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_bot_mode(new_mode = BOT_IDLE) return var/modified_heal_amount = heal_amount diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm index 81acb7ee3f3..22fa7f68c3b 100644 --- a/code/modules/mob/living/basic/drone/_drone.dm +++ b/code/modules/mob/living/basic/drone/_drone.dm @@ -37,7 +37,10 @@ bubble_icon = "machine" initial_language_holder = /datum/language_holder/drone mob_size = MOB_SIZE_SMALL +<<<<<<< HEAD has_unlimited_silicon_privilege = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, STAMINA = 0, OXY = 0) hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD) unique_name = TRUE @@ -202,7 +205,20 @@ for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_atom_to_hud(src) +<<<<<<< HEAD add_traits(list(TRAIT_VENTCRAWLER_ALWAYS, TRAIT_NEGATES_GRAVITY, TRAIT_LITERATE, TRAIT_KNOW_ENGI_WIRES, TRAIT_ADVANCEDTOOLUSER), INNATE_TRAIT) +======= + add_traits(list( + TRAIT_VENTCRAWLER_ALWAYS, + TRAIT_NEGATES_GRAVITY, + TRAIT_LITERATE, + TRAIT_KNOW_ENGI_WIRES, + TRAIT_ADVANCEDTOOLUSER, + TRAIT_SILICON_ACCESS, + TRAIT_REAGENT_SCANNER, + TRAIT_UNOBSERVANT, + ), INNATE_TRAIT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 listener = new(list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z)) RegisterSignal(listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered)) @@ -222,7 +238,11 @@ holder.pixel_y = hud_icon.Height() - world.icon_size if(stat == DEAD) holder.icon_state = "huddead2" +<<<<<<< HEAD else if(incapacitated()) +======= + else if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.icon_state = "hudoffline" else holder.icon_state = "hudstat" @@ -268,7 +288,11 @@ return icon('icons/mob/butts.dmi', BUTT_SPRITE_DRONE) /mob/living/basic/drone/examine(mob/user) +<<<<<<< HEAD . = list("This is [icon2html(src, user)] \a [src]!", EXAMINE_SECTION_BREAK) //SKYRAT EDIT CHANGE +======= + . = list("This is [icon2html(src, user)] \a [src]!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Hands for(var/obj/item/held_thing in held_items) diff --git a/code/modules/mob/living/basic/drone/visuals_icons.dm b/code/modules/mob/living/basic/drone/visuals_icons.dm index 7a2122022f8..779be475ccf 100644 --- a/code/modules/mob/living/basic/drone/visuals_icons.dm +++ b/code/modules/mob/living/basic/drone/visuals_icons.dm @@ -108,7 +108,11 @@ /mob/living/basic/drone/proc/check_menu() if(!istype(src)) return FALSE +<<<<<<< HEAD if(incapacitated()) +======= + if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mob/living/basic/farm_animals/deer/deer.dm b/code/modules/mob/living/basic/farm_animals/deer/deer.dm new file mode 100644 index 00000000000..eb443def659 --- /dev/null +++ b/code/modules/mob/living/basic/farm_animals/deer/deer.dm @@ -0,0 +1,41 @@ +/mob/living/basic/deer + name = "doe" + desc = "A gentle, peaceful forest animal. How did this get into space?" + icon_state = "deer-doe" + icon_living = "deer-doe" + icon_dead = "deer-doe-dead" + gender = FEMALE + mob_biotypes = MOB_ORGANIC|MOB_BEAST + speak_emote = list("grunts", "grunts lowly") + butcher_results = list(/obj/item/food/meat/slab/grassfed = 3) + response_help_continuous = "pets" + response_help_simple = "pet" + response_disarm_continuous = "gently nudges" + response_disarm_simple = "gently nudges aside" + response_harm_continuous = "kicks" + response_harm_simple = "kick" + attack_verb_continuous = "bucks" + attack_verb_simple = "buck" + attack_sound = 'sound/weapons/punch1.ogg' + health = 75 + maxHealth = 75 + blood_volume = BLOOD_VOLUME_NORMAL + ai_controller = /datum/ai_controller/basic_controller/deer + /// Things that will scare us into being stationary. Vehicles are scary to deers because they might have headlights. + var/static/list/stationary_scary_things = list(/obj/vehicle) + + +/mob/living/basic/deer/Initialize(mapload) + . = ..() + AddElement(/datum/element/ai_retaliate) + AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_SHOE) + var/time_to_freeze_for = (rand(5, 10) SECONDS) + ai_controller.set_blackboard_key(BB_STATIONARY_SECONDS, time_to_freeze_for) + ai_controller.set_blackboard_key(BB_STATIONARY_COOLDOWN, (time_to_freeze_for * (rand(3, 5)))) + ai_controller.set_blackboard_key(BB_STATIONARY_TARGETS, typecacheof(stationary_scary_things)) + + +/// Cold resistent and doesn't need to breathe +/mob/living/basic/deer/ice + habitable_atmos = null + minimum_survivable_temperature = 0 diff --git a/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm b/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm new file mode 100644 index 00000000000..f17e0c9014f --- /dev/null +++ b/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm @@ -0,0 +1,156 @@ +/datum/ai_controller/basic_controller/deer + blackboard = list( + BB_STATIONARY_MOVE_TO_TARGET = TRUE, + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + ) + ai_traits = STOP_MOVING_WHEN_PULLED + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk + planning_subtrees = list( + /datum/ai_planning_subtree/random_speech/deer, + /datum/ai_planning_subtree/stare_at_thing, + /datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee, + /datum/ai_planning_subtree/flee_target, + /datum/ai_planning_subtree/rest_at_home, + /datum/ai_planning_subtree/play_with_friends, + /datum/ai_planning_subtree/find_and_hunt_target/mark_territory, + /datum/ai_planning_subtree/find_and_hunt_target/graze, + /datum/ai_planning_subtree/find_and_hunt_target/drink_water, + ) + + +///subtree to go around drinking water +/datum/ai_planning_subtree/find_and_hunt_target/drink_water + target_key = BB_DEER_WATER_TARGET + finding_behavior = /datum/ai_behavior/find_and_set/in_list/turf_types + hunting_behavior = /datum/ai_behavior/hunt_target/drink_water + hunt_targets = list(/turf/open/water) + hunt_range = 7 + hunt_chance = 5 + + +/datum/ai_behavior/hunt_target/drink_water + always_reset_target = TRUE + hunt_cooldown = 20 SECONDS + + +/datum/ai_behavior/hunt_target/drink_water/target_caught(mob/living/hunter, atom/hunted) + var/static/list/possible_emotes = list("drinks the water!", "dances in the water!", "splashes around happily!") + hunter.manual_emote(pick(possible_emotes)) + + +///subtree to go around grazing +/datum/ai_planning_subtree/find_and_hunt_target/graze + target_key = BB_DEER_GRASS_TARGET + finding_behavior = /datum/ai_behavior/find_and_set/in_list/turf_types + hunting_behavior = /datum/ai_behavior/hunt_target/eat_grass + hunt_targets = list(/turf/open/floor/grass) + hunt_range = 7 + hunt_chance = 45 + + +/datum/ai_behavior/hunt_target/eat_grass + always_reset_target = TRUE + hunt_cooldown = 15 SECONDS + + +/datum/ai_behavior/hunt_target/eat_grass/target_caught(mob/living/hunter, atom/hunted) + var/static/list/possible_emotes = list("eats the grass!", "munches down the grass!", "chews on the grass!") + hunter.manual_emote(pick(possible_emotes)) + + +///subtree to go around playing with other deers +/datum/ai_planning_subtree/play_with_friends + + +/datum/ai_planning_subtree/play_with_friends/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + var/static/list/emote_list = list("plays with", "dances with", "celebrates with") + var/static/list/friend_types = typecacheof(list(/mob/living/basic/deer)) + if(controller.blackboard_key_exists(BB_DEER_PLAYFRIEND)) + controller.queue_behavior(/datum/ai_behavior/emote_on_target, BB_DEER_PLAYFRIEND, emote_list) + if(SPT_PROB(3, seconds_per_tick)) + controller.queue_behavior(/datum/ai_behavior/find_hunt_target/valid_deer, BB_DEER_PLAYFRIEND, friend_types) + return SUBTREE_RETURN_FINISH_PLANNING + + +/datum/ai_behavior/emote_on_target/deer_play + + +/datum/ai_behavior/emote_on_target/deer_play/run_emote(mob/living/living_pawn, atom/target, list/emote_list) + . = ..() + living_pawn.spin(spintime = 4, speed = 1) + + +/datum/ai_behavior/find_hunt_target/valid_deer/valid_dinner(mob/living/source, mob/living/deer, radius, datum/ai_controller/controller, seconds_per_tick) + if(deer.stat == DEAD) + return FALSE + if(!can_see(source, deer, radius)) + return FALSE + deer.ai_controller?.set_blackboard_key(BB_DEER_PLAYFRIEND, source) + return can_see(source, deer, radius) + + +///subtree to mark trees as territories +/datum/ai_planning_subtree/find_and_hunt_target/mark_territory + target_key = BB_DEER_TREE_TARGET + finding_behavior = /datum/ai_behavior/find_hunt_target + hunting_behavior = /datum/ai_behavior/hunt_target/mark_territory + hunt_targets = list(/obj/structure/flora/tree) + hunt_range = 7 + hunt_chance = 75 + + +/datum/ai_behavior/hunt_target/mark_territory + always_reset_target = TRUE + hunt_cooldown = 15 SECONDS + + +/datum/ai_behavior/hunt_target/mark_territory/target_caught(mob/living/hunter, atom/hunted) + hunter.manual_emote("marks [hunted] with its hooves!") + hunter.ai_controller.set_blackboard_key(BB_DEER_TREEHOME, hunted) + + +/datum/ai_planning_subtree/find_and_hunt_target/mark_territory/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if(controller.blackboard_key_exists(BB_DEER_TREEHOME)) //already found our home, abort! + return + return ..() + + +/datum/ai_planning_subtree/rest_at_home/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if(controller.blackboard[BB_DEER_RESTING] > world.time) //we're resting for now, nothing more to do + return SUBTREE_RETURN_FINISH_PLANNING + if(!controller.blackboard_key_exists(BB_DEER_TREEHOME) || controller.blackboard[BB_DEER_NEXT_REST_TIMER] > world.time) + return + controller.queue_behavior(/datum/ai_behavior/return_home, BB_DEER_TREEHOME) + + +/datum/ai_behavior/return_home + required_distance = 0 + behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION + ///minimum time till next rest + var/minimum_time = 2 MINUTES + ///maximum time till next rest + var/maximum_time = 4 MINUTES + + +/datum/ai_behavior/return_home/setup(datum/ai_controller/controller, target_key) + . = ..() + var/atom/target = controller.blackboard[target_key] + if(QDELETED(target)) + return FALSE + var/list/possible_turfs = get_adjacent_open_turfs(target) + shuffle_inplace(possible_turfs) + for(var/turf/possible_turf as anything in possible_turfs) + if(!possible_turf.is_blocked_turf()) + set_movement_target(controller, possible_turf) + return TRUE + return FALSE + + +/datum/ai_behavior/return_home/perform(seconds_per_tick, datum/ai_controller/controller, target_key) + var/mob/living/living_pawn = controller.pawn + var/static/list/possible_emotes = list("rests its legs...", "yawns and naps...", "curls up and rests...") + living_pawn.manual_emote(pick(possible_emotes)) + controller.set_blackboard_key(BB_DEER_RESTING, world.time + 15 SECONDS) + controller.set_blackboard_key(BB_DEER_NEXT_REST_TIMER, world.time + rand(minimum_time, maximum_time)) + return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED diff --git a/code/modules/mob/living/basic/guardian/guardian_creator.dm b/code/modules/mob/living/basic/guardian/guardian_creator.dm index 441a60124a7..bf84b32f423 100644 --- a/code/modules/mob/living/basic/guardian/guardian_creator.dm +++ b/code/modules/mob/living/basic/guardian/guardian_creator.dm @@ -129,7 +129,11 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial()) /obj/item/guardian_creator/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated() || !user.is_holding(src) || used) +======= + if(user.incapacitated || !user.is_holding(src) || used) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm index 11fd7b6aa26..a3308af9198 100644 --- a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm +++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm @@ -8,7 +8,11 @@ var/static/list/comic_phrases = list("BOOM", "BANG", "KABLOW", "KAPOW", "OUCH", "BAM", "KAPOW", "WHAM", "POW", "KABOOM") /obj/item/crusher_trophy/brimdemon_fang/effect_desc() +<<<<<<< HEAD return "mark detonation creates visual and audiosensory effects on the target" +======= + return "mark detonation to create visual and audiosensory effects at the target" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/crusher_trophy/brimdemon_fang/on_mark_detonation(mob/living/target, mob/living/user) target.balloon_alert_to_viewers("[pick(comic_phrases)]!") diff --git a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm index ce9f2439358..b9b105cc56c 100644 --- a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm +++ b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm @@ -52,7 +52,10 @@ /datum/action/cooldown/mob_cooldown/burrow = BB_BURROW_ABILITY, ) grant_actions_by_list(innate_actions) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddElement(/datum/element/ore_collecting) AddElement(/datum/element/wall_tearer, allow_reinforced = FALSE) AddComponent(/datum/component/ai_listen_to_weather) diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm index 1eff38de7f2..46c2a03234a 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm @@ -22,6 +22,7 @@ missing_health *= missing_health_ratio //bonus is active at all times, even if you're above 90 health missing_health *= bonus_value //multiply the remaining amount by bonus_value if(missing_health > 0) +<<<<<<< HEAD //SKYRAT EDIT START /* @@ -29,3 +30,6 @@ */ target.adjustBruteLoss(missing_health, FALSE) //and do that much damage //SKYRAT EDIT END +======= + target.adjustBruteLoss(missing_health) //and do that much damage +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm b/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm index 8a0fe5e157d..ee1712e0c53 100644 --- a/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm +++ b/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm @@ -18,7 +18,11 @@ /datum/idle_behavior/idle_random_walk/parrot ///chance of us moving while perched +<<<<<<< HEAD var/walk_chance_when_perched = 1 // SKYRAT EDIT CHANGE - More obedient poly ORIGINAL : var/walk_chance_when_perched = 5 +======= + var/walk_chance_when_perched = 5 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/idle_behavior/idle_random_walk/parrot/perform_idle_behavior(seconds_per_tick, datum/ai_controller/controller) var/mob/living/living_pawn = controller.pawn diff --git a/code/modules/mob/living/basic/revolutionary.dm b/code/modules/mob/living/basic/revolutionary.dm new file mode 100644 index 00000000000..407f2c09975 --- /dev/null +++ b/code/modules/mob/living/basic/revolutionary.dm @@ -0,0 +1,146 @@ +/mob/living/basic/revolutionary + name = "Revolutionary" + desc = "They stand for a cause..." + mob_biotypes = MOB_ORGANIC|MOB_HUMANOID + faction = list(FACTION_HOSTILE) + icon = 'icons/mob/simple/simple_human.dmi' + gender = MALE + basic_mob_flags = DEL_ON_DEATH + attack_verb_continuous = "robusts" + attack_verb_simple = "robust" + maxHealth = 50 + health = 50 + melee_damage_lower = 15 + melee_damage_upper = 20 + obj_damage = 20 + attack_sound = 'sound/weapons/smash.ogg' + ai_controller = /datum/ai_controller/basic_controller/revolutionary + /// list of weapons we can have + var/static/list/possible_weapons = list( + /obj/item/storage/toolbox/mechanical = "robust", + /obj/item/spear = "pierce", + /obj/item/fireaxe = "slice", + /obj/item/melee/baseball_bat = "bat", + /obj/item/melee/baton = "discipline", + ) + /// List of things to shout + var/static/list/phrases = list( + "The revolution will not be televized!", + "VIVA!", + "Dirty pig!", + "Gondola meat is murder!", + "Free Cargonia!", + "Mime rights are human rights!", + "猫娘 Free Terry!", + ) + /// List of causes to #support + var/static/list/causes = list( + "Worker's rights", + "Icemoon climate change", + "Fair clown treatment", + "Lizards", + "Moths", + "Stop Lavaland drilling", + "The Captain has been replaced by a robot", + "Free Cargonia", + "Befriend all space dragons", + "The Grey Tide", + "Rising cost of medbay", + ) + /// Monkey screeches + var/static/list/monkey_screeches = list( + 'sound/creatures/monkey/monkey_screech_1.ogg', + 'sound/creatures/monkey/monkey_screech_2.ogg', + 'sound/creatures/monkey/monkey_screech_3.ogg', + 'sound/creatures/monkey/monkey_screech_4.ogg', + ) + /// Male screams + var/static/list/male_screams = list( + 'sound/voice/human/malescream_1.ogg', + 'sound/voice/human/malescream_2.ogg', + 'sound/voice/human/malescream_3.ogg', + 'sound/voice/human/malescream_4.ogg', + 'sound/voice/human/malescream_5.ogg', + ) + /// Female screams + var/static/list/female_screams = list( + 'sound/voice/human/femalescream_1.ogg', + 'sound/voice/human/femalescream_2.ogg', + 'sound/voice/human/femalescream_3.ogg', + 'sound/voice/human/femalescream_4.ogg', + 'sound/voice/human/femalescream_5.ogg', + ) + + +/mob/living/basic/revolutionary/Initialize(mapload) + . = ..() + shuffle_inplace(phrases) + var/static/list/display_emote = list( + BB_EMOTE_SAY = phrases, + BB_EMOTE_SOUND = monkey_screeches, + BB_SPEAK_CHANCE = 5, + ) + ai_controller.set_blackboard_key(BB_BASIC_MOB_SPEAK_LINES, display_emote) + var/obj/item/weapon_of_choice = pick(possible_weapons) + attack_sound = weapon_of_choice::hitsound + attack_verb_simple = possible_weapons[weapon_of_choice] + attack_verb_continuous = "[attack_verb_simple]s" + + var/static/list/death_loot = list(/obj/effect/mob_spawn/corpse/human/revolutionary) + AddElement(/datum/element/death_drops, death_loot) + apply_dynamic_human_appearance(src, mob_spawn_path = /obj/effect/mob_spawn/corpse/human/revolutionary, l_hand = weapon_of_choice) + + gender = pick(MALE, FEMALE, PLURAL) + var/first_name + switch(gender) + if(MALE) + first_name = pick(GLOB.first_names_male) + death_sound = pick(male_screams + monkey_screeches) + if(FEMALE) + first_name = pick(GLOB.first_names_female) + death_sound = pick(female_screams + monkey_screeches) + if(PLURAL) + first_name = pick(GLOB.first_names) + death_sound = pick(male_screams + female_screams + monkey_screeches) + + fully_replace_character_name(name, "[first_name] [pick(GLOB.last_names)]") + desc += span_infoplain("\nToday, that cause is: ") + shuffle_inplace(causes) + desc += span_notice("#[pick(causes)].") + + +/obj/effect/mob_spawn/corpse/human/revolutionary + name = "Revolutionary" + outfit = /datum/outfit/revolution + + +/datum/outfit/revolution + name = "Revolution" + uniform = /obj/item/clothing/under/color/grey + head = /obj/item/clothing/head/costume/ushanka + mask = /obj/item/clothing/mask/gas + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/jackboots + + +/datum/ai_controller/basic_controller/revolutionary + blackboard = list( + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + ) + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking + planning_subtrees = list( + /datum/ai_planning_subtree/random_speech/blackboard/revolutionary, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + ) + + +/datum/ai_planning_subtree/random_speech/blackboard/revolutionary + + +/datum/ai_planning_subtree/random_speech/blackboard/revolutionary/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if(!controller.blackboard_key_exists(BB_BASIC_MOB_CURRENT_TARGET)) + return + + return ..() diff --git a/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm b/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm index 4fb7282e444..9301475ce5b 100644 --- a/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm +++ b/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm @@ -55,7 +55,11 @@ // This loop will, at most, loop twice. for(var/atom/check in check_list) for(var/mob/living/mob_target in oview(src, 7)) // They probably cannot see us if we cannot see them... can they? +<<<<<<< HEAD if(mob_target.client && !mob_target.is_blind() && !mob_target.has_unlimited_silicon_privilege) +======= + if(mob_target.client && !mob_target.is_blind() && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return mob_target for(var/obj/vehicle/sealed/mecha/mecha_mob_target in oview(src, 7)) for(var/mob/mechamob_target as anything in mecha_mob_target.occupants) diff --git a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm index d5fd008a186..a07ef94243a 100644 --- a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm +++ b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm @@ -1,6 +1,10 @@ /mob/living/basic/migo name = "mi-go" +<<<<<<< HEAD desc = "A pinkish, fungoid crustacean-like creature with numerous pairs of clawed appendages and a head covered with waving antennae." +======= + desc = "A pinkish, fungoid crustacean-like creature with clawed appendages and a head covered with waving antennae." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "mi-go" icon_living = "mi-go" icon_dead = "mi-go-dead" diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm index 7dd7f13f5ee..bcf2d59973c 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm @@ -257,8 +257,12 @@ if(iscarbon(mob)) if(ishuman(mob)) var/mob/living/carbon/human/H = mob +<<<<<<< HEAD if(H.dna && H.dna.species && !HAS_TRAIT(H, TRAIT_VIRUSIMMUNE)) // SKYRAT EDIT - No more funny purple hair H.set_haircolor("#1d2953", override = TRUE) //will be reset when blight is cured +======= + H.set_haircolor("#1d2953", override = TRUE) //will be reset when blight is cured +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/blightfound = FALSE for(var/datum/disease/revblight/blight in H.diseases) blightfound = TRUE diff --git a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm index b9a3b24f146..132a12307b4 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm @@ -110,10 +110,13 @@ . = ..() AddElement(/datum/element/web_walker, /datum/movespeed_modifier/fast_web) +<<<<<<< HEAD /mob/living/basic/spider/giant/hunter/mold //skyrat edit: exists to make molds not spam the world with simple mobs basic_mob_flags = DEL_ON_DEATH habitable_atmos = null +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Used in the caves away mission. /mob/living/basic/spider/giant/hunter/away_caves minimum_survivable_temperature = 0 diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm index e7771f075a8..aee2c291758 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm @@ -26,7 +26,11 @@ /datum/action/cooldown/mob_cooldown/wrap/IsAvailable(feedback = FALSE) . = ..() +<<<<<<< HEAD if(!. || owner.incapacitated()) +======= + if(!. || owner.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(DOING_INTERACTION(owner, DOAFTER_SOURCE_SPIDER)) if (feedback) diff --git a/code/modules/mob/living/basic/vermin/frog.dm b/code/modules/mob/living/basic/vermin/frog.dm index cce415b960f..a97633cd353 100644 --- a/code/modules/mob/living/basic/vermin/frog.dm +++ b/code/modules/mob/living/basic/vermin/frog.dm @@ -26,7 +26,11 @@ response_harm_simple = "splat" density = FALSE faction = list(FACTION_HOSTILE, FACTION_MAINT_CREATURES) +<<<<<<< HEAD attack_sound = null // SKYRAT EDIT - No more frog ear-rape - ORIGINAL: attack_sound = 'sound/effects/reee.ogg' +======= + attack_sound = 'sound/effects/reee.ogg' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 butcher_results = list(/obj/item/food/nugget = 1) pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY @@ -40,7 +44,11 @@ ai_controller = /datum/ai_controller/basic_controller/frog +<<<<<<< HEAD var/stepped_sound = null // SKYRAT EDIT - No more frog ear-rape - ORIGINA: var/stepped_sound = 'sound/effects/huuu.ogg' +======= + var/stepped_sound = 'sound/effects/huuu.ogg' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///How much of a reagent the mob injects on attack var/poison_per_bite = 3 ///What reagent the mob injects targets with diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm index ad005888178..95c6da425be 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult.dm @@ -78,6 +78,10 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( SEND_SIGNAL(src, COMSIG_MOVABLE_SET_GRAB_STATE, newstate) . = grab_state grab_state = newstate +<<<<<<< HEAD +======= + update_incapacitated() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(grab_state) // Current state. if(GRAB_PASSIVE) REMOVE_TRAIT(pulling, TRAIT_IMMOBILIZED, CHOKEHOLD_TRAIT) @@ -101,7 +105,11 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( /mob/living/carbon/alien/adult/proc/can_consume(atom/movable/poor_soul) if(!isliving(poor_soul) || pulling != poor_soul) return FALSE +<<<<<<< HEAD if(incapacitated() || grab_state < GRAB_AGGRESSIVE || stat != CONSCIOUS) +======= + if(incapacitated || grab_state < GRAB_AGGRESSIVE || stat != CONSCIOUS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(get_dir(src, poor_soul) != dir) // Gotta face em 4head return FALSE diff --git a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm index 2da7974318a..6ec0e8b3703 100644 --- a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm @@ -15,6 +15,10 @@ Doesn't work on other aliens/AI.*/ button_icon_state = "spell_default" check_flags = AB_CHECK_IMMOBILE | AB_CHECK_CONSCIOUS | AB_CHECK_INCAPACITATED melee_cooldown_time = 0 SECONDS +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// How much plasma this action uses. var/plasma_cost = 0 @@ -340,11 +344,15 @@ Doesn't work on other aliens/AI.*/ span_notice("[owner] vomits up a thick purple substance and begins to shape it."), span_notice("You shape a [choice] out of resin."), ) +<<<<<<< HEAD //SKYRAT EDIT START - Roundstart xenohybrid organs if(build_duration && !do_after(owner, build_duration)) owner.balloon_alert(owner, "interrupted!") return //SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new choice_path(owner.loc) return TRUE @@ -406,4 +414,7 @@ Doesn't work on other aliens/AI.*/ /mob/living/carbon/alien/adjustPlasma(amount) . = ..() updatePlasmaDisplay() +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index f9d4c7c03cd..5e549f0e477 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -111,6 +111,15 @@ Des: Removes all infected images from the alien. if(num_hands < 2) return FALSE return TRUE +<<<<<<< HEAD +======= + +/mob/living/carbon/alien/get_visible_suicide_message() + return "[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide." + +/mob/living/carbon/alien/get_blind_suicide_message() + return "You hear thrashing." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/alien/proc/alien_evolve(mob/living/carbon/alien/new_xeno) visible_message( diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 7aeb94d448f..542c39fad23 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -48,8 +48,11 @@ return TRUE +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - SKYRAT_XENO_REDO - Moved to: modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\larva.dm /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/alien/larva_evolve/Activate(atom/target) var/mob/living/carbon/alien/larva/larva = owner var/static/list/caste_options @@ -103,5 +106,8 @@ larva.alien_evolve(new_xeno) return TRUE +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 9303cd23474..0b8e4beda0d 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -1,6 +1,9 @@ /obj/item/organ/internal/alien icon_state = "acid" +<<<<<<< HEAD visual = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10) /obj/item/organ/internal/alien/plasmavessel @@ -222,11 +225,19 @@ stomach_contents -= source UnregisterSignal(source, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_DEATH, COMSIG_QDELETING)) +<<<<<<< HEAD /obj/item/organ/internal/stomach/alien/Insert(mob/living/carbon/stomach_owner, special, movement_flags) RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, PROC_REF(something_moved)) return ..() /obj/item/organ/internal/stomach/alien/Remove(mob/living/carbon/stomach_owner, special, movement_flags) +======= +/obj/item/organ/internal/stomach/alien/mob_insert(mob/living/carbon/stomach_owner, special, movement_flags) + RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, PROC_REF(something_moved)) + return ..() + +/obj/item/organ/internal/stomach/alien/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE) return ..() diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 9aeb31a4f55..6f3e2fdd590 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -136,6 +136,7 @@ if(gib_on_success) new_xeno.visible_message(span_danger("[new_xeno] bursts out of [owner] in a shower of gore!"), span_userdanger("You exit [owner], your previous host."), span_hear("You hear organic matter ripping and tearing!")) +<<<<<<< HEAD //owner.investigate_log("has been gibbed by an alien larva.", INVESTIGATE_DEATHS) // SKYRAT EDIT REMOVAL - ALIEN QOL - don't ever gib host. //owner.gib(DROP_ORGANS|DROP_BODYPARTS) // SKYRAT EDIT ADDITION BEGIN - ALIEN QOL - You aren't getting gibbed but you aren't going to be having fun @@ -144,6 +145,10 @@ owner.cut_overlay(overlay) owner.investigate_log("has been chestbursted.", INVESTIGATE_DEATHS) // SKYRAT EDIT ADDITION END - ALIEN QOL +======= + owner.investigate_log("has been gibbed by an alien larva.", INVESTIGATE_DEATHS) + owner.gib(DROP_ORGANS|DROP_BODYPARTS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else new_xeno.visible_message(span_danger("[new_xeno] wriggles out of [owner]!"), span_userdanger("You exit [owner], your previous host.")) owner.log_message("had an alien larva within them escape (without being gibbed).", LOG_ATTACK, log_globally = FALSE) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index e4a17334374..91b6ade9ecd 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -24,11 +24,14 @@ layer = MOB_LAYER max_integrity = 100 item_flags = XENOMORPH_HOLDABLE +<<<<<<< HEAD // SKYRAT EDIT ADDITION START special_desc_requirement = EXAMINE_CHECK_JOB special_desc_jobs = list("Scientist, Research Director") special_desc = "This alien is an extremely dangerous life form capable of creating a xenomorph. You would know well not to approach without full body biological protection." // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 slowdown = 2 var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case @@ -300,11 +303,14 @@ /obj/item/clothing/mask/facehugger/lamarr name = "Lamarr" desc = "The Research Director's pet, a domesticated and debeaked xenomorph facehugger. Friendly, but may still try to couple with your head." +<<<<<<< HEAD // SKYRAT EDIT ADDITION START: job-restricted examine text special_desc_requirement = EXAMINE_CHECK_ROLE special_desc_roles = list("ROLE_ALIEN") special_desc = "This young one has been cruelly mutilated. It lacks the capability to fill a host with our sisters." // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sterile = TRUE slowdown = 1.5 //lamarr is too fat after being fed in captivity to effectively slow people down or something diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 065569bd01e..9b209848a46 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -172,12 +172,15 @@ power_throw-- if(HAS_TRAIT(thrown_thing, TRAIT_DWARF)) power_throw++ +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(HAS_TRAIT(src, TRAIT_OVERSIZED)) power_throw++ if(HAS_TRAIT(thrown_thing, TRAIT_OVERSIZED)) power_throw-- //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(neckgrab_throw) power_throw++ if(HAS_TRAIT(src, TRAIT_TOSS_GUN_HARD) && isgun(thrown_thing)) @@ -952,6 +955,7 @@ /mob/living/carbon/can_be_revived() if(!get_organ_by_type(/obj/item/organ/internal/brain) && (!IS_CHANGELING(src)) || HAS_TRAIT(src, TRAIT_HUSK)) return FALSE +<<<<<<< HEAD //SKYRAT EDIT ADDITION - DNR TRAIT if(HAS_TRAIT(src, TRAIT_DNR)) return FALSE @@ -964,6 +968,11 @@ if(HAS_TRAIT(src, TRAIT_DNR)) //This is also added when a ghost DNR's! return DEFIB_FAIL_DNR //SKYRAT EDIT ADDITION END - DNR TRAIT +======= + return ..() + +/mob/living/carbon/proc/can_defib() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (HAS_TRAIT(src, TRAIT_SUICIDED)) return DEFIB_FAIL_SUICIDE @@ -1003,7 +1012,11 @@ return DEFIB_POSSIBLE /mob/living/carbon/proc/can_defib_client() +<<<<<<< HEAD return (client || get_ghost(FALSE, FALSE)) && (can_defib() & DEFIB_REVIVABLE_STATES) // SKYRAT EDIT - ORIGINAL: return (client || get_ghost(FALSE, TRUE)) && (can_defib() & DEFIB_REVIVABLE_STATES) +======= + return (client || get_ghost(FALSE, TRUE)) && (can_defib() & DEFIB_REVIVABLE_STATES) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/harvest(mob/living/user) if(QDELETED(src)) @@ -1380,6 +1393,7 @@ /// Special carbon interaction on lying down, to transform its sprite by a rotation. /mob/living/carbon/proc/lying_angle_on_lying_down(new_lying_angle) if(!new_lying_angle) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(dir == WEST) set_lying_angle(270) @@ -1388,6 +1402,8 @@ set_lying_angle(90) return //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_lying_angle(pick(90, 270)) else set_lying_angle(new_lying_angle) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index a7429fff827..e7c3548a8cf 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -93,6 +93,7 @@ var/message_verb_continuous = length(I.attack_verb_continuous) ? "[pick(I.attack_verb_continuous)]" : "attacks" var/message_verb_simple = length(I.attack_verb_simple) ? "[pick(I.attack_verb_simple)]" : "attack" +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(I.force && !user.combat_mode && !length(I.attack_verb_simple) && !length(I.attack_verb_continuous)) var/random = rand(1,2) @@ -104,6 +105,8 @@ message_verb_continuous = "maims" message_verb_simple = "maim" //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/extra_wound_details = "" @@ -276,7 +279,11 @@ var/immediately_stun = should_stun && !(flags & SHOCK_DELAY_STUN) if (immediately_stun) if (paralyze) +<<<<<<< HEAD StaminaKnockdown(stun_duration / 4) // SKYRAT EDIT CHANGE - ORIGINAL: Paralyze(40) +======= + Paralyze(stun_duration) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else Knockdown(stun_duration) //Jitter and other fluff. @@ -290,12 +297,19 @@ ///Called slightly after electrocute act to apply a secondary stun. /mob/living/carbon/proc/secondary_shock(paralyze, stun_duration) if (paralyze) +<<<<<<< HEAD StaminaKnockdown(stun_duration / 6) // SKYRAT EDIT CHANGE - ORIGINAL: Paralyze(60) +======= + Paralyze(stun_duration) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else Knockdown(stun_duration) /mob/living/carbon/proc/help_shake_act(mob/living/carbon/helper, force_friendly) +<<<<<<< HEAD var/nosound = FALSE //SKYRATEDIT ADDITION - EMOTES +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(on_fire) to_chat(helper, span_warning("You can't put [p_them()] out with just your bare hands!")) return @@ -315,6 +329,7 @@ null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(helper, src)) to_chat(helper, span_notice("You shake [src] trying to pick [p_them()] up!")) to_chat(src, span_notice("[helper] shakes you to get you up!")) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - EMOTES -- SENSITIVE SNOUT TRAIT ADDITION else if(helper.zone_selected == BODY_ZONE_PRECISE_MOUTH) nosound = TRUE @@ -338,6 +353,9 @@ visible_message(span_warning("[helper] tries to pat [src] on the head, but [p_they()] move[p_s()] out of the way.")) return //SKYRAT EDIT ADDITION END +======= + else if(check_zone(helper.zone_selected) == BODY_ZONE_HEAD && get_bodypart(BODY_ZONE_HEAD)) //Headpats! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 helper.visible_message(span_notice("[helper] gives [src] a pat on the head to make [p_them()] feel better!"), \ null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(helper, src)) to_chat(helper, span_notice("You give [src] a pat on the head to make [p_them()] feel better!")) @@ -345,12 +363,15 @@ if(HAS_TRAIT(src, TRAIT_BADTOUCH)) to_chat(helper, span_warning("[src] looks visibly upset as you pat [p_them()] on the head.")) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - EMOTES if(HAS_TRAIT(src, TRAIT_EXCITABLE)) var/obj/item/organ/external/tail/src_tail = get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) if(src_tail && !(src_tail.wag_flags & WAG_WAGGING)) emote("wag") //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if ((helper.zone_selected == BODY_ZONE_PRECISE_GROIN) && !isnull(src.get_organ_by_type(/obj/item/organ/external/tail))) helper.visible_message(span_notice("[helper] pulls on [src]'s tail!"), \ @@ -380,11 +401,14 @@ to_chat(helper, span_notice("You wrap [src] into a tight bear hug!")) to_chat(src, span_notice("[helper] squeezes you super tightly in a firm bear hug!")) else +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if (HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS)) visible_message(span_warning("[helper] tries to hug [src], but [p_they()] move[p_s()] out of the way.")) return // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 helper.visible_message(span_notice("[helper] hugs [src] to make [p_them()] feel better!"), \ null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(helper, src)) to_chat(helper, span_notice("You hug [src] to make [p_them()] feel better!")) @@ -444,6 +468,16 @@ if (incapacitated()) shake_up_animation() +/mob/proc/shake_up_animation() + var/direction = prob(50) ? -1 : 1 + animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL) + animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1) + animate(pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_IN) + + // Shake animation + if (incapacitated) + shake_up_animation() + /mob/proc/shake_up_animation() var/direction = prob(50) ? -1 : 1 animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL) @@ -607,11 +641,19 @@ if (!IS_ORGANIC_LIMB(limb)) . += (limb.brute_dam * limb.body_damage_coeff) + (limb.burn_dam * limb.body_damage_coeff) +<<<<<<< HEAD /mob/living/carbon/grabbedby(mob/living/user, supress_message = FALSE, grabbed_part) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/living/carbon/grabbedby(mob/living/user, supress_message = FALSE) if(user != src) return ..() var/obj/item/bodypart/grasped_part = grabbed_part ? grabbed_part : get_bodypart(zone_selected) // SKYRAT EDIT CHANGE - ORIGINAL: var/obj/item/bodypart/grasped_part = get_bodypart(zone_selected) +======= +/mob/living/carbon/grabbedby(mob/living/user, supress_message = FALSE) + if(user != src) + return ..() + + var/obj/item/bodypart/grasped_part = get_bodypart(zone_selected) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!grasped_part?.can_be_grasped()) return var/starting_hand_index = active_hand_index diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 0ee71842400..974305847e0 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -2,7 +2,11 @@ blood_volume = BLOOD_VOLUME_NORMAL gender = MALE pressure_resistance = 15 +<<<<<<< HEAD hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,GLAND_HUD, DNR_HUD) // SKYRAT EDIT ADDITION - DNR ICON +======= + hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,GLAND_HUD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 has_limbs = TRUE held_items = list(null, null) num_legs = 0 //Populated on init through list/bodyparts @@ -125,6 +129,9 @@ var/bodyshape = BODYSHAPE_HUMANOID COOLDOWN_DECLARE(bleeding_message_cd) +<<<<<<< HEAD var/next_smell = 0 //SKYRAT EDIT ADDITION /// Cooldown for the next smell +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 83b46801aa8..977aea72fc5 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -53,6 +53,7 @@ overlays_standing[cache_index] = null SEND_SIGNAL(src, COMSIG_CARBON_REMOVE_OVERLAY, cache_index, I) +<<<<<<< HEAD //used when putting/removing clothes that hide certain mutant body parts to just update those and not update the whole body. /mob/living/carbon/human/proc/update_mutant_bodyparts() dna?.species.handle_mutant_bodyparts(src) @@ -60,6 +61,10 @@ /mob/living/carbon/update_body(is_creating = FALSE) dna?.species.handle_body(src) //This calls `handle_mutant_bodyparts` which calls `update_mutant_bodyparts()`. Don't double call! +======= +/mob/living/carbon/update_body(is_creating = FALSE) + dna?.species.handle_body(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_body_parts(is_creating) /mob/living/carbon/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) @@ -333,8 +338,11 @@ overlays_standing[WOUND_LAYER] = wound_overlay apply_overlay(WOUND_LAYER) +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/update_worn_mask(update_obscured = TRUE) remove_overlay(FACEMASK_LAYER) @@ -372,8 +380,11 @@ */ //SKYRAT EDIT REMOVAL END +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - TESHARI CLOTHES (moved to modular) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/update_worn_back(update_obscured = TRUE) remove_overlay(BACK_LAYER) @@ -401,9 +412,12 @@ apply_overlay(LEGCUFF_LAYER) throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed) +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/update_worn_head(update_obscured = TRUE) remove_overlay(HEAD_LAYER) @@ -428,7 +442,11 @@ /mob/living/carbon/update_worn_handcuffs(update_obscured = TRUE) remove_overlay(HANDCUFF_LAYER) +<<<<<<< HEAD if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT ADDED !(handcuffed.item_flags & ABSTRACT) +======= + if(handcuffed) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(update_obscured) update_obscured_slots(handcuffed.flags_inv) var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER) @@ -468,10 +486,14 @@ //Overlays for the worn overlay so you can overlay while you overlay //eg: ammo counters, primed grenade flashing, etc. //"icon_file" is used automatically for inhands etc. to make sure it gets the right inhand file +<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - CUSTOMIZATION // obj/item/proc/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file) - original /obj/item/proc/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file, mutant_styles = NONE) // SKYRAT EDIT CHANGE END +======= +/obj/item/proc/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_CALL_PARENT(TRUE) RETURN_TYPE(/list) @@ -487,10 +509,13 @@ var/list/needs_update = list() var/limb_count_update = FALSE for(var/obj/item/bodypart/limb as anything in bodyparts) +<<<<<<< HEAD // SKYRAT EDIT BEGIN - Don't handle abstract limbs (Taurs, etc.) if(!limb.show_icon) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 limb.update_limb(is_creating = update_limb_data) //Update limb actually doesn't do much, get_limb_icon is the cpu eater. var/old_key = icon_render_keys?[limb.body_zone] //Checks the mob's icon render key list for the bodypart diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index 3eb36e355b2..bfcaad078a8 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -28,8 +28,11 @@ vary = TRUE /datum/emote/living/carbon/clap/get_sound(mob/living/user) +<<<<<<< HEAD if(!ishuman(user)) return +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.get_bodypart(BODY_ZONE_L_ARM) || !user.get_bodypart(BODY_ZONE_R_ARM)) return return pick( @@ -38,8 +41,11 @@ 'sound/misc/clap3.ogg', 'sound/misc/clap4.ogg', ) +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/carbon/crack key = "crack" diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index c71962eb034..fa40b42f23c 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -6,7 +6,11 @@ var/t_has = p_have() var/t_is = p_are() +<<<<<<< HEAD . = list("This is [icon2html(src, user)] \a [src]!", EXAMINE_SECTION_BREAK) // SKYRAT EDIT CHANGE - HR padding +======= + . = list("This is [icon2html(src, user)] \a [src]!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obscured = check_obscured_slots() if (handcuffed) @@ -25,9 +29,12 @@ if (back) . += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back." +<<<<<<< HEAD . += EXAMINE_SECTION_BREAK // SKYRAT EDIT ADDITION - hr sections +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/appears_dead = FALSE if (stat == DEAD) appears_dead = TRUE diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 58bb11ffebc..1ed54616ba3 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -56,14 +56,18 @@ GLOBAL_LIST_EMPTY(features_by_species) var/skinned_type ///flags for inventory slots the race can't equip stuff to. Golems cannot wear jumpsuits, for example. var/no_equip_flags +<<<<<<< HEAD /// Allows the species to equip items that normally require a jumpsuit without having one equipped. Used by golems. var/nojumpsuit = FALSE ///Affects the speech message, for example: Motharula flutters, "My speech message is flutters!" var/say_mod = "says" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// What languages this species can understand and say. /// Use a [language holder datum][/datum/language_holder] typepath in this var. /// Should never be null. var/datum/language_holder/species_language_holder = /datum/language_holder/human_basic +<<<<<<< HEAD /** * Visible CURRENT bodyparts that are unique to a species. * DO NOT USE THIS AS A LIST OF ALL POSSIBLE BODYPARTS AS IT WILL FUCK @@ -75,6 +79,8 @@ GLOBAL_LIST_EMPTY(features_by_species) */ //var/list/mutant_bodyparts = list() //ORIGINAL var/list/list/mutant_bodyparts = list() //SKYRAT EDIT CHANGE - CUSTOMIZATION (typed list) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The bodyparts this species uses. assoc of bodypart string - bodypart type. Make sure all the fucking entries are in or I'll skin you alive. var/list/bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left, @@ -84,10 +90,15 @@ GLOBAL_LIST_EMPTY(features_by_species) BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right, BODY_ZONE_CHEST = /obj/item/bodypart/chest, ) +<<<<<<< HEAD ///Internal organs that are unique to this race, like a tail. list(typepath of organ 1, typepath of organ 2) var/list/mutant_organs = list() ///List of external organs to generate like horns, frills, wings, etc. list(typepath of organ = "Round Beautiful BDSM Snout"). Still WIP var/list/external_organs = list() +======= + ///Internal organs that are unique to this race, like a tail or other cosmetic organs. list(typepath of organ 1, typepath of organ 2 = "Round"). + var/list/mutant_organs = list() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Replaces default brain with a different organ var/obj/item/organ/internal/brain/mutantbrain = /obj/item/organ/internal/brain ///Replaces default heart with a different organ @@ -108,7 +119,11 @@ GLOBAL_LIST_EMPTY(features_by_species) var/obj/item/organ/internal/appendix/mutantappendix = /obj/item/organ/internal/appendix /// Store body marking defines. See mobs.dm for bitflags +<<<<<<< HEAD //var/list/body_markings = list() // SKYRAT EDIT REMOVAL - We already have this defined as an assoc list +======= + var/list/body_markings = list() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Flat modifier on all damage taken via [apply_damage][/mob/living/proc/apply_damage] (so being punched, shot, etc.) /// IE: 10 = 10% less damage taken. @@ -288,7 +303,14 @@ GLOBAL_LIST_EMPTY(features_by_species) if(ORGAN_SLOT_STOMACH) return mutantstomach else +<<<<<<< HEAD CRASH("Invalid organ slot [slot]") +======= + // Non-standard organs we might have + for(var/obj/item/organ/extra_organ as anything in mutant_organs) + if(initial(extra_organ.slot) == slot) + return extra_organ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Corrects organs in a carbon, removing ones it doesn't need and adding ones it does. @@ -304,6 +326,7 @@ GLOBAL_LIST_EMPTY(features_by_species) * * visual_only - boolean, only load organs that change how the species looks. Do not use for normal gameplay stuff */ /datum/species/proc/regenerate_organs(mob/living/carbon/organ_holder, datum/species/old_species, replace_current = TRUE, list/excluded_zones, visual_only = FALSE) +<<<<<<< HEAD //what should be put in if there is no mutantorgan (brains handled separately) var/list/organ_slots = list( ORGAN_SLOT_BRAIN, @@ -339,11 +362,39 @@ GLOBAL_LIST_EMPTY(features_by_species) continue // we don't want to remove organs that are the same as the new one if(visual_only && !initial(new_organ.visual)) +======= + for(var/slot in get_all_slots()) + var/obj/item/organ/existing_organ = organ_holder.get_organ_slot(slot) + var/obj/item/organ/new_organ = get_mutant_organ_type_for_slot(slot) + var/old_organ_type = old_species?.get_mutant_organ_type_for_slot(slot) + + // if we have an extra organ that before changing that the species didnt have, remove it + if(!new_organ) + if(existing_organ && (old_organ_type == existing_organ.type || replace_current)) + existing_organ.Remove(organ_holder) + qdel(existing_organ) + continue + + if(existing_organ) + // we dont want to remove organs that were not from the old species (such as from freak surgery or prosthetics) + if(existing_organ.type != old_organ_type && !replace_current) + continue + + // we don't want to remove organs that are the same as the new one + if(existing_organ.type == new_organ) + continue + + if(visual_only && (!initial(new_organ.bodypart_overlay) && !initial(new_organ.visual))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue var/used_neworgan = FALSE new_organ = SSwardrobe.provide_type(new_organ) +<<<<<<< HEAD var/should_have = new_organ.get_availability(src, organ_holder) +======= + var/should_have = new_organ.get_availability(src, organ_holder) && should_visual_organ_apply_to(new_organ, organ_holder) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Check for an existing organ, and if there is one check to see if we should remove it var/health_pct = 1 @@ -367,6 +418,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(!used_neworgan) QDEL_NULL(new_organ) +<<<<<<< HEAD if(!isnull(old_species)) for(var/mutant_organ in old_species.mutant_organs) if(mutant_organ in mutant_organs) @@ -407,6 +459,8 @@ GLOBAL_LIST_EMPTY(features_by_species) // organ.Insert will qdel any current organs in that slot, so we don't need to. replacement.Insert(organ_holder, special=TRUE, movement_flags = DELETE_IF_REPLACED) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/proc/worn_items_fit_body_check(mob/living/carbon/wearer) for(var/obj/item/equipped_item in wearer.get_equipped_items(INCLUDE_POCKETS)) var/equipped_item_slot = wearer.get_slot_by_item(equipped_item) @@ -448,7 +502,11 @@ GLOBAL_LIST_EMPTY(features_by_species) if(old_species.type != type) replace_body(human_who_gained_species, src) +<<<<<<< HEAD regenerate_organs(human_who_gained_species, old_species, visual_only = human_who_gained_species.visual_only_organs) +======= + regenerate_organs(human_who_gained_species, old_species, replace_current = FALSE, visual_only = human_who_gained_species.visual_only_organs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Drop the items the new species can't wear INVOKE_ASYNC(src, PROC_REF(worn_items_fit_body_check), human_who_gained_species, TRUE) @@ -464,6 +522,7 @@ GLOBAL_LIST_EMPTY(features_by_species) //Resets blood if it is excessively high so they don't gib normalize_blood(human_who_gained_species) +<<<<<<< HEAD if(ishuman(human_who_gained_species)) var/mob/living/carbon/human/human = human_who_gained_species for(var/obj/item/organ/external/organ_path as anything in external_organs) @@ -475,6 +534,9 @@ GLOBAL_LIST_EMPTY(features_by_species) new_organ.Insert(human, special=TRUE, movement_flags = DELETE_IF_REPLACED) //add_body_markings(human_who_gained_species) // SKYRAT EDIT REMOVAL - We do this differently +======= + add_body_markings(human_who_gained_species) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(length(inherent_traits)) human_who_gained_species.add_traits(inherent_traits, SPECIES_TRAIT) @@ -514,10 +576,13 @@ GLOBAL_LIST_EMPTY(features_by_species) for(var/X in inherent_traits) REMOVE_TRAIT(C, X, SPECIES_TRAIT) +<<<<<<< HEAD for(var/obj/item/organ/external/organ in C.organs) organ.Remove(C) qdel(organ) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //If their inert mutation is not the same, swap it out if((inert_mutation != new_species.inert_mutation) && LAZYLEN(C.dna.mutation_index) && (inert_mutation in C.dna.mutation_index)) C.dna.remove_mutation(inert_mutation) @@ -548,6 +613,7 @@ GLOBAL_LIST_EMPTY(features_by_species) SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src) /** +<<<<<<< HEAD * Proc called when mail goodies need to be updated for this species. * * Updates the mail goodies if that is required. e.g. for the blood deficiency quirk, which sends bloodbags to quirk holders, update the sent bloodpack to match the species' exotic blood. @@ -593,6 +659,18 @@ GLOBAL_LIST_EMPTY(features_by_species) species_human.remove_overlay(BODY_LAYER) if(HAS_TRAIT(species_human, TRAIT_INVISIBLE_MAN)) return handle_mutant_bodyparts(species_human) +======= + * Handles the body of a human + * + * Handles lipstick, having no eyes, eye color, undergarnments like underwear, undershirts, and socks, and body layers. + * Arguments: + * * species_human - Human, whoever we're handling the body for + */ +/datum/species/proc/handle_body(mob/living/carbon/human/species_human) + species_human.remove_overlay(BODY_LAYER) + if(HAS_TRAIT(species_human, TRAIT_INVISIBLE_MAN)) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/standing = list() if(!HAS_TRAIT(species_human, TRAIT_HUSK)) @@ -611,7 +689,11 @@ GLOBAL_LIST_EMPTY(features_by_species) var/mutable_appearance/underwear_overlay if(underwear) if(species_human.dna.species.sexes && species_human.physique == FEMALE && (underwear.gender == MALE)) +<<<<<<< HEAD underwear_overlay = wear_female_version(underwear.icon_state, underwear.icon, BODY_LAYER, FEMALE_UNIFORM_FULL) +======= + underwear_overlay = mutable_appearance(wear_female_version(underwear.icon_state, underwear.icon, FEMALE_UNIFORM_FULL), layer = -BODY_LAYER) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else underwear_overlay = mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER) if(!underwear.use_static) @@ -623,9 +705,15 @@ GLOBAL_LIST_EMPTY(features_by_species) if(undershirt) var/mutable_appearance/working_shirt if(species_human.dna.species.sexes && species_human.physique == FEMALE) +<<<<<<< HEAD working_shirt = wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER) else working_shirt = mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER) +======= + working_shirt = mutable_appearance(wear_female_version(undershirt.icon_state, undershirt.icon), layer = -BODY_LAYER) + else + working_shirt = mutable_appearance(undershirt.icon, undershirt.icon_state, layer = -BODY_LAYER) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 standing += working_shirt if(species_human.socks && species_human.num_legs >= 2 && !(species_human.bodyshape & BODYSHAPE_DIGITIGRADE)) @@ -637,6 +725,7 @@ GLOBAL_LIST_EMPTY(features_by_species) species_human.overlays_standing[BODY_LAYER] = standing species_human.apply_overlay(BODY_LAYER) +<<<<<<< HEAD handle_mutant_bodyparts(species_human) */ @@ -741,6 +830,9 @@ GLOBAL_LIST_EMPTY(features_by_species) update_body_markings(source) */ //SKYRAT EDIT REMOVAL END +======= + update_body_markings(species_human) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //This exists so sprite accessories can still be per-layer without having to include that layer's //number in their sprite name, which causes issues when those numbers change. @@ -752,12 +844,15 @@ GLOBAL_LIST_EMPTY(features_by_species) return "ADJ" if(BODY_FRONT_LAYER) return "FRONT" +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(BODY_FRONT_UNDER_CLOTHES) return "FRONT_UNDER" if(ABOVE_BODY_FRONT_HEAD_LAYER) return "FRONT_OVER" //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Proc that will randomise the hair, or primary appearance element (i.e. for moths wings) of a species' associated mob /datum/species/proc/randomize_main_appearance_element(mob/living/carbon/human/human_mob) @@ -769,7 +864,10 @@ GLOBAL_LIST_EMPTY(features_by_species) human_mob.undershirt = random_undershirt(human_mob.gender) human_mob.underwear = random_underwear(human_mob.gender) human_mob.socks = random_socks(human_mob.gender) +<<<<<<< HEAD human_mob.bra = random_bra(human_mob.gender) //SKYRAT EDIT ADDITION - Underwear and Bra split +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Proc that will randomise the underwear (i.e. top, pants and socks) of a species' associated mob /datum/species/proc/randomize_active_underwear(mob/living/carbon/human/human_mob) @@ -790,7 +888,13 @@ GLOBAL_LIST_EMPTY(features_by_species) var/list/new_features = list() var/static/list/organs_to_randomize = list() +<<<<<<< HEAD for(var/obj/item/organ/external/organ_path as anything in external_organs) +======= + for(var/obj/item/organ/organ_path as anything in mutant_organs) + if(!organ_path.bodypart_overlay) + continue +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/overlay_path = initial(organ_path.bodypart_overlay) var/datum/bodypart_overlay/mutant/sample_overlay = organs_to_randomize[overlay_path] if(isnull(sample_overlay)) @@ -809,7 +913,11 @@ GLOBAL_LIST_EMPTY(features_by_species) H.adjustBruteLoss(0.5 * seconds_per_tick) /datum/species/proc/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self = FALSE, ignore_equipped = FALSE, indirect_action = FALSE) +<<<<<<< HEAD if(no_equip_flags & slot && !(I.is_mod_shell_component() && (modsuit_slot_exceptions & slot))) // SKYRAT EDIT ADDITION - ORIGINAL: if(no_equip_flags & slot) +======= + if(no_equip_flags & slot) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!I.species_exception || !is_type_in_list(src, I.species_exception)) return FALSE @@ -825,7 +933,11 @@ GLOBAL_LIST_EMPTY(features_by_species) // Anything that's small or smaller can fit into a pocket by default if((slot & (ITEM_SLOT_RPOCKET|ITEM_SLOT_LPOCKET)) && I.w_class <= POCKET_WEIGHT_CLASS) excused = TRUE +<<<<<<< HEAD else if(slot & (ITEM_SLOT_SUITSTORE|ITEM_SLOT_BACKPACK|ITEM_SLOT_HANDS)) +======= + else if(slot & (ITEM_SLOT_SUITSTORE|ITEM_SLOT_BACKPACK|ITEM_SLOT_BELTPACK|ITEM_SLOT_HANDS)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 excused = TRUE if(!excused) return FALSE @@ -852,6 +964,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(ITEM_SLOT_FEET) if(H.num_legs < 2) return FALSE +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL if((H.bodyshape & BODYSHAPE_DIGITIGRADE) && !(I.item_flags & IGNORE_DIGITIGRADE)) if(!(I.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) @@ -859,6 +972,13 @@ GLOBAL_LIST_EMPTY(features_by_species) to_chat(H, span_warning("The footwear around here isn't compatible with your feet!")) return FALSE */ +======= + if((H.bodyshape & BODYSHAPE_DIGITIGRADE) && !(I.item_flags & IGNORE_DIGITIGRADE)) + if(!(I.supports_variations_flags & DIGITIGRADE_VARIATIONS)) + if(!disable_warning) + to_chat(H, span_warning("The footwear around here isn't compatible with your feet!")) + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return equip_delay_self_check(I, H, bypass_equip_delay_self) if(ITEM_SLOT_BELT) var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_CHEST) @@ -868,6 +988,13 @@ GLOBAL_LIST_EMPTY(features_by_species) to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE return equip_delay_self_check(I, H, bypass_equip_delay_self) +<<<<<<< HEAD +======= + if(ITEM_SLOT_BELTPACK) + if(H.belt && H.belt.atom_storage?.can_insert(I, H, messages = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED)) + return TRUE + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ITEM_SLOT_EYES) if(!H.get_bodypart(BODY_ZONE_HEAD)) return FALSE @@ -952,7 +1079,10 @@ GLOBAL_LIST_EMPTY(features_by_species) if(H.back && H.back.atom_storage?.can_insert(I, H, messages = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED)) return TRUE return FALSE +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE //Unsupported slot /datum/species/proc/equip_delay_self_check(obj/item/I, mob/living/carbon/human/H, bypass_equip_delay_self) @@ -1157,14 +1287,21 @@ GLOBAL_LIST_EMPTY(features_by_species) var/attack_direction = get_dir(user, target) var/attack_type = attacking_bodypart.attack_type +<<<<<<< HEAD var/unarmed_sharpness = attacking_bodypart.unarmed_sharpness //SKYRAT EDIT ADDITION - If unarmed damage sharpness needs to be taken into account. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(atk_effect == ATTACK_EFFECT_KICK || grappled) //kicks and punches when grappling bypass armor slightly. if(damage >= 9) target.force_say() log_combat(user, target, grappled ? "grapple punched" : "kicked") target.apply_damage(damage, attack_type, affecting, armor_block - limb_accuracy, attack_direction = attack_direction) else // Normal attacks do not gain the benefit of armor penetration. +<<<<<<< HEAD target.apply_damage(damage, attack_type, affecting, armor_block, attack_direction = attack_direction, sharpness = unarmed_sharpness) //SKYRAT EDIT - Applies sharpness if it does - ORIGINAL: target.apply_damage(damage, attack_type, affecting, armor_block, attack_direction = attack_direction) +======= + target.apply_damage(damage, attack_type, affecting, armor_block, attack_direction = attack_direction) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(damage >= 9) target.force_say() log_combat(user, target, "punched") @@ -1341,6 +1478,7 @@ GLOBAL_LIST_EMPTY(features_by_species) // Get the temperature of the environment for area var/area_temp = humi.get_temperature(environment) +<<<<<<< HEAD //SKYRAT EDIT ADDITION //Special handling for getting liquids temperature if(isturf(humi.loc)) @@ -1349,6 +1487,8 @@ GLOBAL_LIST_EMPTY(features_by_species) var/submergment_percent = SUBMERGEMENT_PERCENT(humi, T.liquids) area_temp = (area_temp*(1-submergment_percent)) + (T.liquids.temp * submergment_percent) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Get the insulation value based on the area's temp var/thermal_protection = humi.get_insulation_protection(area_temp) @@ -1627,8 +1767,11 @@ GLOBAL_LIST_EMPTY(features_by_species) former_tail_owner.clear_mood_event("tail_balance_lost") former_tail_owner.clear_mood_event("tail_regained") +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns a list of strings representing features this species has. /// Used by the preferences UI to know what buttons to show. /datum/species/proc/get_features() @@ -1642,15 +1785,24 @@ GLOBAL_LIST_EMPTY(features_by_species) var/datum/preference/preference = GLOB.preference_entries[preference_type] if ( \ +<<<<<<< HEAD (preference.relevant_mutant_bodypart in mutant_bodyparts) \ || (preference.relevant_inherent_trait in inherent_traits) \ || (preference.relevant_external_organ in external_organs) \ +======= + (preference.relevant_inherent_trait in inherent_traits) \ + || (preference.relevant_external_organ in mutant_organs) \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || (preference.relevant_head_flag && check_head_flags(preference.relevant_head_flag)) \ || (preference.relevant_body_markings in body_markings) \ ) features += preference.savefile_key +<<<<<<< HEAD for (var/obj/item/organ/external/organ_type as anything in external_organs) +======= + for (var/obj/item/organ/organ_type as anything in mutant_organs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/preference = initial(organ_type.preference) if (!isnull(preference)) features += preference @@ -1658,7 +1810,10 @@ GLOBAL_LIST_EMPTY(features_by_species) GLOB.features_by_species[type] = features return features +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Given a human, will adjust it before taking a picture for the preferences UI. /// This should create a CONSISTENT result, so the icons don't randomly change. @@ -1696,7 +1851,11 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/get_types_to_preload() var/list/to_store = list() to_store += mutant_organs +<<<<<<< HEAD for(var/obj/item/organ/external/horny as anything in external_organs) +======= + for(var/obj/item/organ/horny as anything in mutant_organs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_store += horny //Haha get it? //Don't preload brains, cause reuse becomes a horrible headache @@ -1743,7 +1902,11 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/get_species_description() SHOULD_CALL_PARENT(FALSE) +<<<<<<< HEAD //stack_trace("Species [name] ([type]) did not have a description set, and is a selectable roundstart race! Override get_species_description.") +======= + stack_trace("Species [name] ([type]) did not have a description set, and is a selectable roundstart race! Override get_species_description.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return "No species description set, file a bug report!" /** @@ -1757,7 +1920,11 @@ GLOBAL_LIST_EMPTY(features_by_species) SHOULD_CALL_PARENT(FALSE) RETURN_TYPE(/list) +<<<<<<< HEAD //stack_trace("Species [name] ([type]) did not have lore set, and is a selectable roundstart race! Override get_species_lore.") +======= + stack_trace("Species [name] ([type]) did not have lore set, and is a selectable roundstart race! Override get_species_lore.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return list("No species lore set, file a bug report!") /** @@ -2174,11 +2341,15 @@ GLOBAL_LIST_EMPTY(features_by_species) SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "comment", SPECIES_PERK_NAME = "Native Speaker", +<<<<<<< HEAD /* SKYRAT EDIT - Digitigrade customization - ORIGINAL: SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] gain the ability to speak [english_list(bonus_languages)].", */ // ORIGINAL END - SKYRAT EDIT START: SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] commonly speak [english_list(bonus_languages)].", // SKYRAT EDIT END +======= + SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] gain the ability to speak [english_list(bonus_languages)].", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) else @@ -2196,6 +2367,7 @@ GLOBAL_LIST_EMPTY(features_by_species) new_species ||= target.dna.species //If no new species is provided, assume its src. //Note for future: Potentionally add a new C.dna.species() to build a template species for more accurate limb replacement +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Synth digitigrade sanitization var/ignore_digi = FALSE // You can jack into this var with other checks, if you want. if(issynthetic(target)) @@ -2222,6 +2394,12 @@ GLOBAL_LIST_EMPTY(features_by_species) if(l_leg) final_bodypart_overrides[BODY_ZONE_L_LEG] = initial(l_leg.digitigrade_type) // SKYRAT EDIT END +======= + var/list/final_bodypart_overrides = new_species.bodypart_overrides.Copy() + if((new_species.digitigrade_customization == DIGITIGRADE_OPTIONAL && target.dna.features["legs"] == DIGITIGRADE_LEGS) || new_species.digitigrade_customization == DIGITIGRADE_FORCED) + final_bodypart_overrides[BODY_ZONE_R_LEG] = /obj/item/bodypart/leg/right/digitigrade + final_bodypart_overrides[BODY_ZONE_L_LEG] = /obj/item/bodypart/leg/left/digitigrade +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/bodypart/old_part as anything in target.bodyparts) if((old_part.change_exempt_flags & BP_BLOCK_CHANGE_SPECIES) || (old_part.bodypart_flags & BODYPART_IMPLANTED)) @@ -2308,6 +2486,13 @@ GLOBAL_LIST_EMPTY(features_by_species) /// Update the overlays if necessary /datum/species/proc/update_body_markings(mob/living/carbon/human/hooman) +<<<<<<< HEAD +======= + if(HAS_TRAIT(hooman, TRAIT_INVISIBLE_MAN)) + remove_body_markings(hooman) + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/needs_update = FALSE for(var/datum/bodypart_overlay/simple/body_marking/marking as anything in body_markings) if(initial(marking.dna_feature_key) == body_markings[marking]) // dna is same as our species (sort of mini-cache), so no update needed diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index f63e692a118..28c8cda518c 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -66,7 +66,10 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift) //SKYRAT EDIT REMOVAL START /* ADD_TRAIT(src, TRAIT_BADDNA, CHANGELING_DRAIN) +<<<<<<< HEAD */ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_volume = 0 return TRUE diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index b3951731a8f..d142cf7a456 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -18,7 +18,11 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /mob/living/carbon/human/dummy/attach_rot(mapload) return +<<<<<<< HEAD /mob/living/carbon/human/dummy/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE, list/override_features, list/override_mutantparts, list/override_markings, retain_features = FALSE, retain_mutantparts = FALSE) // SKYRAT EDIT - Customization +======= +/mob/living/carbon/human/dummy/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 harvest_organs() return ..() @@ -103,7 +107,10 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /proc/create_consistent_human_dna(mob/living/carbon/human/target) target.dna.features["mcolor"] = COLOR_VIBRANT_LIME target.dna.features["ethcolor"] = COLOR_WHITE +<<<<<<< HEAD /* SKYRAT EDIT START REMOVAL START - Customization +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.dna.features["lizard_markings"] = get_consistent_feature_entry(SSaccessories.lizard_markings_list) target.dna.features["ears"] = get_consistent_feature_entry(SSaccessories.ears_list) target.dna.features["frills"] = get_consistent_feature_entry(SSaccessories.frills_list) @@ -117,7 +124,10 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) target.dna.features["tail_lizard"] = get_consistent_feature_entry(SSaccessories.tails_list_lizard) target.dna.features["tail_monkey"] = get_consistent_feature_entry(SSaccessories.tails_list_monkey) target.dna.features["pod_hair"] = get_consistent_feature_entry(SSaccessories.pod_hair_list) +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.dna.initialize_dna(create_mutation_blocks = FALSE, randomize_features = FALSE) // UF and UI are nondeterministic, even though the features are the same some blocks will randomize slightly // In practice this doesn't matter, but this is for the sake of 100%(ish) consistency @@ -180,9 +190,12 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) if(ishuman(target)) var/mob/living/carbon/human/human_target = target human_target.copy_clothing_prefs(copycat) +<<<<<<< HEAD // SKYRAT EDIT target?.client?.prefs?.apply_prefs_to(copycat, TRUE) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 copycat.updateappearance(icon_update=TRUE, mutcolor_update=TRUE, mutations_overlay_update=TRUE) else diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ba5836ba167..cf52fc0e459 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -8,11 +8,14 @@ var/t_is = p_are() var/obscure_name var/obscure_examine +<<<<<<< HEAD // SKYRAT EDIT START var/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isliving(user)) var/mob/living/L = user @@ -21,6 +24,7 @@ if(HAS_TRAIT(src, TRAIT_UNKNOWN)) obscure_name = TRUE obscure_examine = TRUE +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - CUSTOMIZATION var/species_visible @@ -53,15 +57,20 @@ if(dna?.species && !skipface) apparent_species = ", \an [dna.species.name]" . = list("*---------*\nThis is [!obscure_name ? name : "Unknown"][apparent_species]!") +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - . = list("*---------*\nThis is [!obscure_name ? name : "Unknown"]!") + . = list("This is [!obscure_name ? name : "Unknown"]!") if(obscure_examine) return list("You're struggling to make out any details...") var/obscured = check_obscured_slots() +<<<<<<< HEAD var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) */ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //uniform if(w_uniform && !(obscured & ITEM_SLOT_ICLOTHING) && !(w_uniform.item_flags & EXAMINE_SKIP)) @@ -141,8 +150,11 @@ . += wear_id.get_id_examine_strings(user) +<<<<<<< HEAD . += EXAMINE_SECTION_BREAK // SKYRAT EDIT ADDITION - hr sections +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Status effects var/list/status_examines = get_status_effect_examinations() if (length(status_examines)) @@ -366,7 +378,11 @@ if(!key) msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n" else if(!client) +<<<<<<< HEAD msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and [t_has] been completely unresponsive to anything for [round(((world.time - lastclienttime) / (1 MINUTES)),1)] minutes. [t_He] may snap out of it soon.")]\n" // SKYRAT EDIT CHANGE - SSD_INDICATOR - ORIGINAL: msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.")]\n" +======= + msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.")]\n" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/scar_severity = 0 for(var/i in all_scars) @@ -424,10 +440,13 @@ if(target_record) . += "\[Medical evaluation\]
" . += "\[See quirks\]" +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - EXAMINE RECORDS if(target_record && length(target_record.past_medical_records) > RECORDS_INVISIBLE_THRESHOLD) . += "\[View medical records\]" //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(user, TRAIT_SECURITY_HUD)) if((user.stat == CONSCIOUS || isobserver(user)) && user != src) @@ -450,6 +469,7 @@ . += jointext(list("\[Add citation\]", "\[Add crime\]", "\[Add note\]"), "") +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - EXAMINE RECORDS if(target_record && length(target_record.past_security_records) > RECORDS_INVISIBLE_THRESHOLD) . += "\[View past security records\]" @@ -522,6 +542,20 @@ /mob/living/proc/get_status_effect_examinations() var/list/examine_list = list() +======= + if(isobserver(user)) + . += span_info("\nQuirks: [get_quirk_string(FALSE, CAT_QUIRK_ALL)]") + . += "" + + SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) + +/** + * Shows any and all examine text related to any status effects the user has. + */ +/mob/living/proc/get_status_effect_examinations() + var/list/examine_list = list() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/status_effect/effect as anything in status_effects) var/effect_text = effect.get_examine_text() if(!effect_text) @@ -540,10 +574,15 @@ return var/age_text switch(age) +<<<<<<< HEAD if(-INFINITY to 17) // SKYRAT EDIT ADD START -- AGE EXAMINE age_text = "too young to be here" if(18 to 25) age_text = "a young adult" // SKYRAT EDIT END +======= + if(-INFINITY to 25) + age_text = "very young" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(26 to 35) age_text = "of adult age" if(36 to 55) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6887cbba2f3..1e0896450b9 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -18,6 +18,7 @@ set_species(dna.species.type) prepare_huds() //Prevents a nasty runtime on human init +<<<<<<< HEAD . = ..() @@ -36,6 +37,44 @@ GLOB.human_list += src SSopposing_force.give_opfor_button(src) //SKYRAT EDIT - OPFOR SYSTEM +/mob/living/carbon/human/proc/setup_physiology() + physiology = new() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + +/mob/living/carbon/human/proc/setup_mood() + if (CONFIG_GET(flag/disable_human_mood)) + return + mob_mood = new /datum/mood(src) + +<<<<<<< HEAD +/mob/living/carbon/human/dummy/setup_mood() + return + +/// This proc is for holding effects applied when a mob is missing certain organs +/// It is called very, very early in human init because all humans innately spawn with no organs and gain them during init +/// Gaining said organs removes these effects +/mob/living/carbon/human/proc/setup_organless_effects() + // All start without eyes, and get them via set species + become_blind(NO_EYES) + // Mobs cannot taste anything without a tongue; the tongue organ removes this on Insert + ADD_TRAIT(src, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) + +======= + RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face)) + AddComponent(/datum/component/personal_crafting) + AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) + AddComponent(/datum/component/bloodysoles/feet, FOOTPRINT_SPRITE_SHOES) + AddElement(/datum/element/ridable, /datum/component/riding/creature/human) + AddElement(/datum/element/strippable, GLOB.strippable_human_items, TYPE_PROC_REF(/mob/living/carbon/human/, should_strip)) + var/static/list/loc_connections = list( + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + COMSIG_LIVING_DISARM_PRESHOVE = PROC_REF(disarm_precollide), + COMSIG_LIVING_DISARM_COLLIDE = PROC_REF(disarm_collision), + ) + AddElement(/datum/element/connect_loc, loc_connections) + GLOB.human_list += src + /mob/living/carbon/human/proc/setup_physiology() physiology = new() @@ -56,6 +95,7 @@ // Mobs cannot taste anything without a tongue; the tongue organ removes this on Insert ADD_TRAIT(src, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/proc/setup_human_dna() randomize_human_normie(src, randomize_mutations = TRUE) @@ -194,6 +234,7 @@ if(quirkstring) to_chat(human_user, "Detected physiological traits:\n[quirkstring]") else +<<<<<<< HEAD to_chat(usr, "No physiological traits found.") //SKYRAT EDIT ADDITION BEGIN - EXAMINE RECORDS if(href_list["medrecords"]) @@ -201,6 +242,9 @@ if(href_list["genrecords"]) to_chat(usr, "General Record: [target_record.past_general_records]") //SKYRAT EDIT END +======= + to_chat(human_user, "No physiological traits found.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //Medical HUD ends here. if(href_list["hud"] == "s") @@ -266,6 +310,7 @@ if(!crime.valid) sec_record_message += span_notice("\n-- REDACTED --") continue +<<<<<<< HEAD sec_record_message += "\nCrime: [crime.name]" sec_record_message += "\nDetails: [crime.details]" @@ -311,6 +356,53 @@ return var/datum/crime/new_crime = new(name = crime_name, author = allowed_access) +======= + + sec_record_message += "\nCrime: [crime.name]" + sec_record_message += "\nDetails: [crime.details]" + sec_record_message += "\nAdded by [crime.author] at [crime.time]" + to_chat(human_or_ghost_user, examine_block(sec_record_message)) + return + if(ishuman(human_or_ghost_user)) + var/mob/living/carbon/human/human_user = human_or_ghost_user + if(href_list["add_citation"]) + var/max_fine = CONFIG_GET(number/maxfine) + var/citation_name = tgui_input_text(human_user, "Citation crime", "Security HUD") + var/fine = tgui_input_number(human_user, "Citation fine", "Security HUD", 50, max_fine, 5) + if(!fine || !target_record || !citation_name || !allowed_access || !isnum(fine) || fine > max_fine || fine <= 0 || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + return + + var/datum/crime/citation/new_citation = new(name = citation_name, author = allowed_access, fine = fine) + + target_record.citations += new_citation + new_citation.alert_owner(usr, src, target_record.name, "You have been fined [fine] credits for '[citation_name]'. Fines may be paid at security.") + investigate_log("New Citation: [citation_name] Fine: [fine] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) + SSblackbox.ReportCitation(REF(new_citation), human_user.ckey, human_user.real_name, target_record.name, citation_name, fine) + + return + + if(href_list["add_crime"]) + var/crime_name = tgui_input_text(human_user, "Crime name", "Security HUD") + if(!target_record || !crime_name || !allowed_access || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + return + + var/datum/crime/new_crime = new(name = crime_name, author = allowed_access) + + target_record.crimes += new_crime + investigate_log("New Crime: [crime_name] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) + to_chat(human_user, span_notice("Successfully added a crime.")) + + return + + if(href_list["add_note"]) + var/new_note = tgui_input_text(human_user, "Security note", "Security Records", multiline = TRUE) + if(!target_record || !new_note || !allowed_access || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + return + + target_record.security_note = new_note + + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target_record.crimes += new_crime investigate_log("New Crime: [crime_name] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) @@ -447,7 +539,7 @@ /* SKYRAT EDIT - REMOVAL //Check for nonhuman scum - if(dna && dna.species.id && dna.species.id != "human") + if(dna && dna.species.id && dna.species.id != SPECIES_HUMAN) threatcount += 1 */ @@ -840,10 +932,13 @@ var/datum/quirk/quirk_type = type if(initial(quirk_type.abstract_parent_type) == type) continue +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(initial(quirk_type.erp_quirk) && CONFIG_GET(flag/disable_erp_preferences)) continue // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/qname = initial(quirk_type.name) options[has_quirk(quirk_type) ? "[qname] (Remove)" : "[qname] (Add)"] = quirk_type var/result = input(usr, "Choose quirk to add/remove","Quirk Mod") as null|anything in sort_list(options) @@ -955,7 +1050,11 @@ return ishuman(target) && target.body_position == LYING_DOWN /mob/living/carbon/human/proc/fireman_carry(mob/living/carbon/target) +<<<<<<< HEAD if(!can_be_firemanned(target) || incapacitated(IGNORE_GRAB)) +======= + if(!can_be_firemanned(target) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("You can't fireman carry [target] while [target.p_they()] [target.p_are()] standing!")) return @@ -978,11 +1077,15 @@ skills_space = " very quickly" else if(carrydelay <= 4 SECONDS) skills_space = " quickly" +<<<<<<< HEAD //SKYRAT EDIT ADDITION else if(HAS_TRAIT(target, TRAIT_OVERSIZED) && !HAS_TRAIT(src, TRAIT_OVERSIZED)) visible_message(span_warning("[src] tries to carry [target], but they are too heavy!")) return //SKYRAT EDIT END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_notice("[src] starts[skills_space] lifting [target] onto [p_their()] back..."), span_notice("You[skills_space] start to lift [target] onto your back...")) if(!do_after(src, carrydelay, target)) @@ -990,7 +1093,11 @@ return //Second check to make sure they're still valid to be carried +<<<<<<< HEAD if(!can_be_firemanned(target) || incapacitated(IGNORE_GRAB) || target.buckled) +======= + if(!can_be_firemanned(target) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB) || target.buckled) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_warning("[src] fails to fireman carry [target]!")) return @@ -1006,6 +1113,7 @@ visible_message(span_warning("[target] fails to climb onto [src]!")) return +<<<<<<< HEAD if(target.incapacitated(IGNORE_GRAB) || incapacitated(IGNORE_GRAB)) target.visible_message(span_warning("[target] can't hang onto [src]!")) return @@ -1032,6 +1140,11 @@ target.throw_at(get_turf(src), 1, 1, spin=FALSE, quickstart=FALSE) return //SKYRAT EDIT END +======= + if(INCAPACITATED_IGNORING(target, INCAPABLE_GRAB) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB)) + target.visible_message(span_warning("[target] can't hang onto [src]!")) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return buckle_mob(target, TRUE, TRUE, RIDER_NEEDS_ARMS) @@ -1089,7 +1202,11 @@ if (!isnull(race)) dna.species = new race +<<<<<<< HEAD /mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE, list/override_features, list/override_mutantparts, list/override_markings, retain_features = FALSE, retain_mutantparts = FALSE) // SKYRAT EDIT - Customization +======= +/mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update, pref_load) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(use_random_name) fully_replace_character_name(real_name, generate_random_mob_name()) diff --git a/code/modules/mob/living/carbon/human/human_context.dm b/code/modules/mob/living/carbon/human/human_context.dm index f0fd30f6d49..1cba6b1fce6 100644 --- a/code/modules/mob/living/carbon/human/human_context.dm +++ b/code/modules/mob/living/carbon/human/human_context.dm @@ -17,6 +17,7 @@ context[SCREENTIP_CONTEXT_CTRL_LMB] = "Strangle" else return . +<<<<<<< HEAD // SKYRAT EDIT START - screentips for grab interactions (slams/suplexes/dislocations) if(user.combat_mode && user.grab_state > GRAB_PASSIVE) switch(deprecise_zone(user.zone_selected)) @@ -28,6 +29,8 @@ else context[SCREENTIP_CONTEXT_ALT_LMB] = "Dislocate" // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else context[SCREENTIP_CONTEXT_CTRL_LMB] = "Pull" diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 41c129dc4ab..9723679134b 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -201,8 +201,11 @@ apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, MELEE)) return TRUE +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - SKYRAT_XENO_REDO - Moved to: modular_skyrat\modules\xenos_skyrat_redo\code\human_defense.dm /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers) . = ..() if(!.) @@ -254,10 +257,17 @@ if(!dismembering_strike(user, user.zone_selected)) //Dismemberment successful return TRUE apply_damage(damage, BRUTE, affecting, armor_block) +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= + + + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L, list/modifiers) . = ..() if(!.) @@ -581,11 +591,14 @@ continue body_part.check_for_injuries(src, combined_msg) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - MEDICAL if(body_part.current_gauze) combined_msg += "\t [span_notice("Your [body_part.name] is [body_part.current_gauze.get_gauze_usage_prefix()] with [body_part.current_gauze.get_gauze_description()].")]" //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/t in missing) combined_msg += span_boldannounce("Your [parse_zone(t)] is missing!") diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 1e6db319eaa..fa5b5875946 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -5,7 +5,11 @@ icon = 'icons/mob/human/human.dmi' icon_state = "human_basic" appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE +<<<<<<< HEAD hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPSEC_FIRST_HUD,IMPSEC_SECOND_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD,PERMIT_HUD, DNR_HUD) //SKYRAT EDIT ADDITION - PERMIT_HUD, DNR_HUD +======= + hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPSEC_FIRST_HUD,IMPSEC_SECOND_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hud_type = /datum/hud/human pressure_resistance = 25 can_buckle = TRUE @@ -16,9 +20,12 @@ flags_1 = PREVENT_CONTENTS_EXPLOSION_1 max_grab = GRAB_KILL +<<<<<<< HEAD maxHealth = HUMAN_MAXHEALTH //SKYRAT EDIT ADDITION health = HUMAN_MAXHEALTH //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Hair colour and style var/hair_color = COLOR_BLACK var/hairstyle = "Bald" @@ -50,7 +57,10 @@ var/lip_color = COLOR_WHITE var/age = 30 //Player's age +<<<<<<< HEAD var/chrono_age = 30 // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Which body type to use var/physique = MALE @@ -62,9 +72,12 @@ var/socks = "Nude" //Which socks the player wants var/backpack = DBACKPACK //Which backpack type the player has chosen. var/jumpsuit_style = PREF_SUIT //suit/skirt +<<<<<<< HEAD var/datum/scream_type/selected_scream //SKRYAT EDIT ADDITION var/datum/laugh_type/selected_laugh //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Equipment slots var/obj/item/clothing/wear_suit = null diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index e74b0dda690..073ce0a3cd2 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -267,6 +267,10 @@ destination.socks = socks destination.jumpsuit_style = jumpsuit_style +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fully randomizes everything according to the given flags. /mob/living/carbon/human/proc/randomize_human_appearance(randomize_flags = ALL) var/datum/preferences/preferences = new(new /datum/client_interface) diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index 00b703c6c71..79f2f221e15 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -43,6 +43,10 @@ return real_name else return real_name +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(mind) var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) if(changeling?.mimicing) @@ -72,7 +76,11 @@ var/area/our_area = get_area(src) if(our_area.area_flags & BINARY_JAMMING) return FALSE +<<<<<<< HEAD return dongle.translate_binary +======= + return (dongle.special_channels & RADIO_SPECIAL_BINARY) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/radio(message, list/message_mods = list(), list/spans, language) //Poly has a copy of this, lazy bastard . = ..() diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm index b2dce5234b4..a334bf9e95e 100644 --- a/code/modules/mob/living/carbon/human/human_stripping.dm +++ b/code/modules/mob/living/carbon/human/human_stripping.dm @@ -178,7 +178,10 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/id key = STRIPPABLE_ITEM_ID item_slot = ITEM_SLOT_ID +<<<<<<< HEAD can_be_silent = TRUE //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/strippable_item/mob_item_slot/belt key = STRIPPABLE_ITEM_BELT @@ -196,7 +199,10 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/pocket /// Which pocket we're referencing. Used for visible text. var/pocket_side +<<<<<<< HEAD can_be_silent = TRUE //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/strippable_item/mob_item_slot/pocket/get_obscuring(atom/source) return isnull(get_item(source)) \ @@ -224,7 +230,11 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( var/result = start_unequip_mob(item, source, user, strip_delay = POCKET_STRIP_DELAY, hidden = TRUE) +<<<<<<< HEAD if (!(result || HAS_TRAIT(user, TRAIT_STICKY_FINGERS))) //SKYRAT EDIT ADDITION original if (!result) +======= + if (!result) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 warn_owner(source) return result diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 57da14438a5..ff0c813f8a8 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -74,10 +74,13 @@ There are several things that need to be remembered: ..() if(obscured_flags & HIDEFACE) sec_hud_set_security_status() +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - ERP Overlays if(obscured_flags & HIDESEXTOY) update_inv_lewd() // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* --------------------------------------- */ //vvvvvv UPDATE_INV PROCS vvvvvv @@ -113,6 +116,7 @@ There are several things that need to be remembered: var/handled_by_bodyshape = TRUE var/icon_file var/woman +<<<<<<< HEAD var/digi // SKYRAT EDIT ADDITION - Digi female gender shaping var/female_sprite_flags = uniform.female_sprite_flags // SKYRAT EDIT ADDITION - Digi female gender shaping var/mutant_styles = NONE // SKYRAT EDIT ADDITON - mutant styles to pass down to build_worn_icon. @@ -134,11 +138,20 @@ There are several things that need to be remembered: female_sprite_flags &= ~FEMALE_UNIFORM_FULL // clear the FEMALE_UNIFORM_DIGI_FULL bit if it was set, we don't want that. female_sprite_flags |= FEMALE_UNIFORM_TOP_ONLY // And set the FEMALE_UNIFORM_TOP bit if it is unset. // SKYRAT EDIT ADDITION END +======= + //BEGIN SPECIES HANDLING + if((bodyshape & BODYSHAPE_DIGITIGRADE) && (uniform.supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION)) + icon_file = DIGITIGRADE_UNIFORM_FILE + //Female sprites have lower priority than digitigrade sprites + else if(dna.species.sexes && (bodyshape & BODYSHAPE_HUMANOID) && physique == FEMALE && !(uniform.female_sprite_flags & NO_FEMALE_UNIFORM)) //Agggggggghhhhh + woman = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!icon_exists(icon_file, RESOLVE_ICON_STATE(uniform))) icon_file = DEFAULT_UNIFORM_FILE handled_by_bodyshape = FALSE +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Taur-friendly suits! if(bodyshape & BODYSHAPE_TAUR) if(istype(uniform) && uniform.gets_cropped_on_taurs) @@ -156,12 +169,29 @@ There are several things that need to be remembered: mutant_styles = mutant_styles, // SKYRAT EDIT ADDITION - Taur-friendly uniforms! ) +======= + //END SPECIES HANDLING + uniform_overlay = uniform.build_worn_icon( + default_layer = UNIFORM_LAYER, + default_icon_file = icon_file, + isinhands = FALSE, + female_uniform = woman ? uniform.female_sprite_flags : null, + override_state = target_overlay, + override_file = handled_by_bodyshape ? icon_file : null, + ) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) my_chest?.worn_uniform_offset?.apply_offset(uniform_overlay) overlays_standing[UNIFORM_LAYER] = uniform_overlay apply_overlay(UNIFORM_LAYER) +<<<<<<< HEAD update_mutant_bodyparts() +======= + update_body_parts() + apply_overlay(UNIFORM_LAYER) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/update_worn_id(update_obscured = TRUE) remove_overlay(ID_LAYER) @@ -226,6 +256,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/hands.dmi' +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -236,6 +267,9 @@ There are several things that need to be remembered: // SKYRAT EDIT END var/mutable_appearance/gloves_overlay = gloves.build_worn_icon(default_layer = GLOVES_LAYER, default_icon_file = icon_file, override_file = mutant_override ? icon_file : null) // SKYRAT EDIT CHANGE +======= + var/mutable_appearance/gloves_overlay = gloves.build_worn_icon(default_layer = GLOVES_LAYER, default_icon_file = icon_file) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/feature_y_offset = 0 //needs to be typed, hand_bodyparts can have nulls @@ -272,6 +306,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/eyes.dmi' +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -287,6 +322,10 @@ There are several things that need to be remembered: if(!mutant_override) my_head.worn_glasses_offset?.apply_offset(glasses_overlay) // SKYRAT EDIT END +======= + var/mutable_appearance/glasses_overlay = glasses.build_worn_icon(default_layer = GLASSES_LAYER, default_icon_file = icon_file) + my_head.worn_glasses_offset?.apply_offset(glasses_overlay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[GLASSES_LAYER] = glasses_overlay apply_overlay(GLASSES_LAYER) @@ -314,6 +353,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/ears.dmi' +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -329,6 +369,10 @@ There are several things that need to be remembered: if(!mutant_override) my_head.worn_ears_offset?.apply_offset(ears_overlay) // SKYRAT EDIT END +======= + var/mutable_appearance/ears_overlay = ears.build_worn_icon(default_layer = EARS_LAYER, default_icon_file = icon_file) + my_head.worn_ears_offset?.apply_offset(ears_overlay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[EARS_LAYER] = ears_overlay apply_overlay(EARS_LAYER) @@ -351,6 +395,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/neck.dmi' +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -373,6 +418,11 @@ There are several things that need to be remembered: if(!mutant_override) my_chest?.worn_belt_offset?.apply_offset(neck_overlay) // SKYRAT EDIT END +======= + var/mutable_appearance/neck_overlay = worn_item.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = icon_file) + var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) + my_chest?.worn_belt_offset?.apply_offset(neck_overlay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[NECK_LAYER] = neck_overlay apply_overlay(NECK_LAYER) @@ -399,6 +449,7 @@ There are several things that need to be remembered: var/icon_file = DEFAULT_SHOES_FILE +<<<<<<< HEAD // SKYRAT EDIT ADDITION START var/mutant_override = FALSE @@ -418,6 +469,9 @@ There are several things that need to be remembered: var/mutable_appearance/shoes_overlay = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = icon_file, override_file = mutant_override ? icon_file : null) // SKYRAT EDIT CHANGE +======= + var/mutable_appearance/shoes_overlay = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = icon_file) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!shoes_overlay) return @@ -479,6 +533,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/head/default.dmi' +<<<<<<< HEAD // SKYRAT EDIT ADDITION - This needs to be refactored. var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -500,6 +555,11 @@ There are several things that need to be remembered: if(!mutant_override) my_head?.worn_head_offset?.apply_offset(head_overlay) // SKYRAT EDIT END +======= + var/mutable_appearance/head_overlay = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = icon_file) + var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) + my_head?.worn_head_offset?.apply_offset(head_overlay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[HEAD_LAYER] = head_overlay apply_overlay(HEAD_LAYER) @@ -523,6 +583,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/belt.dmi' +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -539,6 +600,11 @@ There are several things that need to be remembered: if(!mutant_override) my_chest?.worn_belt_offset?.apply_offset(belt_overlay) // SKYRAT EDIT END +======= + var/mutable_appearance/belt_overlay = belt.build_worn_icon(default_layer = BELT_LAYER, default_icon_file = icon_file) + var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) + my_chest?.worn_belt_offset?.apply_offset(belt_overlay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[BELT_LAYER] = belt_overlay apply_overlay(BELT_LAYER) @@ -553,6 +619,7 @@ There are several things that need to be remembered: if(wear_suit) var/obj/item/worn_item = wear_suit update_hud_wear_suit(worn_item) +<<<<<<< HEAD if(update_obscured) update_obscured_slots(worn_item.flags_inv) @@ -591,10 +658,26 @@ There are several things that need to be remembered: overlays_standing[SUIT_LAYER] = suit_overlay update_body_parts() update_mutant_bodyparts() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(update_obscured) + update_obscured_slots(worn_item.flags_inv) + + var/icon_file = DEFAULT_SUIT_FILE + + var/mutable_appearance/suit_overlay = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = icon_file) + var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) + my_chest?.worn_suit_offset?.apply_offset(suit_overlay) + overlays_standing[SUIT_LAYER] = suit_overlay + + update_body_parts() apply_overlay(SUIT_LAYER) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/update_pockets() if(client && hud_used) var/atom/movable/screen/inventory/inv @@ -622,6 +705,7 @@ There are several things that need to be remembered: var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) if(isnull(my_head)) //Decapitated return +<<<<<<< HEAD if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1] @@ -671,6 +755,39 @@ There are several things that need to be remembered: var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1] inv.update_icon() +======= + + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1] + inv.update_icon() + + if(wear_mask) + var/obj/item/worn_item = wear_mask + update_hud_wear_mask(worn_item) + + if(update_obscured) + update_obscured_slots(worn_item.flags_inv) + + if(check_obscured_slots(transparent_protection = TRUE) & ITEM_SLOT_MASK) + return + + var/icon_file = 'icons/mob/clothing/mask.dmi' + + var/mutable_appearance/mask_overlay = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = icon_file) + my_head.worn_mask_offset?.apply_offset(mask_overlay) + overlays_standing[FACEMASK_LAYER] = mask_overlay + + apply_overlay(FACEMASK_LAYER) + update_body_parts() //e.g. upgate needed because mask now hides lizard snout + +/mob/living/carbon/human/update_worn_back(update_obscured = TRUE) + remove_overlay(BACK_LAYER) + + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1] + inv.update_icon() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(back) var/obj/item/worn_item = back var/mutable_appearance/back_overlay @@ -681,6 +798,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/back.dmi' +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -691,14 +809,21 @@ There are several things that need to be remembered: // SKYRAT EDIT END back_overlay = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = icon_file, override_file = mutant_override ? icon_file : null) // SKYRAT EDIT CHANGE +======= + back_overlay = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = icon_file) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!back_overlay) return var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) +<<<<<<< HEAD // SKYRAT EDIT ADDITION if(!mutant_override) my_chest?.worn_back_offset?.apply_offset(back_overlay) // SKYRAT EDIT END +======= + my_chest?.worn_back_offset?.apply_offset(back_overlay) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[BACK_LAYER] = back_overlay apply_overlay(BACK_LAYER) @@ -733,12 +858,81 @@ There are several things that need to be remembered: hands += hand_overlay return hands +<<<<<<< HEAD /proc/wear_female_version(t_color, icon, layer, type, greyscale_colors, mutant_styles) // SKYRAT EDIT CHANGE - Digi female gender shaping - ORIGINAL: /proc/wear_female_version(t_color, icon, layer, type, greyscale_colors) var/index = "[t_color]-[greyscale_colors][(mutant_styles & STYLE_DIGI) ? "-d" : ""]" // SKYRAT EDIT CHANGE - Digi female gender shaping - Original: var/index = "[t_color]-[greyscale_colors]]" var/icon/female_clothing_icon = GLOB.female_clothing_icons[index] if(!female_clothing_icon) //Create standing/laying icons if they don't exist generate_female_clothing(index, t_color, icon, type) return mutable_appearance(GLOB.female_clothing_icons[index], layer = -layer, icon_state = t_color) // SKYRAT EDIT - Taur-friendly uniforms and suits - Adds `icon_state = t_color` +======= +/// Modifies a sprite slightly to conform to female body shapes +/proc/wear_female_version(icon_state, icon, type, greyscale_colors) + var/index = "[icon_state]-[greyscale_colors]" + var/static/list/female_clothing_icons = list() + var/icon/female_clothing_icon = female_clothing_icons[index] + if(!female_clothing_icon) //Create standing/laying icons if they don't exist + var/female_icon_state = "female[type == FEMALE_UNIFORM_FULL ? "_full" : ((!type || type & FEMALE_UNIFORM_TOP_ONLY) ? "_top" : "")][type & FEMALE_UNIFORM_NO_BREASTS ? "_no_breasts" : ""]" + var/icon/female_cropping_mask = icon('icons/mob/clothing/under/masking_helpers.dmi', female_icon_state) + female_clothing_icon = icon(icon, icon_state) + female_clothing_icon.Blend(female_cropping_mask, ICON_MULTIPLY) + female_clothing_icon = fcopy_rsc(female_clothing_icon) + female_clothing_icons[index] = female_clothing_icon + + return icon(female_clothing_icon) + +// These coordonates point to roughly somewhere in the middle of the left leg +// Used in approximating what color the pants of clothing should be +#define LEG_SAMPLE_X_LOWER 13 +#define LEG_SAMPLE_X_UPPER 14 + +#define LEG_SAMPLE_Y_LOWER 8 +#define LEG_SAMPLE_Y_UPPER 9 + +/// Modifies a sprite to conform to digitigrade body shapes +/proc/wear_digi_version(icon/base_icon, key, greyscale_config = /datum/greyscale_config/jumpsuit/worn_digi, greyscale_colors) + ASSERT(key, "wear_digi_version: no key passed") + ASSERT(ispath(greyscale_config, /datum/greyscale_config), "wear_digi_version: greyscale_config is not a valid path (got: [greyscale_config])") + // items with greyscale colors containing multiple colors are invalid + if(isnull(greyscale_colors) || length(SSgreyscale.ParseColorString(greyscale_colors)) > 1) + var/pant_color + // approximates the color of the pants by sampling a few pixels in the middle of the left leg + for(var/x in LEG_SAMPLE_X_LOWER to LEG_SAMPLE_X_UPPER) + for(var/y in LEG_SAMPLE_Y_LOWER to LEG_SAMPLE_Y_UPPER) + var/xy_color = base_icon.GetPixel(x, y) + pant_color = pant_color ? BlendRGB(pant_color, xy_color, 0.5) : xy_color + + greyscale_colors = pant_color || "#1d1d1d" // black pants always look good + + var/index = "[key]-[greyscale_config]-[greyscale_colors]" + var/static/list/digitigrade_clothing_icons = list() + var/icon/digitigrade_clothing_icon = digitigrade_clothing_icons[index] + if(!digitigrade_clothing_icon) + var/static/icon/torso_mask + if(!torso_mask) + torso_mask = icon('icons/mob/clothing/under/masking_helpers.dmi', "digi_torso_mask") + var/static/icon/leg_mask + if(!leg_mask) + leg_mask = icon('icons/mob/clothing/under/masking_helpers.dmi', "digi_leg_mask") + + base_icon.Blend(leg_mask, ICON_SUBTRACT) // cuts the legs off + + var/icon/leg_icon = SSgreyscale.GetColoredIconByType(greyscale_config, greyscale_colors) + leg_icon.Blend(torso_mask, ICON_SUBTRACT) // cuts the torso off + + base_icon.Blend(leg_icon, ICON_OVERLAY) // puts the new legs on + + digitigrade_clothing_icon = fcopy_rsc(base_icon) + digitigrade_clothing_icons[index] = digitigrade_clothing_icon + + return icon(digitigrade_clothing_icon) + +#undef LEG_SAMPLE_X_LOWER +#undef LEG_SAMPLE_X_UPPER + +#undef LEG_SAMPLE_Y_LOWER +#undef LEG_SAMPLE_Y_UPPER +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/proc/get_overlays_copy(list/unwantedLayers) var/list/out = new @@ -865,7 +1059,10 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E female_uniform = NO_FEMALE_UNIFORM, override_state = null, override_file = null, +<<<<<<< HEAD mutant_styles = NONE, // SKYRAT EDIT ADD - Further outfit modification for outfits (added `mutant_styles` argument) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // SKYRAT EDIT ADDITION START - Taur-friendly uniforms and suits @@ -889,6 +1086,7 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E //Find a valid layer from variables+arguments var/layer2use = alternate_worn_layer || default_layer +<<<<<<< HEAD var/mutable_appearance/standing if(female_uniform) standing = wear_female_version(t_state, file2use, layer2use, female_uniform, greyscale_colors, mutant_styles) //should layer2use be in sync with the adjusted value below? needs testing - shiz // SKYRAT EDIT CHANGE - ORIGINAL: standing = wear_female_version(t_state, file2use, layer2use, female_uniform, greyscale_colors) @@ -905,6 +1103,36 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E //Get the overlays for this item when it's being worn //eg: ammo counters, primed grenade flashes, etc. var/list/worn_overlays = worn_overlays(standing, isinhands, file2use, mutant_styles) // SKYRAT EDIT CHANGE - ORIGINAL: var/list/worn_overlays = worn_overlays(standing, isinhands, file2use) +======= + var/mob/living/carbon/wearer = loc + var/is_digi = istype(wearer) && (wearer.bodyshape & BODYSHAPE_DIGITIGRADE) && !wearer.is_digitigrade_squished() + + var/mutable_appearance/standing // this is the actual resulting MA + var/icon/building_icon // used to construct an icon across multiple procs before converting it to MA + if(female_uniform) + building_icon = wear_female_version( + icon_state = t_state, + icon = file2use, + type = female_uniform, + greyscale_colors = greyscale_colors, + ) + if(!isinhands && is_digi && (supports_variations_flags & CLOTHING_DIGITIGRADE_MASK)) + building_icon = wear_digi_version( + base_icon = building_icon || icon(file2use, t_state), + key = "[t_state]-[file2use]-[female_uniform]", + greyscale_config = digitigrade_greyscale_config_worn || greyscale_config_worn, + greyscale_colors = digitigrade_greyscale_colors || greyscale_colors || color, + ) + if(building_icon) + standing = mutable_appearance(building_icon, layer = -layer2use) + + // no special handling done, default it + standing ||= mutable_appearance(file2use, t_state, layer = -layer2use) + + //Get the overlays for this item when it's being worn + //eg: ammo counters, primed grenade flashes, etc. + var/list/worn_overlays = worn_overlays(standing, isinhands, file2use) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(length(worn_overlays)) standing.overlays += worn_overlays @@ -1029,6 +1257,10 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E var/static/icon/cut_legs_mask = icon('icons/effects/cut.dmi', "Cut2") var/static/icon/lenghten_torso_mask = icon('icons/effects/cut.dmi', "Cut3") var/static/icon/lenghten_legs_mask = icon('icons/effects/cut.dmi', "Cut4") +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 appearance.remove_filter(list( "Cut_Torso", "Cut_Legs", @@ -1041,6 +1273,10 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E "Monkey_Gnome_Cut_Torso", "Monkey_Gnome_Cut_Legs", )) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(get_mob_height()) // Don't set this one directly, use TRAIT_DWARF if(MONKEY_HEIGHT_DWARF) @@ -1140,6 +1376,7 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E "params" = displacement_map_filter(lenghten_legs_mask, x = 0, y = 0, size = 2), ), )) +<<<<<<< HEAD // Kinda gross but because many humans overlays do not use KEEP_TOGETHER we need to manually propogate the filter // Otherwise overlays, such as worn overlays on icons, won't have the filter "applied", and the effect kinda breaks if(!(appearance.appearance_flags & KEEP_TOGETHER)) @@ -1147,4 +1384,15 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E apply_height_filters(overlay) return appearance +======= + + // Kinda gross but because many humans overlays do not use KEEP_TOGETHER we need to manually propogate the filter + // Otherwise overlays, such as worn overlays on icons, won't have the filter "applied", and the effect kinda breaks + if(!(appearance.appearance_flags & KEEP_TOGETHER)) + for(var/image/overlay in list() + appearance.underlays + appearance.overlays) + apply_height_filters(overlay) + + return appearance + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef RESOLVE_ICON_STATE diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 40dd1d4c054..dda4c4c1a12 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -45,12 +45,24 @@ return r_store if(ITEM_SLOT_SUITSTORE) return s_store +<<<<<<< HEAD return ..() +======= + + return ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/get_slot_by_item(obj/item/looking_for) if(looking_for == belt) return ITEM_SLOT_BELT +<<<<<<< HEAD +======= + if(belt && (looking_for in belt)) + return ITEM_SLOT_BELTPACK + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(looking_for == wear_id) return ITEM_SLOT_ID @@ -161,6 +173,7 @@ if(ITEM_SLOT_GLOVES) if(gloves) return +<<<<<<< HEAD gloves = equipping //SKYRAT EDIT ADDITION - ERP UPDATE @@ -179,6 +192,19 @@ if(wear_suit) return +======= + gloves = equipping + update_worn_gloves() + if(ITEM_SLOT_FEET) + if(shoes) + return + shoes = equipping + update_worn_shoes() + if(ITEM_SLOT_OCLOTHING) + if(wear_suit) + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wear_suit = equipping if(wear_suit.breakouttime) //when equipping a straightjacket @@ -203,7 +229,13 @@ return s_store = equipping update_suit_storage() +<<<<<<< HEAD +======= + if(ITEM_SLOT_BELTPACK) + if(!belt || !belt.atom_storage?.attempt_insert(equipping, src, override = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED)) + not_handled = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else to_chat(src, span_danger("You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")) @@ -381,7 +413,7 @@ /// take the most recent item out of a slot or place held item in a slot /mob/living/carbon/human/proc/smart_equip_targeted(slot_type = ITEM_SLOT_BELT, slot_item_name = "belt") - if(incapacitated()) + if(incapacitated) return var/obj/item/thing = get_active_held_item() var/obj/item/equipped_item = get_item_by_slot(slot_type) diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm index ec384347ec5..a37fccc9029 100644 --- a/code/modules/mob/living/carbon/human/login.dm +++ b/code/modules/mob/living/carbon/human/login.dm @@ -3,7 +3,11 @@ dna?.species?.on_owner_login(src) +<<<<<<< HEAD if(SStts.tts_enabled && isnull(voice)) // SKYRAT EDIT - None option for TTS - ORIGINAL: if(SStts.tts_enabled && !voice) +======= + if(SStts.tts_enabled && !voice) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 voice = pick(SStts.available_speakers) if(!LAZYLEN(afk_thefts)) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 85dda19024c..30f818b0e11 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -19,7 +19,10 @@ BODY_ZONE_CHEST = /obj/item/bodypart/chest, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID +<<<<<<< HEAD mutant_bodyparts = list("wings" = "None") +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mutantbrain = /obj/item/organ/internal/brain/dullahan mutanteyes = /obj/item/organ/internal/eyes/dullahan mutanttongue = /obj/item/organ/internal/tongue/dullahan @@ -292,4 +295,7 @@ owner.gib(DROP_ALL_REMAINS) owner = null return ..() +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 983ac9f9e10..0809b25040a 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -11,7 +11,10 @@ siemens_coeff = 0.5 //They thrive on energy payday_modifier = 1.0 inherent_traits = list( +<<<<<<< HEAD // TRAIT_NO_UNDERWEAR, // SKYRAT EDIT - LET THEM WEAR PANTIES +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_MUTANT_COLORS, TRAIT_FIXED_MUTANT_COLORS, TRAIT_AGENDER, @@ -60,7 +63,10 @@ RegisterSignal(new_ethereal, COMSIG_LIVING_HEALTH_UPDATE, PROC_REF(refresh_light_color)) ethereal_light = new_ethereal.mob_light(light_type = /obj/effect/dummy/lighting_obj/moblight/species) refresh_light_color(new_ethereal) +<<<<<<< HEAD update_mail_goodies(new_ethereal) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/internal/heart/ethereal/ethereal_heart = new_ethereal.get_organ_slot(ORGAN_SLOT_HEART) ethereal_heart.ethereal_color = default_color diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index b4ea6c3f2ad..6e9dba8580c 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -3,6 +3,7 @@ name = "Felinid" id = SPECIES_FELINE examine_limb_id = SPECIES_HUMAN +<<<<<<< HEAD mutant_bodyparts = list("ears" = "Cat", "wings" = "None") mutantbrain = /obj/item/organ/internal/brain/felinid mutanttongue = /obj/item/organ/internal/tongue/cat @@ -12,6 +13,14 @@ /obj/item/organ/external/tail/cat = "Cat", ) */ // SKYRAT EDIT REMOVAL END +======= + mutantbrain = /obj/item/organ/internal/brain/felinid + mutanttongue = /obj/item/organ/internal/tongue/cat + mutantears = /obj/item/organ/internal/ears/cat + mutant_organs = list( + /obj/item/organ/external/tail/cat = "Cat", + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inherent_traits = list( TRAIT_CATLIKE_GRACE, TRAIT_HATED_BY_DOGS, @@ -42,12 +51,16 @@ target_human.dna.features["tail_cat"] = "Cat" if(target_human.dna.features["ears"] == "None") target_human.dna.features["ears"] = "Cat" +<<<<<<< HEAD /* SKYRAT EDIT -- START -- ORIGINAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(target_human.dna.features["ears"] == "None") mutantears = /obj/item/organ/internal/ears else var/obj/item/organ/internal/ears/cat/ears = new(FALSE, target_human.dna.features["ears"]) ears.Insert(target_human, movement_flags = DELETE_IF_REPLACED) +<<<<<<< HEAD */ if(target_human.dna.features["ears"] == "Cat") var/obj/item/organ/internal/ears/cat/ears = new @@ -55,6 +68,8 @@ else mutantears = /obj/item/organ/internal/ears // SKYRAT EDIT -- END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/species/human/felinid/randomize_features(mob/living/carbon/human/human_mob) @@ -161,7 +176,11 @@ // stored_feature_id is only set once (the first time an organ is inserted), so this should be safe. var/obj/item/organ/internal/ears/cat/kitty_ears = new kitty_ears.Insert(soon_to_be_felinid, special = TRUE, movement_flags = DELETE_IF_REPLACED) +<<<<<<< HEAD if(should_external_organ_apply_to(/obj/item/organ/external/tail/cat, soon_to_be_felinid)) //only give them a tail if they actually have sprites for it / are a compatible subspecies. +======= + if(should_visual_organ_apply_to(/obj/item/organ/external/tail/cat, soon_to_be_felinid)) //only give them a tail if they actually have sprites for it / are a compatible subspecies. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/external/tail/cat/kitty_tail = new kitty_tail.Insert(soon_to_be_felinid, special = TRUE, movement_flags = DELETE_IF_REPLACED) @@ -184,8 +203,13 @@ old_tail.Remove(purrbated_human, special = TRUE) qdel(old_tail) // Locate does not work on assoc lists, so we do it by hand +<<<<<<< HEAD for(var/external_organ in target_species.external_organs) if(!should_external_organ_apply_to(external_organ, purrbated_human)) +======= + for(var/external_organ in target_species.mutant_organs) + if(!should_visual_organ_apply_to(external_organ, purrbated_human)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(ispath(external_organ, /obj/item/organ/external/tail)) var/obj/item/organ/external/tail/new_tail = new external_organ() @@ -206,17 +230,23 @@ human_for_preview.set_haircolor("#ffcccc", update = FALSE) // pink human_for_preview.set_hairstyle("Hime Cut", update = TRUE) +<<<<<<< HEAD /* SKYRAT EDIT - Making the species menu icons work better - ORIGINAL: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/internal/ears/cat/cat_ears = human_for_preview.get_organ_by_type(/obj/item/organ/internal/ears/cat) if (cat_ears) cat_ears.color = human_for_preview.hair_color human_for_preview.update_body() +<<<<<<< HEAD */ // START human_for_preview.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) human_for_preview.dna.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) regenerate_organs(human_for_preview, src, visual_only = TRUE) human_for_preview.update_body(TRUE) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/human/felinid/get_physical_attributes() return "Felinids are very similar to humans in almost all respects, with their biggest differences being the ability to lick their wounds, \ @@ -273,6 +303,7 @@ SPECIES_PERK_NAME = "Hydrophobia", SPECIES_PERK_DESC = "Felinids don't like getting soaked with water.", ), +<<<<<<< HEAD // SKYRAT EDIT ADDITION START list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, @@ -281,6 +312,8 @@ SPECIES_PERK_DESC = "Felinids are unhurt by high falls, and land on their feet.", ), // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) return to_add diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index d593f90ec7f..891359ea21a 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -27,7 +27,10 @@ payday_modifier = 1.0 siemens_coeff = 0 no_equip_flags = ITEM_SLOT_MASK | ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_ICLOTHING | ITEM_SLOT_SUITSTORE +<<<<<<< HEAD nojumpsuit = 1 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC sexes = FALSE meat = /obj/item/food/meat/slab/human/mutant/golem diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index d9054a84898..660c26e7fc6 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -4,7 +4,10 @@ inherent_traits = list( TRAIT_USES_SKINTONES, ) +<<<<<<< HEAD mutant_bodyparts = list("wings" = "None") +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT payday_modifier = 1.1 @@ -35,7 +38,11 @@ ) /datum/species/human/get_cough_sound(mob/living/carbon/human/human) +<<<<<<< HEAD if(human.gender == FEMALE) // SKYRAT EDIT CHANGE +======= + if(human.physique == FEMALE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick( 'sound/voice/human/female_cough1.ogg', 'sound/voice/human/female_cough2.ogg', @@ -54,7 +61,11 @@ ) /datum/species/human/get_cry_sound(mob/living/carbon/human/human) +<<<<<<< HEAD if(human.gender == FEMALE) // SKYRAT EDIT CHANGE +======= + if(human.physique == FEMALE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick( 'sound/voice/human/female_cry1.ogg', 'sound/voice/human/female_cry2.ogg', diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index be149ff9537..fe14941cca2 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -42,13 +42,17 @@ BODY_ZONE_CHEST = /obj/item/bodypart/chest/jelly, ) var/datum/action/innate/regenerate_limbs/regenerate_limbs +<<<<<<< HEAD var/datum/action/innate/alter_form/alter_form //SKYRAT EDIT ADDITION - CUSTOMIZATION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/jelly/on_species_gain(mob/living/carbon/new_jellyperson, datum/species/old_species, pref_load) . = ..() if(ishuman(new_jellyperson)) regenerate_limbs = new regenerate_limbs.Grant(new_jellyperson) +<<<<<<< HEAD update_mail_goodies(new_jellyperson) alter_form = new //SKYRAT EDIT CUSTOMIZATION alter_form.Grant(new_jellyperson) //SKYRAT EDIT CUSTOMIZATION @@ -63,6 +67,14 @@ if(alter_form) //SKYRAT EDIT CUSTOMIZATION alter_form.Remove(former_jellyperson) //SKYRAT EDIT CUSTOMIZATION +======= + new_jellyperson.AddElement(/datum/element/soft_landing) + RegisterSignal(new_jellyperson, COMSIG_HUMAN_ON_HANDLE_BLOOD, PROC_REF(slime_blood)) + +/datum/species/jelly/on_species_loss(mob/living/carbon/former_jellyperson, datum/species/new_species, pref_load) + if(regenerate_limbs) + regenerate_limbs.Remove(former_jellyperson) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 former_jellyperson.RemoveElement(/datum/element/soft_landing) UnregisterSignal(former_jellyperson, COMSIG_HUMAN_ON_HANDLE_BLOOD) return ..() @@ -421,7 +433,11 @@ return data +<<<<<<< HEAD /datum/action/innate/swap_body/ui_act(action, params) +======= +/datum/action/innate/swap_body/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 5840740be1b..1bfcc698aa6 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -7,9 +7,14 @@ TRAIT_MUTANT_COLORS, ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE +<<<<<<< HEAD mutant_bodyparts = list("body_markings" = "None", "legs" = "Normal Legs") // SKYRAT EDIT CHANGE - ORIGINAL: mutant_bodyparts = list("legs" = "Normal Legs") //body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None") // SKYRAT EDIT REMOVAL - We do this our own way external_organs = list( +======= + body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None") + mutant_organs = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/horns = "None", /obj/item/organ/external/frills = "None", /obj/item/organ/external/snout = "Round", @@ -47,14 +52,20 @@ /datum/species/lizard/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) return +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/lizard/randomize_features() var/list/features = ..() features["lizard_markings"] = pick(SSaccessories.lizard_markings_list) return features +<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/lizard/get_scream_sound(mob/living/carbon/human/lizard) return pick( diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 3f2a1752c73..3fc3137f972 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -3,7 +3,11 @@ /datum/species/monkey name = "\improper Monkey" id = SPECIES_MONKEY +<<<<<<< HEAD external_organs = list( +======= + mutant_organs = list( +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/monkey = "Monkey", ) mutanttongue = /obj/item/organ/internal/tongue/monkey diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 7c0910ba989..008b5e21c01 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -3,8 +3,13 @@ plural_form = "Mothmen" id = SPECIES_MOTH inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG +<<<<<<< HEAD mutant_bodyparts = list("moth_markings" = "None") // SKYRAT EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None") // external_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // SKYRAT EDIT REMOVAL - Fixing moths +======= + body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None") + mutant_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 meat = /obj/item/food/meat/slab/human/mutant/moth mutanttongue = /obj/item/organ/internal/tongue/moth mutanteyes = /obj/item/organ/internal/eyes/moth @@ -24,12 +29,15 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/moth, ) +<<<<<<< HEAD /datum/species/moth/regenerate_organs(mob/living/carbon/C, datum/species/old_species, replace_current= TRUE, list/excluded_zones, visual_only) +======= +/datum/species/moth/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() - if(ishuman(C)) - var/mob/living/carbon/human/H = C - handle_mutant_bodyparts(H) + RegisterSignal(human_who_gained_species, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) +<<<<<<< HEAD /datum/species/moth/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load) . = ..() RegisterSignal(human_who_gained_species, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) @@ -47,6 +55,21 @@ /datum/species/moth/randomize_features() var/list/features = ..() features["moth_markings"] = pick(SSaccessories.moth_wings_list) // SKYRAT EDIT CHANGE - ORIGINAL: features["moth_markings"] = pick(SSaccessories.moth_markings_list) +======= +/datum/species/moth/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) + . = ..() + UnregisterSignal(C, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS) + +/datum/species/moth/proc/damage_weakness(datum/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) + SIGNAL_HANDLER + + if(istype(attacking_item, /obj/item/melee/flyswatter)) + damage_mods += 10 // Yes, a 10x damage modifier + +/datum/species/moth/randomize_features() + var/list/features = ..() + features["moth_markings"] = pick(SSaccessories.moth_markings_list) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return features /datum/species/moth/get_scream_sound(mob/living/carbon/human/moth) @@ -142,7 +165,11 @@ SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "tshirt", SPECIES_PERK_NAME = "Meal Plan", +<<<<<<< HEAD SPECIES_PERK_DESC = "Moths can eat clothes for nourishment.", +======= + SPECIES_PERK_DESC = "Moths can eat clothes for temporary nourishment.", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 9c1649d0edd..c438b008f5c 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -6,6 +6,20 @@ fixed_mut_color = "#DBBF92" +<<<<<<< HEAD + inherent_traits = list( + TRAIT_MUTANT_COLORS, + TRAIT_NOBREATH, + TRAIT_NOFLASH, + TRAIT_NO_UNDERWEAR, + ) + inherent_factions = list(FACTION_MUSHROOM) + + no_equip_flags = ITEM_SLOT_MASK | ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_ICLOTHING + +======= + mutant_organs = list(/obj/item/organ/external/mushroom_cap = "Round") + inherent_traits = list( TRAIT_MUTANT_COLORS, TRAIT_NOBREATH, @@ -16,6 +30,7 @@ no_equip_flags = ITEM_SLOT_MASK | ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_ICLOTHING +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heatmod = 1.5 mutanttongue = /obj/item/organ/internal/tongue/mush @@ -70,7 +85,11 @@ preference = "feature_mushperson_cap" +<<<<<<< HEAD //dna_block = DNA_MUSHROOM_CAPS_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. +======= + dna_block = DNA_MUSHROOM_CAPS_BLOCK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 restyle_flags = EXTERNAL_RESTYLE_PLANT bodypart_overlay = /datum/bodypart_overlay/mutant/mushroom_cap diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 307d2d677c5..d5405bb848a 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -16,7 +16,10 @@ TRAIT_UNHUSKABLE, ) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inherent_biotypes = MOB_HUMANOID|MOB_MINERAL inherent_respiration_type = RESPIRATION_PLASMA mutantlungs = /obj/item/organ/internal/lungs/plasmaman diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 38e75704795..6bc38e34106 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -7,8 +7,13 @@ TRAIT_MUTANT_COLORS, TRAIT_PLANT_SAFE, ) +<<<<<<< HEAD external_organs = list( // /obj/item/organ/external/pod_hair = "None", // SKYRAT EDIT REMOVAL - Customization (it messes up unit tests.) +======= + mutant_organs = list( + /obj/item/organ/external/pod_hair = "None", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_PLANT inherent_factions = list(FACTION_PLANTS, FACTION_VINES) diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 0e7ac486ba5..7f9a6de3124 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -22,7 +22,11 @@ mutantlungs = null species_language_holder = /datum/language_holder/shadowpeople +<<<<<<< HEAD examine_limb_id = SPECIES_SHADOW // SKYRAT EDIT: Fixing Shadowpeople +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/shadow, BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/shadow, diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index f5c849cc215..e07f91ec45b 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -5,7 +5,10 @@ sexes = FALSE meat = /obj/item/food/meat/slab/human/mutant/skeleton inherent_traits = list( +<<<<<<< HEAD TRAIT_NO_UNDERWEAR, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_EASYDISMEMBER, TRAIT_FAKEDEATH, TRAIT_GENELESS, diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index 2c6d27a1886..27d68e1853a 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -4,9 +4,14 @@ id = SPECIES_SNAIL inherent_traits = list( TRAIT_MUTANT_COLORS, +<<<<<<< HEAD // TRAIT_NO_UNDERWEAR, //SKYRAT EDIT REMOVAL - Roundstart Snails - Snails deserve to wear underwear TRAIT_NO_SLIP_ALL, TRAIT_WATER_BREATHING, //SKYRAT EDIT ADDITION - Roundstart Snails - Sea snails exist, and land snails can weather being underwater for almost a day. +======= + TRAIT_NO_UNDERWEAR, + TRAIT_NO_SLIP_ALL, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) coldmod = 0.5 //snails only come out when its cold and wet @@ -28,7 +33,11 @@ ) ///Multiplier for the speed we give them. Positive numbers make it move slower, negative numbers make it move faster. +<<<<<<< HEAD var/snail_speed_mod = 1 // SKYRAT EDIT REMOVAL - Moved the movespeed to the shell. Original - var/snail_speed_mod = 6 +======= + var/snail_speed_mod = 6 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/snail/prepare_human_for_preview(mob/living/carbon/human/human) human.dna.features["mcolor"] = COLOR_BEIGE @@ -115,7 +124,10 @@ max_integrity = 200 resistance_flags = FIRE_PROOF | ACID_PROOF +<<<<<<< HEAD // SKYRAT EDIT ADDITION - CLARIFICATION - Roundstart Snails - These armor values don't actually do any protection of the wearer, this is for checking direct damage to the backpack. Damage resistance stuff is in their heart file. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/backpack_snail melee = 40 bullet = 30 diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 111b35cb7f7..7700b3685e1 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -17,7 +17,10 @@ TRAIT_NO_MIRROR_REFLECTION, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID +<<<<<<< HEAD mutant_bodyparts = list("wings" = "None") +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN exotic_bloodtype = "U" blood_deficiency_drain_rate = BLOOD_DEFICIENCY_MODIFIER // vampires already passively lose blood, so this just makes them lose it slightly more quickly when they have blood deficiency. diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index b685e18b018..30a72b8a472 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -97,6 +97,10 @@ damage_modifier = 20 // 120 damage to KO a zombie, which kills it mutanteyes = /obj/item/organ/internal/eyes/zombie mutantbrain = /obj/item/organ/internal/brain/zombie +<<<<<<< HEAD +======= + mutanttongue = /obj/item/organ/internal/tongue/zombie +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN inherent_traits = list( diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 3bdff375e22..4e9037b7965 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -62,7 +62,10 @@ damage_dealt = actual_hit.get_damage() - delta // Unfortunately bodypart receive_damage doesn't return damage dealt so we do it manually else damage_dealt = -1 * adjustBruteLoss(damage_amount, forced = forced) +<<<<<<< HEAD INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living, adjust_pain), damage_amount) // SKYRAT EDIT ADDITION - ERP Pain +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(BURN) if(isbodypart(def_zone)) var/obj/item/bodypart/actual_hit = def_zone @@ -81,7 +84,10 @@ damage_dealt = actual_hit.get_damage() - delta // See above else damage_dealt = -1 * adjustFireLoss(damage_amount, forced = forced) +<<<<<<< HEAD INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living, adjust_pain), damage_amount) // SKYRAT EDIT ADDITION - ERP Pain +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(TOX) damage_dealt = -1 * adjustToxLoss(damage_amount, forced = forced) if(OXY) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 1f94edf44cd..ceed2ead52d 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -133,10 +133,13 @@ med_hud_set_status() stop_pulling() +<<<<<<< HEAD cut_overlay(GLOB.combat_indicator_overlay) //SKYRAT EDIT ADDITION - COMBAT_INDICATOR set_combat_indicator(FALSE) //SKYRAT EDIT ADDITION - COMBAT_INDICATOR set_ssd_indicator(FALSE) //SKYRAT EDIT ADDITION - SSD_INDICATOR +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_LIVING_DEATH, gibbed) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MOB_DEATH, src, gibbed) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 9f25bcb82dc..7410340d27d 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -3,6 +3,19 @@ /datum/emote/living mob_type_allowed_typecache = /mob/living mob_type_blacklist_typecache = list(/mob/living/brain) +<<<<<<< HEAD +======= + +/datum/emote/living/taunt + key = "taunt" + key_third_person = "taunts" + message = "taunts!" + cooldown = 1.6 SECONDS //note when changing this- this is used by the matrix taunt to block projectiles. + +/datum/emote/living/taunt/run_emote(mob/living/user, params, type_override, intentional) + . = ..() + user.spin(TAUNT_EMOTE_DURATION, 0.1 SECONDS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/blush key = "blush" @@ -182,7 +195,11 @@ return var/mob/living/carbon/human/human_user = user +<<<<<<< HEAD if(human_user.gender == FEMALE) // SKYRAT EDIT CHANGE +======= + if(human_user.physique == FEMALE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg') return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg') @@ -426,7 +443,10 @@ return return user.dna.species.get_sniff_sound(user) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/snore key = "snore" @@ -678,7 +698,11 @@ return TRUE /datum/emote/living/custom/proc/get_custom_emote_from_user() +<<<<<<< HEAD return stripped_multiline_input(usr, "Choose an emote to display.", "Me" , null, MAX_MESSAGE_LEN) // SKYRAT EDIT CHANGE - ORIGINAL : return copytext(sanitize(input("Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN) +======= + return copytext(sanitize(input("Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/custom/proc/get_custom_emote_type_from_user() var/type = input("Is this a visible or hearable emote?") as null|anything in list("Visible", "Hearable", "Both") @@ -697,7 +721,10 @@ /datum/emote/living/custom/run_emote(mob/user, params, type_override = null, intentional = FALSE) if(params && type_override) emote_type = type_override +<<<<<<< HEAD message = user.say_emphasis(message) //SKYRAT EDIT ADDITION - EMOTES +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() ///Reset the message and emote type after it's run. message = null diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index 4bf0407c467..2c96a9e4adc 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -40,6 +40,11 @@ RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEAF), PROC_REF(on_hearing_loss)) RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEAF), PROC_REF(on_hearing_regain)) +<<<<<<< HEAD +======= + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_STASIS), PROC_REF(on_stasis_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_STASIS), PROC_REF(on_stasis_trait_loss)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignals(src, list( SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION), @@ -187,24 +192,50 @@ SIGNAL_HANDLER add_traits(list(TRAIT_UI_BLOCKED, TRAIT_PULL_BLOCKED), TRAIT_INCAPACITATED) update_appearance() +<<<<<<< HEAD +======= + update_incapacitated() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called when [TRAIT_INCAPACITATED] is removed from the mob. /mob/living/proc/on_incapacitated_trait_loss(datum/source) SIGNAL_HANDLER remove_traits(list(TRAIT_UI_BLOCKED, TRAIT_PULL_BLOCKED), TRAIT_INCAPACITATED) update_appearance() +<<<<<<< HEAD +======= + update_incapacitated() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called when [TRAIT_RESTRAINED] is added to the mob. /mob/living/proc/on_restrained_trait_gain(datum/source) SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, TRAIT_RESTRAINED) +<<<<<<< HEAD +======= + update_incapacitated() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called when [TRAIT_RESTRAINED] is removed from the mob. /mob/living/proc/on_restrained_trait_loss(datum/source) SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, TRAIT_RESTRAINED) +<<<<<<< HEAD +======= + update_incapacitated() + +/// Called when [TRAIT_STASIS] is added to the mob +/mob/living/proc/on_stasis_trait_gain(datum/source) + SIGNAL_HANDLER + update_incapacitated() + +/// Called when [TRAIT_STASIS] is removed from the mob +/mob/living/proc/on_stasis_trait_loss(datum/source) + SIGNAL_HANDLER + update_incapacitated() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Called when traits that alter succumbing are added/removed. diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 6a460afeb37..2f50837fccc 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -69,6 +69,7 @@ if(istype(potential_spine)) damage_softening_multiplier *= potential_spine.athletics_boost_multiplier +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - Landing in liquids if(impacted_turf.liquids && impacted_turf.liquids.liquid_state >= LIQUID_STATE_WAIST) Knockdown(2 SECONDS) @@ -76,6 +77,10 @@ //SKYRAT EDIT ADDITION END // If you are incapped, you probably can't brace yourself var/can_help_themselves = !incapacitated(IGNORE_RESTRAINTS) +======= + // If you are incapped, you probably can't brace yourself + var/can_help_themselves = !INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(levels <= 1 && can_help_themselves) var/obj/item/organ/external/wings/gliders = get_organ_by_type(/obj/item/organ/external/wings) if(HAS_TRAIT(src, TRAIT_FREERUNNING) || gliders?.can_soften_fall()) // the power of parkour or wings allows falling short distances unscathed @@ -101,7 +106,11 @@ if(HAS_TRAIT(src, TRAIT_CATLIKE_GRACE) && (small_surface_area || usable_legs >= 2) && body_position == STANDING_UP && can_help_themselves) . |= ZIMPACT_NO_MESSAGE|ZIMPACT_NO_SPIN skip_knockdown = TRUE +<<<<<<< HEAD if(small_surface_area || (isfelinid(src) || istajaran(src))) // SKYRAT EDIT CHANGE - ORIGINAL: if(small_surface_area) +======= + if(small_surface_area) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message( span_notice("[src] makes a hard landing on [impacted_turf], but lands safely on [p_their()] feet!"), span_notice("You make a hard landing on [impacted_turf], but land safely on your feet!"), @@ -442,6 +451,7 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) +<<<<<<< HEAD //SKYRAT EDIT START - Tail coiling if(ishuman(M)) if(zone_selected == BODY_ZONE_PRECISE_GROIN && M.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) && src.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)) @@ -454,6 +464,14 @@ span_warning("[src] grabs you [grabbed_by_hands ? "by your hands":"passively"]!"), null, null, src) to_chat(src, span_notice("You grab [M] [grabbed_by_hands ? "by their hands":"passively"]!")) // SKYRAT EDIT END +======= + if(ishuman(M)) + var/mob/living/carbon/human/grabbed_human = M + var/grabbed_by_hands = (zone_selected == "l_arm" || zone_selected == "r_arm") && grabbed_human.usable_hands > 0 + M.visible_message(span_warning("[src] grabs [M] [grabbed_by_hands ? "by their hands":"passively"]!"), \ + span_warning("[src] grabs you [grabbed_by_hands ? "by your hands":"passively"]!"), null, null, src) + to_chat(src, span_notice("You grab [M] [grabbed_by_hands ? "by their hands":"passively"]!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else M.visible_message(span_warning("[src] grabs [M] passively!"), \ span_warning("[src] grabs you passively!"), null, null, src) @@ -543,7 +561,7 @@ //same as above /mob/living/pointed(atom/A as mob|obj|turf in view(client.view, src)) - if(incapacitated()) + if(incapacitated) return FALSE return ..() @@ -572,6 +590,7 @@ investigate_log("has succumbed to death.", INVESTIGATE_DEATHS) death() +<<<<<<< HEAD /** * Checks if a mob is incapacitated * @@ -589,6 +608,23 @@ /mob/living/incapacitated(flags) if(HAS_TRAIT(src, TRAIT_INCAPACITATED)) return TRUE +======= +// Remember, anything that influences this needs to call update_incapacitated somehow when it changes +// Most often best done in [code/modules/mob/living/init_signals.dm] +/mob/living/build_incapacitated(flags) + // Holds a set of flags that describe how we are currently incapacitated + var/incap_status = NONE + if(HAS_TRAIT(src, TRAIT_INCAPACITATED)) + incap_status |= TRADITIONAL_INCAPACITATED + if(HAS_TRAIT(src, TRAIT_RESTRAINED)) + incap_status |= INCAPABLE_RESTRAINTS + if(pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE) + incap_status |= INCAPABLE_GRAB + if(HAS_TRAIT(src, TRAIT_STASIS)) + incap_status |= INCAPABLE_STASIS + + return incap_status +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!(flags & IGNORE_RESTRAINTS) && HAS_TRAIT(src, TRAIT_RESTRAINED)) return TRUE @@ -716,8 +752,13 @@ if(!silent) to_chat(src, span_notice("You will now stand up as soon as you are able to.")) else +<<<<<<< HEAD /*if(!silent) SKYRAT EDIT REMOVAL to_chat(src, "You stand up.")*/ +======= + if(!silent) + to_chat(src, span_notice("You stand up.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 get_up(instant) SEND_SIGNAL(src, COMSIG_LIVING_RESTING, new_resting, silent, instant) @@ -727,11 +768,15 @@ /// Proc to append and redefine behavior to the change of the [/mob/living/var/resting] variable. /mob/living/proc/update_resting() update_rest_hud_icon() +<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_LIVING_UPDATED_RESTING, resting) //SKYRAT EDIT ADDITION - GUNPOINT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/proc/get_up(instant = FALSE) set waitfor = FALSE +<<<<<<< HEAD var/get_up_time = 1 SECONDS var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) if(istype(potential_spine)) @@ -762,6 +807,19 @@ if(resting || body_position == STANDING_UP || HAS_TRAIT(src, TRAIT_FLOORED)) return to_chat(src, span_notice("You stand up.")) // SKYRAT EDIT ADDITION +======= + + var/get_up_time = 1 SECONDS + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + get_up_time *= potential_spine.athletics_boost_multiplier + + if(!instant && !do_after(src, 1 SECONDS, src, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM), extra_checks = CALLBACK(src, TYPE_PROC_REF(/mob/living, rest_checks_callback)), interaction_key = DOAFTER_SOURCE_GETTING_UP, hidden = TRUE)) + return + if(resting || body_position == STANDING_UP || HAS_TRAIT(src, TRAIT_FLOORED)) + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_body_position(STANDING_UP) set_lying_angle(0) @@ -923,7 +981,11 @@ if(full_heal_flags) fully_heal(full_heal_flags) +<<<<<<< HEAD if(stat == DEAD && can_be_revived() || (full_heal_flags & HEAL_ADMIN)) //in some cases you can't revive (e.g. no brain) //SKYRAT EDIT ADDITION - DNR TRAIT - Added: " || (full_heal_flags & HEAL_ADMIN)" +======= + if(stat == DEAD && can_be_revived()) //in some cases you can't revive (e.g. no brain) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_suicide(FALSE) set_stat(UNCONSCIOUS) //the mob starts unconscious, updatehealth() //then we check if the mob should wake up. @@ -1171,7 +1233,11 @@ /mob/living/proc/itch(obj/item/bodypart/target_part = null, damage = 0.5, can_scratch = TRUE, silent = FALSE) if ((mob_biotypes & (MOB_ROBOTIC | MOB_SPIRIT))) return FALSE +<<<<<<< HEAD var/will_scratch = can_scratch && !incapacitated() +======= + var/will_scratch = can_scratch && !incapacitated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/applied_damage = 0 if (will_scratch && damage) applied_damage = apply_damage(damage, damagetype = BRUTE, def_zone = target_part) @@ -1258,7 +1324,10 @@ . = TRUE //If we're in an aggressive grab or higher, we're lying down, we're vulnerable to grabs, or we're staggered and we have some amount of stamina loss, we must resist if(pulledby.grab_state || body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered) && (getFireLoss()*0.5 + getBruteLoss()*0.5) >= 40) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/altered_grab_state = pulledby.grab_state if((body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered)) && pulledby.grab_state < GRAB_KILL) //If prone, resisting out of a grab is equivalent to 1 grab state higher. won't make the grab state exceed the normal max, however altered_grab_state++ @@ -1282,6 +1351,7 @@ //SKYRAT EDIT END resist_chance = (resist_chance/altered_grab_state) ///Resist chance divided by the value imparted by your grab state. It isn't until you reach neckgrab that you gain a penalty to escaping a grab. if(prob(resist_chance)) +<<<<<<< HEAD //SKYRAT EDIT ADDITION // Akula break-out flavor if(HAS_TRAIT(src, TRAIT_SLIPPERY)) @@ -1293,6 +1363,8 @@ pulledby.stop_pulling() return FALSE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_danger("[src] breaks free of [pulledby]'s grip!"), \ span_danger("You break free of [pulledby]'s grip!"), null, null, pulledby) to_chat(pulledby, span_warning("[src] breaks free of your grip!")) @@ -1300,10 +1372,17 @@ pulledby.stop_pulling() return FALSE else +<<<<<<< HEAD adjustStaminaLoss(rand(10,15))//failure to escape still imparts a pretty serious penalty //SKYRAT EDIT CHANGE: //adjustStaminaLoss(rand(15,20))//failure to escape still imparts a pretty serious penalty visible_message("[src] struggles as they fail to break free of [pulledby]'s grip!", \ "You struggle as you fail to break free of [pulledby]'s grip!", null, null, pulledby) to_chat(pulledby, "[src] struggles as they fail to break free of your grip!") +======= + adjustStaminaLoss(rand(15,20))//failure to escape still imparts a pretty serious penalty + visible_message(span_danger("[src] struggles as they fail to break free of [pulledby]'s grip!"), \ + span_warning("You struggle as you fail to break free of [pulledby]'s grip!"), null, null, pulledby) + to_chat(pulledby, span_danger("[src] struggles as they fail to break free of your grip!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(moving_resist && client) //we resisted by trying to move client.move_delay = world.time + 4 SECONDS else @@ -1430,11 +1509,19 @@ if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED)) var/ignore_flags = NONE if(interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED) +<<<<<<< HEAD ignore_flags |= IGNORE_RESTRAINTS if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) ignore_flags |= IGNORE_GRAB if(incapacitated(ignore_flags)) +======= + ignore_flags |= INCAPABLE_RESTRAINTS + if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) + ignore_flags |= INCAPABLE_GRAB + + if(INCAPACITATED_IGNORING(src, ignore_flags)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("You are incapacitated at the moment!")) return FALSE @@ -1549,6 +1636,10 @@ if(!dropItemToGround(item)) if(!(item.item_flags & ABSTRACT)) qdel(item) +<<<<<<< HEAD +======= + continue +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_contents += item var/mob/living/new_mob @@ -1944,7 +2035,12 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(isliving(dropping)) var/mob/living/M = dropping if(M.can_be_held && U.pulling == M) +<<<<<<< HEAD return M.mob_try_pickup(U) //SKYRAT EDIT CHANGE //blame kevinz dont open the mobs inventory if you are picking them up +======= + M.mob_try_pickup(U)//blame kevinz + return//dont open the mobs inventory if you are picking them up +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /mob/living/proc/mob_pickup(mob/living/user) @@ -1960,7 +2056,11 @@ GLOBAL_LIST_EMPTY(fire_appearances) /mob/living/proc/mob_try_pickup(mob/living/user, instant=FALSE) if(!ishuman(user)) +<<<<<<< HEAD return FALSE +======= + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.get_empty_held_indexes()) to_chat(user, span_warning("Your hands are full!")) return FALSE @@ -2226,10 +2326,16 @@ GLOBAL_LIST_EMPTY(fire_appearances) /mob/living/proc/can_look_up() if(next_move > world.time) return FALSE +<<<<<<< HEAD if(incapacitated(IGNORE_RESTRAINTS)) return FALSE return TRUE +======= + if(INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)) + return FALSE + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * look_up Changes the perspective of the mob to any openspace turf above the mob * @@ -2363,12 +2469,20 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(. >= UNCONSCIOUS) REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT) remove_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_CRITICAL_CONDITION), STAT_TRAIT) +<<<<<<< HEAD +======= + log_combat(src, src, "regained consciousness") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SOFT_CRIT) if(pulledby) ADD_TRAIT(src, TRAIT_IMMOBILIZED, PULLED_WHILE_SOFTCRIT_TRAIT) //adding trait sources should come before removing to avoid unnecessary updates if(. >= UNCONSCIOUS) REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT) ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) +<<<<<<< HEAD +======= + log_combat(src, src, "entered soft crit") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(UNCONSCIOUS) if(. != HARD_CRIT) become_blind(UNCONSCIOUS_TRAIT) @@ -2376,14 +2490,26 @@ GLOBAL_LIST_EMPTY(fire_appearances) ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) else REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) +<<<<<<< HEAD +======= + log_combat(src, src, "lost consciousness") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HARD_CRIT) if(. != UNCONSCIOUS) become_blind(UNCONSCIOUS_TRAIT) ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) +<<<<<<< HEAD +======= + log_combat(src, src, "entered hard crit") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(DEAD) REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) remove_from_alive_mob_list() add_to_dead_mob_list() +<<<<<<< HEAD +======= + log_combat(src, src, "died") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!can_hear()) stop_sound_channel(CHANNEL_AMBIENCE) refresh_looping_ambience() @@ -2420,6 +2546,10 @@ GLOBAL_LIST_EMPTY(fire_appearances) /mob/living/set_pulledby(new_pulledby) . = ..() +<<<<<<< HEAD +======= + update_incapacitated() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(. == FALSE) //null is a valid value here, we only want to return if FALSE is explicitly passed. return if(pulledby) @@ -2540,10 +2670,13 @@ GLOBAL_LIST_EMPTY(fire_appearances) body_position = new_value SEND_SIGNAL(src, COMSIG_LIVING_SET_BODY_POSITION, new_value, .) if(new_value == LYING_DOWN) // From standing to lying down. +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - SOUNDS if(has_gravity()) playsound(src, "bodyfall", 50, TRUE) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 on_lying_down() else // From lying down to standing up. on_standing_up() @@ -2897,3 +3030,28 @@ GLOBAL_LIST_EMPTY(fire_appearances) return "[span_notice("You'd estimate [p_their()] fitness level at about...")] [span_boldwarning("What?!? [our_fitness_level]???")]" return span_notice("You'd estimate [p_their()] fitness level at about [our_fitness_level]. [comparative_fitness <= 0.33 ? "Pathetic." : ""]") +<<<<<<< HEAD +======= + +///Performs the aftereffects of blocking a projectile. +/mob/living/proc/block_projectile_effects() + var/static/list/icon/blocking_overlay + if(isnull(blocking_overlay)) + blocking_overlay = list( + mutable_appearance('icons/mob/effects/blocking.dmi', "wow"), + mutable_appearance('icons/mob/effects/blocking.dmi', "nice"), + mutable_appearance('icons/mob/effects/blocking.dmi', "good"), + ) + ADD_TRAIT(src, TRAIT_BLOCKING_PROJECTILES, BLOCKING_TRAIT) + var/icon/selected_overlay = pick(blocking_overlay) + add_overlay(selected_overlay) + playsound(src, 'sound/weapons/fwoosh.ogg', 90, FALSE, frequency = 0.7) + update_transform(1.25) + addtimer(CALLBACK(src, PROC_REF(end_block_effects), selected_overlay), 0.6 SECONDS) + +///Remoevs the effects of blocking a projectile and allows the user to block another. +/mob/living/proc/end_block_effects(selected_overlay) + REMOVE_TRAIT(src, TRAIT_BLOCKING_PROJECTILES, BLOCKING_TRAIT) + cut_overlay(selected_overlay) + update_transform(0.8) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 375d82f5b69..6ef04896d36 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -1,9 +1,14 @@ /mob/living/proc/run_armor_check(def_zone = null, attack_flag = MELEE, absorb_text = null, soften_text = null, armour_penetration, penetrated_text, silent=FALSE, weak_against_armour = FALSE) +<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_MOB_RUN_ARMOR) //SKYRAT EDIT ADDITION var/our_armor = getarmor(def_zone, attack_flag) +======= + var/our_armor = getarmor(def_zone, attack_flag) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(our_armor <= 0) return our_armor if(weak_against_armour && our_armor >= 0) @@ -151,6 +156,7 @@ return . = combat_mode combat_mode = new_mode +<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_LIVING_COMBAT_MODE_TOGGLE, new_mode) //SKYRAT EDIT ADDITION if(hud_used?.action_intent) hud_used.action_intent.update_appearance() @@ -163,6 +169,10 @@ face_mouse = (client?.prefs?.read_preference(/datum/preference/toggle/face_cursor_combat_mode) && combat_mode) ? TRUE : FALSE //SKYRAT EDIT ADDITION END +======= + if(hud_used?.action_intent) + hud_used.action_intent.update_appearance() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(silent || !(client?.prefs.read_preference(/datum/preference/toggle/sound_combatmode))) return if(combat_mode) @@ -263,7 +273,11 @@ /** * Called when this mob is grabbed by another mob. */ +<<<<<<< HEAD /mob/living/proc/grabbedby(mob/living/user, supress_message = FALSE, grabbed_part) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/living/proc/grabbedby(mob/living/user, supress_message = FALSE) +======= +/mob/living/proc/grabbedby(mob/living/user, supress_message = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user == src || anchored || !isturf(user.loc)) return FALSE @@ -280,6 +294,7 @@ return FALSE grippedby(user) + update_incapacitated() //proc to upgrade a simple pull into a more aggressive grab. /mob/living/proc/grippedby(mob/living/user, instant = FALSE) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index e5d564c978e..fe697ee2f67 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -1,6 +1,10 @@ /mob/living see_invisible = SEE_INVISIBLE_LIVING +<<<<<<< HEAD hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD, DNR_HUD) // SKYRAT EDIT ADDITION - DNR_HUD +======= + hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pressure_resistance = 10 hud_type = /datum/hud/living interaction_flags_click = ALLOW_RESTING diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 79cb96c90c3..8bff7884b1e 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -90,11 +90,14 @@ if(pulling) if(isliving(pulling)) var/mob/living/L = pulling +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(HAS_TRAIT(L, TRAIT_OVERSIZED) && !HAS_TRAIT(src, TRAIT_OVERSIZED) && !iscyborg(src)) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/bulky_drag, multiplicative_slowdown = PULL_OVERSIZED_SLOWDOWN) return //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!slowed_by_drag || L.body_position == STANDING_UP || L.buckled || grab_state >= GRAB_AGGRESSIVE) remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag) return @@ -129,7 +132,11 @@ return ..() /mob/living/can_z_move(direction, turf/start, turf/destination, z_move_flags = ZMOVE_FLIGHT_FLAGS, mob/living/rider) +<<<<<<< HEAD if(z_move_flags & ZMOVE_INCAPACITATED_CHECKS && incapacitated()) +======= + if(z_move_flags & ZMOVE_INCAPACITATED_CHECKS && incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(z_move_flags & ZMOVE_FEEDBACK) to_chat(rider || src, span_warning("[rider ? src : "You"] can't do that right now!")) return FALSE diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 1a48277242d..4808ea1acb3 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -33,6 +33,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // Misc RADIO_KEY_AI_PRIVATE = RADIO_CHANNEL_AI_PRIVATE, // AI Upload channel +<<<<<<< HEAD +======= + RADIO_KEY_ENTERTAINMENT = RADIO_CHANNEL_ENTERTAINMENT, // Entertainment monitors +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //kinda localization -- rastaf0 @@ -61,7 +65,12 @@ GLOBAL_LIST_INIT(department_radio_keys, list( "в" = MODE_KEY_DEADMIN, // Misc +<<<<<<< HEAD "щ" = RADIO_CHANNEL_AI_PRIVATE +======= + "щ" = RADIO_CHANNEL_AI_PRIVATE, + "з" = RADIO_CHANNEL_ENTERTAINMENT, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /** @@ -233,10 +242,13 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( //Get which verb is prefixed to the message before radio but after most modifications message_mods[SAY_MOD_VERB] = say_mod(message, message_mods) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START: autopunctuation //ensure EOL punctuation exists and that word-bounded 'i' are capitalized before we do anything else message = autopunct_bare(message) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //This is before anything that sends say a radio message, and after all important message type modifications, so you can scumb in alien chat or something if(saymode && !saymode.handle_message(src, message, language)) return diff --git a/code/modules/mob/living/navigation.dm b/code/modules/mob/living/navigation.dm index 3096efb3a7c..7ca8c8bed0f 100644 --- a/code/modules/mob/living/navigation.dm +++ b/code/modules/mob/living/navigation.dm @@ -12,7 +12,11 @@ set name = "Navigate" set category = "IC" +<<<<<<< HEAD if(incapacitated()) +======= + if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(length(client.navigation_images)) addtimer(CALLBACK(src, PROC_REF(cut_navigation)), world.tick_lag) @@ -46,7 +50,11 @@ if(isnull(navigate_target)) return +<<<<<<< HEAD if(incapacitated()) +======= + if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return COOLDOWN_START(src, navigate_cooldown, 15 SECONDS) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index d5d4273f1be..a82cf873a2c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -181,7 +181,11 @@ RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_TRACKING_TARGET, PROC_REF(on_track_target)) RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_GLIDE_CHANGED, PROC_REF(tracked_glidesize_changed)) +<<<<<<< HEAD add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_HANDS_BLOCKED), ROUNDSTART_TRAIT) +======= + add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_AI_ACCESS, TRAIT_HANDS_BLOCKED), INNATE_TRAIT) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER, ALARM_CAMERA, ALARM_BURGLAR, ALARM_MOTION), list(z), camera_view = TRUE) RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered)) @@ -288,7 +292,7 @@ /mob/living/silicon/ai/verb/pick_icon() set category = "AI Commands" set name = "Set AI Core Display" - if(incapacitated()) + if(incapacitated) return icon = initial(icon) icon_state = "ai" @@ -306,7 +310,7 @@ view_core() var/ai_core_icon = show_radial_menu(src, src , iconstates, radius = 42) - if(!ai_core_icon || incapacitated()) + if(!ai_core_icon || incapacitated) return display_icon_override = ai_core_icon @@ -347,7 +351,7 @@ var/reason = tgui_input_text(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") - if(incapacitated()) + if(incapacitated) return if(trim(reason)) @@ -409,7 +413,7 @@ return // stop if(stat == DEAD) return - if(incapacitated()) + if(incapacitated) if(battery < 50) to_chat(src, span_warning("Insufficient backup power!")) return @@ -481,14 +485,22 @@ if(usr != src) return +<<<<<<< HEAD if(href_list["emergencyAPC"]) //This check comes before incapacitated() because the only time it would be useful is when we have no power. +======= + if(href_list["emergencyAPC"]) //This check comes before incapacitated because the only time it would be useful is when we have no power. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!apc_override) to_chat(src, span_notice("APC backdoor is no longer available.")) return apc_override.ui_interact(src) return +<<<<<<< HEAD if(incapacitated()) +======= + if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (href_list["switchcamera"]) @@ -639,7 +651,7 @@ ai_tracking_tool.reset_tracking() var/cameralist[0] - if(incapacitated()) + if(incapacitated) return var/mob/living/silicon/ai/U = usr @@ -681,7 +693,7 @@ set desc = "Change the default hologram available to AI to something else." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return var/input switch(tgui_input_list(usr, "Would you like to select a hologram based on a custom character, an animal, or switch to a unique avatar?", "Customize", list("Custom Character","Unique","Animal"))) @@ -831,7 +843,7 @@ set desc = "Allows you to change settings of your radio." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return to_chat(src, "Accessing Subspace Transceiver control...") @@ -847,7 +859,7 @@ set desc = "Modify the default radio setting for your automatic announcements." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return set_autosay() @@ -1047,7 +1059,7 @@ set category = "AI Commands" set name = "Deploy to Shell" - if(incapacitated()) + if(incapacitated) return if(control_disabled) to_chat(src, span_warning("Wireless networking module is offline.")) diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm index 0c5eb6ec164..f8a65876d6c 100644 --- a/code/modules/mob/living/silicon/ai/ai_defense.dm +++ b/code/modules/mob/living/silicon/ai/ai_defense.dm @@ -63,7 +63,11 @@ . = ..() if(user.combat_mode) return +<<<<<<< HEAD if(stat != DEAD && !incapacitated() && (client || deployed_shell?.client)) +======= + if(stat != DEAD && !incapacitated && (client || deployed_shell?.client)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // alive and well AIs control their floor bolts balloon_alert(user, "the AI's bolt motors resist.") return ITEM_INTERACT_SUCCESS diff --git a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm index 2d099ea8bb0..1822f6d47f2 100644 --- a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm +++ b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm @@ -47,7 +47,11 @@ data["search_mode"] = search_mode == PAINTINGS_FILTER_SEARCH_TITLE ? "Title" : "Author" return data +<<<<<<< HEAD /datum/portrait_picker/ui_act(action, params) +======= +/datum/portrait_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/living/silicon/ai/ai_say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm index 45c3fb26a39..6f29aa85424 100644 --- a/code/modules/mob/living/silicon/ai/ai_say.dm +++ b/code/modules/mob/living/silicon/ai/ai_say.dm @@ -18,7 +18,7 @@ return ..() /mob/living/silicon/ai/radio(message, list/message_mods = list(), list/spans, language) - if(incapacitated()) + if(incapacitated) return FALSE if(!radio_enabled) //AI cannot speak if radio is disabled (via intellicard) or depowered. to_chat(src, span_danger("Your radio transmitter is offline!")) @@ -56,6 +56,10 @@ ai_holo.say(message, sanitize = FALSE, language = language) else to_chat(src, span_alert("No holopad connected.")) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* SKYRAT EDIT REMOVAL - MOVED TO: MODULAR_SKYRAT/MODULES/ALT_VOX/CODE/VOX_PROCS.DM // Make sure that the code compiles with AI_VOX undefined @@ -67,7 +71,7 @@ set desc = "Display a list of vocal words to announce to the crew." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return var/dat = {" @@ -106,7 +110,7 @@ last_announcement = message - if(incapacitated()) + if(incapacitated) return if(control_disabled) diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index e4a98f5f366..cb3fde737e5 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -1,5 +1,9 @@ /mob/living/silicon/ai/examine(mob/user) +<<<<<<< HEAD . = list("This is [icon2html(src, user)] [src]!", EXAMINE_SECTION_BREAK) //SKYRAT EDIT CHANGE +======= + . = list("This is [icon2html(src, user)] [src]!") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(stat == DEAD) . += span_deadsay("It appears to be powered-down.") . += span_notice("Its floor bolts are [is_anchored ? "tightened" : "loose"].") @@ -26,9 +30,12 @@ . += "The wireless networking light is blinking." else if (!shunted && !client) . += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem..." +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION . += get_silicon_flavortext() //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "" . += ..() diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index 98a2e629776..32382b66339 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -235,7 +235,7 @@ set category = "AI Commands" set name = "Toggle Camera Acceleration" - if(incapacitated()) + if(incapacitated) return acceleration = !acceleration to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].") diff --git a/code/modules/mob/living/silicon/ai/robot_control.dm b/code/modules/mob/living/silicon/ai/robot_control.dm index d963fc77be6..a04d1c3af75 100644 --- a/code/modules/mob/living/silicon/ai/robot_control.dm +++ b/code/modules/mob/living/silicon/ai/robot_control.dm @@ -7,7 +7,7 @@ owner = new_owner /datum/robot_control/proc/is_interactable(mob/user) - if(user != owner || owner.incapacitated()) + if(user != owner || owner.incapacitated) return FALSE if(owner.control_disabled) to_chat(user, span_warning("Wireless control is disabled.")) diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm index 229ad70bb84..85e749d2765 100644 --- a/code/modules/mob/living/silicon/death.dm +++ b/code/modules/mob/living/silicon/death.dm @@ -9,3 +9,9 @@ diag_hud_set_health() update_health_hud() return ..() + +/mob/living/silicon/get_visible_suicide_message() + return "[src] is powering down. It looks like [p_theyre()] trying to commit suicide." + +/mob/living/silicon/get_blind_suicide_message() + return "You hear a long, hissing electronic whine." diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 7a6b4c5f207..64fcf1573bb 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -30,6 +30,7 @@ addtimer(CALLBACK(src, PROC_REF(show_laws)), 0) addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0) last_lawchange_announce = world.time +<<<<<<< HEAD // SKYRAT EDIT ADDITION START: AI LAWSYNC if(isAI(src)) var/mob/living/silicon/ai/ai = src @@ -37,6 +38,8 @@ if(cyborg.connected_ai && cyborg.lawupdate) cyborg.lawsync() // SKYRAT EDIT ADDITON END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/silicon/proc/set_zeroth_law(law, law_borg, announce = TRUE) laws_sanity_check() diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 68ee438dc12..fde9128be49 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -46,9 +46,12 @@ . += span_warning("It doesn't seem to be responding.") if(DEAD) . += span_deadsay("It looks like its system is corrupted and requires a reset.") +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION . += get_silicon_flavortext() //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "" . += ..() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index dcfea298f20..1792138eb99 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -11,7 +11,11 @@ post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \ post_untipped_callback = CALLBACK(src, PROC_REF(after_righted)), \ roleplay_friendly = TRUE, \ +<<<<<<< HEAD roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep, /datum/emote/silicon/beep2), /* SKYRAT EDIT CHANGE - ORIGINAL: roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep)*/ \ +======= + roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep), \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 roleplay_callback = CALLBACK(src, PROC_REF(untip_roleplay))) set_wires(new /datum/wires/robot(src)) @@ -158,6 +162,7 @@ if(lockcharge == TRUE) to_chat(src,span_userdanger("ERROR: Lockdown is engaged. Please disengage lockdown to pick module.")) +<<<<<<< HEAD return // SKYRAT EDIT START - Making the cyborg model list static to reduce how many times it's generated. @@ -193,6 +198,35 @@ model.transform_to(GLOB.cyborg_model_list[input_model]) +======= + return + + var/list/model_list = list( + "Engineering" = /obj/item/robot_model/engineering, + "Medical" = /obj/item/robot_model/medical, + "Miner" = /obj/item/robot_model/miner, + "Janitor" = /obj/item/robot_model/janitor, + "Service" = /obj/item/robot_model/service, + ) + if(!CONFIG_GET(flag/disable_peaceborg)) + model_list["Peacekeeper"] = /obj/item/robot_model/peacekeeper + if(!CONFIG_GET(flag/disable_secborg)) + model_list["Security"] = /obj/item/robot_model/security + + // Create radial menu for choosing borg model + var/list/model_icons = list() + for(var/option in model_list) + var/obj/item/robot_model/model = model_list[option] + var/model_icon = initial(model.cyborg_base_icon) + model_icons[option] = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = model_icon) + + var/input_model = show_radial_menu(src, src, model_icons, radius = 42) + if(!input_model || model.type != /obj/item/robot_model) + return + + model.transform_to(model_list[input_model]) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Used to setup the a basic and (somewhat) unique name for the robot. /mob/living/silicon/robot/proc/setup_default_name() @@ -397,7 +431,11 @@ return ..() /mob/living/silicon/robot/execute_mode() +<<<<<<< HEAD if(incapacitated()) +======= + if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/obj/item/W = get_active_held_item() if(W) @@ -505,8 +543,13 @@ lampButton?.update_appearance() update_icons() return +<<<<<<< HEAD set_light_range(lamp_intensity) set_light_color(lamp_doom? COLOR_RED : lamp_color) //Red for doomsday killborgs, borg's choice otherwise +======= + set_light_range(max(MINIMUM_USEFUL_LIGHT_RANGE, lamp_intensity)) + set_light_color(lamp_doom ? COLOR_RED : lamp_color) //Red for doomsday killborgs, borg's choice otherwise +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_light_on(TRUE) lamp_enabled = TRUE lampButton?.update_appearance() @@ -723,6 +766,7 @@ if (hasExpanded) hasExpanded = FALSE +<<<<<<< HEAD //update_transform(0.5) // Original update_transform(0.8) // SKYRAT EDIT CHANGE @@ -732,6 +776,9 @@ update_transform(4/3) //SKYRAT EDIT ADDITION END +======= + update_transform(0.5) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 logevent("Chassis model has been reset.") log_silicon("CYBORG: [key_name(src)] has reset their cyborg model.") model.transform_to(/obj/item/robot_model) @@ -890,7 +937,7 @@ lawupdate = TRUE lawsync() if(radio && AI.radio) //AI keeps all channels, including Syndie if it is a Traitor - if(AI.radio.syndie) + if((AI.radio.special_channels & RADIO_SPECIAL_SYNDIE)) radio.make_syndie() radio.subspace_transmission = TRUE radio.channels = AI.radio.channels @@ -952,7 +999,11 @@ M.visible_message(span_warning("[M] really can't seem to mount [src]...")) return +<<<<<<< HEAD if(stat || incapacitated()) +======= + if(stat || incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(model && !model.allow_riding) M.visible_message(span_boldwarning("Unfortunately, [M] just can't seem to hold onto [src]!")) diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index f41f4bd8ffc..abdaa32bfa8 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -7,7 +7,11 @@ /mob/living/silicon/robot name = "Cyborg" real_name = "Cyborg" +<<<<<<< HEAD icon = 'icons/mob/silicon/robots.dmi' //SKYRAT EDIT - Modified in modular_skyrat\modules\altborgs\code\robot_defines.dm (to allow for custom transformation animations) +======= + icon = 'icons/mob/silicon/robots.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "robot" maxHealth = 100 health = 100 diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index ddf5631c3e0..dff9283c94c 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -173,11 +173,14 @@ if(!gun.chambered) . = TRUE gun.recharge_newshot() //try to reload a new shot. +<<<<<<< HEAD /// SKYRAT EDIT START - Cargo borgs else if(istype(module, /obj/item/hand_labeler/cyborg)) var/obj/item/hand_labeler/cyborg/labeler = module labeler.labels_left = 30 /// SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(cyborg.toner < cyborg.tonermax) . = TRUE @@ -250,11 +253,14 @@ cyborg.diag_hud_set_aishell() log_silicon("CYBORG: [key_name(cyborg)] has transformed into the [new_model] model.") +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - ALTBORGS - Old check for 'dogborg' var no longer necessary, refactored into model_features instead. new_model.update_dogborg() new_model.update_tallborg() //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation)) qdel(src) return new_model @@ -269,26 +275,35 @@ for(var/skin in borg_skins) var/list/details = borg_skins[skin] reskin_icons[skin] = image(icon = details[SKIN_ICON] || 'icons/mob/silicon/robots.dmi', icon_state = details[SKIN_ICON_STATE]) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - ALTBORGS if (!isnull(details[SKIN_FEATURES])) if (TRAIT_R_WIDE in details[SKIN_FEATURES]) var/image/reskin = reskin_icons[skin] reskin.pixel_x -= 16 //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), cyborg, old_model), radius = 38, require_near = TRUE) if(!borg_skin) return FALSE var/list/details = borg_skins[borg_skin] +<<<<<<< HEAD //SKYRAT EDIT START if(cyborg.hasExpanded && (((TRAIT_R_WIDE in details[SKIN_FEATURES]) && (TRAIT_R_WIDE in model_features)) || ((TRAIT_R_TALL in details[SKIN_FEATURES]) && (TRAIT_R_TALL in model_features)))) to_chat(cyborg, span_warning("You can't make yourself into a larger frame when you've already used an expander!")) return FALSE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(details[SKIN_ICON_STATE])) cyborg_base_icon = details[SKIN_ICON_STATE] if(!isnull(details[SKIN_ICON])) cyborg.icon = details[SKIN_ICON] +<<<<<<< HEAD cyborg_icon_override = details[SKIN_ICON] // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(details[SKIN_PIXEL_X])) cyborg.base_pixel_x = details[SKIN_PIXEL_X] if(!isnull(details[SKIN_PIXEL_Y])) @@ -299,12 +314,15 @@ hat_offset = details[SKIN_HAT_OFFSET] if(!isnull(details[SKIN_TRAITS])) model_traits += details[SKIN_TRAITS] +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(!isnull(details[SKIN_FEATURES])) model_features += details[SKIN_FEATURES] if (!isnull(details[SKIN_HAT_REST_OFFSET])) rest_hat_offset = details[SKIN_HAT_REST_OFFSET] //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in old_model.added_modules) added_modules += i old_model.added_modules -= i @@ -355,7 +373,11 @@ /obj/item/robot_model/proc/check_menu(mob/living/silicon/robot/user, obj/item/robot_model/old_model) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(user.model != old_model) return FALSE @@ -408,6 +430,7 @@ /obj/item/pipe_dispenser, /obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg, +<<<<<<< HEAD /obj/item/screwdriver/cyborg/power, // Skyrat ADDITION - Combines Screwdriver and Wrench into one /obj/item/crowbar/cyborg/power, // Skyrat ADDITION - Combines Crowbar and Wirecutters into one /obj/item/multitool/cyborg, //Skyrat ADDITION - Adds multitool for easier access @@ -416,6 +439,12 @@ /obj/item/t_scanner, /obj/item/analyzer, /obj/item/holosign_creator/atmos, // Skyrat Edit - Adds Holofans to engineering borgos +======= + /obj/item/borg/cyborg_omnitool/engineering, + /obj/item/borg/cyborg_omnitool/engineering, + /obj/item/t_scanner, + /obj/item/analyzer, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/assembly/signaler/cyborg, /obj/item/blueprints/cyborg, /obj/item/electroadaptive_pseudocircuit, @@ -423,7 +452,10 @@ /obj/item/stack/sheet/glass, /obj/item/borg/apparatus/sheet_manipulator, /obj/item/stack/rods/cyborg, +<<<<<<< HEAD /obj/item/lightreplacer/cyborg, // Skyrat Edit - Surprised Engie borgs don't get these +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/tile/iron/base/cyborg, /obj/item/stack/cable_coil, ) @@ -744,7 +776,10 @@ /obj/item/storage/bag/ore/cyborg, /obj/item/pickaxe/drill/cyborg, /obj/item/shovel, +<<<<<<< HEAD /obj/item/kinetic_crusher, //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/crowbar/cyborg, /obj/item/weldingtool/mini, /obj/item/extinguisher/mini, @@ -789,8 +824,13 @@ /obj/item/robot_model/peacekeeper/do_transform_animation() ..() +<<<<<<< HEAD to_chat(loc, "Under Safeguard, you are an enforcer of the PEACE and preventer of HARM. \ You are not a security member and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.") // SKYRAT EDIT Changes verbiage off ASIMOV/HUMAN Focus +======= + to_chat(loc, "Under ASIMOV, you are an enforcer of the PEACE and preventer of HUMAN HARM. \ + You are not a security member and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/robot_model/security name = "Security" @@ -832,6 +872,7 @@ name = "Service" basic_modules = list( /obj/item/assembly/flash/cyborg, +<<<<<<< HEAD // SKYRAT EDIT START // /obj/item/reagent_containers/borghypo/borgshaker, /obj/item/reagent_containers/borghypo/borgshaker/specific/alcohol, @@ -871,6 +912,28 @@ /obj/item/reagent_containers/cup/rag, //obj/item/storage/bag/money, //This is never used and there's already too much bloat // SKYRAT EDIT END +======= + /obj/item/reagent_containers/borghypo/borgshaker, + /obj/item/borg/apparatus/beaker/service, + /obj/item/reagent_containers/cup/beaker/large, //I know a shaker is more appropiate but this is for ease of identification + /obj/item/reagent_containers/condiment/enzyme, + /obj/item/reagent_containers/dropper, + /obj/item/rsf, + /obj/item/storage/bag/tray, + /obj/item/pen, + /obj/item/toy/crayon/spraycan/borg, + /obj/item/extinguisher/mini, + /obj/item/hand_labeler/borg, + /obj/item/razor, + /obj/item/instrument/guitar, + /obj/item/instrument/piano_synth, + /obj/item/lighter, + /obj/item/borg/lollipop, + /obj/item/stack/pipe_cleaner_coil/cyborg, + /obj/item/chisel, + /obj/item/reagent_containers/cup/rag, + /obj/item/storage/bag/money, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) radio_channels = list(RADIO_CHANNEL_SERVICE) emag_modules = list( diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 69703a022d0..4373bc5a146 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -1,6 +1,9 @@ /mob/living/silicon gender = NEUTER +<<<<<<< HEAD has_unlimited_silicon_privilege = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 verb_say = "states" verb_ask = "queries" verb_exclaim = "declares" @@ -75,6 +78,12 @@ TRAIT_NOFIRE_SPREAD, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED, TRAIT_FENCE_CLIMBER, +<<<<<<< HEAD +======= + TRAIT_SILICON_ACCESS, + TRAIT_REAGENT_SCANNER, + TRAIT_UNOBSERVANT, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) add_traits(traits_to_apply, ROUNDSTART_TRAIT) @@ -400,7 +409,7 @@ silicon_hud.show_to(src) /mob/living/silicon/proc/toggle_sensors() - if(incapacitated()) + if(incapacitated) return sensors_on = !sensors_on if (!sensors_on) diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index b7e6bd6a8ed..4bab3c64a5a 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -75,11 +75,14 @@ to_chat(user, span_danger("You punch [src], but don't leave a dent!")) return TRUE else +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS)) visible_message(span_warning("[user] tries to pet [src], but it moves out of the way.")) return TRUE // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_notice("[user] pets [src]."), span_notice("[user] pets you."), null, null, user) to_chat(user, span_notice("You pet [src].")) SEND_SIGNAL(user, COMSIG_MOB_PAT_BORG) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index f48d542ba19..b9cc7fcccd5 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -12,7 +12,10 @@ hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_BATT_HUD, DIAG_PATH_HUD = HUD_LIST_LIST) maxbodytemp = INFINITY minbodytemp = 0 +<<<<<<< HEAD has_unlimited_silicon_privilege = TRUE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sentience_type = SENTIENCE_ARTIFICIAL status_flags = NONE //no default canpush pass_flags = PASSFLAPS @@ -163,6 +166,7 @@ /mob/living/simple_animal/bot/Initialize(mapload) . = ..() + add_traits(list(TRAIT_SILICON_ACCESS, TRAIT_REAGENT_SCANNER, TRAIT_UNOBSERVANT), INNATE_TRAIT) GLOB.bots_list += src path_hud = new /datum/atom_hud/data/bot_path/private() @@ -976,6 +980,7 @@ Pass a positive integer as an argument to override a bot's default speed. return data // Actions received from TGUI +<<<<<<< HEAD /mob/living/simple_animal/bot/ui_act(action, params) . = ..() if(.) @@ -983,6 +988,15 @@ Pass a positive integer as an argument to override a bot's default speed. var/mob/user = usr if(!allowed(user)) to_chat(usr, span_warning("Access denied.")) +======= +/mob/living/simple_animal/bot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + var/mob/user = ui.user + if(!allowed(user)) + to_chat(user, span_warning("Access denied.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(action == "lock") @@ -1002,6 +1016,7 @@ Pass a positive integer as an argument to override a bot's default speed. if("airplane") bot_mode_flags ^= BOT_MODE_REMOTE_ENABLED if("hack") +<<<<<<< HEAD if(!HAS_SILICON_ACCESS(usr)) return if(!(bot_cover_flags & BOT_COVER_EMAGGED)) @@ -1009,22 +1024,40 @@ Pass a positive integer as an argument to override a bot's default speed. to_chat(usr, span_warning("You overload [src]'s [hackables].")) message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_VERBOSEJMP(src)]") usr.log_message("disabled safety lock of [src]", LOG_GAME) +======= + if(!HAS_SILICON_ACCESS(user)) + return + if(!(bot_cover_flags & BOT_COVER_EMAGGED)) + bot_cover_flags |= (BOT_COVER_EMAGGED|BOT_COVER_HACKED|BOT_COVER_LOCKED) + to_chat(user, span_warning("You overload [src]'s [hackables].")) + message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]") + user.log_message("disabled safety lock of [src]", LOG_GAME) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_reset() to_chat(src, span_userdanger("(#$*#$^^( OVERRIDE DETECTED")) to_chat(src, span_boldnotice(get_emagged_message())) return if(!(bot_cover_flags & BOT_COVER_HACKED)) +<<<<<<< HEAD to_chat(usr, span_boldannounce("You fail to repair [src]'s [hackables].")) return bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED) to_chat(usr, span_notice("You reset the [src]'s [hackables].")) usr.log_message("re-enabled safety lock of [src]", LOG_GAME) +======= + to_chat(user, span_boldannounce("You fail to repair [src]'s [hackables].")) + return + bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED) + to_chat(user, span_notice("You reset the [src]'s [hackables].")) + user.log_message("re-enabled safety lock of [src]", LOG_GAME) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_reset() to_chat(src, span_userdanger("Software restored to standard.")) to_chat(src, span_boldnotice(possessed_message)) if("eject_pai") if(!paicard) return +<<<<<<< HEAD to_chat(usr, span_notice("You eject [paicard] from [initial(src.name)].")) ejectpai(usr) if("toggle_personality") @@ -1034,6 +1067,17 @@ Pass a positive integer as an argument to override a bot's default speed. enable_possession(usr) if("rename") rename(usr) +======= + to_chat(user, span_notice("You eject [paicard] from [initial(src.name)].")) + ejectpai(user) + if("toggle_personality") + if (can_be_possessed) + disable_possession(user) + else + enable_possession(user) + if("rename") + rename(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/simple_animal/bot/update_icon_state() icon_state = "[isnull(base_icon_state) ? initial(icon_state) : base_icon_state][get_bot_flag(bot_mode_flags, BOT_MODE_ON)]" diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 6c0cd6d16ab..8a22d6680b2 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -42,7 +42,11 @@ var/list/targets = list() for(var/mob/living/carbon/nearby_carbon in view(7, src)) //Let's find us a target var/threatlevel = 0 +<<<<<<< HEAD if(nearby_carbon.incapacitated()) +======= + if(nearby_carbon.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue threatlevel = nearby_carbon.assess_threat(judgement_criteria) if(threatlevel < THREAT_ASSESS_DANGEROUS) diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 4bedf0d3d62..e4f706ede12 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -142,7 +142,12 @@ // Actions received from TGUI /mob/living/simple_animal/bot/floorbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() +<<<<<<< HEAD if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) +======= + var/mob/user = ui.user + if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) @@ -160,7 +165,11 @@ if(tilestack) tilestack.forceMove(drop_location()) if("line_mode") +<<<<<<< HEAD var/setdir = tgui_input_list(usr, "Select construction direction", "Direction", list("north", "east", "south", "west", "disable")) +======= + var/setdir = tgui_input_list(user, "Select construction direction", "Direction", list("north", "east", "south", "west", "disable")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(setdir) || QDELETED(ui) || ui.status != UI_INTERACTIVE) return switch(setdir) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index f3194e88b18..03287785b11 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -286,20 +286,32 @@ data["paiInserted"] = !!paicard return data +<<<<<<< HEAD /mob/living/simple_animal/bot/mulebot/ui_act(action, params) . = ..() if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) +======= +/mob/living/simple_animal/bot/mulebot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + var/mob/user = ui.user + if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) if("lock") +<<<<<<< HEAD if(HAS_SILICON_ACCESS(usr)) +======= + if(HAS_SILICON_ACCESS(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_cover_flags ^= BOT_COVER_LOCKED return TRUE if("on") if(bot_mode_flags & BOT_MODE_ON) turn_off() else if(bot_cover_flags & BOT_COVER_MAINTS_OPEN) +<<<<<<< HEAD to_chat(usr, span_warning("[name]'s maintenance panel is open!")) return else if(cell) @@ -309,6 +321,17 @@ return TRUE else bot_control(action, usr, params) // Kill this later. // Kill PDAs in general please +======= + to_chat(user, span_warning("[name]'s maintenance panel is open!")) + return + else if(cell) + if(!turn_on()) + to_chat(user, span_warning("You can't switch on [src]!")) + return + return TRUE + else + bot_control(action, user, params) // Kill this later. // Kill PDAs in general please +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /mob/living/simple_animal/bot/mulebot/bot_control(command, mob/user, list/params = list(), pda = FALSE) @@ -711,7 +734,11 @@ // player on mulebot attempted to move /mob/living/simple_animal/bot/mulebot/relaymove(mob/living/user, direction) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(load == user) unload(0) @@ -805,7 +832,11 @@ /mob/living/simple_animal/bot/mulebot/paranormal/mouse_drop_receive(atom/movable/AM, mob/user, params) var/mob/living/L = user +<<<<<<< HEAD if(user.incapacitated() || (istype(L) && L.body_position == LYING_DOWN)) +======= + if(user.incapacitated || (istype(L) && L.body_position == LYING_DOWN)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!istype(AM) || iscameramob(AM) || istype(AM, /obj/effect/dummy/phased_mob)) //allows ghosts! diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index ea808833912..302a2138d1f 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -202,9 +202,16 @@ return data // Actions received from TGUI +<<<<<<< HEAD /mob/living/simple_animal/bot/secbot/ui_act(action, params) . = ..() if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) +======= +/mob/living/simple_animal/bot/secbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + var/mob/user = ui.user + if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) @@ -363,11 +370,19 @@ weapon.attack(current_target, src) if(ishuman(current_target)) current_target.set_stutter(10 SECONDS) +<<<<<<< HEAD current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) var/mob/living/carbon/human/human_target = current_target threat = human_target.assess_threat(judgement_criteria) else current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) +======= + current_target.Paralyze(100) + var/mob/living/carbon/human/human_target = current_target + threat = human_target.assess_threat(judgement_criteria) + else + current_target.Paralyze(100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_target.set_stutter(10 SECONDS) threat = current_target.assess_threat(judgement_criteria) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 4bba53270e5..574d4d7085c 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -320,7 +320,11 @@ /mob/living/simple_animal/hostile/proc/CheckAndAttack() var/atom/target_from = GET_TARGETS_FROM(src) +<<<<<<< HEAD if(target && isturf(target_from.loc) && target.Adjacent(target_from) && !incapacitated()) +======= + if(target && isturf(target_from.loc) && target.Adjacent(target_from) && !incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AttackingTarget(target) /mob/living/simple_animal/hostile/proc/MoveToTarget(list/possible_targets)//Step 5, handle movement between us and our target diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index 1d993b18c30..e0b90009e5a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -86,11 +86,14 @@ crusher_kill = TRUE if(crusher_loot) // spawn crusher loot, if any spawn_crusher_loot() +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - ASHWALKER TROPHIES var/datum/status_effect/ashwalker_damage/ashie_damage = has_status_effect(/datum/status_effect/ashwalker_damage) if(!crusher_kill && ashie_damage && crusher_loot && ashie_damage.total_damage >= maxHealth * 0.6) spawn_crusher_loot() // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(true_spawn && !(flags_1 & ADMIN_SPAWNED_1)) var/tab = "megafauna_kills" if(crusher_kill) @@ -215,6 +218,7 @@ L.add_mob_memory(/datum/memory/megafauna_slayer, antagonist = src) L.client.give_award(/datum/award/achievement/boss/boss_killer, L) L.client.give_award(achievement_type, L) +<<<<<<< HEAD //SKYRAT EDIT START /* if(crusher_kill && istype(L.get_active_held_item(), /obj/item/kinetic_crusher)) @@ -222,6 +226,9 @@ var/obj/item/held_item = L.get_active_held_item() if(crusher_kill && (istype(held_item, /obj/item/kinetic_gauntlet) || held_item.GetComponent(/datum/component/kinetic_crusher))) //trust me, i hate this just as much as you //SKYRAT EDIT END +======= + if(crusher_kill && istype(L.get_active_held_item(), /obj/item/kinetic_crusher)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 L.client.give_award(crusher_achievement_type, L) L.client.give_award(/datum/award/score/boss_score, L) //Score progression for bosses killed in general L.client.give_award(score_achievement_type, L) //Score progression for specific boss killed diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index f892c7d05e9..2a13f225ba1 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -250,8 +250,11 @@ Difficulty: Hard /obj/item/crusher_trophy/wendigo_horn/effect_desc() return "melee hits inflict twice as much damage" +<<<<<<< HEAD //SKYRAT EDIT START - MOVED TO MODULAR /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/crusher_trophy/wendigo_horn/add_to(obj/item/kinetic_crusher/crusher, mob/living/user) . = ..() if(.) @@ -261,8 +264,11 @@ Difficulty: Hard . = ..() if(.) crusher.AddComponent(/datum/component/two_handed, force_wielded=20) +<<<<<<< HEAD */ //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/wendigo_skull name = "wendigo skull" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index ba2752dd0e4..dd4b08d2459 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -81,9 +81,12 @@ var/obj/item/I = user.get_active_held_item() if(!I) return +<<<<<<< HEAD //SKYRAT EDIT START if(istype(I, /obj/item/kinetic_gauntlet)) var/obj/item/kinetic_gauntlet/gauntlet = I gauntlet.next_attack = 0 //i hate this but i also don't know how else to implement this //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 I.melee_attack_chain(user, target, null) diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index f25fd4dc0fe..ca615d073a3 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -287,7 +287,10 @@ obj_damage = 15 death_message = "deflates and spills its vital juices!" edible_food_types = MEAT | VEGETABLES +<<<<<<< HEAD ghost_controllable = TRUE //SKYRAT EDIT ADDITION - These guys can be helpful... maybe players will be helpful. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/simple_animal/hostile/ooze/grapes/get_innate_actions() var/static/list/innate_actions = list( diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 25d0e566b15..6b3c51b338d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -495,7 +495,11 @@ //ANIMAL RIDING /mob/living/simple_animal/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return for(var/atom/movable/A in get_turf(src)) if(A != src && A != M && A.density) @@ -521,7 +525,11 @@ return /mob/living/simple_animal/relaymove(mob/living/user, direction) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return return relaydrive(user, direction) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index b7b5fedfab4..c72c32b5614 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -83,6 +83,7 @@ add_to_dead_mob_list() else add_to_alive_mob_list() + update_incapacitated() set_focus(src) prepare_huds() for(var/datum/atom_hud/alternate_appearance/alt_hud as anything in GLOB.active_alternate_appearances) @@ -177,7 +178,11 @@ hud_list[hud] = list() else +<<<<<<< HEAD var/image/I = image('modular_skyrat/master_files/icons/mob/huds/hud.dmi', src, "") //SKYRAT EDIT: original filepath 'icons/mob/huds/hud.dmi' +======= + var/image/I = image('icons/mob/huds/hud.dmi', src, "") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 I.appearance_flags = RESET_COLOR|RESET_TRANSFORM hud_list[hud] = I set_hud_image_active(hud, update_huds = FALSE) //by default everything is active. but dont add it to huds to keep control. @@ -265,7 +270,11 @@ * * ignored_mobs (optional) doesn't show any message to any mob in this list. * * visible_message_flags (optional) is the type of message being sent. */ +<<<<<<< HEAD /atom/proc/visible_message(message, self_message, blind_message, vision_distance = DEFAULT_MESSAGE_RANGE, list/ignored_mobs, visible_message_flags = NONE, separation = " ", pref_to_check) // SKYRAT EDIT ADDITION - separation, pref checks +======= +/atom/proc/visible_message(message, self_message, blind_message, vision_distance = DEFAULT_MESSAGE_RANGE, list/ignored_mobs, visible_message_flags = NONE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/turf/T = get_turf(src) if(!T) return @@ -291,7 +300,11 @@ var/raw_msg = message if(visible_message_flags & EMOTE_MESSAGE) +<<<<<<< HEAD message = "[src][separation][message]" // SKYRAT EDIT - Better emotes +======= + message = "[src] [message]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/M in hearers) if(!M.client) @@ -356,7 +369,11 @@ * * self_message (optional) is what the src mob hears. * * audible_message_flags (optional) is the type of message being sent. */ +<<<<<<< HEAD /atom/proc/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE, separation = " ", pref_to_check) // SKYRAT EDIT ADDITION - Better emotes, pref checks +======= +/atom/proc/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/hearers = get_hearers_in_view(hearing_distance, src) //SKYRAT EDIT ADDITION BEGIN - AI QoL @@ -374,12 +391,17 @@ hearers -= src var/raw_msg = message if(audible_message_flags & EMOTE_MESSAGE) +<<<<<<< HEAD message = "[src][separation][message]" //SKYRAT EDIT CHANGE for(var/mob/M in hearers) // SKYRAT EDIT ADDITION - Emote pref checks if(pref_to_check && !M.client?.prefs.read_preference(pref_to_check)) continue // SKYRAT EDIT END +======= + message = "[src] [message]" + for(var/mob/M in hearers) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(audible_message_flags & EMOTE_MESSAGE && runechat_prefs_check(M, audible_message_flags) && M.can_hear()) M.create_chat_message(src, raw_message = raw_msg, runechat_flags = audible_message_flags) M.show_message(message, MSG_AUDIBLE, deaf_message, MSG_VISUAL) @@ -395,7 +417,11 @@ * * deaf_message (optional) is what deaf people will see. * * hearing_distance (optional) is the range, how many tiles away the message can be heard. */ +<<<<<<< HEAD /mob/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE, separation = " ", pref_to_check) // SKYRAT EDIT ADDITION - Better emotes, pref checks +======= +/mob/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!self_message) return @@ -440,12 +466,33 @@ /mob/proc/get_slot_by_item(obj/item/looking_for) if(looking_for in held_items) return ITEM_SLOT_HANDS +<<<<<<< HEAD return null ///Is the mob incapacitated /mob/proc/incapacitated(flags) return +======= + + return null + +/// Called whenever anything that modifes incapacitated is ran, updates it and sends a signal if it changes +/// Returns TRUE if anything changed, FALSE otherwise +/mob/proc/update_incapacitated() + SIGNAL_HANDLER + var/old_incap = incapacitated + incapacitated = build_incapacitated() + if(old_incap == incapacitated) + return FALSE + + SEND_SIGNAL(src, COMSIG_MOB_INCAPACITATE_CHANGED, old_incap, incapacitated) + return TRUE + +/// Returns an updated incapacitated bitflag. If a flag is set it means we're incapacitated in that case +/mob/proc/build_incapacitated() + return NONE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * This proc is called whenever someone clicks an inventory ui slot. @@ -559,6 +606,7 @@ else result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist? +<<<<<<< HEAD //SKYRAT EDIT CHANGE if(result.len) for(var/i = 1; i <= length(result); i++) @@ -570,6 +618,11 @@ result.Cut(i, i + 1) i-- //SKYRAT EDIT END +======= + if(result.len) + for(var/i in 1 to (length(result) - 1)) + result[i] += "\n" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, examine_block("[result.Join()]")) SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, examinify) @@ -580,7 +633,11 @@ /mob/living/blind_examine_check(atom/examined_thing) //need to be next to something and awake +<<<<<<< HEAD if(!Adjacent(examined_thing) || incapacitated()) +======= + if(!Adjacent(examined_thing) || incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("Something is there, but you can't see it!")) return FALSE @@ -739,7 +796,7 @@ if(ismecha(loc)) return - if(incapacitated()) + if(incapacitated) return var/obj/item/I = get_active_held_item() @@ -783,6 +840,7 @@ if(!check_respawn_delay()) return +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(ckey) if(is_banned_from(ckey, BAN_RESPAWN)) @@ -790,6 +848,8 @@ return //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 usr.log_message("used the respawn button.", LOG_GAME) to_chat(usr, span_boldnotice("Please roleplay correctly!")) @@ -1199,11 +1259,15 @@ // Only update if this player is a target if(obj.target && obj.target.current && obj.target.current.real_name == name) obj.update_explanation_text() +<<<<<<< HEAD if(client) // NOVA EDIT ADDITION - Update the mob chat color list, removing the old name GLOB.chat_colors_by_mob_name -= oldname // NOVA EDIT ADDITION if(client) // NOVA EDIT ADDITION - Update the mob chat color list, adding the new name GLOB.chat_colors_by_mob_name[name] = list(chat_color, chat_color_darkened) // NOVA EDIT ADDITION +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_mob_tag("TAG: [tag] RENAMED: [key_name(src)]") return TRUE @@ -1385,7 +1449,10 @@ VV_DROPDOWN_OPTION(VV_HK_GIVE_DIRECT_CONTROL, "Give Direct Control") VV_DROPDOWN_OPTION(VV_HK_OFFER_GHOSTS, "Offer Control to Ghosts") VV_DROPDOWN_OPTION(VV_HK_VIEW_PLANES, "View/Edit Planes") +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/vv_do_topic(list/href_list) . = ..() @@ -1447,7 +1514,10 @@ if(!check_rights(R_DEBUG)) return usr.client.edit_plane_masters(src) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * extra var handling for the logging var */ diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 2206efd0e13..7ca5b15a6aa 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -66,6 +66,20 @@ /// Whether a mob is alive or dead. TODO: Move this to living - Nodrak (2019, still here) var/stat = CONSCIOUS + /** + * Whether and how a mob is incapacitated + * + * Normally being restrained, agressively grabbed, or in stasis counts as incapacitated + * unless there is a flag being used to check if it's ignored + * + * * bitflags: (see code/__DEFINES/status_effects.dm) + * * INCAPABLE_RESTRAINTS - if our mob is in a restraint (handcuffs) + * * INCAPABLE_STASIS - if our mob is in stasis (stasis bed, etc.) + * * INCAPABLE_GRAB - if our mob is being agressively grabbed + * + **/ + VAR_FINAL/incapacitated = NONE + /* A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob. A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such. The current method unnecessarily clusters up the variable list, especially for humans (although rearranging won't really clean it up a lot but the difference will be noticable for other mobs). @@ -137,9 +151,12 @@ /// bitflags defining which status effects can be inflicted (replaces canknockdown, canstun, etc) var/status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH +<<<<<<< HEAD /// Can they interact with station electronics var/has_unlimited_silicon_privilege = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Calls relay_move() to whatever this is set to when the mob tries to move var/atom/movable/remote_control diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index a6a1c58c7ed..0fc8c166024 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -345,12 +345,18 @@ return return TRUE +<<<<<<< HEAD ///Is the passed in mob an admin ghost WITH AI INTERACT enabled +======= +///Returns TRUE/FALSE on whether the mob is an Admin Ghost AI. +///This requires this snowflake check because AI interact gives the access to the mob's client, rather +///than the mob like everyone else, and we keep it that way so they can't accidentally give someone Admin AI access. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/isAdminGhostAI(mob/user) if(!isAdminObserver(user)) - return - if(!user.client.AI_Interact) // Do they have it enabled? - return + return FALSE + if(!HAS_TRAIT_FROM(user.client, TRAIT_AI_ACCESS, ADMIN_TRAIT)) // Do they have it enabled? + return FALSE return TRUE /** @@ -428,7 +434,11 @@ ///Can the mob see reagents inside of containers? /mob/proc/can_see_reagents() +<<<<<<< HEAD return stat == DEAD || has_unlimited_silicon_privilege || HAS_TRAIT(src, TRAIT_REAGENT_SCANNER) //Dead guys and silicons can always see reagents +======= + return stat == DEAD || HAS_TRAIT(src, TRAIT_REAGENT_SCANNER) //Dead guys and silicons can always see reagents +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Can this mob hold items /mob/proc/can_hold_items(obj/item/I) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 2e2f5c85b53..6bc86e8377e 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -504,11 +504,14 @@ if(move_intent == MOVE_INTENT_RUN) move_intent = MOVE_INTENT_WALK else +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - GUNPOINT if (HAS_TRAIT(src,TRAIT_NORUNNING)) to_chat(src, "You find yourself unable to run.") return FALSE //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 move_intent = MOVE_INTENT_RUN if(hud_used?.static_inventory) for(var/atom/movable/screen/mov_intent/selector in hud_used.static_inventory) diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index aa2e41eb1d2..e05a3b26c32 100644 --- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -14,8 +14,11 @@ the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \ the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you got here... " spawner_job_path = /datum/job/hermit +<<<<<<< HEAD quirks_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts random_appearance = FALSE // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/hermit/Initialize(mapload) . = ..() @@ -81,8 +84,11 @@ flavour_text = "Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?" spawner_job_path = /datum/job/beach_bum outfit = /datum/outfit/beachbum +<<<<<<< HEAD quirks_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts random_appearance = FALSE // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/beach/lifeguard you_are_text = "You're a spunky lifeguard!" @@ -123,7 +129,10 @@ flavour_text = "Time to mix drinks and change lives. Smoking space drugs makes it easier to understand your patrons' odd dialect." spawner_job_path = /datum/job/space_bartender outfit = /datum/outfit/spacebartender +<<<<<<< HEAD random_appearance = FALSE // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/spacebartender name = "Space Bartender" @@ -159,8 +168,11 @@ and eventually bring life to this desolate planet while waiting for contact from your creators. \ Estimated time of last contact: Deployment, 5000 millennia ago." spawner_job_path = /datum/job/lifebringer +<<<<<<< HEAD restricted_species = list(/datum/species/pod) //SKYRAT EDIT ADDITION random_appearance = FALSE // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/seed_vault/Initialize(mapload) . = ..() @@ -228,8 +240,11 @@ spawner_job_path = /datum/job/ash_walker var/datum/team/ashwalkers/team var/obj/structure/ash_walker_eggshell/eggshell +<<<<<<< HEAD restricted_species = list(/datum/species/lizard/ashwalker) //SKYRAT EDIT ADDITION random_appearance = FALSE // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/ash_walker/Destroy() eggshell = null @@ -243,10 +258,13 @@ return FALSE /obj/effect/mob_spawn/ghost_role/human/ash_walker/special(mob/living/carbon/human/spawned_human) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE)) // SKYRAT EDIT MOVE - Moving before parent call prevents char name randomization quirks_enabled = TRUE // ghost role quirks // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE)) to_chat(spawned_human, "Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Invade the strange structure of the outsiders if you must. Do not cause unnecessary destruction, as littering the wastes with ugly wreckage is certain to not gain you favor. Glory to the Necropolis!") @@ -296,14 +314,21 @@ important_text = "The base is rigged with explosives, DO NOT abandon it or let it fall into enemy hands!" outfit = /datum/outfit/lavaland_syndicate spawner_job_path = /datum/job/lavaland_syndicate +<<<<<<< HEAD loadout_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts quirks_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts random_appearance = FALSE // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 deletes_on_zero_uses_left = FALSE /obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/special(mob/living/new_spawn) . = ..() +<<<<<<< HEAD new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_SPAWNER) // SKYRAT EDIT CHANGE - ORIGINAL: new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) +======= + new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms name = "Syndicate Comms Agent" @@ -324,6 +349,7 @@ ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/combat r_pocket = /obj/item/gun/ballistic/automatic/pistol +<<<<<<< HEAD r_hand = /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano/evil // SKYRAT EDIT - Original: /obj/item/gun/ballistic/rifle/sniper_rifle implants = list(/obj/item/implant/weapons_auth) @@ -335,6 +361,14 @@ syndicate.faction |= ROLE_SYNDICATE */ // SKYRAT EDIT REMOVAL END +======= + r_hand = /obj/item/gun/ballistic/rifle/sniper_rifle + + implants = list(/obj/item/implant/weapons_auth) + +/datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/syndicate, visualsOnly = FALSE) + syndicate.faction |= ROLE_SYNDICATE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/lavaland_syndicate/comms name = "Lavaland Syndicate Comms Agent" diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm index 79d028bdbcb..6eb8fc1e6a2 100644 --- a/code/modules/mob_spawn/ghost_roles/space_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm @@ -160,6 +160,11 @@ l_pocket = /obj/item/uplink/nuclear r_pocket = /obj/item/modular_computer/pda/nukeops +<<<<<<< HEAD +======= + skillchips = list(/obj/item/skillchip/disk_verifier) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/captain name = "Syndicate Battlecruiser Captain" you_are_text = "You are the captain aboard the syndicate flagship: the SBC Starfury." diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm index 102501f9b39..1f0fcf843f3 100644 --- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm @@ -272,7 +272,11 @@ /obj/effect/mob_spawn/ghost_role/human/syndicatespace/special(mob/living/new_spawn) . = ..() +<<<<<<< HEAD new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_SPAWNER) // SKYRAT EDIT CHANGE - ORIGINAL: new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) +======= + new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/job/spawn_job = SSjob.GetJobType(spawner_job_path) var/policy = get_policy(spawn_job.policy_index) if(policy) diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm index 32836bf7c5e..b555caefc3d 100644 --- a/code/modules/mob_spawn/mob_spawn.dm +++ b/code/modules/mob_spawn/mob_spawn.dm @@ -38,6 +38,15 @@ if(faction) faction = string_list(faction) +<<<<<<< HEAD +======= +/obj/effect/mob_spawn/Destroy() + spawned_mob_ref = null + if(istype(outfit)) + QDEL_NULL(outfit) + return ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Creates whatever mob the spawner makes. Return FALSE if we want to exit from here without doing that, returning NULL will be logged to admins. /obj/effect/mob_spawn/proc/create(mob/mob_possessor, newname) var/mob/living/spawned_mob = new mob_type(get_turf(src)) //living mobs only @@ -59,7 +68,10 @@ spawned_human.underwear = "Nude" spawned_human.undershirt = "Nude" spawned_human.socks = "Nude" +<<<<<<< HEAD spawned_human.bra = "Nude" //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomize_human_normie(spawned_human) if(hairstyle) spawned_human.set_hairstyle(hairstyle, update = FALSE) @@ -132,12 +144,20 @@ /// Whether this offers a temporary body or not. Essentially, you'll be able to reenter your body after using this spawner. var/temp_body = FALSE +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/Initialize(mapload) . = ..() SSpoints_of_interest.make_point_of_interest(src) LAZYADD(GLOB.mob_spawners[name], src) +<<<<<<< HEAD /obj/effect/mob_spawn/Destroy() +======= +/obj/effect/mob_spawn/ghost_role/Destroy() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/spawners = GLOB.mob_spawners[name] LAZYREMOVE(spawners, src) if(!LAZYLEN(spawners)) @@ -156,6 +176,7 @@ var/user_ckey = user.ckey // Just in case shenanigans happen, we always want to remove it from the list. LAZYADD(ckeys_trying_to_spawn, user_ckey) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(restricted_species && !(user.client?.prefs?.read_preference(/datum/preference/choiced/species) in restricted_species)) var/incorrect_species = tgui_alert(user, "Current species preference incompatible, proceed with random appearance?", "Incompatible Species", list("Yes", "No")) @@ -164,6 +185,8 @@ return // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prompt_ghost) var/prompt = "Become [prompt_name]?" if(!temp_body && user.can_reenter_corpse && user.mind) @@ -186,12 +209,15 @@ to_chat(user, span_warning("You are banned from this role!")) LAZYREMOVE(ckeys_trying_to_spawn, user_ckey) return +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(is_banned_from(user.ckey, BAN_GHOST_ROLE_SPAWNER)) // Ghost role bans to_chat(user, span_warning("Error, you are banned from playing ghost roles!")) LAZYREMOVE(ckeys_trying_to_spawn, user_ckey) return // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!allow_spawn(user, silent = FALSE)) LAZYREMOVE(ckeys_trying_to_spawn, user_ckey) return @@ -275,6 +301,10 @@ ///these mob spawn subtypes trigger immediately (New or Initialize) and are not player controlled... since they're dead, you know? /obj/effect/mob_spawn/corpse +<<<<<<< HEAD +======= + density = FALSE //these are pretty much abstract objects that leave a corpse in their place. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///when this mob spawn should auto trigger. var/spawn_when = CORPSE_INSTANT diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index 3b0795be789..f29b1af46c9 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -17,10 +17,17 @@ if(!pick) return var/part_reference = display_names[pick] +<<<<<<< HEAD var/obj/item/part = locate(part_reference) in parts if(!istype(part) || user.incapacitated()) return if(activating) // SKYRAT EDIT - RETRACTABLE EVERYTHING +======= + var/obj/item/part = locate(part_reference) in mod_parts + if(!istype(part) || user.incapacitated) + return + if(active || activating) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "deactivate the suit first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return @@ -44,7 +51,11 @@ /// Quickly deploys all parts (or retracts if all are on the wearer) /obj/item/mod/control/proc/quick_deploy(mob/user) +<<<<<<< HEAD if(activating) // SKYRAT EDIT - RETRACTABLE EVERYTHING +======= + if(active || activating) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "deactivate the suit first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return FALSE @@ -119,11 +130,14 @@ if(!QDELING(wearer) && !wearer.equip_to_slot_if_possible(overslot, overslot.slot_flags, qdel_on_fail = FALSE, disable_warning = TRUE)) wearer.dropItemToGround(overslot, force = TRUE, silent = TRUE) part_datum.overslotting = null +<<<<<<< HEAD // SKYRAT EDIT START - Avoiding exploits with the modules staying active when any of the parts are retracted. for(var/obj/item/mod/module/module as anything in modules) if(module.active) module.deactivate(display_message = !!user) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_MOD_PART_RETRACTED, user, part) if(!user) return diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index a78c7be77b6..2a269c6d417 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -2,10 +2,13 @@ . = ..() if(!.) return +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - No AIs in MODsuits if(!allow_ai) return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!open) //mod must be open balloon_alert(user, "suit must be open to transfer!") return @@ -92,10 +95,13 @@ pai_assistant.can_holo = FALSE if (pai_assistant.holoform) pai_assistant.fold_in() +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - pAIs in MODsuits if(can_pai_move_suit) pai_assistant.remote_control = src // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SStgui.close_uis(card) on_gained_assistant(card.pai) return TRUE @@ -144,10 +150,13 @@ /obj/item/mod/control/relaymove(mob/user, direction) if((!active && wearer) || get_charge() < CHARGE_PER_STEP || user != ai_assistant || !COOLDOWN_FINISHED(src, cooldown_mod_move) || (wearer?.pulledby?.grab_state > GRAB_PASSIVE)) return FALSE +<<<<<<< HEAD // SKYRAT EDIT START - pAIs in MODsuits with a bit more functionalities if(active && !can_pai_move_suit && ispAI(ai_assistant)) return FALSE // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/timemodifier = MOVE_DELAY * (ISDIAGONALDIR(direction) ? sqrt(2) : 1) * (wearer ? WEARER_DELAY : LONE_DELAY) if(wearer && !wearer.Process_Spacemove(direction)) return FALSE @@ -221,4 +230,9 @@ ai.notify_revival("You have been recovered from the wreckage!", source = card) balloon_alert(user, "ai transferred to card") stored_ai = null +<<<<<<< HEAD #undef AI_FALL_TIME +======= + +#undef AI_FALL_TIME +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 96efa91f1b4..9e1ac621309 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -19,7 +19,10 @@ actions_types = list( /datum/action/item_action/mod/deploy, /datum/action/item_action/mod/activate, +<<<<<<< HEAD /datum/action/item_action/mod/sprite_accessories, // SKYRAT EDIT - Hide mutant parts action +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/item_action/mod/panel, /datum/action/item_action/mod/module, /datum/action/item_action/mod/deploy/ai, @@ -159,7 +162,11 @@ else . += span_notice("You could use a MOD core on it to install one.") if(isnull(ai_assistant)) +<<<<<<< HEAD . += span_notice("You could install a pAI with a pAI card.") // SKYRAT EDIT CHANGE - ORIGINAL: . += span_notice("You could install an AI or pAI using their storage card.") +======= + . += span_notice("You could install an AI or pAI using their storage card.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(isAI(ai_assistant)) . += span_notice("You could remove [ai_assistant] with an intellicard.") . += span_notice("You could copy/set link frequency with a multitool.") @@ -234,6 +241,7 @@ balloon_alert(wearer, "retract parts first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) return +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Can't remove your MODsuit from your back when it's still active (as it can cause runtimes and even the MODsuit control unit to delete itself) if(active) @@ -245,6 +253,9 @@ // SKYRAT EDIT ADDITION END if(!wearer.incapacitated()) +======= + if(!wearer.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/screen/inventory/hand/ui_hand = over_object if(wearer.putItemFromInventoryInHandIfPossible(src, ui_hand.held_index)) add_fingerprint(user) @@ -674,6 +685,10 @@ part.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) part.add_atom_colour(new_color, FIXED_COLOUR_PRIORITY) wearer?.regenerate_icons() +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/mod/control/proc/on_exit(datum/source, atom/movable/part, direction) SIGNAL_HANDLER diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm index e5c7195bd8c..667509c087e 100644 --- a/code/modules/mod/mod_link.dm +++ b/code/modules/mod/mod_link.dm @@ -174,10 +174,13 @@ /obj/item/clothing/neck/link_scryer/examine(mob/user) . = ..() +<<<<<<< HEAD // SKYRAT EDIT NIFSOFT SCRYERS - START if(custom_examine_controls) return // SKYRAT EDIT NIFSOFT SCRYERS - END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(cell) . += span_notice("The battery charge reads [cell.percent()]%. Right-click with an empty hand to remove it.") else diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm index b37be06cd2b..a2e5b104ea1 100644 --- a/code/modules/mod/mod_paint.dm +++ b/code/modules/mod/mod_paint.dm @@ -55,7 +55,11 @@ data["currentColor"] = current_color return data +<<<<<<< HEAD /obj/item/mod/paint/ui_act(action, list/params) +======= +/obj/item/mod/paint/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -124,9 +128,15 @@ balloon_alert(user, "no skin picked!") return mod.theme.set_skin(mod, pick) +<<<<<<< HEAD /obj/item/mod/paint/proc/check_menu(obj/item/mod/control/mod, mob/user) if(user.incapacitated() || !user.is_holding(src) || !mod || mod.active || mod.activating) +======= + +/obj/item/mod/paint/proc/check_menu(obj/item/mod/control/mod, mob/user) + if(user.incapacitated || !user.is_holding(src) || !mod || mod.active || mod.activating) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 68c7f6db1cf..8c42a0000a3 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -146,7 +146,11 @@ part_datum.sealed_layer = category[SEALED_LAYER] part_datum.unsealed_message = category[UNSEALED_MESSAGE] || "No unseal message set! Tell a coder!" part_datum.sealed_message = category[SEALED_MESSAGE] || "No seal message set! Tell a coder!" +<<<<<<< HEAD part_datum.can_overslot = TRUE //SKYRAT EDIT CHANGE, overslottable everything - Original: part_datum.can_overslot = category[CAN_OVERSLOT] || FALSE +======= + part_datum.can_overslot = category[CAN_OVERSLOT] || FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 part.clothing_flags = category[UNSEALED_CLOTHING] || NONE part.visor_flags = category[SEALED_CLOTHING] || NONE part.flags_inv = category[UNSEALED_INVISIBILITY] || NONE diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index 2f0465757ca..345da11ca66 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -104,6 +104,7 @@ if(mod.wearer) balloon_alert(mod.wearer, "not active!") return +<<<<<<< HEAD // SKYRAT EDIT START - DEPLOYABLE EVERYTHING OVER EVERYTHING var/can_activate = TRUE if(!(allow_flags & MODULE_ALLOW_INACTIVE)) @@ -115,6 +116,8 @@ balloon_alert(mod.wearer, "not fully deployed!") return // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(module_type != MODULE_USABLE) if(active) deactivate() @@ -136,6 +139,7 @@ if(!COOLDOWN_FINISHED(src, cooldown_timer)) balloon_alert(mod.wearer, "on cooldown!") return FALSE +<<<<<<< HEAD if(((!mod.active || mod.activating) && !(allow_flags & MODULE_ALLOW_INACTIVE)) || !mod.get_charge()) // SKYRAT EDIT ADDITION: INACTIVE USE balloon_alert(mod.wearer, "unpowered!") return FALSE @@ -147,6 +151,11 @@ balloon_alert(mod.wearer, "deploy all parts first!") return FALSE // SKYRAT EDIT END +======= + if(!mod.active || mod.activating || !mod.get_charge()) + balloon_alert(mod.wearer, "unpowered!") + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!(allow_flags & MODULE_ALLOW_PHASEOUT) && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob)) //specifically a to_chat because the user is phased out. to_chat(mod.wearer, span_warning("You cannot activate this right now.")) @@ -219,7 +228,11 @@ /// Called when an activated module without a device is used /obj/item/mod/module/proc/on_select_use(atom/target) +<<<<<<< HEAD if(!(allow_flags & MODULE_ALLOW_INCAPACITATED) && mod.wearer.incapacitated(IGNORE_GRAB)) +======= + if(!(allow_flags & MODULE_ALLOW_INCAPACITATED) && INCAPACITATED_IGNORING(mod.wearer, INCAPABLE_GRAB)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE mod.wearer.face_atom(target) if(!used()) @@ -351,14 +364,20 @@ used_overlay = overlay_state_inactive else return +<<<<<<< HEAD /* SKYRAT EDIT START - Making MODsuits mutant-compatible - ORIGINAL: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mutable_appearance/module_icon = mutable_appearance(overlay_icon_file, used_overlay, layer = standing.layer + 0.1) if(!use_mod_colors) module_icon.appearance_flags |= RESET_COLOR . += module_icon +<<<<<<< HEAD */ return handle_module_icon(standing, used_overlay) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Updates the signal used by active modules to be activated /obj/item/mod/module/proc/update_signal(value) diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm index 9048701f1d0..f180a044494 100644 --- a/code/modules/mod/modules/module_kinesis.dm +++ b/code/modules/mod/modules/module_kinesis.dm @@ -67,7 +67,11 @@ clear_grab(playsound = !deleting) /obj/item/mod/module/anomaly_locked/kinesis/process(seconds_per_tick) +<<<<<<< HEAD if(!mod.wearer.client || mod.wearer.incapacitated(IGNORE_GRAB)) +======= + if(!mod.wearer.client || INCAPACITATED_IGNORING(mod.wearer, INCAPABLE_GRAB)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clear_grab() return if(!range_check(grabbed_atom)) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 2ab0b0a1fd2..4cac02e72e8 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -953,6 +953,79 @@ balloon_alert(mod.wearer, "ammo box dispensed.") playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, TRUE) +<<<<<<< HEAD +======= +/obj/item/mod/module/fishing_glove + name = "MOD fishing glove module" + desc = "A MOD module that takes in an external fishing rod to enable the user to fish without having to hold one." + icon_state = "fishing_glove" + complexity = 1 + overlay_state_inactive = "fishing_glove" + incompatible_modules = (/obj/item/mod/module/fishing_glove) + required_slots = list(ITEM_SLOT_GLOVES) + var/obj/item/fishing_rod/equipped + +/obj/item/mod/module/fishing_glove/Initialize(mapload) + . = ..() + register_context() + +/obj/item/mod/module/fishing_glove/add_context(atom/source, list/context, obj/item/held_item, mob/user) + if(!held_item && equipped) + context[SCREENTIP_CONTEXT_RMB] = "Remove rod" + return CONTEXTUAL_SCREENTIP_SET + if(istype(held_item, /obj/item/fishing_rod)) + context[SCREENTIP_CONTEXT_LMB] = "Insert rod" + return CONTEXTUAL_SCREENTIP_SET + +/obj/item/mod/module/fishing_glove/examine(mob/user) + . = ..() + . += span_info("You can [EXAMINE_HINT("right-click")] the modsuit gloves to open the fishing rod interface once attached and activated.") + if(equipped) + . += span_info("it has a [icon2html(equipped, user)] installed. [EXAMINE_HINT("Right-Click")] to remove it.") + +/obj/item/mod/module/fishing_glove/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!istype(tool, /obj/item/fishing_rod)) + return ..() + if(equipped) + balloon_alert(user, "remove current rod first!") + if(!user.transferItemToLoc(tool, src)) + user.balloon_alert(user, "it's stuck!") + equipped = tool + balloon_alert(user, "rod inserted") + playsound(src, 'sound/items/click.ogg', 50, TRUE) + return ITEM_INTERACT_SUCCESS + +/obj/item/mod/module/fishing_glove/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) + return + if(!equipped) + return + user.put_in_hands(equipped) + balloon_alert(user, "rod removed") + playsound(src, 'sound/items/click.ogg', 50, TRUE) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + +/obj/item/mod/module/fishing_glove/Exited(atom/movable/gone) + if(gone == equipped) + equipped = null + var/obj/item/gloves = mod?.get_part_from_slot(ITEM_SLOT_GLOVES) + if(gloves && !QDELETED(mod)) + qdel(gloves.GetComponent(/datum/component/profound_fisher)) + +/obj/item/mod/module/fishing_glove/on_suit_activation() + if(!equipped) + return + var/obj/item/gloves = mod.get_part_from_slot(ITEM_SLOT_GLOVES) + if(gloves) + gloves.AddComponent(/datum/component/profound_fisher, equipped) + +/obj/item/mod/module/fishing_glove/on_suit_deactivation(deleting = FALSE) + var/obj/item/gloves = mod.get_part_from_slot(ITEM_SLOT_GLOVES) + if(gloves && !deleting) + qdel(gloves.GetComponent(/datum/component/profound_fisher)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/mod/module/shock_absorber name = "MOD shock absorption module" desc = "A module that makes the user resistant to the knockdown inflicted by Stun Batons." diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index 531bc5b32fd..d9316e061b8 100644 --- a/code/modules/mod/modules/modules_maint.dm +++ b/code/modules/mod/modules/modules_maint.dm @@ -59,7 +59,10 @@ flash_color(mod.wearer, flash_color = "#FF0000", flash_time = 10 SECONDS) set_off = FALSE +<<<<<<< HEAD /* SKYRAT EDIT: See skyrat_modular/modules/jukebox +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Rave Visor - Gives you a rainbow visor and plays jukebox music to you. /obj/item/mod/module/visor/rave name = "MOD rave visor module" @@ -138,7 +141,11 @@ return music_player.selection = new_song +<<<<<<< HEAD SKYRAT EDIT END */ +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Tanner - Tans you with spraytan. /obj/item/mod/module/tanner name = "MOD tanning module" diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index 7a802cf0f6c..cdd246e2ac8 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -225,8 +225,12 @@ organ_evacced.Remove(target, special = TRUE) organ_evacced.forceMove(get_turf(target)) +<<<<<<< HEAD if (!organ.Insert(target)) organ.forceMove(drop_location()) +======= + organ.Insert(target) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ = null ///Patrient Transport - Generates hardlight bags you can put people in. @@ -429,3 +433,25 @@ /datum/surgery/advanced/bioware/cortex_folding, /datum/surgery/advanced/bioware/cortex_folding/mechanic, ) +<<<<<<< HEAD +======= + +/obj/item/mod/module/surgical_processor/emergency + desc = "A module using an onboard surgical computer which can be connected to other computers to download and \ + perform advanced surgeries on the go. This one came pre-loaded with some emergency surgeries." + device = /obj/item/surgical_processor/mod/emergency + +/obj/item/surgical_processor/mod/emergency + loaded_surgeries = list( + /datum/surgery/healing/combo/upgraded/femto, + /datum/surgery/blood_filter, + /datum/surgery/brain_surgery, + /datum/surgery/coronary_bypass, + /datum/surgery/ear_surgery, + /datum/surgery/eye_surgery, + /datum/surgery/hepatectomy, + /datum/surgery/revival, + /datum/surgery/stomach_pump, + /datum/surgery/advanced/wing_reconstruction, + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index a35ab16eba2..665e0d3bd3e 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -19,7 +19,11 @@ /obj/item/mod/module/magnetic_harness/Initialize(mapload) . = ..() if(!guns_typecache) +<<<<<<< HEAD guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe, /obj/item/gun/microfusion)) //SKYRAT EDIT - MICROFUSION +======= + guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/mod/module/magnetic_harness/on_install() var/obj/item/clothing/suit = mod.get_part_from_slot(ITEM_SLOT_OCLOTHING) @@ -568,7 +572,11 @@ projectile.ricochets_max += 1 projectile.min_ricochets += 1 projectile.ricochet_incidence_leeway = 0 //allows the projectile to bounce at any angle. +<<<<<<< HEAD ADD_TRAIT(projectile, TRAIT_ALWAYS_HIT_ZONE, MOD_TRAIT) +======= + projectile.accuracy_falloff = 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef SHOOTING_ASSISTANT_OFF #undef STORMTROOPER_MODE diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index 87bbcfd88a4..e8c6ce11191 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -80,7 +80,11 @@ else balloon_alert(mod.wearer, "invalid target!") +<<<<<<< HEAD /obj/item/mod/module/clamp/on_suit_deactivation(deleting = FALSE) //SKYRAT EDIT +======= +/obj/item/mod/module/clamp/on_suit_deactivation(deleting = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(deleting) return for(var/atom/movable/crate as anything in stored_crates) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 238cc8757f8..4b336f542d7 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -75,9 +75,15 @@ var/comp_light_color = COLOR_WHITE ///Power usage when the computer is open (screen is active) and can be interacted with. +<<<<<<< HEAD var/base_active_power_usage = 0.4 WATTS // SKYRAT EDIT CHANGE - ORIGINAL: 2 WATTS ///Power usage when the computer is idle and screen is off. var/base_idle_power_usage = 0.2 WATTS //SKYRAT EDIT CHANGE - ORIGINAL: 1 WATTS +======= + var/base_active_power_usage = 2 WATTS + ///Power usage when the computer is idle and screen is off. + var/base_idle_power_usage = 1 WATTS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Modular computers can run on various devices. Each DEVICE (Laptop, Console & Tablet) // must have its own DMI file. Icon states must be called exactly the same in all files, but may look differently diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm index edce55c17a6..20da5b6b793 100644 --- a/code/modules/modular_computers/computers/item/computer_power.dm +++ b/code/modules/modular_computers/computers/item/computer_power.dm @@ -43,7 +43,6 @@ ///Charge depends on whether the PC is on, and what programs are running/idle on it. /obj/item/modular_computer/proc/handle_power(seconds_per_tick) var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage - if(light_on) power_usage *= FLASHLIGHT_DRAIN_MULTIPLIER if(active_program) @@ -54,6 +53,19 @@ if(open_programs in idle_threads) power_usage += (open_programs.power_cell_use / 2) +<<<<<<< HEAD + if(light_on) + power_usage *= FLASHLIGHT_DRAIN_MULTIPLIER + if(active_program) + power_usage += active_program.power_cell_use + for(var/datum/computer_file/program/open_programs as anything in idle_threads) + if(!open_programs.power_cell_use) + continue + if(open_programs in idle_threads) + power_usage += (open_programs.power_cell_use / 2) + +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(use_energy(power_usage * seconds_per_tick)) return TRUE power_failure() diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index c7317e1ba2a..7a34ff756ce 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -38,10 +38,14 @@ /datum/computer_file/program/messenger, /datum/computer_file/program/nt_pay, /datum/computer_file/program/notepad, +<<<<<<< HEAD // SKYRAT EDIT ADDITION START /datum/computer_file/program/maintenance/camera, // Adds camera to all base tablets // SKRAT EDIT ADDITION END /datum/computer_file/program/crew_manifest +======= + /datum/computer_file/program/crew_manifest, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) ///List of items that can be stored in a PDA var/static/list/contained_item = list( @@ -329,8 +333,11 @@ starting_programs = list( /datum/computer_file/program/filemanager, /datum/computer_file/program/robotact, +<<<<<<< HEAD /datum/computer_file/program/crew_manifest, // SKYRAT EDIT ADDITION - Manifests for borgs /datum/computer_file/program/messenger, // SKYRAT EDIT ADDITION - Messenger for borgs +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/modular_computer/pda/silicon/Initialize(mapload) @@ -425,7 +432,11 @@ return TRUE /obj/item/modular_computer/pda/silicon/ui_state(mob/user) +<<<<<<< HEAD return GLOB.reverse_contained_state +======= + return GLOB.deep_inventory_state +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/modular_computer/pda/silicon/cyborg/syndicate icon_state = "tablet-silicon-syndicate" diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 1e20936b921..c60a9e4911d 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -365,12 +365,18 @@ /datum/computer_file/program/newscaster, ) +<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL BEGIN - Mutes the Curator's ringer on spawn +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/modular_computer/pda/curator/Initialize(mapload) . = ..() for(var/datum/computer_file/program/messenger/msg in stored_files) msg.alert_silenced = TRUE +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/modular_computer/pda/psychologist name = "psychologist PDA" diff --git a/code/modules/modular_computers/documentation.md b/code/modules/modular_computers/documentation.md deleted file mode 100644 index ba11790f2fd..00000000000 --- a/code/modules/modular_computers/documentation.md +++ /dev/null @@ -1,57 +0,0 @@ -# Modular computer programs - -How module computer programs work - -Ok. so a quick rundown on how to make a program. This is kind of a shitty documentation, but oh well I was asked to. - -## Base setup - -This is how the base program is setup. the rest is mostly tgui stuff. I'll use the ntnetmonitor as a base - -```DM -/datum/computer_file/program/ntnetmonitor - /// This is obviously the name of the file itself. not much to be said - filename = "ntmonitor" - - /// This is sort of the official name. it's what shows up on the main menu - filedesc = "NTNet Diagnostics and Monitoring" - - /// This is what the screen will look like when the program is active - program_icon_state = "comm_monitor" - - /// This is a sort of a description, visible when looking on the ntnet - extended_desc = "This program is a dummy." - - /// size of the program. Big programs need more hard drive space. Don't - /// make it too big though. - size = 12 - - /// If this is set, the program will not run without an ntnet connection, - /// and will close if the connection is lost. Mainly for primarily online - /// programs. - requires_ntnet = 1 - - /// This is access required to run the program itself. - run_access = access_network - - /// This is the access needed to download from ntnet or host on the ptp - /// program. This is what you want to use most of the time. - download_access = access_change_ids - - /// If it's available to download on ntnet. pretty self explanatory. - available_on_ntnet = 1 - - /// ditto but on emagged syndie net. Use this for antag programs - available_on_syndinet = 0 - - /// Bitflags (PROGRAM_CONSOLE, PROGRAM_LAPTOP, PROGRAM_PDA combination) - /// or PROGRAM_ALL. Use this to limit what kind of machines can run the - /// program. For example, comms program should be limited to consoles and laptops. - usage_flags = PROGRAM_ALL - - /// This one is kinda cool. If you have the program minimized, this will - /// show up in the header of the computer screen. You can even have the - /// program change what the header is based on the situation! See `alarm.dm` - /// for an example. - var/ui_header = "downloader_finished.gif" -``` diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 966bb1c80ed..f7726b6f233 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -305,6 +305,7 @@ if("toggleprivate") self_paid = !self_paid . = TRUE +<<<<<<< HEAD //SKYRAT EDIT START if("company_import_window") var/datum/component/armament/company_imports/gun_comp = computer.GetComponent(/datum/component/armament/company_imports) @@ -315,6 +316,8 @@ gun_comp.ui_interact(usr) . = TRUE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(.) post_signal(cargo_shuttle) diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index ae0dc9ea586..2b17195ae65 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -157,7 +157,11 @@ /datum/computer_file/program/messenger/ui_state(mob/user) if(issilicon(user)) +<<<<<<< HEAD return GLOB.reverse_contained_state +======= + return GLOB.deep_inventory_state +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return GLOB.default_state /datum/computer_file/program/messenger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -623,10 +627,13 @@ playsound(computer, 'sound/machines/terminal_error.ogg', 15, TRUE) return FALSE +<<<<<<< HEAD // SKYRAT EDIT BEGIN - PDA messages show a visible message; again! sender.visible_message(span_notice("[sender]'s PDA rings out with the soft sound of keypresses"), vision_distance = COMBAT_MESSAGE_RANGE) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/shell_addendum = "" if(istype(source, /obj/item/circuit_component)) var/obj/item/circuit_component/circuit = source diff --git a/code/modules/modular_computers/file_system/programs/records.dm b/code/modules/modular_computers/file_system/programs/records.dm index 0aab001db04..5ab1fca228a 100644 --- a/code/modules/modular_computers/file_system/programs/records.dm +++ b/code/modules/modular_computers/file_system/programs/records.dm @@ -40,7 +40,10 @@ var/list/current_record = list() current_record["age"] = person.age +<<<<<<< HEAD current_record["chrono_age"] = person.chrono_age // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_record["fingerprint"] = person.fingerprint current_record["gender"] = person.gender current_record["name"] = person.name @@ -54,8 +57,11 @@ for(var/datum/record/crew/person in GLOB.manifest.general) var/list/current_record = list() +<<<<<<< HEAD current_record["age"] = person.age // SKYRAT EDIT ADDITION - Chronological age current_record["chrono_age"] = person.chrono_age // SKYRAT EDIT ADDITION - Chronological age +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_record["bloodtype"] = person.blood_type current_record["ma_dis"] = person.major_disabilities_desc current_record["mi_dis"] = person.minor_disabilities_desc diff --git a/code/modules/pai/hud.dm b/code/modules/pai/hud.dm index b104c7b90ea..5cf5a7c2731 100644 --- a/code/modules/pai/hud.dm +++ b/code/modules/pai/hud.dm @@ -5,7 +5,11 @@ var/required_software /atom/movable/screen/pai/Click() +<<<<<<< HEAD if(isobserver(usr) || usr.incapacitated()) +======= + if(isobserver(usr) || usr.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE var/mob/living/silicon/pai/user = usr if(required_software && !user.installed_software.Find(required_software)) diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm index 83adc05919a..b402e382f4a 100644 --- a/code/modules/pai/pai.dm +++ b/code/modules/pai/pai.dm @@ -166,15 +166,32 @@ card = null return ..() +<<<<<<< HEAD +======= +// Need to override parent here because the message we dispatch is turf-based, not based on the location of the object because that could be fuckin anywhere +/mob/living/silicon/pai/send_applicable_messages() + var/turf/location = get_turf(src) + location.visible_message(span_danger(get_visible_suicide_message()), null, span_hear(get_blind_suicide_message())) // null in the second arg here because we're sending from the turf + +/mob/living/silicon/pai/get_visible_suicide_message() + return "[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"" + +/mob/living/silicon/pai/get_blind_suicide_message() + return "[src] bleeps electronically." + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/silicon/pai/emag_act(mob/user) return handle_emag(user) /mob/living/silicon/pai/examine(mob/user) . = ..() . += "Its master ID string seems to be [(!master_name || emagged) ? "empty" : master_name]." +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION . += get_silicon_flavortext() //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/silicon/pai/get_status_tab_items() . += ..() diff --git a/code/modules/pai/say.dm b/code/modules/pai/say.dm index b35abfe7f9d..c1b07477c16 100644 --- a/code/modules/pai/say.dm +++ b/code/modules/pai/say.dm @@ -1,2 +1,6 @@ /mob/living/silicon/pai/binarycheck() +<<<<<<< HEAD return radio?.translate_binary +======= + return (radio?.special_channels & RADIO_SPECIAL_BINARY) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/pai/shell.dm b/code/modules/pai/shell.dm index 2ef3cf3d8e2..6cb00032c34 100644 --- a/code/modules/pai/shell.dm +++ b/code/modules/pai/shell.dm @@ -30,7 +30,11 @@ * FALSE otherwise. */ /mob/living/silicon/pai/proc/check_menu(atom/anchor) +<<<<<<< HEAD if(incapacitated()) +======= + if(incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(get_turf(src) != get_turf(anchor)) return FALSE diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index d94993c2d38..9dd079e88d3 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -95,7 +95,11 @@ if(toppaper) . += toppaper.icon_state . += toppaper.overlays +<<<<<<< HEAD if(!integrated_pen && pen) // SKYRAT EDIT - CARGO BORGS - ORIGINAL: if(pen) +======= + if(pen) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "clipboard_pen" . += "clipboard_over" @@ -158,7 +162,11 @@ return data +<<<<<<< HEAD /obj/item/clipboard/ui_act(action, params) +======= +/obj/item/clipboard/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index e652b92e978..9153b3b7d6f 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -43,6 +43,12 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department /obj/item/card, /obj/item/folder/biscuit, /obj/item/food/breadslice, +<<<<<<< HEAD +======= + /obj/item/food/chapslice, + /obj/item/food/cookie, + /obj/item/food/grilled_chapslice, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/pizza/flatbread, /obj/item/food/pizzaslice, /obj/item/food/root_flatbread, @@ -66,6 +72,30 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department fax_name = "[current_area.name]" return ..() +<<<<<<< HEAD +======= +/obj/machinery/fax/admin/syndicate + name = "Syndicate Fax Machine" + +/obj/machinery/fax/admin/syndicate/Initialize(mapload) + fax_name = "[special_networks["syndicate"]["fax_name"]]" + fax_id = special_networks["syndicate"]["fax_id"] + syndicate_network = TRUE + return ..() + +/obj/machinery/fax/admin + name = "CentCom Fax Machine" + +/obj/machinery/fax/admin/Initialize(mapload) + if (!fax_name) + fax_name = "[GLOB.nt_fax_department]" + if(!fax_id) + fax_id = special_networks["nanotrasen"]["fax_id"] + name = "[fax_name] Fax Machine" + visible_to_network = FALSE + return ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/fax/Initialize(mapload) . = ..() if (!fax_id) @@ -232,7 +262,11 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department var/list/data = list() //Record a list of all existing faxes. for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax)) +<<<<<<< HEAD if(FAX.fax_id == fax_id || is_centcom_level(FAX.z)) //skip yourself and the centcom fax machine. +======= + if(FAX.fax_id == fax_id) //skip yourself +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue var/list/fax_data = list() fax_data["fax_name"] = FAX.fax_name @@ -253,11 +287,20 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department data["fax_history"] = fax_history var/list/special_networks_data = list() for(var/key in special_networks) +<<<<<<< HEAD +======= + if(special_networks[key]["fax_id"] == fax_id) + continue +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 special_networks_data += list(special_networks[key]) data["special_faxes"] = special_networks_data return data +<<<<<<< HEAD /obj/machinery/fax/ui_act(action, list/params) +======= +/obj/machinery/fax/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -300,7 +343,11 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department history_add("Send", params["name"]) GLOB.requests.fax_request(usr.client, "sent a fax message from [fax_name]/[fax_id] to [params["name"]]", fax_paper) +<<<<<<< HEAD to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name)]"), confidential = TRUE) +======= + to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name, params["id"])]"), confidential = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/client/staff as anything in GLOB.admins) if(staff?.prefs.read_preference(/datum/preference/toggle/comms_notification)) SEND_SOUND(staff, sound('sound/misc/server-ready.ogg')) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 46b9b8f31fd..ab7cc758d92 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -83,7 +83,11 @@ return data +<<<<<<< HEAD /obj/structure/filingcabinet/ui_act(action, params) +======= +/obj/structure/filingcabinet/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 3ee556b3adf..c35128df598 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -106,7 +106,11 @@ return data +<<<<<<< HEAD /obj/item/folder/ui_act(action, params) +======= +/obj/item/folder/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 65f5a29b405..3ac8f4f6bc8 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -1,5 +1,9 @@ /// A mini-tool used to apply label items onto something to modify its name. +<<<<<<< HEAD /obj/item/hand_labeler //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/item/hand_labeler +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "hand labeler" desc = "A combined label printer, applicator, and remover, all in a single portable device. Designed to be easy to operate and use." icon = 'icons/obj/service/bureaucracy.dmi' diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index fe2de7e7520..1c78a8e76af 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -64,6 +64,12 @@ ///If TRUE, staff can read paper everywhere, but usually from requests panel. var/request_state = FALSE +<<<<<<< HEAD +======= + ///If this paper can be selected as a candidate for a future message in a bottle when spawned outside of mapload. Doesn't affect manually doing that. + var/can_become_message_in_bottle = TRUE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/paper/Initialize(mapload) . = ..() pixel_x = base_pixel_x + rand(-9, 9) @@ -73,11 +79,23 @@ add_raw_text(default_raw_text) update_appearance() +<<<<<<< HEAD /obj/item/paper/Destroy() . = ..() camera_holder = null clear_paper() +======= + + if(can_become_message_in_bottle && !mapload && prob(MESSAGE_BOTTLE_CHANCE)) + LAZYADD(SSpersistence.queued_message_bottles, src) + +/obj/item/paper/Destroy() + camera_holder = null + clear_paper() + LAZYREMOVE(SSpersistence.queued_message_bottles, src) + return ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Determines whether this paper has been written or stamped to. /obj/item/paper/proc/is_empty() @@ -306,7 +324,11 @@ set category = "Object" set src in usr +<<<<<<< HEAD if(!usr.can_read(src) || usr.is_blind() || usr.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB) || (isobserver(usr) && !isAdminGhostAI(usr))) +======= + if(!usr.can_read(src) || usr.is_blind() || INCAPACITATED_IGNORING(usr, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB) || (isobserver(usr) && !isAdminGhostAI(usr))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(ishuman(usr)) var/mob/living/carbon/human/H = usr @@ -351,7 +373,11 @@ return UI_UPDATE if(!in_range(user, src) && !isobserver(user)) return UI_CLOSE +<<<<<<< HEAD if(user.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB) || (isobserver(user) && !isAdminGhostAI(user))) +======= + if(INCAPACITATED_IGNORING(user, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB) || (isobserver(user) && !isAdminGhostAI(user))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UI_UPDATE // Even harder to read if your blind...braile? humm // .. or if you cannot read @@ -527,6 +553,7 @@ static_data["user_name"] = user.real_name +<<<<<<< HEAD static_data["raw_text_input"] = list() for(var/datum/paper_input/text_input as anything in raw_text_inputs) static_data["raw_text_input"] += list(text_input.to_list()) @@ -543,12 +570,58 @@ static_data["max_input_field_length"] = MAX_PAPER_INPUT_FIELD_LENGTH static_data["paper_color"] = color ? color : COLOR_WHITE static_data["paper_name"] = name +======= + static_data += convert_to_data() + + static_data["max_length"] = MAX_PAPER_LENGTH + static_data["max_input_field_length"] = MAX_PAPER_INPUT_FIELD_LENGTH +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 static_data["default_pen_font"] = PEN_FONT static_data["default_pen_color"] = COLOR_BLACK static_data["signature_font"] = FOUNTAIN_PEN_FONT return static_data; +<<<<<<< HEAD +======= + +/obj/item/paper/proc/convert_to_data() + var/list/data = list() + + data[LIST_PAPER_RAW_TEXT_INPUT] = list() + for(var/datum/paper_input/text_input as anything in raw_text_inputs) + data[LIST_PAPER_RAW_TEXT_INPUT] += list(text_input.to_list()) + + data[LIST_PAPER_RAW_FIELD_INPUT] = list() + for(var/datum/paper_field/field_input as anything in raw_field_input_data) + data[LIST_PAPER_RAW_FIELD_INPUT] += list(field_input.to_list()) + + data[LIST_PAPER_RAW_STAMP_INPUT] = list() + for(var/datum/paper_stamp/stamp_input as anything in raw_stamp_data) + data[LIST_PAPER_RAW_STAMP_INPUT] += list(stamp_input.to_list()) + + data[LIST_PAPER_COLOR] = color ? color : COLOR_WHITE + data[LIST_PAPER_NAME] = name + + return data + +/obj/item/paper/proc/write_from_data(list/data) + for(var/list/input as anything in data[LIST_PAPER_RAW_TEXT_INPUT]) + add_raw_text(input[LIST_PAPER_RAW_TEXT], input[LIST_PAPER_FONT], input[LIST_PAPER_FIELD_COLOR], input[LIST_PAPER_BOLD], input[LIST_PAPER_ADVANCED_HTML]) + + for(var/list/field as anything in data[LIST_PAPER_RAW_FIELD_INPUT]) + var/list/input = field[LIST_PAPER_FIELD_DATA] + add_field_input(field[LIST_PAPER_FIELD_INDEX], input[LIST_PAPER_RAW_TEXT], input[LIST_PAPER_FONT], input[LIST_PAPER_FIELD_COLOR], input[LIST_PAPER_BOLD], field[LIST_PAPER_IS_SIGNATURE]) + + for(var/list/stamp as anything in data[LIST_PAPER_RAW_STAMP_INPUT]) + add_stamp(stamp[LIST_PAPER_CLASS], stamp[LIST_PAPER_STAMP_X], stamp[LIST_PAPER_STAMP_Y], stamp[LIST_PAPER_ROTATION]) + + var/new_color = data[LIST_PAPER_COLOR] + if(new_color != COLOR_WHITE) + add_atom_colour(new_color, FIXED_COLOUR_PRIORITY) + + name = data[LIST_PAPER_NAME] +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/paper/ui_data(mob/user) var/list/data = list() @@ -753,11 +826,19 @@ /datum/paper_input/proc/to_list() return list( +<<<<<<< HEAD raw_text = raw_text, font = font, color = colour, bold = bold, advanced_html = advanced_html, +======= + LIST_PAPER_RAW_TEXT = raw_text, + LIST_PAPER_FONT = font, + LIST_PAPER_FIELD_COLOR = colour, + LIST_PAPER_BOLD = bold, + LIST_PAPER_ADVANCED_HTML = advanced_html, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// Returns the raw contents of the input as html, with **ZERO SANITIZATION** @@ -793,10 +874,17 @@ /datum/paper_stamp/proc/to_list() return list( +<<<<<<< HEAD class = class, x = stamp_x, y = stamp_y, rotation = rotation, +======= + LIST_PAPER_CLASS = class, + LIST_PAPER_STAMP_X = stamp_x, + LIST_PAPER_STAMP_Y = stamp_y, + LIST_PAPER_ROTATION = rotation, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// A reference to some data that replaces a modifiable input field at some given index in paper raw input parsing. @@ -818,9 +906,15 @@ /datum/paper_field/proc/to_list() return list( +<<<<<<< HEAD field_index = field_index, field_data = field_data.to_list(), is_signature = is_signature, +======= + LIST_PAPER_FIELD_INDEX = field_index, + LIST_PAPER_FIELD_DATA = field_data.to_list(), + LIST_PAPER_IS_SIGNATURE = is_signature, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/paper/construction diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index fdcf53457c6..f2ca575dbde 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -16,6 +16,7 @@ var/hit_probability = 2 ///Reference to the paper that's folded up in this paperplane, which we return when unfolded. var/obj/item/paper/internal_paper +<<<<<<< HEAD // SKYRAT EDIT START - Better paper planes /// How long does getting shot in the eyes knock you down for? @@ -27,6 +28,8 @@ /// Does it get deleted when hitting anything or landing? var/delete_on_impact = FALSE // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/paperplane/syndicate desc = "Paper, masterfully folded in the shape of a plane." @@ -65,7 +68,11 @@ user.visible_message(span_suicide("[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!")) user.adjust_eye_blur(12 SECONDS) if(eyes) +<<<<<<< HEAD eyes.apply_organ_damage(rand(impact_eye_damage_lower, impact_eye_damage_higher)) // SKYRAT EDIT START - Better paper planes +======= + eyes.apply_organ_damage(rand(6,8)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sleep(1 SECONDS) return BRUTELOSS @@ -102,7 +109,11 @@ /obj/item/paperplane/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(iscarbon(hit_atom) && HAS_TRAIT(hit_atom, TRAIT_PAPER_MASTER)) var/mob/living/carbon/hit_carbon = hit_atom +<<<<<<< HEAD if(hit_carbon.can_catch_item(TRUE)) +======= + if(hit_carbon.can_catch_item(src, skip_throw_mode_check = TRUE)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hit_carbon.throw_mode_on(THROW_MODE_TOGGLE) . = ..() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index b72a2320170..4c36e9cd057 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -179,7 +179,11 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks()) return data +<<<<<<< HEAD /obj/machinery/photocopier/ui_act(action, list/params) +======= +/obj/machinery/photocopier/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/photography/camera/silicon_camera.dm b/code/modules/photography/camera/silicon_camera.dm index 9cdbee1bc2b..7af70b0a3e2 100644 --- a/code/modules/photography/camera/silicon_camera.dm +++ b/code/modules/photography/camera/silicon_camera.dm @@ -7,7 +7,11 @@ /// Checks if we can take a picture at this moment. Returns TRUE if we can, FALSE if we can't. /obj/item/camera/siliconcam/proc/can_take_picture(mob/living/silicon/clicker) +<<<<<<< HEAD if(clicker.stat != CONSCIOUS || clicker.incapacitated()) +======= + if(clicker.stat != CONSCIOUS || clicker.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index b009c5b2e79..f052d636100 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -9,12 +9,21 @@ w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE max_integrity = 50 + drop_sound = 'sound/items/handling/paper_drop.ogg' + pickup_sound = 'sound/items/handling/paper_pickup.ogg' grind_results = list(/datum/reagent/iodine = 4) var/datum/picture/picture var/scribble //Scribble on the back. /obj/item/photo/Initialize(mapload, datum/picture/P, datum_name = TRUE, datum_desc = TRUE) set_picture(P, datum_name, datum_desc, TRUE) + //Photos are quite rarer than papers, so they're more likely to be added to the queue to make things even. + if(!mapload && prob(MESSAGE_BOTTLE_CHANCE * 5) && picture?.id) + LAZYADD(SSpersistence.queued_message_bottles, src) + return ..() + +/obj/item/photo/Destroy() + LAZYREMOVE(SSpersistence.queued_message_bottles, src) return ..() /obj/item/photo/proc/set_picture(datum/picture/P, setname, setdesc, name_override = FALSE) @@ -104,7 +113,11 @@ var/n_name = tgui_input_text(usr, "What would you like to label the photo?", "Photo Labelling", max_length = MAX_NAME_LEN) //loc.loc check is for making possible renaming photos in clipboards +<<<<<<< HEAD if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated()) +======= + if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "photo[(n_name ? "- '[n_name]'" : null)]" add_fingerprint(usr) diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm index 014ff849901..92fc3caf607 100644 --- a/code/modules/plumbing/plumbers/acclimator.dm +++ b/code/modules/plumbing/plumbers/acclimator.dm @@ -88,7 +88,11 @@ data["emptying"] = emptying return data +<<<<<<< HEAD /obj/machinery/plumbing/acclimator/ui_act(action, params) +======= +/obj/machinery/plumbing/acclimator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index 050402f79f5..b0d79df69d8 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -36,8 +36,11 @@ CAT_PILLS = GLOB.reagent_containers[CAT_PILLS], CAT_PATCHES = GLOB.reagent_containers[CAT_PATCHES], "Bottles" = list(/obj/item/reagent_containers/cup/bottle), +<<<<<<< HEAD CAT_HYPOS = GLOB.reagent_containers[CAT_HYPOS], // SKYRAT EDIT ADDITION - Hypovials +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) packaging_types = list() @@ -70,10 +73,13 @@ packaging_category = CAT_PATCHES else if(ispath(container, /obj/item/reagent_containers/pill)) packaging_category = CAT_PILLS +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - HYPOVIALS else if(ispath(container, /obj/item/reagent_containers/cup/vial)) packaging_category = CAT_HYPOS // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else packaging_category = "Bottles" return container @@ -92,10 +98,13 @@ suffix = "Pill" if(CAT_PATCHES) suffix = "Patch" +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - HYPOVIALS if (CAT_HYPOS) suffix = "Vial" //SKYRAT EDIT ADDITION END - HYPOVIALS +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else suffix = "Bottle" container.name = "[product_name] [suffix]" @@ -128,6 +137,7 @@ ui.open() /obj/machinery/plumbing/pill_press/ui_static_data(mob/user) +<<<<<<< HEAD var/list/data = list() data["min_volume"] = MIN_VOLUME @@ -147,6 +157,27 @@ return data /obj/machinery/plumbing/pill_press/ui_act(action, params) +======= + var/list/data = list() + + data["min_volume"] = MIN_VOLUME + data["max_volume"] = MAX_VOLUME + data["packaging_types"] = packaging_types + + return data + +/obj/machinery/plumbing/pill_press/ui_data(mob/user) + var/list/data = list() + + data["current_volume"] = current_volume + data["product_name"] = product_name + data["packaging_type"] = packaging_type + data["packaging_category"] = packaging_category + + return data + +/obj/machinery/plumbing/pill_press/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/plumbing/plumbers/splitters.dm b/code/modules/plumbing/plumbers/splitters.dm index b87a07d694c..83b6c88ef84 100644 --- a/code/modules/plumbing/plumbers/splitters.dm +++ b/code/modules/plumbing/plumbers/splitters.dm @@ -32,7 +32,11 @@ data["max_transfer"] = max_transfer return data +<<<<<<< HEAD /obj/machinery/plumbing/splitter/ui_act(action, params) +======= +/obj/machinery/plumbing/splitter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm index 0399ad85f3c..dd8d789e608 100644 --- a/code/modules/plumbing/plumbers/synthesizer.dm +++ b/code/modules/plumbing/plumbers/synthesizer.dm @@ -89,7 +89,11 @@ .["current_reagent"] = initial(reagent_id.name) +<<<<<<< HEAD /obj/machinery/plumbing/synthesizer/ui_act(action, params) +======= +/obj/machinery/plumbing/synthesizer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm index 6e61b1154d5..53e3b420bee 100644 --- a/code/modules/point/point.dm +++ b/code/modules/point/point.dm @@ -7,6 +7,7 @@ * * Not intended as a replacement for the mob verb */ +<<<<<<< HEAD /atom/movable/proc/point_at(atom/pointed_atom) if(!isturf(loc)) return @@ -18,11 +19,36 @@ var/turf/tile = get_turf(pointed_atom) if (!tile) return +======= +/atom/movable/proc/point_at(atom/pointed_atom, intentional = FALSE) + if(!isturf(loc)) + return FALSE + + if (pointed_atom in src) + create_point_bubble(pointed_atom) + return FALSE + + var/turf/tile = get_turf(pointed_atom) + if (!tile) + return FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/turf/our_tile = get_turf(src) var/obj/visual = new /obj/effect/temp_visual/point(our_tile, invisibility) +<<<<<<< HEAD animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT) +======= + SEND_SIGNAL(src, COMSIG_MOVABLE_POINTED, pointed_atom, visual, intentional) + + animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT) + return TRUE + +/mob/point_at(atom/pointed_atom, intentional = FALSE) + . = ..() + if(.) + face_atom(pointed_atom) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/proc/create_point_bubble(atom/pointed_atom) var/mutable_appearance/thought_bubble = mutable_appearance( @@ -109,7 +135,12 @@ if(client && !(pointing_at in view(client.view, src))) return FALSE +<<<<<<< HEAD point_at(pointing_at) SEND_SIGNAL(src, COMSIG_MOB_POINTED, pointing_at) +======= + point_at(pointing_at, TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index 7a487a009b2..f425b2083cd 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -8,9 +8,15 @@ ///Cap for how fast cells charge, as a percentage per second (.01 means cellcharge is capped to 1% per second) #define CHARGELEVEL 0.01 ///Charge percentage at which the lights channel stops working +<<<<<<< HEAD #define APC_CHANNEL_LIGHT_TRESHOLD 10 //SKYRAT EDIT CHANGE - Original: 15 ///Charge percentage at which the equipment channel stops working #define APC_CHANNEL_EQUIP_TRESHOLD 20 //SKYRAT EDIT CHANGE - Original: 30 +======= +#define APC_CHANNEL_LIGHT_TRESHOLD 15 +///Charge percentage at which the equipment channel stops working +#define APC_CHANNEL_EQUIP_TRESHOLD 30 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Charge percentage at which the APC icon indicates discharging #define APC_CHANNEL_ALARM_TRESHOLD 75 @@ -444,6 +450,7 @@ if(!QDELETED(remote_control_user) && user == remote_control_user) . = UI_INTERACTIVE +<<<<<<< HEAD /obj/machinery/power/apc/ui_act(action, params) . = ..() @@ -454,6 +461,19 @@ if(HAS_SILICON_ACCESS(usr)) if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT)) || remote_control_user) to_chat(usr, span_warning("The APC does not respond to the command!")) +======= +/obj/machinery/power/apc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + var/mob/user = ui.user + + if(. || !can_use(user, 1) || (locked && !HAS_SILICON_ACCESS(user) && !failure_timer && action != "toggle_nightshift")) + return + switch(action) + if("lock") + if(HAS_SILICON_ACCESS(user)) + if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT)) || remote_control_user) + to_chat(user, span_warning("The APC does not respond to the command!")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else locked = !locked update_appearance() @@ -462,10 +482,17 @@ coverlocked = !coverlocked . = TRUE if("breaker") +<<<<<<< HEAD toggle_breaker(usr) . = TRUE if("toggle_nightshift") toggle_nightshift_lights(usr) +======= + toggle_breaker(user) + . = TRUE + if("toggle_nightshift") + toggle_nightshift_lights(user) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = TRUE if("charge") chargemode = !chargemode @@ -488,6 +515,7 @@ update() . = TRUE if("overload") +<<<<<<< HEAD if(HAS_SILICON_ACCESS(usr)) overload_lighting() . = TRUE @@ -499,6 +527,19 @@ malfoccupy(usr) if("deoccupy") if(get_malf_status(usr)) +======= + if(HAS_SILICON_ACCESS(user)) + overload_lighting() + . = TRUE + if("hack") + if(get_malf_status(user)) + malfhack(user) + if("occupy") + if(get_malf_status(user)) + malfoccupy(user) + if("deoccupy") + if(get_malf_status(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 malfvacate() if("reboot") failure_timer = 0 @@ -597,9 +638,15 @@ if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights)) low_power_nightshift_lights = TRUE INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE) +<<<<<<< HEAD else if(cell.percent() < APC_CHANNEL_EQUIP_TRESHOLD) equipment = autoset(equipment, AUTOSET_ON) // SKYRAT EDIT CHANGE - ORIGINAL: AUTOSET_OFF lighting = autoset(lighting, AUTOSET_OFF) // SKYRAT EDIT CHANGE - ORIGINAL: AUTOSET_ON +======= + else if(cell.percent() < APC_CHANNEL_EQUIP_TRESHOLD) // turn off equipment + equipment = autoset(equipment, AUTOSET_OFF) + lighting = autoset(lighting, AUTOSET_ON) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 environ = autoset(environ, AUTOSET_ON) alarm_manager.send_alarm(ALARM_POWER) if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights)) @@ -615,6 +662,7 @@ INVOKE_ASYNC(src, PROC_REF(set_nightshift), FALSE) if(cell.percent() > APC_CHANNEL_ALARM_TRESHOLD) alarm_manager.clear_alarm(ALARM_POWER) +<<<<<<< HEAD // SKYRAT ADDITION START - CLOCK CULT if(integration_cog) var/power_delta = clamp(cell.charge - 50, 0, 50) @@ -625,12 +673,19 @@ if(cell.charge <= 50) cell.charge = 0 // SKYRAT ADDITION END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else // no cell, switch everything off charging = APC_NOT_CHARGING equipment = autoset(equipment, AUTOSET_FORCE_OFF) lighting = autoset(lighting, AUTOSET_FORCE_OFF) environ = autoset(environ, AUTOSET_FORCE_OFF) alarm_manager.send_alarm(ALARM_POWER) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // update icon & area power if anything changed if(last_lt != lighting || last_eq != equipment || last_en != environ || force_update) force_update = FALSE @@ -692,7 +747,11 @@ /obj/machinery/power/apc/proc/overload_lighting() if(!operating || shorted) return +<<<<<<< HEAD if(cell && cell.use(0.02 * STANDARD_CELL_CHARGE)) +======= + if(cell && cell.use(0.02 * STANDARD_BATTERY_CHARGE)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(src, PROC_REF(break_lights)) /obj/machinery/power/apc/proc/break_lights() diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm index 8e4d51a703d..c3d2ec749cd 100644 --- a/code/modules/power/apc/apc_tool_act.dm +++ b/code/modules/power/apc/apc_tool_act.dm @@ -110,7 +110,11 @@ if(isnull(choice) \ || !user.is_holding(installing_cable) \ || !user.Adjacent(src) \ +<<<<<<< HEAD || user.incapacitated() \ +======= + || user.incapacitated \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || !can_place_terminal(user, installing_cable, silent = TRUE) \ ) return ITEM_INTERACT_BLOCKING diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index af13cadf361..f8a43f425c1 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -497,7 +497,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri if(!ISADVANCEDTOOLUSER(user)) to_chat(user, span_warning("You don't have the dexterity to do this!")) return FALSE - if(user.incapacitated() || !user.Adjacent(src)) + if(user.incapacitated || !user.Adjacent(src)) return FALSE return TRUE @@ -569,6 +569,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri /obj/item/stack/cable_coil/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!ishuman(interacting_with)) return NONE +<<<<<<< HEAD if(user.combat_mode) return NONE @@ -599,11 +600,44 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri if(!do_after(user, use_delay, attacked_humanoid)) return ITEM_INTERACT_BLOCKING +======= + + if(user.combat_mode) + return NONE + + return try_heal_loop(interacting_with, user) + +/obj/item/stack/cable_coil/proc/try_heal_loop(atom/interacting_with, mob/living/user, repeating = FALSE) + var/mob/living/carbon/human/attacked_humanoid = interacting_with + var/obj/item/bodypart/affecting = attacked_humanoid.get_bodypart(check_zone(user.zone_selected)) + if(isnull(affecting) || !IS_ROBOTIC_LIMB(affecting)) + return NONE + + if (!affecting.burn_dam) + balloon_alert(user, "limb not damaged") + return ITEM_INTERACT_BLOCKING + + user.visible_message(span_notice("[user] starts to fix some of the wires in [attacked_humanoid == user ? user.p_their() : "[attacked_humanoid]'s"] [affecting.name]."), + span_notice("You start fixing some of the wires in [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name].")) + + var/use_delay = repeating ? 1 SECONDS : 0 + if(user == attacked_humanoid) + use_delay = 5 SECONDS + + if(!do_after(user, use_delay, attacked_humanoid)) + return ITEM_INTERACT_BLOCKING + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!attacked_humanoid.item_heal(user, brute_heal = 0, burn_heal = 15, heal_message_brute = "dents", heal_message_burn = "burnt wires", required_bodytype = BODYTYPE_ROBOTIC)) return ITEM_INTERACT_BLOCKING if (use(1) && amount > 0) INVOKE_ASYNC(src, PROC_REF(try_heal_loop), interacting_with, user, TRUE) +<<<<<<< HEAD +======= + + return ITEM_INTERACT_SUCCESS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /////////////////////////////////////////////// // Cable laying procedures @@ -622,7 +656,11 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri to_chat(user, span_warning("There is no cable left!")) return +<<<<<<< HEAD if(get_dist(T,user) > 1) +======= + if(get_dist(T,user) > 1) // Too far +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You can't lay cable at a place that far away!")) return @@ -769,7 +807,7 @@ GLOBAL_LIST(hub_radial_layer_list) if(!ISADVANCEDTOOLUSER(user)) to_chat(user, span_warning("You don't have the dexterity to do this!")) return FALSE - if(user.incapacitated() || !user.Adjacent(src)) + if(user.incapacitated || !user.Adjacent(src)) return FALSE return TRUE diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index a168150c7da..7f2961d1c97 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -19,6 +19,14 @@ w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5) +<<<<<<< HEAD +======= + +/obj/item/stock_parts/power_store/cell/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_FISHING_BAIT, INNATE_TRAIT) + ADD_TRAIT(src, TRAIT_POISONOUS_BAIT, INNATE_TRAIT) //bro is fishing using lithium... +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* Cell variants*/ /obj/item/stock_parts/power_store/cell/empty diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 23fc78cc253..086c4e3cced 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -289,7 +289,11 @@ GLOBAL_LIST_EMPTY(gravity_generators) return data +<<<<<<< HEAD /obj/machinery/gravity_generator/main/ui_act(action, params) +======= +/obj/machinery/gravity_generator/main/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -420,6 +424,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) if(mobs.client) shake_camera(mobs, 15, 1) mobs.playsound_local(T, null, 100, 1, 0.5, sound_to_use = alert_sound) +<<<<<<< HEAD //SKYRAT EDIT ADDITON BEGIN if(!SSmapping.level_has_any_trait(z, ZTRAIT_STATION)) // SHUT THE FUCK UP ABANDONED STATIONS, I DON'T CARE return @@ -428,6 +433,8 @@ GLOBAL_LIST_EMPTY(gravity_generators) else priority_announce("A gravity generator has lost its graviton field integrity ballast, artificial gravity is offline.", "Gravity Generator", ANNOUNCER_GRAVGENOFF) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/gravity_generator/main/proc/gravity_in_level() var/turf/T = get_turf(src) diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 2914a9edec5..da88c54576a 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -189,6 +189,7 @@ return . += mutable_appearance(overlay_icon, base_state) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - AESTHETICS #define LIGHT_ON_DELAY_UPPER (2 SECONDS) @@ -198,6 +199,8 @@ #define NIGHTSHIFT_COLOR_MODIFIER 0.15 //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Area sensitivity is traditionally tied directly to power use, as an optimization // But since we want it for fire reacting, we disregard that /obj/machinery/light/setup_area_power_relationship() @@ -218,10 +221,17 @@ /obj/machinery/light/proc/handle_fire(area/source, new_fire) SIGNAL_HANDLER +<<<<<<< HEAD update(instant = TRUE, play_sound = FALSE) //SKYRAT EDIT CHANGE - ORIGINAL: update() // update the icon_state and luminosity of the light depending on its state /obj/machinery/light/proc/update(trigger = TRUE, instant = FALSE, play_sound = TRUE) // SKYRAT EDIT CHANGE +======= + update() + +// update the icon_state and luminosity of the light depending on its state +/obj/machinery/light/proc/update(trigger = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(status) if(LIGHT_BROKEN,LIGHT_BURNED,LIGHT_EMPTY) on = FALSE @@ -240,6 +250,7 @@ power_set = fire_power brightness_set = fire_brightness else if (nightshift_enabled) +<<<<<<< HEAD brightness_set -= brightness_set * NIGHTSHIFT_LIGHT_MODIFIER // SKYRAT EDIT CHANGE - ORIGINAL: brightness_set = nightshift_brightness power_set -= power_set * NIGHTSHIFT_LIGHT_MODIFIER // SKYRAT EDIT CHANGE - ORIGINAL: power_set = nightshift_light_power if(!color) @@ -260,11 +271,21 @@ blue = clamp(blue, 0, 255) color_set = rgb(red, green, blue) // Splice the numbers together and turn them back to hex. // SKYRAT EDIT ADDITION END +======= + brightness_set = nightshift_brightness + power_set = nightshift_light_power + if(!color) + color_set = nightshift_light_color +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if (major_emergency) color_set = bulb_low_power_colour brightness_set = brightness * bulb_major_emergency_brightness_mul var/matching = light && brightness_set == light.light_range && power_set == light.light_power && color_set == light.light_color +<<<<<<< HEAD if(!matching && (maploaded || instant)) // SKYRAT EDIT CHANGE - ORIGINAL: if(!matching) +======= + if(!matching) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switchcount++ if( prob( min(60, (switchcount**2)*0.01) ) ) if(trigger) @@ -276,6 +297,7 @@ l_power = power_set, l_color = color_set ) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START maploaded = FALSE if(play_sound) @@ -285,6 +307,8 @@ turning_on = TRUE addtimer(CALLBACK(src, PROC_REF(delayed_turn_on), trigger, play_sound, color_set, power_set, brightness_set), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER)) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE) && !turned_off()) use_power = IDLE_POWER_USE low_power_mode = TRUE @@ -296,6 +320,7 @@ update_current_power_usage() broken_sparks(start_only=TRUE) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - AESTHETICS #undef LIGHT_ON_DELAY_UPPER @@ -304,6 +329,8 @@ #undef NIGHTSHIFT_COLOR_MODIFIER // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/light/update_current_power_usage() if(!on && static_power_used > 0) //Light is off but still powered removeStaticPower(static_power_used, AREA_USAGE_STATIC_LIGHT) @@ -383,10 +410,15 @@ . += span_danger("The [fitting] has been smashed.") if(cell || has_mock_cell) . += span_notice("Its backup power charge meter reads [has_mock_cell ? 100 : round((cell.charge / cell.maxcharge) * 100, 0.1)]%.") +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(constant_flickering) . += span_danger("The lighting ballast appears to be damaged, this could be fixed with a multitool.") //SKYRAT EDIT END +======= + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // attack with item - insert light (if right type), otherwise try to break the light @@ -504,16 +536,23 @@ // if a light is turned off, it won't activate emergency power /obj/machinery/light/proc/turned_off() var/area/local_area = get_room_area() +<<<<<<< HEAD return !local_area.lightswitch && local_area.power_light || flickering || constant_flickering //SKYRAT EDIT CHANGE - ORIGINAL : return !local_area.lightswitch && local_area.power_light || flickering +======= + return !local_area.lightswitch && local_area.power_light || flickering +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // returns whether this light has power // true if area has power and lightswitch is on /obj/machinery/light/proc/has_power() var/area/local_area = get_room_area() +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(isnull(local_area)) return FALSE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return local_area.lightswitch && local_area.power_light // returns whether this light has emergency power @@ -555,13 +594,21 @@ if(status != LIGHT_OK || !has_power()) break on = !on +<<<<<<< HEAD update(FALSE, TRUE) //SKYRAT EDIT CHANGE +======= + update(FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sleep(rand(5, 15)) if(has_power()) on = (status == LIGHT_OK) else on = FALSE +<<<<<<< HEAD update(FALSE, TRUE) // SKYRAT EDIT CHANGE +======= + update(FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = TRUE //did we actually flicker? flickering = FALSE diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index 4c913019789..bae06b6e0cd 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -233,7 +233,11 @@ By design, d1 is the smallest direction and d2 is the highest return FALSE if(!user.is_holding(src)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 715a1a118c9..a47d4b9b979 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -246,7 +246,11 @@ data["current_heat"] = current_heat . = data +<<<<<<< HEAD /obj/machinery/power/port_gen/pacman/ui_act(action, params) +======= +/obj/machinery/power/port_gen/pacman/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm index d1118b929ed..b348cd10b14 100644 --- a/code/modules/power/power_store.dm +++ b/code/modules/power/power_store.dm @@ -305,19 +305,31 @@ if(stomach_cell.charge() > charge_limit) to_chat(H, span_warning("Your charge is full!")) return +<<<<<<< HEAD H.visible_message(span_notice("[user] hovers their fingers above [src], arcs forming from its surface!")) //SKYRAT EDIT CHANGE - Ethereal Rework 2024 - ORIGINAL: to_chat(H, span_notice("You begin clumsily channeling power from [src] into your body.")) +======= + to_chat(H, span_notice("You begin clumsily channeling power from [src] into your body.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stomach.drain_time = world.time + CELL_DRAIN_TIME while(do_after(user, CELL_DRAIN_TIME, target = src)) if((charge < CELL_POWER_DRAIN) || (stomach_cell.charge() > charge_limit)) return if(istype(stomach)) +<<<<<<< HEAD to_chat(H, span_purple("You receive some charge from [src], wasting some in the process.")) // SKYRAT EDIT CHANGE - Ethereal Rework 2024 - Original: to_chat(H, span_notice("You receive some charge from [src], wasting some in the process.")) +======= + to_chat(H, span_notice("You receive some charge from [src], wasting some in the process.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stomach.adjust_charge(CELL_POWER_GAIN) charge -= CELL_POWER_DRAIN //you waste way more than you receive, so that ethereals cant just steal one cell and forget about hunger else to_chat(H, span_warning("You can't receive charge from [src]!")) return +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stock_parts/power_store/blob_act(obj/structure/blob/B) SSexplosions.high_mov_atom += src diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 52f40537144..62249ca7c9f 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -3,7 +3,11 @@ /obj/machinery/field/containment name = "containment field" desc = "An energy field." +<<<<<<< HEAD icon = 'icons/obj/machines/engine/singularity.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/machines/engine/singularity.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "Contain_F" density = FALSE move_resist = INFINITY diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 414baedec34..39b6a97fbce 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,7 +1,11 @@ /obj/machinery/power/emitter name = "emitter" desc = "A heavy-duty industrial laser, often used in containment fields and power generation." +<<<<<<< HEAD icon = 'icons/obj/machines/engine/singularity.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/machines/engine/singularity.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "emitter" base_icon_state = "emitter" @@ -352,8 +356,11 @@ /obj/machinery/power/emitter/proc/integrate(obj/item/gun/energy/energy_gun, mob/user) if(!istype(energy_gun, /obj/item/gun/energy)) return +<<<<<<< HEAD if(istype(energy_gun, /obj/item/gun/energy/cell_loaded))//SKYRAT EDIT MEDIGUNS return //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.transferItemToLoc(energy_gun, src)) return gun = energy_gun @@ -423,7 +430,11 @@ . = ..() /obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/buckled_mob, mob/user, check_loc = TRUE) +<<<<<<< HEAD if(user.incapacitated() || !istype(user)) +======= + if(user.incapacitated || !istype(user)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return for(var/atom/movable/atom in get_turf(src)) if(atom.density && (atom != src && atom != buckled_mob)) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 73801e0d7d0..42394c7e21b 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -276,7 +276,11 @@ ///security level and shuttle lockdowns for [/proc/begin_the_end()] /proc/narsie_start_destroy_station() +<<<<<<< HEAD SSsecurity_level.set_level(SEC_LEVEL_GAMMA) //SKYRAT EDIT CHANGE - ALERTS - ORIGINAL "delta" +======= + SSsecurity_level.set_level(SEC_LEVEL_DELTA) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSshuttle.registerHostileEnvironment(GLOB.cult_narsie) SSshuttle.lockdown = TRUE addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_apocalypse)), 1 MINUTES) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index b37e81574ff..3dac3bbb838 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -69,6 +69,7 @@ var/max_charge = 0 var/new_charge = 0 for(var/datum/stock_part/capacitor/capacitor in component_parts) +<<<<<<< HEAD // SKYRAT EDIT CHANGE START - Original: power_coefficient += capacitor.tier switch(capacitor.tier) if(1) @@ -80,6 +81,9 @@ else power_coefficient = 8 // SKYRAT EDIT CHANGE END +======= + power_coefficient += capacitor.tier +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 input_level_max = initial(input_level_max) * power_coefficient output_level_max = initial(output_level_max) * power_coefficient for(var/obj/item/stock_parts/power_store/power_cell in component_parts) @@ -132,7 +136,11 @@ if(isnull(choice) \ || !user.is_holding(item) \ || !user.Adjacent(src) \ +<<<<<<< HEAD || user.incapacitated() \ +======= + || user.incapacitated \ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || !can_place_terminal(user, item, silent = TRUE) \ ) return @@ -377,7 +385,11 @@ ) return data +<<<<<<< HEAD /obj/machinery/power/smes/ui_act(action, params) +======= +/obj/machinery/power/smes/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -431,7 +443,10 @@ /obj/machinery/power/smes/proc/log_smes(mob/user) investigate_log("Input/Output: [input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"ON":"OFF"] | Input-mode: [input_attempt?"AUTO":"OFF"] by [user ? key_name(user) : "outside forces"]", INVESTIGATE_ENGINE) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/power/smes/emp_act(severity) . = ..() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 80280e4b45a..1cf2ee3a9c3 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -486,7 +486,11 @@ data["history"] = history return data +<<<<<<< HEAD /obj/machinery/power/solar_control/ui_act(action, params) +======= +/obj/machinery/power/solar_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index eb359c78a90..28aef8718b4 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -561,7 +561,10 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) final_countdown = TRUE +<<<<<<< HEAD SEND_GLOBAL_SIGNAL(COMSIG_MAIN_SM_DELAMINATING, final_countdown) // SKYRAT EDIT ADDITION - DELAM_SCRAM +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 notify_ghosts( "[src] has begun the delamination process!", source = src, @@ -1050,7 +1053,11 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /// Consume the santa hat and add it as an overlay /obj/machinery/power/supermatter_crystal/proc/holiday_item_interaction(source, mob/living/user, obj/item/item, list/modifiers) SIGNAL_HANDLER +<<<<<<< HEAD if(istype(item, /obj/item/clothing/head/costume/santa) || istype(item, /obj/item/clothing/head/costume/skyrat/christmas)) // SKYRAT EDIT CHANGE - Loadouts +======= + if(istype(item, /obj/item/clothing/head/costume/santa)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(item) RegisterSignal(src, COMSIG_ATOM_EXAMINE, PROC_REF(holiday_hat_examine)) if(istype(src, /obj/machinery/power/supermatter_crystal/shard)) diff --git a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm index 76249306571..c795895affc 100644 --- a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm +++ b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm @@ -37,8 +37,11 @@ GLOBAL_LIST_INIT(sm_delam_list, list( if(sm.damage <= sm.warning_point) // Damage is too low, lets not return FALSE +<<<<<<< HEAD notify_delam_suppression(sm) // SKYRAT EDIT ADDITION - DELAM_SCRAM +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (sm.damage >= sm.emergency_point && sm.damage_archived < sm.emergency_point) sm.investigate_log("has entered the emergency point.", INVESTIGATE_ENGINE) message_admins("[sm] has entered the emergency point [ADMIN_VERBOSEJMP(sm)].") @@ -57,6 +60,7 @@ GLOBAL_LIST_INIT(sm_delam_list, list( switch(sm.get_status()) if(SUPERMATTER_DELAMINATING) +<<<<<<< HEAD // SKYRAT EDIT ADDITION alert_sound_to_playing('modular_skyrat/master_files/sound/effects/reactor/meltdown.ogg', override_volume = TRUE) alert_sound_to_playing('sound/effects/alert.ogg', override_volume = TRUE) @@ -67,6 +71,10 @@ GLOBAL_LIST_INIT(sm_delam_list, list( alert_sound_to_playing('modular_skyrat/master_files/sound/effects/reactor/core_overheating.ogg', override_volume = TRUE) alert_sound_to_playing('sound/misc/notice1.ogg', override_volume = TRUE) // SKYRAT EDIT END +======= + playsound(sm, 'sound/misc/bloblarm.ogg', 100, FALSE, 40, 30, falloff_distance = 10) + if(SUPERMATTER_EMERGENCY) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(sm, 'sound/machines/engine_alert1.ogg', 100, FALSE, 30, 30, falloff_distance = 10) if(SUPERMATTER_DANGER) playsound(sm, 'sound/machines/engine_alert2.ogg', 100, FALSE, 30, 30, falloff_distance = 10) diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm index cbe3f3dab03..5d87e1476f9 100644 --- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm +++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm @@ -34,7 +34,17 @@ continue victim.playsound_local(victim_turf, 'sound/magic/charge.ogg') if(victim.z == 0) //victim is inside an object, this is to maintain an old bug turned feature with lockers n shit i guess. tg issue #69687 +<<<<<<< HEAD to_chat(victim, span_boldannounce("You hold onto \the [victim.loc] as hard as you can, as reality distorts around you. You feel safe.")) +======= + var/message = "" + var/location = victim.loc + if(istype(location, /obj/structure/disposalholder)) // sometimes your loc can be a disposalsholder when you're inside a disposals type, so let's just pass a message that makes sense. + message = "You hear a lot of rattling in the disposal pipes around you as reality itself distorts. Yet, you feel safe." + else + message = "You hold onto \the [victim.loc] as hard as you can, as reality distorts around you. You feel safe." + to_chat(victim, span_boldannounce(message)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(victim, span_boldannounce("You feel reality distort for a moment...")) if (isliving(victim)) @@ -134,7 +144,11 @@ priority_announce( text = "Fatal error occurred in emergency shuttle uplink during transit. Unable to reestablish connection.", title = "Shuttle Failure", +<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', +======= + sound = 'sound/misc/announce_dig.ogg', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index a3bdd2b55bd..87666b08ac8 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -42,7 +42,10 @@ return ITEM_INTERACT_BLOCKING return ..() +<<<<<<< HEAD /* SKYRAT EDIT CHANGE BEGIN - MOVED TO modular_skyrat/master_files/code/modules/power/tesla/coil.dm +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/power/energy_accumulator/tesla_coil/RefreshParts() . = ..() var/power_multiplier = 0 @@ -51,7 +54,10 @@ power_multiplier += capacitor.tier zap_cooldown -= (capacitor.tier * 20) input_power_multiplier = max(1 * (power_multiplier / 8), 0.25) //Max out at 50% efficency. +<<<<<<< HEAD */// SKYRAT EDIT CHANGE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/power/energy_accumulator/tesla_coil/examine(mob/user) . = ..() diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 0e41a7d6e86..3f8fa7fe82d 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -50,7 +50,11 @@ var/turf/spawned_turf = get_turf(src) message_admins("A tesla has been created at [ADMIN_VERBOSEJMP(spawned_turf)].") +<<<<<<< HEAD investigate_log("(tesla) was created at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE) +======= + investigate_log("was created at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/energy_ball/Destroy() if(orbiting && istype(orbiting.parent, /obj/energy_ball)) diff --git a/code/modules/power/thermoelectric_generator.dm b/code/modules/power/thermoelectric_generator.dm index e8e866a4443..8eabc0ca796 100644 --- a/code/modules/power/thermoelectric_generator.dm +++ b/code/modules/power/thermoelectric_generator.dm @@ -1,7 +1,10 @@ +<<<<<<< HEAD /* Skyrat removal START, moved to modular file +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TEG_EFFICIENCY 0.65 /obj/machinery/power/thermoelectric_generator @@ -224,6 +227,9 @@ Skyrat removal START, moved to modular file cold_circ = null #undef TEG_EFFICIENCY +<<<<<<< HEAD Skyrat removal END */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/power/turbine/turbine_computer.dm b/code/modules/power/turbine/turbine_computer.dm index f983e11c1f1..84ce8052ceb 100644 --- a/code/modules/power/turbine/turbine_computer.dm +++ b/code/modules/power/turbine/turbine_computer.dm @@ -68,7 +68,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/turbine_computer/ui_act(action, params) +======= +/obj/machinery/computer/turbine_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm index 1f5ac9a1df3..2104f1366b8 100644 --- a/code/modules/projectiles/ammunition/_firing.dm +++ b/code/modules/projectiles/ammunition/_firing.dm @@ -17,8 +17,12 @@ return FALSE AddComponent(/datum/component/pellet_cloud, projectile_type, pellets) +<<<<<<< HEAD //var/next_delay = click_cooldown_override || CLICK_CD_RANGE // ORIGINAL var/next_delay = click_cooldown_override || ((user.staminaloss <= STAMINA_THRESHOLD_TIRED_CLICK_CD) ? CLICK_CD_RANGE : CLICK_CD_RANGE_TIRED) // SKYRAT EDIT CHANGE +======= + var/next_delay = click_cooldown_override || CLICK_CD_RANGE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(user, TRAIT_DOUBLE_TAP)) next_delay = round(next_delay * 0.5) user.changeNext_move(next_delay) diff --git a/code/modules/projectiles/ammunition/energy/_energy.dm b/code/modules/projectiles/ammunition/energy/_energy.dm index 0d3e11ec51a..1f2e8a78ec7 100644 --- a/code/modules/projectiles/ammunition/energy/_energy.dm +++ b/code/modules/projectiles/ammunition/energy/_energy.dm @@ -8,4 +8,7 @@ var/select_name = CALIBER_ENERGY fire_sound = 'sound/weapons/laser.ogg' firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red +<<<<<<< HEAD var/select_color = FALSE //SKYRAT EDIT ADDITION - This is the color that shows up when selecting an ammo type. Disabled by default +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 954e4d52793..b0452e24672 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -194,6 +194,10 @@ desc = "[initial(desc)] There [(shells_left == 1) ? "is" : "are"] [shells_left] [casing_phrasing]\s left!" /obj/item/ammo_box/update_icon_state() +<<<<<<< HEAD +======= + . = ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/shells_left = LAZYLEN(stored_ammo) switch(multiple_sprites) if(AMMO_BOX_PER_BULLET) @@ -201,6 +205,7 @@ if(AMMO_BOX_FULL_EMPTY) icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left ? "full" : "empty"]" +<<<<<<< HEAD if(ammo_band_color && ammo_band_icon) update_ammo_band() @@ -208,13 +213,25 @@ /obj/item/ammo_box/proc/update_ammo_band() overlays.Cut() +======= +/obj/item/ammo_box/update_overlays() + . = ..() + if(ammo_band_color && ammo_band_icon) + . += update_ammo_band() + +/obj/item/ammo_box/proc/update_ammo_band() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/band_icon = ammo_band_icon if(!(length(stored_ammo)) && ammo_band_icon_empty) band_icon = ammo_band_icon_empty var/image/ammo_band_image = image(icon, src, band_icon) ammo_band_image.color = ammo_band_color ammo_band_image.appearance_flags = RESET_COLOR|KEEP_APART +<<<<<<< HEAD overlays += ammo_band_image +======= + return ammo_band_image +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Count of number of bullets in the magazine /obj/item/ammo_box/magazine/proc/ammo_count(countempties = TRUE) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 1fb6cbbf94d..bbd89389eb8 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -4,6 +4,7 @@ icon_state = "357" ammo_type = /obj/item/ammo_casing/a357 max_ammo = 7 + caliber = CALIBER_357 multiple_sprites = AMMO_BOX_PER_BULLET item_flags = NO_MAT_REDEMPTION ammo_band_icon = "+357_ammo_band" @@ -35,6 +36,7 @@ icon_state = "38" ammo_type = /obj/item/ammo_casing/c38 max_ammo = 6 + caliber = CALIBER_38 multiple_sprites = AMMO_BOX_PER_BULLET custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*10) ammo_band_icon = "+38_ammo_band" diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm index b092e207c10..92ac1a846c2 100644 --- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm @@ -60,5 +60,9 @@ /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie max_ammo = 3 caliber = CALIBER_REBAR_SYNDIE +<<<<<<< HEAD ammo_type = /obj/item/ammo_casing/rebar +======= + ammo_type = /obj/item/ammo_casing/rebar/syndie +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 5293a1220e0..4d476a6ddaf 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -45,7 +45,11 @@ var/weapon_weight = WEAPON_LIGHT var/dual_wield_spread = 24 //additional spread when dual wielding ///Can we hold up our target with this? Default to yes +<<<<<<< HEAD var/can_hold_up = FALSE // SKYRAT EDIT - DISABLED ORIGINAL: TRUE +======= + var/can_hold_up = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Just 'slightly' snowflakey way to modify projectile damage for projectiles fired from this gun. var/projectile_damage_multiplier = 1 @@ -77,8 +81,11 @@ pin = new pin(src) add_seclight_point() +<<<<<<< HEAD give_gun_safeties() // SKYRAT EDIT ADDITION - GUN SAFETIES give_manufacturer_examine() // SKYRAT EDIT ADDITON - MANUFACTURER EXAMINE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_bayonet_point() /obj/item/gun/Destroy() diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 0763a22f8a4..55938cec48a 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -7,6 +7,10 @@ w_class = WEIGHT_CLASS_NORMAL pickup_sound = 'sound/items/gun_pick_up.ogg' drop_sound = 'sound/items/gun_drop.ogg' +<<<<<<< HEAD +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///sound when inserting magazine var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg' @@ -396,7 +400,10 @@ if (display_message) balloon_alert(user, "[magazine_wording] unloaded") update_appearance() +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/can_shoot() return chambered?.loaded_projectile @@ -430,11 +437,18 @@ chambered = null var/num_loaded = magazine?.attackby(A, user, params, TRUE) if (num_loaded) +<<<<<<< HEAD handle_box_reload(user, A, num_loaded) // SKYRAT EDIT CHANGE - ORIGINAL: balloon_alert(user, "[num_loaded] [cartridge_wording]\s loaded") playsound(src, load_sound, load_sound_volume, load_sound_vary) if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT) chamber_round() SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) // SKYRAT EDIT ADDITION - this is normally done by handle_magazine which does not get called so we have to do it manually here +======= + balloon_alert(user, "[num_loaded] [cartridge_wording]\s loaded") + playsound(src, load_sound, load_sound_volume, load_sound_vary) + if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT) + chamber_round() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A.update_appearance() update_appearance() return @@ -561,7 +575,10 @@ SSblackbox.record_feedback("tally", "station_mess_created", 1, CB.name) if (num_unloaded) balloon_alert(user, "[num_unloaded] [cartridge_wording]\s unloaded") +<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) // SKYRAT EDIT ADDITION - this is normally handled by eject_magazine() but internal magazines are a special case +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(user, eject_sound, eject_sound_volume, eject_sound_vary) update_appearance() else diff --git a/code/modules/projectiles/guns/ballistic/bows/_bow.dm b/code/modules/projectiles/guns/ballistic/bows/_bow.dm index 358e87929e2..901eb4e636c 100644 --- a/code/modules/projectiles/guns/ballistic/bows/_bow.dm +++ b/code/modules/projectiles/guns/ballistic/bows/_bow.dm @@ -32,6 +32,7 @@ /obj/item/gun/ballistic/bow/update_overlays() . = ..() if(chambered) +<<<<<<< HEAD // . += "[chambered.base_icon_state][drawn ? "_drawn" : ""]" SKYRAT EDIT REMOVAL // SKYRAT EDIT START var/icon_state = icon_exists(/obj/item/gun/ballistic/bow::icon, chambered.base_icon_state) ? chambered.base_icon_state : "arrow" @@ -39,6 +40,9 @@ icon_state += "_drawn" . += icon(/obj/item/gun/ballistic/bow::icon, icon_state) // SKYRAT EDIT END +======= + . += "[chambered.base_icon_state][drawn ? "_drawn" : ""]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/bow/click_alt(mob/user) if(isnull(chambered)) diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm index 4f5a01b1ebd..6cd688584ac 100644 --- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm +++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm @@ -21,7 +21,11 @@ /obj/item/ammo_casing/arrow/update_icon_state() . = ..() +<<<<<<< HEAD icon_state = "[initial(icon_state)]" //SKYRAT EDIT: Original: icon_state = "[base_icon_state]" +======= + icon_state = "[base_icon_state]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///base arrow projectile /obj/projectile/bullet/arrow diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm index cc6bfbb6477..c5c105cef01 100644 --- a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm +++ b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm @@ -21,7 +21,11 @@ slot_flags = ITEM_SLOT_BACK obj_flags = UNIQUE_RENAME accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/holy +<<<<<<< HEAD //projectile_damage_multiplier = 0.4 // SKYRAT EDIT REMOVAL +======= + projectile_damage_multiplier = 0.4 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/ammo_box/magazine/internal/bow/holy name = "divine bowstring" diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 6d272dce34e..67d3e7210d3 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -1,7 +1,11 @@ /obj/item/gun/ballistic/automatic/pistol name = "\improper Makarov pistol" +<<<<<<< HEAD // desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Original desc = "A small, easily concealable 9x25mm Mk.12 handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Calibre rename +======= + desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "pistol" w_class = WEIGHT_CLASS_SMALL accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm @@ -104,7 +108,11 @@ simulated_hit.firer = throwingdatum.get_thrower() simulated_hit.on_hit(hit_atom) +<<<<<<< HEAD /obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= +/obj/item/gun/ballistic/automatic/pistol/m1911 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "\improper M1911" desc = "A classic .45 handgun with a small magazine capacity." icon_state = "m1911" @@ -184,9 +192,27 @@ actions_types = list(/datum/action/item_action/toggle_firemode) obj_flags = UNIQUE_RENAME // if you did the sidequest, you get the customization +/obj/item/gun/ballistic/automatic/pistol/deagle/regal + name = "\improper Regal Condor" + desc = "Unlike the Desert Eagle, this weapon seems to utilize some kind of advanced internal stabilization system to significantly \ + reduce felt recoil and increase overall accuracy, at the cost of using a smaller caliber. \ + This does allow it to fire a very quick 2-round burst. Uses 10mm ammo." + icon_state = "reagle" + inhand_icon_state = "deagleg" + burst_size = 2 + fire_delay = 1 + projectile_damage_multiplier = 1.25 + accepted_magazine_type = /obj/item/ammo_box/magazine/r10mm + actions_types = list(/datum/action/item_action/toggle_firemode) + obj_flags = UNIQUE_RENAME // if you did the sidequest, you get the customization + /obj/item/gun/ballistic/automatic/pistol/aps name = "\improper Stechkin APS machine pistol" +<<<<<<< HEAD desc = "A modernized reproduction of an old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." //SKYRAT EDIT +======= + desc = "An old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "aps" w_class = WEIGHT_CLASS_NORMAL accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm_aps diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 5ddca6d96bb..e32d6f21d97 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -201,10 +201,16 @@ inhand_icon_state = "rebarxbow" worn_icon_state = "rebarxbow" rack_sound = 'sound/weapons/gun/sniper/rack.ogg' +<<<<<<< HEAD must_hold_to_load = TRUE mag_display = FALSE empty_indicator = TRUE bolt_type = BOLT_TYPE_LOCKING +======= + mag_display = FALSE + empty_indicator = TRUE + bolt_type = BOLT_TYPE_OPEN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 semi_auto = FALSE internal_magazine = TRUE can_modify_ammo = FALSE @@ -249,10 +255,28 @@ return FALSE return ..() +<<<<<<< HEAD +======= +/obj/item/gun/ballistic/rifle/rebarxbow/shoot_with_empty_chamber(mob/living/user) + if(chambered || !magazine || !length(magazine.contents)) + return ..() + drop_bolt(user) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/rifle/rebarxbow/examine(mob/user) . = ..() . += "The crossbow is [bolt_locked ? "not ready" : "ready"] to fire." +<<<<<<< HEAD +======= +/obj/item/gun/ballistic/rifle/rebarxbow/update_overlays() + . = ..() + if(!magazine) + . += "[initial(icon_state)]" + "_empty" + if(!bolt_locked) + . += "[initial(icon_state)]" + "_bolt_locked" + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/rifle/rebarxbow/forced name = "Stressed Rebar Crossbow" desc = "Some idiot decided that they would risk shooting themselves in the face if it meant they could have a draw this crossbow a bit faster. Hopefully, it was worth it." diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 8ae17298afe..98ed42901d4 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -157,7 +157,11 @@ accepted_magazine_type = /obj/item/ammo_box/magazine/m12g can_suppress = FALSE burst_size = 2 +<<<<<<< HEAD fire_delay = 10 //Skyrat edit - Original: 1 +======= + fire_delay = 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pin = /obj/item/firing_pin/implant/pindicate fire_sound = 'sound/weapons/gun/shotgun/shot_alt.ogg' actions_types = list(/datum/action/item_action/toggle_firemode) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index e3b7cc44d59..d058fc9b673 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -5,6 +5,10 @@ icon = 'icons/obj/weapons/guns/energy.dmi' pickup_sound = 'sound/items/gun_pick_up.ogg' drop_sound = 'sound/items/gun_drop.ogg' +<<<<<<< HEAD +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// What type of power cell this uses var/obj/item/stock_parts/power_store/cell @@ -246,13 +250,20 @@ if(!skip_worn_icon) worn_icon_state = temp_icon_to_use return ..() +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/energy/update_overlays() . = ..() // SKYRAT EDIT START if(!automatic_charge_overlays || !cell) return +<<<<<<< HEAD // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/overlay_icon_state = "[icon_state]_charge" if(modifystate) diff --git a/code/modules/projectiles/guns/energy/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm index c9550e0fc2d..fb21cde100b 100644 --- a/code/modules/projectiles/guns/energy/beam_rifle.dm +++ b/code/modules/projectiles/guns/energy/beam_rifle.dm @@ -52,7 +52,10 @@ hitscan = TRUE tracer_type = /obj/effect/projectile/tracer/tracer/beam_rifle +<<<<<<< HEAD /* SKYRAT EDIT REMOVE - God +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/beam/event_horizon/on_hit(atom/target, blocked, pierce_hit) . = ..() @@ -63,4 +66,7 @@ var/obj/reality_tear/temporary/tear = new(rift_loc) tear.start_disaster() message_admins("[ADMIN_LOOKUPFLW(target)] has been hit by an anti-existential beam at [ADMIN_VERBOSEJMP(rift_loc)], creating a singularity.") +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index ba6849cb2ff..b18fc6fddd5 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -123,7 +123,11 @@ /obj/item/gun/energy/recharge/kinetic_accelerator/proc/check_menu(mob/living/carbon/human/user) if(!istype(user)) return FALSE +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -157,10 +161,17 @@ modkit_upgrade.modify_projectile(kinetic_projectile) /obj/item/gun/energy/recharge/kinetic_accelerator/cyborg +<<<<<<< HEAD icon_state = "kineticgun" // SKYRAT EDIT CHANGE holds_charge = TRUE unique_frequency = TRUE max_mod_capacity = 100 // SKYRAT EDIT CHANGE FROM 90 - Balance due to fauna changes and no level perks applying +======= + icon_state = "kineticgun_b" + holds_charge = TRUE + unique_frequency = TRUE + max_mod_capacity = 90 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/energy/recharge/kinetic_accelerator/minebot trigger_guard = TRIGGER_GUARD_ALLOW_ALL diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 1183cbfe653..43c9f428583 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -136,7 +136,11 @@ /obj/projectile/magic/antimagic, /obj/projectile/magic/arcane_barrage, /obj/projectile/magic/bounty, +<<<<<<< HEAD ///obj/projectile/magic/change, //SKYRAT EDIT REMOVAL +======= + /obj/projectile/magic/change, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/magic/death, /obj/projectile/magic/door, /obj/projectile/magic/fetch, diff --git a/code/modules/projectiles/guns/special/meat_hook.dm b/code/modules/projectiles/guns/special/meat_hook.dm index cfa932a6541..5852129bdb7 100644 --- a/code/modules/projectiles/guns/special/meat_hook.dm +++ b/code/modules/projectiles/guns/special/meat_hook.dm @@ -59,11 +59,18 @@ hitsound = 'sound/effects/splat.ogg' /// The chain we send out while we are in motion, referred to as "initial" to not get confused with the chain we use to reel the victim in. var/datum/beam/initial_chain +<<<<<<< HEAD var/chain_icon = 'icons/effects/beam.dmi' // SKYRAT EDIT ADDITION /obj/projectile/hook/fire(setAngle) if(firer) initial_chain = firer.Beam(src, icon_state = "chain", icon = chain_icon, emissive = FALSE) // SKYRAT EDIT CHANGE - Adds icon arg - ORIGINAL: chain = firer.Beam(src, icon_state = "chain", emissive = FALSE) +======= + +/obj/projectile/hook/fire(setAngle) + if(firer) + initial_chain = firer.Beam(src, icon_state = "chain", emissive = FALSE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(firer, TRAIT_IMMOBILIZED, REF(src)) addtimer(TRAIT_CALLBACK_REMOVE(firer, TRAIT_IMMOBILIZED, REF(src)), IMMOBILIZATION_TIMER) // safety if we miss, if we get a hit we stay immobilized return ..() diff --git a/code/modules/projectiles/guns/special/syringe_gun.dm b/code/modules/projectiles/guns/special/syringe_gun.dm index caa51c59053..a3530a514e4 100644 --- a/code/modules/projectiles/guns/special/syringe_gun.dm +++ b/code/modules/projectiles/guns/special/syringe_gun.dm @@ -46,12 +46,16 @@ /obj/item/gun/syringe/recharge_newshot() if(!syringes.len) return +<<<<<<< HEAD //SKYRAT EDIT SMARTDARTS if(istype(syringes[length(syringes)], /obj/item/reagent_containers/syringe/smartdart)) chambered.newshot(/obj/projectile/bullet/dart/syringe/dart) else chambered.newshot() //SKYRAT EDIT SMARTDARTS END +======= + chambered.newshot() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/syringe/can_shoot() return syringes.len diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index f41bccb5fa8..becf252d324 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -1,3 +1,7 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MOVES_HITSCAN -1 //Not actually hitscan but close as we get without actual hitscan. #define MUZZLE_EFFECT_PIXEL_INCREMENT 17 //How many pixels to move the muzzle flash up so your character doesn't look like they're shitting out lasers. #define MAX_RANGE_HIT_PRONE_TARGETS 10 //How far do the projectile hits the prone mob @@ -208,11 +212,19 @@ var/wound_falloff_tile ///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes var/embed_falloff_tile +<<<<<<< HEAD var/static/list/projectile_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered)) // SKYRAT EDIT ADDITION START /// If this should be able to hit the target even on direct firing when `ignored_factions` applies var/ignore_direct_target = FALSE // SKYRAT EDIT ADDITION END +======= + ///How much accuracy is lost for each tile travelled + var/accuracy_falloff = 7 + ///How much accuracy before falloff starts to matter. Formula is range - falloff * tiles travelled + var/accurate_range = 100 + var/static/list/projectile_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// If true directly targeted turfs can be hit var/can_hit_turfs = FALSE @@ -308,11 +320,16 @@ playsound(src, get_sfx_skyrat(impact_sound), vol_by_damage(), TRUE, -1) // SKYRAT EDIT ADDITION END +<<<<<<< HEAD if(isturf(target_turf) && hitsound_wall) +======= + if(isturf(target) && hitsound_wall) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/volume = clamp(vol_by_damage() + 20, 0, 100) if(suppressed) volume = 5 playsound(loc, hitsound_wall, volume, TRUE, -1) +<<<<<<< HEAD if(damage > 0 && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_turf) && prob(75)) @@ -320,6 +337,14 @@ if(impact_effect_type && !hitscan) new impact_effect_type(target_wall, hitx, hity) +======= + + if(damage > 0 && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_turf) && prob(75)) + var/turf/closed/wall/target_wall = target_turf + if(impact_effect_type && !hitscan) + new impact_effect_type(target_wall, hitx, hity) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target_wall.add_dent(WALL_DENT_SHOT, hitx, hity) return BULLET_ACT_HIT @@ -327,6 +352,7 @@ if(!isliving(target)) if(impact_effect_type && !hitscan) new impact_effect_type(target_turf, hitx, hity) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - IMPACT SOUNDS if(isturf(target) && hitsound_wall) var/volume = clamp(vol_by_damage() + 20, 0, 100) @@ -335,6 +361,8 @@ playsound(loc, hitsound_wall, volume, TRUE, -1) SKYRAT EDIT REMOVAL END */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return BULLET_ACT_HIT @@ -368,16 +396,25 @@ if(hit_limb_zone) organ_hit_text = " in \the [living_target.parse_zone_with_bodypart(hit_limb_zone)]" if(suppressed == SUPPRESSED_VERY) +<<<<<<< HEAD //playsound(loc, hitsound, 5, TRUE, -1) SKYRAT EDIT REMOVAL - IMPACT SOUNDS else if(suppressed) //playsound(loc, hitsound, 5, TRUE, -1) SKYRAT EDIT REMOVAL - IMPACT SOUNDS +======= + playsound(loc, hitsound, 5, TRUE, -1) + else if(suppressed) + playsound(loc, hitsound, 5, TRUE, -1) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(living_target, span_userdanger("You're shot by \a [src][organ_hit_text]!")) else /* SKYRAT EDIT REMOVAL - IMPACT SOUNDS if(hitsound) var/volume = vol_by_damage() playsound(src, hitsound, volume, TRUE, -1) +<<<<<<< HEAD SKYRAT EDIT REMOVAL END */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 living_target.visible_message(span_danger("[living_target] is hit by \a [src][organ_hit_text]!"), \ span_userdanger("You're hit by \a [src][organ_hit_text]!"), null, COMBAT_MESSAGE_RANGE) if(living_target.is_blind()) @@ -475,9 +512,14 @@ store_hitscan_collision(point_cache) return TRUE +<<<<<<< HEAD if(!HAS_TRAIT(src, TRAIT_ALWAYS_HIT_ZONE)) var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use. +======= + var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. + def_zone = ran_zone(def_zone, clamp(accurate_range - (accuracy_falloff * distance), 5, 100)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return process_hit(T, select_target(T, A, A), A) // SELECT TARGET FIRST! @@ -594,12 +636,22 @@ if((target.pass_flags_self & pass_flags) && !direct_target) return FALSE if(HAS_TRAIT(target, TRAIT_UNHITTABLE_BY_PROJECTILES)) +<<<<<<< HEAD +======= + if(!HAS_TRAIT(target, TRAIT_BLOCKING_PROJECTILES) && isliving(target)) + var/mob/living/living_target = target + living_target.block_projectile_effects() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!ignore_source_check && firer) var/mob/M = firer if((target == firer) || ((target == firer.loc) && ismecha(firer.loc)) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target))) return FALSE +<<<<<<< HEAD if(ignored_factions?.len && ismob(target) && (!direct_target || ignore_direct_target)) //SKYRAT EDIT: ignore_direct_target +======= + if(ignored_factions?.len && ismob(target) && !direct_target) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/target_mob = target if(faction_check(target_mob.faction, ignored_factions)) return FALSE diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 6364afab811..c3bf0064ab8 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -2,7 +2,11 @@ name = "laser" icon_state = "laser" pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE +<<<<<<< HEAD damage = 25 +======= + damage = 20 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 damage_type = BURN hitsound = 'sound/weapons/sear.ogg' hitsound_wall = 'sound/weapons/effects/searwall.ogg' diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 6f14df2f4c8..77de46e53d7 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -140,6 +140,7 @@ /obj/projectile/bullet/rebar/hydrogen name = "metallic hydrogen bolt" icon_state = "rebar_hydrogen" +<<<<<<< HEAD damage = 40 speed = 0.6 dismemberment = 0 //goes through clean. @@ -161,6 +162,40 @@ pain_mult = 4 jostle_pain_mult = 2 rip_time =18 +======= + damage = 55 + speed = 0.6 + projectile_piercing = PASSMOB|PASSVEHICLE + projectile_phasing = ~(PASSMOB|PASSVEHICLE) + phasing_ignore_direct_target = TRUE + dismemberment = 0 //goes through clean. + damage_type = BRUTE + armour_penetration = 30 //very pointy. + wound_bonus = -15 + bare_wound_bonus = 10 + shrapnel_type = /obj/item/ammo_casing/rebar/hydrogen + embed_type = /datum/embed_data/rebar_hydrogen + embed_falloff_tile = -3 + shrapnel_type = /obj/item/ammo_casing/rebar/hydrogen + accurate_range = 205 //15 tiles before falloff starts to kick in + +/obj/projectile/bullet/rebar/hydrogen/Impact(atom/A) + . = ..() + def_zone = ran_zone(def_zone, clamp(205-(7*get_dist(get_turf(A), starting)), 5, 100)) + +/datum/embed_data/rebar_hydrogen + embed_chance = 0 + +/obj/projectile/bullet/rebar/hydrogen/on_hit(atom/target, blocked, pierce_hit) + if(isAI(target)) + return BULLET_ACT_FORCE_PIERCE + return ..() + +/obj/projectile/bullet/rebar/hydrogen/process_hit(turf/T, atom/target, atom/bumped, hit_something) + . = ..() + if(pierces >= 3) + qdel(src) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/bullet/rebar/healium name = "healium bolt" diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index 5543b11d115..2ac1a93c78c 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -2,7 +2,10 @@ name = "electrode" icon_state = "spark" color = COLOR_YELLOW +<<<<<<< HEAD stamina = 70 // SKYRAT EDIT CHANGE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 paralyze = 10 SECONDS stutter = 10 SECONDS jitter = 40 SECONDS @@ -19,7 +22,10 @@ do_sparks(1, TRUE, src) else if(iscarbon(target)) var/mob/living/carbon/C = target +<<<<<<< HEAD C.adjust_confusion_up_to(15 SECONDS, 30 SECONDS) // SKYRAT EDIT ADDITION - Electrode jitteriness +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 C.add_mood_event("tased", /datum/mood_event/tased) SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK) if(HAS_TRAIT(C, TRAIT_HULK)) diff --git a/code/modules/projectiles/projectile/special/curse.dm b/code/modules/projectiles/projectile/special/curse.dm index 03b2e0feb53..040e9f805f7 100644 --- a/code/modules/projectiles/projectile/special/curse.dm +++ b/code/modules/projectiles/projectile/special/curse.dm @@ -72,3 +72,7 @@ speed = 1 range = 20 color = "#ff7e7e"//Tint it slightly +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm index af3c11ce210..cbc9be1d401 100644 --- a/code/modules/reagents/chem_splash.dm +++ b/code/modules/reagents/chem_splash.dm @@ -112,8 +112,11 @@ var/distance = max(1, get_dist(thing, epicenter)) var/fraction = 0.5 / (2 ** distance) //50/25/12/6... for a 200u splash, 25/12/6/3... for a 100u, 12/6/3/1 for a 50u source.expose(thing, TOUCH, fraction) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Liquids if(isturf(epicenter)) var/turf/center_of_mess = epicenter center_of_mess.add_liquid_from_reagents(source) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/reagents/chemistry/holder/mob_life.dm b/code/modules/reagents/chemistry/holder/mob_life.dm index 0692d166d2c..0a354a22790 100644 --- a/code/modules/reagents/chemistry/holder/mob_life.dm +++ b/code/modules/reagents/chemistry/holder/mob_life.dm @@ -57,6 +57,7 @@ if(!owner) owner = reagent.holder.my_atom +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION var/can_process = reagent_process_flags_valid(owner, reagent) //If the mob can't process it, remove the reagent at it's normal rate without doing any addictions, overdoses, or on_mob_life() for the reagent @@ -65,6 +66,8 @@ return //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(owner && reagent && (!dead || (reagent.chemical_flags & REAGENT_DEAD_PROCESS))) if(owner.reagent_check(reagent, seconds_per_tick, times_fired)) return diff --git a/code/modules/reagents/chemistry/holder/reactions.dm b/code/modules/reagents/chemistry/holder/reactions.dm index ebb3c0c10e9..e4fad9b8c28 100644 --- a/code/modules/reagents/chemistry/holder/reactions.dm +++ b/code/modules/reagents/chemistry/holder/reactions.dm @@ -213,6 +213,7 @@ var/reaction_message = equilibrium.reaction.mix_message if(equilibrium.reaction.mix_sound) playsound(get_turf(my_atom), equilibrium.reaction.mix_sound, 80, TRUE) +<<<<<<< HEAD //SKYRAT EDIT ADDITION //If the reaction pollutes, pollute it here if we have an atom if(equilibrium.reaction.pollutant_type && my_atom) @@ -220,6 +221,8 @@ if(my_turf) // reactions can happen in nullspace (like inside of a mob's stomach for instance). my_turf.pollute_turf(equilibrium.reaction.pollutant_type, equilibrium.reaction.pollutant_amount * equilibrium.reacted_vol) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(equilibrium) update_total() SEND_SIGNAL(src, COMSIG_REAGENTS_REACTED, .) @@ -348,6 +351,7 @@ extract.desc = "This extract has been used up." extract.grind_results.Cut() +<<<<<<< HEAD //SKYRAT EDIT ADDITION //If the reaction pollutes, pollute it here if we have an atom if(selected_reaction.pollutant_type && my_atom) @@ -356,5 +360,7 @@ my_turf.pollute_turf(selected_reaction.pollutant_type, selected_reaction.pollutant_amount * multiplier) //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //finish the reaction selected_reaction.on_reaction(src, null, multiplier) diff --git a/code/modules/reagents/chemistry/holder/ui_data.dm b/code/modules/reagents/chemistry/holder/ui_data.dm index 97820c2fd6c..3b5f0ee0a14 100644 --- a/code/modules/reagents/chemistry/holder/ui_data.dm +++ b/code/modules/reagents/chemistry/holder/ui_data.dm @@ -297,7 +297,11 @@ var/datum/chemical_reaction/reaction = sub_reactions[ui_reaction_index] return reaction.type +<<<<<<< HEAD /datum/reagents/ui_act(action, params) +======= +/datum/reagents/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 0d5fbeb18b6..579b6521b09 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -34,6 +34,7 @@ var/obj/item/reagent_containers/beaker = null /// Dispensable_reagents is copypasted in plumbing synthesizers. Please update accordingly. (I didn't make it global because that would limit custom chem dispensers) var/list/dispensable_reagents = list() +<<<<<<< HEAD /// These become available once the manipulator has been upgraded to tier 2 (nano) // SKYRAT EDIT CHANGE - ORIGINAL: /// These become available once the manipulator has been upgraded to tier 4 (femto) var/list/upgrade_reagents = list() // SKYRAT EDIT ADDITION BEGIN @@ -42,6 +43,10 @@ /// These become available once the manipulator has been upgraded to tier 4 (femto) var/list/upgrade3_reagents = list() // SKYRAT EDIT ADDITION END +======= + /// These become available once the manipulator has been upgraded to tier 4 (femto) + var/list/upgrade_reagents = list() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// These become available once the machine has been emaged var/list/emagged_reagents = list() /// Starting purity of the created reagents @@ -50,12 +55,15 @@ var/list/recording_recipe /// Saves all the recipes recorded by the machine var/list/saved_recipes = list() +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN /// Used for custom transfer amounts var/list/transferAmounts = list() /// The custom transfer amount var/customTransferAmount // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default list of dispensable_reagents var/static/list/default_dispensable_reagents = list( @@ -85,9 +93,12 @@ /datum/reagent/water, /datum/reagent/fuel, ) +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - ORIGINAL /* +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default list of reagents upgrade_reagents var/static/list/default_upgrade_reagents = list( /datum/reagent/acetone, @@ -105,6 +116,7 @@ /datum/reagent/drug/space_drugs, /datum/reagent/toxin ) +<<<<<<< HEAD */ var/static/list/default_upgrade_reagents = list( /datum/reagent/fuel/oil, @@ -139,10 +151,19 @@ if(dispensable_reagents) dispensable_reagents = sort_list(dispensable_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) +======= +/obj/machinery/chem_dispenser/Initialize(mapload) + if(dispensable_reagents != null && !dispensable_reagents.len) + dispensable_reagents = default_dispensable_reagents + if(dispensable_reagents) + dispensable_reagents = sort_list(dispensable_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(upgrade_reagents != null && !upgrade_reagents.len) upgrade_reagents = default_upgrade_reagents if(upgrade_reagents) upgrade_reagents = sort_list(upgrade_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(upgrade2_reagents != null && !upgrade2_reagents.len) upgrade2_reagents = default_upgrade2_reagents @@ -153,6 +174,8 @@ if(upgrade3_reagents) upgrade3_reagents = sort_list(upgrade3_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(emagged_reagents != null && !emagged_reagents.len) emagged_reagents = default_emagged_reagents @@ -420,6 +443,7 @@ if(is_operational) recording_recipe = null return TRUE +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CHEMISTRY QOL if("custom_amount") if(!beaker) @@ -431,6 +455,8 @@ transferAmounts += customTransferAmount return TRUE //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("reaction_lookup") if(beaker) @@ -463,12 +489,15 @@ /obj/machinery/chem_dispenser/item_interaction(mob/living/user, obj/item/tool, list/modifiers) if(is_reagent_container(tool) && !(tool.item_flags & ABSTRACT) && tool.is_open_container()) +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - CHEMISTRY QOL var/obj/item/reagent_containers/container = tool if(customTransferAmount) transferAmounts -= customTransferAmount transferAmounts = container.possible_transfer_amounts //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.transferItemToLoc(tool, src)) return ITEM_INTERACT_BLOCKING replace_beaker(user, tool) @@ -514,11 +543,15 @@ recharge_amount *= capacitor.tier parts_rating += capacitor.tier for(var/datum/stock_part/servo/servo in component_parts) +<<<<<<< HEAD /* SKYRAT EDIT - ORIGINAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (servo.tier > 3) dispensable_reagents |= upgrade_reagents else dispensable_reagents -= upgrade_reagents +<<<<<<< HEAD */ //SKYRAT EDIT START if (servo.tier > 1) @@ -536,6 +569,8 @@ else dispensable_reagents -= upgrade3_reagents //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts_rating += servo.tier power_cost = max(new_power_cost, 0.1 KILO WATTS) @@ -616,6 +651,7 @@ /datum/reagent/consumable/tonic, /datum/reagent/water, ) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN var/static/list/drink_upgrade_reagents = list( /datum/reagent/consumable/applejuice, @@ -633,6 +669,8 @@ /datum/reagent/consumable/sol_dry ) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 upgrade_reagents = null /// The default list of emagged reagents dispensable by the soda dispenser var/static/list/drink_emagged_reagents = list( @@ -648,6 +686,7 @@ dispensable_reagents = drinks_dispensable_reagents if(emagged_reagents != null && !emagged_reagents.len) emagged_reagents = drink_emagged_reagents +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(upgrade_reagents != null && !upgrade_reagents.len) upgrade_reagents = drink_upgrade_reagents @@ -662,6 +701,8 @@ if(upgrade3_reagents) upgrade3_reagents = sort_list(upgrade3_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() AddComponent(/datum/component/simple_rotation) @@ -725,7 +766,10 @@ /datum/reagent/consumable/ethanol/rice_beer, /datum/reagent/consumable/ethanol/rum, /datum/reagent/consumable/ethanol/sake, +<<<<<<< HEAD /datum/reagent/consumable/ethanol/synthanol, // SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/tequila, /datum/reagent/consumable/ethanol/triple_sec, /datum/reagent/consumable/ethanol/vermouth, @@ -735,8 +779,11 @@ /datum/reagent/consumable/ethanol/yuyake, ) upgrade_reagents = null +<<<<<<< HEAD upgrade2_reagents = null //SKYRAT EDIT upgrade3_reagents = null //SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default list of emagged reagents dispensable by the beer dispenser var/static/list/beer_emagged_reagents = list( /datum/reagent/consumable/ethanol, diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 51adc8d68a5..1ffee0555eb 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -128,12 +128,15 @@ if(!isnull(filling)) . += filling +<<<<<<< HEAD /obj/machinery/chem_master/wrench_act(mob/living/user, obj/item/tool) //SKYRAT ADDITION START if(default_unfasten_wrench(user, tool) == SUCCESSFUL_UNFASTEN) return ITEM_INTERACT_SUCCESS return ITEM_INTERACT_BLOCKING //SKYRAT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/chem_master/Exited(atom/movable/gone, direction) . = ..() if(gone == beaker) @@ -168,8 +171,11 @@ CAT_TUBES = GLOB.reagent_containers[CAT_TUBES], CAT_PILLS = GLOB.reagent_containers[CAT_PILLS], CAT_PATCHES = GLOB.reagent_containers[CAT_PATCHES], +<<<<<<< HEAD CAT_HYPOS = GLOB.reagent_containers[CAT_HYPOS], // SKYRAT EDIT CAT_DARTS = GLOB.reagent_containers[CAT_DARTS], // SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) return containers @@ -482,10 +488,13 @@ item_name_default = "[master_reagent.name] [item_name_default]" if(!(initial(selected_container.reagent_flags) & OPENCONTAINER)) // Closed containers get both reagent name and units in the name item_name_default = "[master_reagent.name] [item_name_default] ([volume_in_each]u)" +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Autonamed hyposprays/smartdarts if(ispath(selected_container, /obj/item/reagent_containers/cup/vial) || ispath(selected_container, /obj/item/reagent_containers/syringe/smartdart)) item_name_default = "[master_reagent.name] [item_name_default]" // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/item_name = tgui_input_text(usr, "Container name", "Name", diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index dca2b603ca4..ba786c76a05 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -153,7 +153,11 @@ data["resistances"] = get_resistance_data(blood) return data +<<<<<<< HEAD /obj/machinery/computer/pandemic/ui_act(action, params) +======= +/obj/machinery/computer/pandemic/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index f70ae995832..d009179bb34 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -220,11 +220,15 @@ inverse_chem = /datum/reagent/inverse/hercuri inverse_chem_val = 0.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED +<<<<<<< HEAD process_flags = REAGENT_ORGANIC | REAGENT_SYNTHETIC // SKYRAT EDIT ADDITION - Lets hercuri process in synths +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() var/need_mob_update +<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN -- Adds check for owner_flags; indented the getFireLoss check and everything under it, so synths can get cooled down var/owner_flags = affected_mob.dna.species.reagent_flags if (owner_flags & PROCESS_ORGANIC) @@ -233,6 +237,12 @@ else need_mob_update = affected_mob.adjustFireLoss(-1.25 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) // SKYRAT EDIT CHANGE END +======= + if(affected_mob.getFireLoss() > 50) + need_mob_update = affected_mob.adjustFireLoss(-3 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) + else + need_mob_update = affected_mob.adjustFireLoss(-2.25 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 affected_mob.adjust_bodytemperature(rand(-25,-5) * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) if(ishuman(affected_mob)) var/mob/living/carbon/human/humi = affected_mob @@ -535,11 +545,14 @@ if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, BURN) && carbies.getFireLoss() < UNHUSK_DAMAGE_THRESHOLD && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/synthflesh) + reac_volume >= SYNTHFLESH_UNHUSK_AMOUNT)) carbies.cure_husk(BURN) carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or a golem or something +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - non-modular changeling balancing if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, CHANGELING_DRAIN) && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/synthflesh) + reac_volume >= SYNTHFLESH_LING_UNHUSK_AMOUNT))//Costs a little more than a normal husk carbies.cure_husk(CHANGELING_DRAIN) carbies.visible_message("A rubbery liquid coats [carbies]'s tissues. [carbies] looks a lot healthier!") // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /******ORGAN HEALING******/ /*Suffix: -rite*/ @@ -583,7 +596,10 @@ /datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) . = ..() var/need_mob_update +<<<<<<< HEAD need_mob_update = affected_mob.adjustStaminaLoss(-12.5 * REM * seconds_per_tick, updating_stamina = FALSE) //SKYRAT EDIT ADDITION - COMBAT - makes your heart beat faster, fills you with energy. For miners +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) if(affected_mob.health <= HEALTH_THRESHOLD_CRIT && affected_mob.health > (affected_mob.crit_threshold + HEALTH_THRESHOLD_FULLCRIT * (2 * normalise_creation_purity()))) //we cannot save someone below our lowered crit threshold. diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm index 31f7572b09c..73af6360841 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm @@ -57,7 +57,11 @@ if(HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) // we're an accomplished drinker booze_power *= 0.7 if(HAS_TRAIT(drinker, TRAIT_LIGHT_DRINKER)) +<<<<<<< HEAD booze_power *= 1.33 // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: booze_power *= 2 +======= + booze_power *= 2 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // water will dilute alcohol effects var/total_water_volume = 0 @@ -73,12 +77,20 @@ booze_power *= (total_alcohol_volume / combined_dilute_volume) // Volume, power, and server alcohol rate effect how quickly one gets drunk +<<<<<<< HEAD drinker.adjust_drunk_effect(booze_power * ALCOHOL_RATE * REM * seconds_per_tick) // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: (sqrt(volume) * booze_power * ALCOHOL_RATE * REM * seconds_per_tick) +======= + drinker.adjust_drunk_effect(sqrt(volume) * booze_power * ALCOHOL_RATE * REM * seconds_per_tick) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(boozepwr > 0) var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) var/heavy_drinker_multiplier = (HAS_TRAIT(drinker, TRAIT_HEAVY_DRINKER) ? 0.5 : 1) if (istype(liver)) +<<<<<<< HEAD if(liver.apply_organ_damage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * heavy_drinker_multiplier * seconds_per_tick, 0))/300))) // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: if((((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * heavy_drinker_multiplier * seconds_per_tick, 0))/150))) +======= + if(liver.apply_organ_damage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * heavy_drinker_multiplier * seconds_per_tick, 0))/150))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UPDATE_MOB_HEALTH /datum/reagent/consumable/ethanol/expose_obj(obj/exposed_obj, reac_volume) @@ -490,6 +502,10 @@ quality = DRINK_NICE taste_description = "burning cinnamon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // This drink is really popular with a certain demographic. var/teenage_girl_quality = DRINK_VERYGOOD @@ -514,7 +530,10 @@ atom.reagents.add_reagent(/datum/reagent/gold, convert_amount) return ..() +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/patron name = "Patron" description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." @@ -698,7 +717,11 @@ /datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) . = ..() if(drinker.blood_volume < BLOOD_VOLUME_NORMAL) +<<<<<<< HEAD drinker.blood_volume = min(drinker.blood_volume + (1 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL) //Bloody Mary quickly restores blood loss. // SKYRAT EDIT - Bloodshot is now the go-to drink for bloodloss, not Bloody Mary - ORIGINAL: drinker.blood_volume = min(drinker.blood_volume + (3 * REM * delta_time), BLOOD_VOLUME_NORMAL) +======= + drinker.blood_volume = min(drinker.blood_volume + (3 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL) //Bloody Mary quickly restores blood loss. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/brave_bull name = "Brave Bull" @@ -2659,7 +2682,11 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) +<<<<<<< HEAD stomach.adjust_charge(reac_volume * 0.003 * STANDARD_CELL_CHARGE) +======= + stomach.adjust_charge(reac_volume * 0.003 * ETHEREAL_CHARGE_NORMAL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/telepole name = "Telepole" @@ -2679,7 +2706,11 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) +<<<<<<< HEAD stomach.adjust_charge(reac_volume * 0.002 * STANDARD_CELL_CHARGE) +======= + stomach.adjust_charge(reac_volume * 0.002 * ETHEREAL_CHARGE_NORMAL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/pod_tesla name = "Pod Tesla" @@ -2706,7 +2737,11 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) +<<<<<<< HEAD stomach.adjust_charge(reac_volume * 0.005 * STANDARD_CELL_CHARGE) +======= + stomach.adjust_charge(reac_volume * 0.005 * ETHEREAL_CHARGE_NORMAL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Welcome to the Blue Room Bar and Grill, home to Mars' finest cocktails /datum/reagent/consumable/ethanol/rice_beer diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index 20e7e51d52b..2ef9a3725f7 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -55,8 +55,11 @@ affected_mob.adjust_temp_blindness(-2 SECONDS * REM * seconds_per_tick) var/need_mob_update switch(current_cycle) +<<<<<<< HEAD if(1 to 20) //nothing +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(21 to 110) if(SPT_PROB(100 * (1 - (sqrt(110 - current_cycle) / 10)), seconds_per_tick)) need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, -2 * REM * seconds_per_tick) @@ -1293,4 +1296,8 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) +<<<<<<< HEAD stomach.adjust_charge(reac_volume * 0.003 * STANDARD_CELL_CHARGE) +======= + stomach.adjust_charge(reac_volume * 0.003 * ETHEREAL_CHARGE_NORMAL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 15dc966ae3e..b428c500bbe 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -73,7 +73,11 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM ph = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED +<<<<<<< HEAD addiction_types = list(/datum/addiction/nicotine = 18) // 7.2 per 2 seconds +======= + addiction_types = list(/datum/addiction/nicotine = 15) // 6 per 2 seconds +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Nicotine is used as a pesticide IRL. /datum/reagent/drug/nicotine/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 194ce35eebd..fa3d0551671 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -53,10 +53,13 @@ var/obj/item/the_real_food = holder.my_atom if(isitem(the_real_food) && !is_reagent_container(the_real_food)) exposed_mob.add_mob_memory(/datum/memory/good_food, food = the_real_food) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - Racial Drinks if (RACE_DRINK) exposed_mob.add_mood_event("quality_drink", /datum/mood_event/race_drink) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Gets just how much nutrition this reagent is worth for the passed mob /datum/reagent/consumable/proc/get_nutriment_factor(mob/living/carbon/eater) @@ -953,7 +956,11 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) +<<<<<<< HEAD stomach.adjust_charge(reac_volume * 0.03 * STANDARD_CELL_CHARGE) +======= + stomach.adjust_charge(reac_volume * 0.03 * ETHEREAL_CHARGE_NORMAL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/liquidelectricity/enriched/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index 8cfb482cd66..727b092f1f0 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -230,7 +230,11 @@ Basically, we fill the time between now and 2s from now with hands based off the //Just the removed itching mechanism - omage to its origins. /datum/reagent/inverse/ichiyuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() +<<<<<<< HEAD if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated())) +======= + if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = TRUE if(spammer < world.time) to_chat(affected_mob,span_warning("You can't help but itch yourself.")) @@ -660,7 +664,10 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/brain_trauma/hypnosis, // Hypnosis, same reason as obsessed, plus a bug makes it remain even after the neurowhine purges and then turn into "nothing" on the med reading upon a second application /datum/brain_trauma/special/honorbound, // Designed to be chaplain exclusive ) +<<<<<<< HEAD forbiddentraumas += typesof(/datum/brain_trauma/very_special) // SKYRAT EDIT ADDITION - No very special (lewd) quirks gained by inverse neurine +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 traumalist -= forbiddentraumas var/obj/item/organ/internal/brain/brain = affected_mob.get_organ_slot(ORGAN_SLOT_BRAIN) traumalist = shuffle(traumalist) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 2861fe995ab..4ead1ea509e 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1349,6 +1349,12 @@ if (affected_mob.get_timed_status_effect_duration(/datum/status_effect/hallucination) >= 10 SECONDS) affected_mob.adjust_hallucinations(-10 SECONDS * REM * seconds_per_tick) +<<<<<<< HEAD +======= + if(affected_mob.getStaminaLoss() >= 100) + affected_mob.reagents.remove_reagent(type, 2 * REM * seconds_per_tick) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/need_mob_update = FALSE if(SPT_PROB(10, seconds_per_tick)) need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 50, affected_organ_flags) @@ -1694,6 +1700,7 @@ if(!affected_mob.blood_volume) return +<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN -- Adds check for owner_flags var/owner_flags if (iscarbon(affected_mob)) @@ -1702,6 +1709,8 @@ if (!isnull(owner_flags) && !(owner_flags & PROCESS_ORGANIC)) return // SKYRAT EDIT CHANGE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.losebreath += rand(2, 4) affected_mob.adjustOxyLoss(rand(1, 3), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 3c8c549ec5a..5a8ef017a1e 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1,5 +1,9 @@ /datum/reagent/blood +<<<<<<< HEAD data = list("viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null, "monkey_origins" = FALSE) // SKYRAT EDIT - Rebalancing blood for Hemophages - ORIGINAL: data = list("viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null) +======= + data = list("viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Blood" color = "#C80000" // rgb: 200, 0, 0 metabolization_rate = 12.5 * REAGENTS_METABOLISM //fast rate so it disappears fast. @@ -64,6 +68,7 @@ if(!data || !(data["blood_type"] in get_safe_blood(exposed_carbon.dna.blood_type))) exposed_carbon.reagents.add_reagent(/datum/reagent/toxin, reac_volume * 0.5) else +<<<<<<< HEAD /* SKYRAT EDIT - Rebalancing blood for Hemophages - ORIGINAL: exposed_carbon.blood_volume = min(exposed_carbon.blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM) */ // ORIGINAL END - SKYRAT EDIT: @@ -72,6 +77,9 @@ exposed_carbon.blood_volume = min(exposed_carbon.blood_volume + round(reac_volume, 0.1), max_blood_volume) // SKYRAT EDIT END +======= + exposed_carbon.blood_volume = min(exposed_carbon.blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exposed_carbon.reagents.remove_reagent(type, reac_volume) // Because we don't want blood to just lie around in the patient's blood, makes no sense. @@ -207,6 +215,7 @@ var/cooling_temperature = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS default_container = /obj/item/reagent_containers/cup/glass/waterbottle +<<<<<<< HEAD evaporates = TRUE //SKYRAT EDIT ADDITION /datum/glass_style/shot_glass/water @@ -218,6 +227,8 @@ name = "glass of water" desc = "The father of all refreshments." icon_state = "glass_clear" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/glass_style/shot_glass/water required_drink_type = /datum/reagent/water @@ -295,7 +306,11 @@ if(methods & VAPOR) exposed_mob.adjust_wet_stacks(reac_volume * WATER_TO_WET_STACKS_FACTOR_VAPOR) // Spraying someone with water with the hope to put them out is just simply too funny to me not to add it. +<<<<<<< HEAD if(!isfeline(exposed_mob)) // SKYRAT EDIT - Feline trait :) - ORIGINAL: if(!isfelinid(exposed_mob)) +======= + if(!isfelinid(exposed_mob)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return exposed_mob.incapacitate(1) // startles the felinid, canceling any do_after @@ -737,8 +752,12 @@ if(current_cycle >= CYCLES_TO_TURN) var/datum/species/species_type = race +<<<<<<< HEAD //affected_mob.set_species(species_type) //ORIGINAL affected_mob.set_species(species_type, TRUE, FALSE, null, null, null, null, TRUE) //SKYRAT EDIT CHANGE - CUSTOMIZATION +======= + affected_mob.set_species(species_type) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.del_reagent(type) to_chat(affected_mob, span_warning("You've become \a [LOWER_TEXT(initial(species_type.name))]!")) return @@ -801,14 +820,22 @@ if(isjellyperson(affected_mob)) to_chat(affected_mob, span_warning("Your jelly shifts and morphs, turning you into another subspecies!")) var/species_type = pick(subtypesof(/datum/species/jelly)) +<<<<<<< HEAD //affected_mob.set_species(species_type) //ORIGINAL affected_mob.set_species(species_type, TRUE, FALSE, null, null, null, null, TRUE, TRUE) //SKYRAT EDIT CHANGE - CUSTOMIZATION +======= + affected_mob.set_species(species_type) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.del_reagent(type) return UPDATE_MOB_HEALTH if(current_cycle >= CYCLES_TO_TURN) //overwrite since we want subtypes of jelly var/datum/species/species_type = pick(subtypesof(race)) +<<<<<<< HEAD //affected_mob.set_species(species_type) //ORIGINAL affected_mob.set_species(species_type, TRUE, FALSE, null, null, null, null, TRUE, TRUE) //SKYRAT EDIT CHANGE - CUSTOMIZATION +======= + affected_mob.set_species(species_type) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.del_reagent(type) to_chat(affected_mob, span_warning("You've become \a [initial(species_type.name)]!")) return UPDATE_MOB_HEALTH @@ -2554,7 +2581,11 @@ if(target.mind) var/datum/antagonist/changeling/changeling = IS_CHANGELING(target) if(changeling) +<<<<<<< HEAD changeling.adjust_chemicals(-4 * REM * seconds_per_tick) //SKYRAT EDIT - BZ-BUFF-VS-LING - ORIGINAL: changeling.adjust_chemicals(-2 * REM * seconds_per_tick) +======= + changeling.adjust_chemicals(-2 * REM * seconds_per_tick) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/pax/peaceborg name = "Synthpax" diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index b61a4d4d67c..456ea2e1357 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -59,12 +59,15 @@ ///Tagging vars ///A bitflag var for tagging reagents for the reagent loopup functon var/reaction_tags = NONE +<<<<<<< HEAD //SKYRAT EDIT ADDITION ///If defined, it'll emitt that pollutant on reaction var/pollutant_type ///How much amount per volume of the pollutant shall we emitt if `pollutant_type` is defined var/pollutant_amount = 1 //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///REACTION PROCS diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 03b586223ef..0548c378bbd 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -9,11 +9,14 @@ rate_up_lim = 35 reaction_tags = REACTION_TAG_HEALING | REACTION_TAG_EASY +<<<<<<< HEAD //SKYRAT EDIT ADDITION pollutant_type = /datum/pollutant/chemical_vapors pollutant_amount = 0.2 //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/medicine/leporazine results = list(/datum/reagent/medicine/leporazine = 2) required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/copper = 1) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 52ec613270c..879dbd132c2 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -779,7 +779,11 @@ /datum/chemical_reaction/pentaerythritol results = list(/datum/reagent/pentaerythritol = 2) +<<<<<<< HEAD required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/formaldehyde = 3, /datum/reagent/water = 1 ) +======= + required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/formaldehyde = 3, /datum/reagent/lye = 1) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reaction_tags = REACTION_TAG_EASY | REACTION_TAG_CHEMICAL /datum/chemical_reaction/acetaldehyde @@ -965,7 +969,11 @@ optimal_ph_min = 3 optimal_ph_max = 12 required_temp = 50 +<<<<<<< HEAD reaction_flags = REAGENT_SPLITRETAINVOL //SKYRAT EDIT CHANGE - ORIGINAL: reaction_flags = REACTION_INSTANT | REAGENT_SPLITRETAINVOL +======= + reaction_flags = REACTION_INSTANT | REAGENT_SPLITRETAINVOL +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE /datum/chemical_reaction/ant_slurry // We're basically gluing ants together with synthflesh & maint sludge to make a bigger ant. diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 19b6b5d3bd8..01f39175c1a 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -118,12 +118,18 @@ balloon_alert(user, "transferring [amount_per_transfer_from_this]u") mode_change_message(user) +<<<<<<< HEAD /obj/item/reagent_containers/attack(mob/M, mob/living/user, def_zone) if(user.combat_mode) return ..() /obj/item/reagent_containers/pre_attack_secondary(atom/target, mob/living/user, params) if(HAS_TRAIT(target, TRAIT_DO_NOT_SPLASH)) return ..() +======= +/obj/item/reagent_containers/pre_attack_secondary(atom/target, mob/living/user, params) + if(HAS_TRAIT(target, TRAIT_DO_NOT_SPLASH)) + return ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.combat_mode) return ..() if (try_splash(user, target)) @@ -240,13 +246,17 @@ log_combat(thrown_by, M, "splashed", R) reagents.expose(target, TOUCH, splash_multiplier) reagents.expose(target_turf, TOUCH, (1 - splash_multiplier)) // 1 - splash_multiplier because it's what didn't hit the target +<<<<<<< HEAD target_turf.add_liquid_from_reagents(reagents, reagent_multiplier = (1 - splash_multiplier)) // SKYRAT EDIT ADDITION - liquid spills (molotov buff) (huge) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(bartender_check(target) && thrown) visible_message(span_notice("[src] lands onto the [target.name] without spilling a single drop.")) return else +<<<<<<< HEAD //SKYRAT EDIT CHANGE START - liquid spills on non-mobs if(target.can_liquid_spill_on_hit()) target.add_liquid_from_reagents(reagents, thrown_from = src, thrown_to = target) @@ -259,6 +269,14 @@ //SKYRAT EDIT END visible_message("[src] spills its contents all over [target].") //reagents.expose(target, TOUCH) //SKYRAT EDIT REMOVAL +======= + if(isturf(target) && reagents.reagent_list.len && thrown_by) + log_combat(thrown_by, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]") + thrown_by.log_message("splashed (thrown) [english_list(reagents.reagent_list)] on [target].", LOG_ATTACK) + message_admins("[ADMIN_LOOKUPFLW(thrown_by)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [ADMIN_VERBOSEJMP(target)].") + visible_message(span_notice("[src] spills its contents all over [target].")) + reagents.expose(target, TOUCH) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) return diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index 4172b48b46e..44e491bce73 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -62,8 +62,11 @@ M.visible_message(span_warning("[user] fed [M] from [src]."), \ span_warning("[user] fed you from [src].")) log_combat(user, M, "fed", reagents.get_reagent_log_string()) +<<<<<<< HEAD SEND_SIGNAL(M, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reagents.trans_to(M, 10, transferred_by = user, methods = INGEST) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE) return TRUE diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index f7e3204e99b..b89e484322b 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -84,7 +84,10 @@ to_chat(user, span_notice("You swallow a gulp of [src].")) SEND_SIGNAL(src, COMSIG_GLASS_DRANK, target_mob, user) +<<<<<<< HEAD SEND_SIGNAL(target_mob, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/fraction = min(gulp_size/reagents.total_volume, 1) reagents.trans_to(target_mob, gulp_size, transferred_by = user, methods = INGEST) checkLiked(fraction, target_mob) @@ -162,7 +165,11 @@ to_chat(user, span_notice("You fill [src] with [trans] unit\s of the contents of [target].")) target.update_appearance() +<<<<<<< HEAD return ITEM_INTERACT_SUCCESS +======= + return NONE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/attackby(obj/item/attacking_item, mob/user, params) var/hotness = attacking_item.get_temperature() @@ -220,7 +227,11 @@ /obj/item/reagent_containers/cup/beaker name = "beaker" +<<<<<<< HEAD desc = "A beaker. It can hold up to 60 units." //SKYRAT EDIT: Used to say can hold up to 50 units. +======= + desc = "A beaker. It can hold up to 50 units." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/medical/chemical.dmi' icon_state = "beaker" inhand_icon_state = "beaker" @@ -231,8 +242,12 @@ fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) pickup_sound = 'sound/items/handling/beaker_pickup.ogg' drop_sound = 'sound/items/handling/beaker_place.ogg' +<<<<<<< HEAD volume = 60 //SKYRAT EDIT: Addition possible_transfer_amounts = list(5,10,15,20,30,60) //SKYRAT EDIT: Addition +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/beaker/Initialize(mapload) . = ..() @@ -249,6 +264,7 @@ /obj/item/reagent_containers/cup/beaker/large name = "large beaker" +<<<<<<< HEAD desc = "A large beaker. Can hold up to 120 units." //SKYRAT EDIT: Used to say Can hold up to 100 units. icon_state = "beakerlarge" custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT*1.25) @@ -256,10 +272,19 @@ amount_per_transfer_from_this = 10 //possible_transfer_amounts = list(5,10,15,20,25,30,50,100) //SKYRAT EDIT: Original Values possible_transfer_amounts = list(5,10,15,20,30,40,60,120) //SKYRAT EDIT: New Values +======= + desc = "A large beaker. Can hold up to 100 units." + icon_state = "beakerlarge" + custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT*1.25) + volume = 100 + amount_per_transfer_from_this = 10 + possible_transfer_amounts = list(5,10,15,20,25,30,50,100) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) /obj/item/reagent_containers/cup/beaker/plastic name = "x-large beaker" +<<<<<<< HEAD desc = "An extra-large beaker. Can hold up to 150 units." //SKYRAT EDIT: Used to say Can hold up to 120 units icon_state = "beakerwhite" custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plastic=SHEET_MATERIAL_AMOUNT * 1.5) @@ -267,6 +292,14 @@ amount_per_transfer_from_this = 10 //possible_transfer_amounts = list(5,10,15,20,25,30,60,120) //SKYRAT EDIT: Original values possible_transfer_amounts = list(5,10,15,20,25,30,50,75,150) //SKYRAT EDIT: New Values +======= + desc = "An extra-large beaker. Can hold up to 120 units." + icon_state = "beakerwhite" + custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plastic=SHEET_MATERIAL_AMOUNT * 1.5) + volume = 120 + amount_per_transfer_from_this = 10 + possible_transfer_amounts = list(5,10,15,20,25,30,60,120) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fill_icon_thresholds = list(0, 1, 10, 20, 40, 60, 80, 100) /obj/item/reagent_containers/cup/beaker/meta @@ -351,7 +384,11 @@ /obj/item/reagent_containers/cup/bucket name = "bucket" +<<<<<<< HEAD desc = "It's a bucket. You can squeeze a mop's contents into it by using right-click." //SKYRAT EDIT CHANGE - ORIGINAL: desc = "It's a bucket." +======= + desc = "It's a bucket." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/service/janitor.dmi' worn_icon = 'icons/mob/clothing/head/utility.dmi' icon_state = "bucket" @@ -363,8 +400,13 @@ custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 2) w_class = WEIGHT_CLASS_NORMAL amount_per_transfer_from_this = 20 +<<<<<<< HEAD possible_transfer_amounts = list(5,10,15,20,25,30,50,100) //SKYRAT EDIT CHANGE volume = 100 //SKYRAT EDIT CHANGE +======= + possible_transfer_amounts = list(5,10,15,20,25,30,50,70) + volume = 70 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_inv = HIDEHAIR slot_flags = ITEM_SLOT_HEAD resistance_flags = NONE @@ -397,8 +439,11 @@ melee = 10 acid = 50 +<<<<<<< HEAD // SKYRAT EDIT CHANGE START - LIQUIDS /* Original +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/bucket/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/mop)) if(reagents.total_volume < 1) @@ -408,6 +453,7 @@ user.balloon_alert(user, "doused [O]") playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE) return +<<<<<<< HEAD */ /obj/item/reagent_containers/cup/bucket/attackby(obj/mop, mob/living/user, params) if(istype(mop, /obj/item/mop)) @@ -437,6 +483,16 @@ user.put_in_hands(new_cleanbot_ass) return // SKYRAT EDIT CHANGE END - LIQUIDS +======= + else if(isprox(O)) //This works with wooden buckets for now. Somewhat unintended, but maybe someone will add sprites for it soon(TM) + to_chat(user, span_notice("You add [O] to [src].")) + qdel(O) + var/obj/item/bot_assembly/cleanbot/new_cleanbot_ass = new(null, src) + user.put_in_hands(new_cleanbot_ass) + return + + return ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot) . = ..() diff --git a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm index 7441614682c..33f06000a48 100644 --- a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm @@ -14,6 +14,10 @@ obj_flags = UNIQUE_RENAME drop_sound = 'sound/items/handling/drinkglass_drop.ogg' pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' +<<<<<<< HEAD +======= + sound_vary = TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 custom_price = PAYCHECK_LOWER //the screwdriver cocktail can make a drinking glass into the world's worst screwdriver. beautiful. toolspeed = 25 diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index 7b2183b1f22..986c6de3c5e 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -39,11 +39,99 @@ var/bottle_knockdown_duration = BOTTLE_KNOCKDOWN_DEFAULT_DURATION tool_behaviour = TOOL_ROLLINGPIN // Used to knock out the Chef. toolspeed = 1.3 //it's a little awkward to use, but it's a cylinder alright. +<<<<<<< HEAD +======= + /// A contained piece of paper, a photo, or space cash, that we can use as a message or gift to future spessmen. + var/obj/item/message_in_a_bottle +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/Initialize(mapload, vol) . = ..() var/static/list/recipes = list(/datum/crafting_recipe/molotov) AddElement(/datum/element/slapcrafting, recipes) +<<<<<<< HEAD +======= + register_context() + register_item_context() + +/obj/item/reagent_containers/cup/glass/bottle/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + if(message_in_a_bottle) + return NONE + if(istype(held_item, /obj/item/paper) || istype(held_item, /obj/item/stack/spacecash) || istype(held_item, /obj/item/photo)) + context[SCREENTIP_CONTEXT_LMB] = "Insert message" + return CONTEXTUAL_SCREENTIP_SET + return NONE + +/obj/item/reagent_containers/cup/glass/bottle/add_item_context(obj/item/source, list/context, atom/target, mob/living/user) + if(message_in_a_bottle && HAS_TRAIT(target, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION)) + context[SCREENTIP_CONTEXT_RMB] = "Toss message" + return CONTEXTUAL_SCREENTIP_SET + return NONE + +/obj/item/reagent_containers/cup/glass/bottle/Exited(atom/movable/gone, atom/newloc) + if(gone == message_in_a_bottle) + message_in_a_bottle = null + if(!QDELETED(src)) + update_icon(UPDATE_OVERLAYS) + return ..() + +/obj/item/reagent_containers/cup/glass/bottle/CheckParts(list/parts_list) + . = ..() + var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents + if(bottle.message_in_a_bottle) + message_in_a_bottle = bottle.message_in_a_bottle + bottle.message_in_a_bottle.forceMove(src) + +/obj/item/reagent_containers/cup/glass/bottle/examine(mob/user) + . = ..() + if(message_in_a_bottle) + . += span_info("there's \a [message_in_a_bottle] inside it. Break it to take it out, or find a beach or ocean and toss it with [EXAMINE_HINT("right-click")].") + else if(isGlass) + . += span_tinynoticeital("you could place a paper, photo or space cash inside it...") + +/obj/item/reagent_containers/cup/glass/bottle/update_overlays() + . = ..() + if(message_in_a_bottle) + var/overlay = add_message_overlay() + if(overlay) + . += overlay + +/obj/item/reagent_containers/cup/glass/bottle/interact_with_atom_secondary(atom/target, mob/living/user, list/modifiers) + if(user.combat_mode || !HAS_TRAIT(target, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION)) + return ..() + if(!user.temporarilyRemoveItemFromInventory(src)) + balloon_alert(user, "it's stuck to your hand!") + return ITEM_INTERACT_BLOCKING + user.visible_message(span_notice("[user] tosses [src] in [target]"), span_notice("You toss [src] in [target]"), span_notice("you hear a splash.")) + SSpersistence.save_message_bottle(message_in_a_bottle, type) + playsound(target, 'sound/effects/bigsplash.ogg', 70) + qdel(src) + return ITEM_INTERACT_SUCCESS + +/obj/item/reagent_containers/cup/glass/bottle/item_interaction(mob/living/user, obj/item/item, list/modifiers) + if(!isGlass) + return NONE + if(!istype(item, /obj/item/paper) && !istype(item, /obj/item/stack/spacecash) && !istype(item, /obj/item/photo)) + return NONE + if(message_in_a_bottle) + balloon_alert(user, "has a message already!") + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(item, src)) + balloon_alert(user, "it's stuck to your hand!") + return ITEM_INTERACT_BLOCKING + balloon_alert(user, "message inserted") + message_in_a_bottle = item + update_icon(UPDATE_OVERLAYS) + return ITEM_INTERACT_SUCCESS + +/obj/item/reagent_containers/cup/glass/bottle/proc/add_message_overlay() + if(istype(message_in_a_bottle, /obj/item/paper)) + return "paper_in_bottle" + if(istype(message_in_a_bottle, /obj/item/photo)) + return "photo_in_bottle" + if(istype(message_in_a_bottle, /obj/item/stack/spacecash)) + return "cash_in_bottle" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/small name = "small glass bottle" @@ -56,6 +144,7 @@ if(bartender_check(target) && ranged) return SplashReagents(target, ranged, override_spillable = TRUE) +<<<<<<< HEAD var/obj/item/broken_bottle/B = new(drop_location()) if(!ranged && thrower) thrower.put_in_hands(B) @@ -64,6 +153,18 @@ qdel(src) target.Bumped(B) +======= + var/obj/item/broken_bottle/broken = new(drop_location()) + if(!ranged && thrower) + thrower.put_in_hands(broken) + broken.mimic_broken(src, target, break_top) + broken.inhand_icon_state = broken_inhand_icon_state + if(message_in_a_bottle) + message_in_a_bottle.forceMove(drop_location()) + + qdel(src) + target.Bumped(broken) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/try_splash(mob/living/user, atom/target) @@ -339,6 +440,12 @@ list_reagents = list(/datum/reagent/water/holywater = 100) drink_type = NONE +<<<<<<< HEAD +======= +/obj/item/reagent_containers/cup/glass/bottle/holywater/add_message_overlay() + return //looks too weird... + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/holywater/hell desc = "A flask of holy water...it's been sitting in the Necropolis a while though." icon_state = "unholyflask" @@ -501,7 +608,10 @@ list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100) /obj/item/reagent_containers/cup/glass/bottle/sake/Initialize(mapload) +<<<<<<< HEAD . = ..() +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(10)) name = "Fluffy Tail Sake" desc += " On the bottle is a picture of a kitsune with nine touchable tails." @@ -510,6 +620,15 @@ name = "Inubashiri's Home Brew" desc += " Awoo." icon_state = "sakebottle_i" +<<<<<<< HEAD +======= + return ..() + +/obj/item/reagent_containers/cup/glass/bottle/sake/add_message_overlay() + if(icon_state == "sakebottle_k") //doesn't fit the sprite + return + return ..() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/fernet name = "Fernet Bronca" @@ -530,6 +649,12 @@ icon_state = "curacao_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/curacao = 100) +<<<<<<< HEAD +======= +/obj/item/reagent_containers/cup/glass/bottle/curacao/add_message_overlay() + return //doesn't fit the sprite + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/navy_rum name = "Pride of the Union Navy-Strength Rum" desc = "Ironically named, given it's made in Bermuda." @@ -574,6 +699,12 @@ ///Whether this bottle was a victim of a successful sabrage attempt var/sabraged = FALSE +<<<<<<< HEAD +======= +/obj/item/reagent_containers/cup/glass/bottle/champagne/add_message_overlay() + return //doesn't stylistically fit the sprite + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/champagne/cursed sabrage_success_percentile = 0 //force of the sharp item used to sabrage will not increase success chance @@ -733,12 +864,24 @@ icon_state = "hoochbottle" list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100) +<<<<<<< HEAD +======= +/obj/item/reagent_containers/cup/glass/bottle/hooch/add_message_overlay() + return //doesn't fit the sprite + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/moonshine name = "moonshine jug" desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle." icon_state = "moonshinebottle" list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100) +<<<<<<< HEAD +======= +/obj/item/reagent_containers/cup/glass/bottle/moonshine/add_message_overlay() + return //doesn't fit the sprite + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha name = "Solzara Brewing Company Mushi Kombucha" desc = "Best drunk over ice to savour the mushroomy flavour." @@ -790,6 +933,7 @@ ) /obj/item/reagent_containers/cup/glass/bottle/molotov/CheckParts(list/parts_list) +<<<<<<< HEAD ..() var/obj/item/reagent_containers/cup/glass/bottle/B = locate() in contents if(B) @@ -799,6 +943,17 @@ desc += " You're not sure if making this out of a carton was the brightest idea." isGlass = FALSE return +======= + . = ..() + var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents + if(!bottle) + return + icon_state = bottle.icon_state + bottle.reagents.copy_to(src, 100) + if(istype(bottle, /obj/item/reagent_containers/cup/glass/bottle/juice)) + desc += " You're not sure if making this out of a carton was the brightest idea." + isGlass = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum, do_splash = FALSE) ..(hit_atom, throwingdatum, do_splash = FALSE) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 62c9dfbb05c..bdf8f0ace2a 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -154,7 +154,7 @@ set name = "Empty Spray Bottle" set category = "Object" set src in usr - if(usr.incapacitated()) + if(usr.incapacitated) return if (tgui_alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", list("Yes", "No")) != "Yes") return @@ -397,6 +397,10 @@ current_range = 2 spray_range = 2 spray_sound = 'sound/effects/snap.ogg' +<<<<<<< HEAD +======= + possible_transfer_amounts = list(5) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/spray/chemsprayer/party/spray(atom/A, mob/user) . = ..() diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index ab0aa7f1530..cc31dcee92c 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -79,10 +79,14 @@ . = ..() if(. && atom_integrity > 0) if(tank_volume && (damage_flag == BULLET || damage_flag == LASER)) +<<<<<<< HEAD //SKYRAT EDIT CHANGE var/guaranteed_violent = (damage_flag == BULLET || damage_flag == LASER) boom(damage_type, guaranteed_violent) //SKYRAT EDIT END +======= + boom() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/reagent_dispensers/attackby(obj/item/W, mob/user, params) if(W.is_refillable()) @@ -164,7 +168,11 @@ * This is most dangerous for fuel tanks, which will explosion(). * Other dispensers will scatter their contents within range. */ +<<<<<<< HEAD /obj/structure/reagent_dispensers/proc/boom(damage_type = BRUTE, guaranteed_violent = FALSE) //SKYRAT EDIT CHANGE +======= +/obj/structure/reagent_dispensers/proc/boom() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) return // little bit of sanity sauce before we wreck ourselves somehow var/datum/reagent/fuel/volatiles = reagents.has_reagent(/datum/reagent/fuel) @@ -270,6 +278,7 @@ if(check_holidays(APRIL_FOOLS)) icon_state = "fuel_fools" +<<<<<<< HEAD /obj/structure/reagent_dispensers/fueltank/boom(damage_type = BRUTE, guaranteed_violent = FALSE) //SKYRAT EDIT CHANGE if(damage_type == BURN || guaranteed_violent) @@ -278,12 +287,18 @@ else . = ..() //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/reagent_dispensers/fueltank/blob_act(obj/structure/blob/B) boom(guaranteed_violent = TRUE) //SKYRAT EDIT CHANGE /obj/structure/reagent_dispensers/fueltank/ex_act() +<<<<<<< HEAD boom(guaranteed_violent = TRUE) //SKYRAT EDIT CHANGE +======= + boom() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /obj/structure/reagent_dispensers/fueltank/fire_act(exposed_temperature, exposed_volume) @@ -297,7 +312,11 @@ /obj/structure/reagent_dispensers/fueltank/bullet_act(obj/projectile/hitting_projectile) if(hitting_projectile.damage > 0 && ((hitting_projectile.damage_type == BURN) || (hitting_projectile.damage_type == BRUTE))) log_bomber(hitting_projectile.firer, "detonated a", src, "via projectile") +<<<<<<< HEAD boom(guaranteed_violent = TRUE) // SKYRAT EDIT CHANGE +======= + boom() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return hitting_projectile.on_hit(src, 0) // we override parent like this because otherwise we won't actually properly log the fact that a projectile caused this welding tank to explode. @@ -332,6 +351,7 @@ icon_state = "fuel_high" tank_volume = 5000 +<<<<<<< HEAD /obj/structure/reagent_dispensers/fueltank/large/boom(damage_type = BRUTE, guaranteed_violent = FALSE) //SKYRAT EDIT CHANGE if(damage_type == BURN || guaranteed_violent) explosion(src, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 7, flame_range = 12) @@ -340,6 +360,8 @@ . = ..() //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Wall mounted dispeners, like pepper spray or virus food. Not a normal tank, and shouldn't be able to be turned into a plumbed stationary one. /obj/structure/reagent_dispensers/wall anchored = TRUE @@ -360,7 +382,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/peppertank, 3 desc = "IT'S PEPPER TIME, BITCH!" find_and_hang_on_wall() +<<<<<<< HEAD /obj/structure/reagent_dispensers/water_cooler//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/structure/reagent_dispensers/water_cooler +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "liquid cooler" desc = "A machine that dispenses liquid to drink." icon = 'icons/obj/machines/vending.dmi' @@ -430,7 +456,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/virusfood, 30 anchored = TRUE reagent_id = /datum/reagent/consumable/nutraslop +<<<<<<< HEAD /obj/structure/reagent_dispensers/plumbed//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE +======= +/obj/structure/reagent_dispensers/plumbed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "stationary water tank" anchored = TRUE icon_state = "water_stationary" diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm index f38d4e27680..db74181a794 100644 --- a/code/modules/reagents/withdrawal/generic_addictions.dm +++ b/code/modules/reagents/withdrawal/generic_addictions.dm @@ -269,7 +269,10 @@ QDEL_NULL(fake_alert_ref) QDEL_NULL(health_doll_ref) +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - MOVED TO MODULAR. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Nicotine /datum/addiction/nicotine name = "nicotine" @@ -294,4 +297,7 @@ affected_carbon.set_jitter_if_lower(30 SECONDS * seconds_per_tick) if(SPT_PROB(5, seconds_per_tick)) affected_carbon.emote("cough") +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index 21c5aa7a1a9..4cbc9a216a5 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -434,6 +434,11 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) /// Updates the switch's `position` and `last_pos` variable. Useful so that the switch can properly cycle between the forwards, backwards and neutral positions. /obj/machinery/conveyor_switch/proc/update_position(direction) if(position == CONVEYOR_OFF) +<<<<<<< HEAD +======= + playsound(src, 'sound/machines/lever_start.ogg', 40, TRUE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(oneway) //is it a oneway switch position = oneway else @@ -442,6 +447,10 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) else position = CONVEYOR_BACKWARDS else +<<<<<<< HEAD +======= + playsound(src, 'sound/machines/lever_stop.ogg', 40, TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 position = CONVEYOR_OFF /obj/machinery/conveyor_switch/proc/on_user_activation(mob/user, direction) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index d9a32b700fa..ea387ad0953 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -3,7 +3,11 @@ #define SEND_PRESSURE (0.05*ONE_ATMOSPHERE) /obj/machinery/disposal +<<<<<<< HEAD icon = 'icons/obj/pipes_n_cables/disposal.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/pipes_n_cables/disposal.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 density = TRUE armor_type = /datum/armor/machinery_disposal max_integrity = 200 @@ -416,7 +420,11 @@ data["isai"] = HAS_AI_ACCESS(user) return data +<<<<<<< HEAD /obj/machinery/disposal/bin/ui_act(action, params) +======= +/obj/machinery/disposal/bin/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index b842a69413d..d2380833221 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -195,7 +195,11 @@ // called when player tries to move while in a pipe /obj/structure/disposalholder/relaymove(mob/living/user, direction) +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return for(var/mob/M in range(5, get_turf(src))) M.show_message("CLONG, clong!", MSG_AUDIBLE) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index aedd8fc597d..8d4c75839bf 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,5 +1,9 @@ /obj/item/delivery +<<<<<<< HEAD icon = 'icons/obj/storage/wrapping.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +======= + icon = 'icons/obj/storage/wrapping.dmi' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inhand_icon_state = "deliverypackage" var/giftwrapped = 0 var/sort_tag = 0 @@ -309,7 +313,11 @@ return data /** User clicks a button on the tagger */ +<<<<<<< HEAD /obj/item/dest_tagger/ui_act(action, params) +======= +/obj/item/dest_tagger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm index 20f478c1af1..d7413b55dfc 100644 --- a/code/modules/religion/burdened/psyker.dm +++ b/code/modules/religion/burdened/psyker.dm @@ -254,7 +254,11 @@ wound_bonus = -10 embed_type = null +<<<<<<< HEAD /obj/projectile/bullet/c38/holy/on_hit(atom/target, blocked = 0, pierce_hit) +======= +/obj/projectile/bullet/c38/holy/on_hit(atom/target, blocked, pierce_hit) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() var/roll_them_bones = rand(1,38) if(roll_them_bones == 1 && isliving(target)) diff --git a/code/modules/religion/sparring/sparring_contract.dm b/code/modules/religion/sparring/sparring_contract.dm index c31be81f649..5eb2eaa99f3 100644 --- a/code/modules/religion/sparring/sparring_contract.dm +++ b/code/modules/religion/sparring/sparring_contract.dm @@ -65,7 +65,11 @@ area_names += key return area_names +<<<<<<< HEAD /obj/item/sparring_contract/ui_act(action, list/params) +======= +/obj/item/sparring_contract/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/research/anomaly/anomaly_refinery.dm b/code/modules/research/anomaly/anomaly_refinery.dm index bae2b4f1162..fbc4f5937d7 100644 --- a/code/modules/research/anomaly/anomaly_refinery.dm +++ b/code/modules/research/anomaly/anomaly_refinery.dm @@ -315,7 +315,11 @@ ui = new(user, src, "AnomalyRefinery") ui.open() +<<<<<<< HEAD /obj/machinery/research/anomaly_refinery/ui_act(action, list/params) +======= +/obj/machinery/research/anomaly_refinery/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index c7916f035a7..28e2653c0f1 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -88,6 +88,10 @@ other types of metals and chemistry for reagents). return isnull(desc) ? initial(object_build_item_path.desc) : desc +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //////////////////////////////////////// //Disks for transporting design datums// //////////////////////////////////////// diff --git a/code/modules/research/designs/autolathe/security_designs.dm b/code/modules/research/designs/autolathe/security_designs.dm index c3a0a082d28..de8d8e04abe 100644 --- a/code/modules/research/designs/autolathe/security_designs.dm +++ b/code/modules/research/designs/autolathe/security_designs.dm @@ -223,8 +223,12 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/c9mm +<<<<<<< HEAD // name = "Ammo Box (9mm)" //SKYRAT EDIT: Original name = "Ammo Box (9x25mm Mk.12) (Lethal)" //SKYRAT EDIT: Calibre rename +======= + name = "Ammo Box (9mm) (Lethal)" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 id = "c9mm" build_type = AUTOLATHE materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 300) diff --git a/code/modules/research/designs/autolathe/service_designs.dm b/code/modules/research/designs/autolathe/service_designs.dm index e7177037e52..b20b7d8ab16 100644 --- a/code/modules/research/designs/autolathe/service_designs.dm +++ b/code/modules/research/designs/autolathe/service_designs.dm @@ -581,7 +581,11 @@ /datum/design/telescreen_entertainment name = "Entertainment Telescreen" id = "telescreen_entertainment" +<<<<<<< HEAD build_type = PROTOLATHE +======= + build_type = AUTOLATHE | PROTOLATHE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 materials = list( /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, @@ -593,6 +597,24 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE +<<<<<<< HEAD +======= +/datum/design/entertainment_radio + name = "Entertainment Radio" + id = "radio_entertainment" + build_type = AUTOLATHE | PROTOLATHE + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, + /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25 + ) + build_path = /obj/item/radio/entertainment/speakers/physical + category = list( + RND_CATEGORY_INITIAL, + RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS, + ) + departmental_flags = DEPARTMENT_BITFLAG_SERVICE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/barcode_scanner name = "Barcode Scanner" id = "barcode_scanner" diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm index 62fd0e7c9e5..a0bc32f37fc 100644 --- a/code/modules/research/designs/bluespace_designs.dm +++ b/code/modules/research/designs/bluespace_designs.dm @@ -50,7 +50,11 @@ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO +<<<<<<< HEAD //autolathe_exportable = FALSE //SKYRAT EDIT REMOVAL +======= + autolathe_exportable = FALSE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/desynchronizer name = "Desynchronizer" diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 84e1824315c..07d8f75d697 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -77,7 +77,10 @@ category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS ) +<<<<<<< HEAD *///SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Advanced Robotic Limbs @@ -2744,6 +2747,20 @@ RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING ) +<<<<<<< HEAD +======= +/datum/design/module/fishing_glove + name = "MOD Fishing Glove Module" + id = "mod_fishing" + materials = list( + /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT, + ) + build_path = /obj/item/mod/module/fishing_glove + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/posisphere name = "Positronic Sphere" desc = "The latest in Artificial Pesterance." diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 4d80a09987a..8c3c7cc5e10 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -986,6 +986,21 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE +<<<<<<< HEAD +======= +/datum/design/fishing_gloves + name = "Athletic Fishing Gloves" + desc = "A pair of gloves to fish without a fishing rod and train your athletics with." + id = "fishing_gloves" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT) + build_path = /obj/item/clothing/gloves/fishing + category = list( + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE + ) + departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/stabilized_hook name = "Gyro-Stabilized Hook" desc = "An advanced fishing hook that gives the user a tighter control on the fish when reeling in." @@ -1000,7 +1015,11 @@ /datum/design/auto_reel name = "Fishing Line Auto-Reel" +<<<<<<< HEAD desc = "An advanced line reel which can be used speed up both fishing and casually snagging other items in your direction." +======= + desc = "An advanced line reel which can be used speed up fishing or casually snag other items in your direction." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 id = "auto_reel" build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3) diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index 87362f4e302..b6bb8c8c7fa 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -421,7 +421,14 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/wrench/bolter +<<<<<<< HEAD departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) +======= + category = list( + RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED + ) + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 1412c0f0d8b..f89010c2b67 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -102,7 +102,11 @@ autolathe_exportable = FALSE /datum/design/mag_autorifle +<<<<<<< HEAD name = "WT-550 Autorifle Magazine (4.6x30mm)" +======= + name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A 20 round magazine for the out of date WT-550 Autorifle." id = "mag_autorifle" build_type = PROTOLATHE | AWAY_LATHE @@ -114,7 +118,11 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mag_autorifle/ap_mag +<<<<<<< HEAD name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP)" +======= + name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." id = "mag_autorifle_ap" materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6) @@ -122,7 +130,11 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mag_autorifle/ic_mag +<<<<<<< HEAD name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC)" +======= + name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." id = "mag_autorifle_ic" materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 0c28fcab2bf..c0f577eaa4e 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -166,7 +166,11 @@ return data +<<<<<<< HEAD /obj/machinery/rnd/experimentor/ui_act(action, list/params) +======= +/obj/machinery/rnd/experimentor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 2f02301aeaa..cbe8342ac2b 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -347,10 +347,13 @@ charge_per_item += design.materials[material] charge_per_item = ROUND_UP((charge_per_item / (MAX_STACK_SIZE * SHEET_MATERIAL_AMOUNT)) * coefficient * active_power_usage) var/build_time_per_item = (design.construction_time * design.lathe_time_factor * efficiency_coeff) ** 0.8 +<<<<<<< HEAD // SKYRAT EDIT - Faster lathes if(!speedup_disabled) build_time_per_item *= 0.1 // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //start production busy = TRUE diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index 407d62764d4..052103653a1 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -43,5 +43,9 @@ name = "department protolathe (Security)" allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY circuit = /obj/item/circuitboard/machine/protolathe/department/security +<<<<<<< HEAD stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" +======= + stripe_color = "#DE3A3A" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 payment_department = ACCOUNT_SEC diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm index 339c98a6222..0cd29a100ee 100644 --- a/code/modules/research/machinery/departmental_techfab.dm +++ b/code/modules/research/machinery/departmental_techfab.dm @@ -43,5 +43,9 @@ name = "department techfab (Security)" allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY circuit = /obj/item/circuitboard/machine/techfab/department/security +<<<<<<< HEAD stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" +======= + stripe_color = "#DE3A3A" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 payment_department = ACCOUNT_SEC diff --git a/code/modules/research/ordnance/doppler_array.dm b/code/modules/research/ordnance/doppler_array.dm index 5e44c2dc703..dae4c3e3133 100644 --- a/code/modules/research/ordnance/doppler_array.dm +++ b/code/modules/research/ordnance/doppler_array.dm @@ -290,7 +290,11 @@ data["records"] += list(record_data) return data +<<<<<<< HEAD /obj/machinery/doppler_array/ui_act(action, list/params) +======= +/obj/machinery/doppler_array/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm index d0393d9e103..2bdfe2afa12 100644 --- a/code/modules/research/ordnance/tank_compressor.dm +++ b/code/modules/research/ordnance/tank_compressor.dm @@ -275,7 +275,11 @@ ui = new(user, src, "TankCompressor") ui.open() +<<<<<<< HEAD /obj/machinery/atmospherics/components/binary/tank_compressor/ui_act(action, list/params) +======= +/obj/machinery/atmospherics/components/binary/tank_compressor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 91cf89582d3..1318d9a4d15 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -319,7 +319,11 @@ Nothing else in the console has ID requirements. "id_cache" = flat_id_cache, ) +<<<<<<< HEAD /obj/machinery/computer/rdconsole/ui_act(action, list/params) +======= +/obj/machinery/computer/rdconsole/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/research/server_control.dm b/code/modules/research/server_control.dm index 24327a731a6..12a832ed0e3 100644 --- a/code/modules/research/server_control.dm +++ b/code/modules/research/server_control.dm @@ -61,7 +61,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/rdservercontrol/ui_act(action, params) +======= +/obj/machinery/computer/rdservercontrol/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm index 9c0d68b6b2b..fbd201f8a04 100644 --- a/code/modules/research/techweb/nodes/service_nodes.dm +++ b/code/modules/research/techweb/nodes/service_nodes.dm @@ -165,6 +165,11 @@ prereq_ids = list(TECHWEB_NODE_FISHING_EQUIP) design_ids = list( "fishing_rod_tech", +<<<<<<< HEAD +======= + "fishing_gloves", + "mod_fishing", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stabilized_hook", "auto_reel", "fish_analyzer", diff --git a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm index 0187fa8eda3..0a7ebb07d8d 100644 --- a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm +++ b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm @@ -59,6 +59,10 @@ list(CELL_LINE_TABLE_COCKROACH, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 7), list(CELL_LINE_TABLE_BLOBBERNAUT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) ) +<<<<<<< HEAD +======= + name = "basic sample petri dish" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/petri_dish/random/Initialize(mapload) . = ..() diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index cac8251eba7..6f43c04f754 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -8,6 +8,8 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) #define ACCESS_GRANTING_COOLDOWN (30 SECONDS) +#define ACCESS_GRANTING_COOLDOWN (30 SECONDS) + /obj/machinery/keycard_auth name = "Keycard Authentication Device" desc = "This device is used to trigger station functions, which require more than one ID card to authenticate, or to give the Janitor access to a department." @@ -64,7 +66,11 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) return UI_CLOSE return ..() +<<<<<<< HEAD /obj/machinery/keycard_auth/ui_act(action, params) +======= +/obj/machinery/keycard_auth/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || waiting || !allowed(usr)) return @@ -88,6 +94,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) if(!event_source) sendEvent(KEYCARD_BSA_UNLOCK) . = TRUE +<<<<<<< HEAD //SKYRAT EDIT START if("pin_unrestrict") if(!event_source) @@ -98,6 +105,8 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) sendEvent(KEYCARD_ENG_OVERRIDE) . = TRUE //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("give_janitor_access") var/mob/living/living_user = usr if(!living_user || !istype(living_user)) @@ -192,6 +201,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth/wall_mounted, 26) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth/wall_mounted, 26) +/obj/machinery/keycard_auth/wall_mounted/Initialize(mapload) + . = ..() + find_and_hang_on_wall() + +/// Subtype which is stuck to a wall +/obj/machinery/keycard_auth/wall_mounted + icon = 'icons/obj/machines/wallmounts.dmi' + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth/wall_mounted, 26) + /obj/machinery/keycard_auth/wall_mounted/Initialize(mapload) . = ..() find_and_hang_on_wall() diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index cf53fef368c..4140cf4cef1 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -174,7 +174,11 @@ else return SHUTTLE_CONSOLE_ERROR +<<<<<<< HEAD /obj/machinery/computer/shuttle/ui_act(action, params) +======= +/obj/machinery/computer/shuttle/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 4f1729aa029..b3964492899 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -347,7 +347,11 @@ . = ..() +<<<<<<< HEAD /obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signal_origin, reason, red_alert, set_coefficient=null, silent=FALSE) // SKYRAT EDIT CHANGE - AUTOTRANSFER - adds silent arg +======= +/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signal_origin, reason, red_alert, set_coefficient=null) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnum(set_coefficient)) set_coefficient = SSsecurity_level.current_security_level.shuttle_call_time_mod alert_coeff = set_coefficient @@ -368,10 +372,13 @@ else SSshuttle.emergency_last_call_loc = null +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(silent) return // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 priority_announce( text = "The emergency shuttle has been called. [red_alert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [(timeLeft(60 SECONDS))] minutes.[reason][SSshuttle.emergency_last_call_loc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ][SSshuttle.admin_emergency_no_recall ? "\n\nWarning: Shuttle recall subroutines disabled; Recall not possible." : ""]", title = "Emergency Shuttle Dispatched", diff --git a/code/modules/shuttle/ferry.dm b/code/modules/shuttle/ferry.dm index d1f54b889d1..82898b9b55a 100644 --- a/code/modules/shuttle/ferry.dm +++ b/code/modules/shuttle/ferry.dm @@ -23,6 +23,10 @@ /obj/machinery/computer/shuttle/ferry/request name = "ferry console" circuit = /obj/item/circuitboard/computer/ferry/request +<<<<<<< HEAD possible_destinations = "ferry_home;ferry_away;ferry_ntf" //SKYRAT EDIT CHANGE +======= + possible_destinations = "ferry_home;ferry_away" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 req_access = list(ACCESS_CENT_GENERAL) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 7f763b29e3f..16ba3cf0d9c 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -52,6 +52,7 @@ All ShuttleMove procs go here if(!shuttle_depth) CRASH("A turf queued to move via shuttle somehow had no skipover in baseturfs. [src]([type]):[loc]") +<<<<<<< HEAD //SKYRAT EDIT ADDITION if(newT.lgroup) @@ -69,6 +70,8 @@ All ShuttleMove procs go here newT.reasses_liquids() //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 newT.CopyOnTop(src, 1, shuttle_depth, TRUE) newT.blocks_air = TRUE newT.air_update_turf(TRUE, FALSE) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index d3e18f4f876..1c5837709e8 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -493,8 +493,11 @@ ///List of shuttle events that can run or are running var/list/datum/shuttle_event/event_list = list() +<<<<<<< HEAD var/admin_forced = FALSE //SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define WORLDMAXX_CUTOFF (world.maxx + 1) #define WORLDMAXY_CUTOFF (world.maxx + 1) /** @@ -701,6 +704,7 @@ * Arguments: * * destination_port - Stationary docking port to move the shuttle to */ +<<<<<<< HEAD /obj/docking_port/mobile/proc/request(obj/docking_port/stationary/destination_port, forced = FALSE) // SKYRAT EDIT ADDITION - Forced check if(!check_dock(destination_port) && !forced) // SKYRAT EDIT ADDITION - Forced check testing("check_dock failed on request for [src]") @@ -711,6 +715,13 @@ admin_forced = TRUE // SKYRAT EDIT END +======= +/obj/docking_port/mobile/proc/request(obj/docking_port/stationary/destination_port) + if(!check_dock(destination_port)) + testing("check_dock failed on request for [src]") + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(mode == SHUTTLE_IGNITING && destination == destination_port) return diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 4f6dbdc2f26..e7d6f6999bd 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -162,7 +162,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( var/pack_cost var/list/goodies_by_buyer = list() // if someone orders more than GOODY_FREE_SHIPPING_MAX goodies, we upcharge to a normal crate so they can't carry around 20 combat shotties var/list/clean_up_orders = list() // orders to remove since we are done with them +<<<<<<< HEAD var/list/forced_briefcases = list() // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/supply_order/spawning_order in SSshuttle.shopping_list) if(!empty_turfs.len) @@ -193,7 +196,11 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( continue pack_cost = spawning_order.pack.get_cost() +<<<<<<< HEAD if(spawning_order.paying_account && spawning_order.charge_on_purchase) // SKYRAT EDIT CHANGE - ORIGINAL: if(spawning_order.paying_account) +======= + if(spawning_order.paying_account) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 paying_for_this = spawning_order.paying_account if(spawning_order.pack.goody) LAZYADD(goodies_by_buyer[spawning_order.paying_account], spawning_order) @@ -206,7 +213,11 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( cargo.adjust_money(price - pack_cost) //Cargo gets the handling fee value += pack_cost +<<<<<<< HEAD if(!spawning_order.pack.goody && !(spawning_order?.paying_account in forced_briefcases)) // SKYRAT EDIT CHANGE - ORIGINAL : if(!spawning_order.pack.goody) +======= + if(!spawning_order.pack.goody) //we handle goody crates below +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/structure/closet/crate = spawning_order.generate(pick_n_take(empty_turfs)) crate.name += " - #[spawning_order.id]" diff --git a/code/modules/spells/spell_types/pointed/finger_guns.dm b/code/modules/spells/spell_types/pointed/finger_guns.dm index 24f51a0e908..704de6795d3 100644 --- a/code/modules/spells/spell_types/pointed/finger_guns.dm +++ b/code/modules/spells/spell_types/pointed/finger_guns.dm @@ -33,7 +33,11 @@ return FALSE var/mob/living/carbon/human/human_invoker = invoker +<<<<<<< HEAD if(human_invoker.incapacitated()) +======= + if(human_invoker.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(feedback) to_chat(human_invoker, span_warning("You can't properly point your fingers while incapacitated.")) return FALSE diff --git a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm index 59c9ffdde3b..06768b6470b 100644 --- a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm @@ -141,7 +141,11 @@ if(QDELETED(caster)) return FALSE +<<<<<<< HEAD return !caster.incapacitated() +======= + return !caster.incapacitated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Actually does the shapeshift, for the caster. /datum/action/cooldown/spell/shapeshift/proc/do_shapeshift(mob/living/caster) diff --git a/code/modules/spells/spell_types/teleport/teleport.dm b/code/modules/spells/spell_types/teleport/teleport.dm index d4861572042..421200b4ac5 100644 --- a/code/modules/spells/spell_types/teleport/teleport.dm +++ b/code/modules/spells/spell_types/teleport/teleport.dm @@ -48,5 +48,9 @@ return var/mob/living/carbon/caster = cast_on +<<<<<<< HEAD if(caster.incapacitated() || !caster.is_holding(target)) +======= + if(caster.incapacitated || !caster.is_holding(target)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return . | SPELL_CANCEL_CAST diff --git a/code/modules/spells/spell_types/touch/_touch.dm b/code/modules/spells/spell_types/touch/_touch.dm index 5f0bc242559..a3efb846b89 100644 --- a/code/modules/spells/spell_types/touch/_touch.dm +++ b/code/modules/spells/spell_types/touch/_touch.dm @@ -19,7 +19,11 @@ * (generally) inadvisable unless you know what you're doing */ /datum/action/cooldown/spell/touch +<<<<<<< HEAD check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED +======= + check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sound = 'sound/items/welder.ogg' invocation = "High Five!" invocation_type = INVOCATION_SHOUT diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 60799f546c8..c81e2a80ca2 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -1,9 +1,15 @@ +<<<<<<< HEAD ///BSA unlocked by head ID swipes GLOBAL_VAR_INIT(bsa_unlock, FALSE) /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR BSA_OVERHAUL +======= +///BSA unlocked by head ID swipes +GLOBAL_VAR_INIT(bsa_unlock, FALSE) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Crew has to build a bluespace cannon // Cargo orders part for high price // Requires high amount of power @@ -301,7 +307,11 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) data["target"] = get_target_name() return data +<<<<<<< HEAD /obj/machinery/computer/bsa_control/ui_act(action, params) +======= +/obj/machinery/computer/bsa_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -387,7 +397,10 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) QDEL_NULL(centerpiece.back_ref) qdel(centerpiece) return cannon +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/bsa_control/emag_act(mob/user, obj/item/card/emag/emag_card) if(obj_flags & EMAGGED) return FALSE @@ -395,4 +408,7 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) balloon_alert(user, "rigged to explode") to_chat(user, span_warning("You emag [src] and hear the focusing crystal short out. You get the feeling it wouldn't be wise to stand near [src] when the BSA fires...")) return TRUE +<<<<<<< HEAD */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 6c2661bbe22..f948505590f 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -164,7 +164,11 @@ data["choiceB"] = initial(mutation2.name) return data +<<<<<<< HEAD /obj/machinery/dna_vault/ui_act(action, params) +======= +/obj/machinery/dna_vault/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/station_goals/vault_mutation.dm b/code/modules/station_goals/vault_mutation.dm index b05bda05db7..cd0098b35a7 100644 --- a/code/modules/station_goals/vault_mutation.dm +++ b/code/modules/station_goals/vault_mutation.dm @@ -144,3 +144,7 @@ /datum/mutation/human/plasmocile/proc/remove_buff(obj/item/organ/internal/lungs/our_lungs) our_lungs.plas_breath_dam_min = initial(our_lungs.plas_breath_dam_min) our_lungs.plas_breath_dam_max = initial(our_lungs.plas_breath_dam_max) +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index 0bb9566306d..201a7f031e6 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -1,10 +1,19 @@ /obj/item/disk/surgery/brainwashing +<<<<<<< HEAD name = "Surgery Disk" //SKYRAT EDIT: Formerly "Brainwashing Surgery Disk" //Finally I can upload the funny surgery disk without letting everyone in the room know about it! desc = "The disk provides instructions on some kind of surgery, but the label has been scratched off..." //Skyrat edit: Moved to Special Desc. surgeries = list(/datum/surgery/advanced/brainwashing) special_desc_requirement = EXAMINE_CHECK_JOB // SKYRAT EDIT special_desc_jobs = list("Medical Doctor, Chief Medical Officer, Roboticist") // SKYRAT EDIT CHANGE //You mean to tell me the roles that get this role-exclusive item know what it does? special_desc = "The disk provides instructions on how to impress an order on a brain, making it the primary objective of the patient." +======= + name = "Brainwashing Surgery Disk" + desc = "The disk provides instructions on how to impress an order on a brain, making it the primary objective of the patient." + surgeries = list( + /datum/surgery/advanced/brainwashing, + /datum/surgery/advanced/brainwashing/mechanic, + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/surgery/advanced/brainwashing name = "Brainwashing" diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm index ab11ce0c20f..dc5a6246bba 100644 --- a/code/modules/surgery/amputation.dm +++ b/code/modules/surgery/amputation.dm @@ -16,7 +16,10 @@ /datum/surgery_step/clamp_bleeders, /datum/surgery_step/sever_limb, ) +<<<<<<< HEAD removes_target_bodypart = TRUE // SKYRAT EDIT ADDITION - Surgically unremovable limbs +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/surgery/amputation/mechanic name = "Disassemble" diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index ff25597e824..6354ed16720 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -77,7 +77,11 @@ ///Controls if the limb is disabled. TRUE means it is disabled (similar to being removed, but still present for the sake of targeted interactions). var/bodypart_disabled = FALSE ///Handles limb disabling by damage. If 0 (0%), a limb can't be disabled via damage. If 1 (100%), it is disabled at max limb damage. Anything between is the percentage of damage against maximum limb damage needed to disable the limb. +<<<<<<< HEAD var/disabling_threshold_percentage = 1 //SKYRAT EDIT CHANGE - COMBAT - ORIGINAL : var/disabling_threshold_percentage = 0 +======= + var/disabling_threshold_percentage = 0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Damage variables ///A mutiplication of the burn and brute damage that the limb's stored damage contributes to its attached mob's overall wellbeing. @@ -203,10 +207,13 @@ var/robotic_emp_paralyze_damage_percent_threshold = 0.3 /// A potential texturing overlay to put on the limb var/datum/bodypart_overlay/texture/texture_bodypart_overlay +<<<<<<< HEAD // SKYRAT EDIT BEGIN /// If we even wanna try and handle icons/overlays of the limb (Taurs don't, f.e.). See update_body_parts var/show_icon = TRUE // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/apply_fantasy_bonuses(bonus) . = ..() @@ -354,6 +361,7 @@ for(var/datum/wound/wound as anything in wounds) switch(wound.severity) if(WOUND_SEVERITY_TRIVIAL) +<<<<<<< HEAD // check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)].")]" // SKYRAT EDIT - Medical overhaul-ish - ORIGINAL check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [wound.get_topic_name(owner)].")]" // SKYRAT EDIT - Medical overhaul-ish if(WOUND_SEVERITY_MODERATE) @@ -365,6 +373,15 @@ if(WOUND_SEVERITY_CRITICAL) // check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!")]" // SKYRAT EDIT - Medical overhaul-ish - ORIGINAL check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [wound.get_topic_name(owner)]!!")]" // SKYRAT EDIT - Medical overhaul-ish +======= + check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)].")]" + if(WOUND_SEVERITY_MODERATE) + check_list += "\t [span_warning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!")]" + if(WOUND_SEVERITY_SEVERE) + check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!")]" + if(WOUND_SEVERITY_CRITICAL) + check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!!")]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/embedded_thing in embedded_objects) var/stuck_word = embedded_thing.is_embed_harmless() ? "stuck" : "embedded" @@ -543,6 +560,7 @@ return // now we have our wounding_type and are ready to carry on with wounds and dealing the actual damage if(wounding_dmg >= WOUND_MINIMUM_DAMAGE && wound_bonus != CANT_WOUND) +<<<<<<< HEAD //SKYRAT EDIT ADDITION - MEDICAL //This makes it so the more damaged bodyparts are, the more likely they are to get wounds //However, this bonus isn't applied when the object doesn't pass the initial wound threshold, nor is it when it already has enough wounding dmg @@ -556,6 +574,8 @@ var/obj/item/stack/medical/gauze/our_gauze = current_gauze our_gauze.get_hit() //SKYRAT EDIT ADDITION END - MEDICAL +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_wounding(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus, attack_direction, damage_source = damage_source) for(var/datum/wound/iter_wound as anything in wounds) @@ -682,12 +702,15 @@ update_disabled() if(updating_health) owner.updatehealth() +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION //Consider moving this to a new species proc "spec_heal" maybe? if(owner.stat == DEAD && HAS_TRAIT(owner, TRAIT_REVIVES_BY_HEALING)) if(owner.health > 50) owner.revive(FALSE) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cremation_progress = min(0, cremation_progress - ((brute_dam + burn_dam)*(100/max_damage))) return update_bodypart_damage_state() @@ -980,6 +1003,7 @@ if(should_draw_greyscale) //Should the limb be colored? draw_color ||= species_color || (skin_tone ? skintone2hex(skin_tone) : null) +<<<<<<< HEAD // SKYRAT EDIT ADDITION var/datum/species/owner_species = human_owner.dna.species @@ -993,6 +1017,9 @@ // SKYRAT EDIT END recolor_external_organs() +======= + recolor_bodypart_overlays() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE //to update the bodypart's icon when not attached to a mob @@ -1065,10 +1092,16 @@ huskify_image(thing_to_husk = aux) draw_color = husk_color if(draw_color) +<<<<<<< HEAD var/limb_color = alpha != 255 ? "[draw_color][num2hex(alpha, 2)]" : "[draw_color]" // SKYRAT EDIT ADDITION - Alpha values on limbs. We check if the limb is attached and if the owner has an alpha value to append limb.color = limb_color // SKYRAT EDIT CHANGE - ORIGINAL: limb.color = "[draw_color]" if(aux_zone) aux.color = limb_color // SKYRAT EDIT CHANGE - ORIGINAL: aux.color = "[draw_color]" +======= + limb.color = "[draw_color]" + if(aux_zone) + aux.color = "[draw_color]" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //EMISSIVE CODE START // For some reason this was applied as an overlay on the aux image and limb image before. @@ -1109,6 +1142,7 @@ . += overlay.get_overlay(external_layer, src) for(var/datum/layer in .) overlay.modify_bodypart_appearance(layer) +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MARKINGS CODE var/override_color var/atom/offset_spokesman = owner || src @@ -1165,6 +1199,8 @@ if (emissive) . += emissive // SKYRAT EDIT END - MARKINGS CODE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return . /obj/item/bodypart/proc/huskify_image(image/thing_to_husk, draw_blood = TRUE) @@ -1370,7 +1406,11 @@ QDEL_NULL(current_gauze) ///Loops through all of the bodypart's external organs and update's their color. +<<<<<<< HEAD /obj/item/bodypart/proc/recolor_external_organs() +======= +/obj/item/bodypart/proc/recolor_bodypart_overlays() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/bodypart_overlay/mutant/overlay in bodypart_overlays) overlay.inherit_color(src, force = TRUE) @@ -1443,8 +1483,13 @@ var/burn_damage = AUGGED_LIMB_EMP_BURN_DAMAGE if(severity == EMP_HEAVY) time_needed *= 2 +<<<<<<< HEAD brute_damage *= 1.3 // SKYRAT EDIT : Balance - Lowers total damage from ~125 Brute to ~30 burn_damage *= 1.3 // SKYRAT EDIT : Balance - Lowers total damage from ~104 Burn to ~24 +======= + brute_damage *= 2 + burn_damage *= 2 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receive_damage(brute_damage, burn_damage) do_sparks(number = 1, cardinal_only = FALSE, source = owner || src) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 5d5db47fe76..e45a6893bd6 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -68,10 +68,13 @@ chest_owner.add_splatter_floor(chest_owner.loc) playsound(get_turf(chest_owner), 'sound/misc/splort.ogg', 80, TRUE) for(var/obj/item/organ/organ in contents) +<<<<<<< HEAD // SKYRAT EDIT START - Non-spillable organs if(!organ.drop_when_organ_spilling) continue // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/org_zone = check_zone(organ.zone) if(org_zone != BODY_ZONE_CHEST) continue @@ -272,7 +275,11 @@ return FALSE var/obj/item/bodypart/chest/mob_chest = new_limb_owner.get_bodypart(BODY_ZONE_CHEST) +<<<<<<< HEAD if(mob_chest && !(mob_chest.acceptable_bodytype & bodytype) && !(mob_chest.acceptable_bodyshape & bodyshape) && !(mob_chest.acceptable_bodyshape & bodyshape) && !special) +======= + if(mob_chest && !(mob_chest.acceptable_bodytype & bodytype) && !(mob_chest.acceptable_bodyshape & bodyshape) && !special) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -406,12 +413,20 @@ qdel(phantom_loss) //Copied from /datum/species/proc/on_species_gain() +<<<<<<< HEAD for(var/obj/item/organ/external/organ_path as anything in dna.species.external_organs) +======= + for(var/obj/item/organ/organ_path as anything in dna.species.mutant_organs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Load a persons preferences from DNA var/zone = initial(organ_path.zone) if(zone != limb_zone) continue +<<<<<<< HEAD var/obj/item/organ/external/new_organ = SSwardrobe.provide_type(organ_path) +======= + var/obj/item/organ/new_organ = SSwardrobe.provide_type(organ_path) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_organ.Insert(src) update_body_parts() diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 00c21f13738..7c99bc4ad74 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -194,6 +194,7 @@ if(worn_face_offset) worn_face_offset.apply_offset(eye_left) worn_face_offset.apply_offset(eye_right) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Customization (Emissives and synths) if(eyes.eye_icon_state == "None") @@ -229,6 +230,21 @@ . = ..() AddElement(/datum/element/toy_talk) +======= + . += eye_left + . += eye_right + else if(!eyes && (head_flags & HEAD_EYEHOLES)) + var/image/no_eyes = image('icons/mob/human/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH) + worn_face_offset?.apply_offset(no_eyes) + . += no_eyes + + return + +/obj/item/bodypart/head/Initialize(mapload) + . = ..() + AddElement(/datum/element/toy_talk) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/head/GetVoice() return "The head of [real_name]" diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm index d977d4ae902..e2cd3d8573c 100644 --- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm +++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm @@ -50,7 +50,11 @@ lip_style = human_head_owner.lip_style lip_color = human_head_owner.lip_color hairstyle = human_head_owner.hairstyle +<<<<<<< HEAD hair_alpha = human_head_owner.hair_alpha ? human_head_owner.hair_alpha : owner_species.hair_alpha // SKYRAT EDIT - Customization - Hair alpha - ORIGINAL: hair_alpha = owner_species.hair_alpha +======= + hair_alpha = owner_species.hair_alpha +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hair_color = human_head_owner.hair_color facial_hairstyle = human_head_owner.facial_hairstyle facial_hair_alpha = owner_species.facial_hair_alpha @@ -110,11 +114,14 @@ hair_overlay = image(hair_sprite_accessory.icon, hair_sprite_accessory.icon_state, -HAIR_LAYER, image_dir) hair_overlay.alpha = hair_alpha hair_overlay.pixel_y = hair_sprite_accessory.y_offset +<<<<<<< HEAD // SKYRAT EDIT ADDITION - Species hair offset if(LAZYFIND(owner?.dna?.species?.offset_features, OFFSET_HAIR)) hair_overlay.pixel_x += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_X] hair_overlay.pixel_y += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_Y] // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Emissive blocker if(blocks_emissive != EMISSIVE_BLOCK_NONE) hair_overlay.overlays += emissive_blocker(hair_overlay.icon, hair_overlay.icon_state, location, alpha = hair_alpha) @@ -127,11 +134,14 @@ var/hair_gradient_color = gradient_colors[GRADIENT_HAIR_KEY] var/image/hair_gradient_overlay = get_gradient_overlay(hair_sprite_accessory.icon, hair_sprite_accessory.icon_state, -HAIR_LAYER, SSaccessories.hair_gradients_list[hair_gradient_style], hair_gradient_color, image_dir) hair_gradient_overlay.pixel_y = hair_sprite_accessory.y_offset +<<<<<<< HEAD // SKYRAT EDIT ADDITION - Species hair offset if(LAZYFIND(owner?.dna?.species?.offset_features, OFFSET_HAIR)) hair_gradient_overlay.pixel_x += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_X] hair_gradient_overlay.pixel_y += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_Y] // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += hair_gradient_overlay if(show_debrained && (head_flags & HEAD_DEBRAIN)) diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 8833f87e28e..0ced4ce2fe2 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -182,8 +182,13 @@ /mob/living/carbon/proc/synchronize_bodytypes() var/all_limb_flags = NONE for(var/obj/item/bodypart/limb as anything in bodyparts) +<<<<<<< HEAD for(var/obj/item/organ/external/ext_organ in limb) all_limb_flags |= ext_organ.external_bodytypes +======= + for(var/obj/item/organ/organ in limb) + all_limb_flags |= organ.external_bodytypes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 all_limb_flags |= limb.bodytype bodytype = all_limb_flags @@ -192,8 +197,13 @@ /mob/living/carbon/proc/synchronize_bodyshapes() var/all_limb_flags = NONE for(var/obj/item/bodypart/limb as anything in bodyparts) +<<<<<<< HEAD for(var/obj/item/organ/external/ext_organ in limb) all_limb_flags |= ext_organ.external_bodyshapes +======= + for(var/obj/item/organ/organ in limb) + all_limb_flags |= organ.external_bodyshapes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 all_limb_flags |= limb.bodyshape bodyshape = all_limb_flags diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index dadaee6ccb2..1402f6f9be3 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -124,8 +124,13 @@ if (severity == EMP_HEAVY) knockdown_time *= 2 owner.Knockdown(knockdown_time) +<<<<<<< HEAD if(owner.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. return FALSE +======= + if(INCAPACITATED_IGNORING(owner, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_danger("As your [plaintext_zone] unexpectedly malfunctions, it causes you to fall to the ground!")) return @@ -173,8 +178,13 @@ if (severity == EMP_HEAVY) knockdown_time *= 2 owner.Knockdown(knockdown_time) +<<<<<<< HEAD if(owner.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. return FALSE +======= + if(INCAPACITATED_IGNORING(owner, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_danger("As your [plaintext_zone] unexpectedly malfunctions, it causes you to fall to the ground!")) return @@ -277,19 +287,29 @@ if(all_robotic) owner.add_traits(list( +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL BEGIN - Synths are not immune to temperature TRAIT_RESISTCOLD, TRAIT_RESISTHEAT, SKYRAT EDIT REMOVAL END */ +======= + TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE, ), AUGMENTATION_TRAIT) else owner.remove_traits(list( +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL BEGIN - Synths are not immune to temperature TRAIT_RESISTCOLD, TRAIT_RESISTHEAT, SKYRAT EDIT REMOVAL END */ +======= + TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE, ), AUGMENTATION_TRAIT) diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm index 7e7f21073a9..0fd5a36d7ed 100644 --- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm @@ -47,7 +47,34 @@ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi' limb_id = SPECIES_LIZARD +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR MUTANT_BODYPARTS.DM +======= +/// Checks if this mob is wearing anything that does not have a valid sprite set for digitigrade legs +/// (In other words, is the mob's digitigrade body squished by its clothing?) +/mob/living/carbon/proc/is_digitigrade_squished() + return FALSE + +/mob/living/carbon/human/is_digitigrade_squished() + var/obj/item/clothing/shoes/worn_shoes = shoes + var/obj/item/clothing/under/worn_suit = wear_suit + var/obj/item/clothing/under/worn_uniform = w_uniform + + var/uniform_compatible = isnull(worn_uniform) \ + || (worn_uniform.supports_variations_flags & DIGITIGRADE_VARIATIONS) \ + || !(worn_uniform.body_parts_covered & LEGS) \ + || (worn_suit?.flags_inv & HIDEJUMPSUIT) // If suit hides our jumpsuit, it doesn't matter if it squishes + + var/suit_compatible = isnull(worn_suit) \ + || (worn_suit.supports_variations_flags & DIGITIGRADE_VARIATIONS) \ + || !(worn_suit.body_parts_covered & LEGS) + + var/shoes_compatible = isnull(worn_shoes) \ + || (worn_shoes.supports_variations_flags & DIGITIGRADE_VARIATIONS) + + return !uniform_compatible || !suit_compatible || !shoes_compatible + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/leg/left/digitigrade icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi' limb_id = BODYPART_ID_DIGITIGRADE @@ -56,6 +83,7 @@ /obj/item/bodypart/leg/left/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) . = ..() +<<<<<<< HEAD if(ishuman(owner)) var/mob/living/carbon/human/human_owner = owner var/obj/item/clothing/shoes/worn_shoes = human_owner.get_item_by_slot(ITEM_SLOT_FEET) @@ -74,6 +102,15 @@ else limb_id = SPECIES_LIZARD +======= + var/old_id = limb_id + limb_id = owner?.is_digitigrade_squished() ? SPECIES_LIZARD : BODYPART_ID_DIGITIGRADE + if(old_id != limb_id) + // Something unsquished / squished us so we need to go through and update everything that is affected + for(var/obj/item/thing as anything in owner?.get_equipped_items()) + if(thing.supports_variations_flags & DIGITIGRADE_VARIATIONS) + thing.update_slot_icon() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/leg/right/digitigrade icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi' @@ -83,6 +120,7 @@ /obj/item/bodypart/leg/right/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) . = ..() +<<<<<<< HEAD if(ishuman(owner)) var/mob/living/carbon/human/human_owner = owner var/obj/item/clothing/shoes/worn_shoes = human_owner.get_item_by_slot(ITEM_SLOT_FEET) @@ -102,3 +140,12 @@ else limb_id = SPECIES_LIZARD */ +======= + var/old_id = limb_id + limb_id = owner?.is_digitigrade_squished() ? SPECIES_LIZARD : BODYPART_ID_DIGITIGRADE + if(old_id != limb_id) + // Something unsquished / squished us so we need to go through and update everything that is affected + for(var/obj/item/thing as anything in owner?.get_equipped_items()) + if(thing.supports_variations_flags & DIGITIGRADE_VARIATIONS) + thing.update_slot_icon() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm index 85f25dd7149..8f363f7a16d 100644 --- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm @@ -252,7 +252,11 @@ limb_id = SPECIES_FLYPERSON is_dimorphic = FALSE should_draw_greyscale = FALSE +<<<<<<< HEAD head_flags = HEAD_HAIR|HEAD_FACIAL_HAIR|HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN // SKYRAT EDIT - Flies deserve hair - ORIGINAL: head_flags = HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN +======= + head_flags = HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 teeth_count = 0 bodypart_traits = list(TRAIT_ANTENNAE) diff --git a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm index c960d3b7a7b..ea62b65d3f9 100644 --- a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - Moved to modular_skyrat\master_files\code\modules\surgery\bodyparts\species_parts\moth_bodyparts.dm +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/head/moth icon = 'icons/mob/human/species/moth/bodyparts.dmi' icon_state = "moth_head" @@ -60,4 +63,7 @@ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi' limb_id = SPECIES_MOTH should_draw_greyscale = FALSE +<<<<<<< HEAD */ // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index 593008b8eef..1b0da47e2f1 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -13,7 +13,11 @@ ) /datum/surgery/gastrectomy/mechanic +<<<<<<< HEAD name = "Engine Diagnostic (Heart)" // Nova Edit: Original name = "Engine Diagnostic" +======= + name = "Engine Diagnostic" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 requires_bodypart_type = BODYTYPE_ROBOTIC steps = list( /datum/surgery_step/mechanic_open, diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index a8c7c7825b6..87fc6cad778 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -1,6 +1,10 @@ /datum/surgery/healing target_mobtypes = list(/mob/living) +<<<<<<< HEAD requires_bodypart_type = BODYTYPE_ORGANIC //SKYRAT EDIT CHANGE - ORIGINAL VALUE: requires_bodypart_type = FALSE +======= + requires_bodypart_type = NONE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 replaced_by = /datum/surgery surgery_flags = SURGERY_IGNORE_CLOTHES | SURGERY_REQUIRE_RESTING possible_locs = list(BODY_ZONE_CHEST) diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index 7c11ef3b98e..049eaf78c10 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -59,7 +59,10 @@ /datum/surgery_step/clamp_bleeders, /datum/surgery_step/replace_limb, ) +<<<<<<< HEAD removes_target_bodypart = TRUE // SKYRAT EDIT ADDITION - Surgically unremovable limbs +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //SURGERY STEP SUCCESSES diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm index c34c8754505..96d7eecaebc 100644 --- a/code/modules/surgery/lobectomy.dm +++ b/code/modules/surgery/lobectomy.dm @@ -68,8 +68,16 @@ if(ishuman(target)) var/mob/living/carbon/human/human_target = target var/obj/item/organ/internal/lungs/target_lungs = human_target.get_organ_slot(ORGAN_SLOT_LUNGS) +<<<<<<< HEAD target_lungs.operated = TRUE human_target.setOrganLoss(ORGAN_SLOT_LUNGS, 60) +======= + human_target.setOrganLoss(ORGAN_SLOT_LUNGS, 60) + if(target_lungs) + target_lungs.operated = TRUE + if(target_lungs.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that + target_lungs.organ_flags &= ~ORGAN_EMP +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 display_results( user, target, diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 59e0ded0a66..42ebacdb7e0 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -239,6 +239,7 @@ tool = tool.contents[1] target_organ = tool user.temporarilyRemoveItemFromInventory(target_organ, TRUE) +<<<<<<< HEAD if(target_organ.Insert(target)) if(apparatus) apparatus.icon_state = initial(apparatus.icon_state) @@ -255,6 +256,22 @@ target_organ.on_surgical_insertion(user, target, target_zone, tool) else target_organ.forceMove(target.loc) +======= + target_organ.Insert(target) + if(apparatus) + apparatus.icon_state = initial(apparatus.icon_state) + apparatus.desc = initial(apparatus.desc) + apparatus.cut_overlays() + display_results( + user, + target, + span_notice("You insert [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."), + span_notice("[user] inserts [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), + span_notice("[user] inserts something into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), + ) + display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain as your new [tool.name] comes to life!") + target_organ.on_surgical_insertion(user, target, target_zone, tool) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(current_type == "extract") if(target_organ && target_organ.owner == target) @@ -294,7 +311,11 @@ ///only operate on internal organs /datum/surgery_step/manipulate_organs/internal/can_use_organ(mob/user, obj/item/organ/organ) +<<<<<<< HEAD return isinternalorgan(organ) && !(organ.organ_flags & ORGAN_UNREMOVABLE) // SKYRAT EDIT - Don't show unremovable organs - ORIGINAL: return isinternalorgan(organ) +======= + return isinternalorgan(organ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///prosthetic surgery gives full effectiveness to crowbars (and hemostats) /datum/surgery_step/manipulate_organs/internal/mechanic @@ -308,7 +329,11 @@ ///Only operate on external organs /datum/surgery_step/manipulate_organs/external/can_use_organ(mob/user, obj/item/organ/organ) +<<<<<<< HEAD return isexternalorgan(organ) && !(organ.organ_flags & ORGAN_UNREMOVABLE) // SKYRAT EDIT - Don't show unremovable organs - ORIGINAL: return isexternalorgan(organ) +======= + return isexternalorgan(organ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///prosthetic surgery gives full effectiveness to crowbars (and hemostats) /datum/surgery_step/manipulate_organs/external/mechanic diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index 98d947793ef..736e417184e 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -1,4 +1,7 @@ +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ name = "organ" icon = 'icons/obj/medical/organs/organs.dmi' @@ -79,6 +82,12 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) volume = reagent_vol,\ after_eat = CALLBACK(src, PROC_REF(OnEatFrom))) +<<<<<<< HEAD +======= + if(bodypart_overlay) + setup_bodypart_overlay() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/Destroy() if(bodypart_owner && !owner && !QDELETED(bodypart_owner)) bodypart_remove(bodypart_owner) @@ -140,7 +149,11 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) return /obj/item/organ/proc/on_life(seconds_per_tick, times_fired) +<<<<<<< HEAD CRASH("Oh god oh fuck something is calling parent organ life") +======= + return +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/examine(mob/user) . = ..() @@ -342,3 +355,19 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /// Tries to replace the existing organ on the passed mob with this one, with special handling for replacing a brain without ghosting target /obj/item/organ/proc/replace_into(mob/living/carbon/new_owner) return Insert(new_owner, special = TRUE, movement_flags = DELETE_IF_REPLACED) +<<<<<<< HEAD +======= + + +/// Get all possible organ slots by checking every organ, and then store it and give it whenever needed +/proc/get_all_slots() + var/static/list/all_organ_slots = list() + + if(!all_organ_slots.len) + for(var/obj/item/organ/an_organ as anything in subtypesof(/obj/item/organ)) + if(!initial(an_organ.slot)) + continue + all_organ_slots |= initial(an_organ.slot) + + return all_organ_slots +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/organs/external/_visual_organs.dm b/code/modules/surgery/organs/external/_visual_organs.dm new file mode 100644 index 00000000000..3aa54f27418 --- /dev/null +++ b/code/modules/surgery/organs/external/_visual_organs.dm @@ -0,0 +1,309 @@ +/* +System for drawing organs with overlays. These overlays are drawn directly on the bodypart, attached to a person or not +Works in tandem with the /datum/sprite_accessory datum to generate sprites +Unlike normal organs, we're actually inside a persons limbs at all times +*/ +/obj/item/organ + ///The overlay datum that actually draws stuff on the limb + var/datum/bodypart_overlay/mutant/bodypart_overlay + + /// The savefile_key of the preference this relates to. Used for the preferences UI. + var/preference + ///With what DNA block do we mutate in mutate_feature() ? For genetics + var/dna_block + + ///Set to EXTERNAL_BEHIND, EXTERNAL_FRONT or EXTERNAL_ADJACENT if you want to draw one of those layers as the object sprite. FALSE to use your own + ///This will not work if it doesn't have a limb to generate its icon with + var/use_mob_sprite_as_obj_sprite = FALSE + + ///Does this organ have any bodytypes to pass to its bodypart_owner? + var/external_bodytypes = NONE + ///Does this organ have any bodyshapes to pass to its bodypart_owner? + var/external_bodyshapes = NONE + + ///Which flags does a 'modification tool' need to have to restyle us, if it all possible (located in code/_DEFINES/mobs) + var/restyle_flags = NONE + + ///If not null, overrides the appearance with this sprite accessory datum + var/sprite_accessory_override + +/**accessory_type is optional if you havent set sprite_datums for the object, and is used mostly to generate sprite_datums from a persons DNA +* For _mob_sprite we make a distinction between "Round Snout" and "round". Round Snout is the name of the sprite datum, while "round" would be part of the sprite +* I'm sorry +*/ +/obj/item/organ/proc/setup_bodypart_overlay(accessory_type) + bodypart_overlay = new bodypart_overlay(src) + + accessory_type = accessory_type ? accessory_type : sprite_accessory_override + var/update_overlays = TRUE + if(accessory_type) + bodypart_overlay.set_appearance(accessory_type) + bodypart_overlay.imprint_on_next_insertion = FALSE + else if(loc) //we've been spawned into the world, and not in nullspace to be added to a limb (yes its fucking scuffed) + bodypart_overlay.randomize_appearance() + else + update_overlays = FALSE + + if(use_mob_sprite_as_obj_sprite && update_overlays) + update_appearance(UPDATE_OVERLAYS) + + if(restyle_flags) + RegisterSignal(src, COMSIG_ATOM_RESTYLE, PROC_REF(on_attempt_feature_restyle)) + +/// Some sanity checks, but mostly to check if the person has their preference/dna set to load +/proc/should_visual_organ_apply_to(obj/item/organ/organpath, mob/living/carbon/target) + if(!initial(organpath.bodypart_overlay)) + return TRUE + + if(isnull(organpath) || isnull(target)) + stack_trace("passed a null path or mob to 'should_visual_organ_apply_to'") + return FALSE + + var/datum/bodypart_overlay/mutant/bodypart_overlay = initial(organpath.bodypart_overlay) + var/feature_key = !isnull(bodypart_overlay) && initial(bodypart_overlay.feature_key) + if(isnull(feature_key)) + return TRUE + + if(target.dna.features[feature_key] != SPRITE_ACCESSORY_NONE) + return TRUE + return FALSE + +///Update our features after something changed our appearance +/obj/item/organ/proc/mutate_feature(features, mob/living/carbon/human/human) + if(!dna_block) + return + + var/list/feature_list = bodypart_overlay.get_global_feature_list() + + bodypart_overlay.set_appearance_from_name(feature_list[deconstruct_block(get_uni_feature_block(features, dna_block), feature_list.len)]) + +///If you need to change an external_organ for simple one-offs, use this. Pass the accessory type : /datum/accessory/something +/obj/item/organ/proc/simple_change_sprite(accessory_type) + var/datum/sprite_accessory/typed_accessory = accessory_type //we only take types for maintainability + + bodypart_overlay.set_appearance(typed_accessory) + + if(owner) //are we in a person? + owner.update_body_parts() + else if(bodypart_owner) //are we in a limb? + bodypart_owner.update_icon_dropped() + //else if(use_mob_sprite_as_obj_sprite) //are we out in the world, unprotected by flesh? + +/obj/item/organ/update_overlays() + . = ..() + + if(!use_mob_sprite_as_obj_sprite) + return + + //Build the mob sprite and use it as our overlay + for(var/external_layer in bodypart_overlay.all_layers) + if(bodypart_overlay.layers & external_layer) + . += bodypart_overlay.get_overlay(external_layer, bodypart_owner) + +///The horns of a lizard! +/obj/item/organ/external/horns + name = "horns" + desc = "Why do lizards even have horns? Well, this one obviously doesn't." + icon_state = "horns" + + zone = BODY_ZONE_HEAD + slot = ORGAN_SLOT_EXTERNAL_HORNS + + preference = "feature_lizard_horns" + dna_block = DNA_HORNS_BLOCK + restyle_flags = EXTERNAL_RESTYLE_ENAMEL + + bodypart_overlay = /datum/bodypart_overlay/mutant/horns + +/datum/bodypart_overlay/mutant/horns + layers = EXTERNAL_ADJACENT + feature_key = "horns" + +/datum/bodypart_overlay/mutant/horns/can_draw_on_bodypart(mob/living/carbon/human/human) + if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR)) + return FALSE + + return TRUE + +/datum/bodypart_overlay/mutant/horns/get_global_feature_list() + return SSaccessories.horns_list + +///The frills of a lizard (like weird fin ears) +/obj/item/organ/external/frills + name = "frills" + desc = "Ear-like external organs often seen on aquatic reptillians." + icon_state = "frills" + + zone = BODY_ZONE_HEAD + slot = ORGAN_SLOT_EXTERNAL_FRILLS + + preference = "feature_lizard_frills" + dna_block = DNA_FRILLS_BLOCK + restyle_flags = EXTERNAL_RESTYLE_FLESH + + bodypart_overlay = /datum/bodypart_overlay/mutant/frills + +/datum/bodypart_overlay/mutant/frills + layers = EXTERNAL_ADJACENT + feature_key = "frills" + +/datum/bodypart_overlay/mutant/frills/can_draw_on_bodypart(mob/living/carbon/human/human) + if(!(human.head?.flags_inv & HIDEEARS)) + return TRUE + return FALSE + +/datum/bodypart_overlay/mutant/frills/get_global_feature_list() + return SSaccessories.frills_list + +///Guess what part of the lizard this is? +/obj/item/organ/external/snout + name = "lizard snout" + desc = "Take a closer look at that snout!" + icon_state = "snout" + + zone = BODY_ZONE_HEAD + slot = ORGAN_SLOT_EXTERNAL_SNOUT + + preference = "feature_lizard_snout" + external_bodyshapes = BODYSHAPE_SNOUTED + + dna_block = DNA_SNOUT_BLOCK + restyle_flags = EXTERNAL_RESTYLE_FLESH + + bodypart_overlay = /datum/bodypart_overlay/mutant/snout + +/datum/bodypart_overlay/mutant/snout + layers = EXTERNAL_ADJACENT + feature_key = "snout" + +/datum/bodypart_overlay/mutant/snout/can_draw_on_bodypart(mob/living/carbon/human/human) + if(!(human.wear_mask?.flags_inv & HIDESNOUT) && !(human.head?.flags_inv & HIDESNOUT)) + return TRUE + return FALSE + +/datum/bodypart_overlay/mutant/snout/get_global_feature_list() + return SSaccessories.snouts_list + +///A moth's antennae +/obj/item/organ/external/antennae + name = "moth antennae" + desc = "A moths antennae. What is it telling them? What are they sensing?" + icon_state = "antennae" + + zone = BODY_ZONE_HEAD + slot = ORGAN_SLOT_EXTERNAL_ANTENNAE + + preference = "feature_moth_antennae" + dna_block = DNA_MOTH_ANTENNAE_BLOCK + restyle_flags = EXTERNAL_RESTYLE_FLESH + + bodypart_overlay = /datum/bodypart_overlay/mutant/antennae + + ///Are we burned? + var/burnt = FALSE + ///Store our old datum here for if our antennae are healed + var/original_sprite_datum + +/obj/item/organ/external/antennae/mob_insert(mob/living/carbon/receiver, special, movement_flags) + . = ..() + + RegisterSignal(receiver, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_antennae)) + RegisterSignal(receiver, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_antennae)) + +/obj/item/organ/external/antennae/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + + UnregisterSignal(organ_owner, list(COMSIG_HUMAN_BURNING, COMSIG_LIVING_POST_FULLY_HEAL)) + +///check if our antennae can burn off ;_; +/obj/item/organ/external/antennae/proc/try_burn_antennae(mob/living/carbon/human/human) + SIGNAL_HANDLER + + if(!burnt && human.bodytemperature >= 800 && human.fire_stacks > 0) //do not go into the extremely hot light. you will not survive + to_chat(human, span_danger("Your precious antennae burn to a crisp!")) + + burn_antennae() + human.update_body_parts() + +///Burn our antennae off ;_; +/obj/item/organ/external/antennae/proc/burn_antennae() + var/datum/bodypart_overlay/mutant/antennae/antennae = bodypart_overlay + antennae.burnt = TRUE + burnt = TRUE + +///heal our antennae back up!! +/obj/item/organ/external/antennae/proc/heal_antennae(datum/source, heal_flags) + SIGNAL_HANDLER + + if(!burnt) + return + + if(heal_flags & (HEAL_LIMBS|HEAL_ORGANS)) + var/datum/bodypart_overlay/mutant/antennae/antennae = bodypart_overlay + antennae.burnt = FALSE + burnt = FALSE + +///Moth antennae datum, with full burning functionality +/datum/bodypart_overlay/mutant/antennae + layers = EXTERNAL_FRONT | EXTERNAL_BEHIND + feature_key = "moth_antennae" + ///Accessory datum of the burn sprite + var/datum/sprite_accessory/burn_datum = /datum/sprite_accessory/moth_antennae/burnt_off + ///Are we burned? If so we draw differently + var/burnt = FALSE + +/datum/bodypart_overlay/mutant/antennae/New() + . = ..() + + burn_datum = fetch_sprite_datum(burn_datum) //turn the path into the singleton instance + +/datum/bodypart_overlay/mutant/antennae/get_global_feature_list() + return SSaccessories.moth_antennae_list + +/datum/bodypart_overlay/mutant/antennae/get_base_icon_state() + return burnt ? burn_datum.icon_state : sprite_datum.icon_state + +///The leafy hair of a podperson +/obj/item/organ/external/pod_hair + name = "podperson hair" + desc = "Base for many-o-salads." + + zone = BODY_ZONE_HEAD + slot = ORGAN_SLOT_EXTERNAL_POD_HAIR + + preference = "feature_pod_hair" + use_mob_sprite_as_obj_sprite = TRUE + + dna_block = DNA_POD_HAIR_BLOCK + restyle_flags = EXTERNAL_RESTYLE_PLANT + + bodypart_overlay = /datum/bodypart_overlay/mutant/pod_hair + +///Podperson bodypart overlay, with special coloring functionality to render the flowers in the inverse color +/datum/bodypart_overlay/mutant/pod_hair + layers = EXTERNAL_FRONT|EXTERNAL_ADJACENT + feature_key = "pod_hair" + + ///This layer will be colored differently than the rest of the organ. So we can get differently colored flowers or something + var/color_swapped_layer = EXTERNAL_FRONT + ///The individual rgb colors are subtracted from this to get the color shifted layer + var/color_inverse_base = 255 + +/datum/bodypart_overlay/mutant/pod_hair/get_global_feature_list() + return SSaccessories.pod_hair_list + +/datum/bodypart_overlay/mutant/pod_hair/color_image(image/overlay, draw_layer, obj/item/bodypart/limb) + if(draw_layer != bitflag_to_layer(color_swapped_layer)) + return ..() + + if(draw_color) // can someone explain to me why draw_color is allowed to EVER BE AN EMPTY STRING + var/list/rgb_list = rgb2num(draw_color) + overlay.color = rgb(color_inverse_base - rgb_list[1], color_inverse_base - rgb_list[2], color_inverse_base - rgb_list[3]) //inversa da color + else + overlay.color = null + +/datum/bodypart_overlay/mutant/pod_hair/can_draw_on_bodypart(mob/living/carbon/human/human) + if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR)) + return FALSE + + return TRUE diff --git a/code/modules/surgery/organs/external/restyling.dm b/code/modules/surgery/organs/external/restyling.dm index 7d6be1b6d58..4ed1d555ecf 100644 --- a/code/modules/surgery/organs/external/restyling.dm +++ b/code/modules/surgery/organs/external/restyling.dm @@ -1,7 +1,14 @@ +<<<<<<< HEAD //Contains a bunch of procs for different types, but in the end it just lets you restyle external_organs so thats why its here ///Helper proc to fetch a list of styles a player might want to restyle their features into during the round : returns list("Cabbage" = /datum/sprite_accessory/cabbage) /obj/item/organ/external/proc/get_valid_restyles() +======= +//Contains a bunch of procs for different types, but in the end it just lets you restyle the bodypart overlay so thats why its here + +///Helper proc to fetch a list of styles a player might want to restyle their features into during the round : returns list("Cabbage" = /datum/sprite_accessory/cabbage) +/obj/item/organ/proc/get_valid_restyles() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/valid_restyles valid_restyles = list() @@ -31,18 +38,30 @@ ///Asks the external organs inside the limb if they can restyle /obj/item/bodypart/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) var/list/valid_features = list() +<<<<<<< HEAD for(var/obj/item/organ/external/feature in contents) if(feature.restyle_flags & restyle_type) valid_features.Add(feature) var/obj/item/organ/external/target_organ +======= + for(var/obj/item/organ/feature in contents) + if(feature.restyle_flags & restyle_type) + valid_features.Add(feature) + + var/obj/item/organ/target_organ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(LAZYLEN(valid_features)) if(1) target_organ = valid_features[1] if(2 to INFINITY) var/choose_options = list() var/name_to_organ = list() //literally so I dont have to loop again after someones made their choice +<<<<<<< HEAD for(var/obj/item/organ/external/organ_choice as anything in valid_features) +======= + for(var/obj/item/organ/organ_choice as anything in valid_features) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 choose_options[organ_choice.name] = image(organ_choice) name_to_organ[organ_choice.name] = organ_choice var/picked_option = show_radial_menu(trimmer, original_target, choose_options, radius = 38, require_near = TRUE) @@ -57,7 +76,11 @@ target_organ.attempt_feature_restyle(source, trimmer, original_target, body_zone, restyle_type, style_speed) ///Invoke async so we dont break signals +<<<<<<< HEAD /obj/item/organ/external/proc/on_attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) +======= +/obj/item/organ/proc/on_attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(restyle_flags & restyle_type) @@ -66,7 +89,11 @@ to_chat(trimmer, span_warning("This tool is incompatible with the [src.name]!")) ///Restyles the external organ from a list of valid options +<<<<<<< HEAD /obj/item/organ/external/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) +======= +/obj/item/organ/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/restyles = get_valid_restyles() var/new_style = tgui_input_list(trimmer, "Select a new style", "Grooming", restyles) @@ -80,5 +107,8 @@ span_notice("You successfully change [original_target == trimmer ? "your" : original_target.name + "'s"] [name].") ) +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 simple_change_sprite(restyles[new_style]) //turn name to type and pass it on diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm index ade081030d0..ff93b774842 100644 --- a/code/modules/surgery/organs/external/spines.dm +++ b/code/modules/surgery/organs/external/spines.dm @@ -9,18 +9,30 @@ preference = "feature_lizard_spines" +<<<<<<< HEAD //dna_block = DNA_SPINES_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. +======= + dna_block = DNA_SPINES_BLOCK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 restyle_flags = EXTERNAL_RESTYLE_FLESH bodypart_overlay = /datum/bodypart_overlay/mutant/spines +<<<<<<< HEAD /obj/item/organ/external/spines/Insert(mob/living/carbon/receiver, special, movement_flags) +======= +/obj/item/organ/external/spines/mob_insert(mob/living/carbon/receiver, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If we have a tail, attempt to add a tail spines overlay var/obj/item/organ/external/tail/our_tail = receiver.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) our_tail?.try_insert_tail_spines(our_tail.bodypart_owner) return ..() +<<<<<<< HEAD /obj/item/organ/external/spines/Remove(mob/living/carbon/organ_owner, special, movement_flags) +======= +/obj/item/organ/external/spines/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If we have a tail, remove any tail spines overlay var/obj/item/organ/external/tail/our_tail = organ_owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) our_tail?.remove_tail_spines(our_tail.bodypart_owner) @@ -32,7 +44,11 @@ feature_key = "spines" /datum/bodypart_overlay/mutant/spines/get_global_feature_list() +<<<<<<< HEAD return SSaccessories.sprite_accessories["spines"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.spines_list +======= + return SSaccessories.spines_list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/spines/can_draw_on_bodypart(mob/living/carbon/human/human) . = ..() diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 8116b200887..8e87f8d1eff 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -7,7 +7,11 @@ zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_EXTERNAL_TAIL +<<<<<<< HEAD //dna_block = DNA_TAIL_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. +======= + dna_block = DNA_TAIL_BLOCK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 restyle_flags = EXTERNAL_RESTYLE_FLESH // defaults to cat, but the parent type shouldn't be created regardless @@ -20,7 +24,11 @@ ///The overlay for tail spines, if any var/datum/bodypart_overlay/mutant/tail_spines/tail_spines_overlay +<<<<<<< HEAD /obj/item/organ/external/tail/Insert(mob/living/carbon/receiver, special, movement_flags) +======= +/obj/item/organ/external/tail/mob_insert(mob/living/carbon/receiver, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) receiver.clear_mood_event("tail_lost") @@ -34,7 +42,11 @@ // If it's not your tail AND of different species, we are horrified if(IS_WEAKREF_OF(receiver, original_owner)) receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_right) +<<<<<<< HEAD else if(type in receiver.dna.species.external_organs) +======= + else if(type in receiver.dna.species.mutant_organs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_species) else receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_wrong) @@ -64,12 +76,17 @@ tail_spines_overlay = new tail_spines_overlay.tail_spine_key = tail_spine_key +<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(!bodypart.owner.dna.mutant_bodyparts["spines"]) bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT ADDITION END var/feature_name = bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] // SKYRAT EDIT CHANGE - ORIGINAL: var/feature_name = bodypart.owner.dna.features["spines"] //tail spines don't live in DNA, but share feature names with regular spines tail_spines_overlay.set_appearance_from_dna(bodypart.owner.dna, feature_name, feature_key = "spines") // SKYRAT EDIT CHANGE - ORIGINAL: tail_spines_overlay.set_appearance_from_name(feature_name) +======= + var/feature_name = bodypart.owner.dna.features["spines"] //tail spines don't live in DNA, but share feature names with regular spines + tail_spines_overlay.set_appearance_from_name(feature_name) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bodypart.add_bodypart_overlay(tail_spines_overlay) /// If we have a tail spines overlay, delete it @@ -87,7 +104,11 @@ organ_owner.clear_mood_event("tail_regained") +<<<<<<< HEAD if(type in organ_owner.dna.species.external_organs) +======= + if(type in organ_owner.dna.species.mutant_organs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ_owner.add_mood_event("tail_lost", /datum/mood_event/tail_lost) organ_owner.add_mood_event("tail_balance_lost", /datum/mood_event/tail_balance_lost) @@ -144,17 +165,23 @@ ///Tail parent type, with wagging functionality /datum/bodypart_overlay/mutant/tail layers = EXTERNAL_FRONT|EXTERNAL_BEHIND +<<<<<<< HEAD feature_key = "tail" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "tail_monkey" +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/wagging = FALSE /datum/bodypart_overlay/mutant/tail/get_base_icon_state() return "[wagging ? "wagging_" : ""][sprite_datum.icon_state]" //add the wagging tag if we be wagging +<<<<<<< HEAD // SKYRAT EDIT ADDITION - CUSTOMIZATION /datum/bodypart_overlay/mutant/tail/get_global_feature_list() return SSaccessories.sprite_accessories["tail"] // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/tail/can_draw_on_bodypart(mob/living/carbon/human/human) if(human.wear_suit && (human.wear_suit.flags_inv & HIDEJUMPSUIT)) return FALSE @@ -169,15 +196,24 @@ wag_flags = WAG_ABLE /datum/bodypart_overlay/mutant/tail/get_global_feature_list() +<<<<<<< HEAD return SSaccessories.sprite_accessories["tail"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.tails_list_human +======= + return SSaccessories.tails_list_human +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/cat/get_butt_sprite() return icon('icons/mob/butts.dmi', BUTT_SPRITE_CAT) ///Cat tail bodypart overlay /datum/bodypart_overlay/mutant/tail/cat +<<<<<<< HEAD feature_key = "tail" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "tail_cat" // color_source = ORGAN_COLOR_HAIR // SKYRAT EDIT REMOVAL +======= + feature_key = "tail_cat" + color_source = ORGAN_COLOR_HAIR +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/monkey name = "monkey tail" @@ -190,7 +226,11 @@ ///Monkey tail bodypart overlay /datum/bodypart_overlay/mutant/tail/monkey color_source = NONE +<<<<<<< HEAD feature_key = "tail" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "tail_monkey" +======= + feature_key = "tail_monkey" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/tail/monkey/get_global_feature_list() return SSaccessories.tails_list_monkey @@ -203,6 +243,7 @@ bodypart_overlay = /datum/bodypart_overlay/mutant/tail/lizard wag_flags = WAG_ABLE +<<<<<<< HEAD //dna_block = DNA_LIZARD_TAIL_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. ///Lizard tail bodypart overlay datum @@ -211,6 +252,16 @@ /datum/bodypart_overlay/mutant/tail/lizard/get_global_feature_list() return SSaccessories.sprite_accessories["tail"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.tails_list_lizard +======= + dna_block = DNA_LIZARD_TAIL_BLOCK + +///Lizard tail bodypart overlay datum +/datum/bodypart_overlay/mutant/tail/lizard + feature_key = "tail_lizard" + +/datum/bodypart_overlay/mutant/tail/lizard/get_global_feature_list() + return SSaccessories.tails_list_lizard +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/lizard/fake name = "fabricated lizard tail" @@ -226,7 +277,11 @@ var/tail_spine_key = NONE /datum/bodypart_overlay/mutant/tail_spines/get_global_feature_list() +<<<<<<< HEAD return SSaccessories.sprite_accessories["tailspines"] // SKYRAT EDIT CHANGE - ORIGINAL: return SSaccessories.tail_spines_list +======= + return SSaccessories.tail_spines_list +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/tail_spines/get_base_icon_state() return (!isnull(tail_spine_key) ? "[tail_spine_key]_" : "") + (wagging ? "wagging_" : "") + sprite_datum.icon_state // Select the wagging state if appropriate diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm index 680226b859b..9dd80d36731 100644 --- a/code/modules/surgery/organs/external/wings/functional_wings.dm +++ b/code/modules/surgery/organs/external/wings/functional_wings.dm @@ -35,15 +35,25 @@ QDEL_NULL(fly) return ..() +<<<<<<< HEAD /obj/item/organ/external/wings/functional/Insert(mob/living/carbon/receiver, special, movement_flags) . = ..() if(!.) return +======= +/obj/item/organ/external/wings/functional/mob_insert(mob/living/carbon/receiver, special, movement_flags) + . = ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(fly)) fly = new fly.Grant(receiver) +<<<<<<< HEAD /obj/item/organ/external/wings/functional/Remove(mob/living/carbon/organ_owner, special, movement_flags) +======= +/obj/item/organ/external/wings/functional/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() fly?.Remove(organ_owner) if(wings_open) @@ -146,11 +156,15 @@ var/open_feature_key = "wingsopen" /datum/bodypart_overlay/mutant/wings/functional/get_global_feature_list() +<<<<<<< HEAD /* SKYRAT EDIT - CUSTOMIZATION - ORIGINAL: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(wings_open) return SSaccessories.wings_open_list else return SSaccessories.wings_list +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END // SKYRAT EDIT ADDITION START if(wings_open) @@ -158,6 +172,9 @@ return SSaccessories.sprite_accessories["wings"] // SKYRAT EDIT ADDITION END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Update our wingsprite to the open wings variant /datum/bodypart_overlay/mutant/wings/functional/proc/open_wings() wings_open = TRUE diff --git a/code/modules/surgery/organs/external/wings/moth_wings.dm b/code/modules/surgery/organs/external/wings/moth_wings.dm index 3ddf98ee17b..896661c8931 100644 --- a/code/modules/surgery/organs/external/wings/moth_wings.dm +++ b/code/modules/surgery/organs/external/wings/moth_wings.dm @@ -5,7 +5,11 @@ preference = "feature_moth_wings" +<<<<<<< HEAD //dna_block = DNA_MOTH_WINGS_BLOCK // SKYRAT EDIT REMOVAL +======= + dna_block = DNA_MOTH_WINGS_BLOCK +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bodypart_overlay = /datum/bodypart_overlay/mutant/wings/moth @@ -74,7 +78,11 @@ ///Moth wing bodypart overlay, including burn functionality! /datum/bodypart_overlay/mutant/wings/moth +<<<<<<< HEAD feature_key = "wings" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "moth_wings" +======= + feature_key = "moth_wings" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 layers = EXTERNAL_BEHIND | EXTERNAL_FRONT ///Accessory datum of the burn sprite var/datum/sprite_accessory/burn_datum = /datum/sprite_accessory/moth_wings/burnt_off @@ -87,11 +95,19 @@ burn_datum = fetch_sprite_datum(burn_datum) /datum/bodypart_overlay/mutant/wings/moth/get_global_feature_list() +<<<<<<< HEAD return SSaccessories.sprite_accessories["wings"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.moth_wings_list /datum/bodypart_overlay/mutant/wings/moth/can_draw_on_bodypart(mob/living/carbon/human/human) if(!(human.wear_suit?.flags_inv & HIDEMUTWINGS)) return ..(human, ignore_suit = TRUE) // SKYRAT EDIT - Customization - ORIGINAL: return TRUE +======= + return SSaccessories.moth_wings_list + +/datum/bodypart_overlay/mutant/wings/moth/can_draw_on_bodypart(mob/living/carbon/human/human) + if(!(human.wear_suit?.flags_inv & HIDEMUTWINGS)) + return TRUE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /datum/bodypart_overlay/mutant/wings/moth/get_base_icon_state() diff --git a/code/modules/surgery/organs/external/wings/wings.dm b/code/modules/surgery/organs/external/wings/wings.dm index 62efd492530..894c0fb05d2 100644 --- a/code/modules/surgery/organs/external/wings/wings.dm +++ b/code/modules/surgery/organs/external/wings/wings.dm @@ -31,3 +31,7 @@ return TRUE return FALSE +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/organs/internal/appendix/_appendix.dm b/code/modules/surgery/organs/internal/appendix/_appendix.dm index 83ed8da84ac..8dc22c6b8ff 100644 --- a/code/modules/surgery/organs/internal/appendix/_appendix.dm +++ b/code/modules/surgery/organs/internal/appendix/_appendix.dm @@ -6,7 +6,11 @@ name = "appendix" icon_state = "appendix" base_icon_state = "appendix" +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_APPENDIX food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/bad_food = 5) diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm index d4c4b57d75f..930bfb06271 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm @@ -27,6 +27,7 @@ eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT) balloon_alert(eye_owner, "hud enabled") +<<<<<<< HEAD /obj/item/organ/internal/cyberimp/eyes/hud/Insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags) . = ..() if(!.) @@ -35,6 +36,15 @@ toggled_on = TRUE /obj/item/organ/internal/cyberimp/eyes/hud/Remove(mob/living/carbon/eye_owner, special, movement_flags) +======= +/obj/item/organ/internal/cyberimp/eyes/hud/mob_insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags) + . = ..() + + eye_owner.add_traits(HUD_traits, ORGAN_TRAIT) + toggled_on = TRUE + +/obj/item/organ/internal/cyberimp/eyes/hud/mob_remove(mob/living/carbon/eye_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT) toggled_on = FALSE diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm index f71e29631b3..55a488706cc 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm @@ -2,7 +2,11 @@ /obj/item/organ/internal/cyberimp name = "cybernetic implant" desc = "A state-of-the-art implant that improves a baseline's functionality." +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ_flags = ORGAN_ROBOTIC failing_desc = "seems to be broken." var/implant_color = COLOR_WHITE diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm index 6bdf093dd47..7f2cf3b021f 100644 --- a/code/modules/surgery/organs/internal/ears/_ears.dm +++ b/code/modules/surgery/organs/internal/ears/_ears.dm @@ -4,7 +4,10 @@ desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible." zone = BODY_ZONE_HEAD slot = ORGAN_SLOT_EARS +<<<<<<< HEAD visual = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gender = PLURAL healing_factor = STANDARD_ORGAN_HEALING @@ -136,6 +139,7 @@ icon_state = "kitty" visual = TRUE damage_multiplier = 2 +<<<<<<< HEAD // Keeps track of which cat ears sprite is associated with this. var/variant = "Cat" @@ -162,6 +166,36 @@ ear_owner.update_body() */ //SKYRAT EDIT REMOVAL END +======= + + preference = "feature_human_ears" + + dna_block = DNA_EARS_BLOCK + + bodypart_overlay = /datum/bodypart_overlay/mutant/cat_ears + +/// Bodypart overlay for the horrible cat ears +/datum/bodypart_overlay/mutant/cat_ears + layers = EXTERNAL_FRONT | EXTERNAL_ADJACENT + color_source = ORGAN_COLOR_HAIR + feature_key = "ears" + + /// We dont color the inner part, which is the front layer + var/colorless_layer = EXTERNAL_FRONT + +/datum/bodypart_overlay/mutant/cat_ears/get_global_feature_list() + return SSaccessories.ears_list + +/datum/bodypart_overlay/mutant/cat_ears/can_draw_on_bodypart(mob/living/carbon/human/human) + if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR)) + return FALSE + return TRUE + +/datum/bodypart_overlay/mutant/cat_ears/color_image(image/overlay, draw_layer, obj/item/bodypart/limb) + if(draw_layer != bitflag_to_layer(colorless_layer)) + return ..() + return overlay +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/ears/penguin name = "penguin ears" diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm index 7ab37382a55..1991a7f5a06 100644 --- a/code/modules/surgery/organs/internal/eyes/_eyes.dm +++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm @@ -50,23 +50,38 @@ /// indication that the eyes are undergoing some negative effect var/damaged = FALSE /// Native FOV that will be applied if a config is enabled +<<<<<<< HEAD var/native_fov = FOV_180_DEGREES //SKYRAT EDIT CHANGE /obj/item/organ/internal/eyes/Insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) // If we don't do this before everything else, heterochromia will be reset leading to eye_color_right no longer being accurate if(ishuman(eye_recipient)) var/mob/living/carbon/human/human_recipient = eye_recipient +======= + var/native_fov = FOV_90_DEGREES + +/obj/item/organ/internal/eyes/mob_insert(mob/living/carbon/receiver, special, movement_flags) + // If we don't do this before everything else, heterochromia will be reset leading to eye_color_right no longer being accurate + if(ishuman(receiver)) + var/mob/living/carbon/human/human_recipient = receiver +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 old_eye_color_left = human_recipient.eye_color_left old_eye_color_right = human_recipient.eye_color_right . = ..() +<<<<<<< HEAD if(!.) return eye_recipient.cure_blind(NO_EYES) apply_damaged_eye_effects() refresh(eye_recipient, call_update = TRUE) +======= + receiver.cure_blind(NO_EYES) + apply_damaged_eye_effects() + refresh(receiver, call_update = TRUE) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Refreshes the visuals of the eyes /// If call_update is TRUE, we also will call update_body @@ -91,6 +106,7 @@ if(CONFIG_GET(flag/native_fov) && native_fov) affected_human.add_fov_trait(type, native_fov) +<<<<<<< HEAD // SKYRAT EDIT ADDITION - EMISSIVES if (affected_human.emissive_eyes) is_emissive = TRUE @@ -103,16 +119,31 @@ . = ..() if(ishuman(eye_owner)) var/mob/living/carbon/human/human_owner = eye_owner +======= + if(call_update) + affected_human.update_body() + +/obj/item/organ/internal/eyes/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + + if(ishuman(organ_owner)) + var/mob/living/carbon/human/human_owner = organ_owner +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(initial(eye_color_left)) human_owner.eye_color_left = old_eye_color_left if(initial(eye_color_right)) human_owner.eye_color_right = old_eye_color_right if(native_fov) +<<<<<<< HEAD eye_owner.remove_fov_trait(type) +======= + organ_owner.remove_fov_trait(type) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!special) human_owner.update_body() // Cure blindness from eye damage +<<<<<<< HEAD eye_owner.cure_blind(EYE_DAMAGE) eye_owner.cure_nearsighted(EYE_DAMAGE) // Eye blind and temp blind go to, even if this is a bit of cheesy way to clear blindness @@ -125,6 +156,19 @@ eye_owner.update_tint() eye_owner.update_sight() is_emissive = FALSE // SKYRAT EDIT ADDITION +======= + organ_owner.cure_blind(EYE_DAMAGE) + organ_owner.cure_nearsighted(EYE_DAMAGE) + // Eye blind and temp blind go to, even if this is a bit of cheesy way to clear blindness + organ_owner.remove_status_effect(/datum/status_effect/eye_blur) + organ_owner.remove_status_effect(/datum/status_effect/temporary_blindness) + // Then become blind anyways (if not special) + if(!special) + organ_owner.become_blind(NO_EYES) + + organ_owner.update_tint() + organ_owner.update_sight() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define OFFSET_X 1 #define OFFSET_Y 2 @@ -137,16 +181,26 @@ if(isnull(eye_icon_state)) return list() +<<<<<<< HEAD var/eye_icon = parent.dna?.species.eyes_icon || 'icons/mob/human/human_face.dmi' // SKYRAT EDIT ADDITION var/mutable_appearance/eye_left = mutable_appearance(eye_icon, "[eye_icon_state]_l", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_left = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_l", -BODY_LAYER) var/mutable_appearance/eye_right = mutable_appearance(eye_icon, "[eye_icon_state]_r", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_right = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_r", -BODY_LAYER) +======= + var/mutable_appearance/eye_left = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_l", -BODY_LAYER) + var/mutable_appearance/eye_right = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_r", -BODY_LAYER) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/overlays = list(eye_left, eye_right) var/obscured = parent.check_obscured_slots(TRUE) if(overlay_ignore_lighting && !(obscured & ITEM_SLOT_EYES)) +<<<<<<< HEAD overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -eyes_layer, alpha = eye_left.alpha) // SKYRAT EDIT CHANGE - ORIGINAL: overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -BODY_LAYER, alpha = eye_left.alpha) overlays += emissive_appearance(eye_right.icon, eye_right.icon_state, parent, -eyes_layer, alpha = eye_right.alpha) // SKYRAT EDIT CHANGE - ORIGINAL: overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -BODY_LAYER, alpha = eye_left.alpha) +======= + overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -BODY_LAYER, alpha = eye_left.alpha) + overlays += emissive_appearance(eye_right.icon, eye_right.icon_state, parent, -BODY_LAYER, alpha = eye_right.alpha) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/bodypart/head/my_head = parent.get_bodypart(BODY_ZONE_HEAD) if(my_head) if(my_head.head_flags & HEAD_EYECOLOR) @@ -156,6 +210,7 @@ my_head.worn_face_offset.apply_offset(eye_left) my_head.worn_face_offset.apply_offset(eye_right) +<<<<<<< HEAD // SKYRAT EDIT START - Customization (Synths + Emissives) if(eye_icon_state == "None") eye_left.alpha = 0 @@ -174,6 +229,8 @@ // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return overlays #undef OFFSET_X @@ -454,7 +511,11 @@ deactivate(close_ui = TRUE) /// Set the initial color of the eyes on insert to be the mob's previous eye color. +<<<<<<< HEAD /obj/item/organ/internal/eyes/robotic/glow/Insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) +======= +/obj/item/organ/internal/eyes/robotic/glow/mob_insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() left_eye_color_string = old_eye_color_left right_eye_color_string = old_eye_color_right @@ -731,7 +792,10 @@ desc = "These eyes seem to have a large range, but might be cumbersome with glasses." eye_icon_state = "snail_eyes" icon_state = "snail_eyeballs" +<<<<<<< HEAD eyes_layer = ABOVE_BODY_FRONT_HEAD_LAYER //SKYRAT EDIT - Roundstart Snails +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/eyes/jelly name = "jelly eyes" diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm index b0fac316ad3..7b7d8dcf622 100644 --- a/code/modules/surgery/organs/internal/heart/_heart.dm +++ b/code/modules/surgery/organs/internal/heart/_heart.dm @@ -3,7 +3,11 @@ desc = "I feel bad for the heartless bastard who lost this." icon_state = "heart-on" base_icon_state = "heart" +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_HEART item_flags = NO_BLOOD_ON_ITEM diff --git a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm index bd30318a722..c44c1d8034e 100644 --- a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm +++ b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm @@ -21,15 +21,25 @@ add_atom_colour(ethereal_color, FIXED_COLOUR_PRIORITY) update_appearance() +<<<<<<< HEAD /obj/item/organ/internal/heart/ethereal/Insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags) . = ..() if(!.) return +======= +/obj/item/organ/internal/heart/ethereal/mob_insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags) + . = ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(heart_owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) RegisterSignal(heart_owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_owner_fully_heal)) RegisterSignal(heart_owner, COMSIG_QDELETING, PROC_REF(owner_deleted)) +<<<<<<< HEAD /obj/item/organ/internal/heart/ethereal/Remove(mob/living/carbon/heart_owner, special, movement_flags) +======= +/obj/item/organ/internal/heart/ethereal/mob_remove(mob/living/carbon/heart_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(heart_owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_QDELETING)) REMOVE_TRAIT(heart_owner, TRAIT_CORPSELOCKED, SPECIES_TRAIT) stop_crystalization_process(heart_owner) diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm index 9f933b6a2a8..2a34b650d02 100644 --- a/code/modules/surgery/organs/internal/liver/_liver.dm +++ b/code/modules/surgery/organs/internal/liver/_liver.dm @@ -1,13 +1,21 @@ #define LIVER_DEFAULT_TOX_TOLERANCE 3 //amount of toxins the liver can filter out #define LIVER_DEFAULT_TOX_RESISTANCE 1 //lower values lower how harmful toxins are to the liver +<<<<<<< HEAD #define LIVER_FAILURE_STAGE_SECONDS 180 //amount of seconds before liver failure reaches a new stage // SKYRAT EDIT CHANGE - Original: 60 +======= +#define LIVER_FAILURE_STAGE_SECONDS 60 //amount of seconds before liver failure reaches a new stage +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MAX_TOXIN_LIVER_DAMAGE 2 //the max damage the liver can receive per second (~1 min at max damage will destroy liver) /obj/item/organ/internal/liver name = "liver" desc = "Pairing suggestion: chianti and fava beans." icon_state = "liver" +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LIVER @@ -307,6 +315,10 @@ #undef HAS_NO_TOXIN #undef HAS_PAINFUL_TOXIN #undef LIVER_DEFAULT_TOX_TOLERANCE +<<<<<<< HEAD //#undef LIVER_DEFAULT_TOX_RESISTANCE // SKYRAT EDIT REMOVAL - Needed in modular +======= +#undef LIVER_DEFAULT_TOX_RESISTANCE +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef LIVER_FAILURE_STAGE_SECONDS #undef MAX_TOXIN_LIVER_DAMAGE diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm index 47078bfc803..8f551ce807d 100644 --- a/code/modules/surgery/organs/internal/lungs/_lungs.dm +++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm @@ -1,7 +1,11 @@ /obj/item/organ/internal/lungs name = "lungs" icon_state = "lungs" +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LUNGS gender = PLURAL @@ -154,17 +158,27 @@ add_gas_reaction(/datum/gas/zauker, while_present = PROC_REF(too_much_zauker)) ///Simply exists so that you don't keep any alerts from your previous lack of lungs. +<<<<<<< HEAD /obj/item/organ/internal/lungs/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags) . = ..() if(!.) return . +======= +/obj/item/organ/internal/lungs/mob_insert(mob/living/carbon/receiver, special = FALSE, movement_flags) + . = ..() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receiver.clear_alert(ALERT_NOT_ENOUGH_OXYGEN) receiver.clear_alert(ALERT_NOT_ENOUGH_CO2) receiver.clear_alert(ALERT_NOT_ENOUGH_NITRO) receiver.clear_alert(ALERT_NOT_ENOUGH_PLASMA) receiver.clear_alert(ALERT_NOT_ENOUGH_N2O) +<<<<<<< HEAD /obj/item/organ/internal/lungs/Remove(mob/living/carbon/organ_owner, special, movement_flags) +======= +/obj/item/organ/internal/lungs/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() // This is very "manual" I realize, but it's useful to ensure cleanup for gases we're removing happens // Avoids stuck alerts and such diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm index db7134f48e6..f1bed46c891 100644 --- a/code/modules/surgery/organs/internal/stomach/_stomach.dm +++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm @@ -5,7 +5,11 @@ name = "stomach" desc = "Onaka ga suite imasu." icon_state = "stomach" +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_STOMACH @@ -197,7 +201,10 @@ ///This gets called after the owner takes a bite of food /obj/item/organ/internal/stomach/proc/after_eat(atom/edible) +<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_STOMACH_AFTER_EAT, edible) // SKYRAT EDIT ADDITION - Hemophage Organs +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return /obj/item/organ/internal/stomach/proc/handle_disgust(mob/living/carbon/human/disgusted, seconds_per_tick, times_fired) @@ -247,11 +254,19 @@ disgusted.throw_alert(ALERT_DISGUST, /atom/movable/screen/alert/disgusted) disgusted.add_mood_event("disgust", /datum/mood_event/disgusted) +<<<<<<< HEAD /obj/item/organ/internal/stomach/Insert(mob/living/carbon/receiver, special, movement_flags) . = ..() receiver.hud_used?.hunger?.update_appearance() /obj/item/organ/internal/stomach/Remove(mob/living/carbon/stomach_owner, special, movement_flags) +======= +/obj/item/organ/internal/stomach/mob_insert(mob/living/carbon/receiver, special, movement_flags) + . = ..() + receiver.hud_used?.hunger?.update_appearance() + +/obj/item/organ/internal/stomach/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(stomach_owner)) var/mob/living/carbon/human/human_owner = owner human_owner.clear_alert(ALERT_DISGUST) diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm index 6467beac078..66d9ebef2ce 100644 --- a/code/modules/surgery/organs/internal/tongue/_tongue.dm +++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm @@ -2,7 +2,11 @@ name = "tongue" desc = "A fleshy muscle mostly used for lying." icon_state = "tongue" +<<<<<<< HEAD visual = FALSE +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_TONGUE attack_verb_continuous = list("licks", "slobbers", "slaps", "frenches", "tongues") @@ -124,6 +128,7 @@ food_taste_reaction = FOOD_LIKED return food_taste_reaction +<<<<<<< HEAD /obj/item/organ/internal/tongue/Insert(mob/living/carbon/tongue_owner, special = FALSE, movement_flags) . = ..() if(!.) @@ -131,11 +136,20 @@ if(modifies_speech) RegisterSignal(tongue_owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) tongue_owner.voice_filter = voice_filter +======= +/obj/item/organ/internal/tongue/mob_insert(mob/living/carbon/receiver, special, movement_flags) + . = ..() + + if(modifies_speech) + RegisterSignal(receiver, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + receiver.voice_filter = voice_filter +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* This could be slightly simpler, by making the removal of the * NO_TONGUE_TRAIT conditional on the tongue's `sense_of_taste`, but * then you can distinguish between ageusia from no tongue, and * ageusia from having a non-tasting tongue. */ +<<<<<<< HEAD REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) if(!sense_of_taste || (organ_flags & ORGAN_FAILING)) ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) @@ -150,6 +164,21 @@ // Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) tongue_owner.voice_filter = initial(tongue_owner.voice_filter) +======= + REMOVE_TRAIT(receiver, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) + apply_tongue_effects() + +/obj/item/organ/internal/tongue/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + + temp_say_mod = "" + UnregisterSignal(organ_owner, COMSIG_MOB_SAY) + REMOVE_TRAIT(organ_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE) + REMOVE_TRAIT(organ_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) + // Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA + ADD_TRAIT(organ_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) + organ_owner.voice_filter = initial(organ_owner.voice_filter) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/apply_organ_damage(damage_amount, maximum = maxHealth, required_organ_flag) . = ..() @@ -159,7 +188,10 @@ /// Applies effects to our owner based on how damaged our tongue is /obj/item/organ/internal/tongue/proc/apply_tongue_effects() +<<<<<<< HEAD //tongues can't taste food when they are failing +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sense_of_taste) //tongues can't taste food when they are failing if(organ_flags & ORGAN_FAILING) @@ -187,7 +219,11 @@ say_mod = "hisses" taste_sensitivity = 10 // combined nose + tongue, extra sensitive modifies_speech = TRUE +<<<<<<< HEAD languages_native = list(/datum/language/draconic, /datum/language/ashtongue) //SKYRAT EDIT: Ashtongue for Ashwalkers +======= + languages_native = list(/datum/language/draconic) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 liked_foodtypes = GORE | MEAT | SEAFOOD | NUTS | BUGS disliked_foodtypes = GRAIN | DAIRY | CLOTH | GROSS voice_filter = @{"[0:a] asplit [out0][out2]; [out0] asetrate=%SAMPLE_RATE%*0.9,aresample=%SAMPLE_RATE%,atempo=1/0.9,aformat=channel_layouts=mono,volume=0.2 [p0]; [out2] asetrate=%SAMPLE_RATE%*1.1,aresample=%SAMPLE_RATE%,atempo=1/1.1,aformat=channel_layouts=mono,volume=0.2[p2]; [p0][0][p2] amix=inputs=3"} @@ -195,6 +231,7 @@ new /regex("s+", "g") = "sss", new /regex("S+", "g") = "SSS", new /regex(@"(\w)x", "g") = "$1kss", +<<<<<<< HEAD //new /regex(@"(\w)X", "g") = "$1KSSS", // SKYRAT EDIT REMOVAL new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1", new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1", @@ -221,6 +258,16 @@ /obj/item/organ/internal/tongue/lizard/New(class, timer, datum/mutation/human/copymut) . = ..() AddComponent(/datum/component/speechmod, replacements = CONFIG_GET(flag/russian_text_formation) ? russian_speech_replacements : speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) // SKYRAT EDIT CHANGE - ORIGINAL: AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) +======= + new /regex(@"(\w)X", "g") = "$1KSSS", + new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1", + new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1", + ) + +/obj/item/organ/internal/tongue/lizard/New(class, timer, datum/mutation/human/copymut) + . = ..() + AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/lizard/silver name = "silver tongue" @@ -410,7 +457,11 @@ var/message = speech_args[SPEECH_MESSAGE] var/mob/living/carbon/human/user = source var/rendered = span_abductor("[user.real_name]: [message]") +<<<<<<< HEAD user.log_talk(message, LOG_SAY, tag="abductor") +======= + user.log_talk(message, LOG_SAY, tag=SPECIES_ABDUCTOR) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/living/carbon/human/living_mob in GLOB.alive_mob_list) var/obj/item/organ/internal/tongue/abductor/tongue = living_mob.get_organ_slot(ORGAN_SLOT_TONGUE) if(!istype(tongue)) @@ -582,10 +633,14 @@ GLOBAL_LIST_INIT(english_to_zombie, list()) color = "#96DB00" // TODO proper sprite, rather than recoloured pink tongue modifies_speech = TRUE voice_filter = "atempo=0.5" // makes them talk really slow +<<<<<<< HEAD liked_foodtypes = VEGETABLES | FRUIT | GROSS | RAW //SKYRAT EDIT - Roundstart Snails - Food Prefs disliked_foodtypes = DAIRY | ORANGES | SUGAR //SKYRAT EDIT: Roundstart Snails - As it turns out, you can't give a snail processed sugar or citrus. /* SKYRAT EDIT START - Roundstart Snails: Less annoying speech. +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/snail/modify_speech(datum/source, list/speech_args) var/new_message var/message = speech_args[SPEECH_MESSAGE] @@ -595,7 +650,10 @@ GLOBAL_LIST_INIT(english_to_zombie, list()) else new_message += message[i] speech_args[SPEECH_MESSAGE] = new_message +<<<<<<< HEAD */ // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/ethereal name = "electric discharger" diff --git a/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm b/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm index 9183c7eb809..26703dcc6d1 100644 --- a/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm +++ b/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm @@ -1,7 +1,10 @@ /obj/item/organ/internal/vocal_cords //organs that are activated through speech with the :x/MODE_KEY_VOCALCORDS channel name = "vocal cords" icon_state = "appendix" +<<<<<<< HEAD visual = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_VOICE gender = PLURAL @@ -87,7 +90,10 @@ next_command = world.time + (cooldown * cooldown_mod) /obj/item/organ/internal/adamantine_resonator +<<<<<<< HEAD visual = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "adamantine resonator" desc = "Fragments of adamantine exist in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders." zone = BODY_ZONE_HEAD diff --git a/code/modules/surgery/organs/organ_movement.dm b/code/modules/surgery/organs/organ_movement.dm index ff9f753ce18..b4c51aa4542 100644 --- a/code/modules/surgery/organs/organ_movement.dm +++ b/code/modules/surgery/organs/organ_movement.dm @@ -18,7 +18,12 @@ mob_insert(receiver, special, movement_flags) bodypart_insert(limb_owner = receiver, movement_flags = movement_flags) +<<<<<<< HEAD return TRUE +======= + if(!special) + receiver.update_body_parts() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Remove the organ from the select mob. @@ -32,6 +37,12 @@ mob_remove(organ_owner, special, movement_flags) bodypart_remove(limb_owner = organ_owner, movement_flags = movement_flags) +<<<<<<< HEAD +======= + if(!special) + organ_owner.update_body_parts() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Insert the organ into the select mob. * @@ -65,6 +76,14 @@ wash(CLEAN_TYPE_BLOOD) organ_flags &= ~ORGAN_VIRGIN +<<<<<<< HEAD +======= + if(external_bodytypes) + receiver.synchronize_bodytypes() + if(external_bodyshapes) + receiver.synchronize_bodyshapes() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receiver.organs |= src receiver.organs_slot[slot] = src owner = receiver @@ -120,6 +139,12 @@ ADD_TRAIT(src, TRAIT_NODROP, ORGAN_INSIDE_BODY_TRAIT) interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP +<<<<<<< HEAD +======= + if(bodypart_overlay) + limb.add_bodypart_overlay(bodypart_overlay) + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Remove the organ from the select mob. * @@ -163,6 +188,12 @@ SEND_SIGNAL(organ_owner, COMSIG_CARBON_LOSE_ORGAN, src, special) ADD_TRAIT(src, TRAIT_USED_ORGAN, ORGAN_TRAIT) +<<<<<<< HEAD +======= + organ_owner.synchronize_bodytypes() + organ_owner.synchronize_bodyshapes() + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/diseases = organ_owner.get_static_viruses() if(!LAZYLEN(diseases)) return @@ -211,6 +242,19 @@ REMOVE_TRAIT(src, TRAIT_NODROP, ORGAN_INSIDE_BODY_TRAIT) interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP +<<<<<<< HEAD +======= + if(!bodypart_overlay) + return + + limb.remove_bodypart_overlay(bodypart_overlay) + + if(use_mob_sprite_as_obj_sprite) + update_appearance(UPDATE_OVERLAYS) + + color = bodypart_overlay.draw_color // so a pink felinid doesn't drop a gray tail + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// In space station videogame, nothing is sacred. If somehow an organ is removed unexpectedly, handle it properly /obj/item/organ/proc/forced_removal() SIGNAL_HANDLER diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm index 42e92fa1eca..37bbc54f4f5 100644 --- a/code/modules/surgery/revival.dm +++ b/code/modules/surgery/revival.dm @@ -112,19 +112,26 @@ on_revived(user, target) return TRUE +<<<<<<< HEAD //SKYRAT EDIT CHANGE - DNR TRAIT - need this so that people don't just keep spamming the revival surgery; it runs success just bc the surgery steps are done if(HAS_TRAIT(target, TRAIT_DNR)) target.visible_message(span_warning("...[target.p_they()] lie[target.p_s()] still, unaffected. Further attempts are futile, target.p_theyre() gone.")) else target.visible_message(span_warning("...[target.p_they()] convulse[target.p_s()], then lie[target.p_s()] still.")) //SKYRAT EDIT CHANGE END - DNR TRAIT - ORIGINAL: target.visible_message(span_warning("...[target.p_they()] convulse[target.p_s()], then lie[target.p_s()] still.")) +======= + target.visible_message(span_warning("...[target.p_they()] convulse[target.p_s()], then lie[target.p_s()] still.")) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /// Called when you have been successfully raised from the dead /datum/surgery_step/revive/proc/on_revived(mob/surgeon, mob/living/patient) patient.visible_message(span_notice("...[patient] wakes up, alive and aware!")) patient.emote("gasp") +<<<<<<< HEAD to_chat(patient, "[CONFIG_GET(string/blackoutpolicy)]") //SKYRAT EDIT ADDITION - BLACKOUT POLICY +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_MIND_TRAIT(surgeon, TRAIT_MORBID) && ishuman(surgeon)) // Contrary to their typical hatred of resurrection, it wouldn't be very thematic if morbid people didn't love playing god var/mob/living/carbon/human/morbid_weirdo = surgeon morbid_weirdo.add_mood_event("morbid_revival_success", /datum/mood_event/morbid_revival_success) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index b1bae3944d0..05e12140e01 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -80,7 +80,10 @@ return FALSE #define SURGERY_SLOWDOWN_CAP_MULTIPLIER 2.5 //increase to make surgery slower but fail less, and decrease to make surgery faster but fail more +<<<<<<< HEAD #define SURGERY_SPEEDUP_AREA 0.5 // Skyrat Edit Addition - reward for doing surgery in surgery +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Modifier given to surgery speed for dissected bodies. #define SURGERY_SPEED_DISSECTION_MODIFIER 0.8 ///Modifier given to users with TRAIT_MORBID on certain surgeries @@ -120,10 +123,15 @@ if(check_morbid_curiosity(user, tool, surgery)) speed_mod *= SURGERY_SPEED_MORBID_CURIOSITY +<<<<<<< HEAD /* SKYRAT EDIT START - Worked in with reward buffs below if(HAS_TRAIT(target, TRAIT_ANALGESIA)) speed_mod *= SURGERY_SPEED_TRAIT_ANALGESIA */ // SKYRAT EDIT END +======= + if(HAS_TRAIT(target, TRAIT_ANALGESIA)) + speed_mod *= SURGERY_SPEED_TRAIT_ANALGESIA +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/implement_speed_mod = 1 if(implement_type) //this means it isn't a require hand or any item step. @@ -141,6 +149,7 @@ var/was_sleeping = (target.stat != DEAD && target.IsSleeping()) +<<<<<<< HEAD // Skyrat Edit Addition - reward for doing surgery on calm patients, and for using surgery rooms(ie. surgerying alone) if(was_sleeping || HAS_TRAIT(target, TRAIT_ANALGESIA) || target.stat == DEAD) modded_time *= SURGERY_SPEEDUP_AREA @@ -155,6 +164,8 @@ to_chat(user, span_notice("You are able to work faster due to the quiet environment!")) // Skyrat Edit End +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(do_after(user, modded_time, target = target, interaction_key = user.has_status_effect(/datum/status_effect/hippocratic_oath) ? target : DOAFTER_SOURCE_SURGERY)) //If we have the hippocratic oath, we can perform one surgery on each target, otherwise we can only do one surgery in total. if((prob(100-fail_prob) || (iscyborg(user) && !silicons_obey_prob)) && !try_to_fail) @@ -209,6 +220,34 @@ CRASH("passed invalid surgery_state, \"[surgery_state]\".") +/** + * Handles updating the mob's mood depending on the surgery states. + * * surgery_state = SURGERY_STATE_STARTED, SURGERY_STATE_FAILURE, SURGERY_STATE_SUCCESS + * * To prevent typos, the event category is defined as SURGERY_MOOD_CATEGORY ("surgery") +*/ +/datum/surgery_step/proc/update_surgery_mood(mob/living/target, surgery_state) + if(!target) + CRASH("Not passed a target, how did we get here?") + if(!surgery_effects_mood) + return + if(HAS_TRAIT(target, TRAIT_ANALGESIA)) + target.clear_mood_event(SURGERY_MOOD_CATEGORY) //incase they gained the trait mid-surgery. has the added side effect that if someone has a bad surgical memory/mood and gets drunk & goes back to surgery, they'll forget they hated it, which is kinda funny imo. + return + if(target.stat >= UNCONSCIOUS) + var/datum/mood_event/surgery/target_mood_event = target.mob_mood.mood_events[SURGERY_MOOD_CATEGORY] + if(!target_mood_event || target_mood_event.surgery_completed) //don't give sleeping mobs trauma. that said, if they fell asleep mid-surgery after already getting the bad mood, lets make sure they wake up to a (hopefully) happy memory. + return + switch(surgery_state) + if(SURGERY_STATE_STARTED) + target.add_mood_event(SURGERY_MOOD_CATEGORY, surgery_started_mood_event) + if(SURGERY_STATE_SUCCESS) + target.add_mood_event(SURGERY_MOOD_CATEGORY, surgery_success_mood_event) + if(SURGERY_STATE_FAILURE) + target.add_mood_event(SURGERY_MOOD_CATEGORY, surgery_failure_mood_event) + else + CRASH("passed invalid surgery_state, \"[surgery_state]\".") + + /datum/surgery_step/proc/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( user, @@ -334,6 +373,7 @@ /datum/surgery_step/proc/display_pain(mob/living/target, pain_message, mechanical_surgery = FALSE) if(target.stat < UNCONSCIOUS) if(HAS_TRAIT(target, TRAIT_ANALGESIA)) +<<<<<<< HEAD target.add_mood_event("mild_surgery", /datum/mood_event/mild_surgery) // SKYRAT EDIT ADDITION - Adds mood effects to surgeries if(!pain_message) return @@ -344,6 +384,12 @@ // SKYRAT EDIT ADDITION END else target.add_mood_event("severe_surgery", /datum/mood_event/severe_surgery) // SKYRAT EDIT ADDITION - Adds mood effects to surgeries +======= + if(!pain_message) + return + to_chat(target, span_notice("You feel a dull, numb sensation as your body is surgically operated on.")) + else +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!pain_message) return to_chat(target, span_userdanger(pain_message)) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 2bd8f485887..52cabf1e811 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -644,7 +644,11 @@ for(var/key in whitelist) .["whitelist"] += whitelist[key] +<<<<<<< HEAD /obj/item/blood_filter/ui_act(action, params) +======= +/obj/item/blood_filter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index f4806f7adb9..b3284d17cb2 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1,5 @@ +<<<<<<< HEAD "5.9.0" +======= +"5.10.0" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index 92c7a8388a7..972d5158b26 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -95,6 +95,10 @@ #define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion" #define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage" +<<<<<<< HEAD +======= +#define DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT "clientCount" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage" #define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses" diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index e1f2cb63857..e1cafdd679e 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -149,7 +149,13 @@ if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) if(event_handler && event_handler.receive_health_checks) event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) +<<<<<<< HEAD return TopicResponse() +======= + var/list/health_check_response = TopicResponse() + health_check_response[DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT] = TGS_CLIENT_COUNT + return health_check_response; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) detached = FALSE diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index 237207fdfd0..ba5d83e74f5 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -28,6 +28,14 @@ #undef DMAPI5_MISSING_CHUNKS +#undef DMAPI5_CHUNK +#undef DMAPI5_CHUNK_PAYLOAD +#undef DMAPI5_CHUNK_TOTAL +#undef DMAPI5_CHUNK_SEQUENCE_ID +#undef DMAPI5_CHUNK_PAYLOAD_ID + +#undef DMAPI5_MISSING_CHUNKS + #undef DMAPI5_RESPONSE_ERROR_MESSAGE #undef DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE @@ -95,6 +103,10 @@ #undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION #undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE +<<<<<<< HEAD +======= +#undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE #undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index dc3d543f143..a29279457a0 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -67,7 +67,7 @@ else if(stat) return UI_DISABLED // Update UIs if incapicitated but concious. - else if(incapacitated()) + else if(incapacitated) return UI_UPDATE return UI_INTERACTIVE diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm index f7278c86de4..f3f0cd22abb 100644 --- a/code/modules/tgui/states/not_incapacitated.dm +++ b/code/modules/tgui/states/not_incapacitated.dm @@ -29,6 +29,10 @@ GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitate /datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user) if(user.stat != CONSCIOUS) return UI_CLOSE +<<<<<<< HEAD if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated() || (turf_check && !isturf(user.loc))) +======= + if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated || (turf_check && !isturf(user.loc))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UI_DISABLED return UI_INTERACTIVE diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm index 4749ef27872..2bb4a34d3d4 100644 --- a/code/modules/tgui_input/alert.dm +++ b/code/modules/tgui_input/alert.dm @@ -120,7 +120,11 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data +<<<<<<< HEAD /datum/tgui_alert/ui_act(action, list/params) +======= +/datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/checkboxes.dm b/code/modules/tgui_input/checkboxes.dm index 53b264038dc..b7e22792ca6 100644 --- a/code/modules/tgui_input/checkboxes.dm +++ b/code/modules/tgui_input/checkboxes.dm @@ -115,7 +115,11 @@ return data +<<<<<<< HEAD /datum/tgui_checkbox_input/ui_act(action, list/params) +======= +/datum/tgui_checkbox_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/keycombo.dm b/code/modules/tgui_input/keycombo.dm index 948dbaea234..330d8ec231a 100644 --- a/code/modules/tgui_input/keycombo.dm +++ b/code/modules/tgui_input/keycombo.dm @@ -8,7 +8,11 @@ * * 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. +<<<<<<< HEAD * * default - The default (or current) key, shown as a placeholder. +======= + * * default - The default (or current) key, shown as a placeholder. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /proc/tgui_input_keycombo(mob/user = usr, message, title = "Key Input", default = 0, timeout = 0, ui_state = GLOB.always_state) if (!istype(user)) @@ -107,7 +111,11 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data +<<<<<<< HEAD /datum/tgui_input_keycombo/ui_act(action, list/params) +======= +/datum/tgui_input_keycombo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm index 22c6d48edfc..769f6754866 100644 --- a/code/modules/tgui_input/list.dm +++ b/code/modules/tgui_input/list.dm @@ -137,7 +137,11 @@ data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) return data +<<<<<<< HEAD /datum/tgui_list_input/ui_act(action, list/params) +======= +/datum/tgui_list_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm index 68998acb033..2ecaae0504c 100644 --- a/code/modules/tgui_input/number.dm +++ b/code/modules/tgui_input/number.dm @@ -136,7 +136,11 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data +<<<<<<< HEAD /datum/tgui_input_number/ui_act(action, list/params) +======= +/datum/tgui_input_number/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm index 1185aaa12af..5e67acf7d35 100644 --- a/code/modules/tgui_input/say_modal/modal.dm +++ b/code/modules/tgui_input/say_modal/modal.dm @@ -86,7 +86,11 @@ if(!payload?["channel"]) CRASH("No channel provided to an open TGUI-Say") window_open = TRUE +<<<<<<< HEAD if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL && payload["channel"] != LOOC_CHANNEL) // SKYRAT EDIT CHANGE (Add LOOC_CHANNEL) +======= + if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 start_thinking() if(!client.typing_indicators) log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators DISABLED.") diff --git a/code/modules/tgui_input/say_modal/speech.dm b/code/modules/tgui_input/say_modal/speech.dm index 8fff832477c..299499d4453 100644 --- a/code/modules/tgui_input/say_modal/speech.dm +++ b/code/modules/tgui_input/say_modal/speech.dm @@ -10,7 +10,11 @@ /datum/tgui_say/proc/alter_entry(payload) var/entry = payload["entry"] /// No OOC leaks +<<<<<<< HEAD if(!entry || payload["channel"] == OOC_CHANNEL || payload["channel"] == ME_CHANNEL || payload["channel"] == LOOC_CHANNEL) // SKYRAT EDIT CHANGE - CUSTOMIZATION +======= + if(!entry || payload["channel"] == OOC_CHANNEL || payload["channel"] == ME_CHANNEL) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick(hurt_phrases) /// Random trimming for larger sentences if(length(entry) > 50) @@ -47,6 +51,7 @@ if(ADMIN_CHANNEL) SSadmin_verbs.dynamic_invoke_verb(client, /datum/admin_verb/cmd_admin_say, entry) return TRUE +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - CUSTOMIZATION if(LOOC_CHANNEL) client.looc(entry) @@ -55,6 +60,8 @@ client.mob.whisper_verb(entry) return TRUE // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /** diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm index 806696dcf4f..c0b59be5842 100644 --- a/code/modules/tgui_input/text.dm +++ b/code/modules/tgui_input/text.dm @@ -133,7 +133,11 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data +<<<<<<< HEAD /datum/tgui_input_text/ui_act(action, list/params) +======= +/datum/tgui_input_text/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/transport/elevator/elev_panel.dm b/code/modules/transport/elevator/elev_panel.dm index 0b5e99bdbb0..63108a20fef 100644 --- a/code/modules/transport/elevator/elev_panel.dm +++ b/code/modules/transport/elevator/elev_panel.dm @@ -299,7 +299,11 @@ return data +<<<<<<< HEAD /obj/machinery/elevator_control_panel/ui_act(action, list/params) +======= +/obj/machinery/elevator_control_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm index 1323953de78..04111ca9a9c 100644 --- a/code/modules/transport/tram/tram_controller.dm +++ b/code/modules/transport/tram/tram_controller.dm @@ -1096,7 +1096,11 @@ return data +<<<<<<< HEAD /obj/machinery/transport/tram_controller/ui_act(action, params) +======= +/obj/machinery/transport/tram_controller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/transport/tram/tram_controls.dm b/code/modules/transport/tram/tram_controls.dm index 0bfce56aa5c..bf8d95c81b2 100644 --- a/code/modules/transport/tram/tram_controls.dm +++ b/code/modules/transport/tram/tram_controls.dm @@ -130,7 +130,11 @@ this_destination["id"] = destination.platform_code . += list(this_destination) +<<<<<<< HEAD /obj/machinery/computer/tram_controls/ui_act(action, params) +======= +/obj/machinery/computer/tram_controls/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm index af8f4199438..96fb50f2815 100644 --- a/code/modules/transport/transport_module.dm +++ b/code/modules/transport/transport_module.dm @@ -612,7 +612,11 @@ if(!isliving(user)) return FALSE // Gotta be awake and aware +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE // Maintain the god given right to fight an elevator if(user.combat_mode) @@ -704,7 +708,11 @@ * * boolean, FALSE if the menu should be closed, TRUE if the menu is clear to stay opened. */ /obj/structure/transport/linear/proc/check_menu(mob/user, starting_loc) +<<<<<<< HEAD if(user.incapacitated() || !user.Adjacent(src) || starting_loc != src.loc) +======= + if(user.incapacitated || !user.Adjacent(src) || starting_loc != src.loc) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 91c2f8c1382..94f284cb03e 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -291,10 +291,13 @@ #include "weird_food.dm" #include "wizard_loadout.dm" #include "worn_icons.dm" +<<<<<<< HEAD // SKYRAT EDIT START #include "~skyrat\automapper.dm" #include "~skyrat\opposing_force.dm" // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // END_INCLUDE #ifdef REFERENCE_TRACKING_DEBUG //Don't try and parse this file if ref tracking isn't turned on. IE: don't parse ref tracking please mr linter #include "find_reference_sanity.dm" diff --git a/code/modules/unit_tests/barsigns.dm b/code/modules/unit_tests/barsigns.dm index 0914522446f..b21017befef 100644 --- a/code/modules/unit_tests/barsigns.dm +++ b/code/modules/unit_tests/barsigns.dm @@ -2,12 +2,16 @@ * Test if icon states for each datum actually exist in the DMI. */ /datum/unit_test/barsigns_icon +<<<<<<< HEAD var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/unit_test/barsigns_icon/Run() var/obj/machinery/barsign_type = /obj/machinery/barsign var/icon/barsign_icon = initial(barsign_type.icon) var/list/barsign_icon_states = icon_states(barsign_icon) +<<<<<<< HEAD barsign_icon_states += icon_states(SKYRAT_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns barsign_icon_states += icon_states(SKYRAT_LARGE_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns @@ -17,6 +21,11 @@ if(sign_type in blacklisted_sign_types) continue // SKYRAT EDIT ADDITION END +======= + + // Check every datum real bar sign + for(var/sign_type in (subtypesof(/datum/barsign) - /datum/barsign/hiddensigns)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/barsign/sign = new sign_type() if(!(sign.icon_state in barsign_icon_states)) @@ -26,16 +35,23 @@ * Check that bar signs have a name and desc, and that the name is unique. */ /datum/unit_test/barsigns_name +<<<<<<< HEAD var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/unit_test/barsigns_name/Run() var/list/existing_names = list() +<<<<<<< HEAD for(var/sign_type in (subtypesof(/datum/barsign) - /datum/barsign/hiddensigns)) // SKYRAT EDIT ADDITION BEGIN - MODULAR BARSIGNS if(sign_type in blacklisted_sign_types) continue // SKYRAT EDIT ADDITION END +======= + for(var/sign_type in subtypesof(/datum/barsign) - /datum/barsign/hiddensigns) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/barsign/sign = new sign_type() if(!sign.name) diff --git a/code/modules/unit_tests/changeling.dm b/code/modules/unit_tests/changeling.dm index bdcc9b2d281..4b47dd9b0da 100644 --- a/code/modules/unit_tests/changeling.dm +++ b/code/modules/unit_tests/changeling.dm @@ -11,7 +11,11 @@ var/datum/antagonist/changeling/ling_datum = IS_CHANGELING(ling) // Get the ability we're testing +<<<<<<< HEAD ling_datum.give_power(/datum/action/changeling/sting/transformation) // SKYRAT EDIT CHANGE - Transformation sting not purchasable here - ORIGINAL : ling_datum.purchase_power(/datum/action/changeling/sting/transformation) +======= + ling_datum.purchase_power(/datum/action/changeling/sting/transformation) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/action/changeling/sting/transformation/sting_action = locate() in ling.actions sting_action.selected_dna = ling_datum.current_profile sting_action.sting_duration = 0.5 SECONDS // just makes sure everything settles. @@ -75,12 +79,21 @@ // The more DNA features and random things we change, the more likely we are to catch something not updating correctly. // Yeah guess who/what this is, I dare you. ling.dna.features["mcolor"] = "#886600" +<<<<<<< HEAD ling.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Smooth", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["tail_lizard"] = "Smooth" ling.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["snout"] = "Sharp + Light" ling.dna.mutant_bodyparts["horns"] = list(MUTANT_INDEX_NAME = "Curled", MUTANT_INDEX_COLOR_LIST = list("#292826", "#292826", "#8292826")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["horns"] = "Curved" ling.dna.mutant_bodyparts["frills"] = list(MUTANT_INDEX_NAME = "Short", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["frills"] = "Sort" ling.dna.mutant_bodyparts["spines"] = list(MUTANT_INDEX_NAME = "Long + Membrane", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["spines"] = "Long + Membrane" ling.dna.body_markings["chest"] = list("Light Belly" = list("#886600", 0)) // SKYRAT EDIT CHANGE - ORIGINAL : ling.dna.features[lizard_markings] = list("Light Belly") +======= + ling.dna.features["tail_lizard"] = "Smooth" + ling.dna.features["snout"] = "Sharp + Light" + ling.dna.features["horns"] = "Curled" + ling.dna.features["frills"] = "Short" + ling.dna.features["spines"] = "Long + Membrane" + ling.dna.features["lizard_markings"] = "Light Belly" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ling.dna.features["legs"] = DIGITIGRADE_LEGS ling.eye_color_left = COLOR_WHITE ling.eye_color_right = COLOR_WHITE diff --git a/code/modules/unit_tests/embedding.dm b/code/modules/unit_tests/embedding.dm index a163a55c364..11181722e22 100644 --- a/code/modules/unit_tests/embedding.dm +++ b/code/modules/unit_tests/embedding.dm @@ -8,9 +8,15 @@ TEST_ASSERT_EQUAL(bullet.get_embed().embed_chance, 100, "embed_chance failed to modify") bullet.preparePixelProjectile(victim, firer) bullet.fire(get_angle(firer, victim), victim) +<<<<<<< HEAD // SKYRAT EDIT REMOVAL START - TODO - Figure out why it's not embedding during the unit test and fix it. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/components = victim.GetComponents(/datum/component/embedded) TEST_ASSERT_EQUAL(components.len, 1, "Projectile with 100% embed chance didn't embed, or embedded multiple times") var/datum/component/embedded/comp = components[1] TEST_ASSERT_EQUAL(comp.weapon.get_embed().embed_chance, 100, "embed_chance modification did not transfer to shrapnel") +<<<<<<< HEAD // SKYRATEDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/unit_tests/emoting.dm b/code/modules/unit_tests/emoting.dm index 4eecaca015c..193f79ccd74 100644 --- a/code/modules/unit_tests/emoting.dm +++ b/code/modules/unit_tests/emoting.dm @@ -9,12 +9,17 @@ human.say("*shrug") TEST_ASSERT_EQUAL(emotes_used, 1, "Human did not shrug") +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - Following check does not affect us /* human.say("*beep") TEST_ASSERT_EQUAL(emotes_used, 1, "Human beeped, when that should be restricted to silicons") */ //SKYRAT EDIT REMOVAL END +======= + human.say("*beep") + TEST_ASSERT_EQUAL(emotes_used, 1, "Human beeped, when that should be restricted to silicons") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human.setOxyLoss(140) @@ -23,12 +28,17 @@ human.say("*shrug") TEST_ASSERT_EQUAL(emotes_used, 1, "Human shrugged while unconscious") +<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - Following check fails due to global cooldown from the above test step (.8s) /* human.say("*deathgasp") TEST_ASSERT_EQUAL(emotes_used, 2, "Human could not deathgasp while unconscious") */ //SKYRAT EDIT REMOVAL END +======= + human.say("*deathgasp") + TEST_ASSERT_EQUAL(emotes_used, 2, "Human could not deathgasp while unconscious") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human.key = null diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm index 5cb582ca969..73ce3df8714 100644 --- a/code/modules/unit_tests/fish_unit_tests.dm +++ b/code/modules/unit_tests/fish_unit_tests.dm @@ -1,5 +1,24 @@ #define TRAIT_FISH_TESTING "made_you_read_this" +<<<<<<< HEAD +======= +///Ensures that all fish have an aquarium icon state and that sprite_width and sprite_height have been set. +/datum/unit_test/fish_aquarium_icons + +/datum/unit_test/fish_aquarium_icons/Run() + for(var/obj/item/fish/fish as anything in subtypesof(/obj/item/fish)) + if(ispath(fish, /obj/item/fish/testdummy)) //We don't care about unit test fish. + continue + var/init_icon = fish::dedicated_in_aquarium_icon + var/init_icon_state = fish::dedicated_in_aquarium_icon_state || "[fish::icon_state]_small" + if(!icon_exists(init_icon, init_icon_state)) + TEST_FAIL("[fish] with doesn't have a \"[init_icon_state]\" aquarium icon state in [init_icon]. Please make one.") + if(!fish::sprite_width) + TEST_FAIL("[fish] doesn't have a set sprite_width.") + if(!fish::sprite_height) + TEST_FAIL("[fish] doesn't have a set sprite_height.") + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Checks that things associated with fish size and weight work correctly. /datum/unit_test/fish_size_weight @@ -76,10 +95,18 @@ incompatible_traits = list(/datum/fish_trait/dummy/two) inheritability = 100 diff_traits_inheritability = 100 +<<<<<<< HEAD /datum/fish_trait/dummy/apply_to_fish(obj/item/fish/fish) ADD_TRAIT(fish, TRAIT_FISH_TESTING, FISH_TRAIT_DATUM) fish.grind_results[/datum/reagent] = 10 +======= + reagents_to_add = list(/datum/reagent = 10) + +/datum/fish_trait/dummy/apply_to_fish(obj/item/fish/fish) + . = ..() + ADD_TRAIT(fish, TRAIT_FISH_TESTING, FISH_TRAIT_DATUM) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/dummy/two incompatible_traits = list(/datum/fish_trait/dummy) @@ -259,15 +286,27 @@ /datum/unit_test/explosive_fishing/Run() var/datum/fish_source/source = GLOB.preset_fish_sources[/datum/fish_source/unit_test] source.spawn_reward_from_explosion(run_loc_floor_bottom_left, 1) +<<<<<<< HEAD if(length(source.fish_table)) +======= + if(source.fish_counts[/obj/item/wrench]) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TEST_FAIL("The unit test item wasn't removed/spawned from fish_table during 'spawn_reward_from_explosion'.") /datum/fish_source/unit_test fish_table = list( /obj/item/wrench = 1, +<<<<<<< HEAD ) fish_counts = list( /obj/item/wrench = 1, +======= + /obj/item/screwdriver = INFINITY, + ) + fish_counts = list( + /obj/item/wrench = 1, + /obj/item/screwdriver = 0, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) #undef TRAIT_FISH_TESTING diff --git a/code/modules/unit_tests/mecha_damage.dm b/code/modules/unit_tests/mecha_damage.dm index f922d342b49..a688fb0bd2a 100644 --- a/code/modules/unit_tests/mecha_damage.dm +++ b/code/modules/unit_tests/mecha_damage.dm @@ -31,7 +31,10 @@ // Get a sample laser weapon. // The captain's laser gun here is chosen primarily because it deals more damage than normal lasers. var/obj/item/gun/energy/laser/dummy_laser = allocate(/obj/item/gun/energy/laser/captain) +<<<<<<< HEAD qdel(dummy_laser.GetComponent(/datum/component/gun_safety)) // SKYRAT EDIT - Safeties on guns make them impossible to shoot :) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/ammo_casing/laser_ammo = dummy_laser.ammo_type[1] var/obj/projectile/beam/laser_fired = initial(laser_ammo.projectile_type) var/expected_laser_damage = round(dummy_laser.projectile_damage_multiplier * initial(laser_fired.damage) * (1 - expected_laser_armor / 100), DAMAGE_PRECISION) @@ -39,7 +42,10 @@ // Get a sample ballistic weapon. // The syndicate .357 here is chosen because it does a lot of damage. var/obj/item/gun/ballistic/dummy_gun = allocate(/obj/item/gun/ballistic/revolver) +<<<<<<< HEAD qdel(dummy_gun.GetComponent(/datum/component/gun_safety)) // SKYRAT EDIT - Safeties on guns make them impossible to shoot :) +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/ammo_casing/ballistic_ammo = dummy_gun.magazine.ammo_type var/obj/projectile/bullet_fired = initial(ballistic_ammo.projectile_type) var/expected_bullet_damage = round(dummy_gun.projectile_damage_multiplier * initial(bullet_fired.damage) * (1 - expected_bullet_armor / 100), DAMAGE_PRECISION) diff --git a/code/modules/unit_tests/organ_bodypart_shuffle.dm b/code/modules/unit_tests/organ_bodypart_shuffle.dm index 842dd1c6c13..487554154a3 100644 --- a/code/modules/unit_tests/organ_bodypart_shuffle.dm +++ b/code/modules/unit_tests/organ_bodypart_shuffle.dm @@ -2,7 +2,11 @@ /datum/unit_test/organ_bodypart_shuffle /datum/unit_test/organ_bodypart_shuffle/Run() +<<<<<<< HEAD var/mob/living/carbon/human/hollow_boy = allocate(/mob/living/carbon/human/consistent) +======= + var/mob/living/carbon/human/hollow_boy = allocate(/mob/living/carbon/human/consistent) //freshly filled with wet insides +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Test if organs are all properly updating when forcefully removed var/list/removed_organs = list() @@ -30,5 +34,8 @@ continue TEST_ASSERT(organ in hollow_boy.organs, "Organ '[organ.name] was put in an empty bodypart that replaced a humans, but the organ did not come with.") +<<<<<<< HEAD // Test if bodyparts are all properly updating when forcefully removed hollow_boy = allocate(/mob/living/carbon/human/consistent) //freshly filled with wet insides +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/unit_tests/organ_set_bonus.dm b/code/modules/unit_tests/organ_set_bonus.dm index 8e2c65270f7..395fbf81809 100644 --- a/code/modules/unit_tests/organ_set_bonus.dm +++ b/code/modules/unit_tests/organ_set_bonus.dm @@ -25,13 +25,20 @@ for(var/datum/infuser_entry/infuser_entry as anything in flatten_list(GLOB.infuser_entries)) var/output_organs = infuser_entry.output_organs var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent) +<<<<<<< HEAD lab_rat.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF"), MUTANT_INDEX_EMISSIVE_LIST = list(FALSE)) // SKYRAT EDIT - Customization +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/obj/item/organ/inserted_organs = list() // Attempt to insert entire list of mutant organs for the given infusion_entry. for(var/obj/item/organ/organ as anything in output_organs) organ = new organ() +<<<<<<< HEAD TEST_ASSERT(organ.Insert(lab_rat, special = TRUE, movement_flags = DELETE_IF_REPLACED), "The organ `[organ.type]` for `[infuser_entry.type]` was not inserted in the mob when expected, Insert() returned falsy when TRUE was expected.") +======= + organ.Insert(lab_rat, special = TRUE, movement_flags = DELETE_IF_REPLACED) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inserted_organs += organ // Search for added Status Effect. diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index 36fc4570540..e397826428a 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -86,5 +86,17 @@ for (var/_ in 1 to number) if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE, indirect_action = TRUE)) TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") +<<<<<<< HEAD +======= + + if (outfit.belt_contents) + var/list/belt_contents = outfit.belt_contents?.Copy() + for (var/path in belt_contents) + var/number = belt_contents[path] || 1 + for (var/_ in 1 to number) + if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BELTPACK, TRUE, indirect_action = TRUE)) + TEST_FAIL("[outfit.name]'s belt_contents are invalid! Couldn't add [path] to backpack.") + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef CHECK_OUTFIT_SLOT diff --git a/code/modules/unit_tests/paintings.dm b/code/modules/unit_tests/paintings.dm index abe3ba9aa97..fe09a127d92 100644 --- a/code/modules/unit_tests/paintings.dm +++ b/code/modules/unit_tests/paintings.dm @@ -3,10 +3,13 @@ /datum/unit_test/paintings/Run() for(var/obj/item/canvas/canvas as anything in typesof(/obj/item/canvas)) +<<<<<<< HEAD //SKYRAT EDIT START if(canvas == /obj/item/canvas/drawingtablet) //This doesn't need frames. continue //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 canvas = new canvas var/canvas_icons = icon_states(canvas.icon) for(var/frame_type in SSpersistent_paintings.frame_types_by_patronage_tier) diff --git a/code/modules/unit_tests/projectiles.dm b/code/modules/unit_tests/projectiles.dm index 6e97fc054a2..006e5311fa3 100644 --- a/code/modules/unit_tests/projectiles.dm +++ b/code/modules/unit_tests/projectiles.dm @@ -23,11 +23,14 @@ TEST_ASSERT(loaded_bullet, "Ammo casing has no loaded bullet") gunner.put_in_hands(test_gun, forced=TRUE) +<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(test_gun.GetComponent(/datum/component/gun_safety)) qdel(test_gun.GetComponent(/datum/component/gun_safety)) loaded_bullet.wound_bonus = CANT_WOUND //Baseline wounding makes things weird //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gunner.set_combat_mode(FALSE) // just to make sure we know we're not trying to pistol-whip them var/expected_damage = loaded_bullet.damage loaded_bullet.def_zone = BODY_ZONE_CHEST diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm index 37585745925..97dec7269cf 100644 --- a/code/modules/unit_tests/say.dm +++ b/code/modules/unit_tests/say.dm @@ -200,7 +200,11 @@ speaker.forceMove(run_loc_floor_bottom_left) listener.forceMove(locate((run_loc_floor_bottom_left.x + distance), run_loc_floor_bottom_left.y, run_loc_floor_bottom_left.z)) +<<<<<<< HEAD var/pangram_quote = "The quick brown fox jumps over the lazy dog." // SKYRAT EDIT CHANGE - account for autopunct in living_say.dm - ORIGINAL: var/pangram_quote = "The quick brown fox jumps over the lazy dog" +======= + var/pangram_quote = "The quick brown fox jumps over the lazy dog" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // speaking speaker.say(pangram_quote) @@ -237,11 +241,19 @@ // Normally speaking, if there isn't a functional telecomms array on the same z-level, then handheld radios // have a short delay before sending the message. We use the centcom frequency to get around this. speaker_radio.set_frequency(FREQ_CENTCOM) +<<<<<<< HEAD speaker_radio.independent = TRUE listener_radio.set_frequency(FREQ_CENTCOM) listener_radio.independent = TRUE var/pangram_quote = "The quick brown fox jumps over the lazy dog." // SKYRAT EDIT CHANGE - account for autopunct in living_say.dm - ORIGINAL: var/pangram_quote = "The quick brown fox jumps over the lazy dog" +======= + speaker_radio.special_channels = RADIO_SPECIAL_CENTCOM + listener_radio.set_frequency(FREQ_CENTCOM) + listener_radio.special_channels = RADIO_SPECIAL_CENTCOM + + var/pangram_quote = "The quick brown fox jumps over the lazy dog" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 speaker.say(pangram_quote) TEST_ASSERT(handle_speech_result, "Handle speech signal was not fired (radio test)") diff --git a/code/modules/unit_tests/screenshot_humanoids.dm b/code/modules/unit_tests/screenshot_humanoids.dm index 3bfaffb8c70..a28da130007 100644 --- a/code/modules/unit_tests/screenshot_humanoids.dm +++ b/code/modules/unit_tests/screenshot_humanoids.dm @@ -7,10 +7,17 @@ // Test lizards as their own thing so we can get more coverage on their features var/mob/living/carbon/human/lizard = allocate(/mob/living/carbon/human/dummy/consistent) lizard.dna.features["mcolor"] = "#099" +<<<<<<< HEAD lizard.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Light Tiger", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["tail_lizard"] = "Light Tiger" lizard.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["snout"] = "Sharp + Light" lizard.dna.mutant_bodyparts["horns"] = list(MUTANT_INDEX_NAME = "Simple", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["horns"] = "Simple" lizard.dna.mutant_bodyparts["frills"] = list(MUTANT_INDEX_NAME = "Aquatic", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["frills"] = "Aquatic" +======= + lizard.dna.features["tail_lizard"] = "Light Tiger" + lizard.dna.features["snout"] = "Sharp + Light" + lizard.dna.features["horns"] = "Simple" + lizard.dna.features["frills"] = "Aquatic" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lizard.dna.features["legs"] = "Normal Legs" lizard.set_species(/datum/species/lizard) lizard.equipOutfit(/datum/outfit/job/engineer) @@ -19,10 +26,16 @@ // let me have this var/mob/living/carbon/human/moth = allocate(/mob/living/carbon/human/dummy/consistent) +<<<<<<< HEAD moth.dna.features["mcolor"] = "#E5CD99" // SKYRAT EDIT ADDITION - Customization moth.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Firewatch", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: moth.dna.features["moth_antennae"] = "Firewatch" moth.dna.mutant_bodyparts["moth_markings"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: moth.dna.features["moth_markings"] = "None" moth.dna.mutant_bodyparts["wings"] = list(MUTANT_INDEX_NAME = "Moth (Firewatch)", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: moth.dna.features["moth_wings"] = "Firewatch" +======= + moth.dna.features["moth_antennae"] = "Firewatch" + moth.dna.features["moth_markings"] = "None" + moth.dna.features["moth_wings"] = "Firewatch" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 moth.set_species(/datum/species/moth) moth.equipOutfit(/datum/outfit/job/cmo, visualsOnly = TRUE) test_screenshot("[/datum/species/moth]", get_flat_icon_for_all_directions(moth)) @@ -46,9 +59,12 @@ /datum/unit_test/screenshot_humanoids/proc/make_dummy(species, job_outfit) var/mob/living/carbon/human/dummy/consistent/dummy = allocate(/mob/living/carbon/human/dummy/consistent) dummy.set_species(species) +<<<<<<< HEAD // SKYRAT EDIT ADDITION START - More consistent screenshots var/datum/species/dummy_species = new species dummy_species.prepare_human_for_preview(dummy) // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dummy.equipOutfit(job_outfit, visualsOnly = TRUE) return dummy diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_sentientdisease.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_sentientdisease.png new file mode 100644 index 00000000000..e7e1cbd661f Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_sentientdisease.png differ diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index 5eb63bf4957..6b7689ddd68 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -73,6 +73,7 @@ /mob/living/simple_animal/hostile/vatbeast, /mob/living/simple_animal/hostile/zombie, /mob/living/simple_animal/soulscythe, +<<<<<<< HEAD // MODULAR SKYRAT ENTRIES // PLEASE REFACTOR THESE AS YOU CAN @@ -146,6 +147,8 @@ /mob/living/simple_animal/hostile/zombie/cheesezombie, /mob/living/simple_animal/hostile/zombie/nocorpse, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // DO NOT ADD NEW ENTRIES TO THIS LIST // READ THE COMMENT ABOVE ) diff --git a/code/modules/unit_tests/species_change_clothing.dm b/code/modules/unit_tests/species_change_clothing.dm index c73da727103..77e1a263ce0 100644 --- a/code/modules/unit_tests/species_change_clothing.dm +++ b/code/modules/unit_tests/species_change_clothing.dm @@ -9,14 +9,21 @@ morphing_human.equipOutfit(/datum/outfit/job/assistant/consistent) morphing_human.dna.features["legs"] = DIGITIGRADE_LEGS //you WILL have digitigrade legs +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - This part of the test is useless as it's behavior that we actually WANT from those shoes, here. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/human_shoes = morphing_human.get_item_by_slot(ITEM_SLOT_FEET) human_shoes.supports_variations_flags = NONE //do not fit lizards at all costs. morphing_human.set_species(/datum/species/lizard) var/obj/item/lizard_shoes = morphing_human.get_item_by_slot(ITEM_SLOT_FEET) +<<<<<<< HEAD // TEST_ASSERT_NOTEQUAL(human_shoes, lizard_shoes, "Lizard still has shoes after changing species.") */ // SKYRAT EDIT REMOVAL END +======= + TEST_ASSERT_NOTEQUAL(human_shoes, lizard_shoes, "Lizard still has shoes after changing species.") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Testing whether item-species restrictions properly blocks changing into a blacklisted species. morphing_human.set_species(/datum/species/monkey) diff --git a/code/modules/unit_tests/strippable.dm b/code/modules/unit_tests/strippable.dm index 18f521929cd..66224d5532d 100644 --- a/code/modules/unit_tests/strippable.dm +++ b/code/modules/unit_tests/strippable.dm @@ -8,8 +8,11 @@ var/datum/strip_menu/strip_menu = allocate(/datum/strip_menu, target, strippable) +<<<<<<< HEAD run_loc_floor_bottom_left.luminosity = 6 // SKYRAT EDIT - Making this unit test pass by lighting a turf up. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/ui_state = strip_menu.ui_state(user) TEST_ASSERT_EQUAL(strip_menu.ui_status(user, ui_state), UI_INTERACTIVE, "Perfect conditions were not interactive.") diff --git a/code/modules/unit_tests/trauma_granting.dm b/code/modules/unit_tests/trauma_granting.dm index 26f536d74df..0ac385ef4f7 100644 --- a/code/modules/unit_tests/trauma_granting.dm +++ b/code/modules/unit_tests/trauma_granting.dm @@ -17,9 +17,12 @@ trauma_blacklist += typesof(/datum/brain_trauma/special/imaginary_friend) // Requires a obsession target trauma_blacklist += typesof(/datum/brain_trauma/special/obsessed) +<<<<<<< HEAD //SKYRAT EDIT START trauma_blacklist += typesof(/datum/brain_trauma/very_special/induced_hypnosis) // Requires an object to properly work //SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/brain_trauma/trauma as anything in typesof(/datum/brain_trauma) - trauma_blacklist) if(trauma == initial(trauma.abstract_type)) diff --git a/code/modules/unit_tests/turf_icons.dm b/code/modules/unit_tests/turf_icons.dm index f9d8296419e..6ffed11ea84 100644 --- a/code/modules/unit_tests/turf_icons.dm +++ b/code/modules/unit_tests/turf_icons.dm @@ -1,6 +1,10 @@ /// Makes sure turf icons actually exist. :) /datum/unit_test/turf_icons +<<<<<<< HEAD var/modular_mineral_turf_file = 'modular_skyrat/modules/xenoarch/icons/mining.dmi' //= 'icons/turf/mining.dmi' //MODULARITY SUPPORT - insert your snowflake MAP_SWITCH icon file here if you use that define. // SKYRAT EDIT - Added our modular file here (thanks) +======= + var/modular_mineral_turf_file //= 'icons/turf/mining.dmi' //MODULARITY SUPPORT - insert your snowflake MAP_SWITCH icon file here if you use that define. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/unit_test/turf_icons/Run() for(var/turf/turf_path as anything in (subtypesof(/turf) - typesof(/turf/closed/mineral))) @@ -28,10 +32,13 @@ var/list/ignored_types = list() //ignored_types += typesof(YOUR_DOWNSTREAM_TYPEPATH(s)_HERE) //MODULARITY SUPPORT. If you have snowflake typepaths that are blacklisted in, for example, create & destroy unit test because they require certain SS's being init, use this to blacklist them. +<<<<<<< HEAD //SKYRAT EDIT START ignored_types += typesof(/turf/open/openspace/ocean) ignored_types += typesof(/turf/open/misc/ocean) // SKYRAT EDIT END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/turf/open/open_turf_path as anything in (subtypesof(/turf/open) - ignored_types)) diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index e2902be1228..71ed3ce0e39 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -339,6 +339,7 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) returnable_list += typesof(/turf/open/space/openspace) returnable_list += typesof(/turf/open/openspace) +<<<<<<< HEAD //SKYRAT EDIT ADDITION START - OUR UNCREATABLES DOWN HERE //Not designed to be spawned without a turf. returnable_list += typesof(/obj/effect/abstract/liquid_turf) @@ -355,6 +356,8 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) returnable_list += list(/obj/item/organ/external/neck_accessory, /obj/item/organ/external/head_accessory) //SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return returnable_list /proc/RunUnitTests() diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm index decd67e1742..658504d69a8 100644 --- a/code/modules/uplink/uplink_devices.dm +++ b/code/modules/uplink/uplink_devices.dm @@ -113,13 +113,21 @@ . += span_notice("You can destroy this device with a screwdriver.") // Multitool uplink +<<<<<<< HEAD ////obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) //ORIGINAL /obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 35, datum/uplink_handler/uplink_handler_override = null) //SKYRAT EDIT CHANGE +======= +/obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() AddComponent(/datum/component/uplink, owner, FALSE, TRUE, UPLINK_TRAITORS, tc_amount) // Pen uplink +<<<<<<< HEAD ///obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) //ORIGINAL /obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 35, datum/uplink_handler/uplink_handler_override = null) //SKYRAT EDIT CHANGE +======= +/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() AddComponent(/datum/component/uplink, owner, TRUE, FALSE, UPLINK_TRAITORS, tc_amount) diff --git a/code/modules/uplink/uplink_items/badass.dm b/code/modules/uplink/uplink_items/badass.dm index 08cf3affe07..80c2edb2076 100644 --- a/code/modules/uplink/uplink_items/badass.dm +++ b/code/modules/uplink/uplink_items/badass.dm @@ -91,7 +91,11 @@ /datum/uplink_item/badass/stickers name = "Syndicate Sticker Pack" desc = "Contains 8 random stickers precisely engineered to resemble suspicious objects, which may or may not be useful for fooling crew." +<<<<<<< HEAD item = /obj/item/storage/box/syndie_kit/stickers +======= + item = /obj/item/storage/box/stickers/syndie_kit +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cost = 1 /datum/uplink_item/badass/demotivational_posters diff --git a/code/modules/uplink/uplink_items/clownops.dm b/code/modules/uplink/uplink_items/clownops.dm index a5b4b0ec1df..3d9b8069a48 100644 --- a/code/modules/uplink/uplink_items/clownops.dm +++ b/code/modules/uplink/uplink_items/clownops.dm @@ -141,7 +141,10 @@ cost = 80 purchasable_from = UPLINK_CLOWN_OPS +<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL START +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/stealthy_tools/combatbananashoes name = "Combat Banana Shoes" desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \ @@ -151,7 +154,10 @@ cost = 6 surplus = 0 purchasable_from = UPLINK_CLOWN_OPS +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/badass/clownopclumsinessinjector //clowns can buy this too, but it's in the role-restricted items section for them name = "Clumsiness Injector" diff --git a/code/modules/uplink/uplink_items/device_tools.dm b/code/modules/uplink/uplink_items/device_tools.dm index 567d359e82e..dab2de920ae 100644 --- a/code/modules/uplink/uplink_items/device_tools.dm +++ b/code/modules/uplink/uplink_items/device_tools.dm @@ -66,8 +66,12 @@ cost = 1 surplus = 20 +<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL /datum/uplink_item/device_tools/briefcase_launchpad +======= +/datum/uplink_item/device_tools/briefcase_launchpad +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Briefcase Launchpad" desc = "A briefcase containing a launchpad, a device able to teleport items and people to and from targets up to eight tiles away from the briefcase. \ Also includes a remote control, disguised as an ordinary folder. Touch the briefcase with the remote to link it." @@ -83,7 +87,10 @@ Comes with 4 charges, recharges randomly. Warranty null and void if exposed to an electromagnetic pulse." item = /obj/item/storage/box/syndie_kit/syndicate_teleporter cost = 8 +<<<<<<< HEAD */ //END SKYRAT EDIT +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/device_tools/camera_app name = "SyndEye Program" @@ -177,7 +184,10 @@ cost = 3 purchasable_from = ~UPLINK_ALL_SYNDIE_OPS +<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - It's laggy and doesn't really add much roleplay value +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/device_tools/suspiciousphone name = "Protocol CRAB-17 Phone" desc = "The Protocol CRAB-17 Phone, a phone borrowed from an unknown third party, it can be used to crash the space market, funneling the losses of the crew to your bank account.\ @@ -186,7 +196,10 @@ restricted = TRUE cost = 7 limited_stock = 1 +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/device_tools/binary name = "Binary Translator Key" diff --git a/code/modules/uplink/uplink_items/explosive.dm b/code/modules/uplink/uplink_items/explosive.dm index 0ecea6a5b60..f72ae43440d 100644 --- a/code/modules/uplink/uplink_items/explosive.dm +++ b/code/modules/uplink/uplink_items/explosive.dm @@ -36,7 +36,10 @@ cost = 4 cant_discount = TRUE +<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL START +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/explosives/detomatix name = "Detomatix disk" desc = "When inserted into a tablet, this cartridge gives you four opportunities to \ @@ -45,7 +48,11 @@ item = /obj/item/computer_disk/virus/detomatix cost = 6 restricted = TRUE +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/explosives/emp name = "EMP Grenades and Implanter Kit" desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \ diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm index 73eae12ce08..fe0322355b1 100644 --- a/code/modules/uplink/uplink_items/job.dm +++ b/code/modules/uplink/uplink_items/job.dm @@ -319,7 +319,10 @@ restricted_roles = list(JOB_ROBOTICIST, JOB_RESEARCH_DIRECTOR) surplus = 15 +<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL START +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/role_restricted/spider_injector name = "Australicus Slime Mutator" desc = "Crikey mate, it's been a wild travel from the Australicus sector but we've managed to get \ @@ -332,8 +335,11 @@ restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST) surplus = 10 +<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/role_restricted/blastcannon name = "Blast Cannon" desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \ diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index 50ae39c2996..e697338604b 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -253,8 +253,13 @@ /datum/uplink_item/weapon_kits/high_cost/machinegun name = "L6 Squad Automatic Weapon (Moderate)" +<<<<<<< HEAD desc = "A fully-loaded Scarborough Arms belt-fed machine gun. \ This deadly weapon has a 50-round box chambered for 7.12x82mm ammunition." //SKYRAT EDIT - AUSSEC TO SCARBOROUGH +======= + desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \ + This deadly weapon has a massive 50-round magazine of devastating 7mm ammunition." +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item = /obj/item/gun/ballistic/automatic/l6_saw /datum/uplink_item/ammo_nuclear/basic/machinegun diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index 155ef2b4570..dc0735619d9 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -190,5 +190,8 @@ . = ..() if(trailer && .) var/dir_to_move = get_dir(trailer.loc, old_loc) +<<<<<<< HEAD trailer.glide_size = glide_size //SKYRAT EDIT: Carts +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 step(trailer, dir_to_move) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index d28b510328a..cee92059aac 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -586,7 +586,11 @@ /obj/vehicle/sealed/mecha/proc/process_occupants(seconds_per_tick) for(var/mob/living/occupant as anything in occupants) +<<<<<<< HEAD if(!(mecha_flags & IS_ENCLOSED) && occupant?.incapacitated()) //no sides mean it's easy to just sorta fall out if you're incapacitated. +======= + if(!(mecha_flags & IS_ENCLOSED) && occupant?.incapacitated) //no sides mean it's easy to just sorta fall out if you're incapacitated. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mob_exit(occupant, randomstep = TRUE) //bye bye continue if(cell && cell.maxcharge) @@ -658,7 +662,11 @@ if(phasing) balloon_alert(user, "not while [phasing]!") return +<<<<<<< HEAD if(user.incapacitated()) +======= + if(user.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!get_charge()) return diff --git a/code/modules/vehicles/mecha/equipment/tools/radio.dm b/code/modules/vehicles/mecha/equipment/tools/radio.dm index 33a113a8274..87b2ce60376 100644 --- a/code/modules/vehicles/mecha/equipment/tools/radio.dm +++ b/code/modules/vehicles/mecha/equipment/tools/radio.dm @@ -36,7 +36,11 @@ return TRUE if("set_frequency") var/new_frequency = text2num(params["new_frequency"]) +<<<<<<< HEAD radio.set_frequency(sanitize_frequency(new_frequency, radio.freerange, radio.syndie)) +======= + radio.set_frequency(sanitize_frequency(new_frequency, radio.freerange, (radio.special_channels & RADIO_SPECIAL_SYNDIE))) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE return FALSE diff --git a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm index cca0a832d5c..71efe27e323 100644 --- a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm @@ -14,11 +14,17 @@ harmful = TRUE mech_flags = EXOSUIT_MODULE_RIPLEY ///Bool for whether we beat the hell out of things we punch (and tear off their arms) +<<<<<<< HEAD var/killer_clamp = TRUE ///How much base damage this clamp does var/clamp_damage = 20 ///Var for the chassis we are attached to, needed to access ripley contents and such var/obj/vehicle/sealed/mecha/ripley/cargo_holder +======= + var/killer_clamp = FALSE + ///How much base damage this clamp does + var/clamp_damage = 20 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Audio for using the hydraulic clamp var/clampsound = 'sound/mecha/hydraulic.ogg' ///Chassis but typed for the cargo_hold var diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm index 5166b9c5fdf..94955618e27 100644 --- a/code/modules/vehicles/mecha/mech_bay.dm +++ b/code/modules/vehicles/mecha/mech_bay.dm @@ -114,7 +114,11 @@ ui = new(user, src, "MechBayPowerConsole", name) ui.open() +<<<<<<< HEAD /obj/machinery/computer/mech_bay_power_console/ui_act(action, params) +======= +/obj/machinery/computer/mech_bay_power_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm index b4c29220254..2108e268eaf 100644 --- a/code/modules/vehicles/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/mecha/mech_fabricator.dm @@ -427,7 +427,11 @@ return data +<<<<<<< HEAD /obj/machinery/mecha_part_fabricator/ui_act(action, list/params) +======= +/obj/machinery/mecha_part_fabricator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) diff --git a/code/modules/vehicles/mecha/mecha_control_console.dm b/code/modules/vehicles/mecha/mecha_control_console.dm index 3b465994e9e..82e25d7e74e 100644 --- a/code/modules/vehicles/mecha/mecha_control_console.dm +++ b/code/modules/vehicles/mecha/mecha_control_console.dm @@ -45,7 +45,11 @@ return data +<<<<<<< HEAD /obj/machinery/computer/mecha/ui_act(action, params) +======= +/obj/machinery/computer/mecha/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm index 7a9141e80c1..dbc20f46d0c 100644 --- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm +++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm @@ -20,7 +20,11 @@ moved_inside(M) /obj/vehicle/sealed/mecha/enter_checks(mob/M) +<<<<<<< HEAD if(M.incapacitated()) +======= + if(M.incapacitated) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(atom_integrity <= 0) to_chat(M, span_warning("You cannot get in the [src], it has been destroyed!")) diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm index 8b0c71b91ca..b1eec324bbb 100644 --- a/code/modules/vehicles/mecha/working/clarke.dm +++ b/code/modules/vehicles/mecha/working/clarke.dm @@ -96,7 +96,11 @@ ) return data +<<<<<<< HEAD /obj/item/mecha_parts/mecha_equipment/orebox_manager/ui_act(action, list/params) +======= +/obj/item/mecha_parts/mecha_equipment/orebox_manager/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm index 754a6b820d7..778dc033185 100644 --- a/code/modules/vehicles/mecha/working/ripley.dm +++ b/code/modules/vehicles/mecha/working/ripley.dm @@ -338,7 +338,11 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo) )) return data +<<<<<<< HEAD /obj/item/mecha_parts/mecha_equipment/ejector/ui_act(action, list/params) +======= +/obj/item/mecha_parts/mecha_equipment/ejector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE @@ -382,7 +386,11 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo) to_chat(source, span_warning("You don't have the room to remove [cuffs]!")) return COMSIG_MOB_BLOCK_CUFF_REMOVAL +<<<<<<< HEAD /obj/item/mecha_parts/mecha_equipment/ejector/seccage/ui_act(action, list/params) +======= +/obj/item/mecha_parts/mecha_equipment/ejector/seccage/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(action == "eject") var/mob/passenger = locate(params["cargoref"]) in contents if(!passenger) diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index 82146976ad1..cd59352417e 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -169,7 +169,11 @@ pick_up_board(skater) /obj/vehicle/ridden/scooter/skateboard/proc/pick_up_board(mob/living/carbon/skater) +<<<<<<< HEAD if (skater.incapacitated() || !Adjacent(skater)) +======= + if (skater.incapacitated || !Adjacent(skater)) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(has_buckled_mobs()) to_chat(skater, span_warning("You can't lift this up when somebody's on it.")) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 4fef2f626c1..6eedf60c65a 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -988,9 +988,15 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) var/list/weighted_crits = list() weighted_crits[CRUSH_CRIT_SHATTER_LEGS] = 100 +<<<<<<< HEAD weighted_crits[CRUSH_CRIT_PARAPALEGIC] = 80 //weighted_crits[CRUSH_CRIT_HEADGIB] = 20 // SKYRAT EDIT REMOVAL weighted_crits[CRUSH_CRIT_SQUISH_LIMB] = 80 // SKYRAT EDIT CHANGE - ORIGINAL: weighted_crits[CRUSH_CRIT_SQUISH_LIMB] = 100 +======= + weighted_crits[CRUSH_CRIT_PARAPLEGIC] = 80 + weighted_crits[CRUSH_CRIT_HEADGIB] = 20 + weighted_crits[CRUSH_CRIT_SQUISH_LIMB] = 100 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return weighted_crits @@ -1027,7 +1033,11 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) if(left_leg || right_leg) carbon_target.visible_message(span_danger("[carbon_target]'s legs shatter with a sickening crunch!"), span_userdanger("Your legs shatter with a sickening crunch!")) return TRUE +<<<<<<< HEAD if(CRUSH_CRIT_PARAPALEGIC) // paralyze this binch +======= + if(CRUSH_CRIT_PARAPLEGIC) // paralyze this binch +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // the new paraplegic gets like 4 lines of losing their legs so skip them if (!iscarbon(atom_target)) return FALSE @@ -1182,6 +1192,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) obj_flags |= EMAGGED balloon_alert(user, "product lock disabled") return TRUE +<<<<<<< HEAD /obj/machinery/vending/interact(mob/user) if (!HAS_AI_ACCESS(user)) @@ -1195,6 +1206,23 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) untilt(user) return +======= + +/obj/machinery/vending/interact(mob/user) + if (HAS_AI_ACCESS(user)) + return ..() + + if(seconds_electrified && !(machine_stat & NOPOWER)) + if(shock(user, 100)) + return + + if(tilted && !user.buckled) + to_chat(user, span_notice("You begin righting [src].")) + if(do_after(user, 5 SECONDS, target=src)) + untilt(user) + return + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /obj/machinery/vending/attack_robot_secondary(mob/user, list/modifiers) @@ -1317,7 +1345,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) .["extended_inventory"] = extended_inventory -/obj/machinery/vending/ui_act(action, params) +/obj/machinery/vending/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -1430,7 +1458,11 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) sec_radio = new (src) sec_radio.set_listening(FALSE) sec_radio.set_frequency(FREQ_SECURITY) +<<<<<<< HEAD sec_radio.talk_into(src, "SECURITY ALERT: [usr] recorded attempting to purchase [item_record.name] in [get_area(src)]. Please watch for substance abuse.", FREQ_SECURITY) // SKYRAT EDIT CHANGE +======= + sec_radio.talk_into(src, "SECURITY ALERT: Underaged crewmember [usr] recorded attempting to purchase [item_record.name] in [get_area(src)]. Please watch for substance abuse.", FREQ_SECURITY) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.narcd_underages += usr flick(icon_deny,src) vend_ready = TRUE @@ -1766,7 +1798,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) ) .["vending_machine_input"] += list(data) -/obj/machinery/vending/custom/ui_act(action, params) +/obj/machinery/vending/custom/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/vending/cytopro.dm b/code/modules/vending/cytopro.dm new file mode 100644 index 00000000000..ce351be7769 --- /dev/null +++ b/code/modules/vending/cytopro.dm @@ -0,0 +1,35 @@ +/obj/machinery/vending/cytopro + name = "\improper CytoPro" + desc = "For all your cytology needs!" + product_slogans = "Cloning? Don't be ridiculous.;Don't be uncultured, get some cells growing!;Who needs farms when we got vats?" + product_ads = "Grow your own little creatures!;Biology, at your fingertips!" + icon_state = "cytopro" + icon_deny = "cytopro-deny" + panel_type = "panel2" + light_mask = "cytopro-light-mask" + products = list( + /obj/item/storage/bag/xeno = 5, + /obj/item/reagent_containers/condiment/protein = 10, + /obj/item/storage/box/swab = 3, + /obj/item/storage/box/petridish = 3, + /obj/item/storage/box/monkeycubes = 3, + /obj/item/biopsy_tool = 3, + /obj/item/clothing/under/rank/rnd/scientist = 5, + /obj/item/clothing/suit/toggle/labcoat/science = 5, + /obj/item/clothing/suit/bio_suit/scientist = 3, + /obj/item/clothing/head/bio_hood/scientist = 3, + /obj/item/reagent_containers/dropper = 5, + /obj/item/reagent_containers/syringe = 5, + /obj/item/petri_dish/random = 6, + ) + contraband = list( + /obj/item/knife/kitchen = 3, + ) + refill_canister = /obj/item/vending_refill/cytopro + default_price = PAYCHECK_CREW * 1 + extra_price = PAYCHECK_COMMAND * 0.5 + payment_department = ACCOUNT_SCI + +/obj/item/vending_refill/cytopro + machine_name = "CytoPro" + icon_state = "refill_plant" diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index f7fca7e017b..8e3ca159b36 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -24,7 +24,11 @@ ) premium = list( /obj/item/storage/belt/utility = 3, +<<<<<<< HEAD ///obj/item/construction/rcd/loaded = 2, // SKYRAT EDIT REMOVAL +======= + /obj/item/construction/rcd/loaded = 2, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/smart_metal_foam = 1, ) refill_canister = /obj/item/vending_refill/engivend diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 969ba6add45..a4a2af1acf2 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -58,6 +58,10 @@ /obj/item/skillchip/sabrage = 2, /obj/item/skillchip/useless_adapter = 5, /obj/item/skillchip/wine_taster = 2, +<<<<<<< HEAD +======= + /obj/item/skillchip/big_pointer = 2, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), ), list( diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 0ab72e1f24a..abaa754b402 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -41,7 +41,10 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) icon_state = "secdrobe" product_ads = "Beat perps in style!;It's red so you can't see the blood!;You have the right to be fashionable!;Now you can be the fashion police you always wanted to be!" vend_reply = "Thank you for using the SecDrobe!" +<<<<<<< HEAD /* SKYRAT EDIT - LISTS OVERRIDDEN IN 'modular_skyrat\modules\sec_haul\code\misc\vending.dm' +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 products = list( /obj/item/clothing/head/beret/sec = 3, /obj/item/clothing/head/soft/sec = 3, @@ -66,8 +69,12 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) /obj/item/clothing/under/rank/security/officer/formal = 3, /obj/item/clothing/suit/jacket/officer/blue = 3, /obj/item/clothing/head/beret/sec/navyofficer = 3, +<<<<<<< HEAD ) */ +======= + ) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe payment_department = ACCOUNT_SEC light_color = COLOR_MOSTLY_PURE_RED @@ -333,7 +340,11 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) /obj/item/storage/backpack/satchel/explorer = 1, /obj/item/storage/backpack/messenger/explorer = 1, /obj/item/storage/bag/books = 1, +<<<<<<< HEAD /obj/item/radio/headset/headset_srv = 2, +======= + /obj/item/radio/headset/headset_srvent = 2, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe payment_department = ACCOUNT_SRV diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm index 4dd144b4c80..c3d4451d7e7 100644 --- a/code/modules/wiremod/components/abstract/module.dm +++ b/code/modules/wiremod/components/abstract/module.dm @@ -237,7 +237,11 @@ #define WITHIN_RANGE(id, table) (id >= 1 && id <= length(table)) +<<<<<<< HEAD /obj/item/circuit_component/module/ui_act(action, list/params) +======= +/obj/item/circuit_component/module/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/wiremod/components/admin/proccall.dm b/code/modules/wiremod/components/admin/proccall.dm index b86e05e6c8a..8aa36bf1f69 100644 --- a/code/modules/wiremod/components/admin/proccall.dm +++ b/code/modules/wiremod/components/admin/proccall.dm @@ -114,7 +114,11 @@ arguments += add_input_port(data["name"], data["datatype"]) return ..() +<<<<<<< HEAD /obj/item/circuit_component/proccall/ui_act(action, list/params) +======= +/obj/item/circuit_component/proccall/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/wiremod/components/bci/reagent_injector.dm b/code/modules/wiremod/components/bci/reagent_injector.dm index d7f4a969f31..593e43b7d8a 100644 --- a/code/modules/wiremod/components/bci/reagent_injector.dm +++ b/code/modules/wiremod/components/bci/reagent_injector.dm @@ -9,10 +9,13 @@ display_name = "Reagent Injector" desc = "A component that can inject reagents from a BCI's reagent storage." category = "BCI" +<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - Add container type flag - This is required since we have two reagent components, and the BCI only allows one active //circuit_flags = CIRCUIT_NO_DUPLICATES - SKYRAT EDIT - ORIGINAL circuit_flags = CIRCUIT_NO_DUPLICATES|CIRCUIT_REAGENT_CONTAINER_TYPE //SKYRAT EDIT CHANGE END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 circuit_flags = CIRCUIT_NO_DUPLICATES required_shells = list(/obj/item/organ/internal/cyberimp/bci) diff --git a/code/modules/wiremod/components/id/access_checker.dm b/code/modules/wiremod/components/id/access_checker.dm index 038f4078ecb..20dc3dadf31 100644 --- a/code/modules/wiremod/components/id/access_checker.dm +++ b/code/modules/wiremod/components/id/access_checker.dm @@ -87,7 +87,11 @@ data["oneAccess"] = check_any.value return data +<<<<<<< HEAD /obj/item/circuit_component/compare/access/ui_act(action, params) +======= +/obj/item/circuit_component/compare/access/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm index 45f71ceb617..96c58336f0c 100644 --- a/code/modules/wiremod/core/component_printer.dm +++ b/code/modules/wiremod/core/component_printer.dm @@ -117,7 +117,11 @@ materials.use_materials(design.materials, efficiency_coeff, 1, "printed", "[design.name]") return new design.build_path(drop_location()) +<<<<<<< HEAD /obj/machinery/component_printer/ui_act(action, list/params) +======= +/obj/machinery/component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return @@ -276,7 +280,11 @@ get_asset_datum(/datum/asset/spritesheet/research_designs) ) +<<<<<<< HEAD /obj/machinery/debug_component_printer/ui_act(action, list/params) +======= +/obj/machinery/debug_component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return @@ -364,7 +372,11 @@ update_static_data_for_all_viewers() +<<<<<<< HEAD /obj/machinery/module_duplicator/ui_act(action, list/params) +======= +/obj/machinery/module_duplicator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/wiremod/core/integrated_circuit.dm b/code/modules/wiremod/core/integrated_circuit.dm index 29f8d42b489..9d07d2ca9e1 100644 --- a/code/modules/wiremod/core/integrated_circuit.dm +++ b/code/modules/wiremod/core/integrated_circuit.dm @@ -264,6 +264,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) to_chat(user, span_danger("You can't insert multiple instances of this component into the same circuit!")) return FALSE +<<<<<<< HEAD // SKYRAT ADDITION BEGIN - This is required since we have two reagent components, and the BCI only allows one active if(to_add.circuit_flags & CIRCUIT_REAGENT_CONTAINER_TYPE) if(shell && shell.reagents) @@ -271,6 +272,8 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) return FALSE // SKYRAT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/success = FALSE if(user) success = user.transferItemToLoc(to_add, src) diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index 67a3a41a488..7c3fe016558 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -3,7 +3,10 @@ desc = "An implant that can be placed in a user's head to control circuits using their brain." icon = 'icons/obj/science/circuits.dmi' icon_state = "bci" +<<<<<<< HEAD visual = FALSE +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_HEAD w_class = WEIGHT_CLASS_TINY diff --git a/code/world.dm b/code/world.dm index 4f0b46c815a..31437dda2f5 100644 --- a/code/world.dm +++ b/code/world.dm @@ -18,7 +18,7 @@ name = "/tg/ Station 13" fps = 20 cache_lifespan = 0 - //map_format = SIDE_MAP // SKYRAT EDIT - TODO: WALLENING - REMOVE THIS (hopefully the visual z-fighting issues will have been ironed out by then + map_format = SIDE_MAP #ifdef FIND_REF_NO_CHECK_TICK loop_checks = FALSE #endif diff --git a/config/antag_rep.txt b/config/antag_rep.txt deleted file mode 100644 index a3e9ef2ab7a..00000000000 --- a/config/antag_rep.txt +++ /dev/null @@ -1,5 +0,0 @@ -## Custom antag reputation values -## List of job titles followed by antag rep value, all prefixed with ANTAG_REP. See code/modules/jobs/job_types for titles -## e.g. -## ANTAG_REP Captain 10 -## ANTAG_REP Assistant 0 diff --git a/config/awaymissionconfig.txt b/config/awaymissionconfig.txt index 0a96d93984a..f4d8e25546d 100644 --- a/config/awaymissionconfig.txt +++ b/config/awaymissionconfig.txt @@ -14,5 +14,8 @@ #_maps/RandomZLevels/snowdin.dmm #_maps/RandomZLevels/research.dmm #_maps/RandomZLevels/SnowCabin.dmm +<<<<<<< HEAD #_maps/RandomZLevels/blackmesa.dmm +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #_maps/RandomZLevels/museum.dmm diff --git a/config/config.txt b/config/config.txt index 51f28e06311..418f1e876f9 100644 --- a/config/config.txt +++ b/config/config.txt @@ -5,7 +5,10 @@ $include dbconfig.txt $include comms.txt $include logging.txt $include resources.txt +<<<<<<< HEAD $include skyrat/skyrat_config.txt +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 $include interviews.txt $include lua.txt $include auxtools.txt diff --git a/config/game_options.txt b/config/game_options.txt index d5279e609dd..d0bdd7e6475 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -305,10 +305,13 @@ LAW_WEIGHT custom,0 ## standard-ish laws. These are fairly ok to run ## Unique AI station trait uses weights so we don't want asimov +<<<<<<< HEAD #SKYRAT EDIT ADDITION BEGIN LAW_WEIGHT armadyne_safeguard,40 LAW_WEIGHT dagothbot,8 #SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LAW_WEIGHT asimov,0 LAW_WEIGHT asimovpp,5 LAW_WEIGHT paladin,5 @@ -390,6 +393,7 @@ ROUNDSTART_RACES ethereal ## Races that are radical departures to what a species is, so while they technically can be roundstart - it's probably not wise #ROUNDSTART_RACES android #ROUNDSTART_RACES golem +<<<<<<< HEAD ## SKYRAT RACES DOWN THERE ROUNDSTART_RACES mammal @@ -409,6 +413,8 @@ ROUNDSTART_RACES aquatic ROUNDSTART_RACES insect ROUNDSTART_RACES synth ROUNDSTART_RACES ghoul +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ##------------------------------------------------------------------------------------------- diff --git a/config/jobconfig.toml b/config/jobconfig.toml index 949228e3680..dc6d2bd1289 100644 --- a/config/jobconfig.toml +++ b/config/jobconfig.toml @@ -19,6 +19,7 @@ ## Best of luck editing! [AI] +<<<<<<< HEAD "Playtime Requirements" = 2400 "Required Account Age" = 30 "# Required Character Age" = 0 @@ -59,6 +60,34 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 +======= +"# Playtime Requirements" = 180 +"# Required Account Age" = 30 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[ASSISTANT] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = -1 +"# Total Positions" = -1 + +[ATMOSPHERIC_TECHNICIAN] +"# Playtime Requirements" = 60 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 3 + +[BARTENDER] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [BITRUNNER] "# Playtime Requirements" = 0 @@ -68,6 +97,7 @@ "# Total Positions" = 3 [BOTANIST] +<<<<<<< HEAD "Playtime Requirements" = 0 "Required Account Age" = 0 "# Required Character Age" = 0 @@ -87,6 +117,20 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 +======= +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 3 + +[CAPTAIN] +"# Playtime Requirements" = 180 +"# Required Account Age" = 14 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [CARGO_TECHNICIAN] "# Playtime Requirements" = 0 @@ -96,6 +140,7 @@ "# Total Positions" = 5 [CHAPLAIN] +<<<<<<< HEAD "Playtime Requirements" = 0 "Required Account Age" = 0 "# Required Character Age" = 0 @@ -143,6 +188,48 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 +======= +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[CHEMIST] +"# Playtime Requirements" = 60 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 2 + +[CHIEF_ENGINEER] +"# Playtime Requirements" = 180 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[CHIEF_MEDICAL_OFFICER] +"# Playtime Requirements" = 180 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[CLOWN] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[COOK] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 2 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [CORONER] "# Playtime Requirements" = 0 @@ -152,6 +239,7 @@ "# Total Positions" = 1 [CURATOR] +<<<<<<< HEAD "Playtime Requirements" = 0 "Required Account Age" = 0 "# Required Character Age" = 0 @@ -353,3 +441,157 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 +======= +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[CYBORG] +"# Playtime Requirements" = 120 +"# Required Account Age" = 21 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 0 + +[DETECTIVE] +"# Playtime Requirements" = 300 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[GENETICIST] +"# Playtime Requirements" = 60 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 2 + +[HEAD_OF_PERSONNEL] +"# Playtime Requirements" = 180 +"# Required Account Age" = 10 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[HEAD_OF_SECURITY] +"# Playtime Requirements" = 300 +"# Required Account Age" = 14 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[JANITOR] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 2 + +[LAWYER] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 2 + +[MEDICAL_DOCTOR] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 4 +"# Total Positions" = 6 + +[MIME] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[PARAMEDIC] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 2 + +[PRISONER] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 0 + +[PSYCHOLOGIST] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[QUARTERMASTER] +"# Playtime Requirements" = 0 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[RESEARCH_DIRECTOR] +"# Playtime Requirements" = 180 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 + +[ROBOTICIST] +"# Playtime Requirements" = 60 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 2 +"# Total Positions" = 2 + +[SCIENTIST] +"# Playtime Requirements" = 60 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 3 +"# Total Positions" = 5 + +[SECURITY_OFFICER] +"# Playtime Requirements" = 300 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 5 +"# Total Positions" = 5 + +[SHAFT_MINER] +"# Playtime Requirements" = 0 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 3 +"# Total Positions" = 3 + +[STATION_ENGINEER] +"# Playtime Requirements" = 60 +"# Required Account Age" = 0 +"# Required Character Age" = 0 +"# Spawn Positions" = 5 +"# Total Positions" = 5 + +[VETERAN_ADVISOR] +"# Playtime Requirements" = 6000 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 0 +"# Total Positions" = 0 + +[WARDEN] +"# Playtime Requirements" = 300 +"# Required Account Age" = 7 +"# Required Character Age" = 0 +"# Spawn Positions" = 1 +"# Total Positions" = 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/config/jobs.txt b/config/jobs.txt deleted file mode 100644 index 3b393782222..00000000000 --- a/config/jobs.txt +++ /dev/null @@ -1,89 +0,0 @@ -#This allows easy configuration of the number of positions allowed for each job -#Format is: [Job name]=[total positions],[spawn positions] -#Job names must be identical to the title var of each job datum -#Positions can be set to -1 to allow unlimited slots - - -# Station Command - -Captain=1,1 -Head of Personnel=1,1 -Head of Security=1,1 -Chief Engineer=1,1 -Research Director=1,1 -Chief Medical Officer=1,1 -Quartermaster=1,1 - - -# Central Command - -Nanotrasen Consultant=1,1 -Blueshield=1,1 - - -# Cargo - -Cargo Technician=4,2 -Shaft Miner=4,4 -Customs Agent=2,2 - - -# Service - -Bartender=1,1 -Cook=2,1 -Barber=2,2 -Botanist=3,2 -Janitor=5,5 -Clown=1,1 -Mime=1,1 -Curator=2,2 -Lawyer=2,2 -Chaplain=1,1 -Psychologist=1,1 -Bouncer=2,2 - - -# Engineering - -Station Engineer=5,5 -Atmospheric Technician=3,2 -Engineering Guard=2,2 - - -# Medical - -Medical Doctor=5,3 -Paramedic=3,2 -Chemist=2,2 -Geneticist=2,2 -Virologist=1,1 -Orderly=2,2 - - -# Science - -Scientist=5,5 -Roboticist=3,2 -Vanguard Operative=0,0 -Science Guard=2,2 - - -# Security - -Warden=1,1 -Detective=2,2 -Security Officer=6,6 -Corrections Officer=2,1 - - -# Silicons - -AI=1,1 -Cyborg=3,3 - - -# Misc. - -Assistant=-1,-1 -Prisoner=12,12 diff --git a/config/maps.txt b/config/maps.txt index 3bb36ceaa17..75f4cb7a815 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -62,6 +62,7 @@ endmap map runtimestation endmap +<<<<<<< HEAD ##SKYRAT MAPS## @@ -79,3 +80,5 @@ map kilostation maxplayers 75 votable endmap +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index fb34b2208a5..3e258cbbeac 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -83,7 +83,10 @@ #_maps/RandomRuins/SpaceRuins/waystation.dmm #_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +<<<<<<< HEAD #_maps/RandomRuins/SpaceRuins/skyrat/drones_derelict.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/forgottenship_skyrat.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/shuttle8532.dmm #modular_skyrat/modules/ruins/maps/space/dangerous_research.dmm +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/config/word_filter.toml b/config/word_filter.toml index e2a5f1c05b9..eae833ed34b 100644 --- a/config/word_filter.toml +++ b/config/word_filter.toml @@ -23,6 +23,10 @@ [soft_ic] "testsofterblocks" = "This term is commonly considered OOC, only use it with context." +<<<<<<< HEAD # Anything in here will warn the player if said ICly *except* PDAs, the player must approve their message to send it +======= +# Anything in here will warn the player if said ICly *except* PDAs. the player must approve their message to send it +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [soft_ic_outside_pda] "testsoftestblocks" = "Stop saying debug phrases ICly." diff --git a/dependencies.sh b/dependencies.sh index 01ba3094e5b..8319e5edd33 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -11,9 +11,9 @@ export BYOND_MINOR=1637 export RUST_G_VERSION=3.3.0 #node version -export NODE_VERSION=14 -export NODE_VERSION_LTS=20.12.0 -export NODE_VERSION_COMPAT=14.16.1 +export NODE_VERSION_LTS=20.13.0 +# compatiblility mode MUST work with windows 7 +export NODE_VERSION_COMPAT=20.2.0 # SpacemanDMM git tag export SPACEMAN_DMM_VERSION=suite-1.9 @@ -21,11 +21,11 @@ export SPACEMAN_DMM_VERSION=suite-1.9 # Python version for mapmerge and other tools export PYTHON_VERSION=3.9.0 -#auxlua repo -export AUXLUA_REPO=tgstation/auxlua +#dreamluau repo +export DREAMLUAU_REPO="tgstation/dreamluau" -#auxlua git tag -export AUXLUA_VERSION=1.4.4 +#dreamluau git tag +export DREAMLUAU_VERSION=0.1.2 #hypnagogic repo export CUTTER_REPO=spacestation13/hypnagogic diff --git a/dreamluau.dll b/dreamluau.dll new file mode 100644 index 00000000000..cc2d56d2d1e Binary files /dev/null and b/dreamluau.dll differ diff --git a/html/changelogs/AutoChangeLog-pr-86478.yml b/html/changelogs/AutoChangeLog-pr-86478.yml new file mode 100644 index 00000000000..4247a79257d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-86478.yml @@ -0,0 +1,4 @@ +author: "EnterTheJake" +delete-after: True +changes: + - balance: "Syndicate quiver is now small sized instead of Bulky." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-86491.yml b/html/changelogs/AutoChangeLog-pr-86491.yml new file mode 100644 index 00000000000..6b16473e718 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-86491.yml @@ -0,0 +1,4 @@ +author: "grungussuss" +delete-after: True +changes: + - sound: "fish sounds are louder" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-86516.yml b/html/changelogs/AutoChangeLog-pr-86516.yml new file mode 100644 index 00000000000..d4e75e8a530 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-86516.yml @@ -0,0 +1,4 @@ +author: "FeudeyTF" +delete-after: True +changes: + - bugfix: "fixed removing last case" \ No newline at end of file diff --git a/html/changelogs/archive/2018-04.yml b/html/changelogs/archive/2018-04.yml index cc47dfc36bb..2268af99b4f 100644 --- a/html/changelogs/archive/2018-04.yml +++ b/html/changelogs/archive/2018-04.yml @@ -409,7 +409,11 @@ flags are removed. - code_imp: New stationloving component replaces all of this. - code_imp: 'Added new signals: COMSIG_MOVABLE_Z_CHANGED is now sent when a movable +<<<<<<< HEAD changes Z level, COMSIG_PREQDELETED is sent before the object''s Destroy() +======= + changes Z level, COMSIG_PARENT_PREQDELETED is sent before the object''s Destroy() +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 is called and allows interrupting the deletion, COMSIG_ITEM_IMBUE_SOUL is sent when a wizard attempts to make a thing their phylactery' - bugfix: slime pressurization potions are no longer consumed when attempting to diff --git a/html/changelogs/archive/2018-08.yml b/html/changelogs/archive/2018-08.yml index adf61a4b58f..e61132f7a18 100644 --- a/html/changelogs/archive/2018-08.yml +++ b/html/changelogs/archive/2018-08.yml @@ -63,7 +63,11 @@ the vault contains a set of valuable Syndicate documents.' - tweak: Added a scrubber pipenet to the Lavaland mining base. Garen: +<<<<<<< HEAD - bugfix: mobs now call COMSIG_ATOM_ATTACKBY +======= + - bugfix: mobs now call COMSIG_PARENT_ATTACKBY +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JJRcop: - rscadd: Deadchat can use emoji now, be sure to freak out scrying orb users. Kmc2000: diff --git a/html/changelogs/archive/2021-05.yml b/html/changelogs/archive/2021-05.yml index 7a162ba1990..6d0f6584475 100644 --- a/html/changelogs/archive/2021-05.yml +++ b/html/changelogs/archive/2021-05.yml @@ -602,6 +602,7 @@ added. - bugfix: Removed instances of duplicated pipes in icebox atmos. 2021-05-24: +<<<<<<< HEAD Cheshify: - rscadd: New gear is available within Mothership Astrum. - balance: Mothership Astrum has been entirely rebalanced. @@ -630,11 +631,14 @@ found on the maps at round-start. GoldenKeyboard: - rscadd: Cryopods can store items; and their control computer can dispense them. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy: - imageadd: The cyborg toolset is now all new and improved, with a new coat of paint! RandomGamer123: - spellcheck: Attacking someone with a blood filter now uses the correct verb conjugation - bugfix: Lockers can now only be unlocked if you're next to them. +<<<<<<< HEAD SkyratBot: - bugfix: Fixed another source to the bug preventing reconnect. - bugfix: Lockers can now only be unlocked if you're next to them. @@ -653,6 +657,8 @@ - refactor: tamable component + egg layer component, animal variety element Sonic121x: - imageadd: ID trim for department peace keeper +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SpaceDragon00: - qol: Inspecting a weapon shows a warning label. By default, this shows force, throwforce, armour_penetration, and block_chance in an esoteric manner. Inspecting @@ -661,9 +667,12 @@ and the damage of those modes - qol: Using credits on a PDA, Laptop, or Tablet now inserts the credits into the contained ID card, if there is one +<<<<<<< HEAD ZephyrTFA: - admin: LOOC can now be muted. How you managed to earn a LOOC mute is beyond me though. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alexkar598: - code_imp: Removed a proc thats used nowhere and implemented nowhere maxymax13: @@ -673,6 +682,7 @@ ID card models. - imageadd: The rainbow ID card has been resprited. - imageadd: The flames ID card has been slightly improved. +<<<<<<< HEAD thestubborn: - bugfix: blueshield jacket should show up now - rscadd: Tentacle Beard! @@ -748,10 +758,54 @@ - rscadd: From June 23rd to June 29th, celebrates pride week w/ rainbow floor tiles. - rscdel: Removed the toggle intent selection style preference - bugfix: Fixes the jumpskirt in hand icon displaying an error +======= + tralezab: + - refactor: tamable component + egg layer component, animal variety element +2021-05-25: + AnturK: + - config: Explorer drone adventures are now stored in the db instead of config + Fikou: + - code_imp: ai upload now doesnt lag you as much + InsaneRed: + - qol: Converts most of the equipment on mechs into ballons + JohnFulpWillard: + - spellcheck: The Research Director's plasmaman envirosuit is now labelled as belonging + to the Research Director rather than the Chief Engineer. + Melbert: + - bugfix: Fixes being unable to feed chickens for eggs + Mothblocks: + - rscadd: From June 23rd to June 29th, celebrates pride week w/ rainbow floor tiles. + SgtHunk: + - qol: Slaughter demons now slam their targets with right-click rather than with + ctrl+shift+click. + Watermelon914: + - bugfix: Fixed being able to noogie harm people as a pacifist. + - bugfix: Fixed borgs dropping their equipment when cryo'd. + ninjanomnom: + - bugfix: Fixes the pda alert using the wrong overlay and displaying an error state + - bugfix: Water vapor can be purchased instead of shipping an empty crate + - bugfix: The express console can purchase gas canisters again + - bugfix: Gas canisters come in a large crate again + norill: + - bugfix: fixed backpack firefighter tank nozzle refilling not working in extinguisher + mode + - qol: Made the action of holding firelocks open by left clicking with a crowbar + less confusing by adding balloon messages describing what is happening. Changed + the firelock examine text to explain that right-click opens it permanently and + left-click opens it temporarily +2021-05-26: + FlamingLily: + - bugfix: Muscled Veins is now correctly labelled as muscled veins, and not threaded + veins. + - bugfix: Gastrectomy now correctly has a surgery failure message + RandomGamer123: + - rscdel: Removed the toggle intent selection style preference +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Waltermeldron: - rscadd: Adds Integrated Circuits back to science. Circuit Components can be printed off and placed onto these circuits. These circuits can be placed into shells that can be printed at the protolathe. +<<<<<<< HEAD Yawet330: - tweak: Mold weight & Max occurances - tweak: Mold rats now respect hardsuits. @@ -784,6 +838,23 @@ - bugfix: Jatum handles better non-assoc list - bugfix: Fixed UIs like the cargo chatroom console and the genetics console not opening. +======= + dragomagol: + - qol: door remotes now use balloon alerts instead of chat messages + ninjanomnom: + - bugfix: Certain objects that were migrated to a new greyscale system could no + longer be colored via washing machine. This has been fixed. + - bugfix: You can select the config again in the greyscale debug menu with admin + controls enabled + - balance: Canister leaks are more consistent rather than jittery, but slower. + - bugfix: Fixes the jumpskirt in hand icon displaying an error + vincentiusvin: + - bugfix: Fixed multiple piping mistakes in Delta, Meta, and Icebox. +2021-05-27: + BraveMole: + - bugfix: Jatum handles better non-assoc list + Mickyan: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: you can knock cigarettes out of people's mouths again, hooray! - balance: objects that can be knocked off now have a chance to fall whenever the wearer is knocked down @@ -792,6 +863,7 @@ - balance: Broken prescription glasses can be repaired using cloth or a welding tool - balance: Increased point cost of Nearsighted quirk from -1 to -4 +<<<<<<< HEAD Swiftfeather: - bugfix: Teleportation now blocked at gateway missions tf-4: @@ -862,3 +934,92 @@ - bugfix: Fixed duplicate PunPun in Tramstation bar - bugfix: Fixed duplicated chemistry locker embedded in the Tramstation HPLC machine - bugfix: Organs without owner no longer runtime +======= + PositiveEntropy, Twaticus, AdipemDragon: + - imageadd: Replaces the old stool sprites with new and improved ones made by Twaticus + and AdipemDragon! + - imageadd: Ports new and improved Tau Ceti bookshelf sprites! + Watermelon914: + - bugfix: Fixed UIs like the cargo chatroom console and the genetics console not + opening. + norill: + - bugfix: fixed check plumbing admin verb +2021-05-28: + Fikou: + - qol: the borg disabler cooler only is in tech places if secborgs arent disabled + InsaneRed: + - bugfix: the extra vent on deltastations incinerator has been removed + - bugfix: Deltastations kitchen's privacy shutters work again + - bugfix: Thermomachines across all maps have now been properly linked to waste + and will work properly now. Trit huffers rejoice + - bugfix: The SM pipe on metastation will no longer connect to waste and burn up + the entire mix if your newly-chosen engineer friend accidently uses a grey pipe. + - bugfix: Box whiteship now has a proper thermomachine setup for its cryo. + - bugfix: Metastations xenobiology freezer is now properly connected. + - bugfix: Icebox Supermatter setup's thermomachines are no longer connected to the + injector and should no longer empty all of waste. + - bugfix: Fixes up some randomly visible adaptors on metastation toxins and connects + its freezer to waste. + - bugfix: Kilostation's toxin freezers are now connected properly. + - bugfix: Deltastation's supply freezer is now connected properly. + - bugfix: Metastation's supply freezer is now connected properly. + - bugfix: Tramstation's toxin freezers are now linked up to waste correctly + - bugfix: Icebox N2 to pure pipe is now named correctly + - bugfix: Fixed the duplicate piping infront of the n2 pipe on icebox + Maurukas: + - bugfix: Some debris leftover from extending Kilostation have been cleared + Melbert: + - rscadd: GAGS Lizard Plushes. Now, lizard plushes get a randomly generated lizard + color when they're made. + Ryll/Shaps: + - bugfix: Embeddable items like ninja stars can once again embed in people + Skoglol: + - balance: Powersinks now generate heat when absorbing energy, and are a lot easier + to counter with the SM than before. + - bugfix: Organ damage messages are now only sent if you are conscious. + Watermelon914: + - bugfix: Blob camera no longer falls through zlevels. + - code_imp: Added an optimization to the input subsystem. + cacogen: + - bugfix: Human burgers can name themselves after their ingredient sources again + vincentiusvin: + - bugfix: Some duplicate pipes in kilo atmospherics have been fixed. + - qol: Various piping improvements in kilo atmospherics. +2021-05-29: + antropod: + - bugfix: Fixed reagent multiplication exploit with 1u foam + ninjanomnom: + - bugfix: Some screwdriver inhand icons have been fixed to not show an error + - bugfix: Some prison jumpsuit inhand icons have been fixed to not show an error +2021-05-30: + Mickyan: + - bugfix: Smoking no longer spills spaghetti from your pockets + - bugfix: Lit cigarettes no longer keep falling off + - spellcheck: Removed extra "the" from item knockdown messages + RandomGamer123: + - bugfix: Starlight condensation now heals you on glass tiles exposed to space, + multi-z stations, lavaland, and unroofed structures correctly. + RaveRadbury: + - bugfix: Mime crayons don't make you multicolored when you eat them. + Watermelon914: + - bugfix: Fixes AND/OR gates not properly functioning because of null inputs. + norill: + - bugfix: Fixed not being able to add telecomms frequency filters + - bugfix: Changed the color of command frequency in telecomms and headset GUI from + blue to yellow to match chat color +2021-05-31: + Gamer025: + - bugfix: Fixed some incorrect uses of UnregisterSignal + - bugfix: Organs without owner no longer runtime + Maurukas: + - qol: adds a substantial number of fire alarms to Tramstation areas that had few/none + - bugfix: Fixed duplicate PunPun in Tramstation bar + - bugfix: Fixed duplicated chemistry locker embedded in the Tramstation HPLC machine + - bugfix: The Cryopod bays on Icebox, Metastation and Deltastation have been wired + into the station's power grid + Melbert: + - rscadd: GAGS flowers (Rainbow bunch flowers now look prettier!) + - refactor: Rainbow bunch flowers now use GAGS instead of their old method of greyscaling + ninjanomnom: + - bugfix: Screwdrivers no longer cause an error icon while in the belt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-06.yml b/html/changelogs/archive/2021-06.yml index 8f41d959021..fda6adca5d5 100644 --- a/html/changelogs/archive/2021-06.yml +++ b/html/changelogs/archive/2021-06.yml @@ -2,6 +2,7 @@ Arkatos: - refactor: Notice board now uses tgui. - bugfix: Notice boards will now properly drop their contents upon destruction. +<<<<<<< HEAD KathrinBailey: - bugfix: Wildcat magazines now show up. - rscadd: Prototype version of Privateers, including a new shuttle for their exclusive @@ -150,6 +151,96 @@ instant mozi_h: - bugfix: Fixed a small icon inconsistency with the notice board. +======= + FlamingLily: + - qol: Surgery masks no longer block surgery. + Gamer025: + - bugfix: Offering an item multiple times no longer causes runtimes + - bugfix: Chairs no longer runtime when being deconstructed + Inept: + - rscadd: Some new holidays have been added. + JohnFulpWillard: + - qol: Microwaves now use Right Click instead of Alt click to turn on. + Krysonism: + - imageadd: The desk, green and banana lamps have been resprited. + Mothblocks: + - bugfix: Fixed dynamic latejoins. + Timberpoes: + - bugfix: Fix oversight where Dynamic can assign antag datums to the minds of players + who will be forcefully returned to the lobby. + ninjanomnom: + - imageadd: Better greyscale support has been added to datum materials allowing + objects to have more complex compositions of sprites. The golden cleric mace + is extra shiny now. + - bugfix: Mime shoes no longer runtime when generating their icon. This may fix + some graphical oddity or do nothing at all since they get colored pure white + anyway. + rasepretep: + - code_imp: removed the piece of code that causes carpotoxin to qdel temporal scars + (hopefully I identified it correctly) +2021-06-02: + FernandoJ8: + - bugfix: RD's liver now has the TRAIT_ROYAL_METABOLISM trait. + ModDownloading: + - qol: 'You can be your own character in Mafia again. Don''t worry plasmamen: you + don''t die from fire or lack of plasma in the mafia game, so you can be a funny + purple skeleton in relative peace.' + RandomGamer123: + - bugfix: Heretic's reality phase ability is no longer affected by the bag of holding + dragomagol: + - bugfix: railings drop rods on deconstruction + - bugfix: connected the kilo medbay lobby apc to the grid +2021-06-03: + Mordent: + - refactor: Split DnaConsole interface into separate files. + RandomGamer123: + - bugfix: Removes random camera and railing in space near xenobio on metastation + - bugfix: Switchblades' blades now actually pop out like intended + SpaceDragon00: + - bugfix: Large energy crossbow now sounds like an energy crossbow + carshalash: + - qol: Makes fish affordable to common workers. + dragomagol: + - qol: newly-resprited stools and barstools are now facing tables + zxaber: + - bugfix: AIs should no longer occasionally have their lawset randomly and silently + returned to Asimov. +2021-06-04: + GoldenAlpharex: + - bugfix: Custom outfits will now save their ID trim. + JJRcop: + - bugfix: Drone tools can no longer be inserted into an autolathe. + JohnFulpWillard: + - bugfix: Shaft Miners can now access Cargo on Tramstation + Mothblocks: + - qol: Controllers for circuits now use right-click instead of alt-right-click. + SmArtKar: + - bugfix: Attacking something as morph no longer floods your chat with "You're already + in your normal form!" + - bugfix: Fixed banana juice having x2 chance of appearing in mystery soup + - bugfix: Fixes AI screen blur not disappearing after getting creampied + Y0SH1M4S73R: + - bugfix: Local insurance providers have realized that they should advertise their + services BEFORE the occurrence of the very accidents they are supposed to insure + against. +2021-06-05: + Mothblocks: + - balance: Increased the minimum pop for heretics to 18 players. + RandomGamer123: + - bugfix: Reaction chambers no longer drop beakers when deconstructed + - bugfix: Fixes split personality sometimes switching to other person upon death + - bugfix: Gun scopes no longer work if you don't have the gun in your hands + SmArtKar: + - bugfix: Coniine no longer makes you suffocate even after it leaves your system + Y0SH1M4S73R: + - bugfix: dynamic will no longer spawn abductors if there aren't enough applicants + for a proper 2-person abductor team + mozi_h: + - bugfix: Fixed a small icon inconsistency with the notice board. + peptron1: + - rscadd: Ghosts can now find out how much power is in the network by examining + cables +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-06-07: 'ArcaneMusic, Celotajs: ft PowerfulBacon': - rscadd: Modular, GAGS winter coats and sprites. @@ -158,6 +249,7 @@ - rscadd: Added the ability to dye your hair with gradients by using a hair dye spray. - rscadd: The new Colorist quirk, allowing you to spawn with a hair dye spray. +<<<<<<< HEAD FlamingLily: - bugfix: Internals activating in stripping menu - bugfix: Stasis units exist again @@ -200,11 +292,76 @@ to equip themselves when you hold them in your hand and mouse over an inventory slot they can be equipped to. - bugfix: The drive-by landing station trait can no longer send players to space. +======= + Gamer025: + - bugfix: The message for new duplicate keybinds should only appear once now + - bugfix: Resetting your keybinds to classic mode works correctly now + - bugfix: Hotkey mode is now actually used when new hotkeys with a default setting + are added + - bugfix: You will no longer get a duplicate keybinding conflict message for new + hotkeys with no default key, they will just be silently set to unbound + Ghilker: + - bugfix: fix temperature pump exploit that allows the users to go over 1e8 limiter. + This is done by a power usage equation that become exponential upon reaching + 3e7 and will eat through the room APC charge (so no makeshift power drain). + Krysonism: + - imageadd: The circuit multitool has a new sprite. + ModDownloading: + - rscadd: audio_cooldown, a var for coders to use in new emotes to add a cooldown + for sounds when the emote is used voluntarily. + - rscadd: Clapping and laughing now have 5-second audio cooldowns. + NamelessFairy: + - bugfix: DeusVend's name is now consistent across both the vendor and restocking + unit + SmArtKar: + - bugfix: Fixed wrong icons in Orion Trail general market event + Watermelon914: + - rscadd: Added the Internal GPS, Direction, Health, Pull and Signal Combiner circuit + components. + - rscadd: Added the Money Bot shell which can dispense and receive money and also + added the ability to lock shells by scanning your ID over the circuit and then + over the shell once inside the shell. + - rscadd: You can now rename integrated circuits so that they appear on the attached + shell. + - code_imp: Restructured the circuit components folder to be more organised. + Y0SH1M4S73R: + - spellcheck: The text for the surrender emote is now grammatically consistent. + ninjanomnom: + - qol: Additional information was added to the greyscale configuration menu in the + form of tooltips. + - qol: You can now randomize the colors in the greyscale configuration menu. + - qol: The configuration that a layer is from is now displayed in the full version + of the greyscale configuration menu. + - bugfix: The full version of the greyscale configuration menu now properly displays + all layer steps again. + tralezab: + - admin: Sorted the traitor panel a bit. + - rscadd: anonymous names feature content + - spellcheck: any reference to ai triumvirate as "tripAI" has been obliterated. + use the right case next time, jagoff + - code_imp: Moved ai triumvirate off SSTicker + - refactor: ai triumvirate is now a singleton datum controller + - admin: anonymous names has two new themes and some optional enabled theme features + vincentiusvin: + - qol: Ghosts can open NT CIMS (SM monitor) by clicking the Supermatter Crystal. + - rscdel: Removed the EER from the examine text +2021-06-08: + Mothblocks: + - qol: The "your fingers are too big" message for shooting a gun (such as with insulated + gloves on) is now a balloon alert. + Watermelon914: + - bugfix: Fixed the unbearable lag on the R&D consoles. + bobbahbrown: + - bugfix: Players with zero living time will now be caught as expected by a default + config soft panic bunker. + interestingusernam3: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Fake N-spect scanners, buyable via black market uplink (Tools section). - rscadd: Bananium HONK-spect scanners, craftable from fake N-spect scanners (Crafting menu, misc section). - rscadd: The N-spect scanner now draws power from a removable power cell when printing reports. The cell it starts with has enough power for 100 reports. +<<<<<<< HEAD - bugfix: Telekinesis throwing is now logged even if you don't hit someone. bobbahbrown: - bugfix: Players with zero living time will now be caught as expected by a default @@ -258,12 +415,29 @@ life as well. - rscadd: 'New emote: *tilt "tilts their head to the side."' - admin: Added the ability to enforce two-factor authentication onto admins. +======= + tralezab: + - rscadd: Robotics Two Person Mecha! +2021-06-09: + Fhaxaris: + - bugfix: Telekinesis throwing is now logged even if you don't hit someone. + Melbert: + - bugfix: Fixes self-use sleepers like syndie-sleepers so you can actually use them + by yourself when you're inside them. + RandomGamer123: + - bugfix: The heroine bud can no longer be removed by click-dragging + Thunder12345: + - bugfix: The drive-by landing station trait can no longer send players to space. + - bugfix: Swarmer traps are functional again + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Admins will no longer accidentally toggle delaying the end of the shift off when multiple admins attempt to delay at the same time. - admin: When a round end delay goes past the ordinary server restart time, admins are now required to manually end the shift through Reboot World in the Server verb tab or Reboot-World in the command bar. The shift will no longer automatically restart past this point just because an admin undelayed end. +<<<<<<< HEAD - bugfix: 'Fixed defibrillator paddles and wall mounts not detecting charge changes. qol: Examining defibrillators now tell you if there is a power cell inside and how to remove it' @@ -287,10 +461,69 @@ unit0016: - bugfix: Xenobiology on NSS Journey no longer generates roundstart atmos diffs. - rscadd: Interdyne has been remapped from the ground up. +======= + - bugfix: Straight jackets and cargo gauntlets no longer pretend they're trying + to equip themselves when you hold them in your hand and mouse over an inventory + slot they can be equipped to. + cacogen: + - qol: Right-clicking a reagent container in your active hand will pick the previous + transfer amount instead of the next + - code_imp: Mauna mug uses ctrl+click instead of attack_self() to toggle power + - code_imp: Resetting an object's name and description with a pen will return them + to what they were before being changed, instead of their initial values + - bugfix: Resetting a sculpture's description will no longer result in a description + telling you to yell at Firecage + - qol: All custom names in Character Settings can now either be reset to the default + or randomised by leaving the text box blank + - qol: You can now pick a random religion in Character Settings by leaving the text + box blank. Setting a religion will also set the bible name and deity if applicable +2021-06-10: + Mothblocks: + - admin: Added the ability to enforce two-factor authentication onto admins. + Thunder12345: + - spellcheck: The remaining damage message when tending burns no longer calls it + brute damage. + fira: + - bugfix: Fixed race condition in creation of z-levels. + - bugfix: Input system won't request in-place movements constantly anymore. +2021-06-11: + Arkatos: + - qol: Midround alien larvas start the game already in a vent instead of just on + top of it. Fair chance for everyone! + GoldenAlpharex: + - bugfix: '*me should no longer force someone else''s message on your emote.' + Melbert: + - qol: You can now quick-swap beakers in and out of the bio-generator (Insert a + new beaker without needing to eject the old one). + RandomGamer123: + - bugfix: Replaces unusable TEG board on derelict with boards for a turbine setup + instead. + - bugfix: The tram control console now displays an icon for science correctly. + - qol: You can now examine people to see if they are being strangled with durathread. + - qol: Cutting durathread off of someone else now produces a public message for + everyone to know. + - bugfix: Durathread strangling caused by golems can now be cut off with jaws of + life as well. + RaveRadbury: + - rscadd: 'New emote: *tilt "tilts their head to the side."' + TJatPBnJ: + - qol: Storage items open on right-click, instead of alt-click + Wallem: + - bugfix: Matchbox sprite properly empties. + norill: + - bugfix: Fixed defibrillator paddles and wall mounts not detecting charge changes. + - qol: Examining defibrillators now tell you if there is a power cell inside and + how to remove it + tf-4: + - bugfix: The chemistry diamond is now NFPA compliant + vincentiusvin: + - bugfix: fixed the 2person mech crushing it's own parts +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-06-12: Arkatos: - bugfix: Fixed a case where slip mood debuff was not triggering at all. You should think about being more careful next time... +<<<<<<< HEAD SkyratBot: - admin: Opening and closing job slots is now logged. - bugfix: The tram control console now displays an icon for science correctly. @@ -313,6 +546,17 @@ GoldenAlpharex, but actually Mothblocks: - bugfix: Looking at the images in the Color Customization of the GAGS menu will no longer make you feel like you dropped your glasses. +======= + JohnFulpWillard: + - admin: Opening and closing job slots is now logged. + Thunder12345: + - imageadd: Three new hair gradients, a pair of shorter fades and a spiky wave. + Watermelon914: + - bugfix: Fixed a runtime with the comparison components. + vincentiusvin: + - bugfix: stimformation should not be called if no gas is actually being formed. +2021-06-13: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Inept, Coiax, AdipemDragon, YakumoChen: - rscadd: 'The release of the new cookbook, "Tiziran Cooking: a Taste of the Homeworld" has brought Lizard food to the masses! Try out some new treats, like Moonfish, @@ -324,6 +568,7 @@ They all like saltwater! - rscadd: A few new snacks are also now available at the station's snack vendors, for those of you too lazy to visit the kitchen. +<<<<<<< HEAD Mqiib's spritework: - imageadd: Skeletons and Robots now have unique wing sprites Ryll/Shaps: @@ -401,6 +646,27 @@ un-graftable, un-shearable, un-mutatable plant traits that show up on the plant analyzer now. qol: The plant analyzer now differentiates between traits you can mess with and traits you cannot.' +======= + JohnFulpWillard: + - qol: Sloths can now be picked up. +2021-06-14: + Arkatos: + - bugfix: Cayenne will no longer keep flickering an error sign when carrying a disk. + - bugfix: Radial info boxes will now layer properly over the radial button, so it + is actually visible and clickable. + Bluetshirtguy, RaveRadbury: + - expansion: Mimes have more picture words for their PDAs + - imageadd: New emojis for OOC chat and Mime PDAs + GoldenAlpharex, but actually Mothblocks: + - bugfix: Looking at the images in the Color Customization of the GAGS menu will + no longer make you feel like you dropped your glasses. + Melbert: + - rscadd: There are now over a dozen new plant traits, but they're not really new. + A bunch of unique plant behaviors (like holymelon's anti-magic) are now un-graftable, + un-shearable, un-mutatable plant traits that show up on the plant analyzer now. + - qol: The plant analyzer now differentiates between traits you can mess with and + traits you cannot. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Killer Tomatos no longer have liquid contents naturally. - balance: Liquid Contents and Hypodermic Prickles are no longer compatible with one another. They already didn't work together in most cases, this just makes @@ -409,6 +675,7 @@ - code_imp: Autodoc'd grown food / plant gene code - refactor: Refactored grown food / plant gene code - admin: A bunch more botany grief stuff is logged now +<<<<<<< HEAD SkyratBot: - bugfix: Fixed the tgui changelog dates sometimes being inaccurate to the source files. @@ -445,10 +712,91 @@ - bugfix: countess, karn, and formal red now hide shoes 2021-06-20: Arkatos: +======= + Mothblocks: + - rscadd: When a midround ghost event doesn't get any applicants, a sleeper agent/syndicate + infiltrator will roll in its place. + Mqiib's spritework: + - imageadd: Skeletons and Robots now have unique wing sprites + RandomGamer123: + - bugfix: The Enhanced Interrogation Chamber's mid-interrogation messages will now + actually be received. + - bugfix: The hypnoflash (and flashes in general) now work on sleeping people. + RaveRadbury: + - qol: You can select wrapping paper colors by right clicking them. + Ryll/Shaps: + - admin: The Modify Transform -> Translate option in the VV dropdown will now remind + you which way positive or negative numbers will move the sprite in question. + For those of you wondering, on the Y-axis, positive moves you up and negative + moves you down. + - bugfix: Dogs are now properly restricted to being able to fetch/pick up items + only, and can no longer fetch you lockers and full size cars + TemporalOroboros: + - rscadd: Neon carpets exists. Bug your local chemist or quartermaster for a supply. + - code_imp: Decals support user-defined planes and some forms of smoothing. + Timberpoes: + - admin: Adding and removing quirks using the VV dropdown is now more reliable in + adding or removing the effects of quirks. + - code_imp: Refactors quirks and (hopefully) improves their code, squashing some + runtimes associated with quirks on deleted mobs and increasing the performance + of some quirks. There should be no player-facing changes, however any problems + with quirks should be reported on the Github issue tracker since they may stem + from this PR. + Watermelon914: + - bugfix: Fixed wrap and charge abilities for tarantula and broodmother spiders + - bugfix: Fixed moneybots dispensing 0 credits and added a failure signal if it + tries to dispense 0 credits. + - refactor: Refactored tram code to be more robust and easier to read. + Y0SH1M4S73R: + - spellcheck: fixed a typo in disembowelment + bobbahbrown: + - admin: The interview system has been improved with in-chat clickable links for + interviews and ability to include links in interview questions. + fira: + - bugfix: Made statpanel relay used mouse button when clicking on turf contents. + vincentiusvin: + - qol: Most alt-click atmospheric interactions changed to use balloon alerts. + zxaber: + - sounddel: The space-jam ambient sound will no longer play inside the AI's core. +2021-06-15: + Watermelon914: + - refactor: Refactors how spans are done in code. +2021-06-16: + ArcaneDefence: + - expansion: Poutine can be made via the crafting menu in the misc foods category + again. + DuffCreeper: + - rscadd: Allows people to now examine fire alarms to detect their thermal sensor + state. Silicons can now also Ctrl+Click to enable and disable at the sensor + at a whim + - code_imp: Cleaned up single letter variables in firealarm.dm + JohnFulpWillard: + - bugfix: Flipping a gun will no longer unload all its bullets. + - balance: Bartenders now properly have a weapon's permit for their gun. + Mothblocks, ArcaneMusic for sprites: + - rscadd: Bot circuits can now use USB cables to connect to computers and machines + that support it. Currently, only the tram controls computer supports this, but + support should roll out for other systems. + - rscadd: Bot shells now have a button that you can register to. + TemporalOroboros: + - bugfix: Wigs work when on your head again. + Watermelon914: + - bugfix: Fixed the RAM component retaining its output type after the input port + is cleared. + tralezab: + - bugfix: carbon roses can no longer mutate into carbon roses +2021-06-17: + Arkatos: + - qol: Swarmers now have a generic living healthdoll and pull icon. + - qol: Swarmers will now show severity of their injuries as a red screen overlay + to the user. + - qol: Swarmer's abilities now have tooltips to clarify their use upon mouse hover. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Smartfridges will now show an approximate number of their stored items correctly on their sprite. - bugfix: Smartfridges will now count maximum number of allowed items correctly. - bugfix: Smartfridges will now show their UI only when directly interacted with. +<<<<<<< HEAD Cheshify: - balance: Mothership Astrum has been entirely rebalanced again. - bugfix: Accidental debug tools and mapping errors have been removed from Astrum. @@ -466,17 +814,67 @@ - bugfix: Restores Crew Health Monitor to to the Kilostation medbay - bugfix: 'Additional scrubbers/vents to some areas on Kilo that had inadequate coverage qol: Declutter pass of Kilo medbay, holodeck area' +======= + EOBGames: + - rscadd: Metastation's medbay has received another revision. Stop by the next time + you get hurt, and marvel at the new design! + Maurukas: + - bugfix: Metastation has received the correct health HUDs for its new medbay + - bugfix: Camera coverage has been improved in Metastation's medbay + RandomGamer123: + - bugfix: Amanitin (destroying angel toxin) is now back to its original amount of + deadliness prior to human metabolisation changes. + Wayland-Smithy: + - bugfix: Fixed the tgui changelog dates sometimes being inaccurate to the source + files. + tralezab: + - expansion: dullahans are now considered undead +2021-06-18: + RandomGamer123: + - bugfix: Power fist no longer occasionally and randomly says it does not have enough + gas when it has enough + - bugfix: Connects Delta's cryopod room to the station's power grid +2021-06-19: + Maurukas: + - bugfix: Nitrile gloves have been restocked on Metastation. + - bugfix: Disconnected scrubber pipe on Metastation + - bugfix: Batteries are now included with defibrillators on Metastation + - bugfix: Broken power cable on metastation + - qol: KiloStation's fire safety budget has been reduced, resulting in the removal + of some redundant firelocks + - bugfix: Restores drug vendor to Kilostation Medbay + - bugfix: Restores Crew Health Monitor to to the Kilostation medbay + - bugfix: Additional scrubbers/vents to some areas on Kilo that had inadequate coverage + - qol: Declutter pass of Kilo medbay, holodeck area +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Some cameras in Kilostation now have better names - bugfix: Misc. piping and wiring issues on Kilostation have been repaired - bugfix: Missing air alarm added to Kilostation Botany - bugfix: The water tank stuck in a door in Kilostation engineering has been released back into its natural maintenance habitat +<<<<<<< HEAD - bugfix: Chat feedback is improved when setting down briefcase launchpads. - bugfix: Urinals no longer alert you about the letter "i" being stuck to your hand in certain edge cases. - rscadd: Added a new machine to the robotics lab; the ectoscopic sniffer. - bugfix: Fixed being unable to add extra circuit components when an integrated circuit was removed. +======= + Timberpoes: + - rscdel: Removed the fake error texture floor tiles. +2021-06-20: + Krysonism: + - rscadd: Added a new machine to the robotics lab; the ectoscopic sniffer. + OHJ4Y: + - qol: Surgical aprons can now hold more medical-related items in their storage + slot. + Ryll/Shaps: + - bugfix: OOC heart commendations should once again function and poll people as + it should during the shuttle's return trip. + SmArtKar: + - bugfix: Luminescents once again use slime extracts + SpaceDragon00: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Combat defibs no longer enable their safeties when being EMPed - bugfix: Visible message sends its message to mobs that are also its location - bugfix: shock_touching (Renamed to shock_pulling) now actually uses the damage @@ -484,6 +882,7 @@ - code_imp: Removed useless mob/user input for cooldowncheck - code_imp: Added recharge_time variable to paddles for variable charge times - code_imp: Added can_hurt, do_success, and do_cancel to reduce code duplication +<<<<<<< HEAD - bugfix: Luminescents once again use slime extracts ZephyrTFA: - balance: Medibots are no longer able to be upgraded @@ -515,16 +914,62 @@ - bugfix: Fixed signal ports receiving signals when a signal is not actually sent - bugfix: Some overlays missing from variant defibs are now properly applied. - spellcheck: multiple projectiles are now pluralized correctly +======= + Timberpoes: + - bugfix: Chat feedback is improved when setting down briefcase launchpads. + - bugfix: Urinals no longer alert you about the letter "i" being stuck to your hand + in certain edge cases. + Watermelon914: + - bugfix: Fixed being unable to add extra circuit components when an integrated + circuit was removed. +2021-06-21: + ArcaneMusic: + - qol: Suspenders now uses a GAGS setup, allowing for custom recolors. + Melbert: + - bugfix: Fixes contractor tablets breaking due to contract targets cryoing. + - bugfix: Fixed nuke ops lobby meta exploit + RandomGamer123: + - bugfix: Makes roleblocks in mafia actually end properly + - bugfix: Tachyon-doppler arrays now connect with servers on different z-levels. + SpaceDragon00: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: People with digitigrade legs are now properly paralyzed by the Paraplegic perk - bugfix: Usable_limbs can no longer be set below 0, which let people walk when they shouldn't be able to +<<<<<<< HEAD - bugfix: Tachyon-doppler arrays now connect with servers on different z-levels. - bugfix: Makes roleblocks in mafia actually end properly ZephyrTFA: - bugfix: Cryo Storage now silences PDAs that it hoovers. 2021-06-22: ATHATH: +======= + Timberpoes: + - bugfix: H.A.U.L. gauntlets no longer output a message about losing their grip + power when you drop them to the floor. + - bugfix: Removing the H.A.U.L. gauntlets while pulling something will now stop + the enhanced pulling effect. + - bugfix: Fix some runtimes with quirks and equipping silicons. + Watermelon914: + - bugfix: Fixed signal ports receiving signals when a signal is not actually sent + Y0SH1M4S73R: + - expansion: The DNA console can now edit the nonhuman features of its occupants, + as well as allowing injectors to apply those features. Look for the "Features" + tab in the DNA console. + dragomagol: + - spellcheck: multiple projectiles are now pluralized correctly + jupyterkat: + - qol: you can now press space or enter to select in tgui input lists + - bugfix: tgui input lists no longer break when duplicate keys are passed + ninjanomnom: + - bugfix: Some overlays missing from variant defibs are now properly applied. +2021-06-22: + ATHATH: + - qol: Contractor batons will now stun cyborgs on a left click and harmbaton them + on a right click, instead of stunning cyborgs if you're NOT in combat mode and + harmbatonning them if you are. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Stunning a cyborg with a contractor baton now puts your contractor baton on cooldown, just like knocking a human down does. Don't worry, you can still easily chainstun/baton 'n' bash borgs with contractor batons. @@ -537,13 +982,18 @@ wield a classic baton have been accounted for. This shouldn't affect normal gameplay unless an admin tries some REALLY weird stuff. Like, clumsy contractor cyborg level weird. +<<<<<<< HEAD SkyratBot: - bugfix: Fix some runtimes with quirks and equipping silicons. - bugfix: Eggs now give 5u yolk no matter what it is cracked in +======= + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The traitor's Agent ID card has a new option available during forging called Wallet ID Spoofing. Selecting this option will automatically snap the Agent ID card to the front of any wallet, allowing the traitor to hide more valuable ID cards behind it. This is disabled when the card is unforged. +<<<<<<< HEAD - refactor: Refactors dbcore.dm to possibly resolve the crashes that happen on Terry. coiax: - tweak: You can now open your own mail, even after being mindswapped into a different @@ -553,10 +1003,24 @@ - bugfix: Anthromorphs can now wear chaplain stuff. Gandalf2k15: - rscadd: Synthetics can now suffer moderate to severe wounds, watch out! +======= + Watermelon914: + - refactor: Refactors dbcore.dm to possibly resolve the crashes that happen on Terry. + carshalash: + - bugfix: Eggs now give 5u yolk no matter what it is cracked in +2021-06-23: + Fikou: + - expansion: new mech action figures and job action figures + - bugfix: Intento leaderboard works good + - imageadd: new sprites for mech action figures + Greniza: + - imageadd: New turf decals for alternative tiletypes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's Tram is now more capable of making things regret being in the way of it - bugfix: Tramstation's Tram is now less likely to unintentionally explode +<<<<<<< HEAD Semoro and azizonkg: - bugfix: Ported fixes of SStimer subsystem from RU SS220 Paradise - config: 'Added a new config var: flag/log_timers_on_bucket_reset' @@ -629,6 +1093,95 @@ - bugfix: Delta/Meta's windows overlooking the ERT hangar no longer have grilles covering all the furniture. Whoops. SkyratBot: +======= + RandomGamer123: + - bugfix: Cigarettes with the smoke_all property actually let you smoke in everything + the cigarette contains now. + - qol: Adds more intercoms and a new fire extinguisher to Metastation's new medbay. + - bugfix: Replaces broken valueless space cash item in old AI sat ruin with a 200 + credit one + Semoro and azizonkg: + - bugfix: Ported fixes of SStimer subsystem from RU SS220 Paradise + - config: 'Added a new config var: flag/log_timers_on_bucket_reset' + TemporalOroboros: + - bugfix: Specific chem dispenser recipes no longer create fonts of infinite power. + Watermelon914: + - bugfix: Fixed explosions delimbing you if they're weaker +2021-06-24: + Ed640: + - bugfix: Paper bins after being stacked too high to fall over or getting burnt + will no longer void your "important" paper forms when trying to add more paper + afterwards. + Melbert: + - refactor: Cow tipping and medibot tipping is now a component. + Ryll/Shaps: + - qol: Admin ghosts can now use the :j speech prefix to relay messages from deadchat + to their current linked body, if one exists. Perfect for keeping in touch with + your deployed ERT via headset without needing to stay in your body back at Centcom! + Watermelon914: + - expansion: Adds the multiplexer circuit component. + - expansion: Changed the drone circuit to have a lower movement delay. + - qol: Circuit components can now be directly inserted into shells. + - qol: Added the description and special details to each circuit component that + can be accessed when it is inside an integrated circuit. These will have specific + details, such as power usage, distance effectiveness and more. + YakumoChen: + - bugfix: Dynamic will no longer create malf humans for players for never play silicon + in the first place. +2021-06-25: + Cheshify: + - balance: The Forcefield Projector takes a second to put a forcefield down. + RandomGamer123: + - bugfix: QMs can now use the Nanotrasen Internal Requisition Network program on + modular computers to order things remotely. + - qol: All people may now download the Nanotrasen Internal Requisition Network program + on modular computers to request to order things remotely. + SpaceVampire: + - bugfix: The spare Codex Cicatrix created by the ritual, no longer comes with free + charges. + Timberpoes: + - qol: Right clicking containers such as backpacks with certain items may now perform + that item's action instead of opening the backpack. The behaviour has been implemented + with the forensic scanner, which can now scan objects it was previously unable + to in melee range, such as backpacks, by right clicking. Any items you'd want + to use againt backpacks without inserting the item or opening the backpack should + be reported as issues so they can be implemented. + Watermelon914: + - expansion: Adds the MMI circuit component. + - qol: Allows inputting signals into signal ports. + - expansion: Adds the airlock shell. The circuit has full control over the airlock. + - expansion: Implements USB cables for the binary valve to be able to open/close + the valve. + - expansion: Adds a private channel for radios that only lets circuits with the + same owner's ID to interact with it. + - refactor: Refactors USB code to be easier to use for less experienced coders. + eeSPee: + - bugfix: Fixed heretic ghouls having reduced max health after being revived after + deghouled + - qol: heretic ghouls now have a little moodlet tooltip +2021-06-26: + Arkatos: + - qol: Improved radial info messages for some spider variants to better reflect + their strengths and weaknesses. + - bugfix: Spider egg clusters now stop processing when they mature to improve performance. + - refactor: Spider egg clusters were integrated into the mob spawner system. This + means you will now see grown spider eggs in the ghost spawners interface. + - admin: Alien-banned players are no longer allowed to spawn from the spider egg + clusters. + Sheits: + - bugfix: Made android and skeleton wings work instead of telling the user "you + feel nothing but a terrible aftertaste" when they drink strange elixir + - bugfix: Made android and skeleton wings not use a mutant colour overlay like lizard + wings + - imageadd: Fly wings :) + - code_imp: Added android species check + TemporalOroboros: + - rscadd: Cigarettes heat their contents while they are lit. + - balance: Candy cigarettes now caramelize their own sugar. Their temperature has + been reduced to ensure they don't charcoalize it too. + - code_imp: Cleaned up cigarette code a bit. + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Agent ID cards can now steal accesses wirelessly from other players by right click slapping them with the agent ID card. This operation is completely covert, minus the fact you have to hold your ID card in your hand to initiate @@ -637,6 +1190,7 @@ including bags, wallets, tablets and PDAs without having to open them or remove ID cards first by right clicking. You can still open containers to steal accesses from exact cards as before. +<<<<<<< HEAD - rscadd: 'Added new mechanics or gameplay changes expansion: Expands content of an existing thing qol: made something easier to use' - spellcheck: Fixes bug in Ripley mech construction where it would say "securing @@ -706,6 +1260,17 @@ - rscadd: Added funtionality so free golems get an alert from policy.json. - rscdel: Deleted a line of text for Free golem's flavor text. Since in my opinion the spawn-in text, with the addition of the policy.json text was a bit too much. +======= + carshalash: + - bugfix: fixed inaccurate foodtypes/taste tags +2021-06-27: + Fikou: + - bugfix: fixes not being able to upload mutations from disk to dna console + LemonInTheDark: + - bugfix: Fixes passive vents on space tiles flooding space with whatever was being + vented + SpaceDragon00: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Reverted the normal blob''s max HP and initial HP values, which were accidentally modified (Old: 30 and 30, New: 25 and 21)' - bugfix: Fixed an issue where certain strains with bonus core regeneration were @@ -714,12 +1279,37 @@ Resource blobs - code_imp: Added an initial HP define that is set as a normal blob's integrity upon Initialize +<<<<<<< HEAD - refactor: 'hunger mechanics are now inherent to stomaches expansion: ethereal charge mechanic is now unique to their stomache and can be transferred freely' +======= + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Baseball bats can now be used to break kneecaps with their right click attack. This requires the target to be one of either prone, immobilised or buckled to something. If you aim for the legs and right click, you'll wind up a swing for the kneecaps. Research indicates that this isn't good for the target's legs. +<<<<<<< HEAD +======= + - bugfix: Fixes an issue where right clicking on an ID-secured locker would unintentionally + trigger twice, locking then unlocking the locker. Right clicking now correctly + attempts to lock and unlock a locker only once. +2021-06-28: + Coconutwarrior97: + - rscadd: Added funtionality so free golems get an alert from policy.json. + - rscdel: Deleted a line of text for Free golem's flavor text. Since in my opinion + the spawn-in text, with the addition of the policy.json text was a bit too much. + MrStonedOne: + - server: Added configs to disable laggy hard deletes once they lag the server too + much. + - admin: laggy hard deletes only output once per type path. + Time-Green: + - refactor: hunger mechanics are now inherent to stomaches + - expansion: ethereal charge mechanic is now unique to their stomache and can be + transferred freely + dragomagol: + - imagedel: removes the yellow siding tiles at Centcom +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ninjanomnom & Trina (Sprites): - rscadd: Stationary tanks can now be constructed using most materials. Start the frame with a stack of plasteel. @@ -729,6 +1319,7 @@ - balance: Stationary tanks share behavior with canisters and can over-pressurize and explode in the same fashion. 2021-06-29: +<<<<<<< HEAD Cheshify: - rscadd: A new Station Announcer can sometimes show up! - bugfix: Astrum's returning gateway is fixed. @@ -769,12 +1360,23 @@ Chamber to the showroom. - rscadd: Warning strips in Ghost Cafe botany are no longer annoying, and pool updated to the new liquids system. +======= + Arokha: + - bugfix: async modal message/title swapped + - bugfix: async modal not firing callbacks + RandomGamer123 and IndieanaJones: + - qol: Offering a cyborg on a cult rune now allows the cultist to transform the + cyborg into a construct of their choosing. + - bugfix: Offering a cyborg on a cult offer rune no longer creates an empty soulstone + and round removes the cyborg. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - balance: Knives (such as the kitchen knife, hunting knife, combat knife, etc...) are generally more effective at causing slashing wounds now. The butcher's cleaver in particular is now equal to a circular saw in terms of wounding. - balance: Scalpels are an eensy bit less effective at wounding enemies wearing armor, though they are still very effective at causing bleeding. +<<<<<<< HEAD SkyratBot: - imagedel: removes the yellow siding tiles at Centcom - bugfix: Fixed issue which made cooked steaks inedible. You should now be able @@ -799,3 +1401,29 @@ unit0016: - rscadd: DS-2. - rscdel: DS-1. +======= + Sheits: + - balance: Reduces the maximum weight paradox bags can hold + - imageadd: Adds paradox bag icon and belt sprites + Timberpoes: + - bugfix: Fixed issue which made cooked steaks inedible. You should now be able + to eat griddled steaks again. + - bugfix: Obsessed antags will now recieve a chat message stating the antag's policy + flavour text, if any such policy exists in config. + cacogen: + - balance: Cannabis has more believable effects + zxaber: + - bugfix: RD consoles now have hardware supporting ID changes by default. + - balance: Jaunting spells of all types (except for Nightmare) no longer allow for + the user to end up inside a wall or most other dense objects. Instead, you will + be moved to a valid spot on the path you took, or returned to your start location. +2021-06-30: + Fikou: + - bugfix: fixes singularity beacons + Watermelon914: + - expansion: Adds several list circuit components to manipulate lists. + - expansion: Adds the table datatype that can have queries performed on it with + components. + - expansion: Adds USB connections for the arrest console. + - bugfix: Fixed race conditions happening with circuits. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-07.yml b/html/changelogs/archive/2021-07.yml index a6507e9b2e8..6484fc45242 100644 --- a/html/changelogs/archive/2021-07.yml +++ b/html/changelogs/archive/2021-07.yml @@ -3,6 +3,7 @@ - bugfix: Fixed a case where a relic war hammer was not able to do kneejerk action. - bugfix: Fixed a case where a radial menu for the null rod reskin variant selection was showing one duplicate option. +<<<<<<< HEAD SkyratBot: - imageadd: new riot armor sprites - admin: Adds logging for impacted cyborgs during law changes @@ -25,10 +26,45 @@ ZephyrTFA: - bugfix: Use the correct timer flags for it to actually hash correctly - bugfix: Actually call submit when it auto approves so they get their gear. +======= + - qol: Updated radial menu for a null rod reskin variant selection. It will now + include a small button for showing additional information about each given null + rod variant. + KubeRoot: + - rscadd: Transit tube dispenser stations are now buildable via RPD + - bugfix: Transit tube dispenser station sprite errors have been fixed. The sprites + themselves have not been changed, but the names and orientation has been corrected. + LemonInTheDark: + - server: Hello people who parse performance log files (yes all two of you). Empty + entries will no longer cause errors, they will instead be properly represented + by a 0 + Malgover: + - imageadd: new riot armor sprites + Time-Green: + - balance: Debriding surgery efficiency has been multiplied by 8 + Watermelon914: + - expansion: Adds the sound emitter circuit component. + Wayland-Smithy: + - bugfix: Fixed cyborg locker right click to lock + - bugfix: Fixed an infinite loop bug with portal teleports. The cake is a stack + overflow. + - bugfix: Fixed portals layer so they appear over most other objects. + - bugfix: Fixed hand teleporter portals moving in zero gravity. + - qol: Portals on dense objects no longer require clicking to enter and can be walked + into. + - qol: Portals you are standing on may be entered by clicking even with a tool in + hand. + - code_imp: Removed an unused teleport arg that may cause issues with new portal + code. + bloons3: + - admin: Adds logging for impacted cyborgs during law changes + - admin: Adds additional cyborg logging +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bobbahbrown: - admin: Added other tickets opened by a user to the adminhelp dialogue - server: Added the $reset directive to reset a configuration entry's values to its default +<<<<<<< HEAD cacogen: - balance: Cannabis has more believable effects jjpark-kb: @@ -44,6 +80,14 @@ 2021-07-02: Gandalf2k15: - rscadd: Sentient firelocks. +======= + tralezab: + - bugfix: fixes buying shuttle insurance while the shuttle is docked + - expansion: added barticles to bonfires +2021-07-02: + Cheshify: + - bugfix: The flashlight pens are now actually pen-sized +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Glowshrooms created from spread now should behave like things that actually exist again. @@ -56,6 +100,7 @@ breaking the windows into sci halls - bugfix: Tramstation Kitchen Freezer now uses the proper area so the kitchen and freezer air alarms dont control the same vents +<<<<<<< HEAD Ryll/Shaps: - bugfix: You can no longer sacrifice pAI shells as a cultist - bugfix: OOC heart commendations once again properly save and persist between rounds! @@ -105,11 +150,75 @@ any explosion will do! - bugfix: Fixed Cross Server messages containing HTML garbage. - bugfix: Analyzing stationary tanks no longer gives you the same thing four times. +======= + RandomGamer123: + - bugfix: Nuclear operatives' uplink implants now properly only show items they + are allowed to buy, preventing them bypassing uplink restrictions. + Ryll/Shaps: + - bugfix: OOC heart commendations once again properly save and persist between rounds! + - bugfix: You can no longer sacrifice pAI shells as a cultist + Seris02: + - bugfix: changeling legs now copy digitigrade/normal legs + Sparkezel: + - balance: Bats no longer stunlock people. Increased bat damage by 2. + Timberpoes: + - bugfix: The detective's scanner should now always properly output the correct + data for scans and should no longer print out blank entries erroneously. + Wayland-Smithy: + - bugfix: Fixed rogue vending machines targeting incorporeal. + bobbahbrown: + - bugfix: You may no longer circumvent config VAS protections by proxying proc calls. + ninjanomnom: + - bugfix: Some greyscale icons like the sombrero have had their errors fixed. +2021-07-03: + Watermelon914: + - rscadd: Adds a midround ruleset that allows living players to become the blob + if they are randomly selected. + aaaa1023: + - bugfix: Sink frames are now deconstructable with a wrench. + dragomagol: + - spellcheck: updated outdated references to intents in martial arts instructions + interestingusernam3: + - bugfix: Killing and reviving polar bears no longer makes them easier to move. + tralezab: + - rscadd: catwalk flooring! +2021-07-04: + Arkatos: + - bugfix: Large cardboard boxes will now show a proper icon when they are open. + Ghommie: + - bugfix: The "Is This Thing On?" explosion calibration experiment will now accept + explosions with negative devastation or heavy strength because, once again, + any explosion will do! + MMMiracles: + - bugfix: Fixed a few errant pipe issues in Tramstation Atmospherics + RandomGamer123: + - spellcheck: Ion carbine gun parts kits are no longer called "generic gun parts + kit". + - spellcheck: The "advanced" in advanced energy gun parts kit is no longer misspelled. + - qol: Examining stationary tanks now tells you their pressure limits. + - bugfix: Analyzing stationary tanks no longer gives you the same thing four times. + Sheits: + - bugfix: Inhand sprites for hydrogen fire axes now face the right way + Urumasi: + - bugfix: The turbine now behaves correctly if the intake is blocked. + Watermelon914: + - bugfix: Fixed carps not properly being tameable. + - bugfix: Fixed the tameable component not properly being removed from a mob. + - qol: The RAM circuit component now allows you to select the type instead of trying + to interpret it, allowing it to be used as a constant value component. + - code_imp: Made the any datatype for circuit components much easier to read in + code. + - expansion: Adds crew monitor usb connections + - bugfix: Fixed the sound emitter's frequency port + - bugfix: Fixed cooldowns for speech and soundemitter circuit components. + - code_imp: Brought the speech component more in line with other components. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Limited the maximum string length of a circuit component port to 5K characters to fix exploits that can create strings that duplicate in size each iteration. - bugfix: Fixed being able to insert an infinite amount of components into a shell because of an oversight. - bugfix: Fixed being able to interact the circuit of a locked shell. +<<<<<<< HEAD - rscadd: Adds a midround ruleset that allows living players to become the blob if they are randomly selected. - rscadd: catwalk flooring! @@ -117,6 +226,15 @@ Superlagg: - rscadd: PDA customization is now set and saved per character. - rscadd: PDA ring messages can now be set in character preferences. +======= + Wayland-Smithy: + - bugfix: Fixed incorporeal movers procing containment field effects. + - bugfix: Fixed fully_heal proc curing blindness from quirks and blindfolds. + - bugfix: Fixed Create Command Report UI lacking an option derived from command_name(). + - bugfix: Fixed Cross Server messages containing HTML garbage. + YakumoChen: + - expansion: Adds a contraband flavor of Gallery's Peanuts to Getmore vendor +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bobbahbrown: - rscadd: Added a brand new upgrade to janicarts, the vacuum upgrade, which you can procure from RnD. This upgrade vacuums items from under the janicart directly @@ -126,6 +244,7 @@ to insert a key with a trashbag attached. - rscadd: You can now right-click while riding a janicart to remove the bag without unbuckling yourself, neato! +<<<<<<< HEAD jjpark-kb: - bugfix: fix light replacers breaking lights after replacing tf-4, theOOZ: @@ -143,6 +262,19 @@ - bugfix: Borgs can now click on adjacent portals (with no module slot active) to use them like humans. - balance: nuke op and detective holsters can now be placed in armor best suit storage +======= + thestubborn: + - expansion: Bananas can be holstered + tralezab: + - expansion: PDAs now include round time. +2021-07-05: + Fikou: + - qol: The Nightmare's light eater can now break rocks. + - imagedel: removes the weird light from the upgraded mining hardsuit helmet sprite + - qol: commission plaques will no longer hide items you dropped below them + - balance: hierophant club dash now doesnt work on blocked turfs + Greniza: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Environment protection bags, which protect their occupants from weather, and give protection from temperature and pressure. The rare variants even have the same protection effects as a space suit. @@ -157,6 +289,7 @@ - bugfix: Using wirecutters on an unlabeled bodybag no longer sends the "You cut the tag off of the bodybag" message. - bugfix: Allows bodybags to be picked up again. +<<<<<<< HEAD - balance: mmis can no longer possess savannah ivanovs - bugfix: the single missing pipe in library maintenance isn't missing anymore theOOZ: @@ -169,6 +302,43 @@ GoldenAlpharex: - imageadd: A fresh coat of paint was applied to the Nanotrasen Representative's closet on behalf of the Nanotrasen Branding Committee. Rejoice! +======= + KIBORG04: + - bugfix: Mafia psychologist couldn't reveal role + Nari Harimoto: + - bugfix: the autolathe shockwire is properly defined again, autolathes may now + potentially shock you when hacking + Paxilmaniac: + - balance: nuke op and detective holsters can now be placed in armor best suit storage + - bugfix: the single missing pipe in library maintenance isn't missing anymore + RandomGamer123: + - bugfix: Stationary pressure tanks now properly have their base pressure at 20000kPa. + - bugfix: Stationary pressure tanks now do not name themselves as "plasteel plasteel + pressure tank". + TheSmallBlue: + - expansion: Added the "Split" circuitry component. + Wayland-Smithy: + - bugfix: Borgs can now click on adjacent portals (with no module slot active) to + use them like humans. + coiax, Timberpoes: + - expansion: Adds the new Wallets! station trait. Makes everyone start with wallets + with their ID card inside, along with their starting budget. Might also include + a little surprise. + - expansion: Wallets that spawn inside dorm wardrobes also have little surprises + in them. + - expansion: Wallets can now hold pills. + read-0nly: + - rscadd: Added temperature and pressure sensors to circuits + spessbro: + - bugfix: carnivory trait shows up on the plant analyzer + tralezab: + - balance: mmis can no longer possess savannah ivanovs +2021-07-06: + Fikou: + - bugfix: switchblade can now be used to butcher and slice necks + - bugfix: fixes voice of god not giving you large text + - bugfix: wisps no longer fall in chasms +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Changelings birthed from headslugs that weren't already changelings (for example, from the icebox mutation pool) are no longer full changeling antagonists, @@ -176,6 +346,7 @@ the past). MeyHaZah: - imageadd: Concussive Gauntlets Resprite +<<<<<<< HEAD SkyratBot: - balance: hierophant club dash now doesnt work on blocked turfs - rscadd: Added temperature and pressure sensors to circuits @@ -186,10 +357,15 @@ - bugfix: Stationary pressure tanks now properly have their base pressure at 20000kPa. - bugfix: Stationary pressure tanks now do not name themselves as "plasteel plasteel pressure tank". +======= + Wayland-Smithy: + - bugfix: Fixed the cursed spring water double teleport polymorph machine. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bobbahbrown: - bugfix: Buckling to a vehicle will no longer wait until you move to set your position on the vehicle properly. 2021-07-07: +<<<<<<< HEAD Gandalf2k15: - rscadd: Closets are now animated. - rscadd: You can now be banned from EORG, do not EORG prep. @@ -297,11 +473,66 @@ - bugfix: runtime errors from weather - bugfix: Environmental Protection Bags protect from ash storms - bugfix: properly updates the light color of the mining hardsuit helmet +======= + ArcaneMusic: + - expansion: A new ruin has surfaced on icebox. Signal pings indicated that may + have been a post office, once. + - bugfix: Hologrids once again cannot be picked up, as is intended. + EuSouAFazer: + - bugfix: Inaccessible medkit in Kilostation dorms is now reachable + InsaneRed: + - qol: Cleaned up waste and distro pipes near sms on most maps so they dont automatically + link up to sm cooling pipeline + Nari Harimoto: + - bugfix: meta medbay sec posts air vents are now actually connected, trimmed a + line of cable that led nowhere from pharmacy + - bugfix: meta pharmacy now has medic access again, but no access anywhere for chem + factory except for chemist + - bugfix: an intercom in meta-med delivery shared the same wall as an APC, moved + the intercom to the top left of the room + - qol: Meta-station Xenobio slime computer camera can now move up and down between + the left most cells, as well as drop slimes in the work area between the consoles + - bugfix: Deltastation bar's atmos alarm now correctly placed, and nudged a pipe + nearby to no longer have a redundant loop + - bugfix: tram pharmacy now has medic access for when skeleton access is lifted + Paxilmaniac: + - rscadd: New ERT type, marines, for whatever you might want them for. + - rscadd: Tacticool armor from tgmc to compliment. + Wayland-Smithy: + - bugfix: Fixed unplaced blob overmind spawning in places it can not move. + spessbro: + - qol: made portaseeder use ctrl-click instead of a verb + unit0016 / Melbert: + - expansion: Many more antagonists now shout special phrases when suiciding with + C4/X4, including Heretics, Centcom Interns, Obsessed, Clown Ops, and Santa Clause. +2021-07-08: + AnCopper: + - rscadd: Added a name to clown.txt + Fikou: + - bugfix: properly updates the light color of the mining hardsuit helmet + Greniza: + - bugfix: runtime errors from weather + - bugfix: Environmental Protection Bags protect from ash storms + Iamgoofball: + - balance: Removes stuns from Voice of God. + InsaneRed: + - rscadd: Chaplains who worship the machine gods can now trade in 2000 favor to + receive a random cybernetic implant + Nari Harimoto: + - bugfix: the examine text on the Seed Extractor now accurately displays the amount + of seeds you may potentially get + Spookuni: + - balance: Nanotrasen has released experimental new laser lenses for laser rifles, + energy guns, and illegal hellfire modkits, increasing the number of shots they + can fire from full charge by roughly 20%. + Wayland-Smithy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Introduces the Lag Switch subsystem for when a smoother experience is worth trading a few bells and whistles for. Performance enhancement measures can be togged by admins with the Show Lag Switches admin verb or enabled automatically at a pop amount set via config. - config: 'Added a new config var: number/auto_lag_switch_pop' +<<<<<<< HEAD - balance: Bats no longer stunlock people. Increased bat damage by 2. YakumoChen: - imageadd: Human skin hats, touched up by Krysonism @@ -317,11 +548,26 @@ Arkatos: - bugfix: Fixed a case where you could make more engraved messages than your soapstone had uses by queing them fast enough. +======= + ZephyrTFA: + - code_imp: Rust is now a component + - refactor: refactor almost all of the rust heretic atom procs + - rscadd: Wirebrush for advanced rust removal +2021-07-09: + Arkatos: + - qol: Observers can now interact with the engraved messages from any distance. + Rate them! + - bugfix: Fixed a case where you could make more engraved messages than your soapstone + had uses by queing them fast enough. + Ghilker: + - bugfix: fix issue with the thermomachine rotation when pulled/pushed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Removing the Thermal Vision mutation will now remove the active vision as well PositiveEntropy, Kryson, maxymax13: - imageadd: The Security TV, Smartfridge, and Booze-o-Mat now have new updated sprites! +<<<<<<< HEAD SkyratBot: - bugfix: Fixed the component printer's layout being broken. unit0016: @@ -379,6 +625,97 @@ SkyratBot: - bugfix: restraints now use equip_to_slot() instead of snowflake code when applied, thus fixing issues such as cuffs not falling off when hit by a shrink ray. +======= + Time-Green: + - refactor: "A majority of species features have been turned into organs. Soon you\ + \ will be able to combine a moth and a lizard into one \xFCber being" + - bugfix: Dropped limbs will now display horns, frills etc instead of just naked + and ugly + - bugfix: Swapping limbs will now transfer those limbs features, so putting a lizard + head onto a human will actually mean they get a snout and horns and everything + instead of just being an awkward colored human head + Watermelon914: + - bugfix: Fixed the component printer's layout being broken. + Wayland-Smithy: + - qol: Orbiters now transfer to changeling headslugs at birth. + YakumoChen: + - expansion: You can now wear the suffering of others on your head with just a sheet + of human skin! + - imageadd: Human skin hats, touched up by Krysonism +2021-07-10: + Nari Harimoto: + - bugfix: AI intellicards can no longer be teleported out of intellicard slots on + consoles using telekinesis or silicon access range + Paxilmaniac: + - bugfix: two floor decals that were on a wall in delta xenobio are no longer + ProtivogaSpriter: + - imageadd: Replaced old Mjolnir sprites with new Mjolnir sprites. + Time-Green: + - bugfix: fixes a plumbing harddel + Watermelon914: + - bugfix: Fixed CQC sometimes not registering attacks and grabs properly. + Wayland-Smithy: + - bugfix: Fixed and improved wabbajack polymorph logging. + - bugfix: Silicons can now toggle emitter locks with secondary attack. + - bugfix: Fixed Tram ghost magnet and other cases of observer forceMove. + - code_imp: Renamed some observer code vars for better readability. Portals check + types less. + - bugfix: Fixed all clients being forced to Fit Viewport regardless of their Auto + Fit Viewport preference being set to manual. + Zytolg: + - qol: There's some eye candy in the Abandoned Medbay that now suggests that it + was at some point a medbay. + - balance: Downgrades the Chem Dispenser and Heater to their Ghetto Counterparts + read-0nly: + - qol: adds random number to carp spawned from space dragon rifts +2021-07-11: + '@Azarak': + - bugfix: pipes sprite fix + - refactor: pipe sprites now uses bitmasks + KubeRoot: + - bugfix: Flash implant now displays its message instead of runtiming when used + on cooldown + Mothblocks: + - bugfix: Fixed moth wings not showing up when you have a suit on. + Nari Harimoto: + - qol: Stunbatons will now harm-baton on left-click if you are in combat mode and + the baton is off + Paxilmaniac: + - bugfix: energy guns now have the correct icon, and no longer look like nanotrasen + brand super soakers + - bugfix: the set of duplicate icons for energy guns that caused the guns to look + different in map editors is no longer + Timberpoes: + - balance: The Bluespace RPED can no longer teleport chems in reagent containers, + instead emptying any reagents from containers inserted into it. + Wayland-Smithy: + - bugfix: 'Fixed some station name html encoding for plaintext handlers like: Station + Charter announcements, the World Name (SS13 window title), and in Cross Server + Messages both custom and news about the crews ultimate fate.' + carshalash: + - expansion: Splits eggs into two reagents. Introduces Pavlova, THE great Oceanic + dessert. Whipped cream is also added. +2021-07-12: + Ghommie: + - balance: Railings integrity has been lowered from 300 (default for structures) + to 75 (grilles integrity times 1.5) and their armor changed to match that of + grilles. + - bugfix: Hostile critters such as lobstrosities and giant tarantulas won't throw + themselves at you after dying while charging their attack. + - bugfix: Fixes the mech mounted teleporter. + - bugfix: Fixes intrinsically paralytic mobs being cured from their paralysis just + because they got a brand new (prosthetic) limb. + Kylerace: + - bugfix: you can no longer get infinite chems from holodeck bees + Mokiros: + - spellcheck: Circuit board for All-In-One Grinder is now named appropriately + Paxilmaniac: + - bugfix: marine ert engineers spawn with welding goggles instead of nvgs so they + can actually weld + - bugfix: the metastation genetics monkey pen no longer has a ' in front of its + name + SpaceDragon00: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Secure safes no longer show up as weapons (I'm labelling this as a fix because I don't know any scenarios where you'd even be able to use a secure safe as an item, so its force value seemed unnecessary) @@ -391,6 +728,7 @@ - code_imp: Added a proc to initialize a list of object subtypes keyed to their object paths - code_imp: Turned Hits_To_Crit into a define +<<<<<<< HEAD - code_imp: 'Improved the clarity of some comments, along with adding some where they were previously missing qol: A gun''s weapon notes now gives you the notes of its magazine, which gives you the notes of its ammo, making it so you don''t @@ -444,10 +782,22 @@ - spellcheck: Circuit board for All-In-One Grinder is now named appropriately - bugfix: The Tram whiteship now has a chance to spawn! - bugfix: latejoin arrivals are less likely to spawn on top of each other now. +======= + - code_imp: Improved the clarity of some comments, along with adding some where + they were previously missing + - qol: A gun's weapon notes now gives you the notes of its magazine, which gives + you the notes of its ammo, making it so you don't need to take out ammo to see + its damage. + Time-Green: + - bugfix: glasses arent horribly embedded in lizard snouts anymore + Watermelon914: + - bugfix: Fixed admins getting spammy logs from arrest console circuits. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - balance: Ashwalkers now have lungs adapted for the atmosphere of Indecipheres, and now breathe. However, if the Indecipheres atmosphere has miasma, they are immune to it. +<<<<<<< HEAD itseasytosee: - bugfix: Syndicate hardsuit helmet sprites will now properly update when combat mode is activated. @@ -466,10 +816,85 @@ - bugfix: Packages sent through disposals to Virology on Icebox won't end up at Xenobio anymore. - admin: Adds a safety check to the "Release Obj" admin proc +======= + dragomagol: + - bugfix: The Tram whiteship now has a chance to spawn! + itseasytosee: + - bugfix: Syndicate hardsuit helmet sprites will now properly update when combat + mode is activated. + tf-4: + - bugfix: When someone ties a neckerchief near you, it no longer tells you you did + it. +2021-07-13: + Ghommie: + - bugfix: latejoin arrivals are less likely to spawn on top of each other now. + - bugfix: Cannon balls should no longer destroy "indestructible" walls. + - bugfix: Fixes being able to simultaneously perform an attack and a tackle as a + xeno or monkey with right click and combat mode on. + - bugfix: Venus human traps and swarmers' names are now numbered. + - bugfix: Deletes a duplicate chat feedback on [mob/carbon/proc/swap_hand()] + - bugfix: Fixed ai monkeys appearing as catatonic on examine() + - bugfix: Monkeys and dogs no longer yoink items they can't reach. + - bugfix: Fixed morph speed being slower while undisguised and some old code related + to it. + - bugfix: fixed the blackout station trait affecting unrelated areas like CentCom + quarters. + - qol: Stops (blob and otherwise) mobs from falling through blob tiles on open space. + - bugfix: fixes the equipment menu lacking from the honker mech html UI because + of bad copypasta. + - bugfix: restraints now use equip_to_slot() instead of snowflake code when applied, + thus fixing issues such as cuffs not falling off when hit by a shrink ray. + - bugfix: Fixes inhand holder jank separating pAIs holoforms from their shells in + some occasions. + InsaneRed: + - bugfix: fixed metastation's xenobiology's disposal piping and adds it its own + cooling loop for freezers + Krysonism: + - expansion: You can now carve blumpkins. + - imageadd: The pumpkin, blumpkin and their carved varieties have new sprites. + Nari Harimoto: + - bugfix: anti-magic now prevents you slipping from the magic flying incorporeal + bananas fired by the honks staff + Putnam3145: + - bugfix: Watchers no longer search 9 tiles away for stuff then throw the result + away if it's more than 1 tile away + RandomGamer123: + - bugfix: Fixes lone stationary tanks having 5000L instead of 2500L volume. + - bugfix: Roundstart stationary air tanks now have the proper 21:79 oxygen:nitrogen + gas mix that is used throughout the station. + Time-Green: + - bugfix: fix some moth and lizard preferences missing + - bugfix: apparently mothwings were supposed to go above spacesuits, oops + Wayland-Smithy: + - qol: Chat Highlighting now works with more symbols and can be case sensitive and/or + match whole words only. + - bugfix: Fixed Chat Highlighting only working for the first comma separated entry. + - bugfix: Your own messages sent over a radio and dchat now properly avoid_highlighting. + - bugfix: Fixed admin observer special radio keys double sanitizing input. +2021-07-14: + Ghommie: + - bugfix: Fixed the rat king's abilities being usable while dead. + - bugfix: Fixed the rat king's Domain ability being usable on cooldown. + - admin: Adds a safety check to the "Release Obj" admin proc + - bugfix: fixed the charge moodlet lingering after a ethereal stomach removal. + Guestify: + - qol: replaced a couple of windows with walls in kilo and delta medbay, added a + couple of defib holders that can be easily accessed + RandomGamer123: + - qol: Icebox atmospherics now has a small project room with some resources. + - bugfix: Packages sent through disposals to Virology on Icebox won't end up at + Xenobio anymore. + Watermelon914: + - balance: Removes the refresher crystal from lavaland loot. + Wayland-Smithy: + - qol: Holopad incoming calls can now be rejected. + - qol: AI secondary attack now opens Holopad UIs. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed connected Holopad callers not seeing their own runechat text. - bugfix: Fixed AI hologram transmit runechat text. - bugfix: Fixed the AI radio help message giving false info about the generic department key. +<<<<<<< HEAD - bugfix: Fixed the rat king's abilities being usable while dead. - bugfix: Fixed the rat king's Domain ability being usable on cooldown. - balance: Removes the refresher crystal from lavaland loot. @@ -518,6 +943,23 @@ lyricalpaws: - bugfix: Brushing someone's hair no longer tells them they brushed their name's hair +======= +2021-07-15: + Wayland-Smithy: + - qol: Revenants can orbit adjacent people and things with Right Click, unless they + are stunned, revealed, blocked by salt etc.. + - code_imp: Improved Jaunt Move checks a little bit. + Y0SH1M4S73R: + - spellcheck: The notification that ghosts receive when someone raises a spectral + blade no longer contains an incorrect usage of the word "the" + ZephyrTFA: + - bugfix: Resolves my sanity as truncate now returns a valid value when it does + nothing + carshalash: + - bugfix: Eggs now work when cracked into glasses + tralezab: + - balance: space dragons are rarer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-07-16: ATHATH: - spellcheck: The grammar of the box and organ box suicides has been slightly improved. @@ -527,15 +969,22 @@ now causes you to die of burn damage, not brute damage. - rscadd: A special suicide has been added to space helmets. It has a special variant for if you attempt it in a cold environment (while not immune to cold). +<<<<<<< HEAD Cheshify: - bugfix: An unidentified object in black mesa has been resolved Mordent: - bugfix: Hover effect on tgui Tabs made less visually laggy. SkyratBot: +======= + Mordent: + - bugfix: Hover effect on tgui Tabs made less visually laggy. + Watermelon914: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added a more complex AI to carps that allow you to tell them to attack people or to follow you. These carps can be tamed with raw meat, which'll then give you control over them if you succeed in taming them. A carp will only be tamed to 1 person. +<<<<<<< HEAD capsaicinz: - rscadd: syndicate simplemobs to arborlink vault space ruin. makarov and magazines. - rscdel: arborlink vault space ruin turrets. @@ -572,6 +1021,28 @@ - rscadd: You can now empty showers using a plunger! - bugfix: Showers no longer defy the laws of physics and once again require plumbing. Nari Harimoto: +======= +2021-07-17: + Arkatos: + - bugfix: Fixed a case where a PDA's action button icon did not properly update + upon light toggle. + Fikou: + - bugfix: grav anomalies will no longer permanently make you unclickable + - rscdel: deletes a door from deltastation mining shuttle + JohnFulpWillard: + - bugfix: You can now put people in coffins again after fireman carrying them. + Kylerace: + - bugfix: slippery things, among others will no longer stop working forever after + throwing them into hyperspace + Maurukas: + - bugfix: A rogue decal has been purged from Deltastation + - bugfix: The toxins airlocks on Delta, Tram, Meta and Kilo can now be opened from + inside the airlock + Nari Harimoto: + - qol: AI now opens the holopad with left click, and projects a hologram with right + click. AI's right clicking the holopad will immediately project, no more double + clicking +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: AI's right clicking any holopad while projected via the "Project Hologram?" button when presence is requested, will cancel the projection and put their camera back to where they started (moving far away from the pad will not do @@ -580,6 +1051,7 @@ that has two options, jump to the location, works as it does currently, and "Project Hologram" which will immediately project a hologram there, right clicking the pad will move you back to where you were +<<<<<<< HEAD - rscadd: 'Ctrl+leftclicking on the holopad will end the holopad call directly without jumping you back to your last location (it does nothing if you are not already a hologram) qol: AI''s can now examine a holopad to see the AI specific controls @@ -642,6 +1114,105 @@ FlamingLily: - code_imp: All indicators are now within a single indicators module - rscadd: Surrender button when in CI +======= + - rscadd: Ctrl+leftclicking on the holopad will end the holopad call directly without + jumping you back to your last location (it does nothing if you are not already + a hologram) + - qol: AI's can now examine a holopad to see the AI specific controls for the pads + (need to shift+right click and examine from the menu, cant shift-click examine, + issue with how the AI itself functions.) + - qol: when you jump to someone from their name in chat, or a location from chat + such as when presence is requested, you can hit "~" or "0" to jump back + - qol: when you jump back to your previous location with the "Jump Back" key or + to a saved location with "1-9" it stops all following, so you can jump back + or jump to a location and you wont jump back to the person you tracked + Sheits: + - bugfix: Flight potions now work on fly people, androids and skeletons + Wallem, based off of work done by Keelin: + - bugfix: Lets people wash the ant debuff off of themselves, as intended. + - rscadd: Due to a leak in Nanotrasen Brand Ant Farms during shipping, a large influx + of space-ants have been inadvertently dumped onto every Nanotrasen station. + Don't go leaving food around too long, and please be sure to watch your step, + we're pretty sure they bite... + - imageadd: New giant ant sprite by Doshmobile + Wayland-Smithy: + - bugfix: Fixed HTML encoding of automatic evac news alerts emergency_reason. + - qol: Admin Supplypod Presets can now also be loaded by double clicking their label. + - qol: Holopad call Holograms now move in sync with their receiver pad. + - bugfix: Fixed a Holodisk replay Hologram bug, and Hologram Rays not updating when + the pad is moved. + aaaa1023: + - spellcheck: adds a missing space in the description of the ERT Medical Officer's + plushie box. + coiax: + - bugfix: Ethereal players cannot erroneously revive during mafia games. + interestingusernam3: + - bugfix: A Charlie station fluff paper about the Supermatter is no longer misnamed + "singularity generator". THERE WAS NEVER SUCH A THING AS A SINGULARITY GENERATOR. + OCEANIA HAD ALWAYS BEEN AT WAR WITH EASTASIA. +2021-07-18: + Helianthus00: + - qol: Far explosions now cause far less shake and near explosions have been reduced + slightly to scale with this change. + IndieanaJones: + - balance: Space Dragon has received some nerfs to make fighting it and its carps + fairer to the crew. + - bugfix: Fixed a bug where carp rifts without an owner could spawn infinite carp. + InsaneRed: + - bugfix: fixed up some issues with the ski shoes vehicle description + Kylerace: + - bugfix: NanoTrasen has pushed a fix for nonexistent ghost ears, allowing them + to theoretically hear nearby sounds again if they existed, which they don't. + Maurukas: + - bugfix: One standard moth plushie has been issued to the tramstation psychologist's + office. + PositiveEntropy, Meyhazah: + - imageadd: Adds new fire extinguisher sprites based on Tau Ceti's! + Sheits: + - imageadd: Replaces the old aquarium sprites + TiviPlus: + - refactor: Directional lights might seem more smooth now + Watermelon914: + - qol: Allows charging circuit shells by using inducers. + - qol: Allows setting the owner ID of a circuit through a shell. + - bugfix: Fixed carps losing track of who they're following if they take a path + that obstructs their vision + - expansion: Adds the module circuit component. + - bugfix: Fixed carrying being broken. + - bugfix: Fixed light explosions having 0 chance to delimb someone if they have + no bomb resist. + interestingusernam3: + - bugfix: The implant pad will no longer incorrectly describe TRAC implants as being + usable as teleporter beacons. +2021-07-19: + Arkatos: + - qol: You can now load equipment outright by double clicking the corresponding + equipment button in the Select Equipment UI. + Fikou: + - expansion: During moth week, teleporter accidents make you Moths + InsaneRed: + - balance: Elder Atmosian armor now takes less metallic hydrogen to craft and is + better armored. + - qol: Most advanced tools now use balloon alert + Kylerace: + - bugfix: NanoTrasen has realized that its previous theoretical fix for ghost ears + didn't work, not that that's a problem since ghosts don't exist but NanoTrasen + has fixed its mistake. + Melbert: + - qol: Energy Guns use balloon alerts when swapping mode + Mothblocks: + - expansion: Added a box of silver IDs to the HoP office on TramStation. + Seris02: + - bugfix: fixed sentient diseases reinfecting when dead + TheSmallBlue: + - expansion: Added USB cable support to bluespace launchpad consoles to use with + integrated circuits. +2021-07-20: + Ghilker: + - expansion: added downsides to shoving too much fuel/moderator inside the machine, + the cooling volume can be adjusted in the GUI to make it stronger/weaker based + on the user needs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Fixes a bug where emotes such as a carp gnash will mess up a name if the name contains a pronoun within it @@ -655,6 +1226,7 @@ Ryll/Shaps: - bugfix: You should no longer lose deathnettle durability when clicking on floors or walls +<<<<<<< HEAD SkyratBot: - bugfix: Deltastation's HoP line now has a flasher. - bugfix: Deltastation's Atmos waste now sends external connectors to waste, rather @@ -751,19 +1323,138 @@ - spellcheck: Made the Doppler Array explosive sale message less wordy. - code_imp: killed the grown misc file! - rscadd: Added brain-computer interface circuit shells. +======= + TheSmallBlue: + - expansion: Added the To Number circuit component. + Time-Green: + - bugfix: cutting open heads wont drop horns, frills etc on the ground (you could + literally stick it into a human to give them frills but nooooooo you wanted + to report the bug) + TiviPlus: + - bugfix: Fixed weather being opaque + Watermelon914: + - bugfix: Fixed the duffelbag curse and curse of hunger code in general. + - balance: Wizard gets bonus points for choosing the randomized options in their + spellbook. They will get 15 points worth of spells if they choose "Full random" + and they will get 12 points worth of spells if they choose "Semi random". +2021-07-21: + BurgerBB: + - bugfix: Fixes closets/lockers/crates/ect being subject to ant decompisition. + InsaneRed: + - qol: Adds electrolizers to atmos storage across maps for quality of life purposes + and removes the useless turbine to ai sat pipeline in icebox. + JohnFulpWillard: + - bugfix: Deltastation's HoP line now has a flasher. + - bugfix: Deltastation's Atmos waste now sends external connectors to waste, rather + than the other way around. + Kubisopplay: + - bugfix: A CABAL of syndicate hackers broke Nanotrasen protections, allowing malfunctions + in AI to finally happen again + Malgover: + - rscadd: Adds ANTI-TIDER-2500 to the SecTech vendor + Seris02: + - bugfix: classic baton can stamcrit again + TheSmallBlue: + - bugfix: Hulks and larvas can no longer just punch the SM with no consequences + Wallem: + - bugfix: ants have a higher tolerance to extreme ph levels when breeding. New ant + desc. + Watermelon914: + - expansion: Adds the scanner shell that lets you scan objects. + aaaa1023: + - bugfix: Icebox interrogation room is connected to the main power grid again. + - bugfix: Icebox security atmos goes through the atmos maintenance room again rather + than just bypassing it. + coiax: + - rscadd: Appendicitis is now no longer a disease. It has the same effects, although + shows up slightly differently on health scanners. It also is no longer caused + by the event system, and can happen to any appendix inside a person. + dragomagol: + - qol: changed the links for the bartender and cook guides to the appropriate new + wiki pages +2021-07-22: + Ghommie: + - bugfix: fixed some oddities with the wheelchair wheels overlay. + Guestify: + - qol: Added nanodrug vend to tramstation + Watermelon914: + - bugfix: Fixed Index Table outputting a table instead of a list. + timothymtorres: + - qol: Gas meters, freezers, and air alarms all now use GAGS coloring to display + colors based on temperature. (red is hot, green is room temp, and purple is + cold) + vincentiusvin: + - bugfix: fixed cryocells and hfr runtiming on quick consecutive wrench actions. +2021-07-23: + ATHATH: + - bugfix: Classic batons (and their subtypes) no longer spread their stamina damage + across multiple body parts. + Fikou: + - bugfix: You can no longer be the living dead by having adminordrazine when you + die + Ghilker: + - rscadd: Gas masks now properly filter gases when a filter is applied (can be made + roundstart from any lathe and every gas mask starts with one in them) + Ghommie: + - bugfix: toggling combat mode will now send a sound to the player even if the character + is deafened. + Krysonism: + - bugfix: Vatbeasts can use their powerful tentacle slap ability again. + Melbert: + - bugfix: Plant Analyzer's readout should look less weird and more consistent again. + Mothblocks: + - bugfix: Fixed item quirks like photographer putting their items in the wrong spot. + Thunder12345: + - bugfix: Orange shoes no longer turn into errors when detaching handcuffs + bobbahbrown: + - bugfix: Research consoles now correctly show GAGS-ified icons properly. No more + missing janicart upgrades! + tralezab: + - code_imp: killed the grown misc file! + - expansion: Roboticists can now construct critter-sized mechas, start with an EVA + helmet and a leg! + - code_imp: killed the aquarium misc file! + - rscadd: traitors now get some extra flavor. doesn't mean anything mechanically + or ruleswise right now, but maybe it will inspire some more creative traitoring? + - rscadd: a few antags now have a tgui menu instead of a greet. spiffy! they include + antag info you need. +2021-07-24: + GoldenAlpharex, with some help of Imaginos (PositiveEntropy): + - imageadd: Added a new badge to display on future berets. + - expansion: Nanotrasen's fashion department decided to release a brand new series + of berets, meant to replace the old collection and featuring a wider array of + possibilities! + - refactor: Berets are now converted to GAGS, with more options for customization + and greater consistancy between the sprites. + - code_imp: Not all GAGS sprites can be recolored in vendors by default anymore. + Kubisopplay: + - bugfix: Syndicate hackers outsmarted another group of syndicate hackers, and updated + defensive protocols of cyborgs slaved to malfunctioning ais, once again letting + them defend against emags + Melbert: + - qol: Ctrl-click now activates the porta-seeder. + Thunder12345: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added class mechanics to Capture The Flag, with two new classes. - rscadd: The Assaulter class is a fast skirmisher armed with a shotgun and rocket gloves, but a very fragile energy shield. - rscadd: The Marksman class is a sniper armed with a hitscan rifle doing lower than standard damage. +<<<<<<< HEAD - imageadd: Added a bunch of icons for Assaulter and Marksman gear. - tweak: The fair maidens on the medieval simulation shuttle are no longer weapons of mass destruction +======= + - imageadd: 'Added a bunch of icons for Assaulter and Marksman gear. tweak: The + fair maidens on the medieval simulation shuttle are no longer weapons of mass + destruction' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer spawn outside of CTF matches when multiple classes are available. - refactor: Rewritten the multi-class part of CTF spawning to use radial menus. - refactor: Medieval simulation has been refactored to bring it fully under the CTF framework +<<<<<<< HEAD - balance: Add musical instruments to maint loot list - bugfix: fixed cryocells and hfr runtiming on quick consecutive wrench actions. - bugfix: Fixed Index Table outputting a table instead of a list. @@ -842,10 +1533,55 @@ OrionTheFox: - bugfix: Lea's Cowboy Poncho, specifically it's Toggle Component, works properly now +======= + TiviPlus: + - bugfix: fixed normal panic bunker sometimes rejecting when it shouldnt + aaaa1023: + - spellcheck: Bloodspider directive now calls Changelings "Vicious" and not "Visicious" + - spellcheck: Added missing space in the happiness gum box's description. + - bugfix: There are no longer maintenance zone tiles inside the circuits lab on + icebox. + interestingusernam3: + - admin: Admins can't make it possible to deconstruct a hedge by wrenching with + a single var edit anymore. + vincentiusvin: + - bugfix: fixed hfr crate having the wrong parts +2021-07-25: + tralezab: + - bugfix: Nightmares were getting a broken ui panel, now they don't! +2021-07-26: + Ghommie: + - bugfix: Fixes some hardships with placing lattice on multiz maps. + Melbert: + - bugfix: Roses in mask slot now have their correct worn sprite again. + Wayland-Smithy: + - bugfix: Fixed Chat Highlighting working on your own OOC messages. + timothymtorres: + - bugfix: High Volume Vent Pump Layer 3 icon state to be correct + - balance: Add musical instruments to maint loot list +2021-07-27: + Domitius: + - bugfix: One spraycan can no longer colour every light on the station. + Fikou: + - code_imp: bless aware hud is no longer hardcoded for chaplains + Ghommie: + - bugfix: Sentient monkeys are no longer subsceptible to being knocked over by mobs + in their way. + JohnFulpWillard: + - bugfix: Zombies no longer get permanently hungry. + Mothblocks: + - rscadd: Added brain-computer interface circuit shells. + Nari Harimoto: + - bugfix: AI can now no longer be pushed even when anchored, only when dead or unanchored + can it be pushed (grab a dead core to swap places) + - bugfix: borgs can now no longer be pushed when in combat mode and alive, you will + always swap places with dead borg corpses. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, tf-4: - imageadd: Thanks to a collaboration between the frontier sector and the core sector, the parade jackets now boast new and varied apperances for all to enjoy, with a new parade jacket releasing for the Head of Security! +<<<<<<< HEAD - imageadd: 'In no short effort than the finest of tailors, the captain''s hat, the centcom hat, the captain''s jumpsuit and the captain''s carapace now have finer gold trims and the finest quality leather available, making them more @@ -889,10 +1625,82 @@ - balance: tram is now twice as fast, pray it doesnt get faster - code_imp: bless aware hud is no longer hardcoded for chaplains - rscdel: Nanites have been removed. +======= + - imageadd: In no short effort than the finest of tailors, the captain's hat, the + centcom hat, the captain's jumpsuit and the captain's carapace now have finer + gold trims and the finest quality leather available, making them more vibrant + for all! + - expansion: To utilize the new variants, simply alt-click a parade jacket, or a + centcom commander coat. You can also obtain a Head of Security parade jacket + by simply accessing the Head of Security's closet! + TheSmallBlue: + - expansion: Adds the pathfinding component. + Thunder12345: + - code_imp: Killed the miscellaneous items file! + Wallem: + - bugfix: Only foods which are created at mapload require player interaction in + order to decompose. + Wayland-Smithy: + - spellcheck: Made the Doppler Array explosive sale message less wordy. + - bugfix: Fixed Chat Highlighting working on your own Binary messages. + dragomagol: + - bugfix: lavaland syndie base and seed vault no longer explode into green tiles + timothymtorres: + - expansion: Added xeno plasma statue + tralezab: + - spellcheck: Tiger Cooperative Traitors now have a slightly better uplink information + flavor text + - code_imp: killed the global vars misc file! +2021-07-28: + Cyberboss: + - bugfix: Fixed APC's using extreme amounts of power instantly + EuSouAFazer: + - expansion: Kilostation Medbay's solar now starts with a Space Carp that cannot + destroy stuff. + - expansion: Kilostation Security's solar now doesn't have a solar computer, instead + having an empty computer frame and the circuitboard nearby. There is also 2 + glass nearby as well. + - expansion: Kilostation Engineering's solar now starts partially built, with a + box with assembly and glass nearby. + Fikou: + - bugfix: the elite syndie suit now has the proper icons on its first equip + Guestify: + - bugfix: Replaces security newscasters with non security ones in non security rooms + on Tramstation + Kylerace: + - balance: tram is now twice as fast, pray it doesnt get faster + Wayland-Smithy: + - qol: Poll Candidates alerts no longer steal window focus, like ghost role rolls + and cult leadership votes. + - code_imp: Added an autofocus argument to tgui_alert, defaults on, that can be + used to prevent accidental inputs from surprise alerts when used. + ZephyrTFA: + - bugfix: Rust Heretics can once again benefit from rust + aaaa1023: + - bugfix: Removes stray coldroom area tile in cryogenics, medbay central tiles under + medical and snaking chapel office line on chapel walls on Metastation. + timothymtorres: + - bugfix: Fixed wallets not granting access for ID cards inside them. + timothymtorres, SomeoneYouProbablyKnow: + - expansion: Added a referee costume to autodrope and costume spawners + - imageadd: Added referee costume +2021-07-29: + EuSouAFazer: + - bugfix: Removed the duplicate QM stamp on Icebox + Fikou: + - admin: default instakill rifle doesnt delete itself + Ghilker: + - bugfix: HFR now properly take damage when overfilled with fuel + Ghommie: + - bugfix: Fixes ridden skateboards crashing back-to-back when bumping a dense atom + while another is behind them. + Greniza: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: prisoner transport bags can now be cinched properly - bugfix: syndicate prisoner transport bags now expel the expected amount of gas due to an occupant's exhale - spellcheck: makes cinching a PTB have proper pronouns according to an onlooker +<<<<<<< HEAD - bugfix: Rust Heretics can once again benefit from rust - bugfix: Vatbeasts can use their powerful tentacle slap ability again. - bugfix: Removed the duplicate QM stamp on Icebox @@ -923,11 +1731,75 @@ (BASE /TG/) SECURITY EQUIPMENT ON ROCKPLANET. - rscdel: Cybersun has been disabled. 2021-07-30: +======= + Improvedname: + - balance: Construction bags fit once more in your pockets + Itseasytosee: + - qol: ghosts will no longer get fake virus alerts + Melbert: + - bugfix: Some things that wouldn't dispense themselves from smartfridges now will + properly give themselves up. Some examples include Roses, Nettles / Deathnettles, + and Salad of Edens. + - bugfix: The mapped sprite for GAGS Lizard Plushes works, now. Mappers rejoice. + - admin: Tray planted kudzu will now log in investigate -> botany instead of its + own file. + Mey-Ha-Zah, Fikou: + - imageadd: new sprites for the ash walker egg + Mothblocks: + - rscdel: Nanites have been removed. + Shroopy: + - bugfix: robots now work properly + Thunder12345: + - code_imp: Removes all misc files/folders from the projectiles module + Wallem: + - bugfix: Flowers now have a Natrual Insecticide gene which protects them from decomposition + upon harvest. + Watermelon914: + - expansion: Adds the module duplicator that allows people to duplicate their module + components so that they don't have to recreate the entire code again. + - admin: Added the ability to save/load integrated circuits. + - bugfix: Fixed carps being given orders without a friend via radial menu. + - bugfix: Fixed sentient carps being unridable because of the ai datum. + - bugfix: Fixed the launchpad usb connection not working with null x/y offset inputs. + itseasytosee: + - soundadd: There are now sounds for adjusting the pressure on a pneumatic cannon. + - qol: attacking disembodied brains now has animations and sounds. + - bugfix: constructs examine text color matches the rest of their theme. + - qol: Your gun will now actually spin around in your hand while gun-spinning + - bugfix: Certain non-magic ranged weapons will no longer "appear to have a magic + crystal installed" + - qol: Adds some on examine instructions for constructing a turret + tf-4: + - qol: dash items like the ninja katana now give a balloon alert instead of a chat + message + - bugfix: Meta medbay now has all its areas set correctly + timothymtorres: + - bugfix: Fixed spectral instruments spawn probability +2021-07-30: + AlinaStarkova: + - bugfix: Deltastations chapel disposals chute no longer chucks trash into departures + EuSouAFazer: + - bugfix: Changed the computer in Kilo's mining office. + - bugfix: A small issue on the tiling in the mining dock. + Fikou: + - qol: tcg flippers no longer have the scaling element + - qol: ski shoes arent as limiting anymore + Ghommie: + - bugfix: Icebox and Tram chemistry smartfridges are now preloaded. + - expansion: Monkeys can now retaliate against xenomorph and animal attacks. + IndieanaJones: + - refactor: Revenant, Sentient Disease, Space Pirates, and Obsessed have been registered + into dynamic mode. + InvalidArgument3: + - rscadd: Exosuit-mounted kinetic accelerator equipment. Unlocked through Mining + Technology. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JustANormalHooman, Nari Harimoto: - bugfix: Biobags can feed reproductive extracts again, and can be fed multiple cubes from a bag with one click - refactor: reproductive extracts now have a storage component for the purposes of being fed +<<<<<<< HEAD SkyratBot: - bugfix: Adds APC electronics and replaces uranium with plasma in donut whiteship - code_imp: Removes some unnecessary code bloat from the circuit component files. @@ -965,3 +1837,51 @@ features to be added. qol: Adds dragndrop functionality to integrated circuits so that you no longer have to click to connect ports, you can drag instead.' - bugfix: reactive armor now properly updates its sprite on the mob +======= + LemonInTheDark: + - rscadd: Getting hit point blank by an explosion will shake your screen a good + bit more then before + - qol: '"Shakes" from explosions or hitting things really hard will look a bit smoother + now' + Mothblocks: + - qol: Ghosts can now examine BCIs inside hosts. + Thunder12345: + - code_imp: Removes the misc ID trims file. + Watermelon914: + - code_imp: Removes some unnecessary code bloat from the circuit component files. + godspeedfunnyman: + - bugfix: Adds APC electronics and replaces uranium with plasma in donut whiteship + timothymtorres: + - bugfix: Fixed gas meters showing error icons before round starts and right before + they are created + - bugfix: Fixed pAI loudness booster to work when not in holoform + tralezab code, paxilmaniac sprites: + - expansion: Added Trash Cannons. Find the recipe in maint! +2021-07-31: + DAKKA-WAAAGH: + - rscadd: Casino emergency shuttle + Fikou: + - bugfix: reactive armor now properly updates its sprite on the mob + Ghommie: + - bugfix: Fixed e-bolas being unblockable, and not being able to ensnare flying/floating + mobs (though kinda pointless because they ignore the slowdown). + - bugfix: fixes being able to mind transfer into someone protected against it by + targetting their holoparasite/guardian. + - bugfix: All cargo manifest exports should now work as expected. No more gaining + money from selling erroneously denied manifests and not gaining/losing money + from incorrect manifests. + - bugfix: Fixes martial grab combos working while inside objects. + SmArtKar: + - bugfix: Fixes unremovable components counting towards overall capacity. BCIs are + no longer 6 slot instead of 10 + Watermelon914: + - refactor: Refactors the UI code of integrated circuits to be a lot less messy + and much more organised and to use much better practices to allow for better + features to be added. + - qol: Adds dragndrop functionality to integrated circuits so that you no longer + have to click to connect ports, you can drag instead. + tralezab: + - bugfix: rev art now works correctly! + wesoda25: + - admin: Adds logging for cult reaching red eye and halo milestones +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-08.yml b/html/changelogs/archive/2021-08.yml index 55620b041eb..c4c6a7fc36f 100644 --- a/html/changelogs/archive/2021-08.yml +++ b/html/changelogs/archive/2021-08.yml @@ -1,3 +1,4 @@ +<<<<<<< HEAD 2021-08-02: FlamingLily: - rscadd: sex @@ -9,6 +10,32 @@ Lyroy: - bugfix: Added some of the new jobs to the list of jobs allowed to take certain job-related items in the loadout menu. +======= +2021-08-01: + SmArtKar: + - imageadd: Added new sprites and animations for module duplicator + ma44: + - rscadd: Weapon rechargers will now be more noticeable when it has finished recharging + something. +2021-08-02: + Ghilker: + - bugfix: fixed issue where plasmaman clown and mime would die to the filtered plasma, + clown and mime masks no longer have filters roundstart + - qol: filters can be removed with rclick + Ghommie: + - bugfix: Fixed copies of stamped papers sharing the same `stamps` list. + - rscadd: People with the phobia of falling are now afraid of open space turfs. + Gurkenglas: + - qol: Circuit component descriptions and module names are now visible to the naked + eye. + InsaneRed: + - qol: Metastation's toxins has been reworked a bit to fit better with thermomachinery + and better piping + Jackraxxus: + - bugfix: The wisdom cow no longer spawns in space. + NamelessFairy: + - bugfix: Adds a missing wall to delta maint +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Tram's RD telescreen can now view their dept cameras again - bugfix: Delta and Meta RD offices now have a RD telescreen again @@ -24,6 +51,7 @@ now share an APC and air alarm - bugfix: trams toxins storage room now uses its correct area, added an APC to power the room +<<<<<<< HEAD RatFromTheJungle: - imageadd: new demonic core sprite (ooo animated ooo) SkyratBot: @@ -158,6 +186,76 @@ - imageadd: icons for the new items and enemies. - code_imp: added code and items for the prison, such as jumpsuits, enemies, and the ghost roles. +======= + Ryll/Shaps: + - qol: Adds a new preference for photosensitive players in the OOC preferences menu + to replace the bright white flash from things like flashes/flashbangs with a + solid black screen. + SmArtKar: + - qol: Servers now have USB ports + TheSmallBlue: + - bugfix: The outputs on the Launchpad USB component now work as they should. + TiviPlus: + - bugfix: riding offsets actually work now + Wayland-Smithy: + - qol: Improved the COMMS_KEY config documentation. + maxymax13: + - spellcheck: You no longer "accidently" shoot yourself spinning a gun + tf-4: + - bugfix: Clumsily hitting yourself with the classic baton now gives you the message + with the appropriate perspective + tralezab: + - bugfix: cannons lost their sprites in the last feature addition for them... now + they have those back! +2021-08-03: + Fikou, sprites from /vg/: + - expansion: reinforced rock for mapping use + Ghommie: + - expansion: Picked up bees and mice can now fit in boxes. + Gurkenglas: + - expansion: Signals now fire a timestamp. + JohnFulpWillard: + - bugfix: Cultists using Twisted Construction on a Cyborg will no longer spawn 2 + constructs. + KittyNoodle: + - bugfix: ethereal hair will now change with ethereal color without an external + update + SmArtKar: + - expansion: You can make BCI overlay and click interceptor circutry now! + - balance: BCI now has it's own research node. + - bugfix: You no longer can remove BCI core and actions from BCIs and insert them + into other circutry. + Thunder12345: + - code_imp: Removes (almost) all misc files from the clothing module + Watermelon914: + - admin: Adds admin components that allow admins to set variables, get variables, + call procs and execute sdql via circuits. To enable these components to function, + an admin needs to enable the admin_only variable on a circuit. + - qol: Adds more entity information to shell outputs to allow circuits to identify + who used the shell. + - expansion: Adds list literals. + - bugfix: CTF will no longer delete objects on CTF maps that shouldn't be deleted + and it'll also successfully regenerate the map once a CTF round ends. + - bugfix: Fixed phantom slipping caused by synthesized banana peels. + - bugfix: Fixed the metabolism unit test randomly failing because of neurowhine + carshalash: + - bugfix: Eggs now work when cracked into glasses +2021-08-04: + Fikou: + - admin: adds list getter and text2num to sdql wrappers + Greniza: + - bugfix: The pip count, layout, and orientation of standard D6s has been brought + in line with a standard casino D6. + Gurkenglas: + - expansion: The multiplexer component, now router, also demultiplexes across multiple + outputs. Also, the indices now wrap instead of clamp. + Improvedname: + - bugfix: Anti-tider mister is no longer invinsible inhand + InsaneRed: + - bugfix: Cultists can once again draw runes in lavaland mining station + JohnFulpWillard: + - bugfix: Using Twisted Construction on an AI shell no longer ghosts the AI +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's service wing has been revamped! - rscadd: The Kitchen and Hydroponics has been redesigned entirely with small adjustments @@ -170,6 +268,7 @@ - rscadd: The stairs leading to the bar have been made very accessible from the tram dock, being right beside the kitchen entrance. The lower segment of the bar has been redesigned the better fit this change. +<<<<<<< HEAD Melbert: - code_imp: Uncomments the code that makes chaplains enjoy holymelons. Chaplains will now gain positive moodlets from eating holy melons once again. @@ -278,6 +377,125 @@ an existing thing qol: made something easier to use' - bugfix: railings can now be vaulted/climbed over from both sides. - admin: Admins now have a "View All Circuits" button to investigate circuits easier. +======= + Mothblocks: + - bugfix: Fixed medical HUDs not showing the defib icon. + SmArtKar: + - expansion: You can control air alarms using USB now + - bugfix: Phazon microtool arrays no longer have an error sprite + TemporalOroboros: + - bugfix: Fixed rad collectors ignoring letting anyone (un)lock them with their + ID. + - bugfix: Beef wellingtons cannot be sliced to produce beef wellington slices that + can be sliced to produce beef wellington slices that can be sliced to produce + beef wellington slices... + Timberpoes: + - bugfix: Fixed a bug preventing the Plexagon HR Core app from de-prioritising jobs + when 5 or more jobs were prioritised. + Triiodine: + - bugfix: NT engineers have repaired a malfunctioning external airlock set at Kilostation + disposals. It should cycle properly now. + Watermelon914: + - bugfix: Vehicles can now be buckled to again. + - code_imp: Improves BCI code by removing an easily bypassable `add_to` check for + circuit components and implementing proper typechecking in the addable BCI components + - bugfix: Fixed the UI notices about the supported types not showing up on all BCI + components + Zytolg: + - rscadd: Makes Icebox Service Multi-Z through retroaction. + - rscadd: The first Multi-Z kitchen on /tgstation/ + - bugfix: Tosses out the non Multi-Z aspects of the previous service + - qol: You can now use stairs to visit the various areas of Icebox Service + - bugfix: This should force ruin spawns out and away from the center of the station. + Next step is to actually add icebox ruins that are small but help force that + spawn condition. + interestingusernam3: + - bugfix: Being clumsy no longer protects you from grenades sticking to your hands. + tralezab: + - code_imp: Pavlova has better code :) + - spellcheck: Pavlova has a different description now + - bugfix: fixes soulstones granting themselves every language... instead of the + spirit inside. lol. + - refactor: refactored spirit possession used in the possessed blade into a component. + now ANYTHING could be possessed if you so desire! +2021-08-05: + Ghommie: + - balance: Standard bananium floor is now viable for clown decoration and isn't + slippery. Custom bananium floor tiles can be used to slip people though. + IndieanaJones: + - bugfix: Dynamic's Pirate spawn will now properly trigger. + InsaneRed: + - bugfix: You no longer need to unbuckle twice from xenomorph nests to be free + JohnFulpWillard: + - bugfix: Dead Cyborgs are thrown back into their body when turned into a Cultist + construct. + Melbert: + - code_imp: Uncomments the code that makes chaplains enjoy holymelons. Chaplains + will now gain positive moodlets from eating holy melons once again. + Mothblocks: + - admin: Admins now have a "View All Circuits" button to investigate circuits easier. + Paxilmaniac: + - expansion: hmg turret making use of newly fixed manned turret code, and the deployable + component + - bugfix: manned turret projectiles now actually go towards where you aim + - soundadd: new heavy machinegun sound from tgmc + - code_imp: deployable component, for deploying things from other things + SmArtKar: + - expansion: Conveyor switch and quantum pad can now be connected through USB cables + TemporalOroboros: + - bugfix: The chasm hallucination now visibly indicates the turfs it's effecting + again. + Watermelon914: + - refactor: Refactors datatype code completely for integrated circuits. + - refactor: Options have been moved to their own input port with their own special + type known as the "Option" type. + - bugfix: Fixed CTF breaking when it restarts. + Y0SH1M4S73R: + - bugfix: List literal components no longer append their output with garbage data. + antropod: + - bugfix: Custom vendor bluescreen + interestingusernam3: + - spellcheck: Gutlunches no longer eat through their nutrient sacs. +2021-08-06: + Gandalf2k15: + - bugfix: Reinforced walls should now smooth properly. + Ghommie: + - refactor: refactored the thrownthing datum a little. + - qol: you can now throw stuff at movables with no density, such as mobs lying on + the floor, mice, APCs, light bulbs etcetera etcetera. + - bugfix: Contractor pods won't land on groundless turfs such as chasms, lava or + open space anymore. + KubeRoot: + - bugfix: Tailored winter suit hoods are now colored correctly + Melbert: + - bugfix: Rust Heretics now need to stand on Rust to heal again, instead of passive + free healing + SmArtKar: + - balance: Doubles capacity for most shells + - expansion: Added scanner gate shells + dragomagol: + - admin: adds an additional log file, mob_tags, for referencing mob numbers in logs + timothymtorres: + - bugfix: Fixed being able to polymorph pAIs into other mobs. It changes their + holoform now instead. + - bugfix: Fixed being able to polymorph mimics spawned from a staff of animate +2021-08-07: + ArcaneMusic: + - bugfix: Wirecutters have their correct belt slot icon again. + Ghommie: + - bugfix: railings can now be vaulted/climbed over from both sides. + - bugfix: Folded gold wheelchairs are now actually made of gold. + NamelessFairy: + - bugfix: Adds a missing wall on CentCom in the supplypod facility + - bugfix: Most if not all CentCom windows should now be on plating + Nari Harimoto: + - bugfix: chapel areas now work properly, no more APCs thinking its in space on + tram + Thunder12345: + - code_imp: Made the Occupational Corruption Device's deadchat message less cryptic, + and repathed it to something more descriptive + Zytolg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Missing APC in Icebox Bar Maint - bugfix: Changes icebox apiary to the correct type - bugfix: Icebox Disposals was unlinked under the bar table. This should fix that. @@ -287,6 +505,7 @@ - bugfix: Icebox - Kitchen was missing the Processor and Grinder, you can now find them in the freezer and downstairs respectively. - bugfix: Icebox - Changes the bot portal in the bar to the correct subtype. +<<<<<<< HEAD - bugfix: Folded gold wheelchairs are now actually made of gold. - bugfix: Adds a missing wall on CentCom in the supplypod facility - bugfix: Most if not all CentCom windows should now be on plating @@ -359,6 +578,20 @@ BurgerLUA: - balance: Nicotine addiction is now more realistic and has additional side effects from a pool of possible side effects. +======= +2021-08-08: + Mokiros: + - bugfix: added parentheses to properly calculate days in round time + Seris02: + - bugfix: pais will no longer get hurt by the rod of asclepius + Watermelon914: + - bugfix: Fixed circuit component options + - code_imp: Moves most circuit component defines to their appropriate files +2021-08-09: + ArcaneMusic: + - bugfix: Accounting machines now assign the job to the bank account, meaning that + new accounts can buy things without being considered budget cards. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, MeyHaZah, some sprites from /vg/station: - balance: mining soulstone can no longer grab sleeping/unconscious people - balance: voice of god can immobilize in addition to knocking down @@ -378,10 +611,52 @@ - balance: winter biodome is a bit harder, its antique laser has now been replaced with a freeze cube in a vault - balance: spellblade from bubblegum is replaced with a soulscythe +<<<<<<< HEAD +======= + TheSmallBlue: + - bugfix: Pathfinding component should now properly go around walls every time. + Time-Green: + - bugfix: draws moth antennae when you're wearing helmets again (oops) + aaaa1023: + - bugfix: fixed an error caused by toilets taking damage after they were deconstructed +2021-08-10: + ArchPigeon: + - bugfix: fix reattaching of monkey bodyparts + Krysonism: + - expansion: Adds a new illicit drug; bLasToFF, perfect for when you want to dance. + - expansion: Adds a new illicit drug; SaturnX, perfect for when you just want to + disappear. + - expansion: Adds a new illicit drug; Kroncaine, perfect for when you need to get + shit done. + - expansion: The seeds of a rare plant; the kronkus vine can now spawn in maint. + - expansion: Lead batteries and pipes can now spawn in maint. + - rscdel: Removed crank. + - balance: Mushroom hallucinogen has a new trippy effect, but no longer makes you + druggy or dizzy. + Mothblocks: + - qol: Observers can now read circuits from anywhere. + - expansion: Added USB support to teleporter control consoles. + Nari Harimoto: + - bugfix: Nanotrasen architects realized they cut too many corners and left out + a number of airlock cycle controls on Tramstation, they have since returned + and fixed their mistakes + - bugfix: Icebox service disposals has now been professionally connected + - bugfix: Icebox service has now been tweaked to be up to NT standards + - bugfix: Pete has now been assigned to icebox freezer again + Triiodine: + - qol: NanoTrasen sent some engineers in and revised the Virology Module on Ice + box Station, and have also supplied standard equipment available on other station + labs that Ice Box had been missing. The structure changes have caused maintenance + to expand slightly. +2021-08-11: + InsaneRed: + - bugfix: Fixed up distro pipes on botany of tramstation, adds 2 extra water tanks +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - bugfix: Default AI behavior cooldowns have been returned back to 0,8 seconds instead of 0.1 seconds, meaning Ian will no longer disembowel you with 20 attacks in 2 seconds. +<<<<<<< HEAD Seris02: - bugfix: fixes SOOC SkyratBot: @@ -402,14 +677,34 @@ - bugfix: Mediguns now eject Medicells into the user's hands instead of always on the floor. 2021-08-12: +======= +2021-08-12: + EricZilla: + - imageadd: Centcom finally sent us new PDAs. The uh, clown one keeps looking at + me. + Fikou: + - bugfix: fixes cannons not working +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Gamer025: - code_imp: url_encode and decode now try to stringify inputs Gamer025 & Wayland-Smithy: - bugfix: Submenus like Sound and Ghost inside Settings are no longer gone +<<<<<<< HEAD +======= + Gurkenglas: + - qol: All circuit component input ports act as a combiner. + - refactor: 'Circuits: set_input and set_output are now put. input_value and output_value + are now value.' + InsaneRed: + - rscadd: the crystallizer can now produce crystalized hyper noblium that makes + your clothes pressure proof! not dying to pressure from other people is not + guaranteed. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - bugfix: Spider midwives can no longer send commands while dead - bugfix: Nurse spiders can no longer heal dead spiders and get a message when trying to do so. +<<<<<<< HEAD SkyratBot: - imageadd: Centcom finally sent us new PDAs. The uh, clown one keeps looking at me. @@ -485,12 +780,41 @@ - balance: removed some loot left over as an oversight and nerfed the Warden boss fight a bit. - bugfix: removed and replaced some zombies that spawned invisible +======= + Whoneedspacee: + - bugfix: Megafauna are no longer stopped by corpses and chairs. + sqnztb: + - bugfix: Navigation computers can now arbitrarily land on top z-level openspace. +2021-08-13: + AMonkeyThatCodes: + - spellcheck: Areas where it makes sense now have \improper pre-fixed to them + Fikou: + - bugfix: fixes some megafauna shooting too fast + Ghommie: + - bugfix: Food preference quirks are no longer broken by species change. + Jordie0608: + - admin: Round id when a note was made in now displayed in the notes panel + Seris02: + - bugfix: dchat clogging of clientless mobs is gone + Wayland-Smithy: + - admin: Improved invisimin toggle messages. + - bugfix: Fixed Oingo Boingo Punch-face! not displacing airlocks. + - bugfix: Fixed shotgun meteorslugs not displacing airlocks. + - bugfix: Fixed chocolate surprise easter eggs being edible before they are unwrapped + and tasting like egg. +2021-08-14: + FireFlashie: + - bugfix: Fixes changelogs parsing on linux enviroments + Ghilker: + - bugfix: HFR fuel mixes now properly consume the correct amounts +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Paper that's on a clipboard doesn't need to be poked to realise that its appearance has changed and to properly display it on a clipboard. - bugfix: You finally figured that using a stamp on a clipboard was more important than using the pen that's currently attached to it. Congratulations! - code_imp: Added support for preventing a pen from being removed from a clipboard. +<<<<<<< HEAD - spellcheck: Ambitions now properly tell admins that auto-approve lasts TEN, not FIVE minutes. OrionTheFox: @@ -583,10 +907,116 @@ GoldenAlpharex: - bugfix: Space-proof beret now actually appears to have been made into a beret, instead of a reality-bending bunch of letters. +======= + JohnFulpWillard: + - spellcheck: DNA activators will now become expended once used, even if it hasn't + activated anything. + - spellcheck: Removed a space when recycling an activator at a DNA console. + Krysonism: + - balance: liquid electricity grants more charge to ethereals. + - balance: Ethereal racial foods contain more liquid electricity. + SmArtKar: + - expansion: Adds 3 new NTNet components for circuits + Timberpoes: + - config: Added a config flag for mirroring the logging of certain failed logins + to their own file. + Watermelon914: + - expansion: Adds circuit variables, which replace the RAM component. A cog icon + has been added to the top of the integrated circuit UI to access these variables. + - code_imp: Moved all the integrated circuit core files into a new subfolder called + core +2021-08-15: + Ghilker: + - bugfix: constructed atmos devices now show the correct color in the name (no longer + all grey) + - qol: the healium crystal now fix the air instead of refilling it (that role is + still available with the proto nitrate one), the crystal is not made with O2 + instead of freon + - expansion: Add crystal foam recipe to crystallizer, a crystal that when broken + will release a tick foam that closes any and all breaches that it encounters + (it won't refill the air tho) + Rohesie: + - bugfix: Buckling to nearby objects and roundstart shuttle buckling now result + in the proper facing direction. + Wayland-Smithy: + - bugfix: Fixed new ticket ahelp message double sanitizing. +2021-08-16: + Colovorat: + - bugfix: Cyborg emergency reboot module now is no longer dropped if revive is succesful + - bugfix: Controller shell extra button now works properly + Couls: + - bugfix: bright white spheres when attacking things with an item that has a light + source attached + - bugfix: inventory and action buttons creating light sources + Ghommie: + - bugfix: freezers will now actually protect their contents from explosions once + like iamgoofball intended almost 4 years ago. + Time-Green: + - bugfix: moths will burn +2021-08-17: + Ghommie: + - qol: Wormhole projectors now fire blue wormholes with left mouse btton and orange + ones with right mouse button. + GreatKingWombat: + - bugfix: Defined the in-hand state for the chaplains' unholy pitchfork. The in-hand + sprites will now actually appear. + SmArtKar: + - bugfix: NTNet Transmitter now works + Timberpoes: + - admin: Admins can now find "banned account in connection history" admin alerts + mirrored to the suspicious logins log file. + Watermelon914: + - bugfix: Fixed freezers protecting their contents after being exploded. +2021-08-18: + Cyberboss: + - bugfix: The insufficient black market credits message now properly displays. + EOBGames: + - code_imp: Management would like to announce that in accordance with new company + policy, the Toxins Lab will henceforth be known as the Ordnance Lab. In addition, + a number of company protocols have been rewritten with this in mind. + Watermelon914: + - refactor: Refactors connect_loc_behalf and caltrops to both be components. This + will likely solve a lot of current issues with connect_loc_behalf as storing + states will be much more stable on it. +2021-08-19: + GoldenAlpharex: + - bugfix: Space-proof beret now actually appears to have been made into a beret, + instead of a reality-bending bunch of letters. + Maurukas: + - bugfix: The intercom in Deltastation's toxin range has been relocated closer to + the implosion compressor + Moltovz: + - bugfix: fixed a broken bee in botany. + Potato-Masher: + - bugfix: Fixes the Deltastation Engineering console being wired to the wrong powernet, + allowing the Ampcheck program to function as intended. + - bugfix: Added a missing length of cable to the tramstation kitchen, as well as + the absent salt/pepper shakers. + SmArtKar: + - bugfix: Beach Biodome now has an oven and a griddle + jughu: + - bugfix: fixes wizard failing to spawn without a spellbook when you roll a d20 +2021-08-20: + BarrelOfNapkins: + - bugfix: if a character is blind, they can feel how full they feel while eating + Fikou: + - bugfix: fixes service achievements + Ghilker: + - bugfix: fixes thermomachine abuse by slowing the exchange ratio based on the moles + amount on the ports (both if cooling, only main if not) + Gurkenglas: + - bugfix: The intern responsible for NTNet circuit components not working has been + sacked. + Improvedname: + - bugfix: Auto rifle ammo crates have a name now + Krysonism: + - bugfix: Fixed an exploit that allowed SaturnX enjoyers to become permanently invisible. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Pepsiman0: - bugfix: 'the chem mass spectrometer is now a proper machine that is now: buildable, deconstructable, movable and upgradable. (the research for the board is in the basic bio tech node)' +<<<<<<< HEAD SkyratBot: - bugfix: Fixed the circuit duplicator not working. - bugfix: if a character is blind, they can feel how full they feel while eating @@ -707,20 +1137,96 @@ CandleJaxx: - bugfix: Adds missing Vox icons for their mining gear. SkyratBot: +======= + PositiveEntropy, Kryson, TetraZeta: + - imageadd: Ports new Hypospray, Combat Autoinjector, Pestle, Mortar and Dropper + sprites from Shiptest! + - imageadd: Adds a new sprite for pill bottles! + ViktorKoL: + - bugfix: corrected Fiery Rebirth's and Curse of Corrosion's heretic research descriptions + - bugfix: fixed heretic research progression after unlocking the Lonely Ritual + Watermelon914: + - bugfix: Fixed the circuit duplicator not working. + Wayland-Smithy: + - bugfix: Fixed microwave's attack_hand_secondary return value. + timothymtorres: + - qol: Mulebots no longer turn off power when the panel is opened with a screwdriver. + - bugfix: Player controlled mulebot mobility is now affected by motor wires. + - bugfix: Fix fire being extinguished by pAIs, borgs, or simple animals by walking + over the mob. +2021-08-21: + BraveMole: + - code_imp: prevent possible QDEL_IN harddel + Gamer025: + - code_imp: Failsafe is more robust now and the game can actually recover from an + deleted MC + Ghilker: + - bugfix: fix crystallizer from getting stuck on same amount of gases, limits the + allowed amount of allowed gas inside by double the recipe amount per type + MMMiracles: + - bugfix: Solar assemblies can no longer be built on top of existing solar panels. + SpookyTheFox: + - bugfix: tweaked soda dispenser reagent temperatures + Thunder12345: + - admin: The add component option in view variables now uses a tgui list that can + be searched. + Time-Green: + - bugfix: lowered mothwings are now visible again + aaaa1023: + - spellcheck: fixed a few typos in sleeping carp "recall teachings" text. Also changed + a line in it to be less awkward. +2021-08-22: + AMonkeyThatCodes: + - bugfix: Moving aside your mask will no longer make you impervious to disease + Arkatos: + - bugfix: Fixed several messages which were not showing properly about finding a + rabbit in a hat, rattling your bones, denying sect membership or cooking sausages. + Melbert: + - bugfix: Some mask slot items won't prevent you from breathing properly due to + a runtime error + Watermelon914: + - admin: Adds component removals and mass component removals to the VV menu. +2021-08-23: + Timberpoes: + - bugfix: Fixed runtime in monkey AI which would prevent monkey from pickpocketing + weapons or picking weapons off the ground. + vincentiusvin: + - bugfix: fixes hot ice igniting using 100x the actual number of the sheets + - bugfix: fixes hot ice being ignitable with a condenser +2021-08-24: + Fikou: + - bugfix: fixes stun baton switching exploit + Melbert: + - refactor: Various toggle/transforming items (energy swords / shields, the cleaving + saw, switchblades - to name a few) are now handled via component (the transforming + component). + - code_imp: Slightly cleaned up the code surrounding various transforming items. + Comments, better vars, etc. + - bugfix: The Syndicate Jaws of Life no longer become normal Jaws of Life on use + Pepsiman0: + - bugfix: you can now smash a bottle of beer or ale on someone's head + Wayland-Smithy: + - bugfix: Fixed dash abilities, like from Hiero Club, null owner refs. + esainane: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The HFR now places its side components in the correct orientation when constructed by using a Multitool on the rapid HFR boxes. The core still needs rotating if your design requires it, and is best done before you step away unless you want to disassemble and move a side component. +<<<<<<< HEAD Superlagg: - bugfix: Character preference ringtones should actually work again. softcerv: - rscadd: Hypospray kits can be now be Ctrl+Shift clicked to change the design. thestubborn: - bugfix: Fixed the paramedic jacket's sprite. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-08-25: AccountName5: - bugfix: Fixed bug that prevented you from placing vertical bridge pipes on horizontal smart pipes. +<<<<<<< HEAD FlamingLily: - tweak: Made it more clear that combat indicator is an in character state. GoldenAlpharex: @@ -828,11 +1334,80 @@ - code_imp: added a stack trace to job list initialization from text file - config: Reorganized jobs.txt and added missing entries SkyratBot: +======= + Colovorat: + - bugfix: Cables from protolathe and autolathe should merge just fine now + Ghommie: + - bugfix: roundstart offstation antagonists such as wizards and nuke ops no longer + have quirks (either from preferences or hardcore random) assigned to them or + count toward the hardcore random score. + - bugfix: Fixes the lone operative event hardly ever rolling even if the disk is + left on the same place for hours because of dynamic. + Kryson, AMonkeyThatCodes: + - imageadd: Replaces the lobby menu with sprites instead of HTML + softcerv: + - bugfix: stargazers can now form slime links again. +2021-08-26: + Ghommie: + - bugfix: Fixes monkey being unable to access right click functions on several objects + such as stacks and storages. + - bugfix: Outgoing comms console messages to allied stations will not be shown again + as incoming messages. + - bugfix: Fixes traits added by quirks not being removed when those are deleted + (like from eigenstasium). + Krysonism: + - expansion: 'The spores of a new rare mushroom occasionally spawns in maint: the + odious puffball! Gross.' + Nari Harimoto: + - bugfix: smart pipes will no longer occassionally be buggy when placing atmos pipes + across roundstart pipes + TiviPlus: + - refactor: Area based lighting can be varedited and changed now + Watermelon914: + - admin: Made admin only shells not interactable to non-admins + tralezab: + - imageadd: better fish and fish food sprites + wesoda25: + - bugfix: Repairing clothing now immediately updates the sprite +2021-08-27: + Nari Harimoto: + - bugfix: minor edits to some walls in icebox maint so all edges touch + Sealed101: + - bugfix: The long-presumed-missing CMO's rubber stamp has been returned to Delta + station's CMO office. Hail bureaucracy! + TiviPlus: + - bugfix: Fixed an exploit + bobbahbrown: + - admin: Add Requests Manager to view all prayers/centcom and syndicate requests/and + nuke code requests within a round. + esainane: + - spellcheck: The HFR now correctly describes the recipe cooling modifier as adjusting + the maximum cooling, rather than the minimum cooling. + - bugfix: Temperature Control Units now display their color when set or changed, + rather than always displaying as grey. + mokulus: + - code_imp: Treat DreamMaker warnings as errors in CI + timothymtorres: + - bugfix: Fixed crayon and spraycan text input to behave properly + tralezab: + - bugfix: Honorbound followers can now perform surgery. + - bugfix: Honorbound followers can no longer punch the innocents. + - bugfix: fixes heart attack message spam for synthetic organs! +2021-08-28: + Couls: + - rscadd: TGUI autolathe + - expansion: You can now input a custom amount to print(hard limit at 50 or maximum + stack size) + - expansion: Can now search and change categories while the autolathe is busy, line + up those designs! + Ghilker: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: error when typing the mole efficiency (instead of 0.1 it was 0.001, didn't push the change) - bugfix: infinite power consumption (capped) - bugfix: efficiency not being tied to laser tiers (issue connected to infinite power consumption) +<<<<<<< HEAD - refactor: Area based lighting can be varedited and changed now - bugfix: colossus bolts no longer instantly explode you if youre in a car/mech - bugfix: roundstart offstation antagonists such as wizards and nuke ops no longer @@ -893,12 +1468,35 @@ lay eggs as opposed to 10 seconds. qol: Spiders can see further in the dark now.' - spellcheck: Changed the wording on antag panel policy a little bit. +======= + tralezab: + - bugfix: fixes field generators not being interactable +2021-08-29: + Fikou: + - bugfix: colossus bolts no longer instantly explode you if youre in a car/mech +2021-08-30: + Arkatos: + - refactor: Cyborg Station Alerts UI now uses tgui. + - refactor: AI Station Alerts UI now uses tgui. + IndieanaJones: + - expansion: Spider nurses and broodmothers can now place down sealed webs by webbing + an already webbed tile, allowing them to make weak walls. + - qol: Tarantulas now use right-click to charge as opposed to a button ability. Said + button ability is now removed. + - balance: Spiders have received some slight balance changes to make them less oppressive + when they have the upper hand whilst letting them slightly handle atmos changes. One + major change is that broodmothers now take 15 seconds to lay eggs as opposed + to 10 seconds. + - qol: Spiders can see further in the dark now. + Y0SH1M4S73R: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Variables within an SDQL spell list variable can have their names changed without causing a cascade of errors - refactor: SDQL spell query execution has been moved to a component - admin: The parse error handling for SDQL spells has been improved significantly - admin: Projectile SDQL spells can now fire any projectile - admin: Touch SDQL spells can now use any touch attack item +<<<<<<< HEAD jjpark-kb: - bugfix: ashwalking should work for all of the plants now... not just plants with mutations @@ -914,3 +1512,62 @@ jjpark-kb: - rscadd: added spacevine spacewalking mutation - rscadd: spacevines allow you to spacewalk, similar to lattices +======= + esainane: + - bugfix: Smart pipes now calculate their direction properly, and construction code + checks direction logic properly. This fixes many problems with atmospherics + construction. + - bugfix: Smart pipe construction now no longer tries to work around irrelevant + pipes which are on completely different layers and do not interact with the + new pipe in any way. + - bugfix: Smart pipes with less than two allowed directions can no longer be built. + The pipe would be invisible, but still interact in weird ways. + - bugfix: One tile can no longer have more than one atmospheric component ready + to connect in the same direction and layer. This prevents the scenario where + a temperature pump is placed in a manner which looks like it's going to connect + to a horizontal bridge pipe, but actually turns the vertical plasma input pipe + behind it into a manifold, ruptures the connected plasma canister, and sets + Toxins on fire. + - qol: Smart pipes are now much, much smarter. During construction, if a smart pipe + would block placement of a component, it will see if permitted connectivity + can be reconfigured to make room for other components. This includes negotiation + with other smart pipes, preferring to create pipe crossings where available, + or create an opposing corner pipe if not. The RPD can now also reconfigure allowed + connectivity for existing smart pipes manually. Smart pipes can never be reconfigured + to have less than two allowed directions, and active connections cannot be reconfigured. + Automatic reconfiguration will never cause a smart pipe to permit connectivity + that was not previously permitted. + - bugfix: Multi-layer pipe components can trigger smart pipe negotiation where relevant. + - refactor: Rearranged some atmospherics pipe code. Fewer redundant loops, add and + use documented and centralized helpers for bit manipulation where sensible. + Make bitfield assumptions explicit. + - code_imp: made a small part of the documentation in the area less wrong dear god + my eyes the goggles do nothing + tralezab: + - spellcheck: Changed the wording on antag panel policy a little bit. +2021-08-31: + AMonekyThatCodes: + - refactor: Adds basic mobs, a replacement for simple mobs that will hopefully destroy + the subtype. This is so far applied to cockroaches (and their variants) + JohnFulpWillard: + - bugfix: Hardcore random traitors now get their hardcore random points for greentexting. + Mothblocks: + - admin: Admins can now give players a popup if they are not responding to tickets. + Shroopy: + - bugfix: Female uniforms now update color correctly. + - code_imp: Female clothing generation now takes greyscale_colors as an arg, which + is null by default if the clothing item doesn't use GAGS. + Y0SH1M4S73R: + - bugfix: Traitors that are unable to receive equipment required for specific objectives + will be able to order that equipment from the uplink. Other antagonists that + are unable to receive such equipment can call in a pod containing that equipment, + unless they somehow have an unlocked uplink on their person, in which case they + can order it from the uplink. + YakumoChen: + - bugfix: Naive clowns now worry less about their "sleeping" pets. + aaaa1023: + - spellcheck: fixed misspellings of "aggression" in the descriptions of Gelatinous + Ooze, NT combat defib and misspelling in heretic rust spell. + dragomagol: + - admin: gives brainwash victims a hud icon +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-09.yml b/html/changelogs/archive/2021-09.yml index 8c766bb83ca..c2993dda923 100644 --- a/html/changelogs/archive/2021-09.yml +++ b/html/changelogs/archive/2021-09.yml @@ -1,9 +1,29 @@ 2021-09-01: +<<<<<<< HEAD GoldenAlpharex: - bugfix: Cyborgs and AIs can now understand and speak all the languages the crew speaks at the beginning of a shift, with a few rare exceptions. - code_imp: Changed the Neo-Russkya and the Yangyu's typepaths to reflect their actual name. +======= + AlinaStarkova: + - bugfix: Maint areas have been cleaned up to properly cover maint, minor tiles + and airlocks which had space areas were fixed to have an actual maint area + ArcaneMusic: + - bugfix: Meat steaks now have protein as expected. + Ghommie: + - bugfix: fixes people catching fire when using jump or rocket boots to leap over + a gap of lava. + - refactor: refactored lava burn and weather immunities code. + - bugfix: Fixed the anti-drop implant not removing the nodrop trait on held items + if they're somehow dropped. + - bugfix: fixes wormhole jaunter portals floating in space. + - bugfix: balloon alerts no longer become transparent, scale up/down or get colored + alongside their holder. + - bugfix: Hostile mobs will always face their targets when shooting. + - spellcheck: Corrected a possessive case in the text of the ancient note found + in the ice library ruin. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Nanotrasen expert roboticists have found an error in cyborg programming which allows them to interact with things farther than they are supposed to. @@ -12,6 +32,7 @@ checks for range such. and hotkeys are also now respected with can_interact() - bugfix: the emitter area around the SM chamber now has APCs, so no more infinate power for the thermomachines and other equipment +<<<<<<< HEAD SkyratBot: - spellcheck: Corrected a possessive case in the text of the ancient note found in the ice library ruin. @@ -38,3 +59,964 @@ - bugfix: Hostile mobs will always face their targets when shooting. YakumoChen: - balance: Lowered the Brainwash Disk back to 5 TC +======= + Sealed101: + - bugfix: 'Tramstation: Restored the missing law office stamp. Hail bureaucracy!' + - bugfix: 'Tramstation: Replaced the Core AI module in RD''s office with an AI Core + circuitboard. You can actually build a new AI with this!' + - bugfix: 'Tramstation: RnD now comes with three Experi-scanners. You no longer + have an excuse for not scanning those toilets.' + - bugfix: 'Tramstation: Fixed a non-functional shutters button in left-side tram + underpass.' + - rscadd: 'Tramstation: Book manuals have been shipped to Robotics and Medbay Treatment + Center.' + SpaceDragon00: + - admin: Admins can click a category in the banning panel to toggle all checkboxes + within that category + esainane: + - spellcheck: Fix grammar when attacked by an unknown assailant + - spellcheck: Fix typo in Sparkler description + timothymtorres: + - bugfix: Fix staff of lava not terraforming lava properly + tralezab: + - bugfix: fixes a broken antag panel that rarely showed up + - bugfix: trash cannons now accept any oxygen tank, not just red ones + - bugfix: Any instance where you'd see "illusion" as a school of magic is now "translocation". + the illusion school has been dead for awhile now! +2021-09-02: + ArcaneDefence: + - bugfix: Plasmamen that have all of their limbs replaced with non-plasma alternatives + will not autoignite in flammable environments. + - bugfix: Moths have finally figured out how to finish eating clothes again, rather + than infinitely eating a singular sock. + GoblinBackwards: + - bugfix: Doors, reinforced windows, lockers, mass spectrometers and lockers can + now be attacked with right click + Timberpoes: + - bugfix: Fixes a logic error in ID cards which could cause their accesses to be + unintentionally overwritten. + - bugfix: Fix oversight allowing players to spam observers with notifications for + ghost roles. + magatsuchi: + - spellcheck: fixed a single typo + tralezab: + - spellcheck: going postal now uses the correct ui theme and isn't confused with + tiger cooperative +2021-09-03: + ArcaneDefence: + - bugfix: Opening a toilet's cistern will no longer strike the toilet with the crowbar. + BraveMole: + - bugfix: Fix dir delay when riding something and turning + CRITAWAKETS: + - rscadd: Added in a new sock type, Thigh-high and Knee-high ace socks. + - bugfix: Bee socks are now properly ordered in the code. + Fikou: + - bugfix: fixed non-combat mechs doing 0 damage + Fikou, PositiveEntropy: + - expansion: adds a gun circuit shell + - qol: to string circuit component should now see everything in normal view range + Ghilker: + - qol: RPD defaul pipe color is now green, grey has been renamed to omni and the + two colors are moved to the first and last places of the RPD ui + Ghommie: + - bugfix: Using a soulstone on a construct shell no longer destroys it and the shade + if no option for the construct mob type is taken. + - bugfix: Fixed the Bloodcrawl spell not ejecting users if somehow lost. + JohnFulpWillard: + - bugfix: traitors now get objectives again. + - qol: Cayenne can once again strip people. + - bugfix: Cayenne no longer deletes the nuke disk when putting it back down. + Krysonism: + - bugfix: fixed a few small sprites issues with the lobby menu. + TiviPlus: + - bugfix: Mechs with no damage will no longer punch + - bugfix: Fix atv covers not appearing + Watermelon914: + - bugfix: Fixed scanner gates not functioning when anchored and also fixed their + examine text not saying they need to be anchored. + esainane: + - bugfix: Vent and scrubber names once again contain their unique ID tags + - bugfix: When something is disconnected from a smart pipe, the smart pipe now immediately + frees up connectivity in that direction for other pipes or components to use. + maxymax13: + - imageadd: resprited pens and paper bins + - imageadd: four color pen now has a sprite +2021-09-04: + Ghommie: + - bugfix: bees, hivelord, its brood and legion skulls no longer use the MOUSE_OPACITY_OPAQUE + setting that makes the invisible portions of their icons count toward mouse + clicks, which can get in the way of players trying to click stuff below their + layer. Instead, to be easier to click on, they use a component that gives them + a near-invisible underlay. + - bugfix: Fixed the protect objective always failing. + TiviPlus: + - bugfix: patched mechs being slow randomly after phasing + Watermelon914: + - refactor: Refactored how components are triggered and how ports can now be ordered. + aaaa1023: + - bugfix: Mice no longer become invisible when splatted by a mousetrap. +2021-09-05: + Ghommie: + - code_imp: Replaced the MATERIAL_NO_EFFECTS material flag with MATERIAL_EFFECTS. + - bugfix: No more gazillions of atoms having the beauty element. + - bugfix: Fixed mindshield implants not retroactively working against slime or mansus + links. + - bugfix: Fixed stargazers that were either mindshielded, dead or protected against + psych magick by the time they became what they are not receiving the slime link + speech ability. + - bugfix: Stargazers will no permanently longer lose their slime link speech ability + upon death. + - bugfix: Fixed a regression that removed easy access to milk cartons from skeleton + pirates. + GoldenAlpharex: + - qol: The pAI signaler is now a proper internal signaler and will feel much easier + to use. + - bugfix: Fixed the pAI Host Scan being unable to work from within a PDA or anywhere + that wasn't your hands or your pockets. + - spellcheck: Fixed typoes in the pAI interface related to signaler being written + "signaller" + - code_imp: Improved the pAI code, mostly around the softwares. + MrStonedOne: + - bugfix: Discord new round notifications will no longer come shortly before the + round starts. You should now have enough time to actually ready up before round + start. + Nari Harimoto: + - bugfix: Emergency Access can no longer be spammed to cause sound and text pain + - bugfix: you can no longer print from a protolathe at a distance, and the operating + computer tgui will grey out if you walk away again + - bugfix: Admins can now use their godly powers of AdminGhostAI to interact with + every machine again + Sealed101: + - bugfix: Detective vests can store detective's (and nukeops agent) holsters. + Timberpoes: + - bugfix: Maint sect night vision eyes trait now correctly make your eyes show as + glowing an unnatural red when examined instead of doing nothing. + - qol: Tweaks the logic for the cultist glowy red eye trait, allowing admins to + add this to players to make them appear as if they were cultists when examined, + without actually forcing them to make that person a full blown cultist. The + cultist glowy red eye message has been modified as a result, and now examines + as "... glowing with an unnatural red aura!" + aaaa1023: + - qol: Defib mounts are now removed from the wall by right clicking with a wrench + while not on combat mode. + - bugfix: You will no longer smack defib mounts when removing them from the wall. + tralezab: + - rscdel: You can no longer store dice in pill bottles and pills in dice bags. + - bugfix: fixes getting scared of dice bags if you have a medical phobia. +2021-09-06: + ArcaneDefence: + - balance: Projectiles fired by the watchers on lavaland will now deal damage and + apply a short slowdown to carbons. + EOBGames: + - balance: Ethereals can taste again. + Fikou: + - admin: ticket panel is wider, resolve button should now stay on the same line + Ghilker: + - qol: better hfr ui + - bugfix: rclick on gasmasks removes filters + Ghommie: + - expansion: Space pirates now speak Piratespeak. + - bugfix: The transparent area of the image used by imaginary friend mobs should + no longer catch clicks. + - spellcheck: Rectifies the name and description of the cryostylane inverse chem. + Imaginos16: + - imageadd: Improves the Display Case sprite, giving it a fresh new 3/4ths perspective! + Improvedname: + - rscadd: You can now easels with 5 wood + - rscadd: RD/Roboticists/Cmo/Doctors can now buy a syndi brand MMi from their uplink + for 2 tc + - bugfix: Gibbers now produce 3 pieces of meat at tier 1 again + Melbert: + - bugfix: Some invisible chaplain weapons are now visible again + - bugfix: Durathread, Jupiter Cups, Fairy Grass, and a few other plants can no longer + hard species mutate into themselves. + Ryll/Shaps: + - qol: Most of the byond donator ghosts that don't drastically change the ghost + shape can now have hair and accessories like the plain white ghosts + Sealed101: + - bugfix: Better tools now deconstruct blast doors and shutters quicker like they + actually should. Each deconstruction step now provides a message upon completion + as well as uses the tool's sounds! + Seris02: + - bugfix: fixed fake artefacts so they look real + Timberpoes: + - admin: Added a new smite for admins that allows them to give any mob a permanent + imaginary friend of the admin's choosing, including additional customisation + for the looks allowing the imaginary friend to take on the appearance of the + player inserted into it. + Wallem: + - rscadd: You can now pour ants back onto the ground, with the more ants you pour + leading to more damage! + - balance: Ants now do more damage, however they require more sugar in order to + breed. + - imageadd: The ant decal now has a couple shiny new sprites! + timothymtorres: + - bugfix: Fixed xenos will now take damage while in crit state + tralezab: + - bugfix: fixed traitors randomly spawning incredibly bugged. +2021-09-07: + AlinaStarkova: + - expansion: You can now set an Airlocks name and cycle ID in the RCD airlock settings + menu, or by clicking on an airlock control board and making an airlock manually, + this allows you to make airlocks that can cycle with each other. examine an + airlock to see what, if any, ID they are set to cycle on (linear 1x3 airlocks + to space currently do not use cycleIDs) + Ghilker: + - expansion: HFR - different fuel mixes will have different meltdowns (higher the + effort, bigger and badder the result) + Nari Harimoto: + - qol: Disposals mapped into every map have been redone from the ground up to be + fully functional and usable + - bugfix: All of Disposals now works, no infinate loops, no random pipes shooting + into a room, no sections inaccessible due to a wrong junction + QuarianCommando: + - expansion: Added five new table variants - Plasmaglass, Reinforced Plasmaglass, + Reinforced Glass, Plastitanium Glass, and Titaniumglass. + - bugfix: Attempting to create a table with the aforementioned materials will no + longer result in a normal metal table. + Ryll/Shaps: + - bugfix: Disposal outlets no longer constantly shoot you out at an incredibly dangerous + speed, and no longer deal a base 35 damage + guaranteed dislocation/likely hairline + fracture when you hit a wall or other person. Instead, they're back to the old + 10 brute damage they were at last year, though you can still multitool/emag + them to make them shoot out things faster.... + SpaceDragon00: + - bugfix: Firelance can no longer be used when out of battery + Watermelon914: + - expansion: Adds instant circuit components that execute instantly and are colour-coded + orange to be used in handling events. Adds an airlock access event to determine + who is able to open a door. + Y0SH1M4S73R: + - bugfix: Admins will no longer receive erroneous SDQL spell parse errors when loading + a json file that contains projectile var overrides or touch attack var overrides + tralezab: + - rscadd: Pig Latin mutation +2021-09-08: + CodeMonkey: + - bugfix: Robot tourists now stop attacking you after they show you who's boss. + Colovorat: + - expansion: You can place hats on plasmaman helmets! + Couls: + - admin: individual logging now displays things that happened to the individual + again + ExcessiveUseOfCobblestone: + - admin: you can now customize what udders produce using `reagent_produced_typepath` + or by using the `custom_milk_reagent` argument when adding the component + Fikou: + - admin: individual logging is now visible even with client logged out + Ghilker: + - qol: HFR moderator injection and fuel injection are now controlled separately + - qol: 'HFR : now you can choose multiple gases to filter from the moderators instead + of just one and also the rate of filtering and you can filter even at power + level 6. The rate is tied to the numbers of gases, so if you scrub at 200 moles/tick, + and you have 5 gases selected, you''ll be actually filtering at 40 moles/tick + so be aware.' + Mickyan: + - qol: Double examining someone will show their age, provided their face is visible + Nari Harimoto: + - bugfix: Slime console can now use its hotkey to scan slimes and drop/pickup monkies + TemporalOroboros: + - bugfix: Jack-o-lantern helmets now glow in the dark when they are worn. + Watermelon914: + - balance: Disables wrenching on money bot and scannter gate shells when they are + locked. + aaaa1023: + - rscadd: Penthrite now has Balloon alerts for when it first starts processing and + when it finishes processing. + tralezab: + - refactor: refactored some behavior in pride hammer and carp'sie plushie, you may + notice a few more examines and error messages for fail cases but otherwise it's + all the same +2021-09-09: + Ghommie: + - bugfix: Fixed the chat messages for stepping on objects with the caltrop component. + No more "You step on the floor!". + Nari Harimoto: + - bugfix: machines can be dragged with CtrlClick again + Sealed101: + - bugfix: RnD discount experiments now reduce the proper amount of points needed + instead of gradually growing into a 100% free tech node. + - bugfix: Basic Cytology Scan Experiments no longer ask for Unknown fluids instead + of mice. + TiviPlus: + - admin: /area/var/static_lighting proper varedit support + esainane: + - bugfix: When reprogramming a smart pipe to permit more directions, the smart pipe + will now immediately connect in any newly allowed direction, rather than only + connecting when a component is newly placed. + - bugfix: The RPD now correctly reprograms smart pipes to more restrictive states. + tralezab: + - rscadd: You now store some events as mini stories in your head! + - rscadd: You can engrave said memories onto walls with a chisel! +2021-09-10: + Ghommie: + - refactor: Refactored batons and stunbatons code. Stunbatons are now a subtype + of batons. + - code_imp: Removed some batons copypasta. All batons share the same anti-dual wielding + abuse code now. Replaced some old anchored checks for teleprods with move_resist + ones. + - bugfix: Fixed clumsy checks for teleprods stunning the user twice. + - bugfix: Fixed teleprods not teleporting living mobs that aren't xenos or humans. + - balance: TRAIT_STUNRESISTANCE now affects all batons and not just stun batons. + - bugfix: Fixed a money generation exploit with the roulette machine. + ORCACommander: + - bugfix: fixed as slew of failed to validate config setting errors + - rscdel: Removed deprecated config flags + - server: game_options.txt has been updated + esainane: + - bugfix: The tgui color helper now properly handles partially transparent values. + stylemistake: + - refactor: Performance of core tgui components was improved (Button, Icon, Flex, + Stack). UI should feel a tiny bit faster. + timothymtorres: + - bugfix: Fixed wormhole jaunter to trigger when falling into a chasm + - bugfix: Fixed wormhole jaunter to be affected by EMP +2021-09-11: + ArcaneDefence: + - bugfix: Full tile windows that have become opaque from being painted a dark color + will now lose their opacity when repainted with a light enough color + Gamer025: + - bugfix: Crafting stackable items while already holding an existing stack of them + no longer causes runtimes + Ghommie: + - bugfix: Fixed a small irregularity in the outline glow of the `p` of the character + setup button when highligthed or pressed + Guillaume Prata: + - qol: You can now use the shock touch mutation as a ghetto alternative for revival + surgery. Just like stun batons! + - qol: The analyzer was renamed to gas analyzer and it can be printed at the Engineering/Science + protolathes now. + Sealed101: + - bugfix: Fixes screwdrivers not being recycle-friendly in the autolathe. + - qol: Moves screwdrivering an autolathe's maintenance panel open to right click. + - bugfix: Fixes being able to feed the autolathe when its maintenance panel is open. + carrotattacker, Sampslig: + - rscadd: Adds the juice, a drink that lets you see bluespace rifts and travel through + them + esainane: + - bugfix: Round setup hints and circuit board descriptions that mention production + of research points through power generation no longer appear. This functionality + was removed a long time ago. + timothymtorres: + - expansion: Supernatural phobia now includes more wizard objects, spooky mobs, + and haunted objects. + - expansion: Clown phobia now includes bananium objects and honk related simple + mobs. + - expansion: Phobias can be triggered from related stamps, toys, statues, and megaphones. + tralezab: + - qol: TGUI-ifies apprentice contracts. Yummy! + - bugfix: soul shards now properly remove antag when exorcised +2021-09-12: + ATHATH: + - bugfix: Dreaming is now less rare. + CodeMonkey: + - bugfix: Fixes parallax animations + Fikou: + - admin: adds infinity to vv classes + Mothblocks: + - bugfix: The R&D console has been given back its tooltips + - bugfix: Fixed RPD arrows, strip menu eyes, etc not being styled properly. + Nari Harimoto: + - bugfix: you no longer hit space heaters when wrenching or screwdrivering them + dragomagol: + - qol: removed reinforced walls under grilles in space on Meta and Delta + esainane: + - bugfix: The HFR no longer yeets all iron content given scraps of Oxygen. + - bugfix: The HFR now burns Oxygen proportionally to the amount of iron content + removed when appropriate. + - bugfix: The HFR using Oxygen to mitigate iron content buildup now properly respects + delta time. + - qol: The HFR interface now lists recipes in a more sensible order. This is sorted + by maximum temperature, which also roughly approximates difficulty and desirability. + - bugfix: The HFR interface now lets you toggle waste removal at power level 6, + rather than merely having it permitted in the backend. +2021-09-13: + Fikou: + - bugfix: server restarting stuff uses alert instead of tgui alert + kopoba: + - spellcheck: Nanotrasen recount blood packs in cargo order now its match reality +2021-09-14: + Ghilker: + - spellcheck: fixed airlocks id from entrence to entrance + Nari Harimoto: + - bugfix: kilostation now has an unlocked mix chamber air alarm, 3 cores in the + launch room, the telescreen can see the test site, and a fancy launch controller + - bugfix: icebox disposals no longer spits trash on the mailroom floor +2021-09-15: + Mothblocks, Floyd on lots of the design: + - refactor: The preferences menu has been completely rewritten in tgui. + - refactor: The "Stop Sounds" verb has been moved to OOC. +2021-09-16: + AMonkeyThatCodes: + - admin: Admin only menus now have a new SVG background + ATHATH: + - bugfix: The negative moodlet from being held at gunpoint will no longer last indefinitely + under certain conditions. + AccountName5: + - balance: Temperature pump power consumption no longer increases exponentially. + Removes maximum operational temperature as it is now obsolete. + - bugfix: Fixed temperature pump exploit. It should no longer treat output as having + a much lower heat capacity than it actually has. + ArcaneDefence: + - bugfix: Magmawing watchers do not apply a slowdown any more. + Burgerman, tralezab: + - bugfix: You can now see the nuke code in your memories + Burgermancoding: + - expansion: Adds plates to the autolathe + Couls: + - bugfix: restored lighting to areas that were supposed to have it + Fikou: + - refactor: turns stickmen into basic mobs + - balance: wizard paper robe now makes stickmen hostile to things that arent stickmen + and arent you + - bugfix: observe button now works even if your tgui doesnt + FlamingLily: + - bugfix: Narsie no longer stops the shuttle leaving from beyond the eldritch grave. + - bugfix: RPDs now have four different directions to choose from once again + - expansion: You can now feel pain when having surgery done on you while you're + conscious. Oh god. + Gamer025: + - bugfix: RCDs end their attack chain early now + Ghommie: + - admin: Fixed the Everyone Is A Traitor admin button not affecting latejoins. + - balance: Lowered the cost of the obsessed midround ruleset from 10 to 3. + Guillaume Prata: + - bugfix: Removes some of the odd items that didn't have an icon from the Janitor's + winter coat suit store and fixes Security's ones being unable to hold the base + items like internals. + - qol: You can now toggle a space heater on/off with right click. + JohnFulpWillard: + - spellcheck: Being shoved into a disposal unit tells you who shoved you in, rather + than saying you shoved yourself. + KRVH: + - spellcheck: Removed the extra 's' in the food/drug eating verb. + Mooshimi: + - admin: admins are now alerted when miasma, freon, and co2 canisters are opened, + and are informed of the contents of canisters containing dangerous gases in + general, not just the spooky gas on its own. + - code_imp: added overall logging for all canisters opened + - balance: lowered disco ball's max volume + Nari Harimoto: + - bugfix: the aux base console now wont block an empty tile + SishTis: + - rscadd: If a human mob speaks with a language their tongue counts as native one + (like draconic for forked tongue), their speech will sound normally. + TemporalOroboros: + - balance: Tank explosions (the kind used by TTVs and singlecaps) now take tank + volume into account as well as scale faster at low pressures and much, much + slower at high pressures. + - balance: The research doppler array in toxins now grants more points at lower + explosion ranges. The maximum cash generation is practically unchanged though. + - balance: The blastcannon has experienced negligible net change to its range given + bog-standard TTVs. + TheSmallBlue: + - bugfix: pressing the close button while entering a mob as a ghost will no longer + force you to become that mob. + - bugfix: you can no longer ghost and re-enter posibrains indefinitely. + Timberpoes: + - bugfix: Attacking something after you've deactivated the Chameleon mutation or + changeling Chameleon Skin power should no longer turn you partially transparent. + - bugfix: Fixed an issue with ping display that could cause display and chat errors + on exceptionally long shifts. + - balance: The Odysseus no longer fires magical syringes that only react their contents + when the target is hit. It now fires syringes that react as soon as your fire + your Ody's syringe gun. You have been warned. + TiviPlus: + - bugfix: Fix space lighting with lattices + Wallem: + - bugfix: Flyswatter can now swat ants + esainane: + - bugfix: The HFR will now once again use warning colors on the iron content indicator + when dangerous levels of iron content are present. + - qol: When configuring smart pipes, the RPD will now only spark if the configuration + actually changed, and the RPD now provides feedback if configuration couldn't + change. + - bugfix: The HFR interface now uses correct units, and avoids references to tickrate. + - bugfix: The HFR no longer rapidly absorbs all available fuel from the fuel port + at rates far exceeding the fuel injection rate. + - bugfix: You can no longer leave HFR moderator injection uninteractably on with + cooling disabled. + - spellcheck: Fix truely -> truly in a tip of the round + lyricalpaws: + - qol: Adds a new mention to the epinephrine pens about allergies + oranges: + - rscadd: Added french kissing to the game + sqnztb: + - bugfix: Fluid ducts now properly start as "omni" instead of "grey." + - bugfix: fixes a bad icon state for filled mid_joiners + zxaber: + - balance: 'The cyborg emergency reboot module is now reusable. sound: The cyborg + emergency reboot module will now make a different sound when rebooting AI shells + or borgs without a ghost.' +2021-09-17: + JohnFulpWillard: + - bugfix: Malf AI's who shunt onto an APC can once again be tracked by the nuke + disk pinpointer. + Watermelon914: + - admin: Adds the signal handler circuit component. + - qol: Big dropdowns on the integrated circuit ui will now expand when opened. + - bugfix: Fixed any ports returning a string if set to the value of 0. + - admin: Admins can now save custom shells from integrated circuits. + Zytolg: + - bugfix: Removes the spare stool from the Icebox Theater. + ninjanomnom: + - bugfix: Shamebrero and maybe some other greyscale icons flashing have been fixed +2021-09-18: + AccountName5: + - admin: Revenant emag now logs correctly. + - bugfix: 'Roulette: You no longer win when betting on even and rolling 0.' + Arkatos: + - bugfix: Station alert console will now always show a correct icon when an alert + is added or cleared. + - bugfix: Station alert console and Canary application icons will no longer get + stuck in an alert mode forever. + Ghommie: + - bugfix: Fixed betting on singles never paying out if the chosen number is 0. + Guillaume Prata: + - qol: Engineering, Atmos and the CE's tablets come preinstalled with Canary (Alarm + monitor) now. + JohnFulpWillard: + - qol: Clown operatives have been split from Nuclear operatives in the antagonist + preferences menu. + - qol: The nukie preference icon's background nukies no longer overlap with the + main nukie, and a nuke has been added. + - bugfix: Agent IDs and other similar Chameleon gear can no longer be used/forged + while you have your hand blocked and/or are in critical condition. + LemonInTheDark: + - admin: Putting pdas/paper up against cameras is now logged. Not what is actually + written, I'm too scared of people injecting war and peace into the game logs + section of a log panel, but you'll be able to tell em off for spamming the poor + ai with messages + Melbert: + - rscadd: Icebox Chemistry Lab is now multi-z'd, with maintenance changes to match. + - bugfix: fixed a maintenance door in the icebox HFR room that had the wrong access + / name + Mooshimi: + - bugfix: GODMODE dummies can no longer be deafened by flashbangs + - rscadd: added disposals blast door at the end of tram disposals + Pepsilawn: + - admin: Mobs being forced to say things through ingame sources or admin magic will + now show up correctly in logs if whispered. + Sealed101: + - bugfix: Liquid Electricity blood packs in blood freezers now have proper labeling. + - bugfix: Donating Ethereal blood to a new bag now also properly labels it. + - qol: Balloon message upon labeling your blood pack with a pen for more clarity + Seris02: + - bugfix: hopefully fixes pellet clouds only spawning one projectile + Watermelon914: + - admin: Adds admin input requests circuit component + esainane: + - bugfix: The HFR now actually consumes oxygen used to mitigate iron content + tralezab: + - qol: Converted slaughter demons (and their friends) to antagonist panels + - expansion: Adds the Sparring God as a new sect! + - rscadd: MOONICORNS. Watch out for their horn! + - refactor: during a code refactor for cow, they may be SLIGHTLY faster or SLIGHTLY + slower as an accidental result +2021-09-19: + Ghommie: + - balance: 'Replaces the hardcoded material restriction for exporting protolathe + designs to autolathes with a variable that does the same when set FALSE. Energy + bolas, gun part kits, tele shield, enegy bolas and jaws of life currently have + it set FALSE. TL;DR: You can export designs like bluespace cells to autolathes.' + - qol: Added a chat feedback when unable to import designs to autolathes. + Ryll/Shaps: + - balance: Bone wounds in general have been made less obnoxious, especially when + suffered on the legs. Instead of limping every step with that leg, you now have + a chance to limp each step with that leg that scales with the severity of the + wound. Putting your leg in a sling also reduces this limp chance per step, in + addition to reducing the delay the limp adds. + - balance: Skeletons and plasmamen can now apply bone gel directly to fractured + limbs, take no damage from applying this fix, don't need surgical tape, and + recover 4x as fast as fleshy humans do from these improvised fixes. Shine on, + you crazy bone-bags! + - balance: Sticky tape (and especially surgical tape) makef for much more effective + slings than before, with surgical tape even outshining gauze. + - spellcheck: Adjusted some bone wound examine descriptions to be more obvious what + they represent + Timberpoes: + - bugfix: Fixed an oversight/exploit allowing the nuke disk to be removed from station + z-levels. + - admin: Improved the warnings for when stationloving objects such as the nuke disk + get relocated. + - admin: Expanded explosion logging should now make your day a little bit brighter. + Watermelon914: + - qol: Heretic now has an antagonist panel + necromanceranne: + - code_imp: Added an argument for the decomposition component that allows for specifying + what kind of item something decomposes into. + - bugfix: Space ants no longer prey upon chickens and their produce. + - rscadd: Includes some examples from existing food and a new kind of food. Moldy + bread, moldy pizza slices, rotten eggs and moldy dead mice. + tralezab: + - bugfix: fixed one small runtime with sparring sect +2021-09-20: + JohnFulpWillard: + - bugfix: Maintenance sect's adapted eyes will no longer render you permanently + blind despite having them repaired via the darkness. + Kevinz for Citadel, who was ported to TGMC by XSlayer300, now ported to tg by Ryll/Shaps: + - rscadd: Text modifiers have been added! You can now |italicize| _underline_ and + +bold+ your messages. + LemonInTheDark: + - bugfix: Imaginary friends will show up properly again + Mothblocks: + - bugfix: Fixed FPS preference not applying after reconnect. + Pepsiman0: + - bugfix: holosword doesnt have blockchance + TiviPlus: + - bugfix: fixed lighting bug + Watermelon914: + - qol: BCIs only come with 1 bci action component and it is now removable. + - balance: Devastating explosions will now deal damage equivalent to 40% to 75% + of a dragon's max health. + - balance: Carp rifts will no longer be instantly destroyed to devastating explosions. + - qol: Allows you to interrupt delay components and makes it so that it cannot queue + multiple delays. + carshalash: + - bugfix: adjusted arnold palmer recipe to be made with iced tea instead of hot + tea. + esainane: + - code_imp: The tgui ProgressBar can now accept color specifications in hexademical, + rgb/rgba, color-\ class, and base CSS named colors. + - bugfix: Add missing gas color mappings to tgui, and disambiguate old mappings. + Exotic (and mundane) gases in the SM monitor and HFR interfaces have never been + more colorful! + - bugfix: The HFR now actually produces T3 gas at Fusion Level 2, provided you have + enough plasma in the moderator + tralezab: + - bugfix: some small critters that should have been able to fit in the vim but couldn't, + now can +2021-09-21: + Ghommie: + - bugfix: Certain memories should no longer be added to mobs that are unaware of + them (almost always unconsciousness, in some cases blindness and/or deafness). + - bugfix: stun-harm-batoning for stunbatons has been fixed. + GoldenAlpharex: + - bugfix: Flowers now properly display on people with mutant ears, meaning that + they no longer hide within cat ears anymore. + - bugfix: Welding goggles no longer hide in your hair when you pull them up, they + will now properly display above your hair (and mutant body features if you have + any). + - code_imp: Glasses and headwear can now appear over hair and all mutant body features, + meaning that they shouldn't get wrongly hidden anymore. + Guillaume Prata: + - qol: The atmos holofan barrier has a new animation and is slightly transparent + to easily convey that you can move through it. + Krysonism: + - bugfix: Mega arachnids can snare people again. + Mooshimi: + - bugfix: Fixes a missing piece of pipe on Icebox + Timberpoes: + - bugfix: Things pushed via bumping into them now get fingerprints and admin-viewable + hiddenprints added to them. + TiviPlus: + - code_imp: changed some turf changing code remember to report bugs + Zytolg: + - bugfix: The Icebox Mining Basement Levels now utilize power and air provided by + the main station. Some areas were changed to accomplish this. + - bugfix: The Icebox Mining Basement Levels now utilize pipe layers 2 and 4 instead + of the improper 3, and 4. + - bugfix: You can now use the B-2 level of Icebox mining safely and reliably, a + new, quaint layout affords miners easy access to the B-2 exploration Z. + - bugfix: Due to the extent of the alterations on for mining's B-2 level, the B-1 + level has received some upgrades as well. Please look forwards to them. +2021-09-22: + Fikou: + - balance: If you are on Combat Mode, your bullets no longer pass through prone + people + Ghommie: + - bugfix: Fixes evolved xenos deaths being broadcasted in dchat with the old larva + name . + - bugfix: Fixed hitting people accidentally with food if their mouth is covered + or if they can't otherwise consume food. + Guillaume Prata: + - bugfix: Space heater actually turns On with right click now, for reals this time! + Krysonism: + - imageadd: The mega arachnid's flesh snare now has a visible sprite. + Mothblocks: + - server: MOTD is now read sequentially in configuration, allowing for multiple + MOTD files. + - bugfix: Quirks being removed/renamed/rebalanced will no longer break your quirks + menu + MrZoraman: + - spellcheck: Fix the grammar for the message shown when appraising great art. + Watermelon914: + - expansion: Adds the "speaker name" port to the voice activator circuit component + - admin: Admins are no longer able to bypass proccall protections using remote methods + of proccalling. + - bugfix: Ntnets are now type safe again. + - bugfix: Fixed progress bars appearing white. + axietheaxolotl: + - rscadd: Added new CC armour suit, with accompanying helmet and gasmask + - rscadd: Added suit storage that contains this new armour and gasmask. + - expansion: Expands on the old CC armour suit + - imageadd: added some sprites for da drip + necromanceranne: + - bugfix: Fixes pizzas not being able to be processed. + remuluson2: + - rscadd: Electric razors can now be printed at any lathe. Its in medical section. + - rscadd: Electric razor can be bought from the library vendor. + stylemistake: + - bugfix: 'tgui: IE8: Removed "iefix" css classes from Flex elements which resulted + in unusable layout in complex UIs, such as tgui prefs.' + - bugfix: 'tgui: IE8: Fixed button clicks.' +2021-09-23: + EricZilla: + - expansion: Updated old GAGS colors for the PDAs based on user feedback + - imageadd: Updated appearance of the Survival Pen + - expansion: The Quartermaster now starts with a Survival Pen because its flavorful. + Survival Pen has also been updated to use the fancy font, since, its fancy. + Ghilker: + - bugfix: fix scrubbers/vents/injectors/etc from being able to be placed on all + layer on the same turf + Ghommie: + - bugfix: The weapons authorization setting for turrets will now check for weapons + on targets without a chameleon identification card instead of those with either + a chameleon ID or no ID at all. + Krysonism: + - expansion: Leapers, mega arachnids, queen bees, frogs and walking mushrooms can + now be grown using cytology. + - expansion: A neglected fern, once collected on nearby jungle planet, can sometimes + be found in maintenance + LemonInTheDark: + - bugfix: Fixes a rare case of new players being unable to move + MMMiracles: + - rscadd: Tramstation's Security and Service wing has been flipped around. + - rscadd: Tramstation's commissary has been placed above in the central wing beside + the kitchen. + - rscadd: Tramstation's EVA and Gateway rooms have been adjusted. EVA now has one + extra suit storage unit. + - rscadd: Tramstation's maintenance near the Service and Security wing has had reworked + layouts. + - rscadd: Tramstation's asteroid now leaves behind breathable turfs so digging out + a room isn't as tedious. + Mothblocks: + - bugfix: You can now bind Ctrl/Alt again. + - bugfix: Fixed the quirks list in the preferences menu sometimes being empty. + - admin: Added a panel for editing station traits. + TheSmallBlue: + - rscadd: Added the Proximity Pinpointer component, get the coordinates of any entity! + (As long as its in view) + Timberpoes: + - admin: Adds a couple of missing traits relating to cult and bloodshot eyes to + the Modify Traits VV dropdown menu for mobs. + Y0SH1M4S73R: + - admin: The Set Var, Get Var, Proc Call, and Signal Handler admin circuit components + now use a "datum" datatype for their "Target" port. The "datum" datatype can + accept inputs from "atom" ports, and can be safely cast to the "atom" datatype + using the typecasting component when necessary. + - admin: The Get Var component now has an option port used to select the expected + datatype of the obtained var. Similarly, the Proc Call component now has an + option port used to select the expected datatype of the proc's return value. + Both of these options default to "any" + grimm-hollowknight, ported by tralezab with a few overlays: + - imageadd: New borg sprite, from Yogstation! + necromanceranne: + - bugfix: Stickmen flatguns now properly drop out of your hands when picked up, + as intended. +2021-09-25: + Fikou: + - bugfix: The Qualified Doctor skin for medborgs is now not the only option + Iamgoofball: + - bugfix: Fixes the logging text on respawn to correctly say it's respawn instead + of "abandon mob" + Maurukas: + - bugfix: Mapped in atmospheric tanks will now connect to pipenets in the appropriate + direction + - bugfix: Icebox, Runtime, and a number of ruins have had their gas tanks rotated + or repiped + Qustinnus: + - bugfix: Oozes can now eat food again + tralezab: + - bugfix: Fixes malfunctioning bots breaking when they ordered from the bar. Uh... + oops! + - expansion: Admin fully immerse smite now reminds the victim to roleplay correctly +2021-09-26: + Guillaume Prata: + - bugfix: Huge scrubbers will use their own sprite instead of their little brother + one. + Krysonism: + - bugfix: The crate spawner spawns full crates rather than empty ones again. fix:The + neglected fern can actually spawn now + - bugfix: The neglected fern now has the standard 2-4 cell ines per sample rather + than 1. + Melbert: + - bugfix: Telescopic shields are bulky again when extended, and the balloon alerts + are shorter + MetalClone: + - rscadd: Added the handlebar moustache, available in the character setup + - rscadd: Added the handlebar moustache 2, available in the character setup + - imageadd: added both handlebar moustache icons + Mothblocks: + - bugfix: Fixed not being able to disable specific antagonists randomly. + Timberpoes: + - bugfix: Players can once again select AI eyes and blob eyes from the various orbit, + observe and jump menus. + - rscdel: Removed the research note download objective. + - rscadd: Added new master R&D servers to science departmental server rooms. This + server cannot be deconstructed via ordinary methods. This server cannot be rebuilt + if destroyed and cannot be repaired if sabotaged. If destroyed or sabotaged, + research point gain is halved for the rest of the shift. + - rscadd: Added a new antag objective for traitors and lings to steal the hard drive + from a master R&D server. Any other antag can steal it too, for fun. But only + traitors and lings and things that get traitor or ling objectives can get it + as a dedicated steal objective. + - rscadd: Added a new objective for the space ninja and interactions allowing them + to destroy the drive in the master R&D server or set the current research points + back to 0. Both of these interactions alert the AI and are performed by using + the gloves on an appropriate R&D server. + Watermelon914: + - qol: List Literal can now increase/decrease the amount of input ports from within + the UI now. + - qol: Module components can now have their integrated circuit and UI accessed from + within the integrated circuit. To add circuit components, the module still needs + to be disconnected. + - qol: Connecting ports together will feel more responsive especially if you have + bad internet speeds. + - qol: Circuit variables UI has been revamped and made better. You can now drag + and drop the setters and getters for each circuit variable and it will no longer + automatically close when you move the background. It also takes up less of the + screen. + - qol: The integrated circuits UI when initially opened will now be bigger. + - qol: You can now click to connect ports again + necromanceranne: + - admin: Meteor guns do damage once again. + tralezab: + - rscadd: Hauntium can now be worn by the undead! +2021-09-27: + CRITAWAKETS: + - bugfix: Gets rid of the placeholder alien bed and replaces its appearance in Snowdin + with the proper alien bed. + JohnFulpWillard: + - bugfix: Traitors who aren't given codewords will no longer notice them when said + or have them in their antag menu. + Mothblocks: + - server: 'Added a new word filter configuration: word_filter.toml, which can specify + *why* words are banned.' + - bugfix: Emotes are now properly filtered. + - qol: For players, you will now see which word you said was filtered. + PositiveEntropy: + - imageadd: All folders are now resprited! + Ryll/Shaps: + - rscadd: Added a new achievement for cultists who like to mess with NT's shuttle + corps, "WHAT JUST HAPPENED". + Sheits: + - imageadd: resprites the smoke, forcewall, lightning and blind spells + Superlagg: + - qol: Paper bins now can directly insert their contents into computers. + - qol: Greatly reduced click cooldown on paper bins. + - qol: Paper bins can now pick up papers by clicking on them. + remove32: + - admin: now logging when you update available jobs! +2021-09-28: + Fikou: + - rscadd: Secret Gateways can now be a thing enabled by config. They are not on + the repository, instead, loaded from a config folder. + - rscadd: Adds the secret and anti-phasing z level traits used by Secret Gateways, + secret prevents observers from looking at the z level in any way other than + observing through another player's eyes + - admin: admin loaded away missions can be secret as well + Ghilker: + - bugfix: fix gases not having an overlay + Ghommie: + - qol: You can now use backslashes to escape say text modifiers (e.g. a\\+b\\+c + = d will be outputted as a+b+c instead of abc with the middle letter b bolded). + - qol: Two new tips of the round, both concerning say"" syntax. + JohnFulpWillard: + - admin: Admins can now cancel out of sending an announcement. + JosephJomama: + - qol: You can now adjust shaft miners' jumpsuits to expose their chest. + - imageadd: New sprites for adjusted shaft miner's jumpsuit. + - spellcheck: The cargo tech jumpskirt now has correct punctuation. + Mothblocks: + - balance: The minimum threat for traitor related rulesets to be considered running + has been lowered to their cost. + Ryll/Shaps: + - admin: You can now ping other admins (or whatever other roles) in asay by using + @theirckey in your message + tralezab: + - rscadd: Hand a monkey an instrument. It'll play a cool song! + - qol: sparring sect now has an info button in the top right of the contract menu +2021-09-29: + Arkatos: + - bugfix: Templates in the Plexagon Access Management app will now show correctly. + CRITAWAKETS: + - bugfix: Auxiliary base construction consoles now work, instead of deleting the + drone before it exists. + Fikou: + - bugfix: secret recipes are now actually secret + - admin: renames enable debug verbs to enable mapping verbs + Krysonism: + - expansion: Added new food, envirochow; it permanently increases the max hp of + animals. + Mooshimi: + - rscadd: shuttle windows can now be deconstructed + Mothblocks: + - bugfix: Fixed the beginning of words being filtered "e.g. lol filtering lollipop" + - admin: Check AI laws will no longer collapse the laws, making them unreadable. + NamelessFairy: + - bugfix: Gets rid of a genturf on icebox underground + Ported by Dragomagol, original PR by monster860: + - rscadd: Locker doors are now animated! + PositiveEntropy: + - imageadd: Adds new colo cup sprites, originally from the lean cup sprite. The + description of the colo cup item is also changed for only a single, mildly rare + variant. + Thunder12345: + - imageadd: CTF armour has a shiny new look + - code_imp: CTF shielded armour has been changed from a hardsuit to a vest to clear + the way for modsuits (coming 2021 by Fikou) + - code_imp: Any item of clothing can now be given an energy shield, not only hardsuits + - bugfix: CTF marksman outfits are now named correctly + Timberpoes: + - bugfix: Contractor drop pods are now actually clickable and you can place your + target into them without having to drag them to the tiny bit of pod where the + rubble overlaps it. + TiviPlus: + - bugfix: fixed some phasing things getting stuck on some objects + - bugfix: fixed changing a turf sometimes making an area dark + Zytolg: + - expansion: Adds the Homestead, Comms Outpost, and Plasma Facility to the Icewastes + Ruins Roster. + - code_imp: Adds area support for the Plasma Facility ruin. + twilightwanderer: + - rscadd: Adding the ability to use a large number of characters in the chat client. + - code_imp: In the chat client code, the standard text checking procedures have + been replaced by special chat text checking procedures. +2021-09-30: + 567Turtle: + - expansion: Filing cabinets can be constructed for 2 iron sheets + Arkatos: + - spellcheck: Fixed a few grammar mistakes in the nullrod radial menu descriptions + and better clarified some block chances of the certain nullrod variants. + - spellcheck: Fixed a misspelling of the word "availability" in the Plexagon HR + Core app description. + Iamgoofball: + - spellcheck: Fixed the Popularity Contest theme having references to Grove Street + Families, a long since removed Gang. + Mooshimi: + - code_imp: vendor code has less spaces and more tabs + Mothblocks: + - bugfix: New photographs taken will now properly save. + PositiveEntropy, Kryson, maxymax13, Salla: + - imageadd: Resprites iron and material chairs into new ones, originally from Yogstation! + TiviPlus: + - qol: grav anomalies now have a pretty effect + - refactor: Rendering has been refactored, remember to report bugs + Zytolg: + - bugfix: Monkies no longer play with the firelock switch in Kilostation Genetics + via the power of uninstallation. + - bugfix: Removes a duplicate table and pipes and cable from the Metastation Eng + Foyer. + carshalash: + - bugfix: thirteen look no longer puts you to sleep + esainane: + - bugfix: The Derelict now has one APC per area. Weird behavior as two APCs fight + for control over the same region should no longer be seen. + vincentiusvin: + - bugfix: fixed holosigns not counting towards the max limit and not being deleted + when clicking the creator. + - bugfix: NanoTrasen denies all allegations of unethically producing electrical + cables by forcing ill-equipped employees to lay them and materializing new cables + out of thin air. The reports were clearly exaggerated. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-10.yml b/html/changelogs/archive/2021-10.yml index d3d8f592996..41fe8005839 100644 --- a/html/changelogs/archive/2021-10.yml +++ b/html/changelogs/archive/2021-10.yml @@ -1,3 +1,4 @@ +<<<<<<< HEAD 2021-10-06: AMonekyThatCodes: - refactor: Adds basic mobs, a replacement for simple mobs that will hopefully destroy @@ -197,6 +198,30 @@ Kush1Push1: - rscadd: Russian players can use unique races text formation (from lizardmen and fly persons tongues) with their language. +======= +2021-10-01: + Mooshimi: + - code_imp: AIs will no longer get the asimov lawset on unique-lawset station trait + rounds + Timberpoes: + - bugfix: Spawners Menu buttons once again work to jump or spawn as ghost roles. + Watermelon914: + - bugfix: Fixed module circuit size not taking up capacity equal to the amount of + circuit components inside of it. +2021-10-02: + Arkatos: + - qol: Vending machines now use their name as a title for their UI. + InvalidArgument3: + - bugfix: durand shield will no longer burn forever or take fire/acid damage from + the environment + - bugfix: burning vehicles can now be extinguished. + - bugfix: you can now properly toggle on/off exosuit modules such as the generators, + repair droid, tesla energy relays, and RCS + JohnFulpWillard: + - spellcheck: The NT IRN app will properly tell you that it cannot be used with + department budget cards, who is this 'budgetorders' fellow anyways? + - bugfix: Oven boards can now be researched with the rest of the kitchen's machinery. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's cargo crates now spawn with some maintenance loot at roundstart. - bugfix: Fixed a singular rogue corner decal in Tramstation's cargo @@ -204,6 +229,7 @@ grid and not directly back into the dinner area. - bugfix: Tramstation's directional signs have been updated to properly show department directions. +<<<<<<< HEAD - rscadd: Tramstation's Security and Service wing has been flipped around. - rscadd: Tramstation's commissary has been placed above in the central wing beside the kitchen. @@ -301,11 +327,77 @@ them to make them shoot out things faster.... - admin: "You can now ping other admins (or whatever other roles) in asay by using\ \ @\_theirckey in your message" +======= + Melbert: + - balance: The firebreath Mutation is now a cone of fire, instead of a real fireball. + Mooshimi: + - bugfix: you will no longer spawn behind the arrivals shuttle on kilo or on ice + wastes for icebox, when the stations has the random spawn trait + Mothblocks: + - admin: You can now cancel incoming and outgoing cross comms console messages. + - bugfix: The species list will now scroll properly when there are too many. This + has meant nothing up until this point, but will when Halloween races are enabled + again. + - admin: Added a preference to disable your usual deadmin preferences when you are + spawned in CentCom. This is on by default. + - bugfix: UI with tooltips will now be much faster to create them, such as R&D console + searching or preferences menu tab switching. + Sealed101: + - expansion: 'There is a new type of experiment provided by Nanotrasen: Machinery + scanning!' + Y0SH1M4S73R: + - admin: Circuit components to perform animations and manipulate filters have been + added. These components are the "Begin Animation", "Animation Step", "Add Filter", + "Filter Remover", "Filter Parameter Helper", and "Animation & Filter Bitflag + Helper" components. Refer to their descriptions for more information. +2021-10-03: + Ghilker: + - qol: 'Allow players to build a girder on a turf by r-clicking the turf with a + sheet of iron with enough material in it remove: Removed wall girder building + from iron sheet construction recipe UI' + - qol: added an examine text on iron sheets to inform players about the new method + of building girders + - expansion: Add USB port to the atmos pumps + Hulkamania: + - expansion: You can now proclaim yourself a Mime Fan or a Clown Enjoyer. + InvalidArgument3: + - expansion: 'directional floodlights for exosuits sound: sound effects for switching + exosuit equipment' + JohnFulpWillard: + - bugfix: Midround Nightmares will once again spawn. + KathyRyals: + - bugfix: Fixed the hair dye spray to be tiny, as it was intended. + KittyCatMeowMeow: + - bugfix: Fixes access on Maint airlocks on the tramstation bar + Maurukas: + - bugfix: The Metastation gravity generator is now properly connected to the power + grid again + - bugfix: A large number of doubled power cables have been fixed across on all stations + - bugfix: A large number of broken, disconnected or doubled up atmospherics pipes + have been fixed across all stations + - bugfix: Multiple disconnected vents and scrubbers have been reconnected to the + atmos network on Tram and Meta + - bugfix: A large number of improperly named and networked cameras have been fixed + across all stations + - bugfix: Doubled tiles, decals, disposals, pipes and wires from the great map merge + incident have been removed + Mooshimi: + - spellcheck: was/were grammar fix on items being knocked off + Mothblocks: + - bugfix: Midround wizard is now selectable. + Pickle-Coding: + - bugfix: Reactions will now properly fully react when it has moles to consume. + Instead of the reaction stopping when one of the gasses is lower than reaction + rate, it will instead adjust the reaction rate so that it consumes all of the + gas. + Ryll/Shaps: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Getting hit by the tram and landing on lattice or unplated flooring (on the upper z-level) will now cause you to smash through it and fall to the z-level below at the cost of taking some extra damage. Note that floors with plating will still hold steady, so you can still use flooring to make getting hit by the tram insanely lethal, it just takes a bit more effort. +<<<<<<< HEAD - balance: Bone wounds in general have been made less obnoxious, especially when suffered on the legs. Instead of limping every step with that leg, you now have a chance to limp each step with that leg that scales with the severity of the @@ -494,6 +586,27 @@ - refactor: Refactor spawner code to make it clean and unison. All of the random spawners now follow the same formatting. - spellcheck: fixed airlocks id from entrence to entrance +======= + esainane: + - bugfix: The Space Hotel ruin's Staff Room and Staff Store now use distinct areas, + and no longer have APCs fighting each other for control. + - code_imp: /area now retains a local reference to the APC in the area, if any + - bugfix: The SM/HFR will now always play harsh accent sounds when they should + tralezab: + - bugfix: spirit holder exorcisms now make sounds + - bugfix: fixes possessed blade not actually being able to be possessed + - refactor: null rod's subtype picking is now an element +2021-10-04: + Ghilker: + - bugfix: fix pod emergency storage exploit + KittyCatMeowMeow: + - bugfix: Added a few cables to Lavaland Mining for charging + Mooshimi: + - code_imp: moved some ai law defines to the proper file + Wayland-Smithy: + - bugfix: Fixed many Tramstation department sign arrows pointing to upload and vault. + esainane: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Completely restructure HFR main processes, fixing many unusual edge cases when the HFR was unpowered, out of fuel, interacted with other subsystems poorly, etc. @@ -541,6 +654,7 @@ modifier and the gas production modifier. This means the top tier Hypernoblium/Anti-noblium recipe is now worth using, providing a production bonus of 3x rather than a penalty of x0.03. This recipe is still just as hard to operate safely. +<<<<<<< HEAD - bugfix: Fix dir delay when riding something and turning - bugfix: fixed fake artefacts so they look real - bugfix: Discord new round notifications will no longer come shortly before the @@ -1136,18 +1250,183 @@ - rscadd: Added DeltaTri's donator item. lyricalpaws: - bugfix: Plants distill in to their distill reagents properly. +======= + - bugfix: The Abandoned Zoo ruin no longer has duplicate copies of an APC, power + cable, and rack on the same tile. + tralezab: + - bugfix: You can now hold people at gunpoint from range! +2021-10-05: + Iamgoofball: + - server: Dynamic now has an extra configuration value, max_threat_level. Defaults + to 100 threat. + Krysonism: + - bugfix: Shark biopsy samples are now clean and don't contain a duplicate shark + cell line. + Melbert: + - bugfix: Fixes people getting rejected by the panic bunker when they probably shouldn't + have been (if you can read this, it probably doesn't affect you anymore) + Mothblocks: + - bugfix: Old photos from persistent photo albums will now no longer be lost. + Timberpoes: + - bugfix: Captains can sleep tight at night knowing that Disky no longer fears escape + shuttle rides at the end of the shift. The nuke disk will no longer teleport + itself back to the station from the emergency shuttle when the emergency shuttle + departs. + - admin: Admins should no longer get trolled by URL keys creating clickable links + that look the same as admin PM shortcuts. + Zytolg: + - bugfix: The new mining base on Icebox will now fully load its surrounding plasma + lake area. + - bugfix: The Kilostation Art Closet now provides station sevants with the necessary + art supplies. + esainane: + - bugfix: The airlock to MetaStation's Medical Cold Room is now properly named and + requires Medbay General access. + - bugfix: Kitchen cold rooms which are cold (that is, those on Ice, Meta, and Tram) + now have their air alarms configured to expect this. +2021-10-06: + JohnFulpWillard: + - bugfix: Surgeries that repair organs will once again repair the organ. + - bugfix: Swarmers-banned ghosts can no longer create Swarmer bodies from the beacon. + Zytolg: + - expansion: Remaps the Holding Facility into 2021 Standards + - code_imp: Indestructible paper wall support. It's better than the alternative. + kopoba: + - bugfix: fix ebow was able to accept pka modkits with 0 cost +2021-10-07: + PeterMorrison1: + - bugfix: fixed dropped arrows being controllable with the bow + Watermelon914: + - qol: Refactored tgui list inputs to be a lot more user-friendly. + lovegreenstuff: + - bugfix: ice reaction oversight, now freezes at the proper 274k instead of 245k + tralezab code, melbert idea!: + - rscadd: There's a new wizard event, RPG titles. Summon the star duke! + zxaber: + - rscdel: The augment painter has been removed from the game. + - rscadd: Spraycans can now change the visual style of robotic augments via right-click. + - bugfix: Borg lights are now visible again. +2021-10-08: + InvalidArgument3: + - bugfix: penetrator rounds will no longer ignore vehicles + JohnFulpWillard: + - qol: Choice beacons now use a TGUI menu + Melbert: + - bugfix: The huds for clown and mime fan are back + - bugfix: You can no longer be a simultaneous clown and mime fan, pick a side coward + - bugfix: Quirks that once were not compatible are now incompatible again + NamelessFairy & Mothblocks: + - expansion: Replaces the ghost mafia button with a minigames button which opens + the new minigames panel. + - qol: CTF is now accessible through the new minigames menu + - rscadd: CTF can now be played through the CTF menu, accessible through the minigames + menu + TiviPlus: + - bugfix: fixed ambient occlusion stacking sometimes + Watermelon914: + - expansion: Adds the dispenser shell, which accepts normal-sized items and lets + you dispense them at any time. + - expansion: Adds the For Each component and the Filter List component. + - refactor: Refactored the circuit list datatype to support composite types (i.e. + entity list, any list, number list), which are lists that can only contain values + of the specified datatype. This also refactors anything that uses the list datatype + to use composite lists. + - qol: NTNet components now use composite lists to send and receive data + - bugfix: Prevented people from infinitely making lists with the list literal component. + tralezab: + - bugfix: Fixes catwalks not working at all! + zxaber: + - rscadd: Emagged and Syndicate borgs can now self-detonate. For emagged borgs, + this destroys the MMI, so know what you're signing up for. +2021-10-09: + Burgermancoding: + - qol: you can orbit people who send messages using the gangster cellphone from + families + Colovorat: + - expansion: Adds catwalk floor crafting recipe + - imageadd: catwalk floor tile object sprite and inhand sprites + DaddyIssues and Grobelon: + - expansion: 'Added 3 new foods: Catburgers, Egg with sausage, and Sausage bread.' + Ghilker: + - balance: Rad collectors are gone, can be only spawned by admins. SM will now generate + power by releasing zaps that will hit tesla coils around it. Roundstart setups + might not be enough for bigger stations and t4 machines later in the round, + recommended to upgrade the powergen. + Ghommie: + - expansion: 'The Mr. Deempisi Portrait plaque has been replaced with a very special + picture frame: A small picture of one out four random things (Mr. Deempisi included) + that can have a photo affixed over it. The photo will persist between rounds + on that specific station until removed of if the frame is destroyed. Each station + gets one, all but one (Kilo is too damn cramped) located in the bar behind the + bartender counter. It''s also more artsy than other picture frames now. spriteadd: + Desouled the picture frame sprites.' + Krysonism: + - qol: The tentacle slap ability button now goes red and displays a cooldown timer + when on cooldown. + - bugfix: Vat beasts now longer lose their ability when someone rides them. + - expansion: Adds carp scales, and carp scale crafting. + Melbert: + - bugfix: Removing invasive spreading from a plant will now actually remove invasive + spreading + - refactor: Refactored seed / gene deletion, and a bit of gene addition / removal + Timberpoes: + - bugfix: Observers will no longer see ghost icons representing Maintenance Loot + Spawners of Roundstart Past once the round has actually started. + Wallemations: + - expansion: The Goat Plushie has picked up some bad habits, please try not to let + it near any illicit substances for the sake of its rehabilitation. + Watermelon914: + - admin: Admins can now stop animations on an object as well as decide if it starts + parallel or not. + - bugfix: Fixed animating filters in steps not working at all. + - qol: Gave instantly executing ports special datatypes to distinguish what ports + cause instant execution + - bugfix: Fixed default FPS for new players and applies it to them when they join. + Zytolg: + - bugfix: Fixes the floating sign in the Tramstation Teleporter + esainane: + - code_imp: freon_gas_act is now called freeze_turf. It was only ever used in two + places, neither of which involved Freon. + thestubborn: + - bugfix: the Driscoll poncho should be centered now + timothymtorres: + - qol: Adds random statue spawners to secure art exhibits in the library for Meta, + Tram, and Delta. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-10-10: Arkatos: - bugfix: Thermomachine design icon in the R&D Console UI will now show properly. Guillaume Prata: - bugfix: Cyborgs can interact with a morgue tray to close it now, instead of needing to interact with the main structure. +<<<<<<< HEAD SkyratBot: +======= + Krysonism: + - qol: The mega arachnid now has a toggleable self only small sprite. No more hitting + yourself! + Mooshimi: + - qol: status displays can now be wrenched off the wall, and frames can be printed + at the autolathe + PeterMorrison1: + - bugfix: fixed antagonist preference tooltip showing wrong descriptions + Watermelon914: + - bugfix: Fixed variables sometimes just not working. + - bugfix: Fixed the dispenser shell and For Each and Filter components not appearing + in the component printer. + - bugfix: Fixed the changeling antag panel + - bugfix: Fixed the wizard's antag panel. + - admin: Datum input ports can now have atoms and datums uploaded to them. + esainane: + - bugfix: HFR ambience will no longer play intensely when the HFR is out of fuel + - bugfix: SMs meant to be immobile should now be truly immobile. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Bluespace anomalies will no longer teleport camera eyes, such as AI eye, Blob Overmind eye, Advanced Camera consoles, or the Xenobiology Slime management console. This is particularly relevant for the Xenobiology advanced slime console, as the eye cannot move outside of, or while outside of, the area the console is in. +<<<<<<< HEAD - code_imp: Remove a very useless check from APC code - bugfix: SMs meant to be immobile should now be truly immobile. - bugfix: Fixed the dispenser shell and For Each and Filter components not appearing @@ -1215,6 +1494,35 @@ - bugfix: 'fixes unpowered space ruins actually being powered expansion: more secret away mission stuff' - refactor: Refactored monkey AI a bit, noticeable changes should be minimal! +======= + - spellcheck: Fixed a typo in the Hostile Statue description. + - code_imp: Remove a very useless check from APC code + - bugfix: The beams from Emitters, and all hitscan weaponry, now render properly + again. + - bugfix: CentCom now has one APC per area. + tralezab: + - bugfix: Preferences menu now supports Halloween races +2021-10-11: + Fikou: + - bugfix: fixes unpowered space ruins actually being powered + - expansion: more secret away mission stuff + Ghommie: + - bugfix: Fixed two issues with paper code. Namely paper text being always colored + black outside of edit mode and signatures showing the current name and not the + real name. + - expansion: Added USB ports to light switches. + Mothblocks: + - rscadd: Added back the reset keybindings button. + - bugfix: Fixed weird scaling on the buttons in a tabbed list UI (such as "Communications" + in the keybindings menu) + Watermelon914: + - bugfix: Fixed a runtime with the integrated circuit duplicator + - admin: Signal Handler circuit components are no longer limited to 1 registered + object. + - admin: Get variable circuit components can now get GLOB variables + - admin: Animate and Save Shell circuit components will now apply DF_VAR_EDITED + - bugfix: Fixes the changeling panel not working at all. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Bluespace launchpad maximum range decreased from 60 to 40. Traitor launchpad unaffected. - balance: Bluespace launchpads will now give a visual indication of the turf they @@ -1223,6 +1531,7 @@ - balance: Bluespace launchpads will now show a beam that fades out between the target turf and the launchpad after it has done the teleportation. Again, does not apply to traitor launchpads. +<<<<<<< HEAD - bugfix: Fixed two issues with paper code. Namely paper text being always colored black outside of edit mode and signatures showing the current name and not the real name. @@ -1253,11 +1562,27 @@ finally ended. Miners should be cautious, as the Lavaland natives might start showing up again. - bugfix: Primal Podpeople have finally managed to exit their cryopods again. +======= + esainane: + - bugfix: The CE's blueprints can now once again show an overlay of the station's + original structural layout! Cleaning up after an explosion is now - well, realistically, + just as frustrating as ever, but it looks nice! + tralezab: + - refactor: Refactored monkey AI a bit, noticeable changes should be minimal! + - qol: toggle random events doesn't uselessly include a message to the user, only + to admins... which the user is. +2021-10-12: + Ghommie: + - bugfix: MMI components can't be no longer attached to modules. This was causing + race conditions with other MMI components present in the circuit (not much of + a good thing). +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscdel: Removed the action button for toggling griffin and owl wings, you can still open and close them with alt-click. - refactor: Toggle Suit component for labcoats, suit coats, and formal coats (and some others) +<<<<<<< HEAD Seris02: - bugfix: server erp prefs will now actually turn off the erp emote SkyratBot: @@ -1343,6 +1668,61 @@ ihavenoideahowtonamemyaccount: - rscadd: even more halloween costumes options in the loadout 2021-10-16: +======= + tralezab: + - bugfix: Basic mobs can once again be vareditted +2021-10-13: + Colovorat: + - bugfix: You can no longer extract and transform DNA of species that have no DNA + Fikou: + - bugfix: fixes mode switch actions on storage items being broken + Ghilker: + - qol: lower sound level of the coils, the sound and range is calculated by a function + based on the zap power + Ghommie: + - expansion: A timepiece circuit component has been added. It can output the station + time in different time formats and units of time when triggered. + InvalidArgument3: + - expansion: The Yellow slimecore plasma reaction is back in the form of creating + an EMP-proof cell. + Melbert: + - rscadd: 'Icebox: The Chapel, Library, and Departures Lounge (and some maintenance + around it) have been revamped and expanded to utilize multi-z.' + Mothblocks: + - bugfix: Fixed a bug where bans could not be applied if the database connection + was not immediately established, even after a re-establish. + - server: Updated database schema to allow for null round IDs in bans and tickets. + RandomGamer123: + - bugfix: Contractor support units now do not get a second uplink with 20 TC in + them. + - bugfix: Malf AIs cannot be rolled midround if one has already been rolled roundstart. + - bugfix: Syringe/Hypospray failure messages now reflect the proper body part. + Wayland-Smithy: + - bugfix: Fixed base lighting appearance inheritance. +2021-10-14: + FA120: + - bugfix: list literal can now contain tables,like they are supposed to + Guillaume Prata: + - imageadd: Engineering clothes have working reflective stripes now. Easier for + someone to find your corpse in maints, harder for you to hide in the dark to + do bad things. + Melbert: + - bugfix: You no longer see yourself in everything you double examine + Seris02: + - bugfix: regal rat can now eat cheese + runtime fixes for its signal + SomethingFish: + - expansion: Adds a BLT sandwich as a new food to the game. + Watermelon914: + - bugfix: Fixes filter list component not being a filter list component +2021-10-15: + ArcaneMusic: + - expansion: Venom swells your mob when stung. + Coconutwarrior97: + - bugfix: Fixes the holoparas breaking their users glasses when manifesting bug. + - bugfix: Lavaproof borg upgrade for miner borgs now works properly. + LemonInTheDark: + - bugfix: Fixes openspace not working if the floor below has been changed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's maintenance now has new catwalk tiles covering the various piping/wiring throughout. @@ -1350,6 +1730,7 @@ outages caused by rogue syndicate mice operatives. - bugfix: Patched up a few missed spots involving pipe/wiring for departments like Botany/Courtroom. +<<<<<<< HEAD SkyratBot: - bugfix: Fixed monkeys having the wrong on fire overlay when ablaze. - spellcheck: No more phantom hand grabbing. @@ -1421,6 +1802,91 @@ - bugfix: Secways will now say it's broken, rather than it's component. - code_imp: removes color_legacy prefs and changes sanitize_hexcolor()'s default to 6 characters +======= + Maurukas: + - balance: The super matter crystal can no longer be immediately delaminated by + firing a gun into it, only brought close to the delamination threshold. + Melbert: + - rscadd: 'Icebox: Science RND and Genetics remap!' + RandomGamer123: + - bugfix: Leftover plasma tanks formerly intended for radiation collectors have + been removed. + Ryll/Shaps: + - rscadd: Added new quirk, "Shifty Eyes", which rarely causes people who examine + you while standing closeby to think that you both made eye contact, even when + you didn't. + - balance: The time window for making eye contact with someone else has been extended + from examining each other within 1 second to within 2 seconds. + - spellcheck: Fixed incorrect "the"'s being inserted before the names of improper + nouns in item stripping code. + SuperNovaa41: + - spellcheck: No more phantom hand grabbing. + - bugfix: Pipes now properly fulfill your nicotine cravings. + Zytolg: + - bugfix: The Nanotrasen Materials Reclamation Program has recycled the spare firelock + trapped in the Cargo Offices east windows. +2021-10-16: + Gandalf2k15: + - qol: Added the dyekit functions to the character preferences menu. + Ghommie: + - bugfix: Fixed monkeys having the wrong on fire overlay when ablaze. + Seris02: + - bugfix: quantum pads and other things with fault do_teleport calls no longer cause + runtimes + - code_imp: removes color_legacy prefs and changes sanitize_hexcolor()'s default + to 6 characters + thatoneplebeian: + - refactor: refactored drowsiness code +2021-10-17: + ATHATH: + - bugfix: The "don't allow any organics to escape on the emergency shuttle alive" + objective no longer counts inorganic species like golems, plasmamen, androids, + etc. + - qol: Some malf AI objectives have had their descriptions updated to reflect them + only caring about player-controlled creatures. + Ghommie: + - bugfix: Fixes the mind name of aliens not being updated when evolving (for real + this time) + - expansion: Added a trigonometry circuit component. + - bugfix: Pets no longer enjoy being shoved around. + Guillaume Prata: + - imageadd: Fire extinguishers now have a worn sprite when they are stored on your + Firesuit. + - imageadd: Atmos Optical glasses have a new icon for it's connectable mode. + - balance: Atmospheric Technicians will have external airlock access by default + now instead of only on skeleton crew. + Horatio22 borrowed Iamgoofball and Surrealaser , spriter d4n0w4r: + - imageadd: added 2 new outfits to the detective autodrobe + IndieanaJones: + - bugfix: Monkeys can now open worn backpacks by clicking on them. + - bugfix: Players with the monkified mutation now have a generic monkey name as + opposed to their actual name again. + JohnFulpWillard: + - bugfix: Secways will now say it's broken, rather than it's component. + Krysonism: + - balance: Growing vats can now be set to regrow the sample upon completion. + - balance: Increased the volume of growing vats from 200 to 300u. + LemonInTheDark: + - bugfix: Non wallsocket lights will be properly colored again. Whoops + Melbert: + - bugfix: Icebox chapel morgue slabs are now all the right direction + Mickyan: + - qol: While holding a spraycan you may right click on existing graffiti or colored + objects to set the spraycan to match that color + PositiveEntropy, EricZilla: + - imageadd: Resprites pinpointers! + RandomGamer123: + - bugfix: Admins who aghost won't be dragged back to their body when someone attempts + to defib them. + Sealed101: + - bugfix: fixes combat hypospray locking itself out from 10u transfers to 5u when + used in-hand + SpaceDragon00: + - bugfix: Organs will now consistently "Fail" once they have reached max damage + YakumoChen: + - spellcheck: Gives shaft miner a more accurate job description + esainane: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Radiation Collectors, Tesla Coils, and Grounding Rods are now subtypes of a common energy_accumulator type. This centralizes logic for smoothing energy release; converting between Joules, Watts, and internal energy units; and ensures @@ -1428,6 +1894,7 @@ curve. - bugfix: Tesla Coils no longer generate power using half the smoothing that Radiation Collectors used. This was due to a mistake in handling delta_time. +<<<<<<< HEAD - code_imp: 'Removed many magic numbers from power generation code. qol: Tesla Coils will now display energy stored in Joules and power being produced in Watts, much like Radiation Collectors did. qol: Grounding Rods will now display recent @@ -1456,6 +1923,69 @@ - bugfix: Fixes dogborg models getting an improper pixel offset on their sprite. - bugfix: Dogborgs get their rest and rest-style verbs back. They are located under AI commands. +======= + - code_imp: Removed many magic numbers from power generation code. + - qol: Tesla Coils will now display energy stored in Joules and power being produced + in Watts, much like Radiation Collectors did. + - qol: Grounding Rods will now display recent energy they've absorbed and the sustainable + power that this energy could be producing. It should now be very obvious if + you could use more Tesla Coils. + - bugfix: Fixed supermatter lightning bolt target selection. Previously, two grounding + rods were always* safe. Now, one grounding rod is always* safe. + - qol: Roller Beds now come with an examine hint for how to roll them up. + lovegreenstuff: + - bugfix: probital now works properly on ingest. you now get mitogen again + magatsuchi: + - rscadd: added ability to change hologram appearance to custom character + tralezab: + - rscadd: Titlescreens are now widescreen'd up. + - qol: The titlescreen is no longer described as "Effectively impervious to conventional + methods of destruction." and only the splash screen can be interacted with + - bugfix: you can no longer exploit the pink crossbreeding power to strip factions + from mobs +2021-10-18: + Ghommie: + - bugfix: Fixed the join/ready buttons not reverting if the game fails to setup. + Pickle-Coding: + - admin: Assembly bomb creation is now logged in Kelvin. + RandomGamer123: + - spellcheck: Fixed capitalisation errors in hypernoblium crystal usage messages. + Sealed101: + - bugfix: fixed abductor and advanced tools' recycling results being heavily diminished + or taken from their basic counterparts + SuperNovaa41: + - balance: The Goon Source code item is now invulnerable to deletion (aside from + ninja intervention), similar to every other high risk item. + esainane: + - rscadd: When all else fails, dusting a Clown can alter the Supermatter's containment + field. It might make the situation better. It might not. Who knows, HONK + magatsuchi: + - spellcheck: fixed a single bracket typo + tralezab: + - bugfix: fixes an error in department officers spawning with wallets +2021-10-19: + Cyberboss: + - bugfix: Prying open one of a pair of cycle-linked airlocks will now always close + the other (if it is powered). + - expansion: 'Arrivals, escape, and pod airlocks now restrict those without access + from exiting directly to space. Use is unrestricted when entering the station + or a shuttle is docked. tweak: Shuttle departures will now force exterior airlocks + closed on both the shuttle and docking bay. The lives of your fellow crew members + are more important than your tardiness and limbs, employee!' + - bugfix: Fixed the numbering of escape pods in certain maps. + Ebin-Halcyon: + - balance: Syndicate masks are now fire + acid proof + Ghilker: + - qol: filters can now filter multiple gases at once + Ghommie: + - expansion: Meta and Delta chapels now have pews in lieu of stools or chairs. + MeyHaZah, Onule, Fikou: + - imageadd: mining gear resprite + Mothblocks: + - rscadd: Emagging the communications console will now let you purchase dangerous + shuttles. The Gigafactral and the Monastery were moved over (and made cheaper), + while the Disco Inferno and Oh, Hi Daniel make a return. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - admin: As an admin, if you start replying to a freshly submitted ticket that another admin is already replying to, you'll get a notice that someone already has it @@ -1465,6 +1995,7 @@ - refactor: Rolling paper will now use the customizable reagent holder component. This cleans up the code and expands the possibilities for using the component by adding support for dried items. +<<<<<<< HEAD softcerv: - bugfix: medical bandoliers can now hold hypovials again. 2021-10-20: @@ -1476,6 +2007,25 @@ while the Disco Inferno and Oh, Hi Daniel make a return. jjpark-kb: - bugfix: added a range after mark selection for cargo teleporters +======= + esainane: + - bugfix: Removed a scrubbers pipe that didn't lead anywhere near Upper Hydroponics + on Tram. +2021-10-20: + Ghommie: + - bugfix: Fixed maintenance drones being unable to examinate things they currently + can't interact with throgh shift-click. + - bugfix: Fixed clown car drivers being unable to examinate things or interacting + with their inventory while the car is in cannon mode. + - bugfix: Fixed honorbound people being unable to pull, examinate and alt-click + other living mobs while holding an item that could be used as a melee weapon. + - bugfix: Fixed mechas firing their weapons or using their tools when the pilot + is examinating things through shift-click. + Mickyan: + - expansion: Nearsighter quirk now lets you pick the look of your prescription glasses + from the character preference menu + - imageadd: Added thin prescription glasses +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-10-21: ATHATH: - bugfix: Butter bears can now attack objects, as they were intended to. @@ -1485,6 +2035,7 @@ variables (which are zero by default) become nonzero. - bugfix: Butter bear attacks are now considered to be blunt instead of sharp for the purposes of wounds. +<<<<<<< HEAD Gandalf2k15: - rscadd: Added a mob spawner function for admins. MMMiracles: @@ -1538,10 +2089,14 @@ - bugfix: The SDQL spell parse error modal grows properly. - bugfix: fixed implant abilities not being properly removed when the implant is removed. +======= + Coconutwarrior97: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a hydroponics airlock type, and replaces old medical hydroponics doors with the newer airlock type. - bugfix: Fixes an issue where people with the doctor phobia were afraid of hydroponics doors. +<<<<<<< HEAD - bugfix: Fixed the contents of certain coded or mapped closets exceeding their storage capacity, like the HoS closet on Delta, which had redundant grey HoS jumpsuit, trenchcoat and beret, or the mixed wardrobe closet with its duplicate @@ -1786,6 +2341,28 @@ - imageadd: Digitigrade sprites for the Tacticasual Uniform and Cargo Tech Casual Wear SkyratBot: +======= + Ghommie: + - balance: Moved Pun Pun away from the kitchen on Delta. It's now behind the bar + counter. + JohnFulpWillard: + - bugfix: da vim can now be entered again. + MMMiracles: + - rscadd: Added new pair of glasses that can be found within the trash piles of + maintenance. + - bugfix: Pacifists can now fire the circuit gun. + MentalCow: + - bugfix: Security Plasmamen spawn with their suit sensors set to Maximum + PositiveEntropy, AdipemDragon: + - imageadd: Botany tools have been resprited! + Sealed101: + - bugfix: The internal radio implant from Icebox departures has been returned to + it's owner's internal organs. A normal handheld radio has been left in its place. + - bugfix: The american sausage has become edible AND roast-stick-friendly! + - bugfix: Fixes advanced roasting stick griddling itself when used on a bonfire + with a rod griddle built over it instead of using the bonfire to roast the sausage. + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an issue where the unbanning panel would give inaccurate information about the ban in the unban confirmation prompts. - bugfix: Fixed an issue where clicking the X to close out the confirmation popup @@ -1797,11 +2374,211 @@ one. - admin: Editing the IP, ckey or CID of a server ban will now kick any players matching the edited ban's new details. +<<<<<<< HEAD +======= + Zytolg: + - bugfix: Tramstation is now free from oddly decaled walls. + - bugfix: The Lavaland Syndicate Base is now Powered again. + - code_imp: repathed /unpowered Syndicate Base areas to /powered + esainane: + - bugfix: Gas Filters will now always attempt to move gas, as long as at least one + output has space available. Any gas not able to be moved to its destination + is returned to the input as if it was never removed. Previously, only gases + for the main output port would continue to move when the other output port was + full. + - bugfix: Gas Filters again no longer leaves empty entries for gases that were filtered + in the main output. + - bugfix: Gas Filters again no longer outright destroys gas when no filters (or + a bad filter, somehow) are set. Instead, it will go through to the main output, + as before, or if the main output is full, be returned back to the input, as + if never removed. +2021-10-22: + Ghommie: + - bugfix: Fixed the contents of certain coded or mapped closets exceeding their + storage capacity, like the HoS closet on Delta, which had redundant grey HoS + jumpsuit, trenchcoat and beret, or the mixed wardrobe closet with its duplicate + bandanas, jacket and green jumpsuits, + - bugfix: fixed implant abilities not being properly removed when the implant is + removed. + IndieanaJones: + - expansion: Player monkeys make a screeching noise when using the *screech emote. + JohnFulpWillard: + - bugfix: Changelings that re-adapt with pheremone receptors on, will have them + forcefully removed. + Seris02: + - rscadd: makes it so lockers/crates can have access electronics removed/inserted + Y0SH1M4S73R: + - bugfix: The proc call, set var, and spawn atom circuit components will properly + resolve any weakrefs passed to them through their list ports. + - admin: The signal handler circuit component has two new presets, item_pre_attack_secondary + and item_afterattack_secondary. + - bugfix: Backup human names are once again respected when forcibly humanizing what + would otherwise be a non-human head of staff. + - admin: Added a "suppress_message_admins" variable to SDQL spells, which prevents + the spell's query from getting output to all admins' chat panels. The query + will still be written to the game log. + - bugfix: The SDQL spell parse error modal grows properly. + esainane: + - bugfix: The Orion Trail's instructions screen is usable again. + tralezab: + - bugfix: 480x480 titlescreens now load up centered as intended from the widescreen + title changes +2021-10-23: + Guillaume Prata: + - qol: CMOs will now spawn with blue shoes (Paramedic) that protect them from contracting + diseases from any blood pool they step in, just like everyone else at medbay + already does. + Mickyan: + - qol: Art supplies are now also available in the library vendor in case the art + storage room is not present on station + Mooshimi: + - qol: 'Maintenance drone spawners have returned to robotics maintenance removed: + maint drone is gone from the mechfab and research tree' + Sealed101: + - bugfix: fixes mining drills showing as pickaxes when worn or held in-hand + Seris02: + - bugfix: borgs will no longer leave MMIs while cryoing +2021-10-24: + Coconutwarrior97: + - bugfix: Fixes some hydro airlocks having null in their req_access. + Ghommie: + - expansion: Added binary and decimal conversion components. + Guillaume Prata: + - bugfix: Space Heaters won't change temperature without draining it's cell charge + anymore. + JohnFulpWillard: + - qol: Roulette Wheels now say their actions, rather than have it magically appear + in the chat box of everyone nearby. + Mooshimi: + - balance: cattleprods can no longer be held in suit storage slots + esainane: + - bugfix: Members of the Science department can no longer get given the objective + to steal their own server's source code. +2021-10-25: + ArcaneMusic: + - bugfix: Regular/Advanced mops are now in the same categories of the auto/protolathe. + Coconutwarrior97: + - bugfix: Fixes pacifists wielding mjollnir being able to shock people. + JohnFulpWillard: + - qol: Bounty consoles will now talk to the user if they have to wait for a new + bounty or is using an incorrect ID, rather than telepathically transmit messages. + PositiveEntropy: + - imageadd: Resprites the defibrillator! + Sealed101: + - bugfix: fixes bomb implants blowing you up anyway when closing the window instead + of pressing the "No" option + - bugfix: fixes bomb implants blowing you up when clicking the action button while + the confirmation popup is still up + Watermelon914: + - balance: Makes wizard a high impact ruleset. + esainane: + - bugfix: The SM air alarm on MetaStation and TramStation once again starts unlocked, + and can also be locked and unlocked by Engineers instead of just Atmospherics + Technicians. This matches the setup on Delta, IceBox, and Kilo. + jlsnow301: + - spellcheck: Offering items to other players now has punctuation + tralezab: + - rscadd: Added a rare skillchip to maint. +2021-10-26: + ArcaneMusic: + - rscadd: A new frosted over building has been unearthed in the wastes of icebox. + Fikou: + - rscdel: the captain can no longer unlock his display case on delta without breaking + it + MMMiracles: + - rscadd: Tramstation now has stocked the various departments with either a basic + break room or basic starter food to give a growing crew what they need to stay + healthy. + - rscadd: Some extra public-access vendors for junkfood and cigarettes have been + added to the public halls of Tramstation. + - rscadd: Security now has an evidence room to store confiscated things. + Melbert: + - bugfix: Some special plant reagent genes now show up on the plant analyzer properly + again + Mothblocks: + - bugfix: Backup human names will now properly only apply when you are a nonhuman + head of staff, rather than any head of staff. + Seris02: + - bugfix: fixes a slight issue with the hair color not being visible on ghosts after + the legacy color removal + Watermelon914: + - bugfix: BCIs no longer runtime when they're created at mapload. + - admin: Players now see any notes they may have gotten whilst disconnected when + they join the server for the next time + Zytolg: + - expansion: Sofas now include the Bench Type. These are buildable with 2 metal + plates from the crafting menu. + - expansion: Beds can now be rotated (flipped), and include the Double Bed Type. + Miners can also make Double Pod Beds to really feel like an Alaskan King. + - expansion: Bedsheets to match! Try to share those big blankets with a lizard if + you see that they're shivering! + - code_imp: 'Stuff that lets you interact with the benches and beds in-game, so + that you too can enjoy being a king. sprites: Ports the Benches and Double Bed + sprites from Skyrat sprites: Flipped Beds' + esainane: + - code_imp: LabeledList.Item now supports arbitrary nodes as labels. String labels + still work as previously. + - code_imp: RoundGauge now supports an alertBefore property, for when warnings need + to happen below a threshold. This can combine sensibly to form ranges with alertAfter. + - refactor: The HFR interface has been heavily rewritten and restructured, fixing + many edge cases where data was empty, unset, or took extreme values. Major parts + now have their own file. The structure of gas lists is now consistent. Static + data is used for more values. Much presentation layer logic has been moved to + tgui instead of dm. Some processing that should never have happened, in tgui + or anywhere else, is now gone forever. + - qol: The HFR UI now displays the recipe specific gases that each fuel will create + in a large table inside an expandable area. This can be collapsed when not needed. + - qol: The HFR UI now uses a minimum mass for the scale of its gas lists. This should + provide a visual cue for when a gas mix is running out, or needs more fuel to + start. + - qol: The HFR UI now graphs its various gas mixtures on a unified logarithmic scale, + and tells you how fast the temperatures are changing in real units after all + effects. + - qol: The HFR UI now displays reactor status through gauges, with scales set to + indicate typical ranges involved, and warnings to indicate when something is + going wrong. + - qol: The HFR UI now directly displays reaction instability, reaction activity, + and the cell charge of the local APC. Reaction activity is the amount of heat + output relative to what is permitted by the heat output limiter. This is effectively + making explicit the result of a calculation you would otherwise need to do anyway, + and makes it easier to notice when a reaction has stalled. qol; The HFR UI will + now helpfully inform you in discerning red text if you have no recipe set, or + if any one of the gas mixtures is empty. This should be particularly helpful + for noticing when you didn't add any coolant. Please involve coolant when operating + a nuclear reactor. + - qol: The HFR UI now always lists Plasma, BZ, and Proto-Nitrate in the moderator + gas list, and provides tooltips explaining their usage and purpose. + - qol: The HFR UI now has many other tooltips, from explaining the function and + purpose of the various reactor controls, to the fringe effects of uncommon moderator + gases. + - code_imp: heat_output_bool is gone forever yes this deserves its own changelog + entry + - bugfix: The RD's office in IceBox once again contains an AI Core circuit. + - bugfix: Many escape pods are no longer missing cycling airlock systems. + - bugfix: Air should no longer magically not pass certain areas. + jlsnow301: + - rscadd: Cargo's Delivery Tagger now uses TGUI + malton33: + - rscdel: Removes the book "Singularity and Tesla for Dummies" +2021-10-27: + Capsandi: + - expansion: Ethereals have their own lungs which electrolyze water vapor now + - bugfix: Ethereals will no longer take burn damage from breathing air which they + can stand in safely with internals + Likteer: + - rscadd: Added facial hair to Ethereal customisation. + Melbert: + - code_imp: auto-grow for hydroponics trays now use a setter + NamelessFairy: + - qol: Word filters now support soft filtering, allowing players to say a word only + after they confirm wanting to say it after a warning. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Deadchat is now effected by OOC word filters - bugfix: A reason for a word being filtered will now be displayed nomatter what case the word is in - config: Adds new config options for soft filters - admin: Admins will get notifications when a soft filtered word is said +<<<<<<< HEAD - bugfix: Fixes notes and bans being shown to players on connect when the note or ban doesn't belong to them. - bugfix: fixes hats glued to corgis' heads when dressing corgis up @@ -1838,12 +2615,55 @@ SkyratBot: - rscdel: Removed leftover HTML from spawner menu - refactor: Spawner menu is now easier to read +======= + Sealed101: + - expansion: Spooky headless corgi spirits have been sighted across the Sector! + - bugfix: fixes hats glued to corgis' heads when dressing corgis up + Timberpoes: + - admin: The terrible code ocelot haunting the editing ban panel has been banished. + Editing bans now actually works again. + - qol: Station Engineer trimmed ID cards can now be given Atmospherics access without + needing to be Silver. + - qol: Geneticist and Roboticist trimmed ID cards can now be given Ordnance (Toxins) + accesses without needing to be Silver. + - qol: Detective and Sec Officer trimmed ID cards can now be given Armory access + without needing to be Silver. + Watermelon914: + - bugfix: Fixes notes and bans being shown to players on connect when the note or + ban doesn't belong to them. + Y0SH1M4S73R: + - bugfix: DNA unique identity and unique feature strings once again generate correctly, + which also means they work correctly again. + axietheaxolotl: + - imageadd: recoloured the CC commander envirosuit + esainane: + - bugfix: You can no longer use the *collapse emote to cheat your way out of stamcrit. + - bugfix: Directional firelocks are now transparent, consistent with full-tile firelocks. + This avoids some very strange behavior where you could see through a directional + firelock when you were on the same tile. + - bugfix: Assemblies attached over a wire will now always pulse the wire on activation, + even if the wire is cut. You can create voice or signal activated airlocks again! + - bugfix: Objects which use custom materials and break above 0 integrity no longer + spawn broken. + - code_imp: Made a comment which warned against breaking this sort of thing more + explicit. + - bugfix: Bits of space near the station are no longer randomly powered by unconnected + areas. Outlet Injectors used for sending gas to space have been replaced with + Passive Vents. + - bugfix: The waste air from Virology on Tramstation will now be removed. Previously, + the turf that the outlet injector was on was unpowered. + - bugfix: Reinforced walls will now properly re-smooth when nearby reinforced walls + are created or destroyed. +2021-10-28: + Cyberboss: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Emergency inlet access on the mining station eastern-most airlocks has been removed. - bugfix: Fixed mining station east airlocks requiring external airlock access instead of mining access. - bugfix: Removed access requirements from southern mining station public external airlocks. +<<<<<<< HEAD - bugfix: The SM now properly provides bonus power for operating in a low pressure environment. Make sure you can keep it cool enough, and remember, space or a vacuum won't work, but it will damage the SM! @@ -1861,6 +2681,31 @@ of resize. A little easier to use. - bugfix: Fixed an issue with the crafting menu not being fully dimmed while crafting. 2021-10-30: +======= + Guillaume Prata: + - expansion: Atmospherics Technicians can receive some useful things from their + mail now. + LemonInTheDark: + - bugfix: emagging ethereals works again + Seris02: + - bugfix: orion can now no longer give you multiple prizes + - qol: personal lockers will now allow you to actually un/lock them without swiping + ID + Watermelon914: + - balance: If you try using the staff of change, the staff of chaos or the staff + of healing as a crewmember, then it'll backfire. The Staff of change wabbajacks + the user, like the pool of change; this means you can't become a xenomorph or + a syndicate borg. The Staff of chaos has a 5% chance of firing the bolt directly + at the user using it. The Staff of healing now behaves like a medibeam gun to + non-wizards trying to use it. + carshalash: + - bugfix: Squirt cider now requires salt. Tomato soup no longer becomes squirt cider + esainane: + - bugfix: A roundstart Mannitol pill should no longer cause overdose on its own. + optimumtact: + - rscadd: Bans are now more user friendly +2021-10-29: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - balance: Heavily EMPing a jumpsuit or another piece of under clothing will now short out its suit sensors (as if they had shorted out from damage to the jumpsuit) @@ -1869,6 +2714,7 @@ - bugfix: The sensor list will now be updated when your jumpsuit is EMP'd to reflect any possible changes in suit sensor status. - bugfix: Under clothing will now respect the EMP_PROTECT_SELF flag. +<<<<<<< HEAD Aphast: - bugfix: Added a locked door inside of a dangerous research facility, to prevent an unnecessary casualty. @@ -1901,6 +2747,36 @@ visibility, underfloor interactability, and overfloor presence. This fixes many bugs relating to turfs in general, especially catwalks and glass flooring. - imageadd: made command envirosuits more consistent +======= + ArcaneMusic: + - bugfix: Double Bedsheets now properly show the bedsheet sprites. + JohnFulpWillard: + - bugfix: Bank machines will now immediately stop withdrawing funds if the machine + is broken or unpowered. + Melbert: + - bugfix: The OOC messages of people with minor admin ranks now respect OOC filters + in chat tabs + - expansion: Two new station traits, Ionic Stormfront and Radiation Stormfront. + They make ion storms and rad storms more common, respectively. + Mickyan: + - code_imp: Vending machines no longer require a unique panel overlay for each new + type + Mothblocks: + - bugfix: Felinids can no longer be head of staff if human authority is required. + - bugfix: The foreigner quirk on felinids now works as it does with all other nonhumans + who have their own languages, rather than also giving Galactic Uncommon. + Sealed101: + - bugfix: fixed a runtime in physical experiments trying to unregister a signal + from a non-existant atom + Timberpoes: + - qol: Ordnance, Ordnance Storage and Atmospherics have been dropped to common-level + accesses, allowing them to be added to any ID card instead of just silver and + specific job trimmed cards. + Watermelon914: + - qol: Allows you to link integrated circuits to component printers and, as a result, + let you print components off remotely which are put directly into your circuit. + esainane: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Pressure Tanks will now refuse to accept materials without a specific material type during construction. - bugfix: Pressure Tanks will now drop the correct amount of materials during deconstruction. @@ -1908,19 +2784,73 @@ a sufficiently pressurized tank despite the warning, rather than doing nothing. - bugfix: Pressure Tanks will release their gas contents when destroyed, rather than voiding them. +<<<<<<< HEAD +======= + - refactor: Reworked `/turf/var/intact` into variables which don't conflate underfloor + visibility, underfloor interactability, and overfloor presence. This fixes many + bugs relating to turfs in general, especially catwalks and glass flooring. + - bugfix: The SM now properly provides bonus power for operating in a low pressure + environment. Make sure you can keep it cool enough, and remember, space or a + vacuum won't work, but it will damage the SM! + - code_imp: Calculations relating to the SM pressure bonus are now derived from + human readable parameters. + jlsnow301: + - rscdel: Removed leftover HTML from spawner menu + - refactor: Spawner menu is now easier to read + - bugfix: The crafting menu now uses scrollable sections, fitting the window regardless + of resize. A little easier to use. + - bugfix: Fixed an issue with the crafting menu not being fully dimmed while crafting. +2021-10-30: + ArcaneMusic: + - bugfix: Metastation once again has power to arrivals. + Horatio22: + - imageadd: made command envirosuits more consistent + KathrinBailey: + - bugfix: Corporate Sofas now have their rear middle sprites fixed to align with + the rest of the rear sofa sprites. + LemonInTheDark: + - bugfix: You're (hopefully) no longer able to make timed singlecaps using nitryl. + I really liked this one honestly, it's got an aggressive amount of heart and + soul +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Timberpoes feat. JohnFulpWillard: - config: Modified how ambiguous VALUE_MODE_FLAG keyed_list config entries are parsed and added additional config logging for when weirdness with keyed_list config entries happens in general. (Timberpoes) - config: /datum/config_entry/keyed_list/probability was unused and has been deleted. (Timberpoes) +<<<<<<< HEAD - bugfix: 'The Cloth Golem preferences profile now works (JohnFulpWillard) qol: The species-changing magic mirror variants now list species names instead of internal code IDs. (JohnFulpWillard) qol: Shadowperson species should now show as "Shadow" instead of "???" (JohnFulpWillard)' +======= + - bugfix: The Cloth Golem preferences profile now works (JohnFulpWillard) + - qol: The species-changing magic mirror variants now list species names instead + of internal code IDs. (JohnFulpWillard) + - qol: Shadowperson species should now show as "Shadow" instead of "???" (JohnFulpWillard) + esainane: + - imageadd: Hot Ice icons are now consistent, and now have an stack icon showing + two pieces for when there are between 17 and 33 pieces in the stack. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-10-31: GoldenAlpharex: - bugfix: You can finally remember how to place down wires again! How did you even forget something so simple? +<<<<<<< HEAD ORCACommander: - bugfix: Hair Dye is Back on the Menu +======= + Krysonism: + - balance: The organic slurry is now retained inside the rat after it is dipped + in welding fuel. + Timberpoes: + - bugfix: Vampires and Dullahans can no longer select Cat ears and Cat tails. You + monsters. + Zytolg: + - expansion: Condition Orange! Severe Seismic Activity Detected! New Gulag Position + Registered! + - rscdel: The remnants of the Old Mining Base are gone. We've always had the crater + observatory. + - qol: New Icebox Terrain +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-11.yml b/html/changelogs/archive/2021-11.yml index 8b0ebadea22..be29cdd0a61 100644 --- a/html/changelogs/archive/2021-11.yml +++ b/html/changelogs/archive/2021-11.yml @@ -1,4 +1,5 @@ 2021-11-01: +<<<<<<< HEAD Gandalf2k15: - rscadd: Items in the loadout menu will now automatically be colourable if they support it. @@ -84,6 +85,34 @@ while keeping them shifty and creepy. - spellcheck: corrected the name of the peripherals control board being secured on the Savannah-Ivanov +======= + MMMiracles: + - bugfix: CMOs on Tramstation start back in their office again + Melbert: + - rscadd: 'Icebox: Engineering and Atmos remapping!' + RandomGamer123: + - bugfix: Swapped positions of a fuel tank and rack in Delta's Auxillary Tech Storage + RaveRadbury: + - bugfix: Vampires and Dullahans can be enabled in the config. + Seris02: + - bugfix: sharding someone no longer causes an invisible dead mob + - qol: the PDA will no longer bother you with a message if all you're doing is closing + the interface while laying down. + - bugfix: fixes a runtime when transferring advanced ids to/from wallets + Timberpoes: + - bugfix: It is no longer possible to add reagents to containers in the BRPED. + Zytolg: + - bugfix: Using leftover funding from the quarter, the Icebox CMO has bought their + staff a dinky medical records laptop. + adamsong: + - code_imp: added check to make sure roleban_delimiter exists on a roleban + - admin: max ban message length added + phasenoisepon: + - bugfix: Vampires can now no longer transform into bat form when their brain is + placed in an MMI +2021-11-02: + Mothblocks: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Radiation is now a status effect, where you are either irradiated or not. When irradiated, you will take constant toxin damage, and irregular burn damage. Radiation is removed once all toxin damage is healed. Standing under @@ -130,6 +159,7 @@ they're already irradiated (or can't be). - balance: Breathing tritium will now irradiate you after a certain amount, as well as deal toxin damage. +<<<<<<< HEAD - code_imp: vampire drain now uses the cooldown system - rscadd: 'There''s a new traitor flavor: The Champions of Evil' - bugfix: Shapeshifting into a Human while in a vent will once again gib you. @@ -142,6 +172,14 @@ 2021-11-04: SkyratBot: - bugfix: Removes a XSS vulnerability while picking religious sect. +======= + phasenoisepon: + - bugfix: admin heals no longer delete all restraints in target's inventory +2021-11-04: + CocaColaTastesGood: + - bugfix: Removes a XSS vulnerability while picking religious sect. + - bugfix: Fixes an exploit that allowed players to arbitrarily spawn any path. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-11-05: ATHATH: - bugfix: Liches (and mortals) can no longer use explosive lances to store grenade @@ -149,6 +187,7 @@ mobs, or effects. As a side effect, you should no longer accidentally trigger your explosive lance on the wrong target by misclicking on a piece of graffiti during the heat of combat. +<<<<<<< HEAD GoldenAlpharex: - bugfix: The titlescreens are now centered again. Melbert: @@ -176,11 +215,23 @@ ReinaCoder: - bugfix: Fixes the two Disco Elysium detectives suits to be non-adjustable SkyratBot: +======= + AndAllThatJazz: + - bugfix: Fluid ducts will no longer duplicate when unwrenched + ArcaneDefence: + - bugfix: Corpses will no longer scream when their limbs melt to the bone in icemoon's + plasma lava + CocaColaTastesGood: + - bugfix: Fixes an exploit that allowed players to disable holodeck safety without + following the proper conditions + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The wine cork fired when champagne is popped open is now a projectile and not a thrown item. It can ricochet on walls and will leave an harmless wine cork item when its trajectory has finished. - bugfix: This also fixes a small exploit with hand-thrown corks knocking people down, which was unintended. +<<<<<<< HEAD - server: Init profiles are now logged separately from standard ones, in init_profiler.json - bugfix: Fixed the curator PDA having some inconsistent-looking icons for slotted in IDs and pAIs. @@ -190,10 +241,56 @@ - bugfix: Radstorms dont mutate people who are immune to rads - admin: Added the color matrix editor. It is available from a dropdown option in an atom's View Variables menu as well as when editing an existing color matrix. +======= + - bugfix: Fixed the curator PDA having some inconsistent-looking icons for slotted + in IDs and pAIs. + - bugfix: Fixed blind mobs not receiving messages for when a food item has finished + baking ("You smell something great / a burnt smell...") + - spellcheck: Added punctuation to the above messages. + Ghommie (taken from an old unused file): + - expansion: Skull and coffin cookies can now be baked. + - expansion: Energy Crossbows and Cryptographic sequencers now have a Halloween + exclusive look. + Guillaume Prata: + - expansion: Security Officers, Detectives and the Warden will now spawn with a + Tablet pre installed with BotKeeper and Crew Manifest. + - qol: "AtmoZphere (tablet program) will show the tile's temperature as both \xB0\ + C and K now." + JohnFulpWillard: + - qol: All prison intercoms on all maps have been standardized! + - bugfix: Delta's dormitories intercoms can now actually be spoken through, as it + is no longer a prison intercom. + - qol: Chaplains can now replace their Altar of the Gods by hitting the Chapel floor + with a Bible. + LemonInTheDark: + - admin: the party alarm now flashes roughly 2.5 times slower + - server: Init profiles are now logged separately from standard ones, in init_profiler.json + Maurukas: + - bugfix: Tramstation's engine and emitters have been correctly rewired. + - bugfix: Extra air alarm in tramstation's engine has been removed + Melbert: + - spellcheck: Dormat -> Dormant + ReinaCoder: + - bugfix: Fixes the two Disco Elysium detectives suits to be non-adjustable + Sealed101: + - bugfix: fixed guns that are supposed to be undroppable (implant guns, guns when + using an anti-drop implant) dropping anyway when you shoot yourself in the leg + due to being Clumsy + Stonetear: + - bugfix: PACMANs could previously be emaged, but now there's a indicator when you + do so successfully. + vincentiusvin: + - bugfix: fixed some buttons having zero width +2021-11-06: + KittyNoodle: + - bugfix: Radstorms dont mutate people who are immune to rads + Seris02: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: custom say emotes, or in other words, radio emotes. The format is for example "screams and shouts*damnit!" with any relevant radio keys, language keys and all that used as normal, for example, ";,o screams and shouts*damnit!" or you can use just the emote, ie, ";screams!*" +<<<<<<< HEAD - bugfix: Corpses will no longer cough, spit, or choke on blood when you hit them in the chest really hard SpaceVampire: @@ -240,12 +337,30 @@ too fast. - imageadd: Added fallback icons for clothing inhands - server: Patches multiple(?) arbitrary file related vulnerabilities +======= + TheBonded: + - bugfix: Corpses will no longer cough, spit, or choke on blood when you hit them + in the chest really hard + TheFakeElon: + - server: Patches multiple(?) arbitrary file related vulnerabilities + Y0SH1M4S73R: + - admin: Added the color matrix editor. It is available from a dropdown option in + an atom's View Variables menu as well as when editing an existing color matrix. +2021-11-07: + Archanial: + - bugfix: mapload works + Bumtickley00: + - bugfix: Cold seiver now quickly heals your radiation instead of quickly killing + you + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed the emissive appearances (basically what you can see even in complete darkness) and possibly other overlays of vending machines being removed when the wire panel is opened/closed. - bugfix: Fixed the random double bed sheets spawners spawning normal bedsheets. - bugfix: Fixed double bed sheets other than the standard white one looking like single bed sheets when dyed. +<<<<<<< HEAD YakumoChen: - bugfix: Trash Piles can spawn in place of Maint Crates once again. dawsonkeyes: @@ -258,6 +373,22 @@ - rscadd: adds in the Hardlight Salve Medicell, please read https://github.com/Skyrat-SS13/Skyrat-tg/pull/9268 for more details. 2021-11-08: +======= + GoldenAlpharex, with some oversight from Timberpoes: + - bugfix: Maps will now correctly be loaded at the start of a round. Hurray! + - code_imp: Improved the code for loading map configs and made it more documented, + while also removing a way to delete config files while I was at it. + JohnFulpWillard: + - bugfix: Godmoded shades should no longer spawn from posessed blades spawning spirits + too fast. + Mickyan: + - imageadd: Added fallback icons for clothing inhands +2021-11-08: + AndrewL97: + - rscadd: unit test for map load + - rscadd: directory param to map load + whitelist for data and _maps + - rscadd: advertising for mojave sun in tg commit logs +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nyksia: - bugfix: aliens can no longer clear eggs before the hugger bursts out Ryll/Shaps: @@ -266,6 +397,7 @@ and can no longer cause outright compound fractures in healthy targets. - bugfix: Throwing someone you have in a neckgrab or are choking will now properly throw them harder than normal. +<<<<<<< HEAD Seris02: - rscadd: Glow in the dark markings/bodyparts/eyes SkyratBot: @@ -289,11 +421,36 @@ tracking those incompatible with illegal cloning technology, which is banned sector-wide. Such records have been expunged. 2021-11-09: +======= + Timberpoes: + - bugfix: Items with dash actions and the Bluespace Prophecy trauma now utilise + proper teleportation code, disallowing teleportation to and from teleport restricted + areas. + Toastgoats: + - spellcheck: Fixed a typo on the singulo toy. + axietheaxolotl: + - bugfix: CentCom's suit using an old icon, and fixed the gas mask and helmet's + icon not showing + esainane: + - bugfix: TramStation now has a ticket dispenser by the HoP line, replacing one + of two very close gas vendors. + - bugfix: TramStation's Engineering Console now has a cable to connect it to the + main powernet. + tralezab: + - bugfix: anonymous names doesn't break anymore! it works! hip hip hooray! +2021-11-09: + Ghommie: + - bugfix: Randomized reagent recipes (so far only metalgen and the secret sauce) + should no longer from time to time require reagents that are normally TOO hard + (emphasis on TOO) to get or unobtainable by non-antag players (e.g. most mutation + toxins, syndie stims, godblood, spores) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Fixed certain preferences being reset to their default values when trying to change them, due to the dropdown menu of options changing numbers into text and due to that not being supported by numeric preferences. AKA, changing pixel scaling method will work again. +<<<<<<< HEAD Melbert: - bugfix: Chaplains can no longer select admin only null rods. PositiveEntropy, Naevii: @@ -302,12 +459,28 @@ - balance: rebalances teshari incomming damage to 20-25% vs the previous of 50%, and gives them a single point more of punch damage so they quit magically rolling 0, don't ask, I also don't know why. +======= + JohnFulpWillard: + - refactor: Bot emagging has been refactored, and as such, their cover can be closed + if forced open by emag if the bot itself hasn't been emagged. + - bugfix: Sergeant-At-Armsky can now be found in Delta's Armory! + Melbert: + - bugfix: Chaplains can no longer select admin only null rods. + Mothblocks: + - qol: Cult pylons, rod of asclepius, and space dragon rifts will now give you an + alert as feedback for when you are being healed by them. + - admin: Adds a panel for "known alts", which let you write down confirmed, valid + alts between two people so that they don't show in suspicious connection history. + PositiveEntropy, Naevii: + - imageadd: Ports BeeStation cloak designs! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - rscadd: Yawns can now propagate and cause other nearby mobs who see it to yawn as well. ShizCalev: - bugfix: Radioactive microlasers will no longer irradiate humans wearing radiation proof clothing. +<<<<<<< HEAD SkyratBot: - imageadd: Turret Control frames now have a dedicated icon, rather than literally using the APC image. @@ -411,6 +584,15 @@ - bugfix: Cyborgs can now shake up compromised carbons with the hugging module. - rscadd: Added antivirus-protection to plasmaman suits and all its variants(the entire set). +======= + V2LenKagamine: + - bugfix: You now drop food trash items on use, putting the actual "Trash" in the + same hand you used the item in. + Watermelon914: + - admin: Admin circuits are now abstract so that they don't appear in lockers when + attached to custom shells and such. + esainane: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Wall mounted and directional objects have undergone major internal simplification. Please report anything unusual! - bugfix: You can no longer stack an indefinite amount of Intercoms on the same @@ -425,6 +607,7 @@ - bugfix: The pixel offsets of Intercoms, Fire Alarms, Fire Extinguisher Cabinets, Flashers, and Newscasters have been made consistent between roundstart and constructed instances. +<<<<<<< HEAD - bugfix: 'Constructed Turret Controls will no longer oddly overhang the wall they were placed on. qol: Defibrillator mounts now better indicate which side of the wall they are on.' @@ -502,6 +685,251 @@ Ebin-Halcyon: - bugfix: Interdyne and DS-2 air alarms/fire alarms are properly oriented, defibrilators are returned to their mounts +======= + - bugfix: Constructed Turret Controls will no longer oddly overhang the wall they + were placed on. + - qol: Defibrillator mounts now better indicate which side of the wall they are + on. + - bugfix: Some instances where there were multiple identical lights on the same + tile have been fixed to only have one. + - imageadd: Turret Control frames now have a dedicated icon, rather than literally + using the APC image. +2021-11-10: + ATHATH: + - bugfix: Quantum pads can teleport non-living things again. + - bugfix: Quantum pads can teleport creatures who aren't buckled to something again. + Creatures who are buckled to something unanchored can still be teleported by + quantum pads, but creatures who are buckled to something anchored cannot. + - bugfix: Quantum pads can no longer involuntarily teleport ghosts, although ghosts + can still click on a quantum pad to teleport to that quantum pad's destination + pad. + ArcaneMusic: + - expansion: Cargo can now purchase individual tanks of exodrone fuel for around + 3 crates worth of credits. + Ghommie: + - bugfix: 'Fixed missing award icons in the achievement menu sprite: All achievements + outside the misc category have been given their own icons and should no longer + use the base background one.' + Guillaume Prata: + - bugfix: A small mistake on our contract with Nakamura Engineering made them supply + the station with Rad Insulated Atmos Hardsuits. The mistake was fixed so please + don't stand near the SM or the HFR with the hardsuit, it was never made for + that. + - bugfix: You can't put a PKA inside your Mining hardsuit helmet anymore but you + can put it in your hardsuit instead! + - balance: Pneumatic airlocks seals are normal sized now and can be printed at the + Science lathe. + - balance: After dealing with another weekly subverted Engborg spacing the armory. + CentCom's Robotics division decided to downgrade the Engborg RCD by removing + it's Reinforced Wall deconstruction. + Iamgoofball: + - bugfix: Fixes a grave oversight of being able to type with boxing gloves on. + JohnFulpWillard: + - admin: Silicon activity is now logged in silicon logs rather than being stuffed + into game.log + LemonInTheDark: + - bugfix: Fixed shoving being agressively weird, please report any oddities it's + a bit of a headache getting behavior to match and I'm flying a bit blind + Melbert: + - admin: Admins can now tell when other admins are readied up in the pre-game lobby. + Check adminwho or view your stat panel. + - bugfix: Icebox chapel maint is no longer spaced, literally + - bugfix: 'Icebox science: You can no longer peer into the science break room from + maintenance, the loose light fixture has been relocated to a wall, and scientists + can escape their own maintenance. Also the extra deconstructive analyzer was + killed.' + NamelessFairy: + - admin: Bans will nolonger play a video + Paxilmaniac: + - bugfix: a misplaced pipe in tramstation's atmospherics that was causing wrenched + down portable scrubbers to melt has been removed + That REALLY Good Soda Flavor: + - qol: You can drag a headset onto yourself to open the menu. + Timberpoes: + - refactor: Refactor parts of the job assignment system, unifying job eligibility + checks. + - qol: Adds improved logging for job assignment. + Wallem: + - qol: Ants have become easier to pour in tiles with vents, pipes or cables. + - bugfix: Makes ants incapable of affecting the afterlife. + - bugfix: Ants, gibs, and garbage cleanable decals now properly show up above pipes. + Watermelon914: + - bugfix: Fixed the response signal not being able to be connected to regular signals. + antropod: + - bugfix: fixed chem analyzer not showing impure reagents that don't have impure + chem (like multiver) + jjpark-kb: + - bugfix: 'metastation: placed some missing pipes and removed random wire in library' + jlsnow301: + - bugfix: Virology's PanD.E.M.I.C 2200 should no longer bluescreen + - refactor: The Pandemic machine has been refreshed and is more helpful, intuitive + to use. + timothymtorres: + - expansion: The smoker quirk has new side effects that cause a person's lungs to + have 25% less max health and healing. They also gain a 50% resistance from + lung damage caused from smoking. + - expansion: Exotic cigarette brands now deal different amounts of lung damage. + This applies to syndicate, shady jim's, xeno, and Little Timmy's Candy brands. + - bugfix: Fixed Havana cigars running out of nicotine. As a result of increasing + the starting nicotine amount, the total `chem_volume` was increased to allow + room for other chems to still be injected. +2021-11-11: + ATHATH: + - bugfix: The gluttony sin ruin is no longer radioactive. + Ghilker: + - expansion: add the manual crafting of many atmos devices by the crafting menu + Ghommie: + - expansion: Added a reagents scanner circuit component. + - bugfix: Fixed non-human and non-silicon mobs being unable to mine rock walls when + bumping into them. + - bugfix: The phobia of authority will no longer make mobs afraid of regular id + cards. + - expansion: Added a material scanner circuit component. + - bugfix: Stops the "You lack optic scanners, you get stunned" singularity event + from affecting blinded or dead mobs. + - bugfix: Blob structures can no longer be animated with bolts of animation. + - bugfix: Chimps no longer get grumpy when you hug them or throw things with no + throw force at them. + Guillaume Prata: + - balance: Due to budget cuts, the RPDs can't place transit tube under dense objects + like windows anymore. + JohnFulpWillard: + - admin: Priming grenades are now logged in individual's attack logs. + Justice12354: + - bugfix: Cyborgs can now shake up compromised carbons with the hugging module. + Krysonism: + - imageadd: The irradiated status effect has a new alert sprite. + LemonInTheDark: + - balance: The nob + antinob hfr fuel type is now limited to 1e8 instead of 1e8 + * 1.2 + Mothblocks: + - bugfix: Random names (such as from the secrets panel) will no longer override + your preferences. + Paxilmaniac: + - qol: the whiteship of tram station has been made much shorter, allowing for less + lag on movement and easier docking + Tastyfish: + - bugfix: The "Choking (No N2O)" alert now functions correctly. + darkmanx37: + - qol: Adamantine will now use it's own texture with color consistent to one of + the adamantine slime. + - imageadd: Adamantine textures. + remuluson2: + - rscadd: Added antivirus-protection to plasmaman suits and all its variants(the + entire set). + softcerv: + - bugfix: fixes the fall chance on mending globules to properly work as intended. +2021-11-12: + CocaColaTastesGood: + - bugfix: Fixes an exploit that allowed players to spawn crates marked as special. + Fikou: + - qol: spraycanning stuff now updates its sprites on the mob + Ghommie: + - expansion: The weapon description for energy guns now takes in consideration the + number of pellets the selected mode has. + Ghommie and MrDoomBringer: + - balance: The Syndicate's Robotics Division is glad to announce their line of Syndicate + Saboteur cyborgs hasn't been affected by CentCom's Robotics decision to downgrade + the Engiborg RCDs. This is because The Syndicate is not CentCom or Nanotrasen + despite what some tinfoil hat-wearing billies-bobs may say. + KathyRyals: + - rscadd: Felinids don't like getting sprayed with water. + - code_imp: Adds a new status effect, incapacitated, which causes your do_afters + to stop. + Melbert: + - rscadd: 'Kilostation: Cargo / Drone Bay remap, departures expansion.' + Mothblocks: + - bugfix: Antag HUDs will no longer clear on deconversion if the player was another + antag. + - qol: Antag HUDs (as seen by admins and at the round end) will now animate between + all antagonists, rather than just choosing the most latest. + Y0SH1M4S73R: + - bugfix: The color matrix editor now logs all modifications it makes to colors. + jlsnow301: + - rscadd: Vending machines now have nicer welcome screens + - refactor: Vending machine UIs now do not hide bank balance information while scrolling +2021-11-13: + CocaColaTastesGood: + - bugfix: Fixes an exploit in chef order console that let players potentially lag + the server. + - bugfix: Fixes an exploit that allowed players to purchase role restricted uplink + items that they shouldn't be able too. + KathyRyals: + - rscadd: You can now pull on a felinid's tail to make them happy! + Mothblocks: + - bugfix: Fixed traitor uplinks not letting you buy items that aren't restricted. + NamelessFairy: + - bugfix: CTF Downtowns bar stools face the right way now + - bugfix: CTF Downtowns bar stools have been bolted onto to the floor for insurance + purposes + RandomGamer123: + - bugfix: Scrubbers attached to the dorms public scrubber stations won't immediately + self-destruct from thermomachine waste heat anymore. + - bugfix: The Mix to Incinerator pipeline no longer interferes with HFR construction + in Tram atmospherics. + - qol: Adds N2 to Pure pump and pipes in Tram atmospherics. + - qol: Recolours Mix to Incinerator pipeline to dark rather than orange in Tram + atmospherics to match colouring scheme on other stations. + - qol: Renames old N2 to Pure pump to Air to Pure to reflect that it gives air mix + not N2. + Timberpoes: + - bugfix: The account registration device should no longer create ID cards that + cause vending machines to bluescreen. + - rscdel: Cryostasis pods have been removed from all maps and code. + Toastgoats: + - imageadd: Resprited hatchet inhands and made them face outwards. + esainane: + - spellcheck: Fixed a typo when resetting a multilayer cable + - bugfix: Some diagonal cameras are back to being placed on walls, instead of floating. + - bugfix: When it gets too much, ending it all with an atmospherics piece will now + always do something special. + tralezab: + - rscadd: replaced the request consoles in each department with department order + consoles, which order for free on a cooldown. cargo gets these orders and delivers + the crates, which are locked until delivery. upon delivery, cargo gets paid + the value of the crate, and can then sell the crate back on the shuttle. + - balance: cargo doesn't start with a budget, other departments get what their budget + was split up amongst them +2021-11-14: + Ghommie: + - bugfix: Fixed some potential issues that may lock the economy subsystem in "market + crashing" mode or accidentally clear it. + Iamgoofball: + - balance: Nerfs the felinid tail grab mood buff. + JohnFulpWillard: + - bugfix: Changelings no longer get sent to Argentina when using last resort + - bugfix: Blind people and those without eyes are no longer affected by changeling's + last resort explosion. + Nanotrasen Medi-Sciences Division: + - qol: The medical holobarrier is slightly transparent to convey you can move through + it, as well as more animated! + TheFakeElon: + - code_imp: protects the filename global regex + Thunder12345: + - expansion: The option to choose your body type is now available to all characters + (with a gendered species) + - bugfix: You can no longer access the body type option on genderless species by + setting your gender to other then changing species. + necromanceranne: + - bugfix: You now only go on click cooldown if you actually threw something. + timothymtorres: + - qol: Crates that spawn in maintenance are now more randomized +2021-11-15: + Arturlang: + - bugfix: The witchunter hat no longer hides your hair + Fikou: + - balance: space adaptation has been split into two mutations. pressure adaptation + giving you full immunity to pressure and temperature adaptation giving you full + immunity to temperature. these are not compatible with each other. + Ghilker: + - balance: Increase the CO2 SM heat penalty to 6 + Ghommie: + - bugfix: You can no longer challenge multiple elite mining mobs at once and get + potentially warped between two arenas because of it. + - bugfix: You can now lose against elite mining mobs even if you can't die (cough + cough Memento Mori) if you're over the minus 200 health threshold. Be careful + not to bite the dust. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ghommie (Thanks to dorsisdwarf for the idea): - balance: The detomatix cart now sends forged messages (name and job of the message can also be forged) that can explode a PDA when someone tries to reply to them @@ -509,6 +937,7 @@ instead of detonating the PDA right off the bat. Because of this and the possibility that a portion of these messages goes "unreplied", the TC cost of the item has also been reduced to 4 and the number of charges upped to 6. +<<<<<<< HEAD GoldenAlpharex: - bugfix: Mentors will now no longer get de-mentored by default. ORCACommander: @@ -571,10 +1000,41 @@ SkyratBot: - bugfix: cargo consoles aren't breaking when department orders buys a canister. seriously though who buys canisters man +======= + Mothblocks: + - bugfix: Team antag HUDs will now properly display when they should, and won't + display when they shouldn't. + - bugfix: Antag HUDs will now properly show on round end again. + jlsnow301: + - rscadd: All of your favorite simple bot friends aboard the station now have a + much better interface in TGUI + - qol: You can now lock and unlock bots, including their maintenance hatches, via + the UI. + tralezab: + - expansion: Traitor Flavor now displays on round end! +2021-11-16: + FernandoJ8: + - qol: changes the access requirement of chem lockers from chemistry access to pharmacy + access + Ghommie: + - expansion: Hydroponics tray USB port. + - expansion: Double beds can now hold two people at a time. + - balance: Double beds and double bedsheets, being double the size of normal beds + and bedsheets, just like their names suggest, now also cost double the materials + to craft and give double the materials when deconstructed. + Iamgoofball: + - balance: Gives Space Pirates a bonus to hijack speed on the shuttle, and allows + them to hijack. + Mickyan: + - balance: Wings now allow falling short distances without taking damage (you will + still suffer from knockdown) + RandomGamer123: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes the HFR (and other indestructible machinery with component parts) from being able to be blown up by external sources under special conditions. - bugfix: Fixes the nuke disk from being able to be made inaccessible by being placed in the center of the HFR. +<<<<<<< HEAD - balance: Gives Space Pirates a bonus to hijack speed on the shuttle, and allows them to hijack. - bugfix: Fixed the foreach and filter circuit component not functioning correctly. @@ -602,10 +1062,41 @@ - rscadd: Added /datum/design/component/list_assoc_literal - bugfix: Pure Inacusiate is now humanly possible to create - bugfix: Truly pure Multiver is much easier to achieve now +======= + Thunder12345: + - bugfix: Atheists will no longer mistakenly attempt to get closer to a god they + do not believe in when committing suicide with their fedora + Watermelon914: + - bugfix: Fixed the foreach and filter circuit component not functioning correctly. + itseasytosee: + - imageadd: added a sprite for the sectile when worn on your belt. + - expansion: The Nanotrasen High Impact Weapons Division would like to apologize + for manufacturing a large quantity of dud onboard nuclear warheads. Following + a recall, we expect that the replacement batch of warheads will be 900% more + likely to Anhilate all life within its radius. + tralezab: + - bugfix: cargo consoles aren't breaking when department orders buys a canister. + seriously though who buys canisters man +2021-11-17: + Ghommie: + - qol: (Slower) Mobs won't look so jittery while being moved by the tram anymore. + - qol: This also applies to the tram itself. + GoldenAlpharex: + - code_imp: Improved the comfy chair's armrest code. + Krysonism: + - expansion: Small and large plates have been added to the kitchen vend. + - expansion: Plates will now break when thrown. + - expansion: Carpskin suits and fedoras can now be crafted using carp scales. + LordVollkorn: + - bugfix: Pure Inacusiate is now humanly possible to create + - bugfix: Truly pure Multiver is much easier to achieve now + Paxilmaniac: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the marine ert is no longer as vulnerable to atmospheric problems as before - imageadd: a new centcom themed combat uniform - imageadd: objectively better looking marine armor +<<<<<<< HEAD - bugfix: Atheists will no longer mistakenly attempt to get closer to a god they do not believe in when committing suicide with their fedora - bugfix: Special air alarms (syndicate, ruins, unlocked, engine, etc) should now @@ -626,10 +1117,60 @@ - code_imp: many spans to procs - bugfix: Departmental order consoles are now present on station 2021-11-28: +======= + RaveRadbury: + - qol: You can now load plates onto trays + UnokiAs: + - imageadd: New barrier grenade sprite + - qol: Easier to differentiate the barrier grenade and flashbang + WarlockD: + - rscadd: Added /datum/design/component/list_assoc_literal + esainane: + - bugfix: UpdatePaths will now handle lists that contain strings. + - bugfix: Some diagonal cameras are back to being placed on walls, instead of floating. + For real this time, honest. + - bugfix: Special air alarms (syndicate, ruins, unlocked, engine, etc) should now + all be facing the correct direction. + - bugfix: IceBox's Mixing Chamber air alarm is now placed on the correct tile. + tralezab: + - rscadd: Added two new fish to the aquarium +2021-11-18: + Archemagus (aka Laxesh): + - bugfix: Now floorbot, will try to fix floors, not only when emagged. + Ghilker: + - rscdel: change the name of the "Cosa Nostra Starter Pack" to a more generic "Mafioso + Starter Pack", remove racist innuendo in the description + - rscdel: removed nitryl + - rscdel: removed stimulum + - balance: merged the two into nitryum that shares the two gases features and that + can make a crystal of itself in the crystallizer, the gas is made with trit, + nitrogen and bz at over 1500 K + - balance: the gas effect can be chosen by the partial pressure of the gas, low + pressure and you have the old nitryl effect, higher and you'll have both + Ghommie: + - bugfix: Fixed some issues with the PDA UI, such as the skill tracker app and the + messages list of the messenger app being inaccessible. + - balance: The HoS, warden and officers no longer spawn with a stunbaton in their + bags. + GoldenAlpharex: + - bugfix: Quantum pads have had their blueprint tweaked by Nanotrasen's finest Bluespace + Technicians, and will no longer break the laws of teleportation by teleporting + themselves when they shouldn't. + esainane: + - admin: The camera report verb now works... at least as well as it used to. + itseasytosee: + - bugfix: The correct cinematic now plays when nuke ops fail to escape the station + after blowing it up. + tralezab: + - bugfix: fixes an oversight where mime and clown couldn't use their own department + orders console +2021-11-19: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - bugfix: Hulk punches now count as unarmed attacks for the purposes of blocking. - bugfix: Martial arts that grant their users the ability to block unarmed and melee attacks while they're in throw mode can now block hulk punches. +<<<<<<< HEAD Archemagus (aka Laxesh): - bugfix: Now floorbot, will try to fix floors, not only when emagged. ArdentSpark: @@ -644,10 +1185,229 @@ AyyRobotics(Original PR), AzlanonPC(Sprites), Aspev(SafetyMoth): - rscadd: Added Safety Mothposters! - imageadd: Updated contraband.dmi to add new poster icons. +======= + Archanial: + - bugfix: fixed stealthadmin nicknames should load now + Farquaar: + - imageadd: Added a contraband advert for a seedy lumber company + Ghommie: + - expansion: The "Ian's Adventure" station trait now makes Ian deadchat controllable + and gives him a couple extra lives (to survive early round tiding) + - bugfix: Cargo exports will now start deleting items only after everything is sold. + This will fix issues such as unachievable exports (like machine ones) and getting + less credits than what export scanners says. + - bugfix: Pacifists can no longer attach c4 to other living creatures. + JohnFulpWillard: + - bugfix: Cyborgs who perform research is now logged in the RD's server console, + rather than showing up as Unknown. + Tastyfish: + - bugfix: The crew monitor and crew manifest now correctly sort custom jobs according + to ID trim. + - refactor: Data cores now internally track ID trim when HoP updates cards, as well + as initial job. + - admin: The secrets manifest now also shows the registered trim for each player. + necromanceranne: + - bugfix: Having the bad touch trait correctly prevents you from gaining a good + mood event from being tail pulled. + phasenoisepon: + - rscadd: Wooden pews now require a wrench in hand to be rotated + timothymtorres: + - qol: Tracking beacons are now randomized (except arrivals) and added to several + new areas for all maps. + twilightwanderer: + - rscadd: Added a system of forms and the ability to print them +2021-11-20: + BlueMemesauce: + - bugfix: Metastation Cargo Warehouse Airlocks will no longer have a chance to become + bolted or turn into a wall + Fhaxaris: + - rscadd: If a clown car picks up a person that drank more than 30u of Irish Car + Bomb, the clown car will explode five seconds later in a half max cap sized + explosion. + Ghommie: + - bugfix: Donuts found in sec vendors and boxes can now be used to make glazed donuts + - bugfix: Fixed emptied shot glasses having the drinking glass filling icon. + Guillaume Prata: + - balance: To improve the forensics efforts and professionalism our Security staff, + evidence bags are standard equipment given to every member of security now. + Melbert: + - bugfix: Icebox mining outpost's doors are powered properly + - bugfix: Icebox service sinks are plumbed correctly and don't have ducts sticking + out, also botany no longer has ducts around trays + - bugfix: Icebox kitchen now has universal enzyme + TacticalTortoise: + - bugfix: Deltastation - Teleporter room shutter button opened the wrong shutter + - bugfix: Iceboxstation - Service exit to Iceland was not properly marked + - bugfix: Kilostation - Kitchen shutters were not affected by button + TheBonded: + - bugfix: Aspiring xenobiologists and ambitious wizards can no longer mindswap into + ghost poly or otherwise make them sentient in an attempt to gain godmode + ghost + speed + the ability to go through walls. + Watermelon914: + - expansion: Shells that require anchoring to work now take their power from the + room's APC rather than their cell. They can still use their cell as a backup + battery. If they take too much power in a short period of time, they'll blow + up and eject the circuit. You can examine the shell to see if it requires a + cell to function. + jlsnow301: + - bugfix: Fixed some logic errors in vendor prices. Offstation items are free once + again. Discounted items still give + - bugfix: Crafting while in the crafting menu now properly dims the entire crafting + list. + - bugfix: Mulebots no longer runtime + raffclar: + - bugfix: When a TGUI web page is refreshed, send new data to that page. + timothymtorres: + - qol: Add several new cosmetic random spawners to Tramstation that affect different + locations. (mostly maint) + - qol: Add several new cosmetic random spawners to Metastation that affect different + locations. (mostly maint) +2021-11-21: + Burgermancoding: + - code_imp: Change the description and name of the Mafia set from cargo back to + Cosa Nostra + Timberpoes: + - admin: Non-deadminned admins are now exempt from all chat filters. + Watermelon914: + - admin: Players can now send urgent ahelps when no admins are on for potentially + better responses. + Zytolg: + - expansion: Renovations on the Cosmos Space Hotel in the local sector have been + completed. + esainane: + - bugfix: All wall mounted dispensers - that is, the virus food dispenser and the + pepper spray dispenser - are now considered wall items, instead of just the + pepper spray dispenser. You can no longer use a metal sheet on it to turn it + into a plumbed "stationary dispenser". You can still use metal sheets on mobile + tanks to turn them into plumbed stationary dispensers. + vincentiusvin: + - bugfix: fixed icebox ordnance burn chamber's air alarm working for the wrong area +2021-11-22: + Colovorat: + - expansion: Stun Batong now turns off/on constantly for short time after emp + GoldenAlpharex: + - bugfix: Votes now work again. + JohnFulpWillard: + - bugfix: Missing HUD icons (Defib, clown/mime fan) once again show up. + Wallem: + - bugfix: People with robotic limbs are now incapable of using Sign Language if + their limbs are disabled. + - refactor: Refactored Sign Language +2021-11-23: + ArcaneMusic: + - expansion: Laundry machines can shrink particularly old, worn t-shirts. Remember + kids, hand wash only. + AyyRobotics(Original PR), AzlanonPC(Sprites), Aspev(SafetyMoth): + - rscadd: Added Safety Mothposters! + - imageadd: Updated contraband.dmi to add new poster icons. + BlueMemesauce: + - qol: Adds Supply Request Consoles to cargo lobbies. + Colovorat: + - qol: Bonfire can be made with wood + Farquaar: + - imageadd: Due to lobbying pressure from the Yee-haw Conservation Society, Nanotrasen + vending machines now stock five new cowboy hats and an old-west vest. + Ghommie: + - bugfix: Fixed a mistake that made space bartenders sad (drinking glasses looking + all the same regardless of drink). + - bugfix: Hair gradient preference no longer shows for species that don't have hair + - bugfix: Abandoned crates no longer delete living mobs or indestructible objects + inside them when exploding. + - bugfix: They also no longer explode when deconstructed/emagged while unlocked. + - bugfix: Their anti-tampering mechanism will now properly reactive if locked again + after being unlocked. + GoldenAlpharex: + - bugfix: Areas loaded from map templates should generate their lighting objects + upon being loaded, which means that admin or game-spawned map templates will + now have functional lights. + Iamgoofball: + - expansion: The bureaucratic mistake station trait can now truly chose any job. + Melbert: + - bugfix: Harvesting plants says the correct number of produce again + - bugfix: Fixes random ice turf in icebox's bar + Ryll/Shaps: + - expansion: You can now *swear + axietheaxolotl: + - imageadd: new and redone HoP uniforms +2021-11-24: + Ghilker: + - bugfix: fix message spam for manual pipe crafting + - code_imp: space heater now process on process_atmos() + Ghommie: + - spellcheck: Fixed a mistake in the Drone repair message feedback when repaired + by someone else. + - expansion: Handheld cameras (not the wallmounted security ones) can now be used + as circuit shells. + - bugfix: Lavaland ash storms once again replenish basalt turfs. + - bugfix: Vampire victims no longer receive messages about bloodsucking while unconscious. + Guillaume Prata: + - expansion: Ethereal lungs can be printed with a limb grower now. + LemonInTheDark: + - bugfix: Fixes the master controller dying in a rare case of the godslayer armor + Melbert: + - refactor: Refactored cult rune inscribing into a component + - refactor: Refactored null rod rune clearing into a component + Mothblocks: + - admin: The admin who adds a known alt is now logged in the table. + - rscadd: Added a station trait for varying colored assistant jumpsuits. + - admin: Added options to disable footstep sounds and parallax to the lag switch + panel. + - bugfix: Fixed comms console not acknowledging admin rejects. + - bugfix: Fix the space dragon's rift not healing the dragon. + OrionTheFox: + - bugfix: Catwalk Tiles will now properly show underfloor items + PositiveEntropy: + - imageadd: Resprites the Black, Red and Blue lawyer suits! + - expansion: Adds the Good Lawyer Suit, for those who truly want to be a CRIMINAL + lawyer! + - rscdel: Removes the Black Female Suit and Black Female Suit Skirt + RandomGamer123: + - bugfix: Certain pumps/filters in atmospherics and engineering now show their more + descriptive names which haven't been showing up properly for months. + Seris02: + - code_imp: better logic for plural_s() + Wallem: + - expansion: Glass & Reinforced glass floors are now craftable. + dragomagol: + - admin: hypnotized players now have a visible antag hud, are visible in the check + antag panel, and have objectives visible on the traitor panel + - expansion: hypnotized victims and their objectives are now visible on the round + end report + tralezab: + - rscdel: Batform is gone! + - rscadd: "...Replaced by vampire houses as a preference. Join your department as\ + \ a vampire m\xE9nage!" + - bugfix: department order consoles include circuitboards +2021-11-25: + Drag: + - expansion: Changes "says" to "chirps" for all slimeperson subtypes + Mothblocks: + - bugfix: Fixed vampire clan last names applying to everyone. + ShizCalev: + - bugfix: Fixed ghosts' boo ability going on cooldown when the light they tried + to flicker didn't flick + SuperNovaa41: + - bugfix: Armless people can now open emergency access doors. + - bugfix: You can tie your shoes in-hand again. + - bugfix: You can no longer try to tie lace-less shoes. + - bugfix: Toy shotguns (and toy crossbows) can be fired with only one hand again. + TheBonded: + - qol: Spades can now be used to dig up botanical soil plots as well as shovels. + - qol: Digging up botanical soil plots has been changed to a right click action. + Left clicking with a spade still uproots plants as expected. + tastyfish: + - bugfix: The captain is now at the top of the crew monitor again. + tralezab: + - bugfix: fixes non-chaplains being able to invoke rites + "\u041F\u0435\u043B\u044C\u043C\u0435\u0448\u043A\u0430": + - bugfix: You could see parallax over blackness +2021-11-26: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 BastardBlaster: - bugfix: Cyborgs and those with rad immunity will no longer get the radiation burn message when near something being dusted by the supermatter. - spellcheck: Rewrote some messages when near something that was dusted by the SM +<<<<<<< HEAD Cobalt, Ramirez, Flavrius: - rscadd: A new ERT type, the NRI. Gandalf2k15: @@ -758,6 +1518,14 @@ - code_imp: space heater now process on process_atmos() - bugfix: fixed stealthadmin nicknames should load now - bugfix: department order consoles include circuitboards +======= + KathyRyals: + - balance: Heretics no longer gib their target when sacrificing them, instead outright + killing them and spilling all their organs everywhere in a gruesome manner. + Melbert: + - bugfix: Spading plants correctly updates the tray icon again + Mothblocks: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added back dissection surgery, which can be used with an operating computer to perform experiments for research. - rscadd: Biological technology's requirement has been changed from scanning one @@ -766,6 +1534,7 @@ extracts to performing a dissection surgery on a nonhuman. - rscadd: Xeno-organ biology and Alien Biological Tools' now have additional discounts for performing a dissection surgery on a xenomorph. +<<<<<<< HEAD - bugfix: Some things such as heretic influences won't spawn on open space anymore. - rscadd: Wooden pews now require a wrench in hand to be rotated - admin: The admin who adds a known alt is now logged in the table. @@ -981,6 +1750,86 @@ zydras: - balance: Quartermaster now requires 40hr of Supply playtime, like every other Department Head requiring 40h of their department's. +======= + PositiveEntropy: + - imageadd: In no short effort of our best tailors, every Central Command outfit + have been either redesigned or reshaded! All of them! + TheBonded: + - qol: Chairs and beds are now deconstructed with right click, making them more + consistent with other object deconstructions. + itseasytosee: + - imageadd: added new sprites for the energy axe + jlsnow301: + - bugfix: 'Scams Deleted: You will no longer be charged full price for items listed + as discounted in the vendor.' +2021-11-27: + Gandalf2k15: + - balance: Diagonal movement is now slightly faster + Ghommie: + - expansion: Gradients can now be applied to facial hair too. + - expansion: 'Two new hair gradients: Striped horizontal and Striped vertical.' + - bugfix: Fixed the dye kit missing a lot of checks which made it able to dye mobs + out of reach or while incapacitated. + - bugfix: Fixed clown mobs spawning banana peels on turfs they can't reach or while + inside objects. + - bugfix: Some things such as heretic influences won't spawn on open space anymore. + HarseTheef: + - bugfix: The space heater right click toggle now works correctly. + - bugfix: Pipe layer changes now occur on right + alt click + JohnFulpWillard: + - bugfix: Bots will no longer turn invisible when being turned on/off + Melbert: + - expansion: The Fission360 has been upgraded, operatives. Examining a tablet running + the Fission360 when a bomb is armed will show you the time remaining until detonation, + and it can now point back to the Infiltrator. Hopefully you'll stop missing + your pinpointers now. + - expansion: The Syndicate Infiltrator is now a point of interest in the orbit menu + that ghosts can jump to. + OrionTheFox: + - rscadd: Added new reskins of the Catwalk Tiles, which will blend better with other + types of floor! These can be selected via a radial on the base catwalk tile, + crafted with iron rods. + - expansion: Floorbots will automatically place catwalks when they're in a maintenance + area, and will repair damaged/burnt tiles rather than fully replacing them. + - bugfix: Floorbots will actually place a plating when repairing a breach with tiles, + rather than haphazardly laying a tile that has space below it. + cacogen: + - rscadd: Adds timezones to US Thanksgiving so it's active on the server when it's + celebrated in real life + carshalash: + - expansion: Abductors now have a limb grower to play with, for scientific purposes. + Brain traumas are no longer forced after abductions. + tralezab: + - bugfix: prison plates have fixed text in some interactions +2021-11-28: + Ghommie: + - expansion: Falling for a pda bomb will now net you an achievement. + MMMiracles: + - expansion: Tramstation's Security has been transformed to accommodate a genpop + prisoners of all kinds to mingle together. + - rscadd: Genpop removes the usual isolated timed cells and adds the ability to + assign timers to prisoner IDs for holding them in a general prison area. + Mothblocks: + - bugfix: Fixed tend wounds being inacessible without an operating table + computer. + alexkar598: + - bugfix: Fixed the bitfield_to_field() proc not working + tf-4: + - code_imp: GAR glasses are now (mostly) subtypes rather than all their own thing + - qol: GAR glasses now layer above hair, rather than under it. +2021-11-29: + Ghommie: + - bugfix: 'Fixed yet another couple TK teleportation tricks: airlock notes and cloth + cut from gauzes.' + - bugfix: The camera circuit will now actually work. + MMMiracles: + - bugfix: The Tramstation Tram no longer force unbuckles you from chairs/vehicles + when moving. + Pickle-Coding: + - spellcheck: Captain's wintercoat now has spaces separating between some words. + tralezab: + - rscadd: Malfunctioning Ais now roll for backstory, much like traitors! + - expansion: Malfunctioning Ais now get a unique antag panel! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-11-30: GoldenAlpharex: - bugfix: Elevators are no longer defying the laws of physics and therefore can @@ -990,6 +1839,7 @@ to prevent more physics-defying operations. - code_imp: Improved the industrial lift code by adding documentation and trying to enforce the coding standards in there while I was at it. +<<<<<<< HEAD MMMiracles: - bugfix: The Tramstation Tram no longer force unbuckles you from chairs/vehicles when moving. @@ -999,3 +1849,11 @@ - bugfix: Some erroneous green paint has been scraped off the hydroponics airlocks. - imageadd: The blast cannon & blast wave projectile has new sprites. - bugfix: The camera circuit will now actually work. +======= + Krysonism: + - imageadd: The blast cannon & blast wave projectile has new sprites. + Melbert: + - rscadd: Deltastation - Service and arrivals complete revamp! Cargo tweaks! + Thunder12345: + - bugfix: Some erroneous green paint has been scraped off the hydroponics airlocks. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-12.yml b/html/changelogs/archive/2021-12.yml index 3bf2ee67696..8d5c6a78f77 100644 --- a/html/changelogs/archive/2021-12.yml +++ b/html/changelogs/archive/2021-12.yml @@ -1,19 +1,38 @@ 2021-12-01: +<<<<<<< HEAD SkyratBot: - imageadd: Resprited the lipsticks +======= + FernandoJ8: + - imageadd: Resprited the lipsticks + Fikou: + - bugfix: fullauto now checks for incapacitated instead of stat + HarseTheef: + - bugfix: Baseball bats now correctly knockback targets in the direction of the + bat to the target. + Mothblocks: + - bugfix: Fixed nuke ops leader not having an antag HUD to other nuke ops. + Sealed101: + - expansion: Added ventriloquism to disembodied heads. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: pAI interfaces have been converted to TGUI. - refactor: Requesting a holographic pAI friend now correctly notifies ghosts of your loneliness. - rscadd: pAI door jacks have been given a bit more UI feedback. - rscdel: Requesting and downloading a pAI no longer uses two separate screens. +<<<<<<< HEAD - bugfix: Fixed nuke ops leader not having an antag HUD to other nuke ops. - bugfix: Baseball bats now correctly knockback targets in the direction of the bat to the target. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tastyfish: - bugfix: Cleanbots no longer disappear. - bugfix: Fixed edgecase causing PDA Skill Tracker to hard lock the PDA as your reward for getting legendary level. 2021-12-02: +<<<<<<< HEAD Ebin-Halcyon: - imageadd: Winter Hardsuit EVA sprite changes - bugfix: Winter Hardsuit tails now color themselves correctly @@ -44,6 +63,45 @@ - bugfix: Fix telecomms relays to work across multi-z - bugfix: Fixes an exploit with regenerative mesh and burn wounds. - code_imp: increased atmos performances a bit more +======= + Aerden: + - bugfix: Fixed being scared of the dark even if you have mesons. + Ghilker: + - code_imp: increased atmos performances a bit more + - balance: gasmasks give a slightly darkening overlay, effect will stack with other + items that have tint. + - code_imp: tint code has been updated to properly work. + Ghommie: + - expansion: Synthesizers and headphones can now have circuits installed. + - bugfix: The ship-in-a-bottle is now resistant to icebox/snowdin plasma rivers. + GoldenAlpharex: + - bugfix: Numpad keys are now properly recognized by the keybinds menu. + Guillaume Prata: + - expansion: After a short break, the Supermatter is back again at the her hard + working and slightly different Pluoxium generation business. + - bugfix: Swaps the engineer jumpsuit description still referencing them being resistant + to radiation, now it correctly reference them being resistant to fire. + - bugfix: Fixes a rogue airlock at the SM room on Icebox having the wrong access + requirement. + Iamgoofball: + - balance: Downgrades the purchasable knives in cargo from Combat Knives to Survival + Knives, moves them from Security to Service. + JohnFulpWillard: + - balance: the Head of Personnel no longer has access to Security Office nor Mechs + (outside of mining ones). + Melbert: + - bugfix: Mjol the Creative's summons can't be dispelled by observers anymore + - bugfix: There is now the proper amount of ORMs in Deltastation's Cargo. + - bugfix: Service jobs can leave the Deltastation Service Hall through maintenance + Mothblocks: + - balance: The Irish Car Bomb + clown car interaction has been nerfed from a big + gibbing explosion to throwing out all the mobs (with the usual chance of spilling + out slipping foam) + OrionTheFox: + - qol: Catwalk Tiles now have unique names, so hovering over them in the radial + menu will tell you the type! They're also recyclable now! + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Proto nitrate BZ reaction will now produce gases, instead of just deleting BZ. The gases it produces is nitrogen, helium, and plasma. - balance: Tritium combustion and proto nitrate tritium response will release radiation @@ -58,6 +116,7 @@ - balance: Proto nitrate BZ response hallucination and gas production now occur at the same time, instead of hallucinations only appearing below 30 moles and gas production + radiation (previously it just deleted BZ) above 30 moles. +<<<<<<< HEAD - bugfix: tanks being destroyed in cans/pumps/scrubbers wont cause errors now - bugfix: ED-209s can be constructed once more! - bugfix: The ship-in-a-bottle is now resistant to icebox/snowdin plasma rivers. @@ -74,11 +133,41 @@ - bugfix: The lathe in Deltastation's service hall can print circuit boards again. Reco201: - bugfix: Cyborg pka can now be seen again. +======= + SuperNovaa41: + - bugfix: Fixes an exploit with regenerative mesh and burn wounds. + Tastyfish: + - spellcheck: Made reagents consistently capitalized. + Thunder12345: + - expansion: Tram Station's vault has been moved to the service wing, next to tool + storage. + Timberpoes: + - admin: Improved logging for radio emotes in game logs and player panel logs. + Twaticus: + - imageadd: Makes mob ID sprites smaller, mob PDA sprites more consistent + dragomagol: + - bugfix: ED-209s can be constructed once more! + tf-4: + - bugfix: TK can no longer be used to teleport onto weight machines. + timothymtorres: + - bugfix: Fix telecomms relays to work across multi-z + vincentiusvin: + - bugfix: tanks being destroyed in cans/pumps/scrubbers wont cause errors now +2021-12-03: + AffectedArc07: + - bugfix: Fixed some bugged lighting + Ghommie: + - bugfix: Fixes the cult sacrifice softlocking if the target is deleted before being + sacced. It'll reroll a new target if that happens. + Melbert: + - bugfix: The lathe in Deltastation's service hall can print circuit boards again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - admin: Simplified the "Transformation/Rudimentary Transformation" part of the admin player panel, you can now choose from ghost/human/monkey/cyborg/AI, and all options work whether the target is currently a human/other living mob/ghost. Seris02: +<<<<<<< HEAD - bugfix: mediborgs now have proper pixel placement - bugfix: borgs no longer have pixel shifting issues, specifically dogborgs - bugfix: silicons now show laws on examine @@ -108,10 +197,30 @@ - rscadd: Microfusion cell tech tree. - balance: Reload times now take an amount of time. - rscdel: Removed proprietary temporary hardlight guns. +======= + - qol: made hair gradient color preferences not show up if no gradient is selected + axietheaxolotl: + - rscadd: Pride Pins + carshalash: + - imageadd: Fire mutation now has the sprite of old space adaption while Pressure + is a blue version of it. + jlsnow301: + - bugfix: Removed two map-based runtimes for Syndicate Lavaland Base and The Derelict + tf-4: + - admin: You now have to confirm that you want to reset the station name from the + secrets panel. + - bugfix: Blind people now get a chat message when being cuffed. +2021-12-04: + Ghilker: + - bugfix: fix an oversight where sec hailer shouldn't have the tint changes, the + eye protection and the pepper immunity. All other sec masks (the swat and spacepol) + are unchanged +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Nanotrasen's Paranormal Containment team had some budget cuts, meaning that ghosts are no longer stripped of their hair colors- You can finally sport that bright pink floor bedhead even in death once again! +<<<<<<< HEAD - spellcheck: Fixes a spelling mistake in the feedback for fishing something. - spellcheck: Renamed to fishing master skillchip to something cooler and more in line with the skillchip naming theme. @@ -162,10 +271,52 @@ - admin: Ambitions now count towards tickets handled - balance: Captain and NT Rep gunsets have been removed in favour of energy guns. - rscdel: References to players removed from cargo freighter space ruin +======= + HarseTheef: + - bugfix: Forged agent id cards will no longer break wallets + JohnFulpWillard: + - admin: More Silicon related loggings have been moved to silicon logs. + LemonInTheDark: + - bugfix: The job overflow station trait will now work again. I look forward to + infinite captains + - bugfix: Fixed solars and nearstation areas being pitch black, restores the fullbright + they ought to have + MMMiracles: + - rscadd: You can now run over the goat plushie. + Mickyan: + - spellcheck: Looking up in space no longer says there's a ceiling. There's no ceiling + in space, promise. Please don't try to look for it. + Mothblocks: + - admin: Crafting is now better logged. + - bugfix: Fix all tend wounds showing when selecting a surgery after upgrading. + Paxilmaniac: + - balance: allows the attaching of bayonets to pipe guns + Potato-Masher: + - expansion: Metastation - A near complete remap of the atmospherics section of + the station. Functionally the same, but with added space for projects, the HFR, + and an included basic crystallizer setup. + - qol: Minor atmospherics adjustments to metastation's xenobiology satellite, the + slime euthanization chamber cooling loop has been prettied up and starts with + CO2 already inside to ensure the freezer works immediately with no setup. + ShizCalev: + - bugfix: Fixed mapeditted scrubbers and vents having the incorrect names. + jlsnow301: + - rscadd: Saving pAI candidacy information now outputs an error when unsuccessful. + - rscadd: pAIs now get a door jacking progressbar. It remains obscenely slow, though. + - bugfix: Fixes not being able to access pAI config if it's slotted into your PDA. + vincentiusvin: + - qol: Wired glass tiles need iron to make it a full fledged floor, this is now + explained in the examine message. +2021-12-05: + TheBonded: + - rscadd: You can now tan wet hide into leather by lighting it on fire or placing + it on a bonfire grill. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-12-06: GoldenAlpharex: - bugfix: Meat and pizza walls and floors should no longer cause a runtime every time they're built. +<<<<<<< HEAD - bugfix: You can no longer have an ID declare you as underage thanks to your good buddy the Head of Personnel. Melbert: @@ -190,11 +341,37 @@ - bugfix: The undercharger now actually functions as intended, removing recoil when on, and adding it when off. - balance: Phase emitters increase by 500 C per level instead of 1000 C. +======= + Melbert: + - bugfix: Chefs on Deltastation can now tussle in their Cafeteria. + Paxilmaniac: + - bugfix: the duplicate rack space in meta's service hall isn't duplicate anymore + - bugfix: Mismatched door ids on the starboard side of pirate shuttles will no longer + prevent egress from that side of the ship + RandomGamer123: + - bugfix: Locked circuits cannot have USB cables attached to them anymore. + Y0SH1M4S73R: + - bugfix: BCI manipulation chambers no longer drop the contained BCI when opened. + maxspells: + - bugfix: health scan, gas scan, and atmos scan results will now show up on info + tab instead of the local tab + tralezab: + - bugfix: You can now deliver kilo department orders (the delivery area didn't exist + on kilo) + - bugfix: ethereals no longer get the "he" pronoun accidentally + vincentiusvin: + - bugfix: fixed APC making too many damage runtimes. +2021-12-07: + Ghommie: + - bugfix: Fixed the strip menu not being warded against telekinesis shenanigeans + (No item was stripped from longer distances, but warnings were still sent). +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - imageadd: NanoTrasen's Bench Tailoring department has worked hard on fixing an error in their factory line that resulted in every bench cover being darker than it was supposed to be, bringing them back to what they were supposed to look like! +<<<<<<< HEAD SkyratBot: - bugfix: Screwdrivers can now be inserted into the destructive analyzer through left-click @@ -244,10 +421,48 @@ They will be on by default. - rscadd: IV drips now cause a moderate pierce wound when ripped out - bugfix: You will once again see events that required a playercount to run. +======= + Pickle-Coding: + - spellcheck: Mime finger gun description now states that it mutes your target instead + of stunning. + RandomGamer123: + - expansion: IV Drips can now have their insertion rates finetuned to anything between + 0.1-5u/cycle. + - bugfix: Screwdrivers can now be inserted into the destructive analyzer through + left-click + tastyfish: + - rscadd: New skill tracking app for your PDA's called ExperTrak Skill Tracker. + tralezab: + - bugfix: chaplains can once again convert themselves into an android + - qol: Added a help tab for learning some cargo delivery systems and department + orders as a concept + - bugfix: Ais no longer get the wrong antagonist added to them from "everyone is + traitor" secret +2021-12-08: + Amrabol: + - qol: Job specific bags can now be carried on labcoats, wintercoats and apron suit + storage slot + - rscadd: Added tray sprite to mirror_belt.dmi + Capsandi: + - rscadd: There's been a Moffuchi's Family Pizzeria on the surface of the icemoon + but we only just noticed it + FernandoJ8: + - imageadd: Resprites all of the abductors surgical tools + Ghommie: + - refactor: Refactored and standardized multiz movement code. This should fix some + issues about it. + - qol: You can now drag movables, ride vehicles and fireman carry mobs upstairs + and downstairs. + Iamgoofball: + - qol: Leaders are now distributed evenly among the Families. + - qol: As a result, the Families rulesets now only require 3 people to start, instead + of 9. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer become a Family Leader as a restricted role, such as a Head of Security. - admin: Admins can now promote people to Family Leader with a button from the traitor panel. +<<<<<<< HEAD tf-4: - bugfix: A charging microfusion gun will no longer runtime on examine - bugfix: Removed multiple lattices from the same spot on Blueshift @@ -260,6 +475,65 @@ SkyratBot: - bugfix: Fixed the strip menu not being warded against telekinesis shenanigeans (No item was stripped from longer distances, but warnings were still sent). +======= + JohnFulpWillard: + - bugfix: Magic mirrors will now allow you to swap species again. + Mothblocks: + - bugfix: Fixed away missions not loading when the config was enabled. + Pope: + - bugfix: fixed an issue in orion.dm and orion_event.dm to let silicon play orion + trail + RandomGamer123: + - bugfix: Transit tube dispensers will no longer eat up immovable rods. + SuperNovaa41: + - bugfix: The maroon objective will no longer fail due to your target being borged. + - bugfix: Bardrones no longer recieve tools. + tralezab: + - bugfix: Department orders no longer bugs out and asks you to take the deliveries + to central primary hallway +2021-12-09: + FA120: + - expansion: adds health to the crew monitor's usb table + FernandoJ8: + - rscadd: IV drips now cause a moderate pierce wound when ripped out + Gandalf2k15: + - bugfix: You will once again see events that required a playercount to run. + Retlaw34: + - imageadd: New suit storage sprites + jlsnow301: + - rscadd: TGUI input boxes are on the way! You can find new preferences in the menu. + They will be on by default. +2021-12-10: + AnturK: + - rscadd: You can now become patron of your favorite painting by buying sponsorship + from Nanotrasen Trust Foundation. + - rscadd: Painter's palettes are now available at library vendor. + - qol: Can use strokes in paintings now + Fikou: + - expansion: dunking cold people in the deep fryer causes fun stuff + - expansion: dunking the Freeze Cube artifact from lavaland causes !FUN! stuff + LemonInTheDark: + - code_imp: I've changed how job equipment and organs are loaded, if you end up + with someone else's head/id card/eyes, please let me know yeah? + - code_imp: The preferences menu is now much more efficient. Hopefully you'll see + less small jitters at highpop. + - bugfix: You can no longer use the disease browsing console to summon satan + - bugfix: The disease browsing console will now properly show you the mobs the disease + effects + SuperNovaa41: + - bugfix: AI shells will no longer be instantly converted into a construct shell + by the Twisted Construction spell. + - bugfix: Fixes clothing protection tags being displayed incorrectly. + TheBonded: + - bugfix: you can no longer buckle onto chairs that are under dense atoms (like + machines) + cacogen: + - bugfix: Burnt-out flashes once again update their in-hands correctly + - bugfix: Flashing no longer goes through when the attempt has burnt out the flash + twilightwanderer: + - bugfix: Hints in bureaucracy forms + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Plasma material objects that didn't spawn plasma gas when ignited due to weird code reasons will now do just that. - bugfix: Fixed plasma material objects exploding when used with condenser. @@ -267,6 +541,7 @@ - bugfix: You can no longer duplicate rods with rough false walls. - code_imp: Due to code structural changes the mole amount from welding plasma related objects may get buffed or nerfed. Mostly buffed. +<<<<<<< HEAD - bugfix: Hints in bureaucracy forms - rscadd: You can now become patron of your favorite painting by buying sponsorship from Nanotrasen Trust Foundation. @@ -298,6 +573,12 @@ SkyratBot: - bugfix: Closing the confirmation alert from headcrabs will no longer continue to headcrab you. +======= +2021-12-11: + CandleJaxx: + - bugfix: edited runechat layers for clarity and consistency with old PRs + EOBGames: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'The release of the new cookbook, "Mothic Cuisine: of Fleet and Flotilla" has brought Mothic food to the masses! Try out some new treats, like cheesecake balls, cheese soup, and five-cheese pizza at the kitchen today! There might @@ -306,6 +587,7 @@ \ stocks seeds for T\xF6chta\xFCse Berries, a common ingredient in moth cooking,\ \ in the Megaseed vendors. Additionally, herbs and bell peppers have also made\ \ their way to the station's stock. Botanists, you know what to do." +<<<<<<< HEAD - bugfix: F2 works for quick screenshotting again. - bugfix: Deconstructing an active AI shell will no longer ghost the AI inhabiting it. @@ -436,12 +718,133 @@ SkyratBot: - bugfix: CentCom has finally begun shipping helmets with working flashlight mounts to Deltastation's armory. +======= + Jackraxxus: + - bugfix: Deconstructing an active AI shell will no longer ghost the AI inhabiting + it. + JohnFulpWillard: + - bugfix: Closing the confirmation alert from headcrabs will no longer continue + to headcrab you. + LemonInTheDark: + - code_imp: Fixed some really insane move counts that were sourced from Login() + betraying me. I've killed it now so there should be slightly less stutter sometimes + depending on the weather and position of the moon + Melbert: + - bugfix: Fixes a runtime with starlight condensation + RandomGamer123: + - bugfix: Drones can no longer use the keycard authentication device. + - bugfix: Nuclear operatives will only win if they actually nuked the station and + didn't nuke space instead. + Seris02: + - bugfix: fixed bots getting stuck on railings and crashing anyone with a diagnostic + hud who dares come near + SuperNovaa41: + - bugfix: Pruno fermentation uses up the mix upon turning into pruno. + - bugfix: F2 works for quick screenshotting again. + carshalash: + - balance: Nerfs level of toxin/venom spat out by spiders. + jlsnow301: + - bugfix: Turning off tgui inputs in game preferences now disables tgui input lists. + - refactor: 'Converted several list inputs to tgui, including: Many AI functions, + wayfinders, most cult inputs, observer functions.' + tf-4: + - bugfix: A lack of candidates for certain antags will no longer runtime +2021-12-12: + Iamgoofball: + - admin: Admins are now told what Theme that Families has rolled. + JohnFulpWillard: + - bugfix: Bot covers now respect access again. + LemonInTheDark: + - bugfix: Fixed hitting a move input inside a small grace period in move code leading + to teleportation. It's a side effect of when movement used to be verbs, and + holding a button down meant constantly sending the server move commands + Pepsilawn: + - qol: Account registration devices will now tell the user their new account ID + number, previously unobtainable. + - rscadd: Account registration devices added to service and cargo techfabs. + TheBonded: + - admin: makes (the logging of xenobiology renaming potions better) + jlsnow301: + - refactor: Several input prompts have been converted to TGUI. Nukie prompts, newscasters, + stacks of materials, hand labelers, station charters. Check them out! + tf-4: + - bugfix: Cameras will no longer runtime if the mob has no client +2021-12-13: + Bumtickley00: + - qol: Health analyzers have had significant readability improvements! + - qol: Health analyzers now display allergy information when performing a reagent + scan. + - qol: Health analyzer limb readout toggle moved from a verb to alt-click. + FernandoJ8: + - bugfix: Removes hypnosis from the list of traumas neruwhine can cause, fixing + a pair of related bugs. + Ghommie: + - admin: PDA bomb logging shouldn't be as confusing now. + GoldenAlpharex: + - qol: Plexagon is happy to announce its newest patch, which addresses a highly-requested + quality of life change, consisting of adding the name of the person which had + their ID modified to the name of their access report printout. + - bugfix: The Access Report from the Plexagon Access Management app will now be + smarter and actually remember who it was prepared by, even if the ID used for + the login was removed before printing said Access Report. + JohnFulpWillard: + - bugfix: HoPs can now use security record consoles again. + LemonInTheDark: + - bugfix: Removed a hidden doublepipe, you'll never find the rest, FOOLS + Melbert: + - bugfix: You can actually reskin the pride pin now + OneAsianTortoise: + - bugfix: cigarette pack has correct sprite now. + RandomGamer123: + - bugfix: Cyborgs can no longer attack clown cars when inside them. + unit0016: + - bugfix: The archmagister's ID card icon now exists. Whoopsies. +2021-12-14: + Iamgoofball: + - bugfix: Fixes being able to telekinesis through cameras. + - bugfix: Fixes being able to telekinesis across z-levels. + Mothblocks: + - bugfix: Fixed the skin tones on the preferences menu not having colors. + - bugfix: Jumpsuits, such as in species icons, are now grey again instead of white + on the preferences menu. + tralezab: + - bugfix: fugitives are now their own antagonist toggle, instead of polling for + traitors for some reason +2021-12-15: + Azarak: + - rscadd: Gas Masks now limit your field of view + - rscadd: Added field of view mechanics. It's darkness can be tweaked by a pref + - rscadd: Blind, nearsighted and fov-limited people will now see sounds as visual + effects. + Ghilker: + - bugfix: fix oversight where HFR can EMP its own APC + LemonInTheDark: + - bugfix: Fixed gas flowing into windows from above, I am.... so tired + - bugfix: Fixes gas sometimes not moving up from below after a structure change, + see above + Sealed101: + - bugfix: CentCom has finally begun shipping helmets with working flashlight mounts + to Deltastation's armory. + armhulen: + - refactor: Mob spawns are refactored, no more assortment of "random, instant, and + roundstart" vars on every mob spawn type + - refactor: if there are some minimal differences in how mob spawners feel, that's + why! + gbfree: + - bugfix: fix kilostation emergency pods controls staying locked at red and delta + alerts +2021-12-16: + SuperNovaa41: + - bugfix: Fixes the security warrant computer runtiming if you have no ID. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: TGUI text input will now let you submit default values without rewriting the input - bugfix: TGUI text and number input will now accept pressing ENTER anywhere on the window (assuming the input is valid) - refactor: Many more inputs have been converted to TGUI - PDA messaging, GPS tags, cult runes, roulette machines, custom vendors, more. +<<<<<<< HEAD - bugfix: Fixes the security warrant computer runtiming if you have no ID. - bugfix: fixed rough iron false wall telling you that you need two rods instead of five. @@ -485,10 +888,35 @@ - bugfix: Fixed gas flowing into windows from above, I am.... so tired - bugfix: Fixes gas sometimes not moving up from below after a structure change, see above +======= + vincentiusvin: + - bugfix: fixed rough iron false wall telling you that you need two rods instead + of five. + - bugfix: fixed rough iron wall dropping two rods instead of five. +2021-12-17: + Azarak: + - bugfix: Fixes some effects appearing below mob (smoke, blur, chairrests) + - bugfix: Fixed FOV not applying if you were inside contents of something + LemonInTheDark: + - bugfix: Cat ears will no longer display only on every other render in the preferences + menu. God who added these things + RandomGamer123: + - bugfix: Stops malf AIs in intellicards from activating doomsday device. + tralezab: + - bugfix: fixes fugitives preference having missing textures +2021-12-18: + Iamgoofball: + - bugfix: Fixes Families runtimes and not making enough gang leaders + JohnFulpWillard: + - spellcheck: Fixed a small typo in Cargo's mail console, saying mail had homing + beacons in them. + LemonInTheDark: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes shoving people into lockers sometimes trapping them in lockerspace. Crummy vacation destination, don't go there. - bugfix: Fixes directional shoving just not working - bugfix: Fixes shoving people carrying other people being weird +<<<<<<< HEAD Tokorizo: - rscadd: Vox sprites - bugfix: Syndicate infiltrator armor now works for Vox, new sprites have been added. @@ -536,10 +964,67 @@ - balance: Changes how TK is identified. - code_imp: Swaps which particles the TK movement points to. SkyratBot: +======= + Melbert: + - bugfix: Placing tiny fans in the aux base gives feedback + - bugfix: Breaking / deconstructing aux base turrets no longer brick the console + Pepsilawn: + - bugfix: The rat spit's OD effect will no longer repeat on players already under + the Rat King's rule. + ike709: + - bugfix: Fixed a bug with taste description generation for fruit wine. + jlsnow301: + - bugfix: Bot cover lock button is now disabled when you lack sufficient access. +2021-12-19: + RandomGamer123: + - bugfix: When the nuke goes off, the "you are shredded to atoms" message no longer + displays to people not on the z-level or on the station. + - bugfix: The nuke now kills everyone on a station z-level if blown up on the station. + SuperNovaa41: + - bugfix: Fixes being able to table slam through impassable objects. + - bugfix: Nested containers (lockers, crates, etc) can be resisted out of. + jlsnow301: + - bugfix: TGUI list input will now respond to having large/swapped buttons in preferences. + - bugfix: BYOND functionality restored in TGUI input lists - keyboard support. Up/Down, + type a letter to jump to it (while search is not visible). +2021-12-20: + Fikou: + - bugfix: neurotoxin spit no longer hits the xeno that spat it + JohnFulpWillard: + - bugfix: Enemies of the State and (Command-only) Enemies of the Revolution are + now ACTUALLY blacklisted from being defibrilated. + - bugfix: Basic mobs (Cows, cockroaches), count as Animals for the DNA vault. + - bugfix: The Pirate's shuttle scrambler will now ONLY work if you tell it to. + - admin: Actions done from the R&D console is now logged + MMMiracles: + - bugfix: "The prison gate in Tramstation's Prison is no longer made of Papier-m\xE2\ + ch\xE9" + SuperNovaa41: + - bugfix: Ninjas can no longer call reinforcements if the comms console is depowered + jlsnow301: + - bugfix: Camera consoles now require you to be close by and alive in order to operate. + - bugfix: TramStation's tram console is no longer shifted over to the right + - bugfix: Mr. Pingsky no longer spams AI private because he wants to leave AI satellite + but can't (free him). Autopatrol set to off. + - bugfix: Power control consoles now alert you if you lack access. + - bugfix: Pandemic machine no longer blue screens while inserting premade viruses. + - bugfix: Long civilian bounty texts (specifically viro) no longer overflow the + button. The window is slightly wider as a result. + san7890: + - bugfix: Adds the High-performance liquid chromatography machine to the Syndicate + Lavaland Base. +2021-12-21: + Bizzonium: + - bugfix: fixed potential bucket corruption in timer reset_buckets + JohnFulpWillard: + - bugfix: Headrevs only get a revolutionary banner if they actually win. + Krysonism: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Cows, roaches and their subtypes can be sentienced and mind transfer potioned again. - refactor: refactored syndicate sentience potion and abductor all access gland to use the new simple_access component. +<<<<<<< HEAD - bugfix: Headrevs only get a revolutionary banner if they actually win. - bugfix: fixed energy axe sprites's clipping issues and incorrect facing directions Zonespace27: @@ -552,6 +1037,30 @@ the server, to stop all those nasty runtimes on test servers. - config: SSDecay is now turned off by default in the config, to save about 4~ish seconds of loading time on test servers. +======= + Melbert: + - bugfix: Removed a floating teleport beacon in Icebox's chapel + - bugfix: Fixed APC visibilty in icebox science outpost / RD office + - bugfix: Fixed Air alarm accessibility in icebox atmos office + Mooshimi: + - bugfix: Power has been returned to Tramstation Security department! + - bugfix: Everything in the curator's closet on Kilo Station can now be reached. + Sealed101: + - bugfix: fixed a missing wire in Deltastation's Arrivals Solar array, connecting + the control console to the array + - bugfix: fixed energy axe sprites's clipping issues and incorrect facing directions + tastyfish: + - bugfix: The advanced camera console's and AI's camera search function now works + again. +2021-12-22: + Azarak: + - bugfix: Fixes FoV mask and hiding in potted plants + JohnFulpWillard: + - bugfix: You will no longer spasm if you're unconscious/dead. + RandomGamer123: + - bugfix: Inverse reagents are now properly consumed when being transferred into + a living body (eg. through syringes). +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - admin: Added Datum Tagging, a new admin tool for quickly marking and referring back to various datums and atoms. You can tag atoms by ctrl+middle clicking @@ -561,14 +1070,24 @@ View-Tags button at the bottom of the Admin -> Game status panel section. - admin: Tagged datums can also be referenced for things like proccalls and VV var edits, similarly to Marked objects. +<<<<<<< HEAD SkyratBot: - bugfix: You can no longer shove megafauna that you can't normally push. - bugfix: Adds seeds to vending machines as intended. Corrects pathway for lasagne. Fixes issue with Bell peppers and baking cheese. +======= + Watermelon914: + - bugfix: You can no longer shove megafauna that you can't normally push. + carshalash: + - bugfix: Adds seeds to vending machines as intended. Corrects pathway for lasagne. + Fixes issue with Bell peppers and baking cheese. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Nanotrasen News Network has updated their news tickers for when a station horrifically blows up to be more accommodating towards the person directly responsible for making sure it didn't horrifically blow up. 2021-12-23: +<<<<<<< HEAD Melbert: - bugfix: Removed a floating teleport beacon in Icebox's chapel - bugfix: Fixed APC visibilty in icebox science outpost / RD office @@ -693,11 +1212,42 @@ AtoriBirb: - imageadd: added new hair sprite to our modular hair.dmi GoldenAlpharex, sprites from WalterJe: +======= + JohnFulpWillard: + - bugfix: Balloon alerts when picking up staffs as a non wizard now properly appears + over the player's head. + LemonInTheDark: + - bugfix: Fixed garbage bags being uncleanable by mops, for silly silly reasons + Pickle-Coding: + - bugfix: Allows the supermatter crystal to produce gases while powered, even in + absolutely empty turfs, excluding space turfs. + SuperNovaa41: + - bugfix: Fixes the ablative trenchcoat giving you a permanent sechud. + - qol: The health sensor's status is now more clear when unsecured. + - bugfix: Fixed players appearing above fire and foam. + - bugfix: Void cloak (and other items intended to be invisible) can longer be seen + and unequipped in the strip menu. + - bugfix: You can no longer wrap a locker to bypass the drag slowdown. + - bugfix: Flying over lava no longer erroneously ignites you ablaze. + jlsnow301: + - bugfix: Fixes width on black market uplinks to show three delivery options. Technology! + optimumtact: + - bugfix: Fixed mops wetting the turf when you refill them from the mop bucket I'm + oranges and I don't put changelogs on my PRs +2021-12-24: + AndrewL97: + - bugfix: skin tone sorting + - refactor: refactor various color procs to use natives instead + GoldenAlpharex, sprites from WalterJe: + - qol: Conveyors will now also convey how to interact with them with tools upon + being examined. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: Updated the sprites of the conveyor belts and the conveyor switches, ported and adapted from Tau Ceti! - refactor: Brought up to today's standards conveyor codes, alongside properly documenting it. Also changed how conveyor corners are handled to make them both more intuitive for mappers and for people in-game. +<<<<<<< HEAD Iamgoofball: - balance: You can no longer expand non-32x32 cyborg sprites. - rscdel: Removes the Cyborg Shrinker from the techweb. @@ -725,6 +1275,24 @@ deal. Fikou, theOOZ: - imageadd: adds a new janiborg sprite! +======= + ReinaCoder: + - bugfix: Fixes Tramstation Vacant Commissary not having shutters + - bugfix: Engineers now have access to the SM's External Airlock on Tramstation + SuperNovaa41: + - bugfix: You can no longer continue a surgery if the organ in question is somehow + removed whilst mid operation. + - bugfix: Non-headrev revs can be properly revived after a revolution is quelled + again. + - bugfix: You can no longer bypass the red alert lock on the escape pod safe. + - bugfix: Fixes an exploit with thermite burn times. + jlsnow301: + - spellcheck: Fixed a number of typos in HTML elements that would cause messages + to not render properly. + - bugfix: Changed the font of some messages to better reflect if they were errors, + notices. +2021-12-25: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ? 'Fikou; Sprites: PositiveEntropy, Azlan, Infrared_Baron, Thunder12345, Yeeye; Code: Waltermeldron, Goof, Armhulen, ArcaneMusic, DatBoiTim; Descriptions: Nerevar' : - rscadd: Adds Modular Suits. Printable at robotics. @@ -737,6 +1305,7 @@ As part of this, space wind pushing you is handled by gravity negation, not noslips. - balance: Hardsuits no longer defend from tackles, but negating gravity does. +<<<<<<< HEAD - code_imp: 'Adds support for digitigrade compatible shoes. qol: Piercing syringes now pierce when used from hand, not just as projectile.' - code_imp: Removes the unused outside of admin shenanigans cult hardsuit requirement @@ -756,10 +1325,39 @@ HIDEHAIR. This will let sprites with earholes actually fit ears thru them, but not show the hair instead SkyratBot: +======= + - code_imp: Adds support for digitigrade compatible shoes. + - qol: Piercing syringes now pierce when used from hand, not just as projectile. + - code_imp: Removes the unused outside of admin shenanigans cult hardsuit requirement + for spells. + JohnFulpWillard: + - bugfix: the observe button's tgui is now functional. + Krysonism: + - expansion: Added a new cake, the english fruitcake. + Sealed101: + - bugfix: plopped an xmas tree in tramsation's chapel + SuperNovaa41: + - spellcheck: Fixed a small spelling mistake in the sparring rite ritual. + jlsnow301: + - bugfix: Clipping and sizing issues on drone consoles have been fixed. + - refactor: 'Many more tgui inputs have been converted over: Paystands, paintings, + pet names and more.' + - bugfix: TGUI inputs now support automatically selecting preexisting input (BYOND + default behavior). + - bugfix: You can now press ESC to exit TGUI inputs. + - bugfix: Fixes a bluescreen when turning on admin mode in NtOS chat software. + - bugfix: 'Literally 1984: NtOS chat admins can now properly mute others.' + - bugfix: Turning off NtOS admin mode now properly returns you to the channel. + - bugfix: NtOS chat screen widened slightly to fix clipping issue on the participants + panel. +2021-12-26: + CRITAWAKETS: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: The Spider Clan has issued a recall of all it's katanas, replacing them with new ones that are differently styled. Something about the old ones being literally impossible to find in bright conditions. Or maybe they just didnt like how it looked so they changed its "sprite". +<<<<<<< HEAD - imageadd: Resprites the sec grenade launcher - bugfix: Disarming a heavily incapacitated person with krav maga will no longer make them recoil in pain. @@ -772,11 +1370,35 @@ - bugfix: plopped an xmas tree in tramsation's chapel - bugfix: dogs will no longer forget to unbuckle themselves when fetching items thrown nearby +======= + Cheshify: + - imageadd: The PanD.E.M.I.C 2200 is now visually different than the ChemMaster + Fikou, theOOZ: + - imageadd: adds a new janiborg sprite! + Iamgoofball: + - qol: AI VOX announcements are now additionally broadcasted over the radio. + JohnFulpWillard: + - bugfix: The HoP will now get strange reagent in the mail if Ian is dead, as originally + intended. + Melbert: + - bugfix: Updated the binary key's description / examine text to actually describe + its abilities. + ReinaCoder: + - imageadd: Resprites the sec grenade launcher + TheBonded: + - bugfix: Tesla reactive armour now has separate emp and cooldown messages + - bugfix: dogs will no longer forget to unbuckle themselves when fetching items + thrown nearby + axietheaxolotl: + - imageadd: Resprited the Tactical Turtleneck Suit + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Double click and enter on tgui input lists no longer clears selection. - bugfix: 'Functionality restored: typing while not selecting the search bar will refocus. You can also quick search by typing while the search bar is hidden.' - refactor: Support for current value selections has been added to tgui input lists - lists now work for suit sensors, etc. +<<<<<<< HEAD jjpark-kb: - soundadd: added a started/stopped typing sound for tts device softcerv: @@ -792,12 +1414,43 @@ work correctly. - bugfix: Ghost role spawners can now use your character. SkyratBot: +======= + tf-4: + - bugfix: Disarming a heavily incapacitated person with krav maga will no longer + make them recoil in pain. + timothymtorres: + - bugfix: Fix AIs inside a AI restorer computer now die if the computer is destroyed + while they are inside it. +2021-12-27: + Fikou: + - bugfix: the protect objective now checks for mob and brain suicides + JohnFulpWillard: + - bugfix: Some antags (like Abductors) no longer have 2 antag gain messages. + - spellcheck: Gaining and losing antagonist status will now be properly written + with 'the', as needed. + ReinaCoder: + - bugfix: Cult robes now have sprites for when the hood is down + - bugfix: Tramstation Court Room and Lawyer's Office now have lights + SuperNovaa41: + - bugfix: Makes all cyborg storage items drop their contents on module change. + - bugfix: Sechailer no longer has FOV. + - bugfix: SWAT mask no longer has a tint. + Y0SH1M4S73R: + - admin: The Save Shell admin circuit component now properly loads circuits that + use a BCI or MODsuit module as their shell. + necromanceranne: + - bugfix: Restores the cardborg sprite. + timothymtorres: + - bugfix: Fix all types of grenades to be deleted when shot bullets. + tralezab: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Some code improvements and proper use of department datums by independent nation creation - refactor: Some wonderful cleanup of separatist code, if you notice minor differences it's because of that. - admin: The nations ruleset is back(?) and disabled for admins to run fi they so desire +<<<<<<< HEAD - bugfix: Makes all cyborg storage items drop their contents on module change. - bugfix: Fix all types of grenades to be deleted when shot bullets. - bugfix: Sechailer no longer has FOV. @@ -888,6 +1541,10 @@ - bugfix: Dirt piles can no longer exceed their maximum reagent capacity by 10. Sorry prison botanists. SkyratBot: +======= +2021-12-28: + Fikou: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the mod installer from charliestation no longer has infinite uses - bugfix: fixes broken sprites on prototype suit - bugfix: fixes intellicards not updating @@ -897,6 +1554,7 @@ the pathfinder - bugfix: fixes modsuits deleting everything inside when they explode - bugfix: fixes ais in modsuits not being able to use abilities +<<<<<<< HEAD - bugfix: 'fixes the tether not being able to hook onto catwalks/lattices qol: ais in modsuits now make the user stand up instead of weirdly crawling qol: a modsuit being destroyed with an ai inside now pops it out as a small card you can recover @@ -945,11 +1603,51 @@ fuel. Removing fuel with a crowbar also doesn't smack the launcher when done. - bugfix: Fixes a hard-del with the exo-drone launcher. SkyratBot: +======= + - bugfix: fixes the tether not being able to hook onto catwalks/lattices + - qol: ais in modsuits now make the user stand up instead of weirdly crawling + - qol: a modsuit being destroyed with an ai inside now pops it out as a small card + you can recover from with an intellicard + - qol: modsuit module radial is now more friendly, showing you tooltips and which + modules are active + - qol: mech fabricator module list is now sorted + JohnFulpWillard: + - spellcheck: Removed a visible b> from Cult's objective text. + SuperNovaa41: + - bugfix: You can no longer get an alert by checking your mood with telekinesis. + Zonespace27: + - refactor: Mech Fabricator's `output_part_info()` proc is much more optimized. + timothymtorres: + - bugfix: Fixes phylactery exploits. Liches can no longer be soulstone captured + or be debrained and put into an MMI. + tralezab: + - bugfix: fixed weird "Mob Spawner" objects showing up when you killed clowns +2021-12-29: + Melbert: + - bugfix: Dirt piles can no longer exceed their maximum reagent capacity by 10. + Sorry prison botanists. + Seris02: + - bugfix: fixed a say emoting bug where forced says' were being turned into emotes + dragomagol: + - bugfix: italian mafioso now get their proper names + - admin: admins can now view family objectives from the traitor panel + vincentiusvin: + - bugfix: fixed zombie powder not sleeping you on ingestion and on further ingestion. +2021-12-31: + GoldenAlpharex: + - bugfix: The blackmarket uplink shouldn't run into issues loading the different + categories of items it can order when it was created during mapload. + JohnFulpWillard: + - bugfix: accessories on clothes placed inside garment bags will no longer delete + themselves. + Kylerace: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'NanoTrasen fixed a problem with their orion trail arcade machines relaying security and medical comms to the most dangerous demographic: gamers. NanoTrasen assures you that this security exploit will never happen again.' - bugfix: you cant make radios play comms with a broken speaker by setting their frequency anymore. +<<<<<<< HEAD - bugfix: Spidercharges can now only be blown up in their intended location. - bugfix: Non-suicided brains put into suicided bodies will no longer be marked as suicided. Consequentially, said suicided bodies can be used for brain transplants. @@ -960,3 +1658,39 @@ space-like. tastyfish: - spellcheck: Fixed augmented lung messages. +======= + Melbert: + - bugfix: Hulk is removed more consistently when the user actually enters soft crit. + - bugfix: Exo-drone fuel pellets delete when empty. + - bugfix: Exo-drone launchers now update their icon correctly when adding / removing + fuel. Removing fuel with a crowbar also doesn't smack the launcher when done. + - bugfix: Fixes a hard-del with the exo-drone launcher. + SuperNovaa41: + - bugfix: Possessing a mob no longer lowercases your ckey in admin messages. + - bugfix: You will no longer hear medibot voicelines whilst in crit. + - bugfix: Spidercharges can now only be blown up in their intended location. + - bugfix: The ablative trenchcoat actually gives you a sechud again. + coldud13: + - bugfix: fixed basil boys uniform being offset by one pixel + jlsnow301: + - refactor: The majority of user facing input lists have been converted to TGUI. + - refactor: Tgui text inputs now scale with entered input. + - bugfix: Many inputs now properly accept cancelling out of the menu. + - bugfix: Fixes an edge case where users could not press enter on number inputs. + - bugfix: Custom vendor bluescreen. + - bugfix: You can now press ENTER on text inputs without an entry to cancel. + neopythagorean: + - bugfix: Pipe dispensers no longer produce broken invisible pipes. + tf-4: + - code_imp: space/openspace turfs now exist to make multi-z space turfs act more + space-like. + timothymtorres: + - bugfix: Fix glass floors appearing as lower z-level when on the same z-level. + - bugfix: Fix catwalks appearing as current z-level when they were on a lower z-level. + - bugfix: Fix transparent turfs to display lower z-level properly. + - bugfix: Fix lighting overlays appearing as current z-level when they were on lower + z-level. (for transparent turfs) + - bugfix: Fix mapping icons for catwalks to display correct icon state + - refactor: Refactor turf transparency to be more robust. + - refactor: Refactor catwalks to be elegant code. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-01.yml b/html/changelogs/archive/2022-01.yml index 8a2db0590e8..3c0858fd588 100644 --- a/html/changelogs/archive/2022-01.yml +++ b/html/changelogs/archive/2022-01.yml @@ -1,4 +1,5 @@ 2022-01-01: +<<<<<<< HEAD ErdinyoBarboza: - bugfix: Model 23-37 and M2 Auto are now 12 gauge again. Also fixes the descriptions of the Armory Shotguns @@ -28,6 +29,37 @@ - balance: All Shotguns in the armory are now Riot Shotguns that load normal shotgun shells. - balance: The armory shotgun ammunition storage now contains normal shotgun shells. +======= + SmArtKar: + - bugfix: MODsuits no longer runtime when EMPed with no module selected + SuperNovaa41: + - bugfix: Bodies will no longer (sometimes) be fully deleted when escaping a disposal + pipe trap. + TemporalOroboros: + - bugfix: Fixes blastcannons not actually having any light range regardless of the + bomb they used. + - bugfix: Fixes blastcannons being blocked by cigarette butts. + - code_imp: Unspaghettis some variable definitions. + - code_imp: Brings phasic carbine rounds into compliance with the rest of the projectiles. + Whoneedspacee: + - refactor: Refactors megafauna abilities to be mob actions which are grantable + to any living mob. + - admin: Added a verb under admin events which lets you grant mob actions to a marked + living mob. + jlsnow301: + - bugfix: Fixed a clipping issue with the brainwash objective text. Brainwashed + victims can now properly lead longer objectives about the clown being a zombie, + etc. + san7890: + - spellcheck: The exosuit fabricator should now spit out (more) grammatically correct + messages. +2022-01-02: + Azarak: + - bugfix: Fixes field of view handler perceiving the wrong eye + JohnFulpWillard: + - bugfix: Things on fire moving over a bonfire will now ignite its flame + - bugfix: All of service can now access the Service cargo console. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation has gotten an extension, both in size and layout. - rscadd: Tramstation's medical has been completely overhauled to a new layout, hopefully @@ -36,6 +68,7 @@ top and bottom levels of the map. - rscadd: Cargo now resides over a small bank vault that stores both the station's materials and wealth. +<<<<<<< HEAD SkyratBot: - spellcheck: The exosuit fabricator should now spit out (more) grammatically correct messages. @@ -128,6 +161,57 @@ - bugfix: Chemical grenades no longer evaporate into thin air upon detonation. As a result, gunpowder and teslium now work with them. Also, you can recycle cleaner grenades if you want to bother. +======= + Mothblocks: + - rscdel: The station name has been removed from the hub entry. + - bugfix: Massively decreased initialization times in best case scenarios. + SmArtKar: + - bugfix: Sacrificing a mindshielded person no longer causes their soul to be left + in their brain instead of getting transfered to the soulstone + interestingusernam3: + - bugfix: Silicons and other mobs that shouldn't be able to lie down now won't lie + down no matter what happens. + tralezab: + - bugfix: fixes pirates not getting their antag status, alongside a non-pirate name +2022-01-03: + Fikou: + - qol: You can now pin MODsuit modules to your action buttons. + - bugfix: ghosts can no longer mess with modsuits + SarmentiCampbell: + - bugfix: Russian Revolver can't longer be able to be examined to determine if it + has a bullet in it's chamber or not. + SuperNovaa41: + - admin: Simplemobs attacking objects is now properly logged, when the mob is playercontrolled. + Wallem: + - qol: Stasis beds put food in stasis as well, preventing decomposition. +2022-01-04: + Deek-Za: + - imageadd: Added sprites for cargo cap when flipped + Fikou, modified sprites from Onule, descriptions by Nerevar and Halcyon: + - expansion: cosmohonk suits now start with a waddling module! + - expansion: noslip, nvg and thermal modules can now be bought from the uplink + - expansion: 'you can see extended descriptions of modsuit themes by examining them + closely grammar: All MODsuits now have an extended description viewable by examining + them closely' + - balance: MODsuits no longer slow you down when undeployed in backpack form + - balance: tray modules cost less complexity, organ thrower is incompatible with + microwave beam + - balance: nukie suits no longer start with the thermal module + - qol: the recall module automatically tries to deploy the suit, without sealing + it + GoldenAlpharex: + - bugfix: Admin deadsay will now properly be sent to admins that are on the lobby + screen, with their deadchat toggle turned on. + - code_imp: Admin deadsay shouldn't be as prone to cause small runtimes anymore. + JenqaDev: + - imageadd: Adds the trash bag of holding icon to the janicart + JohnFulpWillard: + - admin: RD server controllers now log remotely shutting off/turning on RD servers. + Mothblocks: + - balance: For servers with Blood Brothers enabled, their cost and weight are now + lower. + SuperNovaa41: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer delete your cult eyes or halo by transforming into a monkey, and then into a human. - bugfix: You can no longer delete your cult eyes or halo by transforming as a changeling. @@ -135,6 +219,7 @@ - refactor: Turns cult eyes and cult halos into elements, and improves the code a touch. - bugfix: Spidercharge ACTUALLY can't be used anywhere now. +<<<<<<< HEAD - server: MS13 is the best - bugfix: All of service can now access the Service cargo console. - bugfix: Stuffing bread full of weed and such will no longer consign some of the @@ -197,12 +282,60 @@ - bugfix: Fixed the mentor PMs appearing in bold pink when it shouldn't be. - code_imp: Did some cleaning up of parts of the mentor code. - bugfix: Fixes a hard-deletion related to the void hood. +======= + TemporalOroboros: + - bugfix: Stuffing bread full of weed and such will no longer consign some of the + reagents to the void. + cacogen: + - qol: When inserting too many sheets for the autolathe to hold, it will take what + it can instead of rejecting the whole stack + neopythagorean: + - bugfix: Cardboard boxes and Body bags no longer claim to be welded together when + examined. + tastyfish: + - bugfix: Centcom and CTF headsets now work properly again. + the-orange-cow: + - qol: The fraxinella flower is now more willing to share its protection against + the insect menace. +2022-01-05: + Fikou: + - qol: disable combat mode defaults to 1. enable combat mode defaults to 4. + Fikou, Armhulen: + - expansion: Adds five new MODsuit modules to maintenance. + - bugfix: fixes MODsuit pins not working + - balance: specific MODsuit designs now gain smoke protection + JohnFulpWillard: + - bugfix: Papers pinned to airlocks will now visibly show if it has anything written + on it. + Melbert: + - bugfix: Fixes cult dagger error with holywater purging. + - bugfix: Rust heretic ascension spread rusts everywhere again. + SuperNovaa41: + - bugfix: Fixes crates duplicating materials with the recycler. + TemporalOroboros: + - bugfix: Fixed an incorrect calculation in the crystallizer preventing most crystallizer + recipes from ever producing high quality products. + axietheaxolotl: + - imageadd: Brand new sabre and sheath sprites! +2022-01-06: + Arturlang: + - bugfix: Modsuits DNA lock module will no longer stop you from changing up the + suit's modules while not worn, even if you are it's rightfull owner. + Jackraxxus: + - bugfix: The gladiator helmet is no longer a missing texture. + JohnFulpWillard: + - bugfix: After being broken again, magic mirrors have been RE-fixed and will ONCE + again change your species. + - bugfix: Revenants (and any other non human) will no longer turn red/blue from + the medieval shuttle teambuilding machines. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Changeling abilities unusable in lesser form are unusuable as a monkey again. - bugfix: Changelings can no longer unintentionally take DNA from monkeys. - bugfix: Changeling lesser form now toggles between "lesser form" and "human form" when used. +<<<<<<< HEAD SkyratBot: - bugfix: Silicons can disable holodeck safeties again. - bugfix: Fixes admins being able to sucessfully JMP as a new player mob. @@ -235,6 +368,36 @@ - rscadd: Added new sprites for Departmental Batons Fikou, sprites from Azlan: - bugfix: fixes mouth hole not working +======= + Mothblocks: + - qol: Restored the original manual refresh for the orbit menu. + OrionTheFox: + - bugfix: Icebox telecomms control is no longer frozen. Rejoice, to the 2 people + who actually go in there. The catwalks are nicer all around too. + ReinaCoder: + - qol: Adjusted security jumpsuits/skirts no longer cover the chest + SuperNovaa41: + - bugfix: Pen's can update an item's description again. + - bugfix: Fixes admins being able to sucessfully JMP as a new player mob. + - bugfix: Silicons can disable holodeck safeties again. + TemporalOroboros: + - bugfix: If you aim at something through cameras you will now aim at the thing + you aimed at from the perspective of yourself instead of the camera you were + using to aim. + Y0SH1M4S73R: + - expansion: Adds four new circuit components designed to analyze the data on ID + cards - Get ID, Read ID Info, Read ID Access, and Access Checker. + - bugfix: The assembly shell can now be attached to wires as intended + dragomagol: + - bugfix: stools on the main station are now facing the correct directions + jlsnow301: + - bugfix: Windoor exam text now properly displays whether the panel is open. + - refactor: Windoor tool_act code is updated to the latest century. + - bugfix: Exploding paper no longer causes a runtime. + san7890: + - bugfix: 'Cargonians and Janitors Rejoice: Disposals on TramStation have been fixed!' +2022-01-07: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Refactored Dullahans in many areas to fix many, many of their bugs and glitches and ensure an actually functional experience playing as one, while @@ -263,6 +426,7 @@ like abductors. - bugfix: When switching from Dullahans to a different species, your old head will no longer stay behind. +<<<<<<< HEAD - bugfix: 'After a long series of tiresome meetings and heated debates, the Nanotrasen Executive Board is happy to announce that all departments will be able to obtain additional headsets for their departments from their clothing vendors, so more @@ -322,12 +486,73 @@ thestubborn: - bugfix: icebox's lawyer office has always had a drobe, stop gaslighting 2022-01-10: +======= + - bugfix: Fixes a hard-deletion related to the void hood. + Mothblocks: + - balance: Malfunctioning AI should now happen more frequently. + SuperNovaa41: + - bugfix: Admin ghosting from a camera eye will no longer runtime. + - bugfix: Basic mobs (i.e. cows) can be properly ridden. + - bugfix: Drones can now vent crawl if there are humans around. + - bugfix: Eigenstasium will no longer teleport undroppable items out of your inventory. + YakumoChen: + - qol: Radio jammers will now also jam PDA messaging. + carshalash: + - qol: Adds descriptions to abductor glands upon shiftclick. + vincentiusvin: + - code_imp: Some code changes to thermomachine ports and appearance. No gameplay + changes expected though. +2022-01-08: + FernandoJ8: + - rscadd: Adds the captain's aid + Fikou, sprites from Azlan: + - expansion: Adds Anomalocks, anomaly core locked MODsuit modules. You can obtain + the anti-gravity and teleporter module from R&D. + - qol: activating a suit now should be accidental click-proof + - bugfix: fixes mouth hole not working +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: You can no longer override the ling DNA you're currently disguised as. This was apparently always intended but broken for ages. - code_imp: Modernized much of ling code. - refactor: Also refactored part of ling code. The ling chemical hud element should be a bit snappier now. +<<<<<<< HEAD +======= + - bugfix: You can see rust again + SmArtKar: + - bugfix: Spiders no longer cause runtimes when coming into contact with spider + webs. Also their AI no longer breaks due to this. + SuperNovaa41: + - bugfix: The regal rat has full access to it's abilities again. + Triiodine, TetraZeta, PositiveEntropy: + - imageadd: Resprites the labcoats, removing the asbestos and charcoal grime from + them! + Watermelon914: + - bugfix: Fixed having a limited vision whilst in the abductor ship. + san7890: + - spellcheck: Nanotrasen has undergone a corporate reorganization, reallocating + powers previously gone to Central Command back into their own fold. + theOOZ: + - qol: Runechat offsets correctly on larger mobs + timothymtorres: + - bugfix: Fix open/space/openspace to have dark shadow borders to indicate it's + openspace + timothymtorres, TheBonded: + - expansion: Adds Claustrophobia quirk that causes suffocation if a player enters + any type of container object. (lockers, crates, machinery, disposals, etc.) + - expansion: Adds Blood Phobia that is triggered from seeing gibs, blood, bloody + clothes or weapons, and blood related objects like IV drips and blood bags. + - bugfix: Fixed some quirks to not process if player is sleeping or unconscious. + tralezab: + - rscdel: Removed monkey mode from the code, when admins ran it it was broken anyways + - rscdel: Jungle fever no longer spreads via monkey bites after conversion, and + it is now jungle flu. +2022-01-09: + Capsandi: + - rscadd: 3 new space ruins, 2 chunks of a blown up space station and a NEW asteroid! + Melbert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Tram medical: Adds some missing white medkits.' - bugfix: 'Tram medical: Cryo freezer actually works.' - bugfix: 'Tram medical: Adds some missing wall mounts and firelocks.' @@ -335,6 +560,7 @@ - bugfix: 'Tram medical: Changes windoor directions in the pharmacy, fixes access on shutters' - bugfix: 'Tram medical: Privacy shutters for the CMO''s office' +<<<<<<< HEAD SkyratBot: - bugfix: Wardens and Heads of Security Rejoice! You are now able to send tiders to the gulag to labor for the better of the station after they steal your third @@ -368,12 +594,55 @@ - bugfix: hypovials can fit inside fridges again tastyfish: - bugfix: Interdyne and DS-2 ID cards are now registered to their owner again. +======= + Nari Harimoto: + - expansion: Centcom has approved the funds to re-arrange Icebox's medbay department + with a new design that better facilitates multiple level functionality + SuperNovaa41: + - refactor: The spider charge has slightly less shit-code now. + TemporalOroboros: + - bugfix: The supermatter will once again emit radiation when it is about to explode. + san7890: + - bugfix: The status screen in the ERT Bay in CentComm has been moved to the other + side of the wall because we accidentally kept sending them down and the crew + would keep selling them. + - bugfix: Wardens and Heads of Security Rejoice! You are now able to send tiders + to the gulag to labor for the better of the station after they steal your third + baton (on TramStation)! + - bugfix: The holopad is now back in Security's meeting room on MetaStation! Silicon + lovers and cold-callers rejoice! + timothymtorres: + - bugfix: Fix transparent floors clipping objects from bottom z-level to above z-level. + unit0016: + - rscadd: The Icemoon Engineering Outpost has been remapped, and received an /area/ + to go with! +2022-01-10: + DragonTrance: + - rscadd: Various items provide special texts when suiciding with them. + - rscadd: Unique text is shown when suiciding with food, a clown box, bubblegum, + bubblegum bubblegum, bees, tinfoil hats, suitcases, Magnus's Grasp, and even + when inside a stealth implant box. + - rscadd: Crayons now color you when suiciding with them. + Fikou: + - balance: Clarke can now attack in all directions + - balance: Clarke can now search for ruins + - balance: Clarke no longer gets a diagnostic HUD + SuperNovaa41: + - refactor: Decks of cards are actual lists of cards now + other improvements. + - bugfix: You can now put X4/C4 onto playing cards, and put them into decks without + deleting your explosive. + - bugfix: Sholean Grapes can use their gel cocoon ability again. + - bugfix: TK will no longer try to interact with your HUD (again). + fikou & urumasi (with stackoverflows send by shaps): + - rscadd: the wizard now has a new flashy weapon. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-01-11: ATHATH: - bugfix: The pig, cow, and horse masks were not available for purchase in the AutoDrobe like the other animal masks are. This oversight has been corrected. - bugfix: The toggleable voice modification boxes of animal masks that don't cover your mouth now actually work. +<<<<<<< HEAD Ebin-Halcyon: - imageadd: Missing Teshari sprites and files that are named wrong GoldenAlpharex: @@ -384,18 +653,55 @@ it to their needs.' - bugfix: Fixed the instances where speech wasn't handled properly, such as hulks not yelling and tongue modifications. +======= + EOBGames: + - rscadd: A number of new posters have been introduced, for your decorating pleasure. + - rscadd: Billboards have also made their way to the sector. + FernandoJ8: + - bugfix: people with only morgue access can now get to the morgue in tramstation + GoldenAlpharex: + - bugfix: Fixed the instances where speech wasn't handled properly, such as hulks + not yelling and tongue modifications. + Iamgoofball: + - balance: The Detective can now print .38 Rubber at the Security Protolathe. + JohnFulpWillard: + - bugfix: The HoP can no longer open CE job slots again. + Maurukas: + - bugfix: Removes non-functioning reagent tanks from Metastation's plumbing room. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored cult buildings to exorcise some copy+paste. Some cosmetic cult buildings won't drop metal now (but still work for cultists!). - balance: Buffed hydroponics dirt tray's capacity to 15u. +<<<<<<< HEAD Ryll/Shaps: - admin: Log messages for being deconverted from a revolution are now also registered in the mob's individual logs instead of just to the game.log SkyratBot: +======= + Pepsilawn: + - bugfix: Stray pixel on the drop pod sign removed. + Pickle-Coding: + - rscadd: Blown kisses will now power the supermatter engine. + Ryll/Shaps: + - admin: Log messages for being deconverted from a revolution are now also registered + in the mob's individual logs instead of just to the game.log + SuperNovaa41: + - bugfix: Clicking an open locker on combat mode will no longer deposit your item. + - bugfix: Fixes holodecks not properly deleting simplemobs. + - bugfix: You can now stamp papers while blind. + - bugfix: Can no longer open storage containers in a locker (or other container) + via right click. + jlsnow301: + - code_imp: Space vine code is cleaned up slightly. + - refactor: Space vines now use more flowery, easier to see colors. + - refactor: Space vine examination text is now easier to read. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an issue where cancelling out of tgui input text didn't count as null/no entry. You can now properly cancel out of succumb, etc. - bugfix: Pressing enter on tgui input text will no longer briefly create a new line. +<<<<<<< HEAD - balance: The Detective can now print .38 Rubber at the Security Protolathe. - refactor: Decks of cards are actual lists of cards now + other improvements. - bugfix: You can now put X4/C4 onto playing cards, and put them into decks without @@ -472,6 +778,38 @@ workings are a little less of a mystery. Melbert: - bugfix: Antag info ui carries over to a fresh body correctly +======= + oranges: + - balance: The engineering borg stun arm malfunction module has been rebalanced + to use more power + san7890: + - code_imp: Nanotrasen has implemented improved checking in their protocols, only + delaying the inevitability that the AI can one day get to be a blood cultist. + tastyfish: + - bugfix: The connect_range component now works correctly, meaning stacking machines + in Recycling now pick up stacks again. + unit0016: + - rscadd: Ectoscopic sniffers are now louder, and explain their purpose on examine. +2022-01-12: + Cheshify: + - qol: Modular Devices now have auditory feedback for disassembly. + - bugfix: Deltastation's Hydroponics Desk now has proper windoors. + Gofawful5: + - bugfix: Fix to where other forms of being dead (ie decapitation/braindeath) now + shows up on crew monitors when vitals are available via the red square. + GoldenAlpharex: + - code_imp: Documents and improves the code of the shuttle subsystem, so its inner + workings are a little less of a mystery. + Jackraxxus: + - bugfix: The HoS in mafia can now properly unselect their target for the night. + Kylerace: + - rscadd: People with the claustrophobia quirk will now be afraid of Santa Claus + and certain Claus-like entities + LemonInTheDark: + - bugfix: You feel space itself shift around you. Atmos has changed. Please report + any strange behavior, if you can notice it. + Melbert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Wrapping a bounty cube then unwrapping it no longer scams the owner out of a cut - bugfix: Wrapping a bounty cube then applying a barcode no longer grants a bigger @@ -481,6 +819,54 @@ by radios alone? - refactor: Refactored Pricetag component, less getcomponent and ugly signals, more sanity, harder to break +<<<<<<< HEAD +======= + - bugfix: Antag info ui carries over to a fresh body correctly + - expansion: Paper dispenser maintenance loot MOD. + S34NW, dragomagol: + - imageadd: new aquarium DIY construction kit sprites + SuperNovaa41: + - bugfix: Stops vending machines from runtiming when broken. + - bugfix: Cyborgs now must be adjacent to a vending machine to lift it back upright. + - bugfix: The civilian bounty computer will now properly give you new bounties if + they weren't already chosen. + - bugfix: You can no longer use telekinesis to teleport with the bluespace prophet + brain trauma. + - admin: Station traits are now logged at roundstart. + - bugfix: Fixed a runtime with syringe injection text. + - expansion: Added a new achievement involving Nar'Sie. + - bugfix: Fixes the equipment menu from runtiming if you the outfit has a skillchip. + TemporalOroboros: + - qol: Due to subtle design changes it is now possible to reach past hydroponics + trays, cooking grills, crates, and a few other table-shaped objects. + Watermelon914: + - rscadd: Adds progression traitors and reworked traitor objectives to give reputation + and telecrystals, which can be used to purchase equipment. + - balance: Traitor gear now has a soft timelock. Most gear becomes accessible 30 + minutes into a round. + - refactor: Refactored the uplink UI code completely to be in typescript and modernizes + it. + - rscdel: Removed romerol, surplus crate and the special syndicate kits from regular + traitor uplink. Romerol is now a final objective that you can receive. + jlsnow301: + - spellcheck: Admin help info is now slightly more readable + ma44: + - code_imp: Basic AI has been modified to allow for future features to be implemented + in a proper way. + neopythagorean: + - refactor: stationary pipe dispensers now take advantage of tgui + san7890, sounds courtesy of Capsandi: + - soundadd: Nanotrasen has sourced fire locks from a new vendor, on the cheap, and + nearly identical to the ones on past stations. Assistants describe the new sound + as "throaty" and "bassy". +2022-01-13: + Iamgoofball: + - balance: "Replaces the Cr\xE8me de Menthe in Quadruple Sec with Grenadine because\ + \ mint with triple citrus tastes awful and Grenadine turns drinks red" + LemonInTheDark: + - server: Added support for define toggle live ref tracking. Consider using it if + you're hunting hard deletes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: The icebox gremlins went and fixed some minor issues the construction crew made of the new Icebox Medbay @@ -494,6 +880,7 @@ names, letting you look up a silicon named "H.E.R.A." by simply searching "hera". - bugfix: Stealthed admins orbiting something will no longer count for that atom's orbiter count in the orbit menu +<<<<<<< HEAD SarmentiCampbell: - rscadd: Added mush kit to curator's heroic beacon SkyratBot: @@ -511,10 +898,21 @@ traitor uplink. Romerol is now a final objective that you can receive. - bugfix: Can no longer open storage containers in a locker (or other container) via right click. +======= + SuperNovaa41: + - bugfix: Emotes will now parse properly in dchat. + - bugfix: Drone tools can no longer be removed from the drone. + carshalash: + - rscdel: Removed podcaster reference shirt. + jlsnow301: + - rscdel: Removes swarmers! The griefiest, lowest fun value antagonist is removed + from the game. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Cameras are once again viewable from a distance, but this is limited to 2 tiles. - bugfix: The viewing range limit of 2 tiles also applies to the SecurEye tablet software. +<<<<<<< HEAD - bugfix: Fixes the equipment menu from runtiming if you the outfit has a skillchip. - rscdel: Removed podcaster reference shirt. - balance: "Replaces the Cr\xE8me de Menthe in Quadruple Sec with Grenadine because\ @@ -582,10 +980,62 @@ under you (and any other mobs). - bugfix: The carp plushie null rod variant now properly gives the carp faction to holy people instead of favouring the unworthy. +======= + san7890: + - code_imp: Traumas.dm is now spanned out and alphabetized. Just a small code improvement. +2022-01-14: + EOBGames: + - rscadd: An old space billboard has been spotted in the vicinity of the station. + Apparently, nobody at the advertising company realised how hard it is to read + a billboard when passing by at 2/3rds the speed of light. + Kylerace: + - bugfix: NanoTrasen has broken up the AI Static Union and thus AI static will no + longer intermittently decide to stop working. + Melbert: + - bugfix: Fixes gang induction, sentient disease abilities, birdboat's vomit button, + and the ooze's boost button + Pickle-Coding: + - bugfix: Pluoxium formation via supermatter will no longer consume oxygen that + doesn't exist. + SuperNovaa41: + - bugfix: Fixes stamps being randomly applied to paper even when not blind. + - bugfix: Fixes the spider charge not giving ninjas their objective + TemporalOroboros: + - bugfix: Guns can once again target individual pixels rather than always shooting + at the center of their target. + TheBonded: + - bugfix: The carp plushie null rod variant now properly gives the carp faction + to holy people instead of favouring the unworthy. + Timberpoes: + - bugfix: Prisoners can no longer roll roundstart revhead or cultist, and can no + longer roll latejoin revhead. This fixes an accidental change from an earlier + PR. + Time-Green: + - expansion: adds a springlock death achievement + jjpark-kb: + - bugfix: fixed nuclear particle's incorrect flag variable which could cause a runtime. + neopythagorean: + - bugfix: Fortune cookies now give you your fortune. + nikothedude: + - qol: In the edge case that an emote would have a custom parameter capitalized, + it now stays capitalized properly. + san7890: + - spellcheck: When a pAI holomatrix shell "perks up", you'll no longer be on the + edge of your seat, holding your breath to see what could possibly come next. + - bugfix: To everyone who likes sleep, hopefully you can all dream a little bit + sounder now that all of your bedsheets actually cover you now rather than persist + under you (and any other mobs). + - bugfix: DeltaStation's Pharmacy has gotten some minor refurbishment, replacing + a window for a wall to slam more equipment on it. + theOOZ: + - balance: Venting now has an indicator + tralezab: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: admin running department revolt works again - bugfix: separatists no longer have a bad greeting message - bugfix: united nations lawset is now properly rejecting law changes unless it completely overrides the laws +<<<<<<< HEAD - balance: Venting now has an indicator jjpark-kb: - rscadd: added a xenoarch guide to the xenoarch lockers @@ -594,6 +1044,20 @@ theOOZ: - balance: Roomba cyborg models can be flipped. 2022-01-15: +======= +2022-01-15: + MMMiraclkes: + - bugfix: Tramstation's prison area is no longer powered by a secret bathroom APC. + OrionTheFox: + - rscadd: The Captain and Corporate MODsuits now have an inbuilt hat stabilizer, + which can also rarely be found in maintenance! + RaidenKoizuma: + - rscadd: Added a medical medal lockbox to spawn within CMO's secure locker which + contains two medals + RandomGamer123: + - bugfix: Allows for putting integrated circuits (and swiping your ID to lock them) + into circuit airlocks without having to use combat mode. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - balance: Rubbershot is now much more bouncy than before, loses damage over range a bit slower, and has a somewhat tighter spread. Its pellets now also fly 50% @@ -601,6 +1065,7 @@ - bugfix: Bullets that deal both brute and stamina damage like .38 Rubber will now properly have both their brute and stamina damage reduced after each ricochet, instead of just the brute. +<<<<<<< HEAD SpookyTheFox: - rscadd: Added new functionality to the botany toolset arm implant - balance: Made a moderately strong weapon available if emagged @@ -661,6 +1126,31 @@ 0.15 on quick suits like rescue and 0.2 on semi quick like advanced or medical to 0.35 on research and 0.4 on prototype) qol: the storage modsuit module now tries to scoop up the suit storage item' +======= + SmoSmoSmoSmok: + - bugfix: Mulebots wont crush people in no gravity + Vexylius: + - qol: Chef can now enter botany on Delta. Also, there's a new biogenerator there. + itseasytosee: + - bugfix: Fixed some drugs keeping you high forever + pitreforten: + - bugfix: you can now get wet again! + tralezab: + - rscadd: Time Eradication Agents now use a MODsuit, which comes with some extra + functionalities +2022-01-16: + ArcaneMusic: + - qol: Improves feedback from the civilian and pirate bounty pads. + - bugfix: Bounty pads can now be deconstructed like regular machinery. + DragonTrance: + - bugfix: The tram can no longer consume and delete the Supermatter. + Fikou: + - qol: You can now right-click modsuit action buttons to activate them faster. + - balance: Undeployed modsuits now have 1/5 of the slowdown instead of 0 (from 0.15 + on quick suits like rescue and 0.2 on semi quick like advanced or medical to + 0.35 on research and 0.4 on prototype) + - qol: the storage modsuit module now tries to scoop up the suit storage item +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: you can now print expanded storage modules - bugfix: the magnate suit now has a jetpack - bugfix: you can now spraypaint storage items @@ -670,6 +1160,7 @@ are: standard, your current ones, using power cells. infinite, dont use power at all, used by some admin and wizard suits. ethereal, these dont use power cells, but an ethereal''s charge directly, they are craftable.' +<<<<<<< HEAD JohnFulpWillard and theOOZ: - balance: You can now tip Borgs over. Ryll/Shaps, credit to Crystalwarrior of Hippiestation: @@ -700,11 +1191,20 @@ a billboard when passing by at 2/3rds the speed of light. - rscadd: chisels are now the animated statue's bane. - code_imp: Badass.dmi has been moved to a new folder in the repository. +======= + JohnFulpWillard: + - qol: People who don't have head revolutionary enabled in their preference, will + no longer be promoted to head revolutionaries by force. + - bugfix: People banned from head revolutionary will no longer roll Head revolutionary. + - bugfix: Assigning timers on people's IDs now work properly, yay Tramstation Brig! + LemonInTheDark: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added a visual effect for dropping items from your inventory or hands - rscadd: Increased the animation time of the pickup effect, to make it less of a snapshot. Did some other things to it to hopefully make it look nicer - rscadd: Very minorly changed self attack animations - bugfix: Attack animations will display properly now +<<<<<<< HEAD - balance: Atmospheric gas masks are now normal-sized, the same as other full-face gas masks. That REALLY Good Soda Flavor: @@ -772,6 +1272,41 @@ watch for wolves. - rscadd: To accommodate the grand new laundry room, the locker room (and surrounding maintenance tunnels) have been shuffled around. +======= + ReinaCoder: + - bugfix: there is now a fire alarm in Metastation arrivals + Ryll/Shaps, credit to Crystalwarrior of Hippiestation: + - rscadd: Suffering slashing or piercing wounds, as well as violent dismemberment, + can now send bloodsplatters flying from your body that can land on walls/floors/windows/whatever + in the environment. Juicy! + SuperNovaa41: + - bugfix: Cult airlocks properly throw non-cultists across the room now. + capsaicinz: + - rscadd: 'Honk Co. is proud to announce their new project: clown operative MODsuits! + Adds the "Honkerative" theme to Syndicate MODsuits, and a paint kit module to + clown operative uplinks. Honka honka.' + itseasytosee: + - bugfix: Robot themed wings will now actually be visible + - imageadd: If synths get wings, they will be robot themed. + jjpark-kb: + - bugfix: added buttons for the chapel privacy shutters on Deltastation + - bugfix: added missing chapel privacy shutters in the office on Deltastation + san7890: + - bugfix: Moved the poster and newscaster in the bar on Deltastation so they aren't + ontop of other wall objects for ghosts/AIs + timothymtorres: + - bugfix: Fix deaf people being able to hear in certain text messages. +2022-01-17: + JohnFulpWillard: + - bugfix: Mutations like Telepathy will now work again. + JohnFulpWillard and theOOZ: + - qol: Tipping mobs over all runs on right click, rather than running on both right + and left click. + - balance: You can now tip Borgs over. + LemonInTheDark: + - qol: Space movement, assuming I've done my job correctly, should feel significantly + smoother +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed the immovable rod not properly carrying orbiters to new z levels - code_imp: Added a framework for different forms of looping movement - balance: Secborgs can no longer fly in space, as they have canonical wheels. The @@ -783,13 +1318,73 @@ - server: Hello admins. Spamming meteors will no longer lag things out quite so much. Still not amazing cause of all the explosions, but it won't kill things anymore. Blow some people up for me yeah? +<<<<<<< HEAD - bugfix: Teleport runes made by wraiths now show their custom names properly. +======= + SuperNovaa41: + - bugfix: Fixes not drawing cards from non-standard decks. + That REALLY Good Soda Flavor: + - imageadd: Added a stamina indicator to the human mob's HUD. + Thunder12345: + - rscadd: Added a new system to allow for partial random generation of space ruins + (and maybe more) + - rscadd: The russian DJ station has been overhauled and given randomly generated + variations. + Watermelon914: + - admin: Added the objectives to the antag panel for admins. + - admin: Added logs for when a player gets a potential objective, when a player + takes an objective and when a player succeeds/fails an objective. + neopythagorean: + - bugfix: Podpeople are no longer missing a hand when facing right, and podwomen + no longer stick out of their jumpsuit. + san7890: + - bugfix: On the mapping end, all of the engineering storages are no longer number + "2" (as far as the sprite labelling the rooms go). The sprites now reflect their + actual usage in their respective maps. + - code_imp: If you care, _globalvars/lists now has a lot of lists spanned out and + alphabetized. If you don't care, that's fine too. + - code_imp: Badass.dmi has been moved to a new folder in the repository. + - bugfix: Nanotrasen has now stopped including a big chunk of iron in their berets, + making it a bit weaker to melee damage. Still just as fashionable, though. + tf-4: + - bugfix: Windoors can now have their electronics removed without creating infinite + assemblies. + - balance: Atmospheric gas masks are now normal-sized, the same as other full-face + gas masks. + tralezab: + - rscadd: chisels are now the animated statue's bane. +2022-01-18: + Capsandi: + - bugfix: Fixed a metastation active turf, enjoy slightly faster loading + FlamingCheese: + - bugfix: Replaced snowed over plating in icebox airlocks with regular plating to + make the plating unable to generate dangerous gases + JohnFulpWillard: + - bugfix: Borgs who are untipped ahead of time and re-tipped will not have their + first self-untip timer untip them the second time. + LemonInTheDark: + - admin: Telemetry code will spam you with undeleted query logs much less often + now! + - server: Improved how the db subsystem handles undeleted queries, should never + have an incident like that again + Melbert: + - expansion: Slapping yourself in the face now delivers a facepalm. + - expansion: Slapping someone who's asleep in the face may wake them up faster. + - balance: 'Placed traitor bugs should have fingerprints and fibers now. Remember: + You can clean your fingerprints off of things with soap or other cleaning methods.' + Mothblocks: + - balance: Nuke disks must now be held by a player or pulled by a player in order + to count as moving to not increase the chances of lone ops. This means no more + disk conveyor belts. + ReinaCoder: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes Icebox not having a drone dispenser. - bugfix: Fixes Icebox not having a medical records console available to MD. - bugfix: Fixes the little cross section of Icebox medical and science maints not allowing medical and science access. - bugfix: Fixes the fire extinguisher on a disposal bin on Icebox - bugfix: Fixes the placement of a camera in Icebox medical +<<<<<<< HEAD - bugfix: Replaced snowed over plating in icebox airlocks with regular plating to make the plating unable to generate dangerous gases - spellcheck: Exploration Drone Control Console's computer board is now properly @@ -861,6 +1456,30 @@ RatFromTheJungle: - rscadd: 'Adds modsuit+ other-stuff to maint-loot remove: removes alot of shit that has no business being in maint loot, from maintloot' +======= + SuperNovaa41: + - bugfix: Fixes AIs not being able to announce any custom laws. + - bugfix: Fixes floorbots dropping full toolboxes. + Thunder12345: + - bugfix: Blood brothers will now be told who their teammates are in their antagonist + info window. + magatsuchi: + - bugfix: sleeping people no longer show up as dead on crew monitor + san7890: + - bugfix: To lessen confusion, DeltaStation's customs areas have been split into + two, so the average scientist doesn't need to perform a kilometer long trek + up and down the station looking for those sweet, sweet anomaly cores. + tf-4: + - bugfix: Trying to make weak virus plasma will no longer plasmaflood virology. +2022-01-19: + Fikou: + - bugfix: fixes the centcom commander outfit not having a modsuit counterpart + JohnFulpWillard: + - spellcheck: Exploration Drone Control Console's computer board is now properly + spelled. + RandomGamer123: + - bugfix: Teleport runes made by wraiths now show their custom names properly. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - rscadd: Added premium Two-Time root beer to soda vending machines for 200 credits! The soda grants you doubled fire-rate with ranged guns while in your system, @@ -868,6 +1487,7 @@ stamina damage and drowsiness when it wears off. - rscadd: Added admin-only racing shooting gloves that grant the doubled fire-rate buff to the wearer with no downsides. +<<<<<<< HEAD SarmentiCampbell: - rscadd: Gave a RCD to the Syndicate Module - balance: The syndicate jack module had their tools replaced with power tools, @@ -953,11 +1573,75 @@ - bugfix: Soulful toolboxes, made by using a soulstone with a shade in it on a toolbox now display their icon properly. - admin: Adds logging to the tippable component, to catch all the new borg griefing. +======= + ShizCalev: + - server: A couple mapping errors will now be more visible and actually logged in + the mapping error log. + Wallem: + - expansion: MODsuits now have a Glove Translator module for all the vocally impaired. + Plasmamen can now _properly_ be mute hand-talkers. + san7890: + - imageadd: The "Interrogation Room" area now has a new sprite to define it on the + mapping end. + - expansion: What's this? Nanotrasen tunneled out a grand hole into the ice planet + that Ice Box Station currently rests on! There's a new laundry room! For your + clothes! What d'you mean, Ian? + - rscadd: You can also exit this laundry room onto a caringly, yet sloppily placed + bridge to explore the ice planet (if you really want to). Watch your step, and + watch for wolves. + - rscadd: To accommodate the grand new laundry room, the locker room (and surrounding + maintenance tunnels) have been shuffled around. + sasichkamega: + - rscadd: patch icon choosing in the chem dispenser and chem press + vincentiusvin: + - bugfix: Pumping hot gas into cold gas using the regular pumps should no longer + explode. + - code_imp: Some math changes to how pressure based pumps calculate pressure (both + portable and fixed). Report if problems are found. +2022-01-20: + DragonTrance: + - balance: Maintenance Drone health changed from 30 to 45 + - balance: Maintenance Drone stun times from getting EMP'd reduced from 10 seconds + to 7 seconds + - qol: Maintenance Drones can now interact near dead bodies + - qol: Maintenance Drones don't have to wait 5 minutes to open an airlock when someone + recently did it. Now they have to wait 1 minute. + - qol: Changed distance Maintenance Drones aren't allowed to interact with anything + from a nearby mob from 4 tiles to 3 tiles + ErdinyoBarboza: + - rscadd: Lizardpeople now enjoy eating (these) nuts. + Fikou: + - rscadd: Reworked the MOD Kinesis module and added it to techwebs. + - bugfix: fixed modsuits not running out of charge + - bugfix: fixed modsuits needing multiple cores and cell fitting being weird + TemporalOroboros: + - bugfix: Aiming at obscured turfs will no longer make you shoot somewhere up and + right of where you clicked. + Thunder12345: + - bugfix: The CMO's office on Icebox can no longer be entered from maint by anyone + with general medbay access. + - bugfix: Eliminated a runtime error related to Modular Map Loading + - bugfix: The Kilo pharmacy's door onto the public med lobby no longer requires + general medical access to open. + san7890: + - bugfix: Great news! If you want to crack open a window on TramStation, you shouldn't + be immediately greeted with the vast vacuum of space lying under said window. + - bugfix: Nanotrasen updated their weather protocols, it should now snow around + Moffuchi's Pizzeria whenever it shows up on the surface of Ice Box Station. + - rscadd: The Laundry Room on TramStation is now called a Laundry Room. Rejoice! + tralezab: + - rscadd: Added thieves! Low level antagonists that want to steal, hoard, and escape + with your goodies! + - rscadd: They show up roundstart and midround, and do not have a license to kill. +2022-01-21: + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Syndicate, ninja, fugitive hunter masks and some costume masks (cyborg visor, plague doctor, carp, owl, monkey) no longer impair vision with field of vision cones. - bugfix: Restored the LACK OF pepperspray protection the aforementioned costume masks (not the antag ones) had before the transition from gas mask tint to FoV. +<<<<<<< HEAD - bugfix: Fixes plants not maintaining their healthy size when picked up and put back down - bugfix: Hitting cancel when renaming a paper now actually cancels the operation. @@ -996,12 +1680,57 @@ - bugfix: Portable Scrubbers and Large Scrubbers should no longer display as large, embittered ERROR icons for those who enjoy mapping. - refactor: Refactored AI law announcing. +======= + JohnFulpWillard: + - bugfix: Tramstation's Brig lockers can now be used more than once. + - qol: Security Officers can right click Tramstation's permabrig lockers to open + them early, unregistering their ID. + OneAsianTortoise: + - bugfix: headset, spray can, card, crayon, seclite have correct suit slot sprite + now. + RandomGamer123: + - bugfix: Certain traitor objectives now fail when they are supposed to instead + of unintentionally succeeding, most notably when objective-critical items are + destroyed. + SuperNovaa41: + - admin: Adds logging to the tippable component, to catch all the new borg griefing. + TemporalOroboros: + - balance: The blastcannon's damage has become more spread out and it now may be + somewhat diminished by walls depending on config. + - balance: The base range of the blastcannon has been slightly buffed to compensate + for the new diminishing effect of walls. + neopythagorean: + - bugfix: Hitting cancel when renaming a paper now actually cancels the operation. +2022-01-22: + AdipemDragon: + - imageadd: Chefs got a whole lot better at making visually apealing pizzas! Their + boxes got spiffied up to match, too. + ArcaneMusic: + - refactor: Boomerang behavior has been moved to a component. + ErdinyoBarboza: + - bugfix: Ready Meal Donkhiladas are now made with meat and vegetables that do not + vaporize when microwaved. + Fikou: + - bugfix: fixes modsuit devices fucking up if you couldnt equip them + - bugfix: fixes modsuit pins fucking up if you remove the module + - imageadd: modsuit jetpack now has unique assets + LemonInTheDark: + - bugfix: Fixes plants not maintaining their healthy size when picked up and put + back down + - bugfix: Fixes some weird behavior with items falling out of your hands when space + moving. Life is pain + - bugfix: Fixes things not properly flying out of ruptured disposal pipes + Melbert: + - expansion: 'Deltastation: Atmosphics, Engineering, and Service Maintenance revamp!' + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Tritiumfire will need more tritium burned in order to release radiation. The higher the volume of the gasmixture, the more tritium is needed. - balance: Tritiumfire radiation pulse will always have a range of at least 6, but will need more tritium in order to increase range. - balance: Tritiumfire will be less likely to irradiate you if there is less tritium getting burned. +<<<<<<< HEAD - rscadd: Reflectors have been slotted with USB ports. - bugfix: Fixed aggressive mobs moving twice as slow as they should. This was the result of a rather big refactor that moved us away from a BYOND thing. I don't @@ -1023,11 +1752,35 @@ map' - balance: changed bluespace miner price from 200,000 to 75,000 - bugfix: fixed bluespace miner missing "pressure too high" examine text +======= + RandomGamer123: + - bugfix: Soulful toolboxes, made by using a soulstone with a shade in it on a toolbox + now display their icon properly. + ShizCalev: + - bugfix: Camera assemblies are now upgradable again! + SkeletalElite: + - rscadd: new plasma cutter EMP effect, it sets you on fire + SuperNovaa41: + - bugfix: Fixed a dead bartender spawning in the beach biodome ruin. + Tastyfish: + - bugfix: Fixed delivery tagger destinations. + YakumoChen: + - qol: Traitors trying to steal a supermatter sliver should be reminded that magboots + are required near an active supermatter at all times. + cacogen: + - qol: Fire alarms prepend their area name + san7890: + - bugfix: Portable Scrubbers and Large Scrubbers should no longer display as large, + embittered ERROR icons for those who enjoy mapping. + - bugfix: Nanotrasen finally realized that when spraying decals on TramStation to + go UNDER any staircase accessories. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tastyfish: - bugfix: Objects transitioning through z-levels in disposals no longer lose their delivery destination tag. - bugfix: Tramstation port-aft disposals loop containing part of service, and engineering now work again. +<<<<<<< HEAD tf-4: - bugfix: fire alarms now ACTUALLY prepend their area name 2022-01-24: @@ -1059,6 +1812,135 @@ game! - rscadd: Playing videogames will now give you a slight mood buff. - bugfix: Ablative trenchcoats will no longer delete sechuds given from other sources. +======= + zxaber: + - bugfix: Fixed cyborg light overlay not showing when the light is off. +2022-01-23: + Blevruz: + - rscadd: Reflectors have been slotted with USB ports. + Iamgoofball: + - rscadd: Traitor Roboticists can now purchase the Springlock MODsuit Module from + the uplink. + - rscadd: This version of the Springlock MODsuit Module activates way, way faster. + LemonInTheDark: + - bugfix: Fixed aggressive mobs moving twice as slow as they should. This was the + result of a rather big refactor that moved us away from a BYOND thing. I don't + know how the BYOND thing fucking works internally, so the numbers might be a + bit off. If something seems (way) too fast/slow, lemme know yeah? + Melbert: + - bugfix: Fixes some decals and piping in Delta's Ordnance Lab + - expansion: 'Ninja / traitor comms hacking can now summon a wider variety of antags: + Pirates, Fugitives, More traitors, or a flat dynamic threat increase!' + Orion_the_Fox, Pirill: + - rscadd: Added several new Bamboo items, turfs, and more! + - imageadd: Updated existing Bamboo items to a less repulsive green. + Pickle-Coding: + - bugfix: Setting volume pump to 0L/S will no longer runtime. + PositiveEntropy: + - imageadd: resprite the toolboxes + - imagedel: removes the old Goon toolbox sprites + Semoro: + - bugfix: Avoid timer scheduling too far events into short queue + - bugfix: timers not removing from second queue on init + SuperNovaa41: + - refactor: Refactored AI law announcing. + - balance: Borgs can halve their selfuntip time with the power of roleplay. + itseasytosee: + - bugfix: fixed stacked cannonball sprites looking wack + jjpark-kb: + - bugfix: ghosts will now bob up and down + san7890: + - soundadd: The next time you work out at the gym, please appreciate the new crispness + of the sound when that machine starts to squeak as a result of your effort. + So refreshing. + zxaber: + - balance: Fire Locks now check for atmos issues on their own, rather than leaving + it to the Fire Alarm. This should cut down on a single breach turning the main + halls into a navigational mess. + - balance: 'Fire Locks will wait five seconds after a reset before triggering again. + tweak: Fire Alarms will still activate all Fire Locks in an area if manually + pulled. tweak: Fire Alarms are still used to reset Fire Locks, but now it''s + a right-click action. tweak: Emagging a Fire Alarm will apply the effect to + all Fire Locks in its area, behaving roughly the same as before. tweak: Disabling + Fire Detect is also still done at the Fire Alarm and should work closely as + it used to.' + - balance: Right-clicking a closed Fire Lock with a crowbar will open it for exactly + two seconds. Holding it open (left click) is unchanged. + - balance: 'Firelock emag functions (ignoring atmos detect) is now done by a doorjack + on the firelock itself. You can still emag a fire alarm to mute it, though. + sprite: Fire Locks now have lights that display the reason they are active. + Orange is Hot, Cyan means Cold, and White means a Fire Alarm was pulled.' +2022-01-24: + ErdinyoBarboza: + - bugfix: Service Tech Storage now has proper kitchen appliance circuitboards + JohnFulpWillard: + - bugfix: Fixed some problems with bullets (Not making you guilty to Honorbound, + Monkeys wouldn't retaliate against you, and Stealth MODsuits wouldn't react + at all). + LemonInTheDark: + - bugfix: Fixed abductor consoles having infinite action buttons + - rscdel: Removed another source of long timer singlecaps + - bugfix: Kudzu will spread properly now + Melbert: + - bugfix: the powergame crowbar has been lifted out of icebox mining and replaced + with a more sane crowbar + - bugfix: Fix Deltastation engineering shared storage door access + - bugfix: Delta atmos has a CO2 -> waste filter, like all other maps + ORCACommander: + - bugfix: The Redundant Form of Redundancy Introduced by the redundant department + of redundancy has had its redundancy reduced redundantly + ReinaCoder: + - bugfix: Tramstation brig's disposals now has a trunk under it + Semoro: + - bugfix: Avoid runechat scheduling too far events into short queue (port from SStimer) + Thunder12345: + - bugfix: Tramstation's gulag processing room has been rearranged so prisoners can + disembark on their own instead of being trapped. + Zonespace27: + - bugfix: Simplebots can now have tools used on them without injuring them in the + process. + capsaicinz: + - rscadd: Adds supermatter spiders. + coldud13: + - spellcheck: removed a misplaced bracket in the modular computer printer display + itseasytosee: + - bugfix: skeleton wings had some missing sprites readded + lewcc: + - bugfix: Using screwdrivers on bots will no longer attack them. + mozi_h: + - refactor: filing cabinets now use tgui + necromanceranne: + - bugfix: Restores the cardborg helmet icon. + - bugfix: Launchpads no longer disappear when screwed open. + tf-4: + - spellcheck: Removed a duplicate exclamation mark from the dismemberment message. + timothymtorres: + - code_imp: Move defines to their local .dm files + - code_imp: Remove code/__DEFINES/misc.dm + - refactor: Adds some documentation to defines + tralezab: + - balance: hop can no longer get objectives to steal the hand tele. + - balance: Heirlooms are now visible to everyone on examine. + unit0016: + - expansion: Donk Co. Has finally seen fit to refurbish their lavaland bases - And + unlike those /other/ guys, now things aren't standardized across every installation! + To.. some executive's amusement. +2022-01-25: + ErdinyoBarboza: + - expansion: Adds Semki's and Pistachios to the Snack Vendor. Also you can now dry + sunflowers to make your own roasted sunflower seeds! + - spellcheck: Improper snack names has been made to use \improper. + Guillaume Prata: + - qol: APCs/Air alarms are now locked/unlocked with Right click + JohnFulpWillard: + - refactor: Honkbots have been made a subtype of Secbots, which means they trigger + phobias of security, and their behavior has additionally been overhauled to + work more like Beepsky. + Kubisopplay: + - bugfix: Malfunction in malfunctioning ai protocols should be fixed, AIs should + break regularly again. + LemonInTheDark: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added an action button to janitor cyborgs. It'll draw water from your bucket and clean the ground under you as you walk. More wasteful then mopping mind @@ -1067,12 +1949,40 @@ version. It doesn't have the 2 second wait attached to it - refactor: Made being a cleaning chemical into a bitflag instead of having manual checks in mop code +<<<<<<< HEAD - spellcheck: Improper snack names has been made to use \improper. - imageadd: New sprites for HoS Jumpsuit/Jumpskirt, and Turtleneck/Skirtleneck - imageadd: New sprites for Warden Jumpsuit/Jumpskirt - imageadd: New sprites for Sec's formal uniforms - bugfix: Malfunction in malfunctioning ai protocols should be fixed, AIs should break regularly again. +======= + PapaporoPaprito's sprites: + - rscadd: ports some moth wings & antennae from fulp (credit to PapaporoPaprito + for the original icons) + SkeletalElite: + - bugfix: An active turf was fixed on the DJ station + SuperNovaa41: + - bugfix: Ablative trenchcoats will no longer delete sechuds given from other sources. + Vladoricious and Michiyamenotehifunana: + - rscadd: Added the CMO turtleneck and turtleneck skirt! Order them in the Medical + section of cargo! + axietheaxolotl: + - imageadd: New sprites for HoS Jumpsuit/Jumpskirt, and Turtleneck/Skirtleneck + - imageadd: New sprites for Warden Jumpsuit/Jumpskirt + - imageadd: New sprites for Sec's formal uniforms + cacogen: + - bugfix: Items returned to vending machines no longer disappear. Instead, they + increment that item's count and can be vended again immediately for free + - expansion: Nearly all vending machines accept returns (no refunds, though) + magatsuchi: + - bugfix: removes catwalk satchels + neopythagorean: + - rscadd: Nanotrasen has begun hiring gamers. These crew members have a need to + game! + - rscadd: Playing videogames will now give you a slight mood buff. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The species of Rabbits signed a declaration saying that they no longer wanted to be a part of Easter. After a long four-year separatist movement and a lot of bloodshed, they aren't! @@ -1081,6 +1991,7 @@ - bugfix: If for some reason you wish to kill one of these creatures, the black and brown variants should now have their eyes comically turn into an X (because that wasn't there before). +<<<<<<< HEAD - bugfix: Fixed some problems with bullets (Not making you guilty to Honorbound, Monkeys wouldn't retaliate against you, and Stealth MODsuits wouldn't react at all). @@ -1157,12 +2068,28 @@ PapaporoPaprito's sprites: - rscadd: ports some moth wings & antennae from fulp (credit to PapaporoPaprito for the original icons) +======= + tastyfish: + - qol: The destination tagger UI now shows its items in alphabetical order (intentionally). + the-orange-cow: + - qol: In game tips now properly recommend Left 4 Zed as a means of mutating plants. Please, + stop using unstable mutagen. +2022-01-26: + ErdinyoBarboza: + - spellcheck: Gives mannitol an actual taste. + - expansion: Boritos Corn Chips can now be bought from Snack Vendors + - bugfix: Made the trash of Ready Donkmeal nicer + - bugfix: Updates food spawners to include Boritos, Semki's and Pistachios + Kokonut (Maxymax13): + - imageadd: Touches up the new toolboxes' appearance. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, Axietheaxolotl: - imageadd: Resprites/Reshades the Head of Security's Trenchcoat! - imageadd: Resprites commander caps into peaked caps! Flex your naval prowess with them! - imagedel: Removes the old captain parade tunic, replacing it with Captain's Parade Jacket! +<<<<<<< HEAD SkyratBot: - refactor: the telecommunications server monitor now uses tgui. - bugfix: Made the trash of Ready Donkmeal nicer @@ -1187,10 +2114,76 @@ Selected" output signal.' - bugfix: The BCI action component now properly typechecks if it was inserted into a BCI. +======= + Riggle: + - admin: gamemode panel now correctly displays the time + SmoSmoSmoSmok: + - bugfix: Vending machine doesn't fall over if its weightless + Y0SH1M4S73R: + - expansion: Adds the MOD Action component for the circuit adapter module. When + the circuit adapter is selected, a radial menu opens, allowing the wearer to + trigger any of the installed Action components. + - qol: The circuit adapter module can be printed in the component printer. + - qol: The circuit adapter module can have its circuit removed. Because of this, + the module no longer starts with an unremovable circuit pre-installed. + - spellcheck: Renames the MOD component to the MOD circuit adapter core, as it is + no longer the only MODsuit-related circuit component. + - bugfix: The MOD circuit adapter core can now activate inactive MODsuits. + - qol: The MOD circuit adapter core's "Selected Module" port is now a string port + instead of an entity port. + - qol: The MOD circuit adapter core now has a "On Module Selected" output signal. + - bugfix: The BCI action component now properly typechecks if it was inserted into + a BCI. + coldud13: + - qol: Adds text to let players know that you can unscrew catwalk plating. + jjpark-kb: + - rscadd: spacevines now have a spawning animation + lewcc: + - refactor: Reworks some tool interactions to use specific tool procs + tralezab: + - bugfix: APOTHEOSIS! now forces you standing during your death animation, restoring + the old (not forced) standing when I originally added APOTHEOSIS! +2022-01-27: + Fikou: + - balance: lowers kilo's bombcap multiplier + Iamgoofball: + - balance: Removes the fucking 20 second stunlock rng from tourettes because it's + fucking stupid and I just had the most agonizing thirty fucking minutes of my + goddamn life, holy shit, I hate this fucking mutation so goddamn much, who the + fuck thought 20 second hard stun was a genius idea for a random mutation, especially + the fact it gives absolutely zero indication that it's from the tourettes because + the stun has no message attached + Kylerace: + - bugfix: the fast mc tab refresh pref actually works + Melbert: + - admin: Comms console hacks by ninjas and traitors (the ones that spawn antags) + are now logged (find them in user logs and in the game log!). + Pickle-Coding: + - bugfix: Bluespace gas vendors no longer deletes the gases it doesn't transfer + when transferring gases. + SkeletalElite: + - bugfix: Kilo uses regular newscasters instead of security variants + Wallem: + - expansion: Monkeys can now protect their village from the rubber menace. + Zonespace27: + - bugfix: Heads of Personnel can now be midround thieves, as intended. + blessedmulligan: + - bugfix: You can now remove attachments from weapons without standing across the + room + magatsuchi: + - bugfix: restructures some code to make airlocks hackable again + - bugfix: blood barrage no longer has a seizure when you use it + neopythagorean: + - refactor: the telecommunications server monitor now uses tgui. + san7890: + - bugfix: Followers of Nar'Sie who hope to summon her can hopefully ascertain the + correct area to summon her, as the gambling and gaming dens have now been seperated. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Whenever radiation shelters are blueprinted and labelled as a "radiation shelter", you can rest easy now that the blueprint has an actual name. It doesn't matter on a day-to-day basis, but it looks a lot nicer for the people working with the blueprints. +<<<<<<< HEAD - bugfix: Heads of Personnel can now be midround thieves, as intended. Snakebittenn: - rscadd: Nanite Slurry has been renovated to passively heal synths and the robolimbs @@ -1245,10 +2238,37 @@ - bugfix: DJ Space ruin no longer uses incorrect turfs. - bugfix: The camera in the Ice Box Station Locker Room is no longer inside of a door. +======= + tastyfish: + - bugfix: Central Command has finally informed the Plexagon vendor that service + hallway access exists, allowing HoP's to grant it to ID cards. + tralezab: + - rscadd: Separatists now have an antagonist ui! + - balance: Antagonists cannot roll for thieves anymore, as you already have a larger + amount of impact on the round than thief would give you. + - admin: Admins no longer roll for thief while they sit around on centcom testing + things. +2022-01-28: + JohnFulpWillard: + - admin: Tool usage is now (config-locked) logged! + Jolly-66: + - bugfix: DJ Space ruin no longer uses incorrect turfs. + Maxymax13: + - imageadd: resprites pills + Sheits: + - imageadd: Resprites the mega legion and all legion related mobs + Wallem: + - qol: Mailbags can be worn on cargo coat. + - imageadd: Mailbags have their own sprite instead of borrowing it from book bags. + Zonespace27: + - qol: You can now use autosurgeons on other people after a delay. + axietheaxolotl: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: New sprites for the Parcel Parceaux, base Mime mask, Mime outfit and skirt, and mime sexy outfit. - imageadd: new sprites for lace-up shoes. - code_imp: Mimes spawn with lace-ups instead of black shoes +<<<<<<< HEAD - balance: Fire Locks now check for atmos issues on their own, rather than leaving it to the Fire Alarm. This should cut down on a single breach turning the main halls into a navigational mess. @@ -1266,10 +2286,14 @@ on the firelock itself. You can still emag a fire alarm to mute it, though. sprite: Fire Locks now have lights that display the reason they are active. Orange is Hot, Cyan means Cold, and White means a Fire Alarm was pulled.' +======= + castawaynont: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: CentComm's Mark One SWAT suit's design has been reworked; it now lacks spaceproofing, but it has become significantly faster to move in and retains temperature-proofing. These adjustments have allowed CC to sell them for a lower cost of 1400. +<<<<<<< HEAD - bugfix: Tramstation brig's disposals now has a trunk under it - balance: lowers kilo's bombcap multiplier - bugfix: The warden can no longer consider half of security to be their office @@ -1277,6 +2301,19 @@ - refactor: Honkbots have been made a subtype of Secbots, which means they trigger phobias of security, and their behavior has additionally been overhauled to work more like Beepsky. +======= + jjpark-kb: + - qol: safes now use balloon alerts for the hint + san7890: + - bugfix: Nanotrasen decided to redirect some of the plasma rivers on IceBox station + towards the labor camp, helping add another layer of security between the station + and those awful, awful prisoners. + - bugfix: Area definitions for the IceBox and Lavaland Labor Camps have been updated. + That means that gulag point-prisoners no longer have a safe haven inside the + security portion of IceBox's security wing. + - bugfix: The warden can no longer consider half of security to be their office + on KiloStation. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Introducing: The Lizard''s Gas! A brand new (gas) station for you to go out and refuel your ships and your stomachs. It''s been a while since the power''s been turned on, but everything is just the way it was left all those @@ -1286,6 +2323,7 @@ - config: since gasthelizards.dmm is removed, the config has been updated as well. make sure it's up-to-date now that we've gotten rid of the dang ol' thing and replaced it with new hotness. +<<<<<<< HEAD - bugfix: Nanotrasen decided to redirect some of the plasma rivers on IceBox station towards the labor camp, helping add another layer of security between the station and those awful, awful prisoners. @@ -1340,6 +2378,60 @@ now abandoned. - bugfix: Attempting to write to paper no longer comically bluescreens. - bugfix: Spiders will now have a randomized number next to their name. +======= + - bugfix: The IceBox Station Telecommunications Room now has a fire alarm. + - bugfix: Atmossians, no longer fret. You now own all of the walls in TramStation's + Incinerator Room. + - bugfix: The camera in the Ice Box Station Locker Room is no longer inside of a + door. +2022-01-29: + Fikou, TetraZeta for sprites, Nerevar for description.: + - expansion: Loader Class MODsuit, equipped with hydraulic arms, available in your + nearby cargo storage (or qm office on delta). + - expansion: BEPIS MODsuit modules, currently available one lets you change your + disposal destination. + Improvedname: + - bugfix: Ash drake shapeshift now converts your health like shapeshifting is supposed + to + LemonInTheDark: + - bugfix: APCs will no longer error and complain about something that doesn't actually + matter + - bugfix: I accidentally doubled the speed of all simple mobs. It's fixed now. I + also know how byond's internal movement stuff works now. I hate this codebase + OneAsianTortoise: + - bugfix: Fixes being able to load C-4/X-4 into the grenade launcher, and it duplicating + when you try to load it + RandomGamer123: + - qol: Purified shades now show who they were prior to becoming a shade. + - bugfix: Purified shades that get converted to shades now become regular cult shades. + - qol: Purified soulstones (and the shades inside) can now directly be converted + into cult soulstones (and cult shades) with Twisted Construction. + - spellcheck: '"Shade of" does not get duplicated anymore for soulstones under certain + conditions' + SmoSmoSmoSmok: + - bugfix: Cuffing people as a PAI/ghost controlled beepsky no longer glitches out + SuperNovaa41: + - bugfix: Thermite will no longer leave an impassable fire tile if the turf beneath + it is deleted/deconstructed. + - bugfix: Spiders will now have a randomized number next to their name. + tralezab: + - balance: Statues can now phase around when unseen. +2022-01-30: + Melbert: + - bugfix: Balloon alerts sourced on turfs work properly. + ReinaCoder: + - bugfix: The adjusted versions of the Head of Security's jumpsuit and skirt are + now the same colour as the non-adjusted. + Timberpoes: + - bugfix: Attempting to write to paper no longer comically bluescreens. + Vire, san7890, mrmelbert, Sealed101: + - bugfix: Autonamed cameras should no longer show static in camera consoles. + antropod: + - balance: Folded bluespace bodybag with dwarves fit into backpack + cacogen: + - bugfix: Ice Box Public Mining downstairs now uses proper external airlocks + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: If you've been noticing some weirdness in the light as you spacewalk over to the AI Satellite on MetaStation, fear no longer for they have been fixed. - spellcheck: The last ash drake currently residing on the celestial body underneath @@ -1347,6 +2439,7 @@ - bugfix: For those of you into code, some stuff with the icon pathing has been shuffled around so it's no longer in the roots of the icon/ folder. If you aren't into code, that's fine too. +<<<<<<< HEAD - bugfix: Cuffing people as a PAI/ghost controlled beepsky no longer glitches out - balance: Folded bluespace bodybag with dwarves fit into backpack - bugfix: Ice Box Public Mining downstairs now uses proper external airlocks @@ -1391,3 +2484,37 @@ - bugfix: The teleporter room shutters on Blueshift are now functional thestubborn: - bugfix: sheriff hat will now display ears +======= + - imageadd: Abandoned Kitchens now have a special sprite indicating that they are + now abandoned. + theOOZ: + - bugfix: Runechat reads the y offset value of the sayer instead of the hearer +2022-01-31: + Donpedrito: + - rscadd: Added blue shoes to the MediDrobe. + Ghommie: + - bugfix: Fixed the Illegal tech node being unobtainable. + Guillaume Prata: + - qol: Metalfoam structures can now be used as a girder to finish building walls. + Jackraxxus: + - bugfix: Examining the pirate Dutchman's mast will no longer shatter your immersion. + Maurukas: + - bugfix: NT CIMS no longer detects Supermatter crystals and shards that are not + owned by Nanotrasen + Melbert: + - qol: blind people can hear talking toys + SmoSmoSmoSmok: + - spellcheck: Fixes popup text resulting from someone batoning a cyborg + TemporalOroboros: + - balance: The sniper rifle can now shoot things from much further away. + Zonespace27: + - bugfix: Using an autosurgeon on someone else now properly gives them the implant. + jjpark-kb: + - qol: You can now rotate the direction of the mecha fab if its wire panel is open + timothymtorres: + - config: Add PR_ANNOUNCEMENTS_PER_ROUND and STATION_GOAL_BUDGET to be a config + instead of define + tralezab: + - admin: Bounty Hunters can now be called via admin ert + - expansion: Oh, and they have cool flame ids as well! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index 85a15576e9b..04bce0a01ee 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -1,4 +1,5 @@ 2022-02-01: +<<<<<<< HEAD AtoriBirb: - bugfix: a trait not removed when the chameleon gene is removed. Ryll/Shaps: @@ -102,6 +103,54 @@ therefore are getting a minor reward instead now properly displays. - spellcheck: Not having enough iron to create a foam wall no longer erroneously tells you that you need four iron sheets instead of two. +======= + ArcaneMusic: + - qol: Blackmarket uplinks now draw from the player's ID card, not from an internal + supply of credits. + - code_imp: Blackmarket uplinks on the backend were tweaked in a way consistent + with other sold items. + CRITAWAKETS: + - refactor: The environmental atmos scanning ability of the gas analyzer is now + a component. + Ghommie: + - bugfix: Fixed the "skeletal guardian" away mission role not being a skeleton. + JohnFulpWillard: + - bugfix: Species-locked traitor items (currently the moth suspicious lantern) has + been re-added after an accidental removal. + Jolly-66: + - bugfix: Last two Active Turfs in DJ Space Ruin were fixed. + LemonInTheDark: + - bugfix: Kilo and tram's whiteships should actually spawn now. No promises on them + docking though + Melbert: + - balance: Icebox's cursed spring now only spawns on the lower levels of the moon. + Mothblocks: + - qol: Default FPS (if you have it unset) is now 100 instead of 40. + RandomGamer123: + - bugfix: Prevents silicons from opening circuit airlocks by walking through them. + Ryll/Shaps: + - bugfix: Iron walls built on top of metal foam will produce metal foam instead + of a girder when decon'd. + TiviPlus: + - bugfix: fixed new areas over starlight areas not having lighting objects + Watermelon914: + - expansion: Final objective battlecruiser will now make you a battlecruiser ally, + giving you the nuke codes and making it obvious to other battlecruiser members + that you are one of them. + - expansion: Added telecom disruption and blackout purchases for traitors to purchase, + and moved the elite syndicate hardsuit from the nukie uplink to the traitor + uplink as a high progression cost item. + - balance: Rebalanced TC rewards from assassinations to be less, and lowered TC + rewards for plentiful objectives. + - balance: Lowers the progression reward of assassination objectives. + cacogen: + - expansion: Gave lower Ice Box public mining an air alarm, vent and scrubber and + made its elevator shaft more warning-like + jjpark-kb: + - expansion: xeno weeds will now be destroyed when their parent node is destroyed + - balance: xeno weeds spread cooldown lowered from 15-20 seconds to 5-10 seconds + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Created a new input component that accepts only integers. More usage to come. - refactor: Pay stands are now holographic. It's 2562! Create one by right-clicking @@ -110,6 +159,7 @@ - refactor: Pay stands now have their own TGUI. - bugfix: Custom vendors now alert you when someone makes a purchase. - bugfix: Custom vendors now place items in your hand when you make a purchase. +<<<<<<< HEAD - bugfix: Stickyban subsystem no longer runtimes on invalid entries - bugfix: Connects robotics trashbin to disposal system on tramstation - bugfix: Nanotrasen moved around some of the wall decorations in IceBoxStation's @@ -185,11 +235,211 @@ - bugfix: The 145.7 frequency is no longer received by all signalers. - bugfix: you no longer see ghosts and through walls with nooartrium - bugfix: fixes modsuit core recipes +======= + san7890: + - bugfix: Nanotrasen realized that when you punt someone down using IceBox Station's + execution room, they would only fall a meager one Z-level (or sometimes, wouldn't + even fall at all!). This has been corrected to allow you to punt them down to + the intended height of TWO Z-Levels. Nifty, eh? + - bugfix: If you're looking through the Medbay on some stations (and shuttles too), + take a moment to appreciate that the stasis beds have been re-arranged. + timothymtorres: + - code_imp: Refactored the incapacitated proc to skip optional arguments and use + the named arguments properly to improve readability. +2022-02-02: + Aerden: + - bugfix: Fixed the thermomachine board being listed as a freezer/heater board in + the circuit imprinter. + - code_imp: Changes the descriptions of the HFR boards to not be the same as the + freezer/heater. + Capsandi: + - bugfix: missing delta turbine air supply pipe has been installed + Ghommie: + - bugfix: Fixes exodrones erroneously reporting "travelling back to station" in + the status panel of their console UI when travelling from site to site. + - qol: exodrones will now report the name of the target sites they're travelling + to. + - bugfix: Fixed an oversight with the skittish trait that let players dive into + burial mounds, which are technically a subtype of crates. + - bugfix: Fixed a runtime error that made abandoned crates not update their lock + lights when unlocked. + - bugfix: Fixed an oversight with abandoned crates not resetting the number of attempts + left and not nulling the last attempted code when re-locked. + - bugfix: Fixed burial mounds somehow getting lock lights overlays. + JohnFulpWillard: + - bugfix: Clowns uploading their PDA cartridge to a screwdrivered-open airlock will + now properly cause it to Honk. + MMMiracles: + - rscadd: Tramstation's maintenance has taken broken down into more modular segments + that will now load in randomly each round. + - rscadd: There is now a medical console and crew console in the main medbay treatment + room. + MacBlaze1: + - qol: made ethereals charging from lights repeat until they move. + Melbert: + - bugfix: Cult deconversion text is the right color again + SmoSmoSmoSmok: + - bugfix: Connects robotics trashbin to disposal system on tramstation + SuperNovaa41: + - bugfix: Drones can now properly insert items into machines frames... or really + anything else. + cacogen: + - expansion: 'Changes to Ice Box mining lower levels:' + - expansion: Replaces external-facing regular walls with reinforced ones + - expansion: Replaces external shutters with external airlocks except for drone + bay + - expansion: Replaces the drone bay's single set of external shutters with a pair + - expansion: Adds outside lights to external airlocks missing them and to fenced-in + areas + - expansion: Adds warning signs to external airlocks + - bugfix: Fire alarms will be renamed with areas like air alarms, e.g. Bar fire + alarm --> The Adminbus fire alarm + san7890: + - bugfix: Nanotrasen moved around some of the wall decorations in IceBoxStation's + Science to appease the ghostly overlords (as well as the AI). + - balance: Security Officers (and the whole lot) now have a name assigned to their + locker room, rather than have it be another appendage of the large beast known + as Brig. +2022-02-03: + Fikou, Armhulen, smartkar: + - rscadd: Brimdemons have invaded Lavaland. + - rscdel: Lobstrocities have awakened from their lavaland slumber, this somehow + made them unavailable in the gold slime pool. + Gamer025: + - bugfix: Stickyban subsystem no longer runtimes on invalid entries + Jolly-66: + - bugfix: Removed a duped pipe from Icebox and a duped power cable from Tram. + LemonInTheDark: + - bugfix: Merge datums will no longer spit blood if two mergable objects are on + the first tile examined. The directions are also trustworthy now + Melbert: + - bugfix: Fixes a hard delete with rod form. Also cleans up some rod code. + - bugfix: Admin sending a looping rod will no longer make all following rods loop + Pepsilawn: + - bugfix: lost sprites for connectable t-ray goggles found and restored + RandomGamer123: + - bugfix: Upgraded BEPISes now longer give tech for free. For a fully upgraded machine, + you now need 200 credits for a 50% chance of a minor reward, and 600 credits + for a 50% chance of a major reward. + - bugfix: The BEPIS message telling you that you've gotten all the tech disks and + therefore are getting a minor reward instead now properly displays. + Ryll/Shaps: + - rscadd: Added in a new admin spawn, the mystery box! Dealing randomized (maybe) + death to thunderdomes near you! Maybe! + Tastyfish: + - bugfix: Calls via holopads now transmit the caller's speech again. + jlsnow301: + - balance: Nerfs the stun on touching a field gen from 30 seconds(!) down to 10. + Adds sound and chat message feedback. + san7890: + - balance: Nanotrasen has updated how they name and define different parts of their + loot-laden maintenance tunnels. Take a look around you! + tastyfish: + - server: Added some more CI linter checks for maps, that are otherwise caught at + runtime. This will likely fail downstream maps if they're double stacking objects + which aren't allowed to stack, or misplacing APC's. + tf-4: + - spellcheck: Not having enough iron to create a foam wall no longer erroneously + tells you that you need four iron sheets instead of two. + timothymtorres: + - qol: Adds more trash items to the garbage and cigbutt spawner. +2022-02-04: + Donpedrito: + - bugfix: Tramstation and Kilostation now have bodies in their morgues shiftstart, + bringing them in line with other stations. + Ghommie: + - imageadd: Updated the icon for the Legion achievement. + - imageadd: Added an icon to the "Look Out, Sir!" achievement. + JohnFulpWillard: + - bugfix: You can now once again resist out of aggressive grabs. + Jolly-66: + - bugfix: Chaplains rejoice, you can now stop burying the dead in your own robes! + Burial garments have been added to the Religious Supply Crate, as was already + promised in the description. + LemonInTheDark: + - bugfix: Optimized automated movement. Should feel a mite smoother now + - bugfix: Changed how the singulo eats turfs to hopefully be less of a load on the + server. Behavior's changed a bit tho, lemme know if anything looks too off + - bugfix: Welding up a disposal segment will not longer delete most of the people/things/dogs + inside it + MacBlaze1: + - bugfix: ethereals can now charge themselves using right click, but they will also + lock/unlock the APC above normal charge + Melbert: + - bugfix: Fixes being able to vote for maps which are outside their configured population + range (Such as Kilostation). + Mothblocks: + - balance: You no longer need beakers to build component printers or module duplicators. + Nari Harimoto: + - bugfix: Icebox medbay has had a slight change in the lobby and pharmacy to fix + some ugly spots + - bugfix: Icebox dept order consoles now work, both the computer and the wallmounted + ones + Potato-Masher: + - bugfix: Kilostation's xenobiology lab airlock is no longer incorrectly accessed + with Ordnance lab access. + - bugfix: Fixed the genturfs under icebox's laundry room stairs. + RandomGamer123: + - qol: The cargo shuttle cannot be sent message has been updated to remind people + that you also cannot send the shuttle when there are undelivered departmental + order crates or syndicate bombs on it. + Ryll/Shaps: + - config: Added ALLOW_ADMIN_PROFILING entry to the config, controlling whether admins + are given access to the server profiler + ShizCalev: + - bugfix: Fixed being able to fry objects that are actively storing other objects. + SmoSmoSmoSmok: + - bugfix: Clicking cancel on the carp rift will no longer summon you as a carp + jlsnow301: + - balance: Returning to lobby is now the default assignment if your job spot was + taken. + san7890: + - rscadd: The Space Ruin "The Lizard's Gas" now has a GPS on it, so you can seek + it out a little bit easier now. + zxaber: + - expansion: Alarm sounds for Fire Locks and Fire Alarms now loops slightly differently, + and will respond to changes quicker. +2022-02-05: + ErdinyoBarboza: + - qol: TramStation Bridge now has lockdown shutters. + - qol: TramStation SM chamber no longer has Firelocks. + - qol: TramStation Middle Hallway and Lower Middle Maints have their APC's outside + the power access like rest of the APC's + - qol: TramStation now has a proper service hall + FlamingCheese: + - bugfix: Random light bulbs near the gulag area have been removed + JohnFulpWillard: + - bugfix: Fixes Icebox's Law office door having plating instead of a Wood floor + like all other entrances. + Watermelon914: + - expansion: Adds list manipulation with circuits, letting you add to and remove + from lists that you create and other various things. It's pretty basic so more + list mutation components will need to be added, but this sets up the foundation + for it. + jjpark-kb: + - qol: you can now fill autolathes with items from trash bags + san7890: + - bugfix: Reality has shifted around you, and now all parts of the outdoors of IceBox + Station should now be blanketed in snow whenever one of those storms come around. + Why was this broken in the first place? Nobody knows! +2022-02-06: + Fikou: + - expansion: brings back the extended announcement + - bugfix: fixes printing unresearched mech stuff and design disks + - bugfix: fixes modsuit core recipes + - bugfix: you no longer see ghosts and through walls with nooartrium + Jackraxxus: + - bugfix: The 145.7 frequency is no longer received by all signalers. + LemonInTheDark: + - bugfix: Wizards who exit rodform in a wall will no longer self gib. Skill issue? + Mothblocks: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The Dynamic report for Peaceful Waypoint/Core Territory no longer guarantees providing any meta information. Previously, "Core Territory" guaranteed there were roundstart antagonists, and "Peaceful Waypoint" guaranteed the inverse. There is now a 15% chance to show the opposite result, meaning you can use the report as a good guess of what is coming, but cannot rely on it. +<<<<<<< HEAD - refactor: Refactors reverse bear trap code. - bugfix: You can now properly take reverse bear traps off of your head if you manage to break free. @@ -204,6 +454,29 @@ Inspector. - bugfix: Fix Poppy's resting state. 2022-02-07: +======= + RandomGamer123, Iamgoofball, IssacTheSharkWolf: + - bugfix: Shuttles on multi-z stations now have ceilings! + SuperNovaa41: + - refactor: Refactors reverse bear trap code. + - bugfix: You can now properly take reverse bear traps off of your head if you manage + to break free. + jlsnow301: + - bugfix: Tgui number input now uses a new component that makes it easier to use. + It now autofocuses and autoselects, just like the original. + - bugfix: Alert modals have been rewritten. Messages no longer clip, they also now + respond to TGUI input preferences (UI tab) and you can press ESC to close. + - bugfix: You should now be able to enter a blank text to succumb. +2022-02-07: + Fikou: + - bugfix: xeno egg now updates its icon properly when burst + Fikou, Imaginos, Azlan, Nerevar: + - qol: you can deactivate modsuit device modules with drop key + - qol: the cargo modsuit can now hold mail bags + - bugfix: fixes modsuit speed potion being fucky + - qol: makes the gps module open the gps tgui instead of putting a gps in your hand + - balance: Reworks the mining MODsuit, the full suit is bought from the mining vendor. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, PositiveEntropy: - imageadd: the elite nukie suit has new sprites - balance: the elite nukie suit starts with a little armor filled to standard by @@ -211,6 +484,7 @@ - balance: welding protection is now a part of the armor booster module, no longer a separate module in syndie suits - balance: adds a jetpack and holster to traitor modsuit +<<<<<<< HEAD Mothblocks: - bugfix: Fixed greyscale colors on female fitting versions of clothes. ORCACommander: @@ -231,6 +505,9 @@ It now properly scales exponentially. - rscdel: Removed the 'take' option for traitor uplinks in the traitor panel. - bugfix: It should no longer be possible to DC admins by spamming grenades. +======= + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: blob overminds can now move vertically through station z-levels while its core hasn't been placed yet. - bugfix: disease mobs can too move vertically while a host hasn't been selected @@ -239,13 +516,41 @@ to be standing on or below open space. This also applies to other living mobs with generic incorporeal movement (not to be confused with the nightmare or wizard's jaunt) as long as they can fly or there's no gravity. +<<<<<<< HEAD - bugfix: The song editor UI now updates properly on pianos/space minimoogs. - bugfix: xeno egg now updates its icon properly when burst - bugfix: Mapped in firelocks that are closed will STAY closed. +======= + Jolly-66: + - bugfix: Mapped in firelocks that are closed will STAY closed. + MacBlaze1: + - bugfix: made blast doors unable to be opened via bumping of any kind + - bugfix: made blastdoors unable to be interacted with via tools when closed + - balance: blast doors and shutters are now above windows and doors, and will hide + them. Both layers have been increased to 3.3. + - balance: shutters now cost 5 plasteel and 5 coil and 1 airlock electronic and + take 10 seconds to build + Melbert: + - bugfix: Fixes some active turfs + airlock issues on the icebox mining outpost + Mothblocks: + - qol: The observe button no longer requires tgui. + - refactor: Replaced the old surgery interface with one that is much better to use, + and lets you choose the body zone within itself. + OneAsianTortoise: + - balance: broken drinking/alcohol glass and broken plate shard now hurt you if + you step on them barefoot. + Ryll/Shaps: + - bugfix: Shooting living mobs with projectiles will no longer cause duplicated + logs/messages + TemporalOroboros: + - qol: Used grenades now look used when examined. + - bugfix: It should no longer be possible to DC admins by spamming grenades. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Wallem: - bugfix: Radio Gloves will no longer vacuum your earpieces when crafted. Wallem, Partheo & Tex: - imageadd: Ports canister sprites made by Partheo & Tex from Yogstation. +<<<<<<< HEAD tf-4: - bugfix: Victim logs are no longer mistakenly logged as subtler emotes. - bugfix: The bamboo stool and carpskin chairs are no longer invisible. @@ -320,6 +625,29 @@ some ugly spots - bugfix: Icebox dept order consoles now work, both the computer and the wallmounted ones +======= + Watermelon914: + - bugfix: Fixed how the diminishing returns of having too much progression scaled. + It now properly scales exponentially. + - rscdel: Removed the 'take' option for traitor uplinks in the traitor panel. + sergeirocks100: + - bugfix: The song editor UI now updates properly on pianos/space minimoogs. + timothymtorres: + - rscdel: Remove rotation from IV drips. + - rscdel: Rotating objects will no longer leave fingerprints. + - qol: Add right-clicking and left-clicking to rotate objects in different directions + for alt click. Left is counterclockwise and right is clockwise. + - qol: Replace to_chat rotation messages with balloon alerts to stop redundant chat + spamming. + - qol: Hotkeys for some pipe interactions had to be changed. Right clicking on an + unwrenched pipe now changes the pipe layer. Right clicking on a unwrenched + trinary pipe device now flips it. Alt clicking handles rotation. + - qol: Computer frames now have rotation component + - bugfix: Fix rotation on wheelchairs to work properly. + - refactor: Refactored the entire rotation component and all objects that use it. Remove + a lot of deprecated code to make things cleaner. +2022-02-08: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Necromanceranne, quin: - rscadd: Adds the Inferno and Cryo Pistols. A hybrid energy/ballistic weapon, to cargo. It can be purchased in either a goodies pack or a normal crate order. @@ -334,18 +662,127 @@ - rscdel: Removes WT-550's from cargo and related content from the techweb/protolathes. - balance: Exotic Ammo is now much earlier in the tech web to take the place of Ballistic Weaponry. +<<<<<<< HEAD RatFromTheJungle: - tweak: modularizes the WT550's as upstream removed them. SkyratBot: - bugfix: fixed some hud items layering improperly - bugfix: Fixed an issue where holopay range could be bypassed by handing the card off. +======= + OrionTheFox: + - imageadd: The Suit Storage Units now have a Locked indicator on their lights! + In exchange, decontamination above safe levels has a slightly different indicator + (flashing red/yellow) + - qol: SSU gives chat warnings as to why it blocks decontamination (no items/safeties + on) + - bugfix: SSU panel/super-decontamination icons work properly now + - rscadd: The SSU super-decontamination also creates a plume of black smoke at the + end, as the flavor description said it did. + TiviPlus: + - code_imp: changed a code-related default, please report if anything turns invisible + jlsnow301: + - bugfix: 'Literally unplayable bugs fixed: Pens can now be rotated again.' + - bugfix: TGUI alerts now display buttons in a column when there's more than 2 options. + - bugfix: TGUI alerts can now be disabled via turning TGUI inputs off in prefs. + - bugfix: Fixed some bluescreens related to TGUI inputs. + - bugfix: Fixes a runtime with material containers. + san7890: + - bugfix: The Security Outpost in MetaStation's Engineering no longer has an intercom + installed between the walls. It is now actually accessible to those who can + not phase into walls. + - bugfix: If you've seen a grille with weird lighting on DeltaStation, rest assured + that we've completely obliterated (fixed) it. The odds are overwhelming that + you have not seen it, however. + - bugfix: The transit tube connection between Engineering and the AI Satellite on + MetaStation is no longer defined as a part of the Engineering Break Room. Looks + like you'll need to drink that coffee elsewhere. + - bugfix: Nanotrasen realized that one of their camera technicians improperly configured + the settings on one of the security cameras on the exterior of the AI Satellite + on TramStation. This has been rectified. + unit0016: + - bugfix: Donk Co. Is sorry. Really, really sorry. Really. They're sorry. They forgot + to ship out the stuff to make their shiny new supermatters actually.. produce + power! Nobody was laughing at people trying to run it anyways, nuh uh. Nope! +2022-02-09: + ArcaneDefence: + - expansion: Malf AIs can now have an intercom interference module. + CameronWoof: + - code_imp: wrench->closet interactions migrated to wrench_act_secondary + Gamer025: + - bugfix: Bottlers no longer runtime if they run out of beakers/containers to fill + Ghommie: + - bugfix: ACTUALLY fixes the Illegal Technology node being unobtainable. + GoblinBackwards: + - bugfix: Making medbots through the crafting menu will now account for using different + types of medkit and health analyser. + - bugfix: Ash mark now deals the correct amount of damage and no longer gets stuck + bouncing between the same two targets. + - balance: Ash mark is significantly stronger due to this fix. + Iamgoofball: + - rscdel: Hooch no longer heals assistants. + - bugfix: Fixes an exploit allowing players to bypass crafting times on spears and + cattleprods. + - balance: Wired Rods are now bulky. + Jackraxxus: + - bugfix: The Tramstation aux base console now uses the correct type, and is no + longer a ghetto advanced camera console. + Kubisopplay: + - balance: Nanotrasen finally realized that installing a powerful explosive in their + most popular cyborg model was stupid, so they replaced it with more robust locking + system + - bugfix: you shouldn't get permanently locked by malf ai robofab now + Melbert: + - bugfix: Fixes a runtime which causes game start to fail and revert occasionally + - bugfix: Obsessed hug objective functions again + NamelessFairy: + - bugfix: CTF Limbo's control point timer is now correctly set to 3 minutes rather + than 6 + Pepsilawn: + - spellcheck: replaced mentions to toxins with ordnance in valentine cards in time + for the 14th + SmoSmoSmoSmok: + - balance: Syndieship turrets now target non emagged or non nukie cyborgs + TiviPlus: + - bugfix: fixed some hud items layering improperly + bobbahbrown: + - admin: Cult rune creation (inscribing?) is now logged on the player panel logs + as well as the game log. + itseasytosee: + - expansion: Skateboards have been made considerably more radical + - expansion: While grinding on a table with a skateboard, if you grind on top of + somebody you are likely to hurt them quite badly + - expansion: 'Colliding with another person will now always result in a crash, in + which the person hit gets knocked over as well as the skater (protip: crash + into someone while grind to double the stun time!)' + - expansion: Colliding with a disposal unit while grinding will result in you getting + dunked in! Wack! + - bugfix: fixed some skateboard related bugs, including the action button for ollieing + always being red, and being able to ollie while dead + jlsnow301: + - bugfix: Fixed an issue where holopay range could be bypassed by handing the card + off. + necromanceranne: + - imageadd: Gives rubbershot and rubbershot boxes a new sprite to differentiate + them from beanbags. + - bugfix: Restores the lost sprites for the Centcom gas mask. + san7890: + - rscadd: The area where you get to sit with your alcohol has been renamed to the + Bar Lounge across all the stations. + - rscadd: Instead of the area between the chapel/holodeck/library/laundry room on + TramStation being referred to as the "lounge", it's now called "Crew Facilities". + Because it's, y'know, facilities for the crew. + - imageadd: On the mapping end, there is now a new area turf sprite for the definition + of the area where you store all of the parts for telecommunications, or "Telecommunications + Storage". How gorgeous. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Atmospheric Technicians can now take it easy, as the room that normally holds all of the canisters of highly flammable gas is now cleanly labelled "Gas Storage" instead of being another appendage of the absolute auditorium known as Atmospherics. spriteadd: The Atmospheric Storage Area Turf now has a new sprite. If you know what that means, I hope you enjoy it. If you don''t, that''s also fine.' +<<<<<<< HEAD - refactor: The environmental atmos scanning ability of the gas analyzer is now a component. - bugfix: Restores the lost sprites for the Centcom gas mask. @@ -437,21 +874,52 @@ - spellcheck: the kiosk scanner wand's description is now better. - bugfix: Being in the bar lounge makes extroverts happy once again! - bugfix: Unused Rubbershots are no longer invisible +======= +2022-02-10: + ArcaneMusic: + - bugfix: Some food can once again be exported through the cargo shuttle. + Cheshify: + - bugfix: Cargo Officers on Delta have been given a locker + Ghommie: + - bugfix: Fixed several common issues with planes and layers, most noticeably potted + plants and plastic flaps being displayed under mobs and not over. + GoblinBackwards: + - bugfix: Thermal holster now fits in armour suit storage. + JohnFulpWillard: + - bugfix: Unused Rubbershots are no longer invisible + Krysonism: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Clownanas are slower, but still faster than humans. - balance: 'Clownanas no longer passively drop bananas, but gain an action that lets them drop three peels with a cooldown of 10 seconds. balanance: Clown simple mobs now speak & understand monkey. balance Clowananas now get another new ability: Drop a monkey energy infused banana bunch, hit it to unleash a honkerblast!' +<<<<<<< HEAD - imageadd: Gives rubbershot and rubbershot boxes a new sprite to differentiate them from beanbags. - spellcheck: Add a message when infinite pizza is generated. - spellcheck: replaced mentions to toxins with ordnance in valentine cards in time for the 14th +======= + Kylerace: + - bugfix: you can now set headset channels without them resetting themselves again + Lyn505: + - spellcheck: the kiosk scanner wand's description is now better. + Timberpoes: + - bugfix: Fix a freak occurrence where random job allocation would sometimes randomly + assign players to roles that were full, fixing bugs like multiple QMs. + Zonespace27: + - spellcheck: Gravitational anomaly crates are no longer mislabeled. + carshalash: + - bugfix: Being in the bar lounge makes extroverts happy once again! + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: TGUI now alerts the user when it is waiting on a refresh cooldown. In many cases, this will prevent screens from breaking that rely on static data. - bugfix: After a union dispute, shuttles can now leave the station in one piece. Fixes an issue where shuttles would just leave sections and players on the way out. +<<<<<<< HEAD - bugfix: Fix a freak occurrence where random job allocation would sometimes randomly assign players to roles that were full, fixing bugs like multiple QMs. - bugfix: Some food can once again be exported through the cargo shuttle. @@ -510,6 +978,57 @@ the final rituals have been changed a bit! qol: Using the Heretic''s Mansus Grasp on surfaces (EX: Rust Grasp) now works on right-click, instead of combat mode. qol: Used heretic influences can now be removed with a Anomaly Neutralizers.' +======= + timothymtorres: + - spellcheck: Add a message when infinite pizza is generated. + tralezab: + - expansion: Added a new pirate ship name + unit0016: + - spellcheck: The Starfury's spawners no longer reference the now deleted SM. Long + live the syndicate sm crystal! +2022-02-11: + GoblinBackwards: + - bugfix: Hiding inside a container no longer allows you to bypass the tramstation + perma gate. + JohnFulpWillard: + - bugfix: You can no longer hear things in space (like flashbangs). + - bugfix: Wardens have a SecHUD icon again + - bugfix: Midround antagonists cannot be rolled while the shuttle is docked at the + station, or already gone to Central Command. + - bugfix: Fire breath can be used even if you can't speak (you're welcome tongue + tied mains). + LemonInTheDark: + - bugfix: Hopefully fixes sparks just, sitting in the air sometimes. At the very + least it'll cause more visible complaints + Melbert: + - rscadd: Large scale heretic revamp! + - expansion: The Codex Cicatrix is no longer a roundstart heretic item. Research + is handled through their antag info UI. Rune drawing is done by using a writing + tool with Mansus Grasp active in your offhand. The actual Codex is an unlockable + ritual item now. + - expansion: The Living Heart is no longer a roundstart heretic item - their actual + heart now becomes their Living Heart, and it makes a sound when triggered. Losing + your heart (being disemboweled) will require you to do a ritual to regain it. + - expansion: The Hereic Antag UI has been overhauled, and now hosts much of their + mechanics as well as providing some helpful tips for newer players. + - expansion: Most heretic spells now require a focus to cast. All heretics can make + a basic focus necklace, and some heretic equipment also functions as a focus. + (Credit to Imaginos for the focus sprite!) + - expansion: Heretics now passively gain +1 influence every 20 minutes. + - expansion: Heretic sacrificing has been reworked. You can now sacrifice people + who are in soft crit or weaker. Sacrificing someone heals them, cuffs them, + and teleports them to the SHADOW REALM, where they must dodge a barrage of hands + to survive. Survive long enough and you return without memory - die, and your + body will be thrown back. + - expansion: Heretics now have a few new rituals, including the Ritual of Knowledge, + a randomly generated ritual that awards knowledge points. + - expansion: Heretic ascension now has a few requirements - you must complete your + objectives assigned to you prior to learning the final ritual, and all the final + rituals have been changed a bit! + - qol: 'Using the Heretic''s Mansus Grasp on surfaces (EX: Rust Grasp) now works + on right-click, instead of combat mode.' + - qol: Used heretic influences can now be removed with a Anomaly Neutralizers. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Some heretic rituals are now limited in the amount they can make. You can only have up to 2 heretic blades crafted at once (3 if you are Path of Flesh). - balance: The Lord of the Night has been buffed to be a little scarier. Did you @@ -525,6 +1044,7 @@ - refactor: Refactored and improved much of Heretic code. Improved the file structure dramatically. - admin: The heretic's traitor panel has been beefed up a bit. +<<<<<<< HEAD SkyratBot: - bugfix: you shouldn't get permanently locked by malf ai robofab now - rscadd: Engineering Unions are planning strikes after their break rooms have been @@ -539,28 +1059,80 @@ - bugfix: Fixed active objectives spontaneously failing over time. - rscadd: On IceBoxStation, the Transit Tube Room is no longer mislabelled as a Storage Room. +======= + OneAsianTortoise: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixes not being able to use tools on account registration device and it functioning without power - imageadd: gives account registration device a unique sprite instead of weapon recharger sprite +<<<<<<< HEAD - bugfix: Mime finger guns cannot be used while you have something in your hand. - bugfix: Dronespeak manuals now can actually only be used on silicons and drones. - bugfix: USB cables no longer allow you to bypass the gas pumps pressure limits of 0-4500 kPa. - bugfix: Hiding inside a container no longer allows you to bypass the tramstation perma gate. +======= + RandomGamer123: + - spellcheck: Fixes minor spelling error in the guide for synthesising omega soap + bun235: + - bugfix: Fixes external airlocks on metastation atmospherics + carshalash: + - qol: Felinids love oranges as much as he loves them! + san7890: + - rscadd: On IceBoxStation, the Transit Tube Room is no longer mislabelled as a + Storage Room. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Nanotrasen has come out with a new way to define the loot-laden maintenance tunnels of KiloStation. This shouldn't affect anything more than just how they get their power, though. - rscadd: On KiloStation, there is now a door between Fore and Fore/Starboard Maintenance. I hope this helps you sleep better at night. +<<<<<<< HEAD - bugfix: Chameleon items now cover the correct slots of whatever they're mimicking +======= + - bugfix: If you've been noticing some very-dark plating outside of Engineering, + it has now been fixed. + - rscadd: Engineering Unions are planning strikes after their break rooms have been + slashed in half by Nanotrasen on DeltaStation and KiloStation. +2022-02-12: + Bizzonium: + - refactor: make SSrunechat to be subsystem of SStimer + GoblinBackwards: + - bugfix: USB cables no longer allow you to bypass the gas pumps pressure limits + of 0-4500 kPa. + JohnFulpWillard: + - spellcheck: The introduction to the Brig's genpop system has been fixed of a few + spelling mistakes. + - bugfix: Role-restricted and species restricted items can be purchased again. + - bugfix: Species-restricted items no longer appear in surplus. + - bugfix: Chaplain Sparring sect's soulstone now has their intended unique name + and description. + - expansion: Honkbots now handcuff people, if you somehow manage to get caught by + one. + - bugfix: Honkbots now no longer spam you and break the game + - bugfix: Mime finger guns cannot be used while you have something in your hand. + Lyn505: + - bugfix: blast doors no longer give you a balloon alert about opening it first + when you crowbar them open while unpowered + Melbert: + - bugfix: Fixes uncommon runtimes that could occur when observers examine heirlooms + - qol: Bad Touch doesn't trigger if the person's dead + - bugfix: Fixes hauntium from runtiming a lot and not haunting people + Mothblocks: + - qol: Made the balloon alerts for rotating stuff more consistent and less intrusive. + RandomGamer123: + - bugfix: Dronespeak manuals now can actually only be used on silicons and drones. + Watermelon914: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Added a lot more logging to admin circuits - admin: Admin circuits display names will now replace the entire name of the shell. - admin: Save Shell component will no longer load the variables that were saved for a shell. - bugfix: Fixed several things breaking with mobs whenever an integrated circuit was spawned with a shell. +<<<<<<< HEAD - bugfix: Role-restricted and species restricted items can be purchased again. - bugfix: Species-restricted items no longer appear in surplus. - bugfix: Cargo Officers on Delta have been given a locker @@ -728,6 +1300,28 @@ - rscadd: The Chaplain's office was split in two by maintenance on Kilostation, and Nanotrasen has finally bothered to install an APC in the part where all of the caskets were kept. +======= + - expansion: Adds a trigger version of the current variable setter circuit component. + - bugfix: Fixed active objectives spontaneously failing over time. + cacogen: + - balance: Omega soap now has 800 uses instead of 301 + - expansion: Gave all soaps custom grind results, mainly for consistency + ike709: + - bugfix: Chameleon items now cover the correct slots of whatever they're mimicking + - refactor: Timer subsystems can now recover from a deleted MC properly. + tastyfish: + - qol: Status displays now scroll text smoothly. +2022-02-13: + GoblinBackwards: + - bugfix: Decaying lockers from the locker staff no longer delete their contents + when vanishing. + Lyn505: + - spellcheck: Fixed missing capitalization in Zealot's blindfold description + Melbert: + - bugfix: Species without hearts can get Living Hearts now. + RandomGamer123: + - expansion: 'Kudzu now has a new mutation available: Cold-proofing' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Kudzu now stops spreading if the tile it is on is under 100K without the cold-proofing mutation. - balance: Kudzu now has a severity system for mutations. Different mutations cost @@ -752,14 +1346,111 @@ - bugfix: Venus human traps' vines now get deleted after they die. - bugfix: Unsuitable cold and heat damage for simplemobs don't get overrided by unsuitable atmos damage anymore. +<<<<<<< HEAD - bugfix: Staff at Centcom are busy people! They are no longer allowed to go on valentines dates. +======= + RaveRadbury: + - qol: Added a day to the start of the Valentine's event. + Watermelon914: + - admin: Adds a new UI for the proccall circuit component to help with handling. + Adds an 'resolve weakref' option to enable/disable automatically resolving weakrefs. + ma44: + - code_imp: Simple animals can be told (in code) to stop moving around more easily + - refactor: Simple animals can now be told to go to places more easily + necromanceranne: + - bugfix: Mice no longer create ants when they decompose. They still create moldy + dead mice. + - balance: Polar bear transformation converts health percentage over when you transform. +2022-02-14: + Fikou: + - bugfix: fixes modsuit charging + - bugfix: fixes using the modsuit sphere transformation in zero gravity + Melbert: + - refactor: Refactored slime link and mansus link to use a component to cut down + on hard-dels and code duplication. + PositiveEntropy, SmArtKar, axietheaxolotl: + - imageadd: Resprites Black Gloves and Jackboots! + bun235: + - bugfix: Fixes air mixer on delta station atmos + san7890: + - bugfix: Mappers have removed the soul of fully variable-edited APCs across any + map that still had them. + - bugfix: If you've been noticing some absurdly dark rocks on KiloStation, rest + assured that we've fixed them. +2022-02-15: + Aerden: + - rscadd: Added the ability to equip the backpack firefighter tanks with atmospheric + modsuits. + - rscadd: Added waterbackpackatmos to belt_mirror.dmi + MMMiracles: + - rscadd: Tramstation's medical wing has been revamped once again to maybe not be + as bad as before. + Melbert: + - expansion: RND labs now have RND consoles again. + RandomGamer123: + - bugfix: Kilostation toxins now has an ordnance monitoring computer + - qol: Gas canisters now display their maximum temperature on being examined! + SmoSmoSmoSmok: + - bugfix: Janitor cyborg's soap running out of uses will no longer glitch out + Watermelon914: + - admin: Urgent ahelps will now send more information to admins to assist with handling + your ahelp. + san7890: + - rscadd: Even though it wasn't much of a break room at all, Engineering unions + are even more angrier now that the name "break room" has been removed from Engineering + on Kilostation. +2022-02-16: + GoldenAlpharex: + - bugfix: Ghosts will now get back to bobbing up and down after they're done orbiting + something, as intended. + Mickyan: + - bugfix: Fixed blacklight and red lights being brighter than intended + Mothblocks: + - qol: Hovering over specific objects, over hovering with specific items, will now + tell you what they can do. For example, hovering a firelock with a crowbar will + tell you can both left-click to hold open, and right-click to keep open. The + preference for screentips has been changed from on/off to on/off/only with tips. + If you had your preference on off before, it has been changed to "only with + tips". That way, it's not as intrusive as when it's always on, but you can still + pick up information when it can actually be provided. Try to give it a shot, + and don't disable it right away. + carshalash: + - expansion: Gives food processor function to make spider eggs and carp meat non-toxic. +2022-02-17: + Amrabol: + - balance: Nanotrasen upgrades Anti-Tider back pack and find a way to make a compact + version for security modsuit, researchers still high on caffeine creates module + version of atmos resin backpack + - bugfix: Syndicate quickly steals designs and applies them to their pyro backpack + transforming it into module names:Fikou for almost entire code work, TGMC for + sound and Cursed Birb + Dr-Pope: + - spellcheck: Makes it so the loader modsuit says it is not airtight with examined. + JoshAdamPowell: + - bugfix: Staff at Centcom are busy people! They are no longer allowed to go on + valentines dates. + Melbert: + - admin: Force-completing heretic objectives in the traitor panel count for ascension, + if you wanna skip the queue. + Nari Harimoto: + - bugfix: icebox now has one, and only one, APC per area + Sheits: + - imageadd: resprites the mailman outfit + TemporalOroboros: + - bugfix: Gunpowder and teslium once again use their intended explosion scaling. + Which is to say "more" and "not". + san7890: + - bugfix: The Lizard's Gas will no longer start out with Active Turfs at the start + of a round. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Across all of Nanotrasen's active stations, the little cubby pocket colloquially known as "Security's Medical Ward" has now been standardized with it's own area name. Our little buddy is growing up! - rscadd: In order to give such an important area a much needed upgrade, Nanotrasen added an whole extra three cubic meters to the medical area of the Security division of the station. Feel free to kick out those legs. +<<<<<<< HEAD Zenitheevee: - balance: removes milk's healing and usage from breastmilk. jjpark-kb: @@ -794,11 +1485,73 @@ - bugfix: Fixes an issue with the Ian respawning side of the "Ian Adventure" station trait. - soundadd: Brimdemons have a different laser firing sound. +======= + - rscadd: The Chaplain's office was split in two by maintenance on Kilostation, + and Nanotrasen has finally bothered to install an APC in the part where all + of the caskets were kept. + unit0016: + - imageadd: RCDs' Radial Menu new uses the updated Chairs, ID Cards, Stools, and + Walls. 2562. +2022-02-18: + Melbert: + - refactor: The Anomaly Neutralizer uses the effect remover component now + Wallem: + - imageadd: Departmental protolathes/techfabs have colored stripes to tell the departments + apart. + jlsnow301: + - bugfix: 'TGUI static data loading screens no longer resize the window temporarily. + Note: If you are using a UI that gets a lot of these, please make an issue report.' + san7890: + - imageadd: Cytology Lab and two different variations of the Central Hall have had + their sprites corrected into splendidly new ones. +2022-02-19: + ArcaneDefence: + - qol: Kinetic crushers now fire their projectile with the right mouse button, allowing + you to fire at targets that are adjacent to you without moving your mouse away + from your target. + ArcaneMusic: + - soundadd: Brimdemons have a different laser firing sound. + Ghommie: + - bugfix: Fixes an issue with the Ian respawning side of the "Ian Adventure" station + trait. + JohnFulpWillard: + - bugfix: Icebox's medical surgery area is now locked behind Surgery access rather + than Medical. + LemonInTheDark: + - qol: The sprays that come off extinguishers will no longer stick around after + they've hit the ground, and they'll also fade out before disappearing + MMMiracles: + - bugfix: Adjusts the posters in Metastation's Atmospherics to not block an APC + - bugfix: Adjusts a poster in Kilostation's library to not block the above bar APC. + Maurukas: + - rscadd: Kilostation medbay has been issued a medical modular suit + MrMelbert: + - qol: Many botany items now have contextual screentips. + SmoSmoSmoSmok: + - bugfix: Clown cyborg soaps will no longer bug out after running out of uses + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: SDQL2 commands that attempted to _new some very simple datums will no longer runtime. Wallem: - bugfix: Fixes sign language users not being able to sign in space. Fixes the visual indicator when attempting to sign while cuffed. +<<<<<<< HEAD +======= + jlsnow301: + - bugfix: Following numerous reports, CentCom has downloaded more RAM into the Orion + Trail arcade machines, thus drastically reducing the occurrence of loading screens. + san7890: + - imageadd: For those on the mapping end, the Science Breakroom now has a new area + turf sprite, bringing it in line with the likes of Medical and Engineering. + Believe me, it helps. + - bugfix: Nanotrasen has fixed up the space area surrounding the AI Upload on KiloStation. + The cameras should work a bit better now, and the excess lights were removed. + You probably won't notice the latter, though. + - bugfix: Snow will now behave properly inside ruins on IceBox Station. + - bugfix: On KiloStation, Atmospherics no longer owns a weird sliver of the Incinerator + room. It didn't make sense, but now it is fixed. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tastyfish: - rscadd: Newscasters, request consoles, and status displays now have a backlight on their displays and emit a soft glow. @@ -806,6 +1559,7 @@ to work with being emissive. - refactor: Internally refactored status display visual updating, so that it retains state across power loss, etc. +<<<<<<< HEAD 2022-02-20: SkyratBot: - admin: Facehuggers leaping onto people's faces is now logged in the facehugged's @@ -823,11 +1577,33 @@ prompt sound SkyratBot: - bugfix: arm implants breaking the drop key +======= + thestubborn: + - balance: Gave the Saints Suit cold protection. + timothymtorres: + - qol: Replace regular card deck on wizard ship with wizoff and tarot card decks. + - bugfix: Fix cigarettes icon to update properly when extinguished. +2022-02-20: + JohnFulpWillard: + - balance: Paramedics no longer have access to Auxiliary base, the Supermatter engine + room (including insuls), the Cargo shuttle, and EVA. Use a Medical MODsuit instead, + you lazy bum! + - balance: Paramedics now have access to Mining bay. + Mickyan: + - expansion: Added some outfits based on moth culture, available at the clothesmate + - expansion: Added a new construction based bundle for the curator, themed after + moth fleet engineers + Ryll/Shaps: + - admin: asay pings now have their own unique sound instead of sharing the vote + prompt sound + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The CRAB-17/Nanotrasen Space-Coin Market is now indestructible. Attacking it repulses you back one tile instead. ID cards now instantly swipe on it instead of requiring a progress bar, and ID card holders like PDAs and wallets can also be directly used on it without having to remove IDs. It still blows up when all ID cards with bank accounts have been swiped on it or after 8 minutes. +<<<<<<< HEAD - balance: every modsuit theme can hold more stuff in suit storage - bugfix: Snow will now behave properly inside ruins on IceBox Station. - balance: Paramedics no longer have access to Auxiliary base, the Supermatter engine @@ -943,6 +1719,82 @@ Melbert: - bugfix: Eldritch Amulet no longer gives thermal vision when it shouldn't SkyratBot: +======= + Watermelon914: + - bugfix: Fixed progression traitor uplinks suddenly changing owners when implanted + with an uplink implant. + san7890: + - rscadd: On MetaStation, DeltaStation, and TramStation, the area colloquially known + as the "Science Lobby" now has a proper definition and it's own APC to boot. + Please enjoy. + - rscadd: MetaStation and Deltastation now have their Medbay Lobbies officially + defined. + - bugfix: On DeltaStation, the Auxiliary Base Construction room no longer possesses + a bit of space. + - bugfix: As far as the Secure Tech Storage on IceBoxStation, Nanotrasen has finally + realized that they should stop installing lights and cameras on their windows. + tastyfish: + - bugfix: Windoor blocking ORM on Delta Station now has correct access. + - rscadd: Made air alarm and keycard authenticator emissive. + - imageadd: Updated air alarm and keycard authenticator sprites to work with being + emissive. + zxaber: + - balance: Malf AIs can detonate their borgs at the robotics console once again. +2022-02-21: + Fikou: + - balance: every modsuit theme can hold more stuff in suit storage + - bugfix: arm implants breaking the drop key + - bugfix: fixes smooth movement breaking sometimes + Melbert: + - bugfix: Fixes heretic target assignment. They should actually be getting Heads + of Staff and such as intended as sacrifice targets. + - bugfix: Void's ritual of knowledge is void path correctly + Toastgoats: + - imageadd: New space dragon sprite! +2022-02-22: + PositiveEntropy, Naevii: + - imageadd: Resprites the Head of Security Greatcoat! + - imageadd: Resprites the object icon of the Head of Security Trenchcoat + Thunder12345: + - imageadd: Power cells and the cell charger have been resprited, the charger will + now look correct with a much wider variety of non-standard power cells + - rscdel: Removed the uncraftable 15k charge high-capacity power cell+, all instances + have been replaced with the regular 10k charge high-capacity cell + - bugfix: Erroneous power cell charge indicators have been removed from many non-standard + types of power cells + - bugfix: All varieties of marauder mech including the nuke ops mauler come with + a bluespace power cell, consistent with other nuke op mechs + - bugfix: Power cell charge indicators will now update while in a cell charger + - bugfix: Potato and other crop batteries will not have their wires disappear when + on cell chargers + san7890: + - bugfix: On IceBoxStation, the courtroom no longer owns a bit of the hall. +2022-02-23: + ArcaneDefence: + - bugfix: An odysseus' sleeper will now realize when a previously contained patient + has left the sleeper through unconventional means. + GoblinBackwards: + - bugfix: Holy water's cult deconvertion timer now resets when transferred to a + new mob + - bugfix: Fixes beam rifle not causing an explosion on impact mode. + - bugfix: Fixes radio gloves being uncraftable + GoldenAlpharex: + - bugfix: Ghosts are 100% less afraid of bobbing up and down, and will no longer + keep their orbit when they shouldn't be keeping it. + Greniza: + - code_imp: adds p_theirs() proc + JohnFulpWillard: + - bugfix: 'Non-dense mobs will no longer knock monkeys over (Ex: Revenants, Bots, + Lizards, Alien larvas).' + Melbert: + - bugfix: Eldritch Amulet no longer gives thermal vision when it shouldn't + - admin: Fixes some heretic logs. Final knowledge uplink log should be clearer, + and ghoul admin message no longer has a typo. + SmoSmoSmoSmok: + - bugfix: Players are no longer able to create walls using sheets that arent linked + to a material + TiviPlus: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed gygax smash not logging the driver - bugfix: Fixed mechs being punched using power but punching as a mech not using power @@ -953,6 +1805,7 @@ nothing - refactor: Mech punch code partly redone - admin: mech punches will now ALWAYS be logged, even against objects +<<<<<<< HEAD - code_imp: adds p_theirs() proc - code_imp: reshuffled some mech bay code please report issues on the github - bugfix: An odysseus' sleeper will now realize when a previously contained patient @@ -966,10 +1819,14 @@ expanded from off-station blobs - bugfix: Fixes issue with cores and nodes having their color applied twice - rscadd: Ratfish can now be found in moisture traps. +======= + - code_imp: reshuffled some mech bay code please report issues on the github +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed distortion effects cutting each other Wallem: - rscadd: Some prisoners have been complaining about the cold weather in the permabrig, so we've dug through disposals and found a couple hats for 'em. +<<<<<<< HEAD YakumoChen: - refactor: MCR lathe design stuff - bugfix: A bug in one of the material costs for one of the camos @@ -1058,12 +1915,49 @@ cutouts you might find lying around, these ones EXTRA "RR-REAL HELP M-". Whatever that means. 2022-02-27: +======= + cacogen: + - qol: RPED now swaps in cell with greatest charge (of highest tier) first + - balance: Blobs can destroy mineral turfs like they can walls + - qol: Adds balloon alerts for blob overmind + - qol: Adds contextual screen tips for blob overmind + - qol: Off-station blobs are lighter than regular blobs + - bugfix: Fixes bug where on-station blobs were not counted towards victory when + expanded from off-station blobs + - bugfix: Fixes issue with cores and nodes having their color applied twice + jlsnow301: + - bugfix: Fixes a blue screen in the Pandemic from loading multiple viruses. + san7890: + - balance: On IceBoxStation, Nanotrasen has finally stopped clearing out excessively + large swatches of land for the gulagged prisoners in order to help them work + for their points. + tralezab: + - rscadd: Ratfish can now be found in moisture traps. +2022-02-24: + ErdinyoBarboza: + - bugfix: Makes the IceBoxStation Underground (Level 2) wastes immune to radiation + and also paints the maintenance as such to let people take shelter. + - qol: Makes the IceBoxStation Service Hall Exit into a properly cycled airlock + system. + - qol: Icebox Locker Room now has real personal lockers once more. + - qol: Icebox Service Exit is not properly mapped with external airlocks and cycled + doors. + san7890: + - rscadd: Nanotrasen has now made it so that the room that you launch your home-made + bombs from is now known as the "Launch Site" across all five stations. + tralezab: + - bugfix: Ratfish can now properly show up in moisture traps + - code_imp: Moisture traps are coded a little better now + - spellcheck: fixed some wording in the moisture trap bite feedback +2022-02-25: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - bugfix: Buckling yourself to and then unbuckling yourself from a stasis bed will no longer permanently halt the effects of any gravitum in your system. - bugfix: Liverless creatures can no longer retain the effects of gravitum indefinitely, as it will now decay in their bodies (just as it does in the bodies of livered creatures). +<<<<<<< HEAD Melbert: - bugfix: Fixes a few potential issues with heretic rituals. - code_imp: Adds proper stack support to heretic rituals. Also allows for more specific @@ -1093,12 +1987,168 @@ - bugfix: Examining cells won't say they have 0% charge when the overlay indicates they don't - code_imp: Fixes some code style issues for more free GBP +======= + Christmas5: + - bugfix: Added the missing variable "plane" to floor lights. + JohnFulpWillard: + - spellcheck: Removed wrong text in esniffers saying ghosts using them sends the + signaller inside of it's, frequency. + - bugfix: Building walls with snow now take time to do, like every other type. + Melbert: + - expansion: Russian Fugitive Hunters are now stronker. Their ship has been remade, + they have a little bit more ammo and equipment, and most importantly they now + have a pet bear. + Mothblocks: + - balance: Thieves can no longer scale, and can only run once. + - balance: Increased the number of thieves by 2. + OneAsianTortoise: + - bugfix: fixes Metastation hydroponics shutter access + Pickle-Coding: + - bugfix: Frostoil reagent will no longer achieve negative temperature when exposed + to air. Changes behaviour to make air converge to 2.7 kelvin instead. + Putnam3145: + - qol: '"Scrubbing" and "siphoning" are now consistently used' + Sealed101: + - bugfix: disktoaster storages now have their proper lights. all hail the toaster + rellyreri: + - spellcheck: Claustrophobics will now breathe instead of breath. + sergeirocks100: + - bugfix: Adjusted cargo tech jumpsuits and jumpskirts now show your arms from all + angles, and the adjusted cargo jumpsuit now uses the normal jumpsuit legs instead + of the digitigrade ones. + timothymtorres: + - qol: Chem dispensers have been changed to eject beakers using RMB instead of AltClick. + - qol: Hydroponics trays have been changed to empty reagents using RMB instead of + AltClick. + - code_imp: Any object that inherits the simple_rotation component will always use + AltClick. +2022-02-26: + BallastMonster: + - spellcheck: fixes false info with vampires becoming bats + Capsandi: + - bugfix: Took out an extra apc in deltastation transfer center which screwed with + the power + Cheshify: + - bugfix: Monkeys can no longer bite people to give them heart attacks + Iamgoofball: + - code_imp: Fixes some code style issues for more free GBP + - code_imp: Implements some missing SDQL 2 wrappers. + JohnFulpWillard: + - bugfix: AI's "O" sound on vox now sounds like an O instead of an I. + KubeRoot: + - qol: 'Chat tab filter behavior has been tweaked: System messages will now be enabled + in custom tabs and any new message types will be enabled by default. NOTE: This + will mess up your custom chat tab filters after the first time you join. You + will need to disable any message types that were automatically enabled with + this change.' + Melbert: + - expansion: Raw Prophets now have a funny little attack animation. + - balance: Raw Prophets have been adjusted slightly. They now have more max health, + a slightly lower sight range (but the ability to toggle it on or off), drop + all their component parts on death, and do more damage for every consecutive + attack on a target they do. + - bugfix: Fixes a few potential issues with heretic rituals. + - code_imp: Adds proper stack support to heretic rituals. Also allows for more specific + "ritual failure" feedback. + RandomGamer123: + - bugfix: Bicycles can now be repaired with a welder and have actually sensible + max_integrity and integrity_failure values. + Ryll/Shaps: + - bugfix: Projectiles now respect armor again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Wallem & Imaginos: - balance: Splits biobags into virology & science bags. Virology bags can't hold slime cores or cytology equipment, and science bags can't hold medipens & bloodbags. - imageadd: Changes all storage bag sprites +<<<<<<< HEAD Zonespace27: - bugfix: There is no longer a "generic" item in the OPFOR services tab. tastyfish: - bugfix: Opening an air alarm panel now renders the overlays correctly. - rscadd: Most status displays now have USB support for circuits. +======= + cacogen: + - bugfix: Examining cells won't say they have 0% charge when the overlay indicates + they don't + dragomagol: + - qol: pointing is now logged + - qol: bodythrow impacts are now logged + - qol: individual logs now display in order, even when the server date rolls over! + jlsnow301: + - spellcheck: Space dragons are now "it" instead of "he". + san7890: + - rscadd: On Tramstation, Nanotrasen installed new APCs on the lower aspects of + the Science Division. + tastyfish: + - bugfix: Opening an air alarm panel now renders the overlays correctly. + - rscadd: Most status displays now have USB support for circuits. + unit0016: + - imageadd: HONK Co. Pranks have released a new set of stencils for any cardboard + cutouts you might find lying around, these ones EXTRA "RR-REAL HELP M-". Whatever + that means. +2022-02-27: + Axietheaxolotl, PositiveEntropy: + - expansion: Adds a beret for the Chief Medical Officer! + - imageadd: Nanotrasen has now tackled overhauling the visual aesthetic of the Chief + Medical Officer, changing their jumpsuits and labcoat, and altering their original + pastel blue color to turquoise! + - imageadd: Nitriles now look much more rubbery than before! + ErdinyoBarboza: + - bugfix: Fixes DeltaStation Service area AI pathfinding. Bots will no longer get + stuck on the railings. + Melbert: + - bugfix: Fixes summon magic and summon guns + - refactor: Refactored wizard rituals (events/ghosts/guns/magic/madness) to reduce + code copy+paste. + dragomagol: + - bugfix: Security can now once again lock down the brig front desk on Icebox + jlsnow301: + - bugfix: The pAI candidate menu now properly switches between IC and OOC comments. + san7890: + - bugfix: In MetaStation Atmospherics, the floor light is no longer installed right + on top of a canister. + - rscadd: Nanotrasen's new set of stations will all have different names for "the + rooms in which you did surgery in" (they're now called Operating Rooms" as well + as a new name, a Theatre (for surgeries). Isn't it great to have some guy poking + around your pizza-filled guts while a gaggle of people watch you through a window + of glass? + - bugfix: If you've ever walked through the maintenance tunnels near DeltaStation's + Atmospherics and spotted a very dark lattice, it has been fixed. + - spellcheck: Nanotrasen found out that the factory for glass floors were capitalizing + their names, so they promptly shut down the factory to build a new one for the + express purpose of not capitalizing their names. + - bugfix: On TramStation, the Ordnance Burning Room (for your Tritium) no longer + owns that bit of space where noxious gases are meant to vent out into. + unit0016: + - bugfix: The AI no longer can start a full OSI investigation when the tips of your + combat boots hit Kilostation, thanks to the fact the firedoors that formerly + automatically triggered the fire alarm whenever you use the external airlocks + are gone. +2022-02-28: + Cheshify: + - bugfix: You no longer need an entire wheel of cheese to make Moth Foods + LemonInTheDark: + - admin: Since _pick doesn't accept lists, I've added _pick_list for you to use + in sdql. Please table everyone on the station kthnx + Melbert: + - code_imp: Made some species datums follow style guidelines slightly better (lists, + indentation, spacing, etc). + - refactor: Refactored how species pages are generated in the preferences menu. + Species themselves are untouched completely. Some species pages have been filled + our more (or less) as a result. + - bugfix: Monkeys how have a preference menu entry, as god intended. + Pickle-Coding: + - bugfix: Prevents exploit allowing you to monitor Centcom and CTF frequencies. + Ryll/Shaps: + - admin: You can now create links to a datum's VV window in asay by posting the + datum's memory reference. The reference is now printed in the VV menu right + below the fancytype, for copying purposes.. + - admin: Tagged datums will now show their tag index in VV + Sylphet: + - rscadd: adds helianthus cocktail + ViktorKoL: + - bugfix: the description of traitor under antagonist preferences is now up to date + with their progressive nature + cakexensen: + - bugfix: Poly's death streak resets upon surviving +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-03.yml b/html/changelogs/archive/2022-03.yml index d82dfa220e3..fa189e22c23 100644 --- a/html/changelogs/archive/2022-03.yml +++ b/html/changelogs/archive/2022-03.yml @@ -1,4 +1,5 @@ 2022-03-01: +<<<<<<< HEAD Axietheaxolotl, PositiveEntropy: - imageadd: Nanotrasen has now tackled overhauling the visual aesthetic of the Chief Medical Officer, changing their jumpsuits and labcoat, and altering their original @@ -49,11 +50,38 @@ SkyratBot: - refactor: redid some savanna-ivanov mech code please report any new issues on the github +======= + Axietheaxolotl, TetraZeta, PositiveEntropy, FuryMcFlurry: + - imageadd: The detective outfits, the blueshift uniform and the constable outfits + have been redone! + - rscdel: Removes the pantyhose from the HoS Parade Skirt + Ebin-Halcyon: + - imageadd: New fireaxe inhand, worn, and in cabinet sprites. + Fikou: + - bugfix: fixes thieves not being able to complete the guns objective + Kubisopplay: + - expansion: Adds malfunction module that lets you impersonate anyone + Mothblocks: + - admin: Going stealth mode now drops your orbiters and blocks you from being orbited. + OneAsianTortoise: + - bugfix: fixes accounting's alert being cut in half + TiviPlus: + - refactor: redid some savanna-ivanov mech code please report any new issues on + the github + adamsong: + - bugfix: fixed vv checking if the client is a turf, and instead checked the thing + that might be a turf, properly updating the vv window + carshalash: + - expansion: Introduces new non-alcoholic beverages to be made at the bar! + - imageadd: Sprites for these new beverages! Not just coloured glass + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: On Meta, Delta, and Tram Stations, expect to see the word "Funeral" dance across your eyes a few times as you enter the chapel. - rscadd: On IceBoxStation, the Chapel has undergone some new area definitions, and the wiring for the power to these areas have changed a bit from what you were accustomed to previously. +<<<<<<< HEAD - bugfix: Fixed being able to push "off" something you're moving towards, allowing for infinite movement in one direction in space, at your walk speed - bugfix: Fixes a weird bug with spellbooks that may have been locking some spell @@ -115,12 +143,56 @@ if the marked item is placed inside of one. - bugfix: you can knock monkeys over by crossing them again. Wallem: +======= + tralezab: + - bugfix: Fixes a weird bug with spellbooks that may have been locking some spell + options when you did some specific actions +2022-03-02: + Fikou: + - qol: modsuit radial icons highlight on extended pieces + - bugfix: modsuit clamp can carry wrapped crates + - bugfix: modsuit activation is no longer affected by do after slowdowns + - bugfix: lobstrosities charge now + GoblinBackwards: + - bugfix: Robotic basic and simple mobs are now damaged by EMPs. + JohnFulpWillard: + - bugfix: Instant recall spell no longer recalls anchored objects, such as microwaves, + if the marked item is placed inside of one. + LemonInTheDark: + - qol: Pushing off something in space will no longer cause it to be delayed for + half a second before drifting properly. Should look nicer now + - bugfix: Fixed being able to push "off" something you're moving towards, allowing + for infinite movement in one direction in space, at your walk speed + Maurukas: + - bugfix: Kilostation will now generate a normal number of space ruin z-levels + - bugfix: Kilostation will now have the correct linkage between its space z-levels + - you can now easily go space exploring again. + - bugfix: Removed duplicate APC from Kilostation security office. + Nari Harimoto: + - imageadd: New thruster sprites to allow for in-wall designs + - bugfix: removed cycle helpers from 2 random tram maint airlocks that arent meant + to cycle (solo airlocks) and a duplicated APC in tram maint + - expansion: the tram now has new walls! they are structures that function like + walls so as to be built on the tram, create and deconstruct via the new tram + girder (screwdriver on the girder to deconstruct, there is no displaced version + ie wrench) + Twaticus, PositiveEntropy, Axietheaxolotl: + - imageadd: Resprites the Warden's Jackets and Jumpsuit, the HoS Jumpsuit, the Formal + Jackets, the Bulletproof and Regular Security Helmets and the Security Jumpsuit! + - expansion: adds a red warden hat to match with the warden's red uniform! + - rscdel: Removes unused helmet camera sprites. + Wallem: + - bugfix: We gave the wisdom cow its tongue back. We're sorry. + - qol: Adds a minimum threshold to ingested ant screaming. + - qol: Ants are no longer lavaproof. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Adds a minimum threshold to ant piles biting through shoes. - balance: Giant ants are now peaceful hostile mobs. This means they will attack anything that does not have the "neutral" factiontype. To compensate, the price to make one has been raised. - imageadd: It appears the invasive "space ant" has gotten into our formerly secret uranium reserves and as such have mutated slightly, gaining a slight bioluminescence. +<<<<<<< HEAD tastyfish: - bugfix: Papers and photos pinned to airlocks now actually animate. 2022-03-05: @@ -256,6 +328,66 @@ - bugfix: Fixed bot trails and launchpad targeting being invisible. Made bot trails look a bit nicer. - bugfix: Bots will no longer attempt to infinitely move into railings +======= + cacogen: + - balance: Hand mining weak turfs (i.e. snow) is now affected by mining level (so + legendary would take 7.5 seconds instead of 15) + - qol: Multiple people can now attempt to manually mine the same mineral turf + - qol: If you fail to manually mine a turf you can try again immediately instead + of having to wait for the cooldown to end + - bugfix: You can no longer mine a snow turf by hand if you're already doing it + - code_imp: Uses variables and time defines for mining speeds instead of deciseconds + and magic numbers +2022-03-03: + ArcaneDefence: + - bugfix: Various cooking recipes that simply said they required 'food' now properly + use plain bread slices. + - bugfix: Fully eating a can of pine nuts no longer creates an error sprite. + Iamgoofball: + - code_imp: Fixes a minor code styling issue with atmos. + Maurukas: + - bugfix: Genturf error and roundstart active turf fixed on Icebox + RandomGamer123: + - refactor: Converts airlock controllers (ie incinerator access consoles) to use + TGUI. + SuperNovaa41: + - refactor: Dehardcoded SSmapping ruin types. + TemporalOroboros: + - qol: The deadchat controllable component is no longer automute bait. + san7890: + - rscadd: There are now some lattices under some pipes in KiloStation Atmospherics. + If you want to see history unravel in front of your eyes, it's south to the + "Atmospherics Pump Room" under the orange Atmos-to-SM pipeline, right above + the SM cooling loops. How nice. + - bugfix: Deltastation's Abandoned Gambling Den no longer owns a bit of space. + vincentiusvin: + - code_imp: minor change to TGUI button content to use flexboxes. This caused a + bug in the past, report if you notice anything weird. +2022-03-04: + JohnFulpWillard: + - bugfix: you can knock monkeys over by crossing them again. + SuperNovaa41: + - spellcheck: Fixes a spelling mistake in thief lore blurbs. + - code_imp: Defined turf environment types. + TemporalOroboros: + - bugfix: Copying reagents will now also copy the temperature of those reagents. + - code_imp: A single letter variable has been expanded. + TheBonded: + - expansion: podpeople from replica pods now have water blood by default, and inherit + their blood chemical from the most abundant chemical trait in their seeds if + applicable. + axietheaxolotl, Imaginos16: + - imageadd: New sprites for the CMO's turtleneck/skirtleneck, paramedic jumpsuit/jumpskirt, + virologist jumpsuit/jumpskirt, and chemist jumpsuit/jumpskirt + san7890: + - imageadd: Congratulations, you now have a new Area Turf Sprite for Engineering's + Technical Storage. + - bugfix: Mappers now no longer have to stare a green square and extrapolate the + position of an air alarm based on that. + tastyfish: + - bugfix: Papers and photos pinned to airlocks now actually animate. + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Ordnance have been updated to enable the publication of papers - rscadd: Several new explosive and gas synthesis experiments have been added to ordnance @@ -265,14 +397,23 @@ exotic gases and complete experiments. - balance: Several techweb nodes are locked and require toxin experiments to complete. - balance: Toxins can purchase boosts for various techweb nodes. +<<<<<<< HEAD - balance: 'You no longer need to anchor doppler arrays for it to work. qol: Doppler array and implosion compressor now supports deconstruction, implosion compressor construction added. qol: Doppler now emits a red light to denote it''s direction and it being on. Doppler not malf.' +======= + - balance: You no longer need to anchor doppler arrays for it to work. + - qol: Doppler array and implosion compressor now supports deconstruction, implosion + compressor construction added. + - qol: Doppler now emits a red light to denote it's direction and it being on. Doppler + not malf. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Implosion compressor renamed to anomaly refinery. - code_imp: Created a new program tab "Science" for the downloader app. Removed Robotics. - refactor: Reworked the code for bombspawner (used in the cuban pete arcade game) +<<<<<<< HEAD - rscadd: Right-clicking to splash reagents requires combat mode - rscadd: 'Remember the above qol: You now right-click the janitorial cart to wet mops and left-click to put them away qol: You can right-click the janitorial @@ -286,12 +427,132 @@ fill from drainable containers like janitorial carts - code_imp: Improvements to janitorial cart code 2022-03-09: +======= +2022-03-05: + Fikou: + - admin: player playtime is now sorted and links player panel + GoblinBackwards: + - bugfix: Fixes bug where batons without cells could turn on after being EMPd + JohnFulpWillard: + - qol: Cayenne can now use the nuke with their head or something. + - bugfix: Sentient elites falling in chasms will no longer spam chests. + Melbert: + - qol: Heretic rituals overhauled slightly. You now pick from a list of all your + rituals when invoking a rune to select what ritual you want to do. + - bugfix: Minor fixes for the Heretic's Living Heart ritual. Cybernetic organs are + now properly detected. + - bugfix: Similarly, you cannot feed the mawed crucible cybernetic organs. + Mothblocks: + - balance: Lowered thieves cost from 6 to 4. + - balance: Disabled midround thieves. + PositiveEntropy: + - imageadd: Nanotrasen has now officially updated all generic jumpsuits and the + prisoner one, marking the third rendition of jumpsuit styles being added into + station! + Thunder12345: + - bugfix: The clown dagger null rod is visible again + Zonespace27: + - spellcheck: Doorjacks now use singular/plural for charges left correctly. + axietheaxolotl: + - imageadd: new front and backfacing jackboot sprites + ma44: + - refactor: Basic AI movement has been refactored to clean it up a bit + san7890: + - balance: IceBoxStation's Labor Camp now has some electrified windows to help deter + potential jailbreakers. + tastyfish: + - qol: The solar array areas are now lit by the sun. + - qol: Solar assemblies now have different sprites for solar panel vs tracker. + - imageadd: Solar panels and trackers have new sprites and a 2.5D effect. +2022-03-06: + GoldenAlpharex: + - code_imp: Added a few more options for woman clothing auto-cropping, hopefully + to help making certain outfits look less scuffed. + - imageadd: Fixed the side views of the suits for woman, that previously looked + -very- scuffed, as a proof of concept for the new female auto-cropping masks. + Mothblocks: + - bugfix: Fixed vaccines not being able to be moved through chem buffers. + - bugfix: Fixed Roy Rogers and Sodium Thiopental not applying their effects. + - balance: Fake beer has been renamed from "Beer" to "Beer...?" + Oricana-16: + - rscadd: Added a usb port to fire alarms + axietheaxolotl: + - expansion: Brand-new Lesbian and Intersex pins! + - imageadd: New sprites for Lesbian and Intersex pins, and also re-does the already + existing pins. + cacogen: + - bugfix: Windoors created by the RCD are correctly named + - bugfix: Windoors created by the RCD work properly with require one access + - bugfix: Windoors with unrestricted directional access open properly when operated + from the same tile + - qol: Windoors have unrestricted directional access overlays like airlocks now + san7890: + - bugfix: The darkenening and lack-of-gravity on some lattices near the Space Hut + on DeltaStation have been resolved. +2022-03-07: + Ghommie: + - bugfix: Fixed the inputs for the linear and exponential sustain settings of the + song editor (instruments UI). + JohnFulpWillard: + - qol: Discoordinated tool user trauma now gives a status effect to let you know + you have it. + - bugfix: Slappers and circlehands don't fit in storage bags anymore. + LemonInTheDark: + - bugfix: Fit viewport will properly well, fit your viewport now. Broke when we + removed the status bar. It'll also attempt to autofit if you change your pixel + scaling. Godspeed + MMMiracles: + - expansion: The tramstation dorms area has been completely revamped to more freely + flow and encourage interactions between the library and chapel. + - bugfix: The chapel now has a mass driver for proper burial disposal. + - bugfix: The overhang in the dorm area no longer shows the walls below on the edges. + Melbert: + - bugfix: Heretic Smugglers (latejoin heretics) actually spawn influences + OneAsianTortoise: + - bugfix: fixes Icebox and Meta's medbay door controls button not working + Pepsilawn: + - spellcheck: you will no longer be asked to be wearing Wheelys when trying to activate + ski shoes and rollerskates + Pickle-Coding: + - balance: It's harder to make large pipenets release radiation. + Thunder12345: + - imageadd: The poll button in the lobby has been changed to better represent its + functionality. + Zonespace27: + - bugfix: Blowguns no longer have a trigger guard + cacogen: + - qol: Can use BSRPED to add components to machine frames at a distance + san7890: + - bugfix: You probably didn't notice, but the Bar's Atrium on IceBoxStation has + been depowered (due to lack of an APC) for the last few weeks now. After a strong + reprimand to its Engineering staff, Nanotrasen will now ensure APCs are installed + in that area. + - imageadd: On the mapping-end, the engraved cult floors will no longer show up + as base plating, but instead what they actually look like in game. + zxaber: + - balance: The Science Hub app can now be downloaded and launched by science employees. +2022-03-08: + Aerden: + - expansion: Volume pumps and meters are now compatible with circuits. + - bugfix: Fix the gas pump's icon not updating when turned on/off with circuits. + GoblinBackwards: + - bugfix: Alt-clicking plumbing IV drips now rotates them like other plumbing components. + - rscdel: Alt-clicking IV drips no longer sets the transfer rate to max. + LemonInTheDark: + - bugfix: Fixed bot trails and launchpad targeting being invisible. Made bot trails + look a bit nicer. + - bugfix: Bots will no longer attempt to infinitely move into railings + Melbert: + - expansion: 'Kilostation: Service and (slight) command remap! Service hall now + included.' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert, sprites from NecromancerAnne: - balance: The Silverscale species are now pierce-immune and pressure-immune (NOT temperature immune though). - balance: Beefed up the Silverscale pirate gang. Their shuttle now has extra ammo and additional general supplies. They're also now equipped with "Prime Nagant"s, which don't jam and have a unique sprite. Regal, fancy! +<<<<<<< HEAD SkyratBot: - imageadd: Hey there, if you like mapping, just know that we added some more area turf sprites to help clarity and contrast between different area for Atmospherics. @@ -493,10 +754,49 @@ ruin. - bugfix: modsuit nominal sound no longer plays when youre deaf - bugfix: Lattices removed from inside the walls of Icebox, Meta, Delta and Kilo. +======= + cacogen: + - rscadd: Right-clicking to splash reagents requires combat mode + - rscadd: Remember the above + - qol: You now right-click the janitorial cart to wet mops and left-click to put + them away + - qol: You can right-click the janitorial cart with an empty hand to quickly remove + your mop + - qol: You now right-click to put things in the trash bag + - qol: Left-clicking the cart with an empty hand will skip the radial menu if there's + only one item in the cart + - rscadd: Adds examine hints for these changes + - bugfix: Fixes overlays not immediately updating when filling janitorial cart + - bugfix: Fixes bludgeoning janitorial cart when filling it + - rscadd: You can right-click with "glass" reagent containers (e.g. buckets) to + fill from drainable containers like janitorial carts + - code_imp: Improvements to janitorial cart code + lewcc: + - refactor: Moves more tool behavior out of attackby(). + san7890: + - rscadd: Nanotrasen has declared that the area colloquially known as the "Science + Break Room" will now get it's own power supply and formal definition. + - rscadd: Nanotrasen has decided to re-name the areas found on the mining station + bases of Lavaland and IceBox Station. +2022-03-09: + Fikou: + - bugfix: abstract movement now checks for cordon turfs + - bugfix: debug modsuits now are insulated + JohnFulpWillard: + - qol: Sentient vibebots can now change their colors. + Wallem: + - refactor: De-Hardcodes decomposition timers. The decomposition time can now either + be custom or use the existing automatic food flag system. + san7890: + - imageadd: Hey there, if you like mapping, just know that we added some more area + turf sprites to help clarity and contrast between different area for Atmospherics. + That should help someone, I know it. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The area where Atmospherics sends and receives gas from the entire station is now referred to as the "Pump Room". You can get some weights in there to train your trapezoids and deltoids (and a bit of bicep/tricep action), but that's up to you. +<<<<<<< HEAD SpaceVampire: - balance: Heretic sickle-sword now does 8 more damage, and has slight armor pen. - balance: Heretics are now able to have more of their weapons summoned at once. @@ -782,6 +1082,56 @@ How responsible! - bugfix: Nanotrasen realized that they should stop installing grilles right on top of the Air Flow Meters on IceBoxStation. +======= + tralezab: + - balance: Nations can't roll other antags when it runs. +2022-03-10: + Ebb-Real: + - bugfix: Ollieing onto empty space makes you fall like it should. + Fikou: + - bugfix: fixes mod plating being called armor in some places + LemonInTheDark: + - bugfix: Fixed two broken posters in the icebox underground + cacogen: + - qol: Attacking a machine as a monkey will now say if it did damage or not + san7890: + - bugfix: After a string of Nar'sie followers reportedly continuously "getting away + with it", Nanotrasen has decided to re-install the Chaplain's Altar back on + Tramstation. + - imageadd: You may now use the pensive emote in OOC chat, just like you would in + your favorite messaging app. +2022-03-11: + AtoriBirb: + - rscadd: A new intermediate tag for sec huds called "Suspected" that allows officers + to identify peoples of interest without raising their threat to where beepsky + will chase and attempt to apprehend them. Shows up as an orange '!'. + DTraitor: + - bugfix: Fixes mobs able to move during charge delay after first charge + Melbert: + - qol: Screen tips for the Null Rod, Anomaly Neutralizer, Codex Cicatrix, and Mansus + Grasp for removing runes / anomalies / drained heretic influences + Tastyfish: + - bugfix: The 2 types of weight machines now have unique in-game names. + - imageadd: New sprites for the weight machines. + san7890: + - bugfix: The reality-correctioneers have removed the purple and black square that + shows up like 33% of the time in TramStation's Maintenance Tunnels. +2022-03-12: + BurgerBB: + - bugfix: Fixes abandoned crates exploding on empty-hand right click regardless + of intent. + Ebb-Real: + - bugfix: fixes RCD not being able to be put in bags and belts by clicking. + Ebin-Halcyon: + - bugfix: Female lizard's chests no longer poke out of their shirts. + Fikou: + - bugfix: high frequency blade now works on mechs, metal gears and other vehicles + - admin: you can now varedit high frequency blade slash color + Ghilker: + - balance: SM pluoxium production reduced by 500%, co2 consumed by the process decreased + by half + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Becoming the patron of a painting now lets you select a different appearance for the frame it''s in. This appearance will persist between rounds (the ability to modify the frame won''t, though). The more credits have been spent on the @@ -790,6 +1140,7 @@ - bugfix: You can now sponsor a painting that hasn't been archived yet. Just make sure it's inserted in a frame with persistence on. - bugfix: fixed some mismatches between sprites and sizes for a few canvases. +<<<<<<< HEAD - admin: When you send people to Admin Prison for any number of reasons, please take joy in knowing they can't explode out the floors any more. - refactor: 'refactored the electrolyzer to use datumized reactions instead of hardcode @@ -905,10 +1256,567 @@ - rscadd: 'Newscasters have been moved over to TGUI, and with them several new features. expansion: Newscaster channels can now be given channel descriptions! expansion: Messages can now be censored by crew with brig access from any console.' +======= + GoldenAlpharex: + - refactor: A minor refactor was done to the persistent scars preference, allowing + it to finally be available in the preferences menu once again. + Inari-Whitebear: + - bugfix: Fixed Delta station bridge engineering console having non-working AmpCheck + due to not being hooked up to the powergrid. + JohnFulpWillard: + - bugfix: pAIs can be inserted into Vibebots again. + - bugfix: Electric shocks now help against heart attacks. + LemonInTheDark: + - bugfix: HUD objects will no longer be hidden by things like blindness + - rscadd: Ghost darkness is now a game preference, and will persist between rounds + - balance: Ghost darkness defaults to a bit darker then currently. I think it looks + better + LemonInTheDark, MrStonedOne: + - code_imp: Adds a color blindness accessibility testing tool. Use it for testing + out your ui changes + MMMiracles: + - bugfix: Adds an APC to the upper dorm area on Tramstation + MacBlaze1: + - expansion: Allows multitools to change the speed of linked conveyor belts by clicking + on a placed conveyor switch. + - code_imp: Because of the above, multitools can no longer be used to interact with + switches. Not like they did much, but well, so you know + MeyHaZah: + - imageadd: Resprites for every book + OneAsianTortoise: + - bugfix: fixes tablet not updating appearance immediately after it is repaired + QuacksQ: + - bugfix: fixes Chili sin carne being uncraftable + Shelteredfreak, MrMelbert, and San7890: + - rscdel: Removed Kilo's chapel in favor of a monastery off of the main station. + - rscadd: Added a new monastery on Kilo's Northwestern asteroid. + - rscadd: Added a security cremator to sec in place of the hardsuits, hardsuits + moved to armory. + - rscadd: Added a public garden in the Chapel's place, complete with cow and chicken + (Done by MrMelbert). + Son-of-Space: + - bugfix: Enabled general access to escape pod on KiloStation + SuperNovaa41: + - bugfix: Fixes non-rustable turfs from becoming rusty. + Thunder12345: + - qol: Pride pins now appear on top of suit slot clothing + Wallem: + - code_imp: De-hardcodes random book icon state generation + cacogen: + - balance: Bump mining requires activehandedness + - code_imp: Bump click element for when bumping something should click it, like + mineral turfs + - bugfix: Fixes hitting snow turfs with a non-mining item to trigger hand mining + (which was something all cyborgs could do to mine) + - rscadd: Cyborgs can left-click with no active module to manually mine snow turfs + instead (takes 15 seconds per turf, good luck) + nevimer: + - bugfix: succumb prompt can be cancelled again + san7890: + - rscadd: On DeltaStation, the Ordnance storage room now owns it's own doors. + - bugfix: The barstools in the Nuclear Operative's Base now point the correct direction. + - rscadd: On DeltaStation, Nanotrasen realized that the "Pumping Room" they elaborately + crafted for Atmospherics wasn't actually the part of that division that actually + moves gas to the rest of the station. They once again elaborately crafted a + new room (called the "Mixing Room") and shifted everything around. It probably + doesn't matter to YOU, though. + - imageadd: For mappers, there is now a new icon that shows up when you place light + emitters down. It's a little bit more descript. + - bugfix: On DeltaStation, certain wall appliances in the Telecommunications Office + no longer appear to be overlapping to those who are able to look at its walls + from both ends. + tastyfish: + - bugfix: Fixes clusterbuster segments working correctly/at all. + tohg7: + - bugfix: fixed an inconsistency where booze bottles and molotovs wouldn't splash + their contents when thrown at things while drinking and shot glasses do. +2022-03-13: + Gandalf2k15: + - imageadd: Medkit sprites have now been updated to proper 3/4th perpsective. + - spellcheck: All instances of "firstaid" have been replaced with "medkit". + Melbert: + - bugfix: Casters who sold their soul can no longer use Soul Tap + OneAsianTortoise: + - bugfix: being inside locker no longer protects you from a nuke + - balance: being inside the fridge guarantees you to survive nuclear bomb + TiviPlus: + - bugfix: potentially fixed some admin features for mech equipment +2022-03-14: + Fikou: + - bugfix: modsuit nominal sound no longer plays when youre deaf + GoblinBackwards: + - bugfix: Removed random wall from in front of the kitchen on Tramstation. + JohnFulpWillard: + - qol: Revs/Traitors adding more threat is now shown on the roundend report. + - bugfix: IceBox's Psychology office medical computer records console now faces + the right way. + Nari Harimoto: + - bugfix: Engineering borgs can now place wallmounts again + OperativeLyn: + - bugfix: Fixed two firelocks being on the same tile in the derelict outpost space + ruin. + Wallem: + - qol: Most foods decompose into JUST moldy food, which then gets eaten by ants, + leaving only the anthills and ultimately making them more visible. + - bugfix: Cleanable decals will try to merge their reagents before they delete if + they have mergeable_decal = TRUE, meaning ants will now properly stack their + reagents when they spawn on the same tile. + - qol: Ants no longer spawn on lavaland's basalt. + san7890: + - rscadd: Instead of having four different corners on each floor, Nanotrasen has + decided to slap down full corners on each floor to keep that one floor looking + that masterful shade of beige. + timothymtorres: + - qol: Change barricade, grille, and girder mapping spawners to have a ~20% not + to spawn. + - qol: Change ornament mapping spawner to only spawn lamps and red phones. +2022-03-15: + Ebb-Real: + - bugfix: Fixes the syndie screwdriver using the wrong belt sprite. + - imageadd: Added belt sprites for the syndie screwdriver and all alien tools. + Fikou: + - spellcheck: fixes double the in motion cameras + Nari Harimoto: + - qol: Each Map now comes with a standard amount of gas cans in Ordanance Storage + (except kilo which gets slightly less, because Kilo is too small) so you do + not need to have to learn vastly different mixing methods per map, removed stored + co2 as it is not used + Pepsilawn: + - bugfix: Removed the extra keycard auth device hidden under the CE's extinguisher + cabinet + SuperNovaa41: + - code_imp: Removes a forgotten devil proc in photocopier code. + - code_imp: Updates `init_gaslist_cache` to match current code standards. + TemporalOroboros: + - expansion: Splashed blood is as infective as bled blood. + cacogen: + - bugfix: Fixed firelock screentips telling silicons they could knock or bash them + - bugfix: Fixed firelock screentips saying bash with combat mode off and knock with + it on (it's the opposite) + - qol: Adds firelock screentips for silicons, monkeys and xenos + carshalash: + - bugfix: Clown tears will no longer explode on creation. + interestingusernam3: + - bugfix: Centcom will no longer include empty "Identified Shift Divergences" sections + in their reports (which would previously occur every time there were only hidden + station traits present). + - bugfix: Cheese wheels and royal cheese no longer count as cheese wedges for recipes. + - code_imp: Cheese wedges are no longer the superclass for all cheese. + lewcc: + - bugfix: Fixes airlock reinforcement not being removable. + - refactor: Heavily refactors reinforcing and un-reinforcing airlocks. + san7890: + - bugfix: On KiloStation, there is no longer a weird floor decal on a wall. Nanotrasen + has commissioned an institution-wide inquiry to find out which joker put it + there. + tastyfish: + - bugfix: Geese now act like geese if provoked again. + vincentiusvin: + - bugfix: fixed an outdated quip about purchasing an ordnance paper. + - bugfix: added the ordnance circuitboards to the techweb, forgot about this in + the original pr. + - qol: added a small tooltip to the compressor buffer port. +2022-03-16: + Iamgoofball: + - qol: Anyone who has access to the cells and the gulag shuttle can now use the + gulag teleporter + JohnFulpWillard: + - bugfix: Armsky and Pingsky aren't pAI controllable anymore. + - bugfix: Podpeople now take self-respiration into account when taking damage from + critical condition, like most other species. + LemonInTheDark: + - qol: /tg/c cards now support in chat tooltips, finally you don't need to look + up what Hivemind means for the 200th time + - code_imp: tgui chat now supports embedding components into it via html attributes. + Go make the game look better lads. + ORCACommander: + - qol: Updated Title Card Specifications + OneAsianTortoise: + - qol: hand labeler paper roll and toner cartridge can be printed at autolathe and + protolathes now + OperativeLyn: + - bugfix: Fixed two firelocks being on the same tile in the Starfury. + Ryll/Shaps: + - bugfix: Dog AI's should no longer lock up and become unresponsive after failed + fetch attempts + - soundadd: Dogs in harass mode that are guarding against someone will now make + growling sounds + TemporalOroboros: + - bugfix: Water vapor should wet and freeze floors once again. + Thunder12345: + - rscdel: Lean has been removed entirely from the game + Wallem: + - rscadd: Seeing how many miners we lose on a weekly basis, we've decided to dig + through some of our prototypes to get something to help you all. Your venders + have been supplied with Kheiral Cuffs, a wrist-worn suit sensor range booster. + Note that any accelerated aging caused by the device will not be counted towards + your retirement. + san7890: + - rscadd: Random Poster Spawners now have directional variants. You don't have to + memorize the pixel offset for those anymore (it was 32). + - admin: When you send people to Admin Prison for any number of reasons, please + take joy in knowing they can't explode out the floors any more. + vincentiusvin: + - bugfix: fixes the doppler array nullifying some of your bombs. +2022-03-17: + Fikou: + - imageadd: new punching bag sprites!!!!!!!!!!!!!!!! + JosephJomama: + - imageadd: The police baton has been resprited into a handsome beatin' stick worthy + for a lone-wolf detective who doesn't play by the rules to whack perps with. + LemonInTheDark: + - rscadd: Rather then being tileable with just floor tiles, lavaland turfs, asteroid + and snow (among other things) now support lattice -> floor tile construction + - bugfix: Because of the above, you can now properly fix the icebox mining shuttle + - refactor: Non floor turfs are no longer typed as floor. This may break things, + please yell at me if it does + Thunder12345: + - bugfix: Pride pins can be reskinned again, accessories whose location can be toggled + now do so with right-click. + capsaicinz: + - bugfix: supply pods, crab-17s, explosions in general(?), and ash drakes(?????????) + no longer make a shattering sound. + - code_imp: turns some "if ("s into "if("s in sound.dm + dragomagol: + - admin: Silicon law logs are shorter and easier to read + san7890: + - imageadd: On the mapping end, the Abductor Ship, the Wizard's Ship, and the Thunderdome + Administration and Observation Areas now have new area turf sprites. Does this + matter to your in-game experience? Probably not. + - rscadd: 'On DeltaStation, IceBoxStation, and TramStation: Nanotrasen has now blocked + off the area informally known as the "Cargo Lobby", and formally defined it.' + - bugfix: Nanotrasen corrected an oversight with the Security Medical ward on TramStation; + it now has an Air Alarm and APC. + - bugfix: DeltaStation's Bomb Range no longer has a floating camera. Instead, the + camera has been redirected to attach on the wall the proper way. + - bugfix: The Syndicate realized that the indoor portion of their top-secret Nuclear + Operative base actually partially owned some of the outside portion of the planetary + body it rests on. It has been corrected. + - rscadd: Nanotrasen decided to shuffle some things around in DeltaStation's Grand + Surgery Theatre's Viewing Room in order to save the cost of having to purchase + two new chairs with each station. + - bugfix: KiloStation's Chapel Entrance now receives power. + - bugfix: There is no longer a space turf in the middle of an asteroid on KiloStation + with gravity attached to it. +2022-03-18: + Fikou: + - bugfix: drones are no longer shy around maint rats and such + GoblinBackwards: + - bugfix: Prevents invalid materials being used on airlock assemblies. + JohnFulpWillard: + - bugfix: Ants now don't appear on icemoon/space asteroids, rather than only lavaland. + MMMiracles: + - bugfix: Patches up the sporadically popping up space turfs that appeared in tram's + security wing. + - bugfix: The bar now has an air alarm. + MacBlaze1: + - expansion: More than two assemblies can now be combined for use in bombs, grenades, + or anything else assembly holders are used in. + - qol: signalers can now be triggered through right click + Melbert: + - bugfix: Makes the wizard's Lich Phylactery mechanic actually work consistently. + - bugfix: The description of the Bind Soul spell (and entry) should match its behavior + a bit more accurately now. You will revive regardless if your body is destroyed + or leaves the z-level. With each revival, the time it takes to respawn does + not change, but the duration of the stun does. + - refactor: Makes Phylacteries a component. + - qol: Gave Lich Phylacerties some QoL features and pizazz. Examining it'll offer + more information to wizards and ghosts. + RandomGamer123: + - bugfix: Engineering departmental order consoles can now once again order gas canisters. + SuperNovaa41: + - bugfix: Fixes being able to spam deny sounds on deliver first crates. + TemporalOroboros: + - bugfix: Using telekinesis will no longer break chameleon. + Zergspower: + - rscadd: Parts and Machine frame to build an ORM from the golem ship + - rscdel: Removed Prebuilt ORM from the golem ship + capsaicinz: + - bugfix: soulscythes are now immune to mining planet storms + nevimer: + - bugfix: native fast gui boxes work again + san7890: + - imageadd: On the mapping end, the Diner now has it's own area turf. If you don't + know what that means, just know that it's a good thing. + - rscadd: Nanotrasen decided to do a few more cost-cutting procedures, removing + lights from a certain outdoor section of KiloStation. +2022-03-19: + Fikou: + - bugfix: you cant hide stuff in locked modsuit storages, it empties when removed + from the suit + Son-of-Space: + - bugfix: Engineers have finally solved for the reason why their solar setups on + TramStation never worked. + Twaticus: + - imageadd: further medkit tweaks + carshalash: + - qol: Adds three new orderable fish crates to split rates of fish one gets. + san7890: + - bugfix: Nanotrasen has decided to quit installling posters on ice turfs near Lower + Chapel Maintenance on IceBoxStation. + - bugfix: Nanotrasen will no longer stop placing two chairs on the same spot in + IceBoxStation Departures. + - rscadd: A mix-up in blueprints meant that TramStation didn't have a formally defined + Ordnance Launch Area. This has now been rectified. + - bugfix: TramStation's Ordnance Mixing no longer owns that bit of space that the + waste gas is meant to exit the burn chamber from. + - bugfix: TramStation's Ordnance Launch Area's APC now has connectivity to the grid. + - bugfix: Nanotrasen busted out some pulse rifles to get rid of some loose rock + debris in the Northwestern Quadrant of KiloStation. +2022-03-20: + Dex: + - bugfix: Fixed training toolbox sprite + Ghommie: + - qol: Added a search function to the "Marlowe Treeby's Art Galaxy" app. You can + now search for paintings by title or author now. + - qol: Speaking of the same app, the name of the author is now displayed under that + of the painting in its preview section. + - bugfix: Fixed a potential BSOD in its TGUI if no painting was ever archived. + - qol: The AI Portrait Picker also got a similar treatment. + Son-of-Space: + - qol: It is now easier to tell that lower maintenance on box is traversable and + is reliable to traverse. + - balance: tweaked access reqs for certain doors in lower maintenance on BoxStation. + SuperNovaa41: + - bugfix: Fixes two random lattices in the bottom corner of the Cent Com map + Vladoricious: + - qol: All accessories show above the suit by default and can be toggled. + cacogen: + - expansion: Can Shift+Ctrl+Click people to give items to them directly now + - bugfix: Fixed runtime on Give screen alert where a proximity check was happening + twice + - bugfix: Fixed being able to take things as a dead person + - qol: Tooltips of low/no power screen alerts (used by cyborgs, MODsuits, mechs + and ethereals) will tell you the actual locations of the roundstart station + chargers + - bugfix: Fixes issue with low/no power screen alerts not clearing after leaving + a mech + jjpark-kb: + - rscadd: resonators will now have their fields spread +2022-03-21: + JohnFulpWillard: + - qol: You can now buckle people onto meatspikes the same way you buckle people + onto anything else. + Maurukas: + - bugfix: The medical escape pod on Kilostation is no longer walled off. + Melbert: + - qol: Heretic targets which become uncompletable (being deleted) will remove themselves + from a heretic's sacrifice list + OperativeLyn: + - bugfix: Fixed a missing blast door in IceBox's surgery room. + - bugfix: You ever noticed the floating piece of sand to the east of Tramstation? + Well it's now gone. + SuperNovaa41: + - bugfix: Fixes a runtime in build mode's KABOOM. + Tastyfish: + - rscadd: Adds the Format List and Format Associate List wiremod component, for + ease of formatting lists of items. + TheSilverNuke: + - balance: allows you to heal using plasma fixation in minor amounts of plasma such + as in Icebox's atmosphere + interestingusernam3: + - bugfix: The reality-defying cheese wedge in the Entemology Outreach Center on + Icemoon has been succesfully contained and replaced with a normal one. + san7890: + - imageadd: On the mapping end, CentCom has now been covered in a fresh new paint... + of area turfs! Who doesn't love those! + - bugfix: In MetaStation Maintenance to the east of Cargo and to the west of the + vault, in that little hallway, a deep dark secret was there. There were TWO + lockers present on the same tile. Nanotrasen has expertly trimmed it such that + only one locker will be placed there now. + - bugfix: Nanotrasen decided to make those fancy lights that point in the direction + of exiting the Arrivals shuttle actually point in the right direction. + - bugfix: Nanotrasen has stamped out the odd issues with lighting and gravity on + the MetaStation AI Satellite. + - bugfix: Nanotrasen also realized it was a good idea to not install their cameras + and lights on the windows surrounding MetaStation's AI Satellite. + this awesome text: + - balance: MODsuits have some armor. + unit0016: + - bugfix: The Kilostation chapel has less stacked turf decals. They're still around, + though.. Watching. Waiting... Additionally, magic power has been NUKED from + the maintenance room back there. Pour one out. + - bugfix: All lights (and cameras) in the Kilostation chapel have been PREPARED + FOR THE FUTURE. And by the future, I mean the wallening. +2022-03-22: + GoblinBackwards: + - bugfix: Prevents iron/adamantine/yellow slime cookies from being to able to stack + their bonuses. + Jolly: + - bugfix: The Beach Biodome had the water turf corrected, and as such, shouldn't + have atmos issues. + OneAsianTortoise: + - bugfix: fixes medical scrub being named "under" +2022-03-23: + Daggertail: + - qol: Amputation, Compound Fracture Repair, Cavity Implantation, Augmentation, + and Prosthetic Replacement surgeries now all clamp bleeders after retracting + skin like most surgeries, rather than before. + Ghilker: + - refactor: cryotubes can now work with any gases + - expansion: cryotubes patients will actually breathe the air inside the tube and + will respond to the gas accordingly (they'll suffer from breath loss if not + in proper atmosphere inside the tube) + - expansion: cryoxadone heals only if the patient is alseep, making the use of the + anesthetic no longer just fluff but also functional + - qol: replaced oxygen canisters with anesthetic ones (a mix of oxygen and n2o at + 65-35 ratio) for allowing the patient to sleep + Ghommie: + - rscadd: 'Added a palette component for palettes and spraycans: Right click the + item while it''s in your active hand to access a radial menu that allows you + to store, select or edit up to 14 colors for palettes and 8 for spraycans. Right-Click + one of the color to pick a new color value, Left-Click to select it.' + - qol: Furthermore, a graphical palette containing the colors of the palette component + will show up in the Canvas UI when painting with a tool that has said component, + allowing you to select colors without unfocusing from the UI window. + - rscdel: Removed the ctrl-click (color picker) shortcut from spraycans, as I felt + it to be too clunky and no longer necessary now (I'm the person that made it + btw). + GoblinBackwards: + - bugfix: Bluespace shelters now come with a ceiling. + - code_imp: Added optional automatic ceiling generation for map templates. + - bugfix: Recyclers no longer eat their own parts when dismantled. + Iamgoofball: + - bugfix: Fixes the description for mice being incredibly rude, judgmental, and + insulting towards mice, who are objectively adorable. + Jolly: + - rscadd: Charlie and Delta Storage rooms were added (as an area). + - rscadd: Charlie Dorms were added (as an area). + - imageadd: Fresh coat of paint for the Old Station (Charlie Station ruin) area + sprites. + LordVollkorn: + - bugfix: Proximity sensors inside chemical grenades should work now. + Melbert: + - balance: Flesh Heretic's summon objective now counts all summons done, alive or + dead, instead of all alive summons. Still does not include flesh ghouls or voiceless + dead. + MrStonedOne: + - bugfix: blob spores and game-controlled blobbernuts no longer get stuck thinking + they can't walk thru blob tiles. This has been broken for over a year and so + you should expect blob spores to be more of a threat then you are used to. + Pickle-Coding: + - bugfix: Fixes tritium fires not releasing radiation when they should. + - bugfix: Fixes water vapour condensation requiring a temperature 20K lower than + usual. + - code_imp: Adds defines for tritium fire radiation stuff. + RandomGamer123: + - bugfix: Makes shuttle engine crates actually purchasable if you bought the BYOS + shuttle. + Shiets, Dragomagol: + - rscadd: Podpeople now have plant-like growths springing from their heads! + - rscadd: Podpeople can style their "hair" with secateurs + SmArtKar: + - bugfix: BCI overlays now actually work + - imageadd: Changed BCI counter overlay numbers to make them more readable + SuperNovaa41: + - bugfix: Fixes being able to use revival surgery on blacklisted defib victims + TemporalOroboros: + - bugfix: Blood-spread-only diseases will no longer always spread upon exposure + to blood. + capsaicinz: + - bugfix: xray beams can now be resisted by laser-resistant armor + - code_imp: /obj/projectile flag is renamed to armor_flag + kawoppi: + - imageadd: adjusted black undershirt side sprites to be more in line with the front + sprite + - imageadd: adjusted white undershirt side sprites to be more in line with the front + sprite + san7890: + - bugfix: There is no longer a poster splayed out over a vending machine in KiloStation's + Botany Section. + - bugfix: Nanotrasen realized that Kilo's Arrivals had a horrendous glitch... the + lights and cameras weren't hooked up to anything. How saddening. It's been fixed + now. + - bugfix: Also, Nanotrasen realized they spilled some dark juice (trademark) on + some other lattices in that area so they cleaned up after themselves as well. + How responsible! + - bugfix: Nanotrasen decided that today was a good day to remove the random floating + poster on the exterior of Security on KiloStation. + - bugfix: Nanotrasen realized that they should stop installing grilles right on + top of the Air Flow Meters on IceBoxStation. + timothymtorres: + - qol: Mood events colors now accurately reflect the severity for the positive or + negative. Really good is bold green, good is green, neutral is gray, bad is + red, and really bad is bold red. + - bugfix: Fixed icebox plasma facility mood event color not working. + - code_imp: Improved mood events descriptions to be simpler to write. +2022-03-24: + Ghilker: + - refactor: refactored the electrolyzer to use datumized reactions instead of hardcode + them in process + - expansion: added the hypernoblium to antinoblium conversion, when hypernoblium + is exposed to the electrolyzer it will be converted to antinoblium +2022-03-25: + Fikou: + - balance: xray lasers now have 100 armor penetration + Ghommie: + - bugfix: Fixed the size of plaques on the painting UI. They were awfully thin. + - bugfix: Fixed 24x24 paintings not being centered inside their frames. + JohnFulpWillard: + - bugfix: Bot's modes have been fixed, Medibots will no longer be on 'arrest' mode. + san7890: + - imageadd: Nanotrasen has upgraded "that machine that prints all of those decals + on our station tiles" to now print two corners that face opposite each other + at the same time. Very cool! + tnekohue: + - bugfix: Fixed Departmental Techfab machine board for service being named oddly + compared to the other ones. + vincentiusvin: + - refactor: Refactored the atmos control console devices. The ones that hook to + the big turf chambers. + - qol: Distro meter now broadcast the whole gasmix info instead of just pressure + to the monitors. + - bugfix: Lavaland syndie's atmos chamber vents are now actually configurable. Moved + a few things around to accomodate this. + - bugfix: Lavalannd syndie chambers hooked to distro and moved distro pipe to layer2 + - qol: atmos monitors can detect reactions now. + - code_imp: Some minor code changes to how anomaly refinery and implosion compressor + show the gas info. No changes expected, report if bug. + - code_imp: recoded checks for atmos chamber abnormalities in debug verbs. +2022-03-26: + Colovorat: + - bugfix: Clicking on airlock with ID Scan wire cut, should not open airlock. + Ghilker: + - bugfix: Fix an overlooked crystallizer issue where gases wouldn't get consumed + because of a fixed rate of removal instead of an percentage based one. + OperativeLyn: + - bugfix: Fixed double firelocks in Deltastation's fore customs area. + SmArtKar: + - expansion: Added VOX and Thought Listener BCI components + - expansion: Object Overlay component overlays can now be rotated + - expansion: Added new view sensor component. + Tastyfish: + - qol: The supply and supply request consoles now have a search bar. + - bugfix: Picking a high priority role in character creation no longer breaks assistant + selection behind the scenes. + Wallem: + - bugfix: GPSes don't start deactivated anymore, which also brings back most space + ruin GPS signals. Sorry about that. + dragomagol: + - bugfix: Kiosk wands can no longer be put into storage containers + - qol: Windoors now use directional variants + maxspells: + - expansion: Surgery steps play sound effects appropriate to the step + san7890: + - rscadd: Nanotrasen has refurbished the Recreation Deck on DeltaStation. Feel free + to "ooh" and "aah" at all of the new features that have been added. + unit0016: + - qol: Mappers now have access to an autoname helper for airlocks! One less field + to punch in means a few seconds extra YOU can use placing down lizard plushies, + wondering where it all went wrong, and adding lattices on the CentCom Z-level. +2022-03-27: + AdipemDragon: + - imageadd: For those who seek out rarer materials, Runite Bars have a nicer appearance. + ArcaneMusic ft. sprites by Kryson: + - rscadd: Newscasters have been moved over to TGUI, and with them several new features. + - expansion: Newscaster channels can now be given channel descriptions! + - expansion: Messages can now be censored by crew with brig access from any console. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Standalone bounty boards have been replaced with newscasters, as the two have been merged. - refactor: Bounty boards and newscaster code have been refactored in order to merge the two pieces of content. +<<<<<<< HEAD Ebin-Halcyon: - rscadd: Families WW3 reenactment gear have been added to the loadout. (Yuri, Allies, and Soviet) @@ -925,6 +1833,87 @@ suited for high population counts. - rscadd: Deltastation security office reverted to its old form, a big single desk instead of the weird whatever was. +======= + GoblinBackwards: + - bugfix: Fixed airlocks and windoors not being able to be attacked by melee weapons + in combat mode. + - bugfix: Fixed stray syndicate supply pods not containing any items. + Jolly: + - bugfix: SnowCabin.dmm had its active turfs rectified. + LemonInTheDark: + - balance: Airlocks will now autoclose in 8 seconds rather then 15 + - bugfix: The latejoin menu will now properly close when you join the game + Maurukas: + - bugfix: The engineering console on Icebox is once again connected to the station's + grid and can see APC status and available power. + OperativeLyn: + - bugfix: IceBox had two washing machines on the same tile, as well as a bit brighter + than usual decals. That tile is back to normal. + Pickle-Coding: + - bugfix: Fix tritium fire releasing more radiation than it should. + Rhials: + - rscadd: Added command encryption keys to the cargo order console + Ryll/Shaps: + - qol: Mystery boxes no longer cut off each other's sound clips when playing their + own + SuperNovaa41: + - bugfix: Fixes nonhuman head of departments showing up as their original species + in security records. + Watermelon914: + - balance: Destroy the Blackbox is now worth 6-9 TC instead of 4 TC + cacogen: + - expansion: Can fire guns and secondary attack (right-click) with TK. Throwing + things with TK now requires throw mode. + - bugfix: You can no longer offer things to yourself, choosing instead to take them + directly + - bugfix: Can no longer headpat mobs without heads + - expansion: Adds screentips for headpatting, hugging and tail pulling + - soundadd: Sound effects for attacking bushes, trees, mushrooms and rocks. + - code_imp: Minor code improvements in flora.dm + dragomagol: + - bugfix: The chairs on the casino shuttle are now facing the proper directions + - bugfix: The Zeta shuttle brig now uses the brig shuttle area + - qol: Shuttle doors that previously had varedited accesses now use preset access + helpers + nianjiilical: + - balance: Sentient Diseases now require a minimum playercount of 25 to activate, + up from 10. + san7890: + - bugfix: If you were a prisoner on KiloStation and you noticed some abnormally + dark rocks, I hope you are pleased to know that they have been brightened up. + No compensation is offered. + vincentiusvin: + - spellcheck: made the reaction list on a few machines' ui (compressor, atmos control) + to be newlined. + willox: + - bugfix: TGUI and Tooltip windows now work with high-dpi web browsers +2022-03-28: + CocaColaTastesGood: + - bugfix: Fixes an exploit that allowed players to send unsanitized text to admins. + Fikou: + - rscadd: Right-click with a MOD paint now lets you paint the suit's color! + LemonInTheDark: + - bugfix: Bartenders can throw drinks again, rejoice! + YakumoChen: + - qol: Added a 50 count bamboo stack to base stack types + vincentiusvin: + - bugfix: fixed lavaland syndie base's pipes popping up. +2022-03-29: + ArcaneMusic: + - bugfix: You can no longer create money out of thin air using bounty boards. + JohnFulpWillard: + - bugfix: Bots blowing up can now be sorted under Info. + - bugfix: Gunpowder's reaction can now be sorted under Info. + - code_imp: boldnotice messages are now sorted under Info. + Jolly: + - bugfix: Lavaland agents rejoice! Theres no longer a missing tile that leads to + space! ..Wait, what? + RandomGamer123: + - bugfix: The 0.7% charge high capacity power cell (which actually also stored 50% + more charge than a regular high capacity power cell, didn't notice that right?) + in Metastation engineering has been replaced with a regular high capacity power + cell. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps and MrDoomBringer: - imageadd: Added new bleeding overlays for humans! People who are losing blood will now have overlays displayed on them that show which bodyparts are bleeding, @@ -937,6 +1926,7 @@ for how much blood a slash can lose per tick has been raised slightly. - balance: Grabbing your own bleeding limb to staunch the bleeding is quicker and slows you down less +<<<<<<< HEAD SkyratBot: - bugfix: You can no longer create money out of thin air using bounty boards. - bugfix: You can no longer offer things to yourself, choosing instead to take them @@ -967,12 +1957,63 @@ - bugfix: The thunderdome side rooms will now properly reset. - admin: The thunderdome is now a placeable map template. - bugfix: modsuit painting is fixed +======= + Son-of-Space: + - qol: Contractors lost some appliances in kitchen maintenance on MetaStation, BoxStation, + and DeltaStation + SuperNovaa41: + - bugfix: The thunderdome side rooms will now properly reset. + - admin: The thunderdome is now a placeable map template. + TiviPlus: + - refactor: The mech UI(s) now use TGUI + - rscadd: Mechs no longer have RNG chances to completely ignore attacks + - rscadd: Mech armor will now directly add armor instead increasing deflection chance + - rscadd: Mechs now have slots for equipping "power", "utility" and "armor" modules + - rscadd: Mechs now use left and right click to use the left and right weapons respectively + - rscadd: Mech internal damage no longer requires low HP and instead now requires + a minimum damage in an attack to consider it + - rscdel: hidden mech bay has (at least for now) been removed + - rscdel: Some ballistic weapons reloading with energy has been removed so they + have infinite ammo + - rscdel: tesla power module has been removed + - rscdel: Honker no longer has snowflake UI that plays sounds + - bugfix: admin uis now work on mech equipment properly + ZephyrTFA: + - balance: Free Golems are now penalized for leaving their natural habitat + capsaicinz: + - bugfix: cleans up some force-feeding code indentation, and adds some headless + flavor + - bugfix: removes duplicate dorm airlock on tramstation. + - bugfix: charlie station dorms now only has one APC, as god intended + dragomagol: + - qol: the gulag item reclaimer now requires brig access to use instead of general + security access + - bugfix: The Zeta emergency shuttle's brig now travels with the rest of the shuttle + magatsuchi: + - bugfix: fixes a bug that causes podpeople hair to crash the pref menu +2022-03-30: + Fikou: + - bugfix: you can no longer push ash drake corpses into doors + - bugfix: modsuit painting is fixed + FlamingCheese: + - bugfix: Reality has downloaded CS Source which fixed the missing texture of a + poster in departures security checkpoint + LemonInTheDark: + - qol: The beach away mission has a light yellow tint + - bugfix: Some areas that were once pitch black are no longer + - bugfix: I've replaced the pumps in server rooms/slime kill rooms with passive + vents. It's faster ok don't worry about it + Son-of-Space: + - rscadd: IceBox Station has a new Security Department + TemporalOroboros: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Improvements in the smoke powder formula have resulted in a doubling of the maximum possible carry density for the resulting clouds. This brings it to par with the fluorosurfactant formula in this area. - balance: Fluorosurfactant no longer acts as an arbitrarily powerful accelerating catalyst in an emulsified state. Research into foam based thermobaric weaponry has begun. +<<<<<<< HEAD - bugfix: The Zeta emergency shuttle's brig now travels with the rest of the shuttle - bugfix: you can no longer push ash drake corpses into doors 2022-03-31: @@ -1012,5 +2053,32 @@ - rscadd: Adds in medical smardarts, non-harmful replacements for syringes in syringe guns that can only inject healing chemicals. - rscadd: Adds in Smartdart guns, syringe guns that can only use smartdarts. +======= + san7890: + - bugfix: On IceBoxStation, hopefully all (if not a good chunk) of the cameras have + been moved to no longer be on windows, and on walls instead. +2022-03-31: + ArcaneMusic: + - bugfix: Fixed 2 newscasters that were accidently mapped next to each other on + tram. + Capsandi: + - expansion: The crashed ship ruin has been remapped + ErdinyoBarboza: + - bugfix: Makes cyborg lollipop dispenser use the cyborg (non-omnizine) variant + for consistency. + Kylerace: + - balance: scrubbers now remove small amounts of gas faster than they used to, without + affecting how fast they scrub gases in high concentrations. + Watermelon914: + - admin: Admins can now see the number of players when someone sends an urgent ahelp. + - admin: Added an option to config send non-urgent ahelps to a channel (where there + are no available admins on). + - admin: Added a response that is sent by the server when an ahelp is responded + to in any way by an admin. + timothymtorres: + - bugfix: Fix jumpsuits to drop accessories when destroyed + - bugfix: Fix welders wasting fuel when clicking on tiles + - bugfix: Fix plants to not hurt user while using telekinesis +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres, lewcc: - bugfix: Fix attack messages appearing when using tools on blast doors diff --git a/html/changelogs/archive/2022-04.yml b/html/changelogs/archive/2022-04.yml index c4d303b133a..d281dc9eea8 100644 --- a/html/changelogs/archive/2022-04.yml +++ b/html/changelogs/archive/2022-04.yml @@ -1,9 +1,14 @@ +<<<<<<< HEAD 2022-04-02: +======= +2022-04-01: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Arkatos: - spellcheck: Fixed several incorrect menu descriptions of some spider variants regarding their poison injection amount. Injection amount menu descriptions will now automatically update whenever their value changes by future code tweaks. Cenrus: +<<<<<<< HEAD - rscadd: Changed some armament vendor item costs - bugfix: Fixed assault op ship turrets not using ballistics Ebin-Halcyon: @@ -36,6 +41,50 @@ - code_imp: changed some mech FOV cone backend to work better - bugfix: Adds checks for packs on the departmental order console. - admin: revenants harvesting a mob now logs in the revenant's combat log. +======= + - bugfix: removed stray pixel on the CQC manual + CocaColaTastesGood: + - bugfix: Adds checks for packs on the departmental order console. + ErdinyoBarboza: + - bugfix: Adds descriptions to some turfs that missed them. + Fikou: + - bugfix: protector stands no longer remove all their overlays when leaving shield + mode + Ghilker: + - expansion: thanks to the latest discoveries, metallic hydrogen can be installed + inside the thermomachines to allow their use without needing a thermal port + connected to a gas reservoir (a total of 3 metallic h2 sheets are required, + obtain them from the local crystallizer, warranty void if applied to other machines) + Ghommie: + - bugfix: Fixed certain pens breaking painting on a canvas because of their peculiar + colors. + - expansion: 'Added two additional canvas types: 36x24 and 45x27, as well as a large + painting frame meant for them. All three items can be bought from the library + vendor.' + - qol: paintings shown in the "Marlowe Treeby's Art Galaxy" app will now always + have a 1:1 pixel ratio, ergo 23x19, as well as the new canvases, won't appear + stretched in its UI anymore. + - bugfix: Fixed the 24x24 canvas not having a wip overlay (the one that shows up + on canvases with unfinished paintings). + GoblinBackwards: + - bugfix: Fixes slime core removal surgery being impossible to start + Iamgoofball: + - qol: You can now see the plant's health with a plant analyzer. + Imaginos16: + - imageadd: Nanotrasen has once more updated its legendary Central Command Wardrobe, + improving upon its designs even further! + - expansion: 'Nanotrasen has also added a new outfit for Special Ops Officers to + enjoy, instead of a simple leather jacket: The CentCom Officer''s Coat!' + JohnFulpWillard: + - bugfix: Assistant Traitors can now purchase the Ancient Toolbox again. + LemonInTheDark: + - expansion: The library computers have received a graphical and functional upgrade. + Better inventory management, poster printing, bible viewing, and well, TGUI. + - server: Bookcases will generate way more db calls during init then is normal. + If this causes issues please bug me and I'll work out a solution + - bugfix: Library consoles and a few other things will no longer look "on" even + when their power is cut. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Expanded heavily on action buttons - rscadd: Adds an action button dropdown that sits just under the normal list in the top left. You can drag new buttons onto it to insert them. Click on it to @@ -47,6 +96,7 @@ - rscadd: When you start to drag an action button, docking ports will appear in places that it can be inserted into. (Outside of just floating somewhere on your screen of course) +<<<<<<< HEAD - rscdel: 'Removed action button locking, and the associated preference. I''m reasonably sure literally none uses this, but if you do hit me up qol: Dragging an action button will now give you an outline of its size around your cursor' @@ -67,10 +117,62 @@ qol: Move Help menu to the end of the menu bar.' - bugfix: 'Humans no longer "enter" mechs twice qol: as a side effect mech entering will cancel immediately instead of failing at the end only' +======= + - rscdel: Removed action button locking, and the associated preference. I'm reasonably + sure literally none uses this, but if you do hit me up + - qol: Dragging an action button will now give you an outline of its size around + your cursor + - bugfix: You can no longer cause the screen to expand by putting an action button + on the edge of widescreen, and then resizing to standard. + - refactor: Refactors action and button code significantly. lots of little things. + Melbert: + - admin: Plant mob spawning (Killer Tomatos) are now logged more thoroughly and + in investigate botany now + PetMudstone: + - spellcheck: Voice and chemical analyzers now have more consistent names and spelling. + Spookuni: + - bugfix: Haloperidol has been properly labelled in medical cyborg hyposprays after + several instances of mediborg induced brain damage were found in human patients. + Tastyfish: + - rscadd: Re-added the Hotkeys-Help verb, and linked the Hotkeys menu item to it. + - qol: Move Help menu to the end of the menu bar. + TheBonded, timothymtorres: + - bugfix: Fixed mulebot movement animation to be smoother + TheBoondock: + - bugfix: fixes a runtime with conveyor where right clicking it with any item would + cause a runtime + Timberpoes: + - bugfix: Fixes an issue where reagent logging would incorrectly output "no reagents" + when a reagent transfer had actually happened. + TiviPlus: + - bugfix: Humans no longer "enter" mechs twice + - qol: as a side effect mech entering will cancel immediately instead of failing + at the end only + - bugfix: mechs will now show in their tabs equippable equipment as intended + - bugfix: fixed mech air tanks being removable + - qol: Mech ammo names are now less ugly + Wallem: + - balance: Lowered the price of Kheiral Cuffs from 2750 to 2000 points. + cacogen: + - bugfix: Pull tail screentip now works properly + - bugfix: Machine frames and circuit boards no longer call manipulators micro-manipulators + when examined + - code_imp: Improves code in constructable_frame.dm and circuitboard.dm + capsaicinz: + - admin: revenants harvesting a mob now logs in the revenant's combat log. + ivanmixo: + - qol: space dragon can now make it's sprite smaller + san7890: + - bugfix: There is no longer a commented out line in IceBoxStation.dmm, which means + that random parts of the library will no longer go completely missing. Enjoy. + - bugfix: MetaStation's Abandoned Bar no longer has a floating poster just... floating + there. It was weird, alright? +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Nanotrasen realized how much they were spending on newscasters that got buried under posters and the like, so the corporation decided to stock the crew with juuuuust enough. They have saved a lot of money from this venture, and the economy will promptly begin to skyrocket to new heights. +<<<<<<< HEAD - spellcheck: Voice and chemical analyzers now have more consistent names and spelling. - bugfix: Fixes an issue where reagent logging would incorrectly output "no reagents" when a reagent transfer had actually happened. @@ -267,11 +369,265 @@ - bugfix: finishing grenades no longer prints the error message when it shouldn't - bugfix: Fix an exploit where permanent invisibility can be gained from using shadowcloak stacked with other transparency effects. +======= + - rscadd: Parts of MetaStation's Xenobiology Satellite have had some moderate re-arrangement, + ultimately leading into an experience where you don't have to clamber over canisters + to check the camera monitor. + - bugfix: Some weird space turfs south of the Xenobiology Satellite have been banished. + - imageadd: 'A new area turf for the Xenobiology Hallway has been added, and mapped + into the one map that uses it: Meta.' + unit0016: + - bugfix: The brig disposal bin on Tramstation is now actually hooked up. Because + of course it wasn't. + vincentiusvin: + - rscadd: Added an ic atmos reaction guide. Available in your atmos control consoles/monitors, + ntosatmos app, and analyzer. + - code_imp: Some changes to how gas canister descriptions are generated. +2022-04-02: + Ebin-Halcyon: + - imageadd: New and updated maid costume sprites + Rhials: + - spellcheck: Cargo crate naming has been made slightly more consistent. Rejoice. + - bugfix: When an airlock that is being hacked receives plasteel reinforcement, + it will no longer keep the hacking UI open and useable. + TheSmallBlue: + - spellcheck: There are no longer two ID Getter Components + TiviPlus: + - code_imp: changed some mech FOV cone backend to work better + - bugfix: fixed mmis seeing the wrong mech UI + san7890: + - rscadd: A new plushie has appeared on TramStation. Seek it out if you dare. + timothymtorres: + - bugfix: Fix shutters contextual screentips to not display as open with LMB. +2022-04-03: + Kapu1178: + - balance: Humans aren't spaceproof anymore + - rscadd: Limbgrower limbs are now a sickly green + - refactor: Digitigrade legs should now behave consistently. + - refactor: Limbs will no longer update appearance as owner is transferred, allowing + for multi-species frankensteins + - bugfix: CHANGELING TRANSFORM FUNCTIONS PROPERLY + - rscdel: Synths and synth-related mechanics (Synth fugative) + RandomGamer123: + - bugfix: Stops find_safe_turf, used by salvation signposts in deep space and the + super secret room, from teleporting people into the windows of the toxins test + area and killing them if they didn't have spaceproof equipment. + Rhials: + - bugfix: Fixed up the wiring in Icebox Xenobiology's shutter buttons. The two buttons + no longer close the same shutters, and now close their intended targets. + Zonespace27: + - bugfix: Standard HoS headset no longer protects against loud sounds. + dragomagol: + - admin: singulo and supermatter logging have been combined into engine logging! + san7890: + - bugfix: You know that shower room in the northeastern portion of IceBox Station? + We fixed the, erm, posters, there. + timothymtorres: + - bugfix: Fix Cryo areas to have CO2 filtering from the gas loops. +2022-04-04: + Ebb-Real: + - expansion: Bandanas are now craftable from 2 pieces of cloth. + - expansion: Adds the striped bandana and adds various preset colored bandanas to + clothing vendors and lockers. + - expansion: You can now dye bandanas with washing machines and customize bandanas + from inside the clothesmate. + - bugfix: You can no longer reset all the values of a bandana just by adjusting + it, this included integrity. + - imageadd: Adds bandana GAGS sprites. + - imagedel: Removes old non GAGS sprites. + - refactor: Refractors bandana neckerchief code. + Fikou: + - rscadd: Adds the Navigate verb, creates a holographic path to an area of your + choosing. + - rscdel: Removed wayfinding pinpointers. + Ghommie: + - bugfix: Fixed large persistent paintings being shown off the wall + Wallem: + - imageadd: Resprites the mass driver + azizonkg: + - bugfix: fixed typo in filename that cause build fail + wesoda25: + - admin: admin messages now appear every time you connect until you click a link + confirming that you read them +2022-04-05: + JohnFulpWillard: + - bugfix: DNA Vault's DNA scanners no longer accept Plasmamen, Skeleton, and Golems + as DNA. + - expansion: 'A new Traitor Final objective has been added: Harvest the DNA of a + Space Carp, and use it to turn yourself into a Space Dragon!' +2022-04-06: + AdipemDragon: + - imageadd: Specialized medkits have some new distinct symbols to aid in distinguishing + them on the spot. + ArcaneDefence: + - qol: Moffins are now found in the mothic food category instead of the pastry category. + Cheshify: + - bugfix: The detective now has the correct consoles on icebox + ErdinyoBarboza: + - spellcheck: Sulphuric Acid is now properly named Sulfuric Acid. + Fikou: + - bugfix: fixes navigation ui for pais and borgs + Melbert: + - expansion: Metastation's Drone Room is now its own area, with its APC and Air + Alarm, instead of sharing an area with the maintenance. It has otherwise remained + largely unchanged, though some extra wall amenities were afforded to it. + - admin: Adds "Open VV" to traitor panel antags, which opens that antag's vv panel. + - admin: '"Mark as in/completed" by objectives in the traitor panel now changes + color based on whether the objective is determined to be "complete", instead + of whether an admin has marked it to be complete. For some objectives, it might + not update color (only text) when an admin marks it as completed - this means + the objective disregards whether an admin has marked it as complete.' + SmArtKar: + - spellcheck: Drop pod debris is no longer capitalised + Son-of-Space: + - bugfix: Labor shuttle is useable again on Meta, Box, Tram, and Runtime. + - bugfix: fixed a shutter name on IceBox + dragomagol: + - bugfix: paper logs once again include the paper's contents + - bugfix: Airlock cycle links work now! + san7890: + - bugfix: Nanotrasen dug around on TramStation, DeltaStation, and KiloStation and + found that grilles were covering a few gas flow meters in each of their atmospherics + divisions. This should now be fully rectified. + - rscadd: TramStation's Supply Division has had a redrawing in areas on both the + upper and lower decks. + - imageadd: New area turfs for the Station-Side Mining Dock have been added to our + catalogue. We hope that you all eagerly anticipate this new collection as it's + quite vogue for Spring fashion. + - balance: IceBoxStation's Public Mining Storage got shuffled around a bit. Nanotrasen + realized they were spending too much on reinforced walls, and decided to re-opt + for normal walls instead. To accomodate for this downturn in reinforced wallage, + another layer of protection was added to the southern wall of the AI's Upload. + - bugfix: The Public Mining Storage now has an APC. Whoopsie. + - bugfix: On the mapping end, it's now easier than ever to tell whatever the fuck + "Mining" is (it goes for so many things these days it's ridiculous) from "Mining + Storage". Very cool. + - bugfix: On Tramstation, the external access airlock to the Supermatter's cooling + loop uses a different form of lighting that functions in the outside setting. + vincentiusvin: + - bugfix: fixed breathedeep catridges not working +2022-04-07: + Fikou: + - bugfix: you can no longer stuff infinite ais in modsuits + Ghilker: + - bugfix: fix machinery being clickable from behind a directional window + JohnFulpWillard: + - admin: Individual material crafting is now logged in crafting.html + - bugfix: Food processors now give more processed food, depending on its matter + bin. + Kapu1178: + - bugfix: Husks render again + - bugfix: Lizards, Moths, and Podpeople character creation icons fixed + LemonInTheDark: + - bugfix: Machine interaction works again, get trolled + Pickle-Coding: + - bugfix: Fixes cryocells kicking you out early. + Son-of-Space: + - bugfix: Engineers have reconnected the disposals loop on DeltaStation + TiviPlus: + - qol: Mechs will now immediately cancel progress bars instead of waiting until + till the end to tell yyou you moved + carshalash: + - qol: Adds a recipe to make paper cups and triples ice cream vat capacity. + dragomagol: + - admin: Launchpad investigate logs have been moved to game log + kawoppi: + - expansion: Frogs can now be picked up. You can fit them in your pockets too! + - expansion: Frogs can now be put on your head. + - imageadd: Added sprites for (rare) frogs placed on heads + san7890: + - imageadd: On the mapping end, donut boxes now look like... donut boxes! They used + to look like flat, white rectangles. Now they don't! Great! + - code_imp: CI will now lint for commented-out lines of code in map files. This + is very good. + timothymtorres: + - bugfix: Fix reinforced girders to only use plasteel for construction + tnekohue: + - bugfix: Fixed a bug with the RCD silo link upgrade when its connected and turned + off. + tralezab: + - rscadd: Beds, Sofas, Slimes, And Jellypeople now provide a soft landing + vincentiusvin: + - balance: made runtimestation more powerful. +2022-04-08: + B4CKU: + - bugfix: finishing grenades no longer prints the error message when it shouldn't + Ghilker: + - bugfix: crystallizer max quality can now be reached regardless of recipe total + moles amount + JohnFulpWillard: + - bugfix: Robocontrol on computers now work again. + - refactor: Janitor's custodial PDA cartridge has been replaced with a Custodial + locator tablet app. + Jolly: + - bugfix: TramStations AI sat teleporter now has a button to control the shutters. + Please stop banging on them to be let in. + - bugfix: A floating poster in Ice Box's service hall was properly contained. + - bugfix: Old Stations Charlie & Delta storage rooms APCs now start with 0 charge, + your immersion has been restored. + LordVollkorn: + - bugfix: Health sensors inside of chemical grenades will now work as intended and + the process is almost impossible to screw up. + Riggle: + - bugfix: Revenant logs are no longer wrapped in a span + SmArtKar: + - bugfix: Added a missing air alarm in Tramstation's cargo office + Son-of-Space: + - bugfix: Mapping helpers have been added for access reqs in security on DeltaStation + - bugfix: Access requirements in security are now standardized on DeltaStation + TheBoondock: + - bugfix: fixes rev runtime when a headrev body is destroyed + san7890: + - bugfix: TramStation's Medbay's White Medkits actually have stuff in them now. + - bugfix: TramStation's Surgery Rooms are now actually named appropriately. The + person who mixed up their starship directions is being executed at noon. + - bugfix: The Ash Walker's Base on Lavaland decided to stop putting tiles under + solid rock. + - bugfix: The Syndicate Operatives positioned on Lavaland are no longer able to + violate the ONE THING they were told to not perform (leave the base). + - bugfix: 'On the mapping end: cyborg, monkey, moth, and plasmamen limbs will no + longer show up as absolutely nothing.' + - bugfix: 'On Meta, Delta, and Kilo: Nanotrasen has decided to shuffle around those + brand-new newscasters to ensure the AIs could actually see the buttons they + want to hit.' + - balance: On IceBoxStation, Nanotrasen finally decided to reinforce the western + walls on the Captain's Room and the Teleporter Room. + - rscadd: A conformational change in reality has caused every single bed (when applicable) + to be tastefully rotated in the opposite direction. + thgvr: + - bugfix: You should no longer fall through a specific spot in space in Tramstation's + upper level. + timothymtorres: + - qol: Girder construction now uses balloon alerts + - bugfix: Fix an exploit where permanent invisibility can be gained from using shadowcloak + stacked with other transparency effects. +2022-04-09: + AnturK: + - bugfix: Spacemen no longer can sculpt light effects from stone + Ebb-Real: + - expansion: Adds the science night vision goggles, they scan chems! + - expansion: Science sunglasses now have a research scanner installed. + JohnFulpWillard: + - bugfix: Kilostation's Brig, Medbay, and Chapel's pipes are all connected to the + station's distro and waste. + Melbert: + - bugfix: Fixes a runtime with bounty cubes on Destroy + TheBoondock: + - bugfix: layering issue with venus fly trap and spacevine + cacogen: + - expansion: Armour tags on clothing tell you when an item blocks pepperspray or + facehuggers + capsaicinz: + - bugfix: you can no longer create singularities by using soultap while in rod form + - balance: wizards can no longer cast spells while in rod form + ninjanomnom: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Stationary gas tanks now cost 12 material for the plating instead of 20 - balance: The base level of stationary gas tank pressure limits has been brought up to the base level of canisters. Higher quality materials still increase this further as before. +<<<<<<< HEAD - bugfix: Spacemen no longer can sculpt light effects from stone - bugfix: You should no longer fall through a specific spot in space in Tramstation's upper level. @@ -350,6 +706,68 @@ - bugfix: HEV no longer allows any helmet type. - bugfix: HEV no longer secures anything but oxygen tanks to your suit storage. SkyratBot: +======= + robbertapir: + - bugfix: Petri dish cultures no longer stay behind on the sprite like some sort + of ghost after being washed out of it. Cells don't have souls. + san7890: + - bugfix: KiloStation's Botany no longer has a bit of it defined as the defunct + "Central" Maintenance. + thgvr: + - bugfix: Digitigrade legs should now display correctly with certain clothing options. + unit0016: + - bugfix: A handful of issues on icebox, pertaining to /area/s, firelocks, airlocks, + mapping helpers, mapping mistakes, a literal space tile, and more have been + squashed! + - bugfix: You can actually move the Syndicate Infiltrator's docking position on + icebox again. Yeah. I know. +2022-04-10: + ArcaneMusic: + - qol: All ID cards have been given a basic, standalone bank account. Not just for + crew, new and old, but also for IDs fresh out of the box. + - rscdel: The accounting machine has been retired from station use, as accounts + come with a default bank account now. + Ghilker: + - rscadd: reworked turbine to be a 3x1 machine, with flow and pressure based calculations. + A paper explaining how to use will spawn when building it and on the roundstart + one. + - bugfix: fixes an issue with the old turbine where you could generate infinite + power with cold gases + - balance: SM consumes items and gain power based on their size + Ghommie: + - bugfix: The screentip context no longer lies about what happens when you left + click another carbon mob with combat mode on. + KazooBard: + - balance: Regular mansus grasp now inflicts cultslur on the target for 4 seconds. + - balance: Increased void mark and void grasp silence duration from 8 seconds each + to 10 seconds each. + Melbert: + - imageadd: Cigars have sprites when held in hand + Mothblocks: + - balance: Free golems can no longer use shuttle consoles, other than to go home. + OneAsianTortoise: + - bugfix: removes the crate in window in lavaland base + Rhials: + - bugfix: The note in the Sloth ruin is fixed! Head on down to Lavaland and reap + the rewards! + SmArtKar: + - expansion: Evangelion jumpsuits have been added to robotics vendor's contraband + section + - imageadd: Ports new evangelion jumpsuit sprites + Son-of-Space: + - bugfix: TramStation atmos is more effectively separated into areas + - qol: It is easier to isolate and fix atmos issues in the Tramstation tunnel + TheBonded: + - bugfix: You can no longer create infinite snow with a crowbar + TiviPlus: + - bugfix: mech armor modules give armor properly now + - bugfix: Fix being unable to reload nukie missiles + ZephyrTFA: + - bugfix: SSUs no longer use power when doing nothing + thgvr: + - bugfix: Deltastation should once more have wrestling masks and athletic shorts. + timothymtorres: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactor antimagic component to be more robust. - soundadd: Add different sound effects for when magic is blocked - bugfix: Equipping or dropping antimagic items now properly updates the magic buttons @@ -358,8 +776,14 @@ - bugfix: Remove bloodsplatter when fireball is blocked by antimagic - bugfix: Remove lockers when staff of locker projectiles blocked by antimagic - bugfix: Fire breath is no longer blocked by antimagic +<<<<<<< HEAD - bugfix: 'Spellcards are now blocked by antimagic qol: Add antimagic chat notification and animation effects. Mobs will now glow when they successfully block magic.' +======= + - bugfix: Spellcards are now blocked by antimagic + - qol: Add antimagic chat notification and animation effects. Mobs will now glow + when they successfully block magic. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Foilhats prevent someone from casting mind magic (telepathy, mindswap, etc.) - balance: Bibles, ritual totems, nullrods, holymelons, and `TRAIT_HOLY` prevent @@ -373,6 +797,7 @@ - balance: Voice of god is now blocked with `MAGIC_RESISTANCE_HOLY` and `MAGIC_RESISTANCE_MIND` - rscdel: Cult blink and cult summon creature spells were never used in the code and have been removed. +<<<<<<< HEAD - bugfix: relocates the SMES terminal to not be in a wall in the lizard gas space ruin - bugfix: Golems can now exist in the rooms they themselves create, sorry about @@ -438,10 +863,73 @@ - spellcheck: fixed an error in the chilling black extract's description. - code_imp: the 'random' subtype of golems no longer exists, and is now effectively replaced by picking from all subtypes of the golem species. +======= + - bugfix: Fix moonicorns not falling through openspace properly. +2022-04-11: + Ebb-Real: + - bugfix: You can no longer fly by spamming ollie onto an empty space and not moving. + JohnFulpWillard: + - qol: Monkeys can now wear headsets. + - balance: Monkeys can now wear glasses. + - refactor: Drone PDA apps have been refactored and is now part of Botkeeper, such + as granting access to dangerous machinery and sending pings. + - refactor: The Curators newscaster PDA app has been moved into a new Newscaster + tablet app, with a full new UI. + - rscdel: The Detomatix cartridge's ability to open the nuclear operative pod doors + has been removed. + Son-of-Space: + - bugfix: NT Risk Audits have replaced fraudulent posters calling the ice moon environment + "space." + Tastyfish: + - bugfix: Fire alarms no longer magically emit light when they lose power. + TheBoondock: + - refactor: Zauker now uses reagent to perform its effects on breath + ZephyrTFA: + - bugfix: Golems can now exist in the rooms they themselves create, sorry about + that. + Zytolg: + - bugfix: relocates the SMES terminal to not be in a wall in the lizard gas space + ruin + cacogen: + - rscdel: Navigate verb uses landmarks now, which means that underfloor wayfinding + beacons (which could be used to change the names of destinations) are gone + - qol: Adds Nearest Way Up and Nearest Way Down to the navigate list, which point + to the nearest ladder or staircase up or down + - bugfix: Fixes runtime with navigation verb paths where deleted paths were still + attempting to animate + san7890: + - bugfix: On DeltaStation, Nanotrasen will no longer place a Gas Vendor and an Intercom + in such a position on one of the walls on the Clown's bedroom where they overlap. + techno0: + - bugfix: Debug Glasses have SM protection + tralezab: + - expansion: New Festival God sect! Sooth or serrate your friends and foes with + the beat. + unit0016: + - expansion: The syndicate infiltrator has been tuned up, coming with a fresh coat + of paint, insurance, and the new shuttle smell. Sadly, no complimentary taco + in the glovebox. +2022-04-12: + Fikou: + - expansion: Maintenance has a new set of special glasses... + Fikou, Azlan, PositiveEntropy, Capsaicin: + - imageadd: new sprites for the syndicate modsuit (and honkerative) + Ghilker: + - bugfix: fixes exploit where you could duplicate gases with valves + - bugfix: thermal conductivity can be properly set so the turbine turfs will not + leak heat + GoblinBackwards: + - bugfix: Fixes brimdemon lasers never disappearing if the demon was deleted while + firing. + MacBlaze1: + - qol: firelocks now automatically reset upon the air temperature being returned + to normal thresholds +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fire alarms now automatically update on atmos monitoring programs/consoles to show their real status. No more false positives! - code_imp: air alarms now have a variable referencing their area that is used - code_imp: added a new signal for when atmos adjacent turfs are calculated +<<<<<<< HEAD - rscadd: Limbgrower limbs are now a sickly green - refactor: Digitigrade legs should now behave consistently. - refactor: Limbs will no longer update appearance as owner is transferred, allowing @@ -605,10 +1093,70 @@ - bugfix: Wizard immovable rod no longer deletes itself when travelling betwen z-levels - bugfix: Diggable turfs no longer get dug up by any item used on them - bugfix: easter baskets can now hold easter eggs +======= + TheSmallBlue: + - expansion: The Hygienebot can now be colored with a spraycan. + - code_imp: Added a flag that allows mobs to be colored with the spraycan. + capsaicinz: + - spellcheck: fixed an error in the chilling black extract's description. + - code_imp: the 'random' subtype of golems no longer exists, and is now effectively + replaced by picking from all subtypes of the golem species. + timothymtorres: + - bugfix: Fix girder construction runtimes +2022-04-13: + Iamgoofball: + - server: Adds Ukraine's Independence Day as a holiday, since the child attacking + our hosting requested goofball PRs. + necromanceranne: + - bugfix: Plasmamen no longer have a stray white pixel. +2022-04-14: + Ghommie: + - bugfix: Fixed supply pods not being displayed below their contents when opened + or the rubbles effect caused by the impact. + GoblinBackwards: + - bugfix: Fixes facial hair using main hair colour instead of facial hair colour + Rhials: + - bugfix: Cleaning strange objects no longer leave behind empty grenade casings. + No littering! + SmArtKar: + - bugfix: Monkeys now can interact with misc(environmental) turfs. Also removed + two unused broken turf types. + - bugfix: You can no longer dupe ants(or any other chemicals) as a janiborg + SmoSmoSmoSmok: + - bugfix: Ghosts can now correctly jump to C4's planted on walls/floors when they + get the notification + Tastyfish: + - imageadd: Wrapped parcels now have an overlay when tagged with a destination. + - refactor: Refactored wrapped parcels to have a common base type. + san7890: + - bugfix: After a few mishaps, Nanotrasen fixed a few small area definition errors + on MetaStation. + unv-annihilator: + - bugfix: held mice are no longer edible by moths +2022-04-15: + ArcaneMusic: + - soundadd: A new round-end sound is in rotation. + Fikou, EOBGames: + - rscadd: Redesign of Hilbert Research Facility + Ghilker: + - qol: mixers now have better indicators for nodes + JohnFulpWillard: + - bugfix: Changeling HUDs now properly carry over through bodies. + - code_imp: Non carbon Changelings now respectively regenerate/lose/spend their + chems. + - bugfix: Grilling food now makes said food, grilled. + LemonInTheDark: + - rscdel: The on human examine species readout has been removed + OneAsianTortoise: + - qol: you can take out PDA/ID from trimmer with right click + SmArtKar: + - bugfix: Water slime cookie no longer tastes like /datum/reagent/water +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnderARock: - bugfix: Fixes spraytan not tanning skin color. Wallem: - imageadd: Updates airlock cycling & mass driver buttons. +<<<<<<< HEAD mcmeiler: - bugfix: Xenobiological Slime Hybrid sprites are back to normal. - bugfix: Limbs can now be see-through again. @@ -701,12 +1249,28 @@ - bugfix: Re-adds the DeltaStation Prison - bugfix: Re-adds the secondary detective locker to DeltaStation - bugfix: Re-adds bouncer spawns to DeltaStation +======= + apynnonen: + - qol: Screentips are no longer hidden by action buttons. + dragomagol: + - bugfix: traitor logging has its own config flag + san7890: + - bugfix: Nanotrasen will now stop placing reinforced window spawners right on top + of snow at IceBox Departures. +2022-04-16: + ATHATH: + - bugfix: Washing someone else's mouth out with soap no longer washes YOUR mouth + out with soap instead. + Fikou: + - bugfix: fixes access on the hilberts hotel vault door +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, Smartkar for sprites: - balance: the MODsuit clamp can no longer hold crates with human or larger sized mobs - balance: the MODsuit holster has been replaced with a magnetic harness (like tgmc) - balance: the MODsuit pepper mister has been replaced with pepper shoulders. They react to attacks with pepper spray +<<<<<<< HEAD OrionTheFox: - imageadd: While sorting through their plasmamen envirosuits, NT shipped a template out to Armadyne for the manufacture of Peacekeeper-branded Envirosuits! They've @@ -745,6 +1309,497 @@ - balance: STG damage 40 -> 32 - spellcheck: Suppressor no longer mentions the syndicate 2022-04-27: +======= + Ghilker: + - expansion: freon burn reaction now produces coldspots and cold cyan fires + GoblinBackwards: + - bugfix: Wizard immovable rod no longer deletes itself when travelling betwen z-levels + - bugfix: Diggable turfs no longer get dug up by any item used on them + JohnFulpWillard: + - bugfix: Brains from HARS victims in a new HARS body will not be revivable anymore. + Melbert: + - expansion: People who survive the heretic realm now have a unique "slurring" mode, + instead of borrowing regular cult slurring + - refactor: Stuttering, Derpspeech, Slurring and Cult Slurring and handled by a + status effect now instead of variables on mobs + - admin: You can now directly give anyone any of the above mentioned speech impediments + directly via an option in the VV dropdown + Y0SH1M4S73R: + - bugfix: The debug industrial lift usable by admins for testing tram behavior has + been fixed, and can now be moved again. + apynnonen: + - bugfix: Bluespace golems can no longer spam teleport + capsaicinz: + - bugfix: metal foam now blocks you from falling down a z-level if it's below you + carshalash: + - expansion: Expands pastry output. + necromanceranne: + - bugfix: Gives the pheromone receptor power an icon. +2022-04-17: + Cheshify: + - rscadd: Remaps the gluttony ruin! + - rscdel: Remove the free antag syringe from the gluttony ruin. + - rscadd: Remapped the Pride's Mirror ruin + Fikou: + - balance: the mining gas mask no longer protects against pepper spray + Ghilker: + - bugfix: turbines don't leak heat. Properly now + GoblinBackwards: + - expansion: Gloves of the north star's effect is now triggered when slapping people + Onule: + - imageadd: Resprited all slimes and slime cores + - imagedel: Removed unused slime and slime core icons + PositiveEntropy: + - imageadd: Resprites the soft caps! + RandomGamer123: + - bugfix: Cyborgs can no longer unbolt the door to the execution chamber on Kilostation. + Zytolg: + - qol: Xenosat Touchups. Employees may now monitor hazardous life forms at a new + and conveniently located desk. + - bugfix: The Xenosat should now feature 0 Diagonal Walls, once again becoming a + symmetrical Pill shape. + carshalash: + - bugfix: Uncle Pete remembered to order new rollerskates for his rollerdome. 30 + Skates will now be stocked for rent on his shuttle. + san7890: + - rscadd: You should now be able to rotate bedsheets on yourself as you take restful + sleeps. + - bugfix: Nanotrasen will no longer place bedsheets the wrong way on beds. + - bugfix: Nanotrasen has tied down a few unruly lattices on TramStation. It's amazing + how they didn't fly off in orbit. + - rscadd: The KiloStation Commissary (and the rooms that border it) have had their + items be shuffled around a bit. + - rscadd: Nanotrasen realized that their holodeck simulation of the photobooth was + not properly configured, and was showing up with ugly, grouted tiles. This has + been rectified to be a pure white backdrop for all your photograph desires. + - bugfix: On KiloStation, Nanotrasen will no longer install screens in the space + compartment near the bridge. + - bugfix: On MetaStation, Nanotrasen will no longer screw a fire extinguisher right + through the screen of a newscaster. + timothymtorres: + - qol: Add colored department posters to cargo delivery room in Meta to help identify + delivery chutes. + wesoda25: + - bugfix: easter baskets can now hold easter eggs +2022-04-18: + Fikou: + - qol: modsuit locks are a bit more clear, nukie/centcom/prototype suits start with + them + - bugfix: modsuits now retract if summoned through summon items or some other hijinx + GoldenAlpharex: + - qol: Telecomms and the gravity generator are no longer ear-deafening when you + don't have a direct line of sight with them, meaning that you can now peacefully + build things in maintenance around them, without having to turn off the sound + of your game. + - code_imp: Added complete documentation and extra configurability to looping sounds, + allowing them to be stopped by walls, to ignore pressure or to be unaffected + by reverb! + Melbert: + - bugfix: Healium healing should be a little more responsive, now + - bugfix: Maintenance will now have wall engravings + MidoriWroth: + - rscadd: Added 3 new Polish foods + - imageadd: Added sprites for the 3 new foods + OrionTheFox: + - bugfix: The Volaju hairstyle is now symmetrical on both facing sides + SnoopCooper#7310, Ghilker (for some minor parts): + - imageadd: better turbine sprites + cat348 for sprites, TheBonded for not being gitbanned: + - imageadd: Disposals Junctions have visible arrows + iprice: + - bugfix: Corrected an error in the spicy donk pocket recipe which would permit + infinite donk pocket creation. + robbertapir: + - bugfix: The Russian revolver now works again + vincentiusvin: + - balance: atmos holofans are now fireproof + zxaber: + - bugfix: Ripley MK2 mechs no longer have two cargo utility equipment items. +2022-04-19: + ArcaneDefence: + - bugfix: Our finest chefs have further refined the art of cookery so grilling random + items that have been deep fried will no longer create grill marks on weird lettering + above the dish. + B4CKU: + - bugfix: slimepeople's state will no longer be listed as "error" in the "swap body" + menu if their body is in crit + Fikou: + - expansion: Falling on punji sticks impales you. + Ghilker: + - qol: Adds a button to the thermomachine to dump residual gases from the main port + into the waste port + - expansion: supermatter delamination now spawns anomalies across the station, both + instantly and overtime + Ghommie: + - bugfix: Removed a fire extinguisher cabinet that was overlapping a large painting + frame on Delta. Moved a newscaster that was also overlapping the large painting + frame in the curator's backroom two tiles down on Meta. + JohnFulpWillard: + - qol: Departmental ID trimmer/PDA painters have been added to head of staff offices, + making it way easier to job change someone into your department. + Quill-Weave: + - bugfix: fixes a stray pixel in library.dmi + RandomGamer123: + - bugfix: The minor dark blue luminescent ability now heals you properly instead + of killing you. + - bugfix: The dark blue burning extract now injects you with regenerative jelly + instead of useless cryoxadone, making it not (as) deadly for slimepeople. + Spessman500: + - bugfix: fixed beepsky and ed209s not patroling + Vladoricious: + - bugfix: The Paranormal Response team has successfully defeated the demon that + was putting medicines in food from nowhere. + - bugfix: The food processor no longer strips chemicals from the things you put + inside. Finally, meth in my carrot fries. + Watermelon914: + - bugfix: Fixed traitors being able to duplicate their TC + Y0SH1M4S73R: + - bugfix: After two failed attempts at rectifying the issue, illegal tech is once + again unlockable. + Zytolg: + - rscadd: Firebase Balthazor has received much needed upgrades. Operatives now have + an adequate workspace for their radioactive activities. + - rscadd: The Syndicate Uplink has received Special Authorization Cards for use + by authorized personnel. + - rscdel: These expansions came at the cost of the old Nukeops Base. + - qol: Nukeops get a bigger and better looking base. Escapees on hijacked shuttles + may not be as lucky... + - code_imp: Added keycards and keycard_doors for use in the Nukeops Base. + - code_imp: Moves /modules/ruins into /modules/mapfluff/ruins and creates /modules/mapfluff/centcom + robbertapir: + - bugfix: Learning about lavaland bone architecture no longer causes the "Tribal" + tab to undergo mitosis. + san7890: + - bugfix: On IceBoxStation, to the northeastern airlock (in relation to the bar), + Nanotrasen will no longer paint the word "Caution" over text that says "STAND + CLEAR". + - bugfix: In MetaStation's Brig, Nanotrasen will no longer install Camera Monitors + on windows. They also removed an excess newscaster embedded within a wall. + tf-4: + - bugfix: Statues can now once again be wrenched. + timothymtorres: + - qol: Change AI upload lawsets to be randomized + - code_imp: Reorganize AI lawset code and remove deprecated malfunction code + timothymtorres, TheBonded: + - code_imp: Improved nightvision code +2022-04-20: + Fikou: + - bugfix: ebows no longer inherit not needing a gun permit from pkas + TheBonded: + - expansion: Laserpointer circuit modules now available. they had to be toned down + for circuit implementation, so dont expect them to do anything other than shine + light. + azizonkg: + - bugfix: renamed suffix for tgui-polyfill from bundle.js to min.js to prevent CBT + failing after target 'clean' + magatsuchi: + - rscdel: Removes the old PDA code, as well as references to it. (mostly) + - refactor: Thinktronic Systems has retired the elegantly aged PDA system, and is + now (forcefully) pushing its new patented job disks and SpaceMessenger app! + Available on your round-start tablet. + robbertapir: + - spellcheck: Replaced all occurrences of "collosal" with "colossal" + stylemistake: + - refactor: Ping system of tgui-panel has been reworked, which fixes things mentioned + below. + - bugfix: AFK players now get properly detected and kicked + - bugfix: Automatic reconnect should now work 100% of the time + - bugfix: Manual reconnect should now work 100% of the time + timothymtorres: + - qol: Fix nearspace areas for Meta + timothymtorres, TheBonded: + - code_imp: Library items have been refactored to be separate files. + vincentiusvin: + - bugfix: fixed icebox perma gym camera not working + - expansion: Remaps delta's ordnance +2022-04-21: + FernandoJ8: + - bugfix: Allergies no longer continue triggering and producing histamine while + the subject is dead + Fikou: + - qol: runtimestation should load faster + Ghilker: + - balance: machines now consume more power all around. Baseline 100 W idle and 1000 + W active + - balance: machines with parts will consume more power depending on the part and + on the part tier + - balance: 'Notice: The base SM with SMES properly configured is enough for the + station when all machines are at tier 1. With few upgrades that don''t touch + the base cooling loop it can carry most of the rounds.' + GoblinBackwards: + - bugfix: Moved the shortcut to eject beakers from most chem machines to right click + for consistency. + - bugfix: Allows silicons to use the right click shortcuts to eject beakers. + - qol: Allows borgs to eject beakers with right click regardless of range. + Mothblocks: + - qol: The reconnect button in tgchat will now reopen the game. + Son-of-Space: + - bugfix: AI coverage over the mech bay on TramStation has been added. + TheBoondock: + - bugfix: fixes bluespace vendor tanks being incompatible with suit storage + Y0SH1M4S73R: + - bugfix: Fixed several href exploits with the bluespace gas vendor, including one + allowing it to produce infinite tanks. + Zytolg: + - bugfix: The Kilostation CMO office has received a new desk, and a modern layout + to replace the cluttered shutter control interface. + magatsuchi: + - bugfix: fixed the ringtone popup text + - bugfix: actually makes the flashlight action button work, and fixes silicon/clown/mime + names showing up properly on tablets/messenger + shizcalev: + - bugfix: re-fixed patrolling bots not properly hunting targets. + tf-4: + - bugfix: Thermomachines will no longer continue to consume metal hydrogen once + upgraded, as well as giving feedback in chat. + thgvr: + - bugfix: Kilostation's AI upload once again has an APC + zxaber: + - balance: The Mecha Extinguisher equipment is now classified as utility. + - balance: The Mecha Extinguisher now puts out fires in a 3x3 square (centered on + the mech). However, it also only has five uses now. Save it for emergencies! +2022-04-22: + ArcaneDefence: + - bugfix: Processing foods with a knife or rolling pin will require a table or tray + again. + B4CKU: + - bugfix: fixed a bug with Vim overlays + - qol: attempting to enter Vim while not a small creature now throws a balloon alert + - qol: Vim can now be assembled using the crafting menu + - expansion: Vim can now be used as a circuit shell + - balance: small creatures can now pilot Vim + Bondismyname but I wish it wasnt: + - qol: Circuit Sound Synthesizers have a few more options of sounds they can play + FernandoJ8: + - bugfix: fixes runtime caused by a newscaster finding no user bank account when + trying to create a channel + Fikou, Anturk: + - bugfix: ghost alerts now resize to 32x32 if larger + Jolly: + - bugfix: Crew no longer can spy on the prisoners on Meta Station with a floating + camera console. Wardens, please pay attention next time. + LordVollkorn: + - bugfix: The chemical press will now only dispense stored pills/patches/bottles + while wrenched to the floor. This means you won't leave a trail of pills behind + you anymore when dragging your chemical press to another location. + - bugfix: Plumbing machinery can now be rotated via ALT-click when there is no power. + - bugfix: Plumbing machinery is now programmable without power. It won't produce + anything without power of course, but at least you can set it up while waiting + for power to come back. + Melbert: + - bugfix: Heretic's Madness Mask applies stamina damage to people when it should + - bugfix: Fixes two instances where mob references were passed into source status + effects improperly + - code_imp: Updated status effect code to modern style guidelines. + - refactor: Drugginess is now a status effect. Now any living mob can be high and + speak beach-bum instead of just carbons and humanoids. Drug effects should also + be more consistently removed on aheal / in rare cases. + - rscadd: Adds a new heretic path, the the Blade Path + - expansion: Heretic sidepaths got tweaked a bit. Blood siphon is now between raw + ritual and void phase. Cleave is now between Lonely Ritual and Void pull. Rusted + Ritual is now between Entropic Plume and Firey Rebirth. + - refactor: Refactored how heretic alt paths are set up to make adding new heretic + paths easier. + Pandarsenic: + - bugfix: Nuclear Operative Ordnance Lab now has minimum functional equipment. + - bugfix: Overlapping sprites in IceBox departures corrected by moving wall-mounted + items to other walls. + - bugfix: IceBox xenobio camera now attaches to a wall instead of floating in the + air. + PositiveEntropy, AxieTheAxolotl: + - imageadd: Resprites several syndicate outfits, particularly the Syndicate Coat, + the Turtlenecks, and the Combat Uniform! + - imageadd: Resprites and updates the Really Black Suits! + - rscdel: Removes the trak_suit from syndicate.dmi (it was a dupe and unused) + RandomGamer123: + - bugfix: Airlock Controllers now display their name in their GUI menu. + - bugfix: Airlock Controllers' GUI menu now doesn't pop back up after being closed + if it update while you'll still in range. + TheBoondock: + - expansion: Bz now also reduce how much tritium is consumed in hypernob formation. + Reduction depends on the ratio of bz to trit, bz > trit will result in reduced + trit consumption. + Zytolg: + - bugfix: The Metastation Tox-Mix chamber now utilizes the airless ver. of the engine + turfs. + magatsuchi: + - bugfix: brings back ctrl-click to remove pen + flavor text + maxspells: + - soundadd: Changed a cautery sound effect to be quieter. + timothymtorres, TheBonded: + - expansion: Mobs can no longer read in the dark unless they have some type of night + vision. + tralezab: + - rscadd: Thieves now have a low chance to found a thieves guild somewhere in maint. + - rscadd: Adds a new type of thief, the "All Access Fan" + - rscdel: Hoarder is disabled and admin only for the moment +2022-04-23: + Ghilker, shield sprite by @SnoopCooper: + - expansion: canisters now have a toggle for shielding that will start to consume + power if the temperature and pressure go over the labeled one (current limits + are higher than old t1 but lower than old t2). Peak draw should be around 25 + kW with fusion temperatures. Canisters have an internal cell that allows it + to hold shielding in areas without power for a time, powercells can be upgraded, + removed, replaced. + Rhials: + - expansion: Glockroaches and Hauberoaches are now accessible through cytology, + and have their own respective cell lines to grow them with. + TheBoondock: + - bugfix: fixes aux base console outputting "span_danger()" in launch sequence + YakumoChen: + - bugfix: Removed a stacked RPlasmaGlass window on Ice Box + Zytolg: + - bugfix: Atmos Technicians have finally gotten off their bums and done their jobs- + installing vents and scrubbers into atmos. +2022-04-24: + Bumtickley00: + - qol: The medical techfab can now print pill bottles + ErdinyoBarboza: + - bugfix: The construction firm has realized they were installing the urinals wrongly + and have now fixed them. + FernandoJ8: + - bugfix: fixes the exploit allowing for hundreds of iterations of the convermol + failed reaction to occur rapidly with a single beaker + Fikou: + - bugfix: fixes the traitor elite nukie suit being id locked + Ghilker: + - bugfix: increase roundstart power available to SM rooms + GoblinBackwards: + - rscadd: Added a whitelist to blood filters, unless the list is empty they will + only remove chems in this whitelist. You can edit the list by using the filter + in your hand + - qol: Blood filter surgery now automatically does a chem scan after each step if + you're holding a health analyzer. + - qol: Blood filter surgery now automatically loops if the patient has any filterable + chems in them + IndieanaJones: + - balance: Regal rats can now pry open airlocks. + - balance: Regal rats can see further in the dark now. + Mothblocks: + - balance: Replaced leftover xray injectors that weren't removed from research station + with thermal vision. + Rhials: + - bugfix: Moves the medical laptop crammed into the Kilostation psych locker to + a proper desk. Also expands the Kilostation office area by a single tile, giving + a much needed buff to a previously weak role. + SmArtKar: + - bugfix: Saline solution bottle no longer has a weird sprite that doesnt match + up with the reagent overlay + TheBoondock: + - bugfix: Fixes ghetto tools playing improper sounds when used during surgery step + that requires saw + - code_imp: add framework for future preop_sound conversion to list() + Vladoricious: + - qol: The research scanner in science goggles and similar eyewear no longer requires + you to press a button to turn it on! Instead, simply closely examine your target. + - bugfix: The MOD advanced reagent scanner module no longer detects explosions despite + being disabled. + - code_imp: Research scanner code cleanup. + Y0SH1M4S73R: + - bugfix: A couple of ugly-looking diagonal walls in the Hilbert Research Facility + have been straightened out. + YakumoChen: + - bugfix: Fixes a sprite not appearing when you use up canned tomatoes + - bugfix: Donkfillet has a sprite for real this time + Zytolg: + - bugfix: Adds more tape to Deltastation + - bugfix: Hijacked Shuttles will now show up at Firebase Balthazord + capsaicinz: + - bugfix: some stacks that need a singular name now have said singular name + - bugfix: stops sausage processing from runtiming, possibly other radials as well(?) + kawoppi: + - expansion: Blushing now makes your face go a little bit red + - expansion: Being drunk flushes your cheeks + vincentiusvin: + - expansion: remapped kilo's ordnance. +2022-04-25: + BlueMemesauce: + - spellcheck: Centers title text in the Crew Monitor Console + Bondismyname but I wish it wasnt: + - bugfix: Titanium shuttle windows are now properly able to be anchored when created + in hand. + EthanRockss: + - rscadd: Added prop gas masks for both default and atmos + - rscadd: Added gas masks to autodrobe + GoblinBackwards: + - bugfix: Prevents abandoned crates deleting their contents (No, you can't cheese + them by blowing them up) + Iamgoofball: + - admin: Activating the Supermatter with a projectile now logs who did it and with + what weapon. + JohnFulpWillard: + - qol: The police whistle's sound was lowered to break your ears less. + JoshAdamPowell: + - bugfix: Random Item now accurately describes how much it costs. + Melbert: + - bugfix: Fixes some improper and bugged balloon alerts. + - code_imp: Adds a grep to prevent malformed balloon alert calls. + - bugfix: '"Open the Hatch" surgery step plays a sound that is potentially more + accurate to the tool being used.' + - bugfix: Monkeys can shove people in disposals correctly, again. + Pariah919: + - rscdel: Removed old carrier TCG art. + RandomGamer123: + - bugfix: The DJ station space ruin's intercoms can now actually be used. + SmArtKar: + - bugfix: Mobs no longer think that turfs with railings are occupied and will propperly + pathfind through them + - code_imp: Optimises pathfinding by removing an unneded istype() + Tastyfish: + - rscadd: Added a tile sprayer to paint the corner and edge colors of floors. + - qol: Made the UI for decal painters more visual. + - bugfix: The PDA's flashlight action button now updates when the flashlight is + toggled. + TemporalOroboros: + - bugfix: The supermatter running into you is just as deadly as you running into + the supermatter. + TheBoondock: + - bugfix: fixes bubblegum charge ignoring cooldown + capsaicinz: + - bugfix: curator PDAs will now properly display their screen overlays. + carshalash: + - bugfix: error in crab pathway. Crab can be grilled again. + magatsuchi: + - bugfix: fixed bug where you wouldn't receive msg notifications without opening + your messenger app first +2022-04-26: + Cenrus: + - bugfix: Removed a stray pixel in the energy shield module sprite + Fikou: + - bugfix: gateway lights work + Fikou, sprite modified by Zhost: + - qol: the sniper rifle has a new zoom system, activated by right-clicking + Ghilker: + - balance: diminished the number of anomalies spawned after the SM delamination + LemonInTheDark: + - rscdel: Removed the concept of ballast from thermomachines, you no longer need + some gas to heat in order to cool things. + MacBlaze1: + - bugfix: fixed ethereal feeding breaking APC charging + RandomGamer123: + - bugfix: Fixed spawn ruins admin debug verb's ruin ordering being not separated + by type + - bugfix: Removes a way to easily detect the presence of PDA uplinks + - bugfix: Grinders no longer consume 10x more energy than they are supposed to + Son-of-Space: + - bugfix: fixed wonky safe placement on Kilostation bridge + - bugfix: Moved firelocks in KiloStation dorms to not overlap posters. + - bugfix: Fixed the kilostation whiteship so that it fully spawns + - bugfix: Adds an APC and area to the lowest level of the mining station on IceBoxstation + TheBonded: + - bugfix: Fixed a very rare chance for the pressure on lavaland and icebox to be + just low enough for wings to not work. Ra'Sep rejoice! + lnGoror: + - bugfix: fixed a krokodil zombie transformation + vincentiusvin: + - bugfix: trying to store a plasma cutter while holding plasma should no longer + blow you up. +2022-04-27: + ArcaneMusic: + - rscadd: The accounting console has been added to the HOP's office, allowing them + to track purchases, and bank balances of the crew on station. It's not illegal, + it's the competitive advantage! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Arkatos: - qol: Civilian Bounty Console will now always bring up its UI when you insert the ID. @@ -755,6 +1810,7 @@ BebeYoshi: - rscadd: Adds more health HUDs, nitrile gloves and medical belts to locker in Tramstation medbay +<<<<<<< HEAD Ducky-Momo: - rscadd: Freezer of racial and otherwise unobtainable ingredients to the back of the kitchen @@ -798,10 +1854,24 @@ - bugfix: fixed a krokodil zombie transformation - bugfix: trying to store a plasma cutter while holding plasma should no longer blow you up. +======= + EthanRockss: + - bugfix: Prop atmos mask now uses the correct worn sprite + - bugfix: Jumpsuit no longer able to burn while wearing nuke op mod suit + GoldenAlpharex: + - bugfix: Ensured that the lower levels of Icebox would also get considered during + the Map Compile option, so we don't get broken maps in production. + JohnFulpWillard: + - bugfix: Obsesseds don't fail the hug objective if they headpat/tail pull instead, + - bugfix: Turning glasses colors on/off with AltClick now properly tells you that + you turned it on or off. + LemonInTheDark: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Getting your eardrums blown out will now properly have a low chance to make you go fully deaf, until you find some earmuffs or get a transplant - refactor: Cached some redundant operations in Life(), speeding it up by ~22%. I know that doesn't mean much to you, but cpu time go brrr ok? +<<<<<<< HEAD - bugfix: Prop atmos mask now uses the correct worn sprite - rscadd: N-Spects to the Security techfab (with Basic Security Equipment) - bugfix: RnD servers will no longer permanently stop working when depowered. @@ -846,6 +1916,40 @@ - bugfix: Augmented limbs can once again have more styles than just the default cyborg one. SkyratBot: +======= + OperativeLyn: + - bugfix: The lit up rocks in the crashed ship space ruin are now dark like the + others. + Pandarsenic: + - qol: Added vent/scrubber pair to the Icebox security entryway and the warden's + backdoor to the armory. + - bugfix: Icebox Brig Medical now has a wire connecting it to the powernet. + RandomGamer123: + - bugfix: Prevent bullets (most notably those fired aimed at the mouth when intended + for executions) from sometimes missing if you're firing at a target diagonally + adjacent to you and there's an obstacle (eg. person) between you two. + SingingSpock: + - rscadd: N-Spects to the Security techfab (with Basic Security Equipment) + Son-of-Space: + - bugfix: The 3rd Level of IceBox is now counted as being a part of the station. + - rscadd: NT Investors have built a new perma brig on IceBoxStation for the purpose + of press releases. + SuperNovaa41: + - bugfix: RnD servers will no longer permanently stop working when depowered. + Y0SH1M4S73R: + - bugfix: Stabilized extracts now work when placed inside modsuits + magatsuchi: + - bugfix: papers are now scannable again after an oversight, and techweb now appears + on all head pdas + - rscdel: removes round start tablets + - bugfix: Nanotrasen has declared a recall on all item stacks, due to the fact the + fact they kept merging in hands and pockets. All stacks will now instead only + merge in your storage containers, or on the floor. + timothymtorres, TheBonded: + - bugfix: Fixes prescription glasses not clearing blurry vison +2022-04-28: + ArcaneMusic: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The values of nearly every item purchasable by players has been rebalanced. - balance: Players will now start with less starting money, but will receive a paycheck once every 5 minutes. @@ -857,6 +1961,7 @@ item printed if it's from a lathe not under your department. - qol: The payment component has received additional handling for physical credits, as well as pulled credits/ID cards for those without hands. +<<<<<<< HEAD - bugfix: Cleaned up some pipes lying around in the Lavaland Syndicate base supermatter. - qol: On the mapping end, all of the Supply Departments (and Lavaland) have had their doors reprogrammed to use a mapping helper system, rather than manually @@ -890,3 +1995,70 @@ - bugfix: Fixed the moth costumers for the restaurant venue not showing up. - bugfix: Fixed bar venue customer bots. - qol: Location names in Crew Monitor console now stretch if too long again +======= + Cenrus: + - bugfix: Fixed lionhunter ammo sidepath + Ghilker: + - balance: removed halon from normal gas reactions, added halon to the electrolyzer + reactions by consuming co2 and n2o at low temperature and low pressure + JohnFulpWillard: + - bugfix: A double light fixture in the law office has been fixed. Enjoy your lights. + magatsuchi: + - bugfix: notepad app no longer causes a barrage of action cooldown messages + - code_imp: adds docs for christmas tree spawner and christmas cracker + san7890: + - qol: On the mapping end, all of the Supply Departments (and Lavaland) have had + their doors reprogrammed to use a mapping helper system, rather than manually + editing the access variables on the door itself. + sergeirocks100: + - imageadd: Cannabis plants have recieved some new sprites. + thgvr: + - bugfix: Cleaned up some pipes lying around in the Lavaland Syndicate base supermatter. + vincentiusvin: + - bugfix: fixed unpowered tram ordnance apc +2022-04-29: + ErdinyoBarboza: + - bugfix: Adds proper cycling to DeltaStation RnD Circuit-Toxin area. + - bugfix: Removes a duplicate APC from DeltaStation brig. + Ghommie: + - bugfix: Fixed the moth costumers for the restaurant venue not showing up. + - bugfix: Fixed bar venue customer bots. + GoldenAlpharex: + - bugfix: The mining augments are now visible once again. + JohnFulpWillard: + - bugfix: Jobs who spawn with tablets not on the belt, have their name and job properly + displayed on the tablet, like everyone else. + OperativeLyn: + - bugfix: Moved an intercom in Metastation's captain's office to prevent overlapping + visible to ghosts. + PositiveEntropy: + - imageadd: Resprites most crates and the trash cart! + YakumoChen: + - rscdel: Tramstation's Medbay has had some budget cuts on their fire alarms. + tralezab: + - bugfix: Nullwave Vibrato now works as intended, stacking antimagic duration + - balance: Nullwave Vibrato stacks 10 seconds of antimagic, every few moments you + listen to it. +2022-04-30: + BlueMemesauce: + - qol: Location names in Crew Monitor console now stretch if too long again + Dragonfruits, with some tweaks by PositiveEntropy: + - imageadd: The cargonian wardrobe has now been updated into a tasteful brown! + Fikou: + - bugfix: fixes overslots being permanently lost if you switched modsuit skin + - bugfix: fixes golems/monkeys keeping modsuits on if switched race from different + species + OperativeLyn: + - bugfix: Removed some useless catwalk tiles, cables and pipes in TramStation maintenance. + castawaynont: + - bugfix: DeltaStation cargo warehouse poster has been moved one tile down + san7890: + - bugfix: Nanotrasen's Department of "Reality Fixing" has corrected an issue regarding + the space on the tiles of the southern solars on TramStation. + - bugfix: Nanotrasen will no longer install "Mining" Access Doors in DeltaStation's + Cargo Bay. + timothymtorres: + - qol: Rearrange Delta library gaming room to host D&D parties + xyc: + - bugfix: tram medbay maint won't sometimes get double stacked cables and piping +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml index 77817940d2c..89d12ae4b7a 100644 --- a/html/changelogs/archive/2022-05.yml +++ b/html/changelogs/archive/2022-05.yml @@ -1,4 +1,5 @@ 2022-05-01: +<<<<<<< HEAD Deek-Za: - bugfix: Meta Orderly's door control button is working once again. - bugfix: Repairs the photocopier. Copy away! @@ -37,11 +38,43 @@ - bugfix: Jobs who spawn with tablets not on the belt, have their name and job properly displayed on the tablet, like everyone else. - bugfix: Fix ghosts not being able to read in the dark +======= + Crushtoe: + - bugfix: Fixes Icebox Security's entrance airlock cyclers and the Interrogation + shutters. + - bugfix: Fixes Icebox Engineering's lower floor EVA airlock cycler. + EthanRocks: + - bugfix: rare case of being able to spawn off station when returning from shadow + realm + GoldenAlpharex: + - bugfix: Fixed hair not blocking emissives, which ended up creating some rather + silly visual glitches at times, in darker areas. + Pepsilawn: + - bugfix: Security hailers no longer inform you that you used a cryptographic sequencer + to emag them when you did not + RandomGamer123: + - bugfix: The disposals bin in front of the cafeteria on KiloStation now is actually + properly connected to the disposals network. + SnoopCooper: + - rscadd: Breathing helium now makes your speech small + carshalash: + - bugfix: corrects pathway in sausage and eggs. Now cooked with fried eggs as intended. + magatsuchi: + - rscadd: Back by popular demand, the Syndicate has re-included their state-of-the-art + Chameleon Gun into their chameleon kits, capable of disguising itself as any + gun known to man-kind! Lethal rounds not included. + the-orange-cow: + - spellcheck: Fixed a few insignificant typos. + timothymtorres: + - bugfix: Fix ghosts not being able to read in the dark + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed adding glass floors to plating - balance: Allows you to replace plating with glass floors instead. 3 second timer. - rscdel: Removed deconstructing the glass floors. No replacement for this one, use a rcd. - bugfix: Fixed metastation glassfloor spawning a weird turf when crowbarred. +<<<<<<< HEAD Spc-Dragonfruits: - imageadd: Resprited (almost) all of Skyrat's modular cargo clothes! - imageadd: Quartermaster and Cargo skirtlenecks! @@ -92,17 +125,57 @@ Nerev4r: - rscdel: Removes snail speech modifier. Try using a lot of ellipses instead! - rscdel: Lowers the amount of water that snails leave behind. +======= + - bugfix: Fixed plasma sheets and it's derivatives exploding you for being shot + at. +2022-05-02: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - balance: Armored bounty hunters are no longer being issued flamethrowers. Instead, they are now issued dual-tube shotguns filled with rubbershot and trailless incendiary slugs, as well as a 9mm Makarov loaded with fire bullets. +<<<<<<< HEAD SkyratBot: - qol: Adds radio messages to the delaminating HFR to let atmosians know what's wrong with it. Unless the HFR has been emped +======= +2022-05-03: + ArcaneMusic: + - bugfix: Drones are exempt from the lathe tax, off and on station. + Arkatos and wiki contributors: + - qol: Mining voucher redeem selection now uses a radial menu and provides additional + information about the voucher sets. Literally years in the making, enjoy! + Ghilker: + - qol: Adds radio messages to the delaminating HFR to let atmosians know what's + wrong with it. Unless the HFR has been emped + JohnFulpWillard: + - bugfix: pAIs can now use Newscaster UIs, and all Silicon can now use Newscasters + in general (except the Bounty board, as they have no money to payout). + - bugfix: Drones can no longer give themselves access to machines/wires through + consoles. + - bugfix: Cayenne can no longer use the nuke from anywhere. + SmArtKar: + - bugfix: Cryo cell overlay should properly display above mobs now + Son-of-Space: + - bugfix: Fixed several inconsistent or niche access requirements on MetaStation + - qol: Replaced all access requirement vars on doors with mapping helpers on MetaStation + Striders13: + - bugfix: H.E.C.K. suit now once again prevents your clothes from burning and your + hair from sticking out. + SuperNovaa41: + - bugfix: Fixes an issue with service borg apparatuses getting multiple beakers + in it's contents. + - bugfix: Fixed being able to ride dead space carp. + TiviPlus: + - code_imp: changed some backend code for rendering, please report any layering + issues on the github + Y0SH1M4S73R: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Wizard casting clothes now use a bitflag instead of a typecache. This allows for nonstandard headwear and suits to be varedited into casting clothes. - balance: The enchanted modsuit's chestplate and helmet must now be deployed in order to cast robed spells. +<<<<<<< HEAD - bugfix: Fixed being able to ride dead space carp. - bugfix: Fixes an issue with service borg apparatuses getting multiple beakers in it's contents. @@ -456,6 +529,16 @@ - balance: Decreased the amount of credits an approved manifest grants. (was +80, it's now +70) - code_imp: Improve nearsighted code to be more robust +======= + capsaicinz: + - rscadd: adds the "how to charge your PDA" poster + castawaynont: + - bugfix: Fixed the cabling and piping in the mining lobby on Kilo. The mining shuttle + should now charge correctly. + thgvr: + - bugfix: Shuffled around some pipes in KiloStation garden so they are no longer + under tables/grass. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres, san7890, axietheaxolotl: - rscadd: Adds haunted tarot deck that allows the user the ability to see and communicate with the dead. Can be found in maint loot as a rare item. @@ -485,6 +568,7 @@ - imageadd: Add some new blank/scribble card icons. - imageadd: Add new clown and mime joker cards to standard decks curtesy of axietheaxolotl (Viro on discord) +<<<<<<< HEAD 2022-05-10: Cenrus: - bugfix: Syndicate command would like to apologize for the hole in the floor in @@ -501,10 +585,315 @@ SkyratBot: - rscadd: Adds Dungeon Master, The Painter and Their Canvas, and Nutimov lawsets. They aren't obtainable at the moment. +======= +2022-05-04: + ArcaneDefence: + - rscadd: Hey did you know you can charge your tablet by microwaving it? + Ghilker: + - bugfix: fix oversight with prop gasmasks having some of the features of normal + ones but without fov + JohnFulpWillard: + - bugfix: MODsuit plasma stabilizers no longer protect plasmamen from self-combustion + if they aren't wearing an envirosuit or gloves. + - bugfix: Icebox no longer spawns Prisoners outside of Permabrig. + - bugfix: A lone disposal pipe segment under a table in the bar on Metastation has + been removed. + castawaynont: + - bugfix: removes windows in Kilo's monkey pen in genetics, allowing access to the + wallmounts in there. + zxaber: + - rscadd: 'Mechs now have a weapons safety, which can be toggled with the Middle + Mouse button. Don''t worry, it defaults to off. expansion: All mechs now use + the mouse reticle, and the reticle is disabled when weapons safety is turned + on.' + - bugfix: AIs can use mech equipment again. With weapons safety off, equipment is + used. With weapons safety on, AI clicks are used. +2022-05-05: + LemonInTheDark: + - balance: The janiborg's drying spray bottle will now always clean a wet turf that's + been washed once + Mothblocks: + - server: Admin ranks can now be combined with a plus sign (for example, Game Master+Coder). + Single admin ranks with a plus sign in their name are no longer supported. + - server: You can no longer edit rank permissions, temporarily or permanently, from + the permissions panel. Please use the admin_ranks database table or admin_ranks.txt + instead. + Pickle-Coding: + - balance: The further you are from a radiation pulse, and the more objects that + block it, the lower your odds are to get irradiated. + - balance: Most radiating emitting things have their radiation pulses functionality + changed. Being near them is more dangerous, and being far away is less dangerous. + Ryll/Shaps: + - spellcheck: Wound and combat messages will no longer mention the species of an + attacked bodypart when not appropriate +2022-05-06: + Ghilker: + - balance: Pacmans no longer require stock parts (no more upgrade memery) + - balance: Base pacman power generation changed from 10-40 kW (t1) and 40-160 kW + (t4) to 2.5-10 kW + - balance: Base pacman max held sheets is 10 + - balance: Base pacman sheet consumption speed has been quintupled + - balance: Super pacman no longer exists, the circuit board now switches between + a low production - low consumption mode to high production - high consumption + mode and viceversa + - balance: This new mode has a max held sheet of 5, power generation changed from + 30-120kW (t1) and 120-480kW (t4) to 15-60 kW and consumes sheets ~3 times faster + than the base pacman + GoldenAlpharex: + - bugfix: Fixed the female-fitted version of uniform clothes, so that they are fitted + for female body types once again. + JohnFulpWillard: + - bugfix: Icebox's Altar of the Gods was removed, letting Chaplains once again replace + their own with a bible if it breaks. + Melbert: + - refactor: Drunkenness is now a status effect. The drunk alert should no longer + persist on aheals and in some rare cases, and should overrall act a bit more + consistently. + - refactor: Dizziness is now a status effect, similar to above. You no longer should + be stuck with an off center client view if you get very dizzy. + - refactor: The "ballmer" voicelines said by scientists are a liver trait now, instead + of hard checking job types. + - refactor: Refactored status effect examine text. Should overall have slightly + better grammar and more consistent span uses. + - bugfix: Stabilized dark purple extracts no longer runtime like crazy when not + holding an item. + - bugfix: Drunken Resilience should update health more accurately when it's occurring. + Rhials: + - bugfix: engineers can now properly access the space loop on Tramstation. + SmArtKar: + - code_imp: Changed some fire-related procs to be snake_case + - refactor: Refactored firestacks into status effects + - bugfix: Monkeys no longer have human fire overlay when on fire and instead use + the one they're supposed to use. + castawaynont: + - bugfix: Delta's virology lobby now has a camera, as intended + - bugfix: Delta's virology lobby now allows MDs in. + - bugfix: removed a section of cabling/piping from tram's medbay maint, preventing + cable/pipe double ups. + san7890: + - qol: IceBoxStation is now contained in one map file, instead of three. This is + good for mapping. If things on IceBox break, please make an issue report. +2022-05-07: + ArcaneMusic: + - bugfix: Id cards, when having their job template changed, will change that job's + payment department as they used to. + EOBGames: + - rscadd: A number of new tiles are available for construction. Check out the small, + diagonal and herringbone variants of your favourite grey, dark and white tiles. + Also, check out the new terracotta and kitchen tiles- they're fancy! + Fikou: + - rscadd: Random Job button in Latejoin panel. + - bugfix: drones should be able to do stuff next to other drones + Ghilker: + - qol: Made the tank compressor input pipe green color to be in line with the current + atmos machines color scheme, increased by 100 kPa the window for tank ejection + to allow more flexibility when filling up the tank + - code_imp: cleaned up some of the code for disconnecting pipes and removed repeated + code + JohnFulpWillard: + - bugfix: The HoP is now considered part of Supply (Supply bans apply to HoP, they + get Supply deathrattle, cannot get smuggle objective, ect). + - bugfix: Admin Nation-creating event can now properly trigger and work. + - bugfix: Plants like Deathnettle will no longer use durability when clicking on + someone from a distance. + Melbert: + - bugfix: Managing to escape the area of a blade heretic's mark will no longer constantly + burden you as if you never left. + - bugfix: There should be less ways of escaping the area of a blade heretic's mark + now. + - qol: Heretics can drag people marked by a blade heretic out of the area they are + trapped within. + - qol: Being thrown back by a blade heretic's mark will be slightly less awkward + now, and less dangerous. + - bugfix: Medical coagulants work as they are expected to now, but the difference + shouldn't be very noticeable, since their primarily function worked anyways + PestoVerde322: + - imageadd: Added new icons for the DNA injectors + - imageadd: Added new icons for the DNA implanters and their cases + - bugfix: The bluespace icon syringe is now more animated + Rhials: + - bugfix: Moves a telescreen in Deltastation's library area + SmArtKar: + - bugfix: Luminescents once again have proper bodyparts + Son-of-Space: + - bugfix: Atmos techs now have general engineering access + Striders13: + - bugfix: demonic watchers will now drop their crusher trophy properly + Wallem: + - imageadd: The book binder has gotten a fresh coat of paint. + Zestybastard, Azlan and PositiveEntropy: + - imageadd: Resprites the old space suits! + - imageadd: Resprites the sleepers! + - rscdel: Removes unused orange and black engi light attachment helmet sprites. + dragomagol: + - bugfix: atmos techs can once again re-enter the engineering lobby and lathe room + - qol: mech construction now has balloon alerts! + - code_imp: mecha_construction_paths.dm is now has significantly less copy/paste + code + itseasytosee: + - balance: You can now pull bulky things in zero gravity at full speed + - bugfix: The slowdown from neck grabs is now properly negated in zero gravity. + jlsnow301: + - bugfix: You no longer have to enter text to succumb. A blank value works. + lnGoror: + - bugfix: Fixes Life(Friendly) reaction spawning hostile mobs + vincentiusvin: + - rscadd: Remapped meta's ordnance. + - bugfix: fixed NT frontier being downloadble by non scientists. + - code_imp: changed how the gas pressure calculation work very slightly, report + if things are bugged. +2022-05-08: + Gandalf2k15 for porting, DarthSidiousPalpatine for their original contribution on TauCeti: + - imageadd: Mob fire sprites have been updated! + - refactor: The way mobs update fire has been refactored. If you spot any anomalies, + please report them. + Ghilker: + - balance: lowered overall max tesla coil power conversion at all parts tiers (at + t4 it went from 85% to 50%) + - bugfix: connect tramstation arrivals to the distro/waste + Hiderin0: + - rscdel: Just deleted an errant disposals pipe at X:97, Y:112 under the glass + JohnFulpWillard: + - bugfix: Modular computers work again, allowing you to put your ID in to download/use + programs. + LemonInTheDark: + - code_imp: Some things that were hyper undeletable are now just normal undeletable. + Please report any unexpected behavior, mostly in away missions, or on lavaland. + - balance: Firelocks now take 3 seconds to auto-close after opening, rather then + 5 + - bugfix: Firelocks on top of normal doors will now no longer fail to re-close for + seemingly random reasons + - qol: Space Parallax will now smoothly animate between steps, based off your movement + speed. Please report any jitter. + - bugfix: Parallax will no longer "freeze" when you cross some area boundaries. + Looks better now. + - bugfix: Dragging objects diagonally will no longer cause them to visually "jump" + to catch up to you. Seriously how did none report this, are we just collectively + blind? + MacBlaze1: + - qol: the gas analyzer now shows the heat capacity and thermal energy of a mix + - qol: the gas analyzer now shows the volume of empty pipe networks + Melbert: + - qol: Heretic ghoul recipes are more descriptive when failing + - bugfix: Fixes a missing span on heretic ghoul deconversion + MrNihil: + - bugfix: You can now recycle unused mutators and activators in dna console. + - bugfix: 'Genetic scanner now shows all mutations. expansion: Genetic scanner will + highlight active mutations.' + OperativeLyn: + - bugfix: Removed a duplicated airlock in IceBox lower maints. + SmArtKar: + - bugfix: Removes second intercom in captain's office on Delta + TemporalOroboros: + - balance: The resulting changes to smoke and foam have effected their balance. + In which direction is currently unclear. + - code_imp: Minor code improvements to smoke, foam, and... _wizard spells?_. + ZephyrTFA: + - rscadd: Heterochromia Quirk, try it out! + - refactor: Eyes now support having two different colors for each eye; become your + own disco! + Zytolg: + - bugfix: Kilostation's command section now accurately reflects that command staff + are, in fact, commanding a hollowed out asteroid. + cacogen: + - qol: Deadchat control on anarchy mode will now alert you when you can enter another + command + castawaynont: + - bugfix: fixed the position of one of kilo's firealarms. + - bugfix: Delta's virology's showers no longer float. + san7890: + - imageadd: On the mapping end, we've removed some duplicate names for different + icons. +2022-05-09: + B4CKU: + - bugfix: fixed export prices of computer parts being overwritten by a "miscellaneous + computer part" + - bugfix: fixed missing export datums for various computer parts + - code_imp: improved code of computer part exports + Comxy: + - bugfix: When holding plasma glass, the sprite of normal glass was shown in hand + since plasma glass in hand didn't exist. + - rscadd: Added titanium and plastitanium glass shards as well as spears and shivs + for their types, including plasma glass shivs. + - imageadd: Sprites for plasma, titanium and plastitanium glass shards when hold + in hand. + - qol: titanium and plastitanium glass having their own shards makes sense, and + is a quality feature. + Fikou: + - balance: some items may protect more or less against diseases now + Fikou, sounds by Floyd: + - rscadd: Maintenance now contains an ancient altar. + Ghilker: + - balance: Change how opening a hole in the chamber will affect the SM, increasing + the dangers it will have by having more damage dealt, increase the power of + the SM by 250 and stopping the SM healing from low moles/cold. + - balance: Increased the heat released by lowering the THERMAL_RELEASE_MODIFIER + from 5 to 4 + - balance: Increased the plasma released by lowering the PLASMA_RELEASE_MODIFIER + from 750 to 650 + - balance: Lowered the oxygen released by increasing the OXYGEN_RELEASE_MODIFIER from + 325 to 340 + - balance: Increased the REACTION_POWER_MODIFIER from 0.55 to 0.65 increasing the + power generated + - balance: improved freon production with a ratio of 6 moles of plasma, 1 mole of + bz and 3 moles of co2. At 800 K there is a minor peak of production to have + a fast way to generate freon, but at over 5000 K the rate starts to increase + up to three times the rate at 800 K. + - balance: Lower the amount of anomalies spawned from the SM delamination + - balance: Lower the probability of getting a flux anomaly from the SM delamination + - balance: Flux anomalies spawned by the SM in this way will have the explosion + size reduced by 4 + - qol: supermatter zaps now change color based on the power generated, starting + from red and going toward blue the higher the power emitted + - rscadd: adds the supermatter cascade round-ender, it can be triggered when the + SM chamber is filled with hypernoblium and antinoblium at over 40% each, when + the total moles are high enough to trigger a singulo and only when the SM integrity + is over 80% (if the gases don't reach the requirement during the delamination + for a moment, the whole thing will stop and need to restart) + Melbert: + - refactor: Refactored the voting subsystem. Votes are now each their own datums. + - refactor: The voting UI now uses Typescript. + - refactor: Refactored the wizard spell Charge + MidoriWroth: + - rscadd: Adds 7 new foods! The power of chefs continues to grow. + - rscadd: Updated pierogi and stuffed cabbage sprites. + RandomGamer123: + - bugfix: Briefcase launchpads now work again. + - bugfix: Briefcase launchpads now don't drain power from the station. + RandomGamer123, some ideas from the-orange-cow & cacogen: + - balance: The explosive mutation for kudzu is now classified as a severe instead + of just above average mutation + - balance: Venus human trap vine throw cooldown increased to 4 seconds + - balance: Kudzu's maximum mutation severity in general has been increased + - balance: Event-spawned kudzu's maximum mutation severity has been further increased + - balance: Kudzu now mutates twice as often in general + - balance: Event-spawned kudzu now has its minimum spread rate tripled + - balance: 'Newly spawned kudzu in general has its starting spread rate buffed expansion: + New temperature stabilisation mutation for kudzu as a semi-alternative to cold + proof and being a beneficial kudzu mutation in general, effectively functions + as a space heater with the target temperature being 20C' + Sneeker134: + - rscadd: New clever mutation, allowing some mobs such as monkeys to use consoles. + Son-of-Space: + - qol: removes redundant access requirements from some airlocks + - bugfix: Fixed some door accesses being overridden on MetaStation + TemporalOroboros: + - bugfix: Spamming the start compression test button will not make the anomaly refinery + eject a live TTV. + - rscadd: That's what the emag is for. + TiviPlus: + - refactor: changed how whether a mech equipment is attachable is determined, please + report if any previously attachable equipments are bugged + Unit2E: + - spellcheck: Clarifies the explanation of the new turbine some, and fixes some + grammar for the parts too. + Watermelon914: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a new 'Destroy Machinery' traitor objective that focuses on destroying various important pieces of machinery around the station. - rscadd: Traitor steal objectives can now have their timer skipped as soon as the bug is placed onto the target item. However, doing so will give reduced rewards. +<<<<<<< HEAD - balance: Low risk steal objectives reward slightly less TC - imageadd: On the mapping end, the "Tram" Area Icon Sprites have been re-standardized. - imageadd: Regenerative core and wounded status effects now have different icons @@ -514,6 +903,30 @@ create hot ice if it's not in a turf. - bugfix: Fixed several inconsistent or niche access requirements on IceBoxStation - qol: Replaced all access requirement vars on doors with mapping helpers on IceBoxStation +======= + - rscdel: Removes the smuggling traitor objective + - balance: Low risk steal objectives reward slightly less TC + Zonespace27: + - balance: Off-station lathes no longer you pay a tax. + castawaynont: + - bugfix: reshuffled some wallmounts in Delta's brig. + iprice: + - bugfix: PDA/Tablets are now made from a realistic amount of iron. + jlsnow301: + - bugfix: Changes the succumb screen to work for both tgui and standard inputs. + san7890: + - rscadd: On the mapping end, mappers are now able to add a wide range of funky + new colors to maps. Keep an eye out, for they might just be coming to a station + near you sometime soon. + timothymtorres: + - balance: Printing surgery tools from the autolathe now requires silver + timothymtorres, TheBonded: + - code_imp: Improve nearsighted code to be more robust + - balance: Decreased the amount of credits an approved manifest grants. (was +80, + it's now +70) +2022-05-10: + LemonInTheDark: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: When ventcrawling, rather then jumping between pipes, your view will "glide" - qol: When ventcrawling, holding two directions no longer locks you in place. Instead behaving as expected @@ -521,11 +934,30 @@ this looks slightly better then the fullbright of current. - code_imp: Ventcrawling code has had a 99% performance increase. I am not joking. Won't lag the server anymore. +<<<<<<< HEAD - bugfix: The tank compressor on Deltastation is now correctly oriented +======= + Melbert: + - refactor: Refactored the Durathread golem's strangle status effect + Pickle-Coding: + - bugfix: Fixes freon fires being too efficient in oxygen deficient environments. + - bugfix: Fixes freon fires hotspots not working properly. + - rscadd: Freon can now react in any gasmixture, instead of just turfs, but can't + create hot ice if it's not in a turf. + RandomGamer123: + - bugfix: The tank compressor on Deltastation is now correctly oriented + Rhials: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The mindshock gland mind control has been changed from a single, six-minute command to two, two-minute long commands. Also, those who are mindshielded will resist the brainwashing effects and the brain-melting waves the gland passively emits. +<<<<<<< HEAD +======= + Ryll/Shaps: + - bugfix: Directional windows, firelocks, and other border objects will now properly + block incoming ballistic fire +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SmArtKar, Rukofamicom: - balance: Hierophant crusher trophy now creates a hierophant chaser instead of a wall @@ -535,6 +967,7 @@ (Shotgun), "Lament" (Alternating cardinal and diagonal shots) and "Perish" (Final attack) - code_imp: Improved colossus' variable names and added spaces where required +<<<<<<< HEAD WatlerJe, PositiveEntropy: - imageadd: Resprites the Polaroid Camera and the Film Cartridge! YakumoChen: @@ -559,6 +992,28 @@ - bugfix: piles of stone bricks can now actually be used to make stone walls SkyratBot: - bugfix: Fixed misplaced sofa parts in the Icemoon abandoned village. +======= + Son-of-Space: + - bugfix: Fixed several inconsistent or niche access requirements on IceBoxStation + - qol: Replaced all access requirement vars on doors with mapping helpers on IceBoxStation + WatlerJe, PositiveEntropy: + - imageadd: Resprites the Polaroid Camera and the Film Cartridge! + san7890: + - imageadd: On the mapping end, the "Tram" Area Icon Sprites have been re-standardized. + tralezab: + - rscadd: Adds Dungeon Master, The Painter and Their Canvas, and Nutimov lawsets. + They aren't obtainable at the moment. + vincentiusvin: + - bugfix: added the missing raw anomaly core to icebox ordnance + - bugfix: fix kilostation and tramstation chambers controllers not accesible from + the inside. +2022-05-11: + BebeYoshi: + - bugfix: The Hair Stylist Association has noticed the sudden changes to the Mohawk, + Short Hair 5, Short Hair 6 and Pig Tails 2 hairstyle and brought them back to + their previous glory. + Ghilker: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: improved the speed of cascade wall spreading, made a better description for them - qol: 'I didn''t update the changelog in the initial PR so i''ll add this here: @@ -567,6 +1022,7 @@ to the SM will instantly cause it to start delaminating and sets the SM for a cascade. Once it delaminates it ensures the start of the cascade. NOTE that if the SM recovers you won''t be able to do it again.' +<<<<<<< HEAD - spellcheck: Recent re-evaluations of the underlying math have concluded that a supermatter cascade will not, in fact, destroy the entire universe - only an area several hundred kilometers in radius. @@ -584,6 +1040,33 @@ - qol: pipes and atmos components have better visual clarity and consistency between them - bugfix: You can no longer farm orbiting blades by using your mark on corpses +======= + - bugfix: Fix being unable to refine the delimber anomaly raw core in the refinery + - code_imp: cleaned and brought up to date the powerfist code + - qol: added some more examine text on the powerfist + - bugfix: thermomachine no longer is under every pipe but is now above them + - qol: pipes and atmos components have better visual clarity and consistency between + them + Iamgoofball: + - qol: The supermatter cascade now takes one minute to end the round instead of + 5 minutes to end the round, to put it on par with Blob and such. + OperativeLyn: + - bugfix: Fixed misplaced sofa parts in the Icemoon abandoned village. + SmArtKar: + - bugfix: Charged green crossbreeds no longer display species types instead of actual + names + - bugfix: You can no longer farm orbiting blades by using your mark on corpses + Son-of-Space: + - bugfix: Fixed several inconsistent or niche access requirements on KiloStation + - qol: Replaced all access requirement vars on doors with mapping helpers on KiloStation + - bugfix: You can now cook meals on the oldstation ruin again + - bugfix: fixed overlapping objecs on the AI minisat on IceBoxStation + Y0SH1M4S73R: + - spellcheck: Recent re-evaluations of the underlying math have concluded that a + supermatter cascade will not, in fact, destroy the entire universe - only an + area several hundred kilometers in radius. + Zonespace27: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Dead mouse, sunglasses, and briefcase bounties removed from assistants - rscadd: Added more engineering & science bounties - rscadd: Flamethrower, pneumatic cannon, water tank, and improvised shotgun shell @@ -592,16 +1075,31 @@ - balance: Medical organ bounties have their reward reduced to 1k for a single organ, and 2k for bulk. - refactor: Refactored bounty cube selection back-end +<<<<<<< HEAD - bugfix: Ripley mechs can no longer toggle to their nonexistant air tank. - spellcheck: fixed the omega soap recipe not having bold on it's first line. - bugfix: Fix mapped in cardhands not initializing properly - bugfix: Cyborg drink glasses will nolonger automagically refill themselves when not actually being held by the cyborg. - bugfix: Fix being unable to refine the delimber anomaly raw core in the refinery +======= + dragomagol: + - qol: department signs have directional variants + - code_imp: sign paths are now in snake_case + dragomagol, unit0016: + - rscadd: Added lore terminals - for when leaving a scrap of paper on the ground + just won't cut it + orthography: + - bugfix: fixes door access. + san7890: + - bugfix: After a mixup in the Marker Beacon Factory with the "Default Glowing Texture" + Factory, Marker Beacons should now have any actual sprite. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'After a recent earthquake, a good chunk of the exterior surrounding the Mining Base on IceBoxStation has undergone a drastic conformational change: the river has expanded. In response to this, more infrastructure in that part of the station has been re-done, and even added in some spots.' +<<<<<<< HEAD - bugfix: You can now cook meals on the oldstation ruin again - bugfix: Mulligan now properly randomizes ethereal color - bugfix: Charged green crossbreeds no longer display species types instead of actual @@ -632,10 +1130,26 @@ - refactor: Added support for AP and Incendiary Magazines to Multi-Sprite Magazines Gandalf2k15: - bugfix: Autotransfer votes now function again +======= + timothymtorres: + - bugfix: Fix mapped in cardhands not initializing properly + timothymtorres, TheBonded: + - bugfix: Fix books to only give mood bonus when read the first time + vincentiusvin: + - spellcheck: fixed the omega soap recipe not having bold on it's first line. + wesoda25: + - bugfix: Mulligan now properly randomizes ethereal color + zxaber: + - bugfix: Ripley mechs can no longer toggle to their nonexistant air tank. +2022-05-12: + GoblinBackwards: + - balance: Fireball no longer has a 3 tile wide hitbox. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Refactored how legs are rendered, using dynamically-generated masks to avoid left legs always displaying over right ones, or right legs above left ones. +<<<<<<< HEAD Melbert: - bugfix: The first stage of addiction now actually occurs. - code_imp: 'The confusion status effect is now based on duration (seconds) instead @@ -744,6 +1258,63 @@ - bugfix: Realigns the DeltaStation holodeck to fit universal templates - bugfix: It is no longer possible to access cargo through maintenance without appropriate access on MetaStation +======= + JohnFulpWillard: + - rscdel: 'The following job cartridges have been deleted: Detective, Lawyer, Janitor, + Curator, Roboticist and Scientist (without sensor pack).' + - balance: The following tablet apps has had their storage space cost lowered Robocontrol + 12 -> 6, Power monitor 9 -> 8, Budget ordering 20 -> 10, Power alarms 5 -> 4, + Science hub 16 -> 10. + - balance: You no longer need an MC Scanner part to use the tablet's remote signalling + device application. + - balance: Cartridges no longer let you run applications off of them, but you can + still download applications off of them. Additionally, applications that were + once on a roundstart cartridge (or were a program you had pre-Ntos PDAs) has + been moved to be downloaded onto your tablet roundstart. + - qol: The Eject Disk button on the tablet's UI has been moved to the very top to + not clutter your UI as much. + Melbert: + - bugfix: High blood pressure effect is now applied correctly by opioid addiction + - spellcheck: opioid is now also spelled correctly + - refactor: Jitterriness is now a status effect + - bugfix: The first stage of addiction now actually occurs. + RandomGamer123: + - spellcheck: Removes some erroneous "the" in some clown car messages + Son-of-Space: + - bugfix: varedited access reqs were removed from the service hallway on IceBox + so mapping helpers can function correctly + - bugfix: maintenance access returned to the library door on IceBox station + san7890: + - bugfix: Nanotrasen will no longer install two separate APCs in the prison wing + of IceBoxStation. +2022-05-13: + Ebb-Real: + - imageadd: Turned vapes into GAGS making them recolorable from vendors. + - imagedel: Removed the massive ammount of old icons for vapes. + Ghilker: + - bugfix: 'fix delimber anomaly from round removing you and other griefs remove: + delimber anomaly doesn''t change your organs anymore' + Guillaume Prata: + - qol: Removed Sutures/Ointment from the list of items you can hold in the exoslot + of your medical wintercoat as there is basically no reason for someone to carry + them on that slot and they kept getting placed there by the inventory shortcuts. + JohnFulpWillard: + - bugfix: Cult's antag UI now works from the start, rather than having to close + and reopen the tab to see your objectives. + - bugfix: Constable helmets no longer cause your hair to mysteriously disappear + when wearing one. + - bugfix: Jobs that are in several departments (like HoP, who is charged for Supply + but not Service) won't get charged lathe tax for any departments they are in. + MacBlaze1: + - bugfix: fixed dizziness causing hard crashes + Son-of-Space: + - bugfix: Realigns the DeltaStation holodeck to fit universal templates + - bugfix: It is no longer possible to access cargo through maintenance without appropriate + access on MetaStation + dragomagol: + - bugfix: non-cultists can now enter the pride ruin + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: On IceBoxStation, Ice Moon Ruins will no longer vent out all their atmospherics out the top of the map, since they magically now have ceilings. - rscadd: 'However, this dark magick to give Ice Moon Ruins ceilings come at a cost: @@ -751,6 +1322,7 @@ infrastructure. Nanotrasen has ensured that anything vital shouldn''t be impacted by this, but do expect to see certain "unmaintained" catwalk sections be swept up in an avalanche of sorts.' +<<<<<<< HEAD - bugfix: Cult's antag UI now works from the start, rather than having to close and reopen the tab to see your objectives. - bugfix: KiloStation maintenance airlock in EVA is properly named @@ -792,12 +1364,111 @@ SkyratBot: - spellcheck: Boritos flavours have more flavour! 2022-05-17: +======= + timothymtorres: + - qol: Add randomized lockers, reagent tanks, and atmospherics equipment to Meta + maint. + - bugfix: Fix ordnance lab having exposed windows peeping into maint. These have + been replaced with rwalls. + - bugfix: Fix wizard modsuit not having antimagic protection + wesoda25: + - qol: ethereals can now press the ghost button to cancel crystallization and permanently + vacate their body +2022-05-14: + Crumpaloo - Main Sprites, PestoVerde322 - Soda Cans, Vending Machines and Posters, ErdinyoBarboza - PR and Small Fixes: + - imageadd: All drinks and bottles have been resprited + Guillaume Prata: + - bugfix: Surgery tools will now give silver back when recycled. + - bugfix: Whistles are small now. Rejoice not having to carry a whistle that was + the size of a bucket while trying to be the referee for a match. + - balance: Tier 2 tools (Jaws of life/Laser scalpel/Experimental welder) are changed + from Small to Medium sized so now you can't carry 49 Jaws of life in your backpack. + JohnFulpWillard: + - bugfix: The Captain's PDA now works, and their cartridge now spawns in their locker. + - balance: CPU, Sensor and Identify hardwares have all been removed from modular + PCs, this means AtmoZphere can run regardless of hardware, and running programs/updating + your PDA info, is no longer tied to hardware either. + - bugfix: Cook's CQC now properly works in the assigned areas outside the kitchen. + - bugfix: Cooks now properly get their Cook mail instead of just money. + - bugfix: Mapping configs can now once again set job position slots (and fully remove + jobs from maps that don't support them). + - balance: Mini-fridges can now hold slightly more things. + - bugfix: The new cult altar can't be spammed anymore. + Melbert: + - bugfix: Fixes some wonky vote formatting + - balance: Central Command's agency of supernatural structures have made it much + less likely for you to come across ancient altars + SmArtKar: + - bugfix: You can no longer use staff of storms to cheese the hell out of lavaland + bosses + Son-of-Space: + - bugfix: Fixed several inconsistent or niche access requirements on TramStation + - qol: Replaced all access requirement vars on doors with mapping helpers on TramStation + - bugfix: KiloStation maintenance airlock in EVA is properly named + - bugfix: Fixed several inconsistent or niche access requirements on DeltaStation + - qol: Replaced all access requirement vars on doors with mapping helpers on DeltaStation + Sylphet: + - bugfix: removes extra air alarm in bar maint + dragomagol: + - code_imp: pod cloning logging is now in investigate botany + fippe: + - bugfix: Botany and Service firelocks in Icebox moved around to stop fire alarm + spam + magatsuchi: + - bugfix: fixes broken admin ticket links +2022-05-15: + FlamingCheese: + - bugfix: Removed that one firelock in icebox xenobio that caused the fire alarm + to trigger on roundstart + JohnFulpWillard: + - bugfix: There is now only one Tom in Deltastation permabrig. + - bugfix: Icebox's vault now properly has access requirements. + PestoVerde322: + - bugfix: fixed the icon behaviour of the manual valve + PositiveEntropy, Retlaw34, PacifistDalek: + - imageadd: Resprites the fire extinguishers once more! + RandomGamer123: + - bugfix: Biogenerators don't take 1% of a power cell to grind a single melon + SmArtKar: + - balance: Hierophant trophy now deals damage that it was supposed to deal. + Thunder12345: + - admin: Attack logs for stripping people and equipping items to them have been + reformatted to match all other attack logs, improving readability. + VioletN: + - bugfix: Fixed the two primary traitor objectives calculating reputation incorrectly + at round end + - bugfix: Fixed the reputation value of objectives having a misplaced decimal point + in the round end report + YakumoChen: + - spellcheck: Boritos flavours have more flavour! + d0sboots: + - bugfix: suit_storage slot now shows the item it has equipped + san7890: + - bugfix: If you ever chance upon Multi-Z Debug Station, rest assured that it now + uses the right kind of space. +2022-05-16: + JohnFulpWillard: + - bugfix: Trying to fireman carry someone you can't fireman carry now properly makes + you not carry them permanently + MMMiracles: + - bugfix: Fixed a few areas on Tramstation where firelocks could enclose but had + no scrubber/vent. + - bugfix: The AI core cabling on Tramstation no longer loops between the solar panels + and the SMES. + MidoriWroth: + - qol: The Icebox kitchen was slightly expanded, giving it 3 more tiles of space + downstairs. + - bugfix: Finally gave the Icebox kitchen a condimaster. + OperativeLyn: + - bugfix: Removed a windoor inside of a wall in IceBox. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, Azlan, Axietheaxolotl: - imageadd: Resprites all the Engineering Jumpsuits and Jumpskirts! - imageadd: Resprites the firesuit! - imageadd: Resprites all the hard hats! - imageadd: Resprites the insulated gloves and Chief Engineer gloves! - imageadd: Resprites the hazard vest! +<<<<<<< HEAD SkyratBot: - bugfix: fixes broken admin ticket links - balance: CPU, Sensor and Identify hardwares have all been removed from modular @@ -813,24 +1484,63 @@ admin - spellcheck: fixed an outdated quip about buying scipapers in the experiment status 2022-05-18: +======= + SmArtKar: + - bugfix: Lightning bolt spell will give tesla shock immunity when granted by an + admin + Son-of-Space: + - bugfix: miners have general access to the cargo bay + - bugfix: Fixed several inconsistent or niche access requirements on TramStation's + modular pieces + - qol: Replaced all access requirement vars on doors with mapping helpers on TramStation's + modular pieces + castawaynont: + - bugfix: fixes the position of some paintings in the Curator's office on Icebox. + vincentiusvin: + - spellcheck: fixed an outdated quip about buying scipapers in the experiment status + xyc: + - bugfix: fixed the position of a few wallmounts in icebox's chapel. +2022-05-17: + Cheshify: + - balance: Snowdin.dmm is now in line with the design doc +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Dorsidwarf: - rscadd: Replaced table-crafting fried eggs with good old-fashioned frying on the chef's griddle. - bugfix: Changed the double-yolk sprite that only the fried-egg (And not foods using it) had to a single. +<<<<<<< HEAD +======= + DragonTrance: + - refactor: Flora code is much more organized :) + - rscadd: Flora (trees, plants, etc) can be uprooted with a shovel, which can then + be dragged around. + - code_imp: Moved "kirbyplants" into their own .dm file, instead of just finding + a comfortable spot in flora code +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - code_imp: Adds radial support to stack crafting. - qol: Cult buildings are now made via radial, instead of stack window. - qol: Stack craftingnow uses balloon alerts. +<<<<<<< HEAD - bugfix: Fixes mind restoration causing dizziness instead of healing it SkyratBot: - balance: Sending PDA's to all is now configured by the WireCarp app, rather than being tied to Law office access. +======= + RandomGamer123: + - bugfix: Tank compressors' icons now visibly update when being rotated + - bugfix: Tank compressors' rotation after reconstruction actually work properly + - code_imp: '`/obj/machinery/atmospherics/components/proc/connect_nodes()` actually + gets called on every node of the atmospheric component' + Son-of-Space: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Security General access has been simplified - bugfix: Detectives ability to brig crew has been moved to skeleton crew access to fit the job function - bugfix: Detectives now have general access to all general areas of security consistently across all stations +<<<<<<< HEAD - code_imp: pod cloning logging is now in investigate botany - imageadd: Turned vapes into GAGS making them recolorable from vendors. - imagedel: Removed the massive ammount of old icons for vapes. @@ -897,6 +1607,35 @@ tf-4: - bugfix: Tram and Icebox once again have gas miners. 2022-05-20: +======= + SuperNovaa41: + - refactor: Turned the forensics component into a datum. + Tastyfish: + - rscadd: Tramstation now has crossing signals to help you not get hit by the tram + (or jump in front of it at the last minute for comedy value). + san7890: + - code_imp: If you're looking into patching out Active Turfs, the logging message + that alerts you to said Active Turfs is now a bit more verbose to getting you + put on the right track. + timothymtorres: + - qol: Change drunk blur effect to scale based on intoxication +2022-05-18: + JohnFulpWillard: + - balance: Sending PDA's to all is now configured by the WireCarp app, rather than + being tied to Law office access. + MTandi: + - bugfix: Experiments now work on non-station z-levels + Melbert: + - bugfix: Fixes mind restoration causing dizziness instead of healing it + magatsuchi: + - config: adds config to allow for name links in adminwho + oranges: + - bugfix: Slimes will once again feed on monkeys + san7890: + - config: In case you were really keen on using Virtual Reality Hub stuff in your + code, do keep in mind that we've removed references to it in config. +2022-05-19: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, Onule: - balance: Doubles the range of the MOD Pathfinder AI - bugfix: Fixes modules rendering below MODsuits @@ -915,6 +1654,7 @@ size to normal while making it uncompatible with storage modules. - rscadd: Adds the chameleon MOD module from the uplink. It lets you disguise the suit as any back item while it's off. +<<<<<<< HEAD Nerev4r: - imageadd: Adds more horns. Upward, curly, lifted, horns from Sojourn, and a Dragon option from Virgo. @@ -930,12 +1670,68 @@ - admin: Admins using the dsay verb will now have their rank(s) shown in a hoverable tooltip SkyratBot: +======= + Guillaume Prata: + - balance: RCDs can't deconstruct reinforced tiles directly anymore. + Ivniinvi: + - bugfix: Admins can no longer unprotect globals. + JohnFulpWillard: + - rscadd: Charliestation now has a Supermatter and Gravity generator chamber. + - balance: Charliestation now requires the gravity generator to have functional + gravity. Its botany also has a biogenerator and nutriment vendor. + LemonInTheDark: + - bugfix: Artificers can see their action buttons again + Melbert: + - bugfix: Restart Votes work once more + MidoriWroth: + - rscdel: Removed some redundant cables in Kilo maints + ReinaCoder: + - bugfix: The bluespace pen slot has been removed from tablets. Now only tiny items + can fit, spray cans and smoking pipes are now small items meaning they will + no longer fit into pen slots. + SmArtKar, SpadesSlick: + - imageadd: New sprites for xenobio shield wall generators + Sylphet: + - rscadd: Added Spinward Smoothies Space Ruin + - rscadd: Added six types of smoothies + Timberpoes: + - config: Changes the policy.json index for polymorphed mobs from "polymorph" to + "Polymorph". + - config: Changes the policy.json index for the policy verb header from "policy_verb_header" + to "Policy Verb Header". + - bugfix: Due to the config changes, Polymorph policy text will now be shown to + players when it previously wasn't. + Zonespace27: + - bugfix: The bounty console should no longer lock up for certain jobs after making + a new bounty. + dragomagol: + - bugfix: circuit speech is now logged properly + fippefi: + - balance: Buffed PACMAN generators to make the map-spawned gens more usable as + backup sources of power. + - qol: PACMAN now tells you if it will use uranium or plasma when you screwdriver + the board + robbertapir: + - bugfix: Attacking people, atmos omni tanks, supplypods and paintings with deep-fried + items no longer shows an error sprite. + - bugfix: Animations for attacking people, atmos omni tanks, supplypods and paintings + with items are no longer black. + vincentiusvin: + - bugfix: fixed cryoxadone not working in crit, it now checks for general unconsciousness. + So things like oxyloss knock out is included. + - qol: If the state or temperature of your cryo ui is red that means cryoxadone + wont be able to work. + - bugfix: added a missing tank dispenser to kilo toxins. +2022-05-20: + Ghilker: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: supermatter cascade gas needed amount was broken and you'd needed around 200k Moles of antinob+hypernob (40% each at least) instead of "just" 20k Moles. - balance: 'changed how hypernob and antinob interact with the SM: heat capacity made similar (15 anti, -13 hyper), transmit modifier added (-5 anti, 3 hyper)' - rscadd: lights now break or set to emergency when the cascade starts, maintenance is set to emergency access +<<<<<<< HEAD - admin: AI malf/combat purchases are now logged in uplink.log - bugfix: Fixes solid plasma breaking into plasmaglass shards - bugfix: Radstorms now yield to the almighty GODMODE flag. Rejoice. @@ -1028,10 +1824,56 @@ - bugfix: Fixes some airlock cycle links in Blueshift. - bugfix: Fixed Tramstation's Supermatter Engine APC. - rscdel: Took NSS Journey out of its misery. +======= + Mothblocks: + - balance: Midround rolls will now happen more frequently, with their power scaling + up over time. + - bugfix: Fixed midrounds not logging properly. + Rhials: + - bugfix: Radstorms now yield to the almighty GODMODE flag. Rejoice. + - bugfix: Removes some stray wires in Tram med maintenance + Ryll/Shaps: + - admin: Admins using the dsay verb will now have their rank(s) shown in a hoverable + tooltip + SmArtKar: + - bugfix: Fixes solid plasma breaking into plasmaglass shards + SpaceSmithers: + - bugfix: Removes a duplicate table in the Laundry Room of IceboxStation + dragomagol: + - admin: AI malf/combat purchases are now logged in uplink.log + nickup9: + - qol: Department heads are now able to check their department budgets when examining + their ID. NT IRN has also been updated for clarity. +2022-05-21: + Fikou: + - bugfix: proximity monitors now work on stuff that was created inside it + LemonInTheDark: + - bugfix: Jetpacking in space without stabalizers feels good now + - bugfix: If you're pulling something in space, and release the pull, it'll follow + behind you properly + MidoriWroth: + - spellcheck: Tramstation botany's condimaster is now a sapmaster + NotRanged, SuperNovaa41: + - qol: There is a new verb in the Admin tab that lets you view your open Admin Help + ticket. + Rhials: + - bugfix: removes a stray windoor clipping into a wall in Tramstation science. + SmArtKar: + - bugfix: Fixes missing eye icon + - bugfix: Fixed vendors qdeling brains of GODMODEd admemes upon rolling a crit squash + - bugfix: Fixed 217-D Plasma Cutter and Exosuit PKA being uninstallable on ripley/clarke + Son-of-Space: + - refactor: Compartmentalized defines for access IDs and converts them from integers + to strings + - bugfix: Standardizes some access reqs on varedited objects like windoors and shutter + buttons + - bugfix: Some missed doors with access reqs instead of mapping helpers were fixed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vladin, Professional Cleaner Association Representative: - bugfix: Ceramic shards are no longer comically large, and can be fit inside trash bags for cleanup. YakumoChen: +<<<<<<< HEAD - bugfix: Microfusions can be stored on MODsuits with a magnetic harness again - qol: interdyne spawns with right id Zenitheevee: @@ -1063,10 +1905,55 @@ - spellcheck: There is now a space between the Staff's name and the thing that declares them to be Staff in deadsay. - admin: Added a new Puzzgrid smite +======= + - bugfix: 'Tram: Engine room external airlock access corrected.' + jlsnow301: + - refactor: Converted the airlock controller to TypeScript, added some visual effects + san7890: + - bugfix: 'Snowy floors should be snowy instead of being... Counter-Strike: Source + Missing Textures.' + - bugfix: The holodeck on DeltaStation will no longer vent all of its atmospherics + into space when a program is switched. Whoops. + tralezab: + - rscadd: Appraiser Skillchip is now available. + vincentiusvin: + - refactor: Refactored how the analyzer's last gasmix ui thing works. No gameplay + changes expected. + - code_imp: Reorganized tool usage code a bit. Also no gameplay changes expected. + wesoda25: + - rscadd: You can now emag tram crossing signals to disable their motion sensors +2022-05-22: + Dmeto: + - bugfix: Restores Captains pen and QM survial pen in respective Pdas + Ghilker: + - bugfix: fix sm shards dusting when wrenching + Iamgoofball: + - balance: Hitting someone in melee with the explosive lance now moves you to the + same tile as them before it sets off the grenade. + - bugfix: Petting 10 animals no longer counts as individual mood bonuses, and will + instead replace eachother. + JohnFulpWillard: + - bugfix: Cyborgs once again can't PDA people anymore. + - bugfix: Cell chargers no longer show up twice in Industrial Engineering's research + node, and APC modules don't look like a Golem shell. + Maurukas: + - bugfix: Icebox's AI sat is now connected to the main power grid + Melbert: + - bugfix: Rust and Blade ascension make you stun immune again + Mothblocks: + - admin: Added a new Puzzgrid smite + RandomGamer123: + - bugfix: Electrolyzers that are anchored no longer consume 5kW even when turned + off + SmArtKar: + - bugfix: Fixed ethereal revive crystal bugging out when buckled + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Nanotrasen realized that intern they left to do announcements accidentally obscured the location of where any potential blood cultists may be summoning their eldritch deity, this should no longer happen whenever they tack this intern on. +<<<<<<< HEAD - bugfix: fix sm shards dusting when wrenching - balance: Hitting someone in melee with the explosive lance now moves you to the same tile as them before it sets off the grenade. @@ -1087,12 +1974,34 @@ Ghommie: - bugfix: Replaces the space turfs under the resin walls at the ghost cafe with dirt. +======= + - spellcheck: There is now a space between the Staff's name and the thing that declares + them to be Staff in deadsay. + - bugfix: There are no longer two turfs on one tile in Hilbert's Research Facility. + In case you've stopped by and some portion of it has been oddly depressurized + (maybe? i dunno), you should be fine now. +2022-05-23: + Fikou: + - balance: Halves the damage of EMPs to MODsuit users to 5 from 10 + - balance: Puts EMP shields on the syndicate modsuit + - rscadd: Adds advanced EMP shield modules, they shield your whole body from EMPs. + Available in the nukie uplink + Ghilker: + - rscadd: Cascade rift is now a portal that teleports you to centcom evac instead + of dusting you. + - balance: There are more crystal walls spawned around the station and the timing + of the cascade has been changed to start the one minute countdown after the + portal has been eaten. + MNarath1: + - bugfix: fixes goliath not chasing people +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixes a rare hard-delete with queen bees. - bugfix: Nuke cinematics should show up again, more often. Hopefully. - bugfix: Malfunctioning AI's Doomsday cinematic also shows again. - code_imp: Sorted, doc'd, and minorly improved the code of nuclear bombs. - refactor: Refactored cinematics a teeny bit. +<<<<<<< HEAD PK_Sonikal: - rscadd: The Survivalist Bunker, occasionally found by space explorers, now has a pharmacy for chemistry. @@ -1108,12 +2017,21 @@ portal has been eaten. - refactor: 'Improved UI for personal crafting: has category groups, better full-sized UI, more space-efficient and readable compact mode.' +======= + MidoriWroth: + - bugfix: Removes the unnecessary light switch in Meta Station medbay central. + PK_Sonikal: + - rscadd: The Survivalist Bunker, occasionally found by space explorers, now has + a pharmacy for chemistry. + Rhials: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a new random event -- Scrubber Clog! Scrubbers may now randomly be clogged by mobs, which will result in them crawling out and getting all over the place. This can be fixed by pumping the scrubber with a plunger, or by just welding the scrubber shut and leaving it for a while. - rscadd: The plunger has been integrated into the janitor's arsenal. You may now purchase them from the Janidrobe and equip them into janibelts. +<<<<<<< HEAD - rscadd: Smoke expands through newly opened airlocks if it hasn't finished spreading. - bugfix: Petting 10 animals no longer counts as individual mood bonuses, and will instead replace eachother. @@ -1187,11 +2105,43 @@ choose. - spellcheck: Fixed a few incorrect capitalisations 2022-05-25: +======= + Son-of-Space: + - qol: Moved around some overlapping wall objects in engineering on IceBox + - qol: Removed a 2x2 wall in engineering on IceBox + - bugfix: Swapped the public mining APC with its directional subtype version on + IceBox + - qol: some sinks were added to medbay on icebox + - qol: a poster in the way of AI/ghosts was moved on icebox. + - bugfix: The rest of the overlapping wall objects on IceBox are no longer overlapping. + - qol: Improved the view underneath the Warden's Office on Tramstation + TemporalOroboros: + - rscadd: Smoke expands through newly opened airlocks if it hasn't finished spreading. + san7890: + - bugfix: Nanotrasen's Reality Corrections Office has stumbled across an older station + with a bunch of abandoned spacemen abroad. Rather than rescue them, they elected + to fix the weird lighting issues their external portions had, and then flew + off. Those spaceman are still out there. + stylemistake: + - refactor: 'Improved UI for personal crafting: has category groups, better full-sized + UI, more space-efficient and readable compact mode.' + vincentiusvin: + - bugfix: fixed lavaland syndiebase atmos distro being unconnected + - bugfix: gave the lavaland syndie atmos it's atmos control computer back +2022-05-24: + Fikou: + - qol: the prototype modsuit is now shockproof + - bugfix: herald projectiles no longer have weird healing mechanics + Fikou, unit0016: + - rscadd: Chrono Legionnaire and Admin MODsuits now have the ability to hold mobs + with kinesis. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The PDA Messenger app is now undeletable, unavailable for download and also no longer takes space on the hardware, something something bluespace cloud storage. As a result, everyone should once again be spawning with the programs they were meant to spawn with in the first place. +<<<<<<< HEAD Melbert: - bugfix: Wags-His-Tail and Eats-The-Roaches have wiggled their way back from a deep space expedition to the janitorial closet of Deltastation. @@ -1216,6 +2166,18 @@ - bugfix: A few tails which were meant to be able to use the fluffy turf emote and couldn't, now can. - bugfix: ashwalkers can use quirks and not loadouts, as was intended +======= + Iamgoofball: + - bugfix: Fixes the price on SOUTH. BRONX. PARADIIIISE! Again. + Maurukas: + - balance: Emagged chem dispenser in the deepstorage ruin is replaced with a regular + one. + MidoriWroth: + - bugfix: Removes a few redundant Icebox botany cables + Pepsilawn: + - bugfix: Fixed incorrect departmental signs on Delta and Meta, as well as the Caves + Gateway mission. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres, TheBonded: - rscadd: Added illiterate quirk that prevents a mob from reading or writing. This prevents using books, paper, tablets, computers and some other objects. @@ -1224,6 +2186,7 @@ will still be able to bash the keyboard to send the ship. - rscadd: New severe brain trauma - Dyslexia. It just makes you illiterate until it's fixed. +<<<<<<< HEAD 2022-05-26: Cursor: - rscadd: The Ghost Cafe now has a skillsoft machine. Go on then. Learn about...Wine? @@ -1284,6 +2247,83 @@ - bugfix: Detectives no longer have access to gear lockers by default across all maps - rscadd: Lattices over chasms will now actually hold you up. +======= +2022-05-25: + Melbert: + - bugfix: Wags-His-Tail and Eats-The-Roaches have wiggled their way back from a + deep space expedition to the janitorial closet of Deltastation. + MidoriWroth: + - imageadd: Beef stroganoff and berry tarts have new sprites + - bugfix: Removes an extra table in Meta atmos + SmArtKar: + - bugfix: Fixes stopping, dropping and rolling not extinguishing your clothing + Son-of-Space: + - bugfix: Fixed some names on objects across all maps + san7890: + - bugfix: If you've been paying to the Continuous Integration logs since... the + dawn of the creation of the "Create And Destroy" Unit Test, you may be pleased + to know that we should now no longer have mapping errors logged as a result + of that test running. + - rscadd: There's a new shuttle! You can now purchase "Basketballer's Stadium" from + your station's communications console in order to get some good time in bouncing + around a ball and making those sneakers squeak against the well-polished floors. + Enjoy! +2022-05-26: + Ghilker: + - imageadd: adds the podpeople photocopy ass + Jolly: + - bugfix: One of Trams modular maintenance doors had its access removed, in favor + of the already existing mapping helper. + MidoriWroth: + - imageadd: The beef stroganoff now actually looks like food. + Mothblocks: + - rscadd: Added a disposal bin to the medbay treatment center on Delta. + SmArtKar: + - rscadd: You can now open taps on fuel and water tanks, making them leak fuel/water + Son-of-Space: + - bugfix: SMES on the Zoo ruin no longer feeds into itself + - bugfix: The showers in the MetaStation Medbay are properly plumbed again + Son-of-Space, MrDoomBringer: + - bugfix: All airlocks across all maps have been properly titled in upper case + - code_imp: A check has been added to look for incorrectly titled airlocks + TemporalOroboros: + - bugfix: You can no longer forge hrefs to message everyone from any PDA. + Timberpoes: + - bugfix: The DB query retrieving the feedback thread link for adminwho properly + deletes the DB query across all code paths, stopping error spam in admin chat. + san7890: + - bugfix: On DeltaStation, Nanotrasen has made access from Medbay Maintenance to + the Recreation Area unrestricted. +2022-05-27: + ArcaneMusic: + - bugfix: Several non-functional prison management computers have been replaced + by functional computers. + FernandoJ8: + - bugfix: Hair dye spray now properly updates your sprite after being used + Fikou, Armhulen, InfraredBaron, SmartKar: + - balance: Removes shock protection from the security MODsuit + - balance: Removes the security MODsuit from the mechfab, still available in the + sec techfab + - balance: Buffs the carrying capacity of the security and safeguard MODsuits + - rscadd: Adds the megaphone (you speak loud) and projectile dampener (similar to + peaceborg one) modules to the safeguard suit + - rscadd: Adds the mirage grenade dispenser (it dispenses grenades that create holographic + copies of you) and criminal capture (dispenses prisoner capture bags, that lock + people in a pressurized environment) modules to the security suit + - balance: Makes pepper shoulders module 2 complexity + - qol: adds the plasma stabilizer and thermal regulator modules to every brig + Ghilker: + - refactor: sm cascade walls are no longer turfs, but are object, no player facing + changes + - bugfix: fixed announcement text and removed texts + JohnFulpWillard: + - bugfix: The Chief Engineer and Station Engineers no longer spawn with a broken + app- AmpCheck. You can still use said app from your Engineering consoles. + Jolly: + - bugfix: Scientists should now be able to access the mass driver on Kilo once more. + - bugfix: Kilo had some of its areas fixed. + MTandi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Gravgen now can't be repaired when not broken. - bugfix: Airlocks now properly say that they're welded when examined. - qol: Oldstation some internal windows are not reinforced to allow easier breaking @@ -1303,6 +2343,7 @@ - rscadd: Oldstation medbay has bonsai skillchip in the box to provide a use for all the dead plant pots - bugfix: Oldstation minor fixes and visual tweaks like missing switches, etc +<<<<<<< HEAD - bugfix: Fix slime potions used on simple mobs to inherit all language abilities from the user - bugfix: The Chief Engineer and Station Engineers no longer spawn with a broken @@ -1361,11 +2402,42 @@ - bugfix: Fixes an obvious oversight resulting in stacking inventory items to violate the laws of physics. Belts are now Bulky and do not fit in bags. - bugfix: Hair dye spray now properly updates your sprite after being used +======= + Melbert: + - bugfix: Adds some minor sanity to the Lionhunter Rifle. + Mooshimi: + - rscadd: Lattices over chasms will now actually hold you up. + OrionTheFox: + - bugfix: added a name to the base jumpsuit type + Pandarsenic: + - qol: Ice Cream Sandwich bounties now specify in the description that they have + to be ice cream sandwiches, hopefully preventing possible confusion about which + foods are suitable. + SmArtKar: + - bugfix: Removed firelock in sci lobby window on Meta + - bugfix: Moved meta hallway air alarm so it wont get blocked by firelocks + Son-of-Space: + - bugfix: Detectives can now use the brig on emergency shuttles properly again + - bugfix: Access helpers were added to more shuttles + - code_imp: Added checks for several commonly misplaced structures + - bugfix: Fixed several overlapping structures on IceBox, Tram, and several CTF + maps + - code_imp: added access helpers for various off-station content + - bugfix: Detectives no longer have access to gear lockers by default across all + maps + Striders13: + - bugfix: fixed service order console not working + Sylphet: + - bugfix: fixes missing smoothie sprites + - imageadd: added smoothie sprites + fippefi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: All request consoles on Icebox have been fixed to a new standard! No more Unknown request console sitting in the kitchen. - bugfix: Request consoles should more often default to a sane name instead of Unknown. - code_imp: Request console naming and subscription code has been redefined to work better with mapping. Auto-names, too! +<<<<<<< HEAD - bugfix: Fixed foam spreading through public airlocks and windoors - bugfix: Detectives can now use the brig on emergency shuttles properly again - bugfix: Access helpers were added to more shuttles @@ -1380,10 +2452,52 @@ new antagonist name. - spellcheck: blade heretic lore for how much silver it takes to make a blade is now correct +======= + jlsnow301: + - qol: The genetics console is a bit easier to use with scrolling mutations and + tabs. + - admin: Added an debug data disk to test mutations. + san7890: + - rscadd: 'Nanotrasen has installed a new holodeck subroutine, cleverly termed: + Microwave Paradise. Enjoy those microwaves.' + - bugfix: If you haven't been able to see any working space ruins lately, that's + our bad. Should be fixed now. + - bugfix: To all the Multi-Z Debug Fans, we have now added a ceiling to one of the + airlocks. Enjoy that. + timothymtorres: + - bugfix: Fix transparent floors ignoring blur effects + - bugfix: Fix slime potions used on simple mobs to inherit all language abilities + from the user +2022-05-28: + Fikou: + - qol: you refill the modsuit plasma core with all your plasma at once + Iamgoofball: + - bugfix: Fixes an obvious oversight resulting in stacking inventory items to violate + the laws of physics. Belts are now Bulky and do not fit in bags. + JohnFulpWillard: + - bugfix: Tablet lights are now directional, like PDAs used to be. + JoshAdamPowell: + - spellcheck: Scrubber clog event will no longer end every area name in 'area', + like recreation area area. + Melbert: + - bugfix: Reactive Delimber armor works, for real + Mooshimi: + - qol: Ghosts will now see the name of who rolled the antagonist instead of the + new antagonist name. + RandomGamer123: + - bugfix: Plasmamen no longer burn in a much larger variety of situations (eg. full + atmos firesuit, space-proof suit but without gloves) that they logically shouldn't + (and previously didn't) burn in + SmArtKar: + - bugfix: Fixed most eye color effects not working + - bugfix: Fixed foam spreading through public airlocks and windoors + Thunder12345: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: Medals have been resprited and should now look 126% more swag. Wallem: - rscadd: Bug-based food items have been given their own foodtype. Lizards, Slimes, and Felinids love bugs! Humans, Moths, and Podpeople don't. +<<<<<<< HEAD Zergspower: - qol: Returns Borg PDA messaging Zonespace27: @@ -1403,6 +2517,12 @@ range. 2022-05-29: SkyratBot: +======= + private-tristan: + - spellcheck: blade heretic lore for how much silver it takes to make a blade is + now correct + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Made adv engi tech node require bz shells as an experiment, organs no longer need it. - balance: Adv mining no longer requires adv engi. @@ -1416,6 +2536,20 @@ - balance: Added more options to purchase nodes in the paper partners. Your point gain stays the same though. - balance: Removed roundstart BZ can from xenobio. +<<<<<<< HEAD +======= +2022-05-29: + LemonInTheDark: + - balance: Smoke and foam can no longer continuously react their reagents + MTandi: + - imageadd: Changed light switch sprite and made it depend on the power availability. + - rscadd: Added microscope crafting recipe + - balance: 'Techweb: Moved cytology tools to a single node from different nodes' + - balance: 'Techweb: Operating computer now available before the experiment that + requires it' + - refactor: oldstation map size now 112x64 + SmArtKar: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added eyesnatcher objective which requires you to pull out someone's eyes. You will be given an automatic eye extractor to assit you in that. - rscadd: Added kidnapping objective which works similarly to old contractors @@ -1426,6 +2560,7 @@ requirement but itsn't job-locked - balance: Default version of Sleeper Protocol now can be rolled by roboticists as well(since they have an operating table with a console) +<<<<<<< HEAD - balance: Smoke and foam can no longer continuously react their reagents - refactor: oldstation map size now 112x64 - rscadd: Brand new HoP coat! @@ -1448,11 +2583,45 @@ - bugfix: Map votes will now happen again once the shuttle departs, regardless of whether your server allows everyone to start a map vote or not, as intended. Melbert: +======= + axietheaxolotl: + - rscadd: Brand new HoP coat! + - imageadd: New sprites for HoP's uniform, skirt, cap, and the ID Painter. + - bugfix: HoP starts with laceups, not brown sneakers. +2022-05-30: + Fikou: + - bugfix: fixes airlock ai mapping helpers not working + - bugfix: chem master now lists a correct metabolization rate + Mooshimi: + - bugfix: Random windoor inside a wall in chapel maintenance on icebox is now gone. + - bugfix: There is now only one firelock in lower ordinance, instead of two in the + same door. + Son-of-Space: + - qol: access helpers have been added for the rest of our shuttles that needed them + - bugfix: Our away missions and ruins now use access helpers instead of varedits + - bugfix: access to medical laptops is now consistent across all stations + - spellcheck: Fixed the name of a shutter button on KiloStation + - code_imp: Reorganized the UpdatePaths folder +2022-05-31: + Comxy: + - imageadd: added new hallucination and delimber anomaly icons + - imagedel: deleted old hallucination and delimber anomaly icons + Fikou: + - bugfix: fixes crusher inhands being swapped + GoldenAlpharex: + - bugfix: Map votes will now happen again once the shuttle departs, regardless of + whether your server allows everyone to start a map vote or not, as intended. + Iamgoofball: + - rscadd: Aurora Caelus is now localized entirely within your station's kitchen. + Melbert: + - rscadd: The science breakroom on Icebox is in a slightly nicer state again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Chaplains no longer trigger their own anti-magic when they use Nullwave Vibrato. - code_imp: Reduced some copy+paste from sect music code. Meyhazah: - imageadd: Resprited chaplain's witch hunter set. +<<<<<<< HEAD SkyratBot: - bugfix: fixes crusher inhands being swapped - rscadd: Aurora Caelus is now localized entirely within your station's kitchen. @@ -1475,3 +2644,26 @@ from command and medical's icons. - imageadd: the Quartermaster has a more command-coloured secHUD icon. - balance: Reagent katana no longer has ridiculous wound bonuses +======= + ReinaCoder: + - qol: Head of Personnels rejoice! Their jumpsuit when adjusted no longer covers + the chest. + Ryll/Shaps: + - balance: Armor can now only block up to 90% of damage from projectiles, same as + for melee attacks + - bugfix: Pellet cloud attacks like buckshot and frag grenades now respect armor + damage reduction when rolling for wounds + Son-of-Space: + - qol: Access helpers were added to centcom + - bugfix: Some accesses in centcomm were made more consistent + Son-of-Space, Pepsilawn: + - code_imp: Adds checks for double firelocks or airlocks + - bugfix: fixes several double firelocks and airlocks across our maps + Urumasi, Meyhazah: + - imageadd: The H.E.C.K. suit has a new sprite. (by Meyhazah) + - rscadd: You can now use a spray can to completely recolor the H.E.C.K. suit. + tralezab: + - balance: Unique AI trait now gets rid of the station's DIFFERENT lawset modules, + and increases the research cost to unlocking them. + - qol: AI is given a printout of their new laws +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-06.yml b/html/changelogs/archive/2022-06.yml index 8ffa2731b73..05b074792c6 100644 --- a/html/changelogs/archive/2022-06.yml +++ b/html/changelogs/archive/2022-06.yml @@ -2,6 +2,7 @@ ATHATH: - bugfix: Podpeople can no longer circumvent their immunity to becoming fat by chowing down on some food and then hiding in a locker. +<<<<<<< HEAD Hardly: - rscadd: Added QM skirtleneck to command vendor Ryll/Shaps: @@ -62,11 +63,82 @@ Ghommie: - bugfix: Stops the mold foam effects from having a station-covering range of 200. It should be 4/5 now. +======= + Fikou: + - balance: The engilathe can now print plasma cutters. + - rscadd: Adds a chance for ID cards to be tastefully thick + - bugfix: reinforced windows can be heated up by things that can weld but arent + welding tools + Fikou, PositiveEntropy, Nerevar, InfraRedBaron: + - refactor: the ninja space suit is now a modsuit + - bugfix: fixes dash beams not working + JohnFulpWillard: + - refactor: Electrocuting faunas now causes them to target you, much like hitting + them. + Kylerace: + - bugfix: external organs show up now + Son-of-Space: + - bugfix: The trash driver on MetaStation now fires trash off the z level again + - bugfix: A scrubber pipe has found its way back to a scrubber in the engine on + MetaStation + - bugfix: Removed an inconsistent camera guarding EVA maints on IceBoxStation + - bugfix: two windoors were removed from walls on IceBoxStation + - bugfix: The turbine boards on the derelict have been mysteriously resupplied (spooky!) + - bugfix: removed some unnecessary varedits from some external airlocks + - bugfix: The APC in TramStation's Experimentor room is now accessible. + - bugfix: A floating intercom was removed from the same experimentor room + Wallem: + - rscadd: Adds a desk bell, so you can let the service industry know how much you + truly care about their hearing. + - imageadd: Ties have now been GAGS-ified + - rscadd: Ties now must be manually tied, allowing for both a classic and a "I just + woke up" look. + - imagedel: Removed inherent ties from several outfits. + axietheaxolotl for the human, armhulenn for the butt and nothing else: + - imageadd: Brand new human sprites! + san7890: + - bugfix: There is no longer a Prisoner Management Console in the space outside + brig on DeltaStation's Security. + - rscadd: On IceBoxStation, the permanent prison situation now has a firing range. + Don't worry, the guns are still fake and are about as useful as the laser tag + guns you already had. + - bugfix: The walls between the nuke ops base and the holding facility have been + tweaked a bit to ensure that when you load in the nuke ops shuttle that you + can't see the rocky walls of the holding facility. + vincentiusvin: + - spellcheck: gasmix reading on some atmos ui stuffs should no longer have funny + chars +2022-06-02: + ArcaneMusic: + - rscadd: Steam vents have been added to maintenance on all stations. Steam vents + create steam clouds that spray when crossed, and can be en/disabled by hand. + JohnFulpWillard: + - refactor: Wizard's warp whistle is now an effect that charges at the summoner + to pick them up, and will drop them down. + Melbert: + - rscadd: Cargorilla. + - code_imp: Removed a locate() in world from the evil PunPun trait + san7890: + - balance: IceMoon Fauna no longer regenerate health. This should make it a bit + easier to kill them in spots such as IceBoxStation. + - bugfix: Hellish Microwaves in the Holodeck no longer draw power. + scriptis: + - bugfix: androids no longer look like they were in the tanning bed for way too + long + tralezab: + - balance: Removed silver costs from surgery tools +2022-06-03: + Crumpaloo: + - imageadd: Added new sprites for the airlock painter, tile & decal sprayer. + Fikou: + - bugfix: surplus prosthetics have correct sprites now +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The stasis ripple effect will now play in a loop as intended, rather than only playing once. - bugfix: Buckling down someone to a stasis bed should no longer occasionally make them lie down veeeeery slowly. +<<<<<<< HEAD - bugfix: Chest markings should now all work again. Yes, this includes tattoos and body tonage. Jolly: @@ -75,6 +147,9 @@ Melbert: - rscadd: Cargorilla. - code_imp: Removed a locate() in world from the evil PunPun trait +======= + Melbert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Heretic: The Amber Focus is now fireproof.' - balance: 'Heretic: The Eldritch Medallion (thermal vision necklace) is now fireproof, acid proof, and works as a focus.' @@ -83,6 +158,7 @@ and a singular sickly blade. It also functions as a focus while the hood is down.' - balance: 'Heretic: Mawed Crucible potions are now small sized (down from normal).' +<<<<<<< HEAD Ryll/Shaps: - bugfix: Fixed pellet clouds not being able to wound SkyratBot: @@ -120,10 +196,25 @@ - imageadd: added new Sol Police uniform sprites to fit better in the modern sprite era. SkyratBot: +======= + - balance: Cremator button has no access requirements + - bugfix: Light switches no longer cause anchored objects over conveyors to move. + Pandarsenic: + - bugfix: Shuffles objects to stop sprites from clipping or covering each other + (with differing levels of severity) on IceBox's overcrowded dormitory walls. + Ryll/Shaps: + - bugfix: Fixed pellet clouds not being able to wound + SingingSpock: + - bugfix: Changed triple citrus recipe to make 3u instead of 5u + Son-of-Space: + - bugfix: Some overlapping objects were adjusted on the walls in the firing range + on MetaStation +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Adds some greps to check for commonly misplaced structures in closed turfs - bugfix: Some objects stacked within closed turfs have been removed from those turfs. +<<<<<<< HEAD - bugfix: Player-facing Traitor reputation numbers are now consistent when you view how much you have. - qol: breathedeep makes a return in the atmozphere tablet app. Right click to scan @@ -145,12 +236,53 @@ Melbert: - bugfix: Fixes some cinematics sticking around for longer than comfortable SkyratBot: +======= + robbertapir: + - bugfix: Made engraving not throw errors when everything works as expected. + tralezab: + - balance: Engineering SMESes now start with a bit more juice. + vincentiusvin: + - qol: Added a roundstart program disk containing nt frontier + - code_imp: Changed ordnance's area definition a bit, this includes the misc labs + (usually used for circuit labs). Gameplay wise they will have new names. + - code_imp: Made the ordnance chamber injector start off. You gotta turn them on + using the monitors. Also tidied their code a bit. +2022-06-04: + Profakos: + - bugfix: Player-facing Traitor reputation numbers are now consistent when you view + how much you have. + Rhials: + - bugfix: Moves the scrubber out from under a vending machine in the Metastation + Meeting Room. + SmArtKar: + - bugfix: Fixed statue simplemob teleport not working and 3 other spells not appearing + Son-of-Space: + - bugfix: departmental officers' access across departments has been standardized, + and previously lost accesses were added back + - balance: Departmental security officers have access to more areas in their departments, + including xenobiology or virology + Zonespace27: + - admin: MODsuits can now be picked through the outfit manager + san7890: + - rscadd: On all five stations, Nanotrasen has redrawn up the area plans in the + permabrig areas. Expect to see a few more APCs in each room to feed each with + power. + vincentiusvin: + - qol: breathedeep makes a return in the atmozphere tablet app. Right click to scan + things, right self click (on the tablet) to scan current turf. +2022-06-05: + Son-of-Space: + - bugfix: A severe lack of plating under a window in the DeltaStation rec room was + remedied + dragomagol: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: cyborg wire pulses/cuts are now logged in silicon.log - admin: AIs being carded is now logged in silicon.log - admin: giving an AI a combat module is now logged in silicon.log - admin: trying to upload over the maximum number of laws is now logged in silicon.log - admin: ion storm law changes are now logged in silicon.log - admin: changing settings on a borg shell is now logged in silicon.log +<<<<<<< HEAD - bugfix: departmental officers' access across departments has been standardized, and previously lost accesses were added back - balance: Departmental security officers have access to more areas in their departments, @@ -161,12 +293,21 @@ - bugfix: fixed parallax blue stars showing through parallax asteroids. - bugfix: Caught Molotovs no longer immolate the target. - bugfix: right clicking the BEPIS no longer makes it invisible. +======= + robbertapir: + - bugfix: held memorizers are now visible +2022-06-06: + Dragomagol, sprites by MistakeNot4892: + - rscadd: 'Added a new pAI holoform: the crow!' + EOBGames: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'A few new crates have made their way to cargo: buy yourself a Lizard or Moth food crate today!' - rscadd: Recipes for Yoghurt (10u cream, 2u virus food), Cornmeal (grind corn), and Quality Oil (1u quality oil, 2u cooking oil) have been added. Bon appetit! - balance: 'Species food (lizard and moth food) have received a sweep of balance changes: they''re now more filling and a bit easier to access.' +<<<<<<< HEAD - bugfix: fixed a bigger dose of zombie powder permasleeping you - bugfix: Durand shields no longer layer incorrectly or visually decouple from the mech. @@ -220,11 +361,61 @@ IsaacTheSharkWolf: - refactor: Redid the upper part of toxins to include the oxygen storage tank, mix pipelines, cooling room and some additional adjustments to fit it all. +======= + Iamgoofball: + - bugfix: Central Command no longer erroneously refers to the Ice Box planet as + a station in orbit. + - bugfix: Under construction airlocks no longer have paper stuck to them. + Jolly: + - bugfix: One of Trams ladder hatches no longer uses a redundant "all-access" helper + to help you escape. The door in question already had no access requirements. + Looks-to-the-Moon: + - bugfix: Xenomorph larva cancelling their evolution no longer displays unnecessary + messages + Melbert: + - bugfix: Fixes some cinematics sticking around for longer than comfortable + Rhials: + - bugfix: right clicking the BEPIS no longer makes it invisible. + SpaceSmithers: + - bugfix: Electric razors are now functional again + kugamo: + - bugfix: fixed parallax blue stars showing through parallax asteroids. + magatsuchi: + - code_imp: replaces some slot names with proper names + robbertapir: + - bugfix: Caught Molotovs no longer immolate the target. + vincentiusvin: + - bugfix: fixed a bigger dose of zombie powder permasleeping you + - bugfix: fixed regular scientists spawning in RD's office in kilo +2022-06-07: + 13spacemen: + - rscadd: You can now add assemblies to welding fuel tanks to blow them up + ATHATH: + - rscadd: Bulky crowbars have been added to all fire-safety lockers. + - spellcheck: Large crowbars are now named "large crowbars" instead of just "crowbars". + - bugfix: Unholy water's stun length reduction effect is now as potent as it was + intended to be. Its strength was previously half as strong as it was intended + to be due to a copy+paste error. + CocaColaTastesGood: + - bugfix: Fixes stack multiplier exploit + Fikou: + - qol: ninjas now get told about pinning modules and the direction to the station + - bugfix: fixes modsuits fucking up when unequipping every item, like staff of change + or slime toxin or whatever + Iamgoofball: + - bugfix: You can no longer roll more IDs to steal than there are crewmembers for + All Access Fan. + - bugfix: Firelocks no longer check the atmospheric contents of solid walls. + - bugfix: Health Analyzers now properly flag robotic and prosthetic limbs again. + Iatots: + - imageadd: Hot Cocoa and Tea now come in mugs again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly, sprites by Blueshirtguy: - rscadd: 'Jolly: Added the flower garland to the crafting tab under clothing! You''ll need 4 of these flowers to craft it: poppies, harebells and roses. It''ll also calm your nerves a bit, if you''re on edge.' - imageadd: 'Blueshirtguy: Sprites for the flower garland on-mob and icon sprites.' +<<<<<<< HEAD Moostard: - bugfix: Spent peacekeeper FMJ casings have a correct sprite now. OrionTheFox: @@ -321,11 +512,46 @@ - config: Add every AI lawset to game_options config - config: Rebalance AI lawsets in game_options config - bugfix: Lawsets overflow to behave correctly +======= + Mooshimi: + - bugfix: There is now air in the Deltastation security escape pod airlock. + Mothblocks: + - bugfix: Fixed Adminwho taking several seconds to resolve. + Pandarsenic: + - bugfix: Corrected a couple of trivial typos. + RandomGamer123: + - bugfix: Nameless ID cards (with security access) can now access the security records + console without issue + ReinaCoder: + - imageadd: The Soviet costume has been resprited and the russian mobs have been + updated to match. + Son-of-Space: + - bugfix: You can no longer get objectives on a random tile in maintenance on TramStation, + along with any other area/based assignments. + - bugfix: You can now properly pull or cancel a fire alarm from outside the eastern + side of the library on MetaStation. + - bugfix: Inspect bounties no longer give you invalid areas to scan for bounties + - bugfix: Inspect bounties now properly choose from a broader range of assignments + in service, maintenance, commons, etc. + SpaceSmithers: + - qol: The Tip of the Round will no longer misinform you about PACMAN generators. + Wallem: + - rscdel: Full Ant Party Pizza pies has been removed. Instead, you can get ant pizza + slices by pouring ants on margherita pizza slices. + itseasytosee: + - balance: Some items are better at damaging structures and robots than others! + Don't try to kill a metal death robot with a scalpel, use a toolbox! + robbertapir: + - bugfix: Photon projector implants can no longer be used in assemblies. This means + that they can no longer bilocate. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Nanotrasen has finally tracked down an elusive signal that's been haunting them over all of their broadcasts... there appears to be a new Syndicate Listening Base commissioned. - balance: The odds for a Syndicate Communications Agent (the Space kind) is now at an 15% chance to spawn. +<<<<<<< HEAD - imageadd: Resprites the white costume found inside the costume vendor. - balance: Station equipment that holds materials (techfabs, ORMs) can't connect to ore silo's on a different Z level. @@ -384,6 +610,37 @@ - imageadd: New plumbing duct sprites. - bugfix: Fire hallucinations are no longer invisible - qol: Fuel and water tanks have examine hints now +======= + - balance: Nanotrasen has now implemented a "buffer zone" on IceBoxStation between + the wilderness portions of the moon and the parts where there is a station presence. + Hopefully, you should see a lot less fauna try to make their way on station. + silicons: + - bugfix: infinite loop on process_hit in projectiles when hitting ON_BORDER objects, + like windoors + timothymtorres: + - bugfix: Fix drones not being able to use computers or vault. + - bugfix: Fix monkeys being able to read or write. They are now illiterate however + they can gain literacy through the Clever mutation. + - bugfix: Fix illiterate mobs being able to receive tablet messages in their chat + log. +2022-06-08: + Guillaume Prata: + - balance: Eating clothing as Mothpeople will give you cloth fibers instead of nutriment. + Cloth fibers give temporary nourishment that gets removed when it finishes metabolizing. + JohnFulpWillard: + - balance: Station equipment that holds materials (techfabs, ORMs) can't connect + to ore silo's on a different Z level. + Paxilmaniac: + - rscadd: Solar panel assemblies and solar tracker electronics can now be made in + an autolathe + ReinaCoder: + - imageadd: Resprites the white costume found inside the costume vendor. + SnoopCooper: + - balance: BZ production rates between pipes and turfs are now consistent. O2 production + removed. + - bugfix: Multiplying production rates by splitting pipenets no longer possible. + Son-of-Space: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Reorganizes some of the access and jobs access code for readability - balance: The minisat and tcomms are more accessible to engineering roles on skeleton crew, and engineers normally @@ -405,6 +662,7 @@ - bugfix: Minisats across all maps have proper access requirements to their contents - bugfix: Tech storage now uses its access properly and again requires both command and tech access to get to secure storage +<<<<<<< HEAD - admin: Smoke now logs the last person to touch the source of the smoke as the last person to touch the smoke itself. Gunpowder smoke should be less annoying to log dive as a result as every explosion will log that person. @@ -421,6 +679,88 @@ - rscadd: The Concealed Weapon Bay is available again for traitor Roboticists and Research Directors. - bugfix: Fixes bzformation not working. +======= + Tastyfish: + - bugfix: The ID access reader and access checker circuit components now work again + with the new string-based access system. + - qol: Plumbing now supports 5 layers. + - qol: The plumbing constructor can now place ducts and change layer via scroll + wheel. + - bugfix: Bunch of cryptic failures and errors fixed in placing plumbing. + - imageadd: New plumbing duct sprites. + TemporalOroboros: + - admin: Smoke now logs the last person to touch the source of the smoke as the + last person to touch the smoke itself. Gunpowder smoke should be less annoying + to log dive as a result as every explosion will log that person. + Timberpoes: + - bugfix: Fixes issue where lobby buttons were still visable and usable under panic + bunker x interview system and also allows use of fix chat verb for interviewees. + private-tristan: + - bugfix: metastation xenobiology area no longer extends 1 tile into space + timothymtorres: + - qol: Playing Russian Roulette with lethal intent now creates a mood event for + the user and is engrained in any nearby peoples memories. The more bullets the + better the memory and mood boost. + - qol: Replace red colored beacons on solars/catwalk areas outside Meta to be colored + according to department (sec is red, medical is blue, etc.) + - rscadd: Add all AI lawsets can now be researched and have their modules printed + - rscadd: Add all AI lawsets to random spawners in AI upload + - rscadd: Add advanced AI techweb node + - balance: Change AI lawsets to be in different random spawner categories + - balance: Change lawsets chance for unique AI station trait + - balance: Move some lawsets out of AI techweb node and put into advanced AI node + - code_imp: Add documentation for AI lawset code + - config: Add every AI lawset to game_options config + - config: Rebalance AI lawsets in game_options config + - bugfix: Lawsets overflow to behave correctly +2022-06-09: + 13spacemen: + - qol: Fuel and water tanks have examine hints now + ATHATH: + - rscadd: Cloaks, like surgical drapes and bedsheets, can now initiate surgeries. + This change affects both head of staff cloaks and skill capes. + Guillaume Prata: + - rscadd: Gravity generator blackout is a new random event to spice the rounds. + - balance: High intensity gravitational anomalies that don't get neutralized in + time will trigger a gravity generator blackout. + Iamgoofball: + - balance: The Quartermaster is now a Head of Staff, and answers directly to the + Captain now. + - balance: This comes with all the stuff a Head of Staff normally has, like command + access, a telebaton, and a silver ID. + - balance: This also comes with no longer being eligible for Head Revolutionary, + and being a target for the Revolution. + - balance: Thanks to a savvy contract with the Space Teamsters, non-humans are allowed + to be Quartermasters still. + - balance: The HoP is no longer the lead of Supply, nor does he have access to Supply. + - balance: The Warden now carries the torch for pretender royal metabolism, as the + last remaining pseudo-head. + - code_imp: Removes a hack from the NT IRN code. + Iatots: + - rscdel: you can't hold bread slices in your mouth (head) anymore. + - rscadd: you can hold griddled toast in your mouth (mask). + Jakkie Sergal: + - rscadd: Added darker floor decals. + Jolly: + - bugfix: A small bit of Kilos arrivals area define was touched up and fixed. Asteroid + rock is not consider part of the station, sorry folks. + - qol: On Icebox, some of the warning tapes have been properly rounded off with + corners. + - bugfix: On Icebox, a vent and scrubber has been added to the primary hall the + arrival shuttle drops crew members off at. This should also stop this portion + of the hall from having atmos specific issues. + Melbert: + - bugfix: Dead bodies shouldn't keep jittering for ages. + - qol: Research servers are now a bit more clear about why they aren't generating + research points. Check the console for more info. If in doubt, turn them off + and on again (i'm not kidding). + - code_imp: Removed a buncha old, deprecated / unused R&D server code related to + them making heat. + Pickle-Coding: + - bugfix: Fixes bzformation not working. + SmArtKar: + - bugfix: Fire hallucinations are no longer invisible +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TehZombehz for the sprites, san7890: - rscadd: For some reason, Donk Co. suddenly found a crate full of alien-themed plushies in their warehouse. They immediately started loading up their arcade @@ -429,6 +769,7 @@ - rscadd: For the brave smokers out there, legends tell of a new lighting technique involving molten stone from the planet's core. Only the brave are advised to attempt this. +<<<<<<< HEAD mel-byond: - rscadd: Added normal and Sec/Med/Meson HUD aviators - rscadd: Added Retinal Projector HUDs @@ -490,11 +831,64 @@ administration team of this change so they can diagnose it properly from there. - spellcheck: Asimov++ no longer includes "In the case of conflict, the majority order rules." +======= + Watermelon914: + - balance: Traitor objectives have a significantly reduced reputation reduction, + making it more viable to gain reputation beyond the expected reputation. + robbertapir: + - bugfix: You can no longer create negative amounts of alloys in the ORM + - bugfix: sechud/medhud buttons in examines now time out after 1 minute. This means + that a single examine will no longer allow you to track someone's identity and/or + health for the rest of the round. + timothymtorres: + - rscadd: Add hallucinogen poison to frog attacks + zxaber: + - rscadd: The Concealed Weapon Bay is available again for traitor Roboticists and + Research Directors. +2022-06-10: + Jolly: + - bugfix: On Tram, in sec, the floating pepper spray refiller has been removed from + the armory. You guys have enough, stop hogging it damnit! + - bugfix: On Tram, in the under tram, steam vents should no longer spontaneously + appear in walls. + PositiveEntropy: + - imageadd: Resprites the Captain's Antique Laser Gun! + ReinaCoder: + - bugfix: The QM now has a miniature e-gun in their locker on kilo like the other + heads! + tf-4: + - bugfix: Donksoft toy vendors no longer bluescreen. +2022-06-11: + JohnFulpWillard: + - bugfix: Space Dragons' expiring no longer deletes the people they had already + eaten. + LemonInTheDark: + - rscadd: Weather effects will now be a bit more subtle in darkness, hopefully this + looks nicer + - imageadd: I've done some resprites to snow and non smoothing lava + MTandi: + - qol: Portable pump In/Out button text replaced with source and destination. + Maurukas: + - bugfix: A manually edited APC in the deepstorage ruin has been replaced with an + APC of the appropriate type. + Melbert: + - refactor: Gunlight / Helmetlight behavior is now a component. + - qol: Gunlight / Helmetlight now uses balloon alerts. + Mothblocks: + - spellcheck: Asimov++ no longer includes "In the case of conflict, the majority + order rules." + RandomGamer123: + - bugfix: Fixes the layer of a scrubber in Icebox engineering + Watermelon914: + - bugfix: Skip time button on the steal objective now has a fast forward icon. + YakumoChen: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Changed the position of light tubes in certain surgery rooms to not be directly over a surgery bed. No more smashing lights with your saw by accident! - qol: Aspiring AIs can now listen in on patient talk in Meta's primary surgery room. Or you could listen to the soothing sounds of the the crew dying from the comfort of a surgery bed when comms are down too, I guess. +<<<<<<< HEAD - bugfix: Skip time button on the steal objective now has a fast forward icon. - bugfix: A manually edited APC in the deepstorage ruin has been replaced with an APC of the appropriate type. @@ -554,10 +948,81 @@ - bugfix: Fixed overlapping objects on a tile in the foyer of the IceBox bar. - bugfix: A set of unpowered airlocks by the cooling loop on TramStation are now powered. +======= + msgerbs: + - bugfix: There is no longer a random pipe in the wall in Metastation's Xenobiology + department. + san7890: + - config: Hey, server operators! Title music playing at the lobby screen is now + DISABLED by default in the config settings (game_options.txt). If you are not + hearing any title music, be sure to adjust your config. If you're a player reading + this and are sorely missing out on those soulful tunes, please notify your server's + administration team of this change so they can diagnose it properly from there. + tf-4: + - balance: Pre-loaded PACMAN generators now have 15 plasma sheets, instead of 50. +2022-06-12: + JohnFulpWillard: + - bugfix: The Warp whistle can be used more than once again. + Melbert: + - bugfix: Fixes Novaflowers not lighting targets on fire. + - code_imp: Reduces some copy+paste and cleans up some unique plant genes code. + - bugfix: Ranged attacks hitting mech equipment no longer ignores mech armor + - bugfix: Melee attacks now damage mech equipment + - bugfix: Mech equipment is now properly disabled at 0% health + Mothblocks: + - bugfix: Fixed thieves/opportunists icon. + Son-of-Space: + - bugfix: Several pairs of external airlocks without cycle link helpers have had + them added on TramStation + YakumoChen: + - bugfix: Fixed a symmetry issue with the lava clown puzzle where a lone chasm tile + wasn't connected with its fellow chasms. + san7890: + - bugfix: Chaplains, CMOs, and Psychologists can now all rejoice that they start + in their offices in Tram now, rather than take the shuttle. + - bugfix: Abductors should now hopefully spawn in on their little alien pod rather + than on the station's arrivals shuttle. + timothymtorres: + - rscadd: Add disease resistance to spaceacillin. It now gives 50% disease progression + slowdown, 75% to block disease infection, 75% to block zombie infection when + attacked, and 50% alien larva growth slowdown. +2022-06-13: + Fikou: + - bugfix: floating now stops slips just as well as flying + - spellcheck: security mod theme no longer mentions being shockproof + - bugfix: fixes naked outfit giving people the ninja modsuit + JohnFulpWillard: + - bugfix: Ore silos can once again be synced to machines on the station on other + z levels, for multi-z maps. + MTandi: + - bugfix: Night shift lights now properly save power + - qol: APC buttons now have tooltips + Melbert: + - bugfix: Earthsblood makes you see colors again. + Mothblocks: + - bugfix: Fixed Dynamic midrounds spawning heavies significantly earlier than they're + supposed to + Rhials: + - bugfix: Jobs are no longer closed when the nuke detonates off-station. + Son-of-Space: + - bugfix: Fixed overlapping objects on a tile in the foyer of the IceBox bar. + - bugfix: Some manual varedits on objects with cargo shipping access were fixed + to work again. + - bugfix: A set of unpowered airlocks by the cooling loop on TramStation are now + powered. + - bugfix: A rack stuck in a wall on the listening station ruin was removed from + the wall. + cacogen: + - balance: The default pirate ship now has a cell charger to recharge suit cells + castawaynont: + - balance: The Space Ninja's MODsuit has a storage module now. + kawoppi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: removed JaniDrobe refill from the General Wardrobes Supply Crate and moved it to its own supply crate - balance: adjusted General Wardrobes Supply Crate price due to it containing one less refill +<<<<<<< HEAD - bugfix: stundprods and teleprods now stun again - bugfix: igniters now work again - bugfix: floating now stops slips just as well as flying @@ -676,18 +1141,106 @@ - qol: Conveyor switches now tell you the speed setting of belts when examined. You can change the speed with a multitool! 2022-06-17: +======= + robbertapir: + - bugfix: stundprods and teleprods now stun again + - bugfix: igniters now work again + vincentiusvin: + - bugfix: fix h2/trit fires being too hot, outputting funny numbers, generally being + weird. +2022-06-14: + Son-of-Space: + - bugfix: A rogue windoor in a wall on Kilostation by the chapel in space was terminated + robbertapir: + - bugfix: Regal rats can now heal by eating all types of cheese, not just cheddar. +2022-06-15: + Iamgoofball: + - spellcheck: Nanotrasen has lost the rights to several popular confectionaries, + and has created "original" replacements. + Mothblocks: + - spellcheck: Adjusted description of moths eating clothes in preferences menu to + better reflect their current behavior. + SuperNovaa41: + - bugfix: Pill names now have a cap at 42 characters to prevent chat spam. + Timberpoes: + - bugfix: Fixes slips being broken again. + - bugfix: Fixes a weird edge case where anything that would prevent a storage closet + or locker from opening would instead cause stealth implant boxes to delete the + player inside them. + UDaV73rus, Tokoriso, dragomagol: + - rscadd: welding now has an animation! + dragomagol: + - bugfix: Renamed a few circuit boards to explain what frame they need + private-tristan: + - bugfix: kilostation solars no longer have plating and catwalks on the same tile + robbertapir: + - bugfix: the flavor text for changing the transfer amount on the medical gel is + no longer backwards + san7890: + - bugfix: Chameleon neckties will no longer give you a missing-texture cape and + a big ERROR icon by default. Trust me when I tell you this wasn't actually a + good thing. + timothymtorres: + - rscadd: Add dyslexia (illiteracy quirk) as a genetic mutation. + - rscadd: Add illiteracy as a effect for confusion disease symptom. +2022-06-16: + Fikou: + - bugfix: unrestricted wizard healing staff no longer tells you you are weak + Pickle-Coding: + - spellcheck: The chat will no longer lie by saying you shoved yourself into the + closet when someone shoves you into a closet. + PositiveEntropy, WJohnston, Dragomagol, LemonInTheDark, Riggle: + - imageadd: Resprites most variety of tiles into a better shaded version! + - code_imp: Damaged floors are now damaged overlays, meaning that most tiles should + properly display a damaged state! + ReinaCoder: + - imageadd: The riot helmet has been resprited! + SovietJenga: + - balance: Moves the botanogenetic shears into the botany research node and locks + it behind a botany experiment + - balance: Removes the advanced engineering node requirement from the botany node + Striders13: + - bugfix: fixed a windoor in metastation warden's office being layered incorrectly + YakumoChen: + - qol: Conveyor switches now tell you the speed setting of belts when examined. + You can change the speed with a multitool! + alphanerdd: + - bugfix: updates donk pocket box examine text to be more accurate + private-tristan: + - bugfix: icebox science has a scidrobe again! + timothymtorres: + - code_imp: Add atmospheric technician gas meter text tip +2022-06-17: + 13spacemen: + - bugfix: Reagent dispensers will actually remove reagents upon leaking + AnturK: + - rscadd: Added fishing, fishing rods and other fishing equipment. + - rscadd: Fishing related cargo crates & private packs. + - rscadd: Fishing technology and designs + Fikou: + - qol: gps and ore bag modsuit modules are now usable when suit is off +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: APC construction/repairs/deconstruction uses balloon alerts now. - bugfix: The circuit board of the Book Inventory Management Console now use the correct name extension (Computer Board) instead of (Machine Board) +<<<<<<< HEAD Melbert: - bugfix: Some heretic focuses apply more consistently now. - bugfix: Furious Steel should go away more often than not now. - bugfix: Fixes the fireman carry "body stuck to you forever" curse +======= + Iamgoofball: + - soundadd: Energy and Magic gunfire sound pitch now varies based on how much ammo + is left. + - soundadd: Ballistic gunfire now has a low-ammo click sound. + Melbert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Items getting knocked off (glasses and cigars), bad omens, and spaghetti falling from pockets should trigger on most knockdowns again like they used to. - code_imp: Cleaned up the knockoff component a bit. Also unit tests it. +<<<<<<< HEAD SkyratBot: - imageadd: The chaplain's jumpsuit and skirt has been resprited. - rscadd: Added fishing, fishing rods and other fishing equipment. @@ -716,16 +1269,66 @@ - imageadd: 3/4 sprites for MULEBots theOOZ: - bugfix: The xeno-tail can wag again, and does not get hidden when wearing a MODsuit +======= + - bugfix: Some heretic focuses apply more consistently now. + - bugfix: Furious Steel should go away more often than not now. + - bugfix: Fixes the fireman carry "body stuck to you forever" curse + ReinaCoder: + - imageadd: The chaplain's jumpsuit and skirt has been resprited. + SmArtKar: + - bugfix: Fixed locate weakpoint do_after being 3 seconds instead of intended 30. + Also you can no longer roll locate weakpoint until you get at least 20 minutes + of progression via objectives + SomethingFish: + - bugfix: Fixes mothic garlic pizza not producing the correct slice on slicing + Thunder12345: + - bugfix: The security office on Tramstation now has an air alarm + - bugfix: The water supply to Metastation's restrooms has been restored + - bugfix: Rocks will no longer grow into Tramstation's bar maintenance + - bugfix: A camera in IceBox's tech storage is now properly named + Twaticus, Wallemations: + - rscadd: '4 new emojis added to the joy mask! Check the AutoDrobe tweak: You can + now use internals with the joy/emotion mask' + atteria: + - imageadd: 3/4 sprites for MULEBots + bob-b-b: + - bugfix: fixed grav gen being overridable/overloadable + - bugfix: Fixes infiltrator toolbox not fitting all suit parts + distributivgesetz: + - rscadd: Added new moodlet for cascades, for more FLAVAH! + - bugfix: Rifts should now spawn at least 30 turfs from the nearest mass, and now + no longer stalemates. + - bugfix: Rift code is now no longer just copypasted supermatter bump code! Godmode + players, rejoice, you can actually leave the station now. + - bugfix: Made shuttle behaviour more predictable, escape shuttle can no longer + end the round prematurely during a cascade, it will stall out in hyperspace + instead. + - bugfix: Supermatter warp effect should be removed correctly now. + - bugfix: Fixed emergency lights not giving off red light. + - bugfix: Bluespace rifts pick a safe turf in CentCom dock now. + - spellcheck: Improves almost all messages that play during a cascade. + - admin: Better logging about resonance cascade-related actions. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-06-18: Melbert: - balance: AI Gorillas are now allied to AI monkeys, and AI Cargorillas won't try (and fail) to wail on crewmembers. +<<<<<<< HEAD SkyratBot: - bugfix: Fixes proto-nitrate tritium response requiring proto-nitrate bz response radiation energy requirement amount of energy to emit radiation pulses, and vice versa. - imageadd: Adds an inhand sprite for the atmos gasmask - imageadd: Updates the medical duffelbag inhand sprite +======= + Pickle-Coding: + - bugfix: Fixes proto-nitrate tritium response requiring proto-nitrate bz response + radiation energy requirement amount of energy to emit radiation pulses, and + vice versa. + ReinaCoder: + - imageadd: The chef's hat, jumpsuit/skirt, and suit has been resprited + distributivgesetz: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Shuttle hijack timeouts work now. jlsnow301 KubeRoot stylemistake Iamgoofball Kapu1178: - rscadd: Adds the TGUI say modal to replace speech input boxes. Many features! @@ -750,6 +1353,7 @@ them. - refactor: Refactors admin centcom reports into typescript. You must send the report to save the text. +<<<<<<< HEAD 2022-06-19: SkyratBot: - bugfix: the randomize_human proc now gives non-humans a name that matches their @@ -760,12 +1364,35 @@ - imageadd: The chef's hat, jumpsuit/skirt, and suit has been resprited - bugfix: the Chaplain's sparring sect now works on Kilostation again. - qol: Meta and Tram have autodrobes in dorms now. +======= + theOOZ: + - imageadd: Adds an inhand sprite for the atmos gasmask + - imageadd: Updates the medical duffelbag inhand sprite +2022-06-19: + ArcaneMusic: + - rscadd: A white cane, an indicator that the wielder is blind, can now be bought + and crafted from medical vendors and iron rods respectively. + FernandoJ8: + - bugfix: the randomize_human proc now gives non-humans a name that matches their + species + Guillaume Prata: + - qol: Airlock painter, extinguishers, geiger counter, holosign projectors, inducers + and welding tools use balloon alerts on some of their more spammy/error actions + and have some useless `to_chat` messages removed. + - qol: Health and Gene analyzers give a balloon alert on a successful scan. + JohnFulpWillard: + - bugfix: the Chaplain's sparring sect now works on Kilostation again. + - bugfix: Kilostation's Xenobiology is no longer roundstart on firelocks, and the + security medical post now has a scrubber. + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Changes supermatter powerloss function. It will transition to linear powerloss function at 5.88076GeV, and the linear powerloss function has been offset so that the transition between the two functions is completely smooth. - balance: Changes powerloss inhibition (both CO2 and psychologist effect) to change the rate of powerloss instead of changing the rate of both functions then comparing them to which one should be used. +<<<<<<< HEAD 2022-06-20: Christmas5: - bugfix: Changeling transformations now update scream/laugh types, age, as well @@ -786,6 +1413,30 @@ - qol: Health and Gene analyzers give a balloon alert on a successful scan. IsaacTheSharkWolf: - bugfix: Burn chamber air alarm(s) should work now. +======= + - rscadd: Gas canisters and other portable atmospheric machinery can now be packaged + with wrapping paper. + - rscadd: Replaces chat messages with balloon alerts for package wrapping related + failures. + Toastgoats: + - qol: Meta and Tram have autodrobes in dorms now. + bob-b-b: + - balance: Increased greed vending machine integrity and max items +2022-06-20: + ArcaneMusic: + - rscadd: Added several new goodie items to purchase through cargo, including translation + keys, mutadone autoinjectors, and a full RLD. + - code_imp: documented research_nodes and radios. + LemonInTheDark: + - code_imp: WAHHHH LIGHTING HAS CHANGED just backend mind. Please report any bugs + MTandi: + - bugfix: Fixed recycler bug that deleted the output stack because it was merged + with the input stack + - bugfix: Fixed recycler bug where it deleted stacks of 50 because it didn't have + enough space by removing recycle bins that reset its internal space from infinity + to the level of matter bin part + - qol: food now shows its type on examine +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: The Cursed Dufflebag now tells nearby people when it takes a bite out of someone. @@ -797,6 +1448,7 @@ dead, and doesn't heal if so. - bugfix: The Cursed Dufflebag no longer permanently makes you a pacifist and clumsy. - code_imp: Diggable component was changed to the Diggable element. +<<<<<<< HEAD OrionTheFox: - imageadd: rearranged all the security digitigrade uniforms into a security_digi.dmi in a continued organization effort. Please report any relevant Uniform icon @@ -819,10 +1471,26 @@ - bugfix: The engineering deliveries windoor on Blueshift now actually allows engineers to open it. SkyratBot: +======= + Mothblocks: + - bugfix: Fixed revolutions blaring alerts for a few seconds after winning. + - balance: Hacking the command console and winning revs no longer adds midround + threat. Instead, it'll force a heavy ruleset to spawn, and barring that, will + spawn a dangerous random event. + Paxilmaniac: + - qol: liquid plasma now points out in examine text that plasma can be collected + from it with a beaker + - bugfix: liquid plasma will now cool down gasses inside of heat exchanger pipes + to 100K instead of heat them to 5000K + SmArtKar: + - bugfix: Locate weakpoint objective now works again. + Watermelon914: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Added a way for administrators to globally disable circuit component sound emitters. - balance: Further limited the sound emitter component so that maximum volume is reduced and pitch is capped between -50 and 50 +<<<<<<< HEAD - rscadd: Gas canisters and other portable atmospheric machinery can now be packaged with wrapping paper. - rscadd: Replaces chat messages with balloon alerts for package wrapping related @@ -874,21 +1542,32 @@ - rscadd: Famed collector items; Funko- Chunko Fops have arrived on station! They talk, and they're here for those who are willing to spend their money on useless, soulless pieces of cloth! +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-06-21: Cursor, sprites by Crumpaloo.: - imageadd: The Cargorilla has found clothing in their size. - rscadd: Updated the Cargorilla's description to match their new look. GoldenAlpharex: +<<<<<<< HEAD - bugfix: Shooting with ballistic weapons at point-blank should hopefully work again. SkyratBot: - bugfix: Fixed revolutions blaring alerts for a few seconds after winning. - bugfix: The Traitor eye snatching objective will now appear in-game. - bugfix: The Lavaland Mafia map now displays safer flooring over empty space. - bugfix: mulebots can be turned on/off +======= + - bugfix: Fixed a runtime related to the TGUI white mode preference that would happen + every time someone would connect to the server. + JohnFulpWillard: + - bugfix: The Traitor eye snatching objective will now appear in-game. + MTandi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Oldstation: Added a lootbox for every role' - rscadd: 'Oldstation: Added 1 diamond ore spawn and 1 gibtonite spawn to asteroids' - rscdel: 'Oldstation: Removed redundant cable, pen, free pipe dispensers and the box of firing pins' +<<<<<<< HEAD nevimer: - bugfix: Fixes the path for the ninja jumpsuit. Still no digi version, has a TG bug with digi selected.. @@ -919,12 +1598,37 @@ - bugfix: N-T armories has finally fixed an assembly line issue, the SMG SABR actually comes with it's firing pin now. SkyratBot: +======= + Pepsilawn: + - bugfix: The Lavaland Mafia map now displays safer flooring over empty space. + SmoSmoSmoSmok: + - bugfix: mulebots can be turned on/off + Thunder12345: + - bugfix: A camera in Meta's tech storage is now properly named +2022-06-22: + Capsandi: + - bugfix: some walls in the crashed ship ruin, they are no longer full-bright + CoffeeDragon16: + - bugfix: switching bodies, such as becoming a lich or mindswapping will no longer + revoke a wizard's access to their spell book + Paxilmaniac: + - rscadd: Glass floor tiles can now be made out of both plasma glass, and reinforced + plasma glass + Pepsilawn: + - bugfix: Kilostation's Greater Port Maintenance has had a missing area patched + up. +2022-06-23: + Cheshify: + - bugfix: The pride and gluttony ruins have had some minor fixes + MidoriWroth: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Botany can now grow olives, which can be ground into a paste and mixed with water to make quality oil. - rscadd: You can now make custom sushi by using an ingredient on a seaweed sheet. The sushi will be named after the first ingredient you use. - balance: Pierogis now need a dough slice instead of a bun - balance: Quality oil costs 50 credits to order instead of 120 +<<<<<<< HEAD - bugfix: The pride and gluttony ruins have had some minor fixes tf-4: - rscadd: Botanists can now use the "Florist" alternate title. @@ -959,17 +1663,66 @@ (and having a total of 140 rep.) Jolly: - spellcheck: Fixed a few iMpRoPeR door names in Deltas Perma. +======= + Mothblocks: + - bugfix: Fixes laser pointer circuits crashing clients. + san7890: + - rscadd: Nanotrasen has now installed an HFR Room and an Atmospherics Project Room + on IceBoxStation. The Atmospherics Storage Room has also had catwalks installed + in to accomodate these rooms uninstalled around it. + - rscadd: The Atmospherics Loop on IceBoxStation has undergone some minor modifications + to accomodate "feeding" these new rooms. Notably, there is now a "minor" loop + on the lower Z-Level that you can push and pull gases towards to your (probable) + heart's content. + - rscadd: The AI Satellite, Incinerator, and some sections of Maintenance have been + shuffled around on IceBoxStation to accomodate these changes. +2022-06-24: + CoffeeDragon16: + - bugfix: getting your tongue removed will affect your speech again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Language encryption keys now only work when you've equipped the headset - bugfix: Language encryption keys no longer forever-grant you the language in some circumstances - bugfix: Language encryption keys now update when they're installed if you're currently wearing the headset +<<<<<<< HEAD - rscdel: Removed a tip suggesting being a drunk scientists boosts research point gain. This was removed at some point, but the tip remained, despite being incorrect. RatFromTheJungle: - rscdel: The STG has been banished from guncargo, back into the void it came from. SkyratBot: +======= + Tastyfish: + - bugfix: Opening wrapped crates now places them at the correct location. + antropod: + - bugfix: Randomized recipes (metalgen and secret sauce) are working again. + carshalash: + - bugfix: Jungle salad can now be eaten again + - bugfix: Eldritch nightmares were incorrectly added to the gold slime pool + dragomagol: + - qol: the cyborg hypospray now has a TGUI menu + theOOZ: + - qol: Rapid Lighting Device now fits in the utility toolbelt + timothymtorres: + - rscadd: Add magical reactions when hydroponics plants are hit with polymorph, + death, or resurrection magic. Plants with the anti-magic gene (holymelons) block + any kind of magical effect on the plant. +2022-06-25: + ArcaneMusic: + - bugfix: White canes now examine objects properly and sound correct when hitting + things. + Ebb, epochayur, SweptWasTaken: + - bugfix: Soap and biopsy tools now have suit storage sprites. + ElGood: + - imageadd: Bluespace RPED has unique inhand sprites + Gandalf2k15: + - refactor: Security level code has been refactored, please report any abnormalities + to the github. + Hamcha: + - bugfix: the message monitor console can now send admin messages again + Kylerace: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'the tram is now twice as fast, pray it doesnt get any faster (it cant without raising world fps) performance: the tram is now about 10 times cheaper to move for the server' @@ -977,16 +1730,34 @@ - code_imp: industrial_lift's now have more of their behavior pertaining to "the entire lift" being handled by their lift_master_datum as opposed to belonging to a random platform on the lift. +<<<<<<< HEAD - bugfix: Coffins' base sell price adjusted back to 100 credits as previously intended. - qol: the cyborg hypospray now has a TGUI menu - bugfix: White canes now examine objects properly and sound correct when hitting things. - refactor: Renamed "delimber" anomaly to "bioscrambler" anomaly +======= + Melbert: + - rscdel: Removed a tip suggesting being a drunk scientists boosts research point + gain. This was removed at some point, but the tip remained, despite being incorrect. + Pepsilawn: + - bugfix: Coffins' base sell price adjusted back to 100 credits as previously intended. + Rhials: + - bugfix: Supermatter cascade final objective no longer generates when the engine + has exploded. + SmoSmoSmoSmok: + - rscadd: You can attach a bell to your wheelchair + Son-of-Space: + - balance: The AIs freeform and purge law boards have been returned as a static + staple on all maps. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Prettier is now recommended as an extension for UI development (or just in general!) - refactor: Many, many interfaces have been hit with the prettier stick so please report any issues. There should be zero noticeable differences in how UIs look or function. +<<<<<<< HEAD - bugfix: the message monitor console can now send admin messages again - spellcheck: silver golems text no longer states that they are immune to most magic - bugfix: Supermatter cascade final objective no longer generates when the engine @@ -1031,10 +1802,49 @@ Original code by SabreML: - bugfix: Items in the suit storage slot won't turn invisible anymore SkyratBot: +======= + private-tristan: + - spellcheck: silver golems text no longer states that they are immune to most magic + skylord-a52: + - refactor: Renamed "delimber" anomaly to "bioscrambler" anomaly +2022-06-26: + Kylerace: + - bugfix: NanoTrasen has issued a ghost vaccine for the ghost virus that made ghosts + ghost deaf two days ago. now ghosts can hear again (as they are no longer ghost + deaf) + Profakos: + - spellcheck: fixes typos in ash lore + RandomGamer123: + - qol: Icebox atmos' shutters and airlocks are now transparent for better visibility + - bugfix: Fixed freon formation being nearly instant at most temperatures + Wallem: + - rscadd: Adds the Active Sonar Module, a module that allows the suit-wearer to + detect living organisms within a given radius. + castawaynont: + - bugfix: Allows Icebox's atmospherics APC to be accessible roundstart by moving + a console. + dragomagol: + - bugfix: advanced cyborg hypospray once again refills its chems + - qol: tochat for cyborg hypospray injections tells you which chem you injected + san7890: + - spellcheck: The exclamation point in the "Server Hop" verb has been deleted, which + now means you only need to type it in as 'server-hop'. Much nicer. +2022-06-27: + 13spacemen: + - rscadd: Added the current map to the hub entry + - qol: Shutters on Metastation have directions now + CoffeeDragon16: + - bugfix: regenerative core implants will automatically revive you again + Hamcha: + - bugfix: The decryption key to the Nanotrasen message network has been delivered + to the Syndicate Listening Post + IndieanaJones: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Gorillas now change speed when holding something vs. not holding something, as was always intended - balance: Made gorillas use their old speed value when they're holding something, and made them slightly faster when they're not holding something +<<<<<<< HEAD - bugfix: The decryption key to the Nanotrasen message network has been delivered to the Syndicate Listening Post - bugfix: People who gain or lose the monkified mutation no longer have invisible @@ -1090,10 +1900,36 @@ - bugfix: the hookshot bounty hunter, when summoned as an ert team member, is no longer identical to the armoured bounty hunter. - bugfix: bounty hunter IDs are no longer invisible save for the trim +======= + - bugfix: People who gain or lose the monkified mutation no longer have invisible + equipped items. + MTandi: + - qol: 'UI: Added option to enter fullscreen mode to OOC verbs' + - qol: 'UI: Added option to hide the status/tooltip bar to OOC verbs' + - qol: 'UI: Made the chat input change colors according to the selected theme' + Mothblocks: + - balance: The amount of midround threat required for a midround roll has increased + slightly from 6.5 to 7. + - balance: Lowered the maximum threat level on sub-20 pop. + - balance: Lowered the number of roundstart traitors. + - server: Fixed "low_pop_minimum_threat" being incorrectly named. It has been changed + to "low_pop_maximum_threat". + Original code by SabreML: + - bugfix: Items in the suit storage slot won't turn invisible anymore + Paxilmaniac: + - code_imp: times for food items are now in X SECONDS format, functionality is still + the exact same + - qol: mining and labor shuttle home docks are no longer varedits of /stationary, + and are now their own subtype + Pickle-Coding: + - bugfix: Fix scrubbers not being able to be deconstructed when connected pipe disconnects. + RandomGamer123: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes nuke op reinforcements having no HUD icon when seen by other nukeops, nor being able to see the HUD icons of other nuke ops - code_imp: Fixed a runtime if update_sight is called on a mob whose client has no eye +<<<<<<< HEAD - spellcheck: Fixed a lack of line breaks in the operating computer when displaying surgeries with required chemicals - bugfix: Fix scrubbers not being able to be deconstructed when connected pipe disconnects. @@ -1101,10 +1937,23 @@ theselfish: - spellcheck: A certain cracked pocket watch's description ends better. 2022-06-29: +======= + private-tristan: + - balance: the meteor with engines strapped to it now has air in its rocks + san7890: + - bugfix: Nanotrasen hired a contracting company to completely re-do the Metastation + brig, but the commanding official was chumped- and was left with was a few decalling + changes and some re-piping. How ultimately odd. + - qol: Nanotrasen has used a new method of installing signs to their walls. If you + see any floating signs, or signs that appear to be positioned in incorrect locations, + please contact your nearest reality manager. +2022-06-28: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 13spacemen, Gandalf2k15: - rscadd: Examining and other chat outputs now display in blocks to make them easier to see - bugfix: AI and borgs no longer have their name show twice upon being examined +<<<<<<< HEAD Guillaume Prata and Wallem: - rscadd: Botany starts with watering cans instead of buckets now. There is also a research locked advanced watering can which generates it's own water. @@ -1126,11 +1975,76 @@ - code_imp: times for food items are now in X SECONDS format, functionality is still the exact same - rscadd: Adds a special Medical ERT belt + gives it to medical ERT +======= + CoffeeDragon16: + - bugfix: plasma glass floor tiles will no longer sometimes be invisible + - bugfix: pianos will now look broken when they are damaged + - soundadd: pianos make a DONG sound when hit + Comxy: + - bugfix: Fixes martial arts auto reset bug. + GoldenAlpharex: + - bugfix: Snail people are no longer too shy to show their eyes, and will now expose + them out for everyone to see them, once more. + Melbert: + - bugfix: Frozen stuff is now properly actually recognized as frozen and won't re-freeze. + - refactor: Refactored how Knock (spell) tells stuff to open up, makes it easier + to add more knockable things. + Paxilmaniac: + - bugfix: fixes the ocean in the beach gateway having a different gasmix than the + sand, making the place unbreathable + Profakos: + - bugfix: Tramstation aux construction console works again as intended. + - bugfix: the hookshot bounty hunter, when summoned as an ert team member, is no + longer identical to the armoured bounty hunter. + - bugfix: bounty hunter IDs are no longer invisible save for the trim + RandomGamer123: + - spellcheck: Fixed a lack of line breaks in the operating computer when displaying + surgeries with required chemicals + Son-of-Space: + - rscadd: derelict1.dmm was overhauled into a derelict version of the Sulaco bridge + Y0SH1M4S73R: + - bugfix: The runic knight helmet's worn sprites have had their alignment fixed. + cinder1992: + - rscdel: Delta-pattern station quartermasters no longer have to listen to the sound + of a fire alarm every time their miners use the mining shuttle. + dragomagol: + - bugfix: Broken tiles (as seen in places like caravan ambush) now match our smooth + iron tiles + san7890: + - bugfix: The Chief Engineer's Keycard Authentication Device is no longer covered + by a electric sign on IceBoxStation. + - bugfix: Disposals will no longer now empty out in the middle of IceBoxStation's + maintenance tunnels. +2022-06-29: + Guillaume Prata and Wallem: + - rscadd: Botany starts with watering cans instead of buckets now. There is also + a research locked advanced watering can which generates it's own water. + JohnFulpWillard: + - bugfix: the Gravity Generator no longer plays several looping sounds. + - bugfix: Oldstation's gravity generator now properly spawns off. + Melbert: + - bugfix: Service members can access the service dorms on Deltastation again + - bugfix: Miners can access the shipping office on Deltastation again + RandomGamer123: + - qol: Makes the noblium gas shells experiment explicitly clear that it requires + Hypernoblium gas and not just "Noblium" + - spellcheck: CentCom is now properly capitalised in the description of an experiment + Salex08: + - spellcheck: The Brand of Dance description is correct now + - bugfix: headpikes can be made again. + Sebbe9123: + - rscadd: Adds a special Medical ERT belt + gives it to medical ERT + Y0SH1M4S73R: + - bugfix: Fixed a runtime that occurs when inflicting a blunt wound on an armless + human. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: TGUI Say now retains current messages / keying through history doesn't erase your current message. - bugfix: TextArea keydown prop has been renamed so as to not trigger double keydown events. - bugfix: TGUI say now properly expands when viewing recent messages +<<<<<<< HEAD - spellcheck: The Brand of Dance description is correct now - bugfix: Fixed a runtime that occurs when inflicting a blunt wound on an armless human. @@ -1147,10 +2061,30 @@ Melbert: - bugfix: Comms console hacking will be interrupted if the comms console itself is destroyed or depowered. +======= + san7890: + - rscadd: Ice Box Station's got a new look. Notably, the cold room is on the bottom + floor with the kitchen all being up on the upper Z-Level +2022-06-30: + 13spacemen: + - imageadd: Shutters and window shutters on all stations are now directional + Melbert: + - bugfix: Comms console hacking will be interrupted if the comms console itself + is destroyed or depowered. + - bugfix: Cult sacrificing someone with a soul will no longer give you an empty + soulstone when it should give you a filled one. + - bugfix: Using a soulstone on a soulless corpse will now properly poll ghosts and + allow a new shade. + - bugfix: You can no longer capture spirits with soulstones you can't even release + spirits from + - bugfix: You can no longer hypothetically capture yourself with a soulstone + - code_imp: Some cleanup on aisle soulstone. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: The blood walk element has been changed from a bespoke element to a component. - code_imp: MULEs now use the blood walk component. - bugfix: MULEbots no longer track blood forever. +<<<<<<< HEAD Nerev4r: - rscadd: Adds a new Ashwalker-specific language, Ashtongue. Go roleplay with them if you wanna speak it too! @@ -1166,10 +2100,16 @@ - imageadd: The Makarov pistol has been resprited - imageadd: The Ghoulbot now has a new sprite matching the new 3/4 mulebot sprites - imageadd: Rootbread slice toppings have a sprite now. +======= + Profakos: + - imageadd: Rootbread slice toppings have a sprite now. + RandomGamer123: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Removes a method that allows xenobiologists to produce slimes of every colour and bypassing the intended progression sequence by making the disease induced by advanced mutation toxin only produce grey slimes unless the infected person is a sentient non-monkey human +<<<<<<< HEAD - bugfix: headpikes can be made again. Zonespace27: - bugfix: Ash runes should no longer harddel @@ -1185,3 +2125,15 @@ - rscdel: removed the draconic necklace, skeletal key, and ashen staff recipes -- placed into rituals - bugfix: fixed icewalker nest named "ash walker nest" to "ice walker nest" +======= + ReinaCoder: + - imageadd: The Ghoulbot now has a new sprite matching the new 3/4 mulebot sprites + - imageadd: The Makarov pistol has been resprited + Salex08: + - qol: Added a new tab for the autolathe which allows you to dispense not only iron + or glass but all the mats you put in + - bugfix: Fixes missing "=" operator in autolathe + nichlas0010: + - bugfix: The Orion Trail's Realism Mode works again, triggering negative events + for the player +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-07.yml b/html/changelogs/archive/2022-07.yml index 8192fd0f22f..675bf0171df 100644 --- a/html/changelogs/archive/2022-07.yml +++ b/html/changelogs/archive/2022-07.yml @@ -1,4 +1,5 @@ 2022-07-01: +<<<<<<< HEAD Desminus: - rscadd: Jarnsmiour gun cargo company. They sell knives. - rscadd: You can now purchase the bowie knife through Jarnsmiour @@ -54,11 +55,22 @@ error sprites appearing - rscadd: Furry Pride Spraypaint added to spray cans - rscdel: Y##f In H##l Sprapaint removed from spray cans +======= + Guillaume Prata: + - qol: Hypernob Protection (given to plasmamen that are breathing Hypernob as gas) + is a status effect now and gives better feedback to the user. + - balance: Hypernob Protection gives a small slowdown. + Hamcha: + - bugfix: The agent card now correctly allows you to take anyone's identity, even + if their name contains numbers + OrionTheFox: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Chainsaws can now actually cut wood! So can the giant axe that is the PKC, and other chainsaw items - but, alas, esword handles alone can not, and you must actually turn them on. Also, all mining implements can mine scattered stones as well! - bugfix: Chainsaws are now faster when they are on, and slower when they aren't. +<<<<<<< HEAD - bugfix: The agent card now correctly allows you to take anyone's identity, even if their name contains numbers - bugfix: the Gravity Generator no longer plays several looping sounds. @@ -88,6 +100,22 @@ - bugfix: Eldritch nightmares were incorrectly added to the gold slime pool. - qol: Gas filtering cloth are now smaller and can fit inside boxes! - bugfix: Fixed a bug that made the hacking status display not appear. +======= + Salex08: + - bugfix: blacklists placeholder food items in the random food generator which caused + error sprites appearing + ShizCalev: + - qol: Gas filtering cloth are now smaller and can fit inside boxes! + chesse20: + - rscadd: Furry Pride Spraypaint added to spray cans + - rscdel: Y##f In H##l Sprapaint removed from spray cans + jlsnow301: + - code_imp: Refactored a large number of TGUI interfaces into TypeScript. If something's + broken, report it! + private-tristan: + - bugfix: metastation library no longer has 2 air alarms +2022-07-02: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: Clown/Mime survival boxes won't have a mostly pointless breathing mask, as their basic mask can be used for internals. @@ -148,6 +176,7 @@ Meyhazah: - imageadd: new sprites for the Chaplain's crusader, ancient, profane and follower outfits. +<<<<<<< HEAD Nerev4r: - bugfix: Snail eyes are recolorable. For real this time. On God. Paxilmaniac: @@ -201,12 +230,42 @@ - rscadd: Furry Pride large spraypaint added to spraycans - rscdel: removes movement and combat mode from the status tab - bugfix: fixed crystalizer passing any item as the user and causing a runtime +======= + NotZang: + - qol: Consistency with the other bot's examination text. + Salex08: + - admin: Admins can now cancel midround random events + TheBoondock: + - bugfix: fixed telekinesis teleporting gun shenanigan + jlsnow301: + - bugfix: Fixed a bug that made the hacking status display not appear + lizardqueenlexi: + - bugfix: Limb growing code now uses species_color instead of mutant_color for synthetic + limb coloration + necromanceranne: + - imageadd: Improves the sprites for bullets, thermal projectiles, and introduces + pellet sprites. + orthography: + - bugfix: fixes intercoms being the incorrect state. + san7890: + - bugfix: Chefs on IceBoxStation will now start with eggs and milk again. +2022-07-03: + Pepsilawn: + - bugfix: Kilostation's Supermatter was made more consistent, it will no longer + start with its pumps lacking pressure target checking. + Y0SH1M4S73R: + - bugfix: Maids in the Mirror are unaffected by the gaze of ghosts + chesse20: + - rscadd: Furry Pride large spraypaint added to spraycans + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: There is now a new preference in Game Preferences, Suppress All Ghost Rolls. If you tick this preference, you will not get a singular window pop-up whenever a Ghost Role is available. Intended for the few who really do need it. - admin: Admins get another additional preference where Suppress All Ghost Roles only works while they are currently in an adminned state. They will still get ghost rolls normally when they are in a deadminned state. +<<<<<<< HEAD - balance: Pluoxium now heals oxygen damage when breathed - refactor: Orbit UI has been reworked. - bugfix: you start with the right amount of breathing mask again @@ -216,10 +275,30 @@ - code_imp: The urban coat now uses GAGS. - code_imp: The polychromic duster and peacoat have been converted to GAGS. 2022-07-05: +======= +2022-07-04: + Melbert: + - code_imp: Some traits which mistakenly were sourced from a hard reference are + no longer. + Salex08: + - bugfix: you start with the right amount of breathing mask again + TheBoondock: + - bugfix: fixed crystalizer passing any item as the user and causing a runtime + - balance: Pluoxium now heals oxygen damage when breathed + jlsnow301: + - refactor: Orbit UI has been reworked. + san7890: + - bugfix: Okay, this time I promise you have eggs and milk in the IceBox Kitchen. +2022-07-05: + Fikou: + - balance: The supermatter running into you is no longer just as deadly as you running + into the supermatter. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: Miners rejoice! A few of the mostly useless and spammy messages that get send to your chat were changed to balloon alerts or straight up removed. Hopefully, you will have an easier time listening to the radio chatter now. +<<<<<<< HEAD SkyratBot: - code_imp: removes a stray verb call from the status tab - balance: The supermatter running into you is no longer just as deadly as you running @@ -248,11 +327,60 @@ capsaicinz: - bugfix: corp. reg. manual is now readable. - config: set the skyrat wiki link to the most up-to-date one. +======= + JohnFulpWillard: + - bugfix: Thief's preference icon has been fixed, and now properly has hair. + Mooshimi: + - rscdel: Removed the lightbulbs inside the Ordinance burn chambers on Kilo and + Icebox. + - rscdel: Removed the mask sign inside the turbine burn chamber on Icebox. + RandomGamer123: + - bugfix: Adds an air scrubber and vent to a section of hallway that was without + them on MetaStation. + Salex08: + - bugfix: fixes a major oversight with steal gun objectives + magatsuchi: + - code_imp: removes a stray verb call from the status tab + - rscdel: removes movement and combat mode from the status tab + necromanceranne: + - code_imp: Added code functionality for autofire windup and resetting, both redefinable. + Nothing uses this code just yet! + - bugfix: Ensures pirate outfits and justice suits are actually able to protect + from damage, as their armor values suggests they should. + - bugfix: Stops golems from wearing the armored versions of the pirate outfits. + vincentiusvin: + - refactor: Changed how canister calculate their overpressure/overtemp damage. No + gameplay changes expected. + zzzmike: + - bugfix: head of staff announcement added to QM + - bugfix: QM added to job blacklist (like other command members are) + - bugfix: QM added as command in CrewManifest.js +2022-07-06: + Guillaume Prata: + - imageadd: The QM's RPG trim icon got updated to use Command's blue instead of + the old cargo brown. + Iamgoofball: + - bugfix: Fixes the Herald being able to drag it's mirror around. + - bugfix: Fixes the Structural Weakpoint Objective to do a normal, smaller explosion, + especially on Lowpop(~20) and gives the objective a lower weight. + Melbert: + - balance: Nettles and Deathnettles are now normal sized, up from tiny. (Number + per plant bag has decreased from 100 to 33.) + orthography: + - bugfix: icebox pumps now match the standard of every other map + - bugfix: gives access to the APC as the AI, and adds more camera coverage where + it belongs. + timothymtorres: + - bugfix: Fix Confusion and Self-Respiration virus symptoms to appear at final stage. + vincentiusvin: + - admin: experiment completion are now logged in research.html +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-07-07: Crumpaloo, jlsnow301, JohnFulpWillard: - rscadd: Typing indicators now use your speech bubble type, rather than all being the same, so Cyborgs no longer look like a human when typing, and Lawyers have that cool speech bubble again. +<<<<<<< HEAD Deek-Za: - bugfix: Prevents a cryopod from breaking permanently through a particular exploit. Gandalf2k15: @@ -275,6 +403,23 @@ tf-4: - bugfix: Modular contraband seeds in the seed vendor are now contraband once again. 2022-07-08: +======= + Mooshimi: + - refactor: Reworked the wiring in AI Sats incorporating multiple layered wiring. + dragomagol: + - bugfix: pAI screens light up with an alert when there's a personality to download! + lizardqueenlexi: + - bugfix: made plastic flaps in MetaStation deliveries area transparent + orthography: + - bugfix: Fixed sec vestibule maintenance + - bugfix: fixed metastation atmos areas. + stylemistake: + - bugfix: Fixed "Script Error" in tgui and tgchat (hopefully). +2022-07-08: + CursedBirb: + - bugfix: Qm coat can carry telebaton + - refactor: Qm coat is a subtype of department coat like other heads clothes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: You fold roller beds and bodybags with a right click instead of click and dragging into you. @@ -289,6 +434,7 @@ one with 4 thin windows)' - bugfix: '[KC13] Fixed the stacked old AI turret in the AI upload hall.' - bugfix: '[KC13] Fixed some wall mount items not being directional (icky var edits).' +<<<<<<< HEAD SkyratBot: - bugfix: The changeling tentacle power now properly functions the way its description says it does. @@ -305,10 +451,13 @@ GoldenAlpharex: - bugfix: Fixed trapdoors freaking out when you destroy their floor tile without having a remote attached to said trapdoor. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: The central service wing has been completely remapped to help put the chef and bartender front-and-center for crew interactions. Hydroponics was moved to the lower floor to accommodate this change. +<<<<<<< HEAD Melbert: - bugfix: Dashes such as the Heirophant staff and Ninja sword should no longer permanently break on rare occasions. @@ -327,6 +476,47 @@ - bugfix: Fixed scrolling the orbit ui - admin: Get-Current-Logs and Get-Server-Logs now let you download entire folders at once +======= + Pepsilawn: + - bugfix: Kilostation had a few areas in space around the ordnance test site fixed + up. + Profakos: + - bugfix: corrected the minimum player count of a few disease events + VioletN: + - bugfix: The changeling tentacle power now properly functions the way its description + says it does. + Zonespace27: + - code_imp: Code for Academy, Challenge, Spacebattle, and Wild West away missions + has been removed + jlsnow301: + - bugfix: Syndicate fission360 apps work again + lizardqueenlexi: + - bugfix: fixed an incorrect disposals junction in Tramstation Medical department + orthography: + - balance: removes the BMP spawns that are out in bum-fuck nowhere. + - bugfix: fixes the lack of air in the BMP asteroid spawns. +2022-07-09: + 13spacemen: + - rscadd: Experimental Syndicate Teleporter is now available in the Traitor Uplink + for 8 TC. Warning, not as safe as Nanotrasen Teleporters. + Fikou: + - bugfix: ethereals no longer revive after being changeling drained + GoldenAlpharex: + - bugfix: Fixed trapdoors freaking out when you destroy their floor tile without + having a remote attached to said trapdoor. + LemonInTheDark: + - bugfix: Thermomachines will properly have a dropshadow + - bugfix: Weather will be blurred as expected + Melbert: + - bugfix: Dashes such as the Heirophant staff and Ninja sword should no longer permanently + break on rare occasions. + QuacksQ: + - spellcheck: Fixed the desc of paper walls + Sheits: + - bugfix: Fixes a stray pixel on female human sprites + Toto5561: + - imageadd: Added new bacon sprites. ~~Accidentally~~ added new mint sprite. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vladoricious: - qol: Tacticool turtlenecks and skirtlenecks now have suit sensors installed! No more excuses. Turn em up. @@ -334,6 +524,7 @@ - qol: Sign Language users now have a unique speech indicator as well as a visual indicator of the tone of their message, making it easier to communicate both with and as a sign language user. +<<<<<<< HEAD 2022-07-10: Melbert: - bugfix: Bolts of Necropotence works again. @@ -371,11 +562,22 @@ - bugfix: Weather will be blurred as expected - bugfix: Qm coat can carry telebaton - refactor: Qm coat is a subtype of department coat like other heads clothes +======= + Zonespace27: + - admin: Get-Current-Logs and Get-Server-Logs now let you download entire folders + at once + carshalash: + - balance: Syndicate no longer wants easily printed upload boards. + jlsnow301: + - bugfix: Fixed scrolling the orbit ui + kawoppi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: rag cleaning speed is now influenced by your cleaning skill - bugfix: cleaning with a rag now gives you cleaning skill experience - bugfix: rags can now be used to wash bloodied windows - bugfix: soap is no longer restricted from washing worn clothing, as this doesn't seem to be causing issues anymore +<<<<<<< HEAD 2022-07-11: Jolly: - qol: On BlueShift, you shouldnt' have to (hopefully) fear frying your fingers @@ -384,18 +586,80 @@ heads may access them as well as engineers, they're located somewhere relative in maints. Melbert: +======= + lizardqueenlexi: + - rscadd: Added a sorting disposals pipe for the Tramstation dormitory, allowing + packages to be sent there + - bugfix: Fixed two incorrect sorting disposals pipes on Tramstation that prevented + packages from reaching certain destinations + - bugfix: Added four missing names to sorting disposals pipes on Tramstation + orthography: + - bugfix: fixed APC wiring + san7890: + - admin: The ID of the Ticket will now show up in all associated Admin PM Messages + when logged. + sergeirocks100: + - imageadd: The library computer now has four directional sprites instead of just + one. + unit0016: + - rscadd: The SBC Starfury has been ever-so-slightly tweaked! Two of the shuttles + are now where the gunnery bays used to be, and the rest of the differences are + largely cosmetic. Largely. + - code_imp: Survival pod fans have been split off into their own file. + vincentiusvin: + - balance: pumps and scrubbers have their heat and pressure limit buffed to be the + same as unshielded cans. + - balance: cans have their release pressure buffed to 2533kpa. + zxaber: + - bugfix: Airlock shock indicators on diagnostics HUDs will now correctly be removed + when the door is unshocked. +2022-07-10: + Melbert: + - bugfix: Bolts of Necropotence works again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Iceboxstation's EVA now comes kitted out with equipment that may actually help you out if you want to go outside. Including special winter coats that can carry big oxygen tanks and boots to prevent you from slipping on ice. - rscadd: Iceboxstation's arrivals hallway, and many of the rooms around it, have had their style and layouts updated slightly. +<<<<<<< HEAD - bugfix: Tonic Water heals dizziness instead of causing it SkyratBot: - code_imp: dehardcodes admin grantable objectives list +======= + Nuke: + - bugfix: Bubblegum will now beat your ass again. + SmoSmoSmoSmok: + - code_imp: dehardcodes admin grantable objectives list + YakumoChen: + - balance: GPS designs can no longer be exported to autolathes. + cacogen: + - bugfix: The generic station name with the long number in words is rarer + jjpark-kb: + - bugfix: trailers will actually trail their attached vehicles + magatsuchi: + - refactor: changes storage from a component to a normal datum + orthography: + - bugfix: fixes the piping of the ORD lab. + - bugfix: changes a pump subclass. + timothymtorres: + - bugfix: Fix simple mob deaths causing deadchat notifications. Special mobs still + cause deadchat notifications (brood spiders, elite lavaland mobs, morphs, revenants, + space dragons) + - bugfix: Fix deafness virus symptom to be permanent if resistance threshold is + met. +2022-07-11: + Melbert: + - bugfix: Tonic Water heals dizziness instead of causing it + san7890: + - bugfix: On Tramstation, prisoners can now exit the labor shuttle without being + trapped inside. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: On TramStation, the xenobiology pen disposals bins should no longer pop off the floor tile on the turf they reside on. They should also now like... actually work. Nanotrasen had to re-route the disposals a bit to accomodate, but that's alright. +<<<<<<< HEAD tf-4: - bugfix: The tile sprayer now has the correct colour for the security decal preset. - bugfix: The "steal the hypospray" antag objective is now possible. @@ -435,6 +699,84 @@ softcerv: - rscadd: ports over the anesthetic machine from beestation. 2022-07-14: +======= +2022-07-12: + Couls: + - bugfix: AI detector now correctly tells you when the AI is out of range + - qol: Uplink description for ai detector properly reflects that it no longer reveals + AI view + Kapu1178: + - soundadd: Random ambience volume has been reduced. + RimiNosha: + - qol: Lavaland ambiance is now much less loud and unpleasant. + Salex08: + - bugfix: fixes silver spawned food not being disgusting + Timberpoes: + - bugfix: Admins will no longer get ADMIN LOG message spam when reproductive extracts + are fed. + magatsuchi: + - bugfix: properly updates storage object icon states + - bugfix: ghosts can now view storage objects again + - bugfix: boxes can no longer fit normal sized objects + san7890: + - rscadd: Across all five station's, that little bartender's cubby area is now known + as the "backroom". How spooky. + - bugfix: TramStation's Bar Lounge now has an air alarm. + zxaber: + - rscadd: Added new experiments for unlocking the path to Durand, Gygax, and Phazon + exosuits. Weapons tech and Advanced Weapons tech are no longer required. +2022-07-13: + CoffeeDragon16: + - bugfix: golems will now have tongues again, and adamantine golems can now talk + to all golems again + - rscadd: cardboard golems no longer have tongues + EOBGames: + - rscadd: A whole host of new posters have just become available. + - rscadd: 'For the architects among you: a number of new aesthetic options are available + for mapping with. Let your creativity free!' + ReinaCoder: + - imageadd: The safe and floor safes have been resprited + ShizCalev: + - bugfix: EMP'd airlocks will now have the proper shocked door overlay. + - bugfix: Fixed airlocks sometimes becoming permanently electrified after being + unelectrified (honk) + - bugfix: Fixed airlocks sometimes showing as electrified even though they are not. + - bugfix: Fixed a scenario where varedited airlocks could sometimes become inadvertently + permanently electrified. + - bugfix: Fixed EMP'd airlocks which were manually electrified after becoming unelectrified. + - bugfix: EMPing an airlock which is already temporarily electrified will now reset + its timer if it has less than 30 seconds remaining. + Spookuni: + - qol: Genetics gets a back desk now for easier interaction with passing maintenance + dwellers + Thunder12345: + - rscadd: The mining outpost was unfortunately destroyed in an industrial accident. + A replacement has been constructed on a group of islands in the magma sea. + jlsnow301: + - admin: Fixed many "admin.fun" listings that were incorrect or missing. + orthography: + - bugfix: asimov++ is now editable + unit0016: + - rscadd: On Icebox, The RD's office and the AI's upload have received murals. + - balance: That one table in the middle of the Icebox upload is gone. Yes, this + is a balance change. +2022-07-14: + ANAME593: + - balance: heretic blades do 20 damage up from 17, have 35% armor penetration, but + deal 20% less damage to structures like lockers + ArcaneMusic: + - code_imp: Crafting recipes now uniformly use the same style for how long they + take. + Christmas5: + - rscadd: Shapeshifting now updates your age, physique, hair gradients, neck items + and underwear colour. + - rscadd: The Human form ability now uses a radial menu. + - bugfix: Human form should now update your species accordingly. + - bugfix: Last resort doesn't respawn you as an actual monkey, but as a monkeyized + human. + CoffeeDragon16: + - bugfix: ethereals will now properly spawn with tongues +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ebb: - rscadd: You can now rip pieces of tape off of tape rolls and use them to tape people's mouth closed by putting it on them as a mask. Either through the stripping @@ -446,6 +788,7 @@ Fikou, sprite by Mooster: - rscadd: Baseballs are now available in the Baseball Field on the Holodeck. - rscadd: Baseball Bats can now hit thrown objects mid-air to send them back. +<<<<<<< HEAD ShizCalev: - bugfix: EMP'd airlocks will now have the proper shocked door overlay. - bugfix: Fixed airlocks sometimes becoming permanently electrified after being @@ -519,12 +862,50 @@ - rscadd: The comedian suit and coat are now available in the AutoDrobe! Wearing them may make you feel like you need a psychiatrist. 2022-07-17: +======= + JohnFulpWillard: + - bugfix: The CE can now trim people's IDs to Atmospherics Technician + - bugfix: The HoS can no longer trim people's IDs to Lawyers. + MMMiracles: + - bugfix: The service hallway on Tram now has an APC, as well as a public cut through + between the two smaller hallways on the lower floor. + magatsuchi: + - bugfix: safes open correctly once again + necromanceranne: + - imageadd: Improves upon the Makarov's colours. + - rscadd: There is (in no way) now a 10mm Makarov that (wasn't) added to the game. + zxaber: + - imageadd: The Airlock Shock Indicator seen when using a Diagnostics Hud has a + new sprite. +2022-07-15: + Mothblocks: + - soundadd: Power is no longer required for ambience. + Salex08: + - bugfix: eyesnatcher objective wont cause runtime errors anymore + TheBoondock: + - bugfix: fixed attaching a knife to cleanbot succeeding even when user has NO_DROP + jlsnow301: + - code_imp: New string ops for tgui + - bugfix: Removed some errant loggers left in UIs + orthography: + - rscadd: Adds a new possible cosmetic change to the ordinance lab. + timothymtorres: + - bugfix: Fix rolling paper pack spawning empty +2022-07-16: + 13spacemen: + - rscadd: You can now deconstruct living AIs and turn them back into AI core frames + with MMIs/posibrains. The AI can finally be a real boy + - qol: AIs that are gibbed now drop MMIs/posibrains + - rscadd: The comedian suit and coat are now available in the AutoDrobe! Wearing + them may make you feel like you need a psychiatrist. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, NecromancerAnne: - balance: The Biohazard Sprayer, Power Fist, Flamethrower and Dart Pistol are no longer in the nukie uplink, instead being given as bonuses in the keycarded parts of the base. Guillaume Prata: - bugfix: Roller beds can actually fold when right clicked now. +<<<<<<< HEAD Jolly: - rscadd: The Central Command evac shuttle dock has been remapped. - qol: The Interlink outside areas are now properly lighted. No more florescent @@ -555,6 +936,63 @@ - bugfix: You can no longer remove the turbine's rotor if its on or if its panel is closed - imageadd: Unique sprite for the Hypernob crystal from atmos +======= + Holoo-1: + - bugfix: fixed canister ui being too small + LordVollkorn / Gage Gaebler: + - rscadd: The toiletbong has been added to the game. Build it using the craftingmenu, + a wrench, a flamethrower and a nearby toilet. + - balance: Deconstructing a toiletbong will empty the flamethrower's plasma tank. + Engineers, you may build toiletbongs for anyone without feeling guilty. + - rscadd: The toiletbong can be emagged. But should you? + - rscadd: Plums have been added to Botany. Get your plum seeds today. *Click* Noice. + - rscadd: Plumcake and plumcake slices have been added. Find them in the craftingmenu. + - rscadd: Plumjuice and plumwine have been added. Pour yourself a glass. + - rscadd: A new drink called "The Hat" has been added. A hat is also where you drink + it from. + RandomGamer123: + - bugfix: You can no longer remove the turbine's rotor if its on or if its panel + is closed + SuperSlayer: + - spellcheck: Traitor codewords are now given by their employer, rather then by + The Syndicate + TheBoondock: + - rscadd: After years of research, the council of elder atmosian created and publish + an experimental design for a long range gas analyzer. The design specified it + to be coated in gold to signify the glory of atmosia. + magatsuchi: + - bugfix: mass transfer between storage no longer causes ear bleeds + timothymtorres: + - bugfix: Fix talking while mouth is gagged with tape + vincentiusvin: + - qol: Canisters, scrubbers, and pumps no longer stop reacting when wrenched. + - code_imp: Canisters should process once instead of twice when spawning. No gameplay + changes expected. +2022-07-17: + Cheshify: + - rscdel: Removed the ability to have impure or failed chems + - balance: A number of impurities in chemicals are now inverses + - bugfix: Mannitol now has a working inverse + D4C-420: + - imageadd: Unique sprite for the Hypernob crystal from atmos + Fikou: + - bugfix: modsuit flamethrower will no longer push objects + Fikou, NecromancerAnne, Wallem: + - qol: nuke ops emergency box now contains a crowbar, screwdriver and mini welder + - rscdel: nuke ops leader krav maga is removed + - balance: nuke op survival knife has been replaced with an energy dagger + - balance: energy daggers have light armor penetration and wound bonus + - qol: energy daggers now emit a soft red light + - balance: nuke op makarov has been replaced by the ansem, a 10mm clandestine pistol. + - rscadd: nuke op diamond drill has been replaced with an entrenching tool, a more + compact wrench/pickaxe/shovel + Melbert: + - qol: 'Icebox: The Quartermaster''s office has had its windows reinforced.' + Mooshimi: + - bugfix: Fixed some strengths on mineral walls, making them harder to break through + via hulk and mechs. + Y0SH1M4S73R: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: the igniter, mirv, and summoning components and the knockback, lifesteal, light_eater, and venomous elements are now compatible with projectile spells. - code_imp: the lifesteal, light_eater, and venomous elements are now compatible @@ -567,6 +1005,7 @@ it had to be an atom. - code_imp: projectile spells set their fired projectiles' `fired_from` var to themselves instead of the turf they were cast from +<<<<<<< HEAD - bugfix: modsuit flamethrower will no longer push objects SuperSlayer: - spellcheck: Traitor codewords are now given by their employer, rather then by @@ -629,14 +1068,73 @@ - bugfix: You can now recolor graffiti to dark colors. - admin: Admins can now cancel midround random events - bugfix: signalCommander now works without altering the default frequency +======= +2022-07-18: + 13spacemen: + - bugfix: Tramstation's shutters are directional once again + ArcaneMusic: + - rscadd: Television themed headgear has arrived! Hack a costume vendor or hollow + out an unsecured status display to make one. Just be careful not to get flashed + while wearing one. + ChakatStormCloud: + - bugfix: 'Virology: all healing symptoms no longer receive an accidental power + boost at Stage Speed 6.' + Ghommie: + - bugfix: You can now recolor graffiti to dark colors. + JohnFulpWillard: + - bugfix: Fixed several instances where we should check internal organs for external + organs + Kylerace: + - bugfix: diagonal movement in space works again + LemonInTheDark: + - balance: Humanoid xenos can now eat people by aggressively grabbing their target, + and dragging them onto themselves. Sneak a knife in and start moving to really + ruin a filthy ghost role user's day + Melbert: + - bugfix: Thermal Vision mutation is no longer 1/10th its intended duration + - bugfix: Banana Glutton's ability will no longer break after eating a banana. + Moose1002: + - qol: Dispenser shells can now be filled from storage bags for easy bulk filling. + Mooshimi: + - rscadd: Festive paper hats have appeared in maintenance on every map. Central + Command is going to get angry if you keep partying like this... + - bugfix: Closed the trapdoor to space under a holo firelock in lower tram maint. + Pickle-Coding: + - bugfix: Fixes N2O formation consuming twice the amount of nitrogen and oxygen + than it should be. + Profakos: + - bugfix: signalCommander now works without altering the default frequency + Rhials: + - spellcheck: Fixes typos in certain away mission items. + ShizCalev: + - bugfix: Fixed the Eastern airlocks to the Space Hotel not being cyclelinked. + - bugfix: Added various missing air alarms, APCs, and cameras across all station + maps. + - bugfix: Pun Pun has been added to the bar on tramstation! + Timberpoes: + - bugfix: Fix issue when the connected database dies but the connection check still + returns "online" where players would be unable to join the shift because the + game thinks they haven't unlocked any jobs at all. + Tristrian: + - bugfix: The mining wardrobe locker contains an explorer duffel bag instead of + a normal one now + - spellcheck: '"explorator''s duffel bag" is now called "explorer duffel bag"' + Twaticus: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: centcom gasmask appears on mob again - bugfix: tile reskinner correctly shows new tiles - bugfix: plasmaman glove inhands no longer appear as a plasmaman suit - bugfix: wheelchairs gained their wheel back +<<<<<<< HEAD +======= + celulamp: + - bugfix: Candy Corn craftable with 5 Corn Oil 5 Sugar +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - bugfix: Holding people at gunpoint has been restored to its former glory, it can once again be used at range, and allows the person holding up to move within two tiles of the target. +<<<<<<< HEAD tf-4: - bugfix: the urban coat, colourable leather jacket, duster, and peacoat are now all colourable as intended. @@ -657,10 +1155,48 @@ Hardly3D: - balance: Two of secmed's firefly gun case's lethal magazines were replaced with a rubber variant. +======= + kawoppi: + - rscadd: added animation for cleaning things with soap, mops, rags or cleanbots + - imageadd: added cleaning bubbles animation + lizardqueenlexi: + - bugfix: Fixed body_parts_covered on various suits to be consistent with their + sprites + - bugfix: Made digitigrade legs properly draw as non-digitigrade when wearing suits + that cover the legs + necromanceranne: + - balance: Gives the battlecruiser operatives the Ansem Pistol. + - bugfix: Gives the battlecruiser crew internals boxes. + - bugfix: Speedloaders and stripper clips can once again can load in ammo of the + same caliber. Detectives rejoice! + orthography: + - bugfix: puts beartraps in the tramstation janitor closet. + raffclar: + - bugfix: Fixed mecha cargo names breaking the utility module interface + timothymtorres: + - bugfix: Fix holoparasites to inherit language from their masters to aid communication + unit0016: + - refactor: ID Card department colors are now greyscaled. Say whuh!? +2022-07-19: + 13spacemen: + - bugfix: Carding an AI or deconstructing it will not ping ghosts about its positronic + brain + - bugfix: Ejecting a brain from an MMI will correctly transfer the guy in the MMI + to the ejected brain + - bugfix: You can (un)anchor AIs with a wrench + - qol: Changed the AI/borg hacked laws font color to be more readable + D4C-420: + - bugfix: fixed bioscrambler armor not having a cooldown when activated or emp'ed + - bugfix: fixed hallucination armor not having a cooldown when activated. + Guillaume Prata: + - qol: Be polite! While on walk intent you won't bump, swap places or push other + people now. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: At Central Command, NanoTrasen's elite architects have noticed that they built a door inside a window outside the Thunderdome and have decided to remove it. +<<<<<<< HEAD LordVollkorn / Gage Gaebler: - rscadd: The toiletbong has been added to the game. Build it using the craftingmenu, a wrench, a flamethrower and a nearby toilet. @@ -706,6 +1242,13 @@ - bugfix: you can no longer put undroppable items into storage - bugfix: fixed ranged analyzer being able to scan out of view targets - soundadd: Power is no longer required for ambience. +======= + Kubisopplay: + - qol: makes borg hypo behave slightly saner + Melbert: + - bugfix: Fixes a runtime with seclite mounts being deconstructed. + MidoriWroth: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added growable peanuts! Grow them in botany for a snack, or grind them into peanut butter - rscadd: Added 4 different peanut and peanut butter-based recipes @@ -716,6 +1259,7 @@ - rscadd: Added a customizable onigiri dish, let your dreams come true. - qol: Meatball noodle soup now requires grown peanuts instead of Gallery's peanuts - imageadd: New sprites for all the new foods! +<<<<<<< HEAD - qol: makes borg hypo behave slightly saner - spellcheck: Fixes typos in certain away mission items. - bugfix: mass transfer between storage no longer causes ear bleeds @@ -748,12 +1292,34 @@ - bugfix: diagonal movement in space works again - bugfix: Fix a runtime when replying to PDA messages through chat. - code_imp: Small code improvements for modular computers and files. +======= + PositiveEntropy, Triiodine: + - imageadd: Resprites all backpacks and satchels in their entirety! + ShizCalev: + - bugfix: Snow golems will no longer be told to put on their wizard robes when trying + to throw snowballs! + - bugfix: Sloths loaded in ruins will no longer sometimes become Cargo's sloth! + - spellcheck: Tweaked the stat panel for revenants to make their essence readout + a little more clear. + - bugfix: Jaunting/incorporeal mobs will no longer be inserted into morgue trays + / cremators when they close. + - bugfix: Cremators will no longer cremate jaunting / incorporeal mobs. + - bugfix: Jaunting out of a morgue tray / cremator will now properly update its + sprite. + SuperNovaa41: + - rscdel: Removed the families gamemode. + SuperSlayer: + - balance: Baton resistance trait now prevents getting knockdowned by batons, instead + of just shortening knockdown duration + Tastyfish: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Shower and sink dismantling is now consistent. - bugfix: Hydroponics tray plumbing connections now accept water without clogging. - rscadd: Showers now have 3 selectable auto-shutoff modes. - qol: Sinks and showers are now constructed with the player facing the wall. - imageadd: Visuals improved on plumbing connections for offset appliances, like sinks and showers. +<<<<<<< HEAD - refactor: ID Card department colors are now greyscaled. Say whuh!? - bugfix: Fixed body_parts_covered on various suits to be consistent with their sprites @@ -873,6 +1439,80 @@ 2022-07-25: Christmas5: - bugfix: Updates /update_body_size() to compensate for a player's rotation. +======= + TheBoondock: + - bugfix: fixed ranged analyzer being able to scan out of view targets + VioletN: + - bugfix: The supermatter engine can spawn bioscrambler anomalies when delaminating + again. + distributivgesetz: + - bugfix: Fix a runtime when replying to PDA messages through chat. + - code_imp: Small code improvements for modular computers and files. + magatsuchi: + - bugfix: you can no longer put undroppable items into storage + ninjanomnom: + - bugfix: Airlocks made from custom materials are now properly colored instead of + being forced to use the color of the first material used. + san7890: + - rscadd: Have you noticed the unrestricted directional airlock helpers on doors? + You know, the little lights under door that allow anyone to pass through. After + a few long hours in the lab, assistants have found a display hidden deep within + the machinations of the airlock that allow you to either flip the direction + of this Unrestricted Exit or disable it entirely. +2022-07-20: + CoffeeDragon16: + - bugfix: xenomorph corrosive acid will once again not target mobs + - bugfix: xenomorph limbs will no longer be examined as human limbs + Justice12354: + - bugfix: Chemical reactions no longer give you double the product + PK_Sonikal: + - bugfix: The oxygen canister in the Cere emergency shuttle's cryogenics setup has + been replaced with the correct anesthetic mix. + Salex08: + - bugfix: roboticist in tramstation have access to tech storage again + Whoneedspacee: + - bugfix: Fixed megafauna not having melee cooldown times after ability usage. + - admin: Mob ability verbs expanded greatly, allowing for creation of custom ability + sequences and allowing easy removal of already added actions. + Y0SH1M4S73R: + - admin: Admins with the debug permission can run lua scripts using the "Open Lua + Editor" verb. + jlsnow301: + - code_imp: notify ghost alerts and healing robotic limbs' code was brought up to + coding standards. + jlsnow301 MooCow: + - bugfix: Adding items to dispenser shells no longer damages the dispenser + orthography: + - bugfix: fixed a scrubber that didn't have pipes. + zxaber: + - bugfix: Added Clown and Mime spawns to Tramstation +2022-07-21: + Fikou: + - bugfix: fixes cqc knockouts + Kylerace: + - bugfix: circuits can no longer send trams to brazil, since that is not on the + station + ReinaCoder: + - imageadd: Gives the Spider Charge a unique sprite + Twaticus: + - imageadd: Various clothing items have been converted using GAGs, making them recolorable. + Check it out at your local clothesmate! + private-tristan: + - qol: Shutters, Blast doors, and Bluespace Vendors are now in the structures category, + instead of misc, craft away! +2022-07-22: + 13spacemen: + - imageadd: Internals action buttons have a gold border and are inserted left-most + by default + - rscdel: Removed the internals HUD icon (gas mask + tank icon) + CoffeeDragon16: + - rscadd: New signage on all stations for the AI upload, AI sattelite, telecomms, + vault, and the R&D servers. + Pickle-Coding: + - rscadd: Proto-nitrate bz response can now emit nuclear particles. + - balance: Proto-nitrate bz response radiation pulse intensity will get reduced + based on how many particles it is creating. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RandomGamer123, bug originally reported by Murmic#2120 on Discord: - qol: Makes it more clear that venus human traps can be possessed in the first place @@ -883,6 +1523,7 @@ it by using the ghost role menu, the link in chat, or by clicking on the notification - admin: Venus human traps now respect role bans (for ROLE_LAVALAND as its the default for ghost roles) +<<<<<<< HEAD RimiNosha: - rscdel: Removed Beachbum, Pirate, Chimpanzee, Shadowtongue, Calcic, Buzzwords, Nekomimetic and Mushroom from the language screen. @@ -967,6 +1608,102 @@ Wallem: - imageadd: Resprites the implant pad Zonespace27: +======= + Salex08: + - bugfix: parrots spawned from strange objects dont come with headsets anymore , + like it was intented + itseasytosee: + - bugfix: Bugs exposed by gunpoint's fixing have been fixed + orthography: + - rscdel: removed one of the two circuit labs on tramstation + - balance: Nanotransen realizes they're losing money by having two of the same niche + science on the same station. The Auxiliary Laboratory has been cleared out until + there is a new use for it. Hope squatters don't set up in there... + - bugfix: gives tramstation science more glass + - bugfix: removes one of the tramstation cargo ordering consoles + tralezab: + - balance: IAA are now flavored around rooting out corruption, rather than just + killing syndicates. +2022-07-23: + CoffeeDragon16: + - bugfix: maintenance-adapted eyes will now display properly + CursedBirb: + - bugfix: Dutch jacket shows hands again + FernandoJ8: + - bugfix: the appearance of broken plating now updates after repairing it + Fikou: + - qol: entrenching tool now tells you on examine how to switch config + Jackraxxus: + - bugfix: Tramstation chemfactory's meson left pair of meson goggles no longer slow + you down. + JohnFulpWillard: + - bugfix: The Veteran's cloak now only respects people who meet the requirements, + rather than being the other way around. + - spellcheck: Fixes a minor spelling error in seperation when you eat a red pill. + Melbert: + - bugfix: Blue, Red, and Delta alerts make the right sound again + - bugfix: Fixes a runtime error preventing Ion Storms from triggering occasionally + Mickyan: + - qol: Blacklight and red light fixtures are slightly brighter + MidoriWroth: + - bugfix: Fixed brownies and breadsticks not being bakeable + - bugfix: Brownie sheets are now sliceable again. + Profakos: + - bugfix: If you toggle night shift mode on an APC too fast, you'll see the balloon + message + Y0SH1M4S73R: + - bugfix: calling the lua function "print" when there are multiple lua states will + no longer crash the server + dragomagol: + - admin: moved dynamic logging into its own file + lizardqueenlexi: + - bugfix: added missing flag to captain's jumpskirt + magatsuchi: + - bugfix: fixes storage item icons not updating properly + necromanceranne: + - balance: Syndicate encryption keys protect your headset from radio jammers. + orthography: + - bugfix: fixes the highfive memory saying deuteragonist instead of the name of + the second actor. + san7890: + - bugfix: The KiloStation Emergency Shuttle now uses appropriate flooring to complement + the floor decalling work. + - bugfix: On MetaStation, the Quartermaster's Office no longer owns a conveyor belt. + Greedy bastard. +2022-07-24: + 13spacemen: + - imageadd: Pun Pun wears drippy clothes now. Swag. + - bugfix: Becoming a digitigrade species should properly drop your shoes if they + don't fit + ArcaneMusic: + - qol: Roller Beds and Body Bags now have screentips explaining how to fold them + up. + Melbert: + - bugfix: Having the Supermatter Engine detonate will no longer make all traitor + final objectives unavailable. (Only the Supermatter Cascade objective is made + unavailable.) + Mooshimi: + - bugfix: Separate DNA Vaults will now check if you already have a power from one + before giving a power to you. + ShizCalev: + - bugfix: Floors repaired by floorbots will now have their overlays updated properly. + Wallem: + - imageadd: Updated the treat fabricator sprite + Watermelon914: + - admin: The lua editor now has text highlighting for lua keywords + dragomagol: + - bugfix: tongue tied players will no longer be haunted by floating faces if they + type too fast + - admin: Added Delay Round End to the server tab + vincentiusvin: + - bugfix: fixed the 20 radius supermatter delam irradiation not working +2022-07-25: + Fikou: + - bugfix: you no longer rename door assemblies with pens on combat mode + Mothblocks: + - qol: Pointing at something on yourself now shows the item. + Y0SH1M4S73R: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes most, if not all harddels related to lua. - bugfix: Fixed lua signal handlers for COMSIG_PARENT_QDELETED. - qol: The lua editor UI will warn when a state's global table has been corrupted @@ -995,6 +1732,7 @@ - qol: pAI requests no longer make the Byond window flash. - qol: The silicon text for "your laws have been updated" is now easier to see. - qol: Changed the text for camera and printer functions. +<<<<<<< HEAD 2022-07-29: Higgin: - balance: CI sounds no longer carry nearly so far and drop off much closer to a @@ -1012,12 +1750,116 @@ - bugfix: Fixed invisible uninteractable languages on the prefs menu, as well as being able to be assigned unobtainable languages because of said bug. ShizCalev: +======= + magatsuchi: + - bugfix: dumping storage containers now works properly, and cigarette carts aren't + janky anymore to open + - bugfix: right clicking a storage container with an item in hand now opens storage + raffclar: + - bugfix: Tablets can be used inside lockers again. +2022-07-26: + Pepsilawn: + - bugfix: Kilo and Icebox's aux bases construction rooms are now correctly locked + behind Aux Base access + - rscadd: Prison Ofitser has been once again dispatched to the Lavaland security + checkpoint after going missing + ShizCalev: + - bugfix: Fixed an exploit caused by unwrenching the holopad. + Y0SH1M4S73R: + - rscadd: Concentrated barbers aid will give hairless species hair after it has + remained in them for a number of cycles inversely proportional to the purity + (20 cycles at 100% purity). Additionally, at 100% purity, it removes the smooth-headed + quirk at the same time that it grants hairless species hair. + - bugfix: Most effects that change your hairstyle are no longer delayed until certain + effects occur. + - bugfix: You cannot bypass the smooth-headed quirk with the genetics console (even + if you were somehow able to figure out how to get a specific hairstyle) + - bugfix: The species and antagonist character icons in the preferences menu are + no longer all bald. +2022-07-27: + CoffeeDragon16: + - admin: head-revolutionary demotion logging will now properly display the demoting + admin + CursedBirb: + - bugfix: Engineer syndie sentry can only be activated with combat wrench + - code_imp: Added balloon alerts and made code easier to read + JohnFulpWillard: + - balance: Revenants' defile ability no longer breaks windows, only damaging it + until nearly broken. The damage dealt to windows has also been slightly lowered. + Melbert: + - rscadd: Almost the entire bottom half of Deltastation has been remapped. + - bugfix: Void Magnet no longer instantly removes itself + - code_imp: Convoke Void now handles the self-cast part of Void Magnet. + Mothblocks: + - balance: Heavily adjusted how much population impacts the chances of midround + rulesets, mostly lowering them. + ShizCalev: + - bugfix: The uplink failsafe code traitor item will now actually give you a failsafe + code! + - bugfix: The uplink failsafe code can no longer be purchased on devices that don't + support code entry. + Thunder12345: + - spellcheck: The butcher's cleaver will now kill people in ways accurate to real + culinary techniques + VioletN: + - bugfix: The "kill pet" traitor objective can now properly target pets owned by + the Head of Personnel, Head of Security, and Quartermaster. + Wallem: + - imageadd: Resprites the implant pad +2022-07-28: + CoffeeDragon16: + - admin: added logging for when you fail to tip something over + - bugfix: cleanbots will display their cleaning animation and clean at the right + speed again + Fikou: + - rscadd: Nuke Op reinforcements now come in different flavors. + - balance: Nuke Op reinforcements now start with plastikovs. + - bugfix: the hook shotguns hook and the m90gls grenade launcher no longer hit the + user + Melbert: + - bugfix: Fixes some alien actions like Evolve not working. + RaveRadbury: + - rscadd: Adds the old maid apron to the autodrobe + - imageadd: Returned the maid apron + Salex08: + - refactor: Mining items have been refactored to make better use of components. + ShizCalev: + - bugfix: Immortal anomalies (eg bioscramblers) will no longer have a death timer + overlay. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an exploit which would result in Mediborg's Amputation Adventure not amputating properly. Legendary gamers don't have to cheat. - bugfix: Clicking Mediborg's Amputation Adventure's with TK will no longer result in amputation. +<<<<<<< HEAD SkyratBot: - spellcheck: minor grammatical change to the golden wheelchair. +======= + - bugfix: Cyborg flashes will no longer fail to drop from the heads of borgs. + - bugfix: Butchering a bodypart for it's organs while inside a locker will no longer + drop the organs /outside/ the locker. + - bugfix: Surgical moth wing reconstruction can no longer be attempted on wings + that... aren't moth wings! + SuperDrish: + - bugfix: Fixed Heterochromia not knowing where the right and left eyes are + orthography: + - spellcheck: minor grammatical change to the golden wheelchair. + tf-4: + - balance: Reflectors can now reflect nuclear particles. + vincentiusvin: + - qol: tidied up tram's atmospherics piping +2022-07-29: + Ekaterina-von-Russland: + - bugfix: fixes the stress experiment + - balance: changes the stress experiment to allow values 2% below or above the target + integrity + FernandoJ8: + - bugfix: xenos now take fire damage in accordance to how many firestacks they have + instead of a set amount + Fikou: + - bugfix: you can no longer push puzzle doors + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Ladders now take left/right clicks to go up or down. Radial menus for them should only show up when you reach the floor above or below but the ladder goes beyond it, so that you don't have to bother clicking a sprite covered by that @@ -1028,6 +1870,7 @@ now. - balance: Climbing up or down a ladder now takes 1 second by default. Less spammable, barely more immersive. +<<<<<<< HEAD - bugfix: fixes the stress experiment - balance: changes the stress experiment to allow values 2% below or above the target integrity @@ -1045,10 +1888,26 @@ 2022-07-30: Ebin-Halcyon: - imageadd: Synth lizards have had a few sprite issues addressed. +======= + GoldenAlpharex: + - bugfix: Security Records should no longer have to apply prefs to a random dummy + to generate pictures for every character that joins the round. + IndieanaJones: + - bugfix: Fixed legionnaire's charge when hitting an ally. + Melbert: + - qol: Swaps a prosthetics freezer for a blood freezer on Delta medical + orthography: + - spellcheck: oh hi mark changed to oh hi daniel. + timothymtorres: + - bugfix: Fix slime potions used on simple mobs to inherit all language abilities + from the user (for real this time) +2022-07-30: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, TeomanTheGreat: - rscadd: the nuke ops leader is now the highest nuke ops playtime player on the team - qol: the nuke ops leader now starts with their radio loud mode on +<<<<<<< HEAD GuiltyNeko: - rscdel: deleted unused, entirely commented out code, the neckleash Jolly: @@ -1072,12 +1931,53 @@ - bugfix: removed a way that you could send items into the void using just a windoor and a pal - qol: the NtOS messenger has a scrollbar now. +======= + Jacquerel: + - rscadd: Urban legend says that people have been hiding sharp glass behind posters + to hurt anyone who tries to remove them. Who would do that? Make sure you're + wearing gloves when pulling down posters... + - rscadd: Adds two new traitor objectives to upset the crew by placing syndicate + posters or drawing the syndicate logo. + - bugfix: removed a way that you could send items into the void using just a windoor + and a pal + JohnFulpWillard: + - qol: the NtOS messenger has a scrollbar now. + Melbert: + - bugfix: Constructs, rats, and some other creatures can attack while their spells + are on CD + - admin: DNR-ing is now logged + Superlagg: + - rscadd: Voracious properly speeds up eating. It also allows you to eat and be + fed even while you're full, albeit more slowly the fulller you are. + Tastyfish: + - rscadd: The results of the tile sprayer and decal painter can now only be removed + by crowbarring the tile, just like map-start. + - bugfix: Tile sprayer's "white" replaced with "neutral", the most common tile overlay + color. + Watermelon914: + - balance: Air alarms USB now support controlling scrubbers, vents and operating + mode as well as the alarm. + - rscadd: Airlocks can now be made into shells by ticking the 'shell' option in + airlock electronic UI. This can only be done during construction. + Y0SH1M4S73R: + - qol: USB cables can connect directly to bluespace launchpads. As a consequence, + You do not need a console for a launchpad if you only intend to control it via + circuits. + distributivgesetz: + - bugfix: Fixed some odd pipes menacingly laying around above tiles in Tramstation + engineering. + - bugfix: Fixed misplaced requests console and light fixture. + magatsuchi: + - bugfix: organ boxes no longer freeze the box instead of the organs + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Toy guns are only available to clown operatives. - rscdel: 'Removes from both operative uplinks: Camera Bug, Combat Gloves Plus (already removed from leaders), Guerrilla Gloves, FRAME disc, Radioactive Microlaser, Blood-Red Magboots (the standalone ones, not the modules), Power Beacon, Bioterror everything (including the bundle), Stechkin APS machine pistol and ammo, AI Detector.' +<<<<<<< HEAD - balance: Air alarms USB now support controlling scrubbers, vents and operating mode as well as the alarm. - rscadd: Airlocks can now be made into shells by ticking the 'shell' option in @@ -1164,5 +2064,58 @@ - bugfix: admin-triggered xeno event now works! mcmeiler: - rscadd: Slimepeople can now change their hair color. +======= +2022-07-31: + CPTANT: + - balance: Regular Windows are now stronger and take about 10 toolbox hits to destroy + ChakatStormCloud: + - bugfix: Basic cyberstomach digestion speed dropped down to be in line with the + other stomachs + CoffeeDragon16: + - bugfix: RPEDs can pick up beakers and assemblies once again + - bugfix: holoparasite renaming text will no longer display to others + Fikou: + - bugfix: everyone is a traitor mode disables progression + - bugfix: fixes nuke ops leaders not spawning + Higgin: + - balance: Non-functional livers and stomachs can now be repaired with their respective + surgeries once in the organ's lifetime. + Jacquerel: + - bugfix: Construction and ape-crushing behaviour should be more consistent between + manual and motorised wheelchairs. + JohnFulpWillard: + - bugfix: Using candy bars as an ingredient in salad now drops a candy wrapper. + Melbert: + - bugfix: Slime Transformation doesn't require wizard clothes + - bugfix: Plant bags transfer seeds in bulk again. + OrionTheFox: + - bugfix: The Pants Altar's pants' icons are now fixed + RigglePrime: + - admin: Admins can now put any human species on purrbation + ShizCalev: + - bugfix: Transferring a carded AI to an empty core will no longer result in a second + AI core appearing. + - balance: People with epilepsy now have a chance to have a seizure when they're + flashed! + - bugfix: Leather satchels no longer have a rogue crotch height pixel sticking through + your clothing when facing left. + - bugfix: Necropolis chest will no longer consume your key if it fails to generate + a reward. Also, if it fails to generate, it'll allow you to attempt it again. + Watermelon914: + - bugfix: Fixed some cases where the highlighted text in the lua editor was out + of place with the actual text. + distributivgesetz: + - bugfix: Fixes APCs clicking constantly during a Grid Check. + ghommie, dragomagol: + - bugfix: admin-triggered xeno event now works! + magatsuchi: + - bugfix: storage UI no longer gets stuck on the screen due to an oversight + orthography: + - bugfix: the all-in-one-grinder shakes (again?) + - spellcheck: adds extra information to objective explanation text. + - bugfix: makes the photo objective more specific + san7890: + - bugfix: Nanotrasen should no longer place single bedsheets on double beds. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres: - rscadd: Bubblegum now spawns demonic bubblegum candy when they devour corpses. diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index 15c8bcb3e01..aa9d0d24e2b 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/html/changelogs/archive/2022-08.yml @@ -1,4 +1,5 @@ 2022-08-01: +<<<<<<< HEAD GoldenAlpharex: - bugfix: Security Records should no longer have to apply prefs to a random dummy to generate pictures for every character that joins the round. @@ -28,6 +29,19 @@ move more smoothly instead of jumping from tile to tile. - qol: Vault bank machine checks for access before alerting. - bugfix: fixed crates being able to store mechs +======= + Armhulen/Armhulenn/Bazelart/Tralezab, san7890: + - admin: Word filters incorrectly set up will now have their errors actually described. + Please, tell your server ops when you see it so they may fix the configuration. + - server: Rust-g on this codebase is now on the 1.0.2 version, prepare accordingly. + Bytube: + - bugfix: fixed crates being able to store mechs + Profakos: + - bugfix: unfrozen items no longer break when thrown + Y0SH1M4S73R: + - code_imp: Several projectiles, particularly magic missile and gauntlet echo, now + move more smoothly instead of jumping from tile to tile. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Calling `print` from lua will no longer spontaneously cause a runtime. - bugfix: The lua editor UI now properly scales with the window, up to certain extremely small sizes. @@ -35,6 +49,7 @@ to facilitate improved performance on the DM side, the lua editor UI no longer displays the global table and the state log by default - instead, they can be enabled using a toggle-button to the right of the tabs. +<<<<<<< HEAD - admin: Admins can now put any human species on purrbation Zenitheevee: - balance: Made Ammo pouches and Telebatons not give illegal tech anymore. @@ -45,10 +60,23 @@ SkyratBot: - qol: nuke ops id trims have a sechud icon - bugfix: chameleon cards now fix their colors upon resetting +======= + Zenitheevee: + - balance: Bluespace crystals can now go in ITEM_MATERIAL capable material storage + (like autolathes) + distributivgesetz: + - qol: Vault bank machine checks for access before alerting. +2022-08-02: + Fikou: + - qol: nuke ops id trims have a sechud icon + - bugfix: chameleon cards now fix their colors upon resetting + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Creatures which can't experience emotions will no longer attempt to do so upon seeing a traitorous poster. SuperSlayer: - bugfix: Aliens help/harm intent now works normally if used on other aliens +<<<<<<< HEAD Zenitheevee: - bugfix: Rolling papers spawn in the pack now 2022-08-03: @@ -79,10 +107,26 @@ - balance: NanoTrasen has updated their clothing contracts to stock five of every clothing available in AutoDrobe and ClothesMate vendors. - qol: Cryo Pods and Cryo Computers no longer require power to work. +======= +2022-08-03: + Capsandi: + - rscadd: The kilo whiteship has been remapped and can fly again + - rscadd: Kilo's abandoned warehouse has been adjusted slightly to match the ship + EOBGames: + - rscadd: Nanotrasen has implemented a new system of Threat Advisories to inform + stations of the relative Dynamic threat to their stations by sector. + LemonInTheDark: + - admin: Wooooo spoooky ADMIN HELP BACKEND HAS CHANGED. If you run into any strange + behavior or dropped messages, REPORT THEM + Mooshimi: + - code_imp: No more runtimes when someone interferes in a religious spar. + - code_imp: No more runtimes when someone wearing cowboy boots is table slammed. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Camera assemblies can now be moved after being unwelded! (This was an 11 year old bug lol.) - qol: Camera assembly welding has been updated to balloon alerts! +<<<<<<< HEAD - bugfix: Trying to inject someone in the eyes/mouth/feet/hands will no longer result in you trying to inject their chest! - bugfix: Fixed the Stray Cargo Pod event failing to occur if it tried to send an @@ -195,6 +239,15 @@ - qol: most storage item chat messages have been replaced with balloon alerts - admin: Wooooo spoooky ADMIN HELP BACKEND HAS CHANGED. If you run into any strange behavior or dropped messages, REPORT THEM +======= + - bugfix: Fixed the Stray Cargo Pod event failing to occur if it tried to send an + empty cargo pod. + - bugfix: Trying to inject someone in the eyes/mouth/feet/hands will no longer result + in you trying to inject their chest! + SuperSlayer: + - bugfix: fixes slimes attacking objects not getting logged + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed the integrated circuit paper printing mechanic as part of paper code rewrite. - rscdel: Removed the ability to scan paper directly into the modular computer notes @@ -205,6 +258,7 @@ - bugfix: Fixes signatures not working at all. Signatures now only work when %s or %sign is put into an [___] input field. - bugfix: Input fields are now fixed and also work again. +<<<<<<< HEAD - balance: Nanotrasen realized that the more access they had on their cards was costing them a pretty penny, so they trimmed back the number of accesses a certain departmental Security Guard might have. However, any given guard will get back @@ -213,6 +267,53 @@ - config: Hey server operators, listen! We've changed up how Departmental Security Officers get their accesses, so be sure to review the DEPSEC_ACCESS_LEVEL config number to see what you want to work best for your server. +======= + Twaticus: + - imageadd: Converts some families gear into recolorable items in the clothesvendor. + Includes a hat, scarf, 3 jackets, football gear, and buttondown shirt with shorts/pants. + Adds a recolorable waistcoat. + VioletN: + - bugfix: The Fire Cascade heretic spell no longer hurts the user. + jlsnow301: + - bugfix: Custom virus names should now display properly in the pandemic. + orthography: + - bugfix: fixes tail wag emote stopping the wag. + san7890: + - admin: You should hopefully no longer see an error message that has nothing to + say regarding the word filter. +2022-08-04: + CoffeeDragon16: + - qol: most storage item chat messages have been replaced with balloon alerts + GoblinBackwards: + - bugfix: Fixes heretic curses always failing and saying the items had no fingerprints. + Hardly: + - rscadd: You can now buy lizards through cargo. + LemonInTheDark: + - bugfix: You can no longer infinitely york as an alien + Melbert: + - qol: AIs which update their status displays on multi-z station maps will now update + ALL displays on station, instead of only those which match the level their core + is on + Profakos: + - rscadd: Added a new button to the thunderdome administration arena that toggles + entertainment monitor's ability to broadcast the thunderdome arena's cameras. + - bugfix: Clicking on entertainment monitors actually works now + Tastyfish: + - qol: Searching within a material stack's recipes now searches the categorized + recipes as well. + Watermelon914: + - bugfix: Clicking on tiles you can't see will work again if you pressed F12. + orthography: + - qol: allows for an existing ai lawset to be used as the default instead of a "custom" + lawset. + - server: added server settings that allow for the ai lawset to be specified. This + *should* be changed in the server to allow the "asimov++" card to spawn in place + of the "asimov" card in the AI upload. + timothymtorres: + - qol: Add chance for maintenance crate and closet spawners to be open to make the + area look more messy. + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: All four SM delams got recoded, no significant gameplay changes expected. - qol: SM healing is broadcasted on crew radio too now instead of just engi - qol: SM going singulo or tesla will be announced on common comms when the damage @@ -221,10 +322,38 @@ and trigger cascades. - bugfix: Fixed the sm not having a boxy overlay on normal delams when counting down. This is what the radio message was referring to as "causality field". +<<<<<<< HEAD +======= +2022-08-05: + JohnFulpWillard: + - balance: Ordnance data disks now have the Frontier app on them, and has entirely + replaced Frontier data disks. + - bugfix: Labor camp Prisoners without a sentence can no longer send themselves + back up whenever they wanted by clicking the button fast enough. + - bugfix: Prisoners can no longer get infinite labor camp points by clicking the + stacking machine with ores. + - bugfix: All ore machines now properly change their direction when they dock a + shuttle in a separate direction, fixing Lavaland's labor camp stacking machine. + - qol: Labor camp's point checker now states all the information you need, rather + than being a paragraph of text that just appears in chat. + Justice12354: + - rscadd: The Mothroach, your new local exotic pet + - rscadd: Mothroach Hide and Mothroach Meat + - rscadd: 'New crafting recipe for the Moth Plush: 1 Mothroach Hide; 1 heart; 3 + cloth' + - bugfix: Fixes dead mobs on-head not having sprites + Mooshimi: + - admin: A lot of game logs will now also be in individual game logs, for convenience + in log diving. + - admin: Added logging for bluespace launchpad x and y offset changes, which go + to individual game logs. + - admin: Attack logs will now be slightly shorter, one useless word was removed. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Added a test in Aurora Caelus event for if the station has the ability to show it. - bugfix: Stations without space should no longer receive station objectives that require space to be present. +<<<<<<< HEAD - bugfix: Fixed a typo in Metastation's service's camera tag - qol: Add chance for maintenance crate and closet spawners to be open to make the area look more messy. @@ -264,12 +393,66 @@ Mqiib, ToasterBiome: - balance: Explosion epicenters no longer explode mobs twice; Fireballs and other explosive projectiles are significantly less-damaging +======= + - qol: Machines that require a minimum level of part now have it visible. + Pepsilawn: + - bugfix: Fixed a typo in Metastation's service's camera tag + Profakos: + - refactor: The Force Event UI has been refactored + - refactor: Events now have categories and descriptions + - refactor: Admin triggered events happen immediately + - balance: Fake Virus and Electric Storms are shown to admins, making them cancelable + ShizCalev: + - bugfix: You can no longer crawl into a vent if it's welded while you're climbing + into it. + - bugfix: ES8 explosive charges (structural weakpoint charges) can now only be planted + on walls or the floor. + lizardqueenlexi: + - bugfix: Universal recorder now properly reports length of silence in seconds instead + of deciseconds + san7890: + - balance: Nanotrasen realized that the more access they had on their cards was + costing them a pretty penny, so they trimmed back the number of accesses a certain + departmental Security Guard might have. However, any given guard will get back + a greater amount of accesses depending on how many security guards there are + in relation to the population. + - config: Hey server operators, listen! We've changed up how Departmental Security + Officers get their accesses, so be sure to review the DEPSEC_ACCESS_LEVEL config + number to see what you want to work best for your server. + - admin: The word filter should no longer runtime on initialize. For real this time. + timothymtorres: + - rscadd: The drink "Between the Sheets" requires sleeping underneath bedsheets + to gain healing effects + vincentiusvin: + - bugfix: deleted unconnected lavabase pump + - bugfix: removed unecessary bridge pipes from kilomos +2022-08-06: + Jackraxxus: + - bugfix: Admin AI interact can once again print items from departmental protolathes. + JohnFulpWillard: + - rscadd: Pun Pun now gives stuff in their hand frequently and rings desk bells. + - rscadd: Pun Pun now has gentleman-like emotes, rather than screeching and roaring. + - balance: Pun Pun no longer looks for weapons in their off time. + - balance: Pun Pun is no longer vulnerable to stuns by being walked into. + - qol: Monkeys can now use desk bells. + Mooshimi: + - bugfix: Things that are ventcrawling can no longer alt click tiles to see what + is outside the pipes. + Mqiib, ToasterBiome: + - balance: Explosion epicenters no longer explode mobs twice; Fireballs and other + explosive projectiles are significantly less-damaging + Profakos: + - bugfix: Mining flora can be harvested again + RigglePrime: + - bugfix: Purrbation now properly adds and removes tails +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Purchasing the Stationwide Blackout traitor event repeatedly will now only announce there is a power outage if the previous power outage has finished. - balance: Vehicles & Mecha now take 2.5 second to repair with a welder. - qol: Vehicles & mecha will automatically repair over time once clicked. - qol: Vehicles & Mecha now give balloon alerts when repairing. +<<<<<<< HEAD SkyratBot: - bugfix: Silicons can now interact with floodlights. - imageadd: Improved Unholy Pitchfork back and inhand sprites @@ -278,10 +461,19 @@ - bugfix: Things that are ventcrawling can no longer alt click tiles to see what is outside the pipes. - bugfix: Purrbation now properly adds and removes tails +======= + X13-423: + - imageadd: Improved Unholy Pitchfork back and inhand sprites + XyzzyThePretender: + - bugfix: Silicons can now interact with floodlights. + tralezab: + - rscadd: Bileworms have appeared on lavaland! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-08-07: Capybara Holly: - bugfix: Trying to remove rust from walls with a welding tool will now blind you like it should +<<<<<<< HEAD Paxilmaniac: - imageadd: the SEVA mining suit has been resprited - bugfix: SEVA is now once again actually going to protect you from fire @@ -327,12 +519,40 @@ - bugfix: removed unecessary bridge pipes from kilomos - bugfix: Fix audible emotes playing sounds while mob is gagged, mute, tongueless, or under a vow of silence. +======= + CursedBirb: + - bugfix: Banana now have correct right hand sprite + Holoo-1: + - bugfix: fixed hplc not displaying purity. Also fixed incorrect display of volume + if beaker is inserted in output slot + JohnFulpWillard: + - bugfix: The air scrubber in atmos near the northern maintenance airlock is now + connected to waste. + Kylerace: + - bugfix: makes verb queuing work again + Mooshimi: + - bugfix: Blind support added to some actions like stripping, being hit, and force-feeding. + - bugfix: Blind people will now only be able to 'hear' audible emotes. + - bugfix: Blind and deaf people will see and hear no emotes, for obvious reasons. + Mothblocks: + - rscadd: Revolution victories now call the shuttle when enough of the station is + revolutionaries. + ShizCalev: + - bugfix: Grilles are now anchorable with screwdrivers again. +2022-08-08: + Addust: + - rscadd: Kilo whiteship now has shit so that it can actually maintain power now + - rscadd: Kilo whiteship now has both the bar and crew quarters area to increase + information hell + Fikou: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the mining modsuit now costs 3000 from 2500 - balance: the mining modsuit now still slows you down over lava, though you still resist it - qol: the plasma core now accepts plasma both in sheet form and ore form - bugfix: the plasma core should no longer buggily not refill you - bugfix: the mining modsuit bombs should now have enemies target you +<<<<<<< HEAD - bugfix: Blind support added to some actions like stripping, being hit, and force-feeding. - admin: A lot of game logs will now also be in individual game logs, for convenience in log diving. @@ -377,14 +597,43 @@ Hatterhat: - bugfix: Loadouts with the option selected to place all items in a suitcase now properly apply the GAGS/grayscaling system to applicable items. +======= + GoldenAlpharex: + - bugfix: Belts will now change appearance when items are inserted into them as + well, instead of only doing so when an item was removed from them. + LemonInTheDark: + - bugfix: Attempting to send back a reply to an ahelp after it is closed now sends + the reply to a new ticket, rather then just dropping it and leaving you for + dead with a runtime + - admin: see above +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Paramedic PDAs now start with the Lifeline pinpointer app - rscadd: Replaced the "proximity crew pinpointer" in the paramedic's belt with a bottle of Calomel - rscdel: Removed the "proximity crew pinpointer" +<<<<<<< HEAD MortoSasye: - balance: Head roles and security cannot have the Illiterate quirk. Head roles also can't have the brain tumor quirk. +======= + Pickle-Coding: + - code_imp: Radiation pulses will ask MC if they should continue processing for + every turf they iterate through, rather than just every pulse. + SpaceSmithers: + - bugfix: A locker in Icebox Maintenance will no longer disappear immediately upon + roundstart. + san7890: + - balance: The odds of gulagged prisoners on IceBoxStation getting mauled by a wolf + should go down dramatically. + timothymtorres: + - bugfix: Fix audible emotes playing sounds while mob is gagged, mute, tongueless, + or under a vow of silence. +2022-08-09: + Melbert: + - bugfix: Heretic stalkers are able again to return back to their normal form after + casting shapeshift. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, AxieTheAxolotl: - rscadd: Adds the Chief Medical Officer's Scrubs, making it the default clothing option when they spawn! @@ -395,6 +644,7 @@ - imageadd: Resprites every labcoat in the game, including the paramedic's. - imageadd: Resprites the entire medical department (again)! ShizCalev: +<<<<<<< HEAD - bugfix: The eye of god will now send a provide a message when its scan is recharged. SkyratBot: - rscadd: Added new VOID stamp @@ -432,6 +682,33 @@ - bugfix: Heretic stalkers are able again to return back to their normal form after casting shapeshift. ShizCalev: +======= + - bugfix: Security records in filing cabinets will now actually contain crimes! + - bugfix: The eye of god will now send a provide a message when its scan is recharged. + SuperNovaa41: + - bugfix: Fixes ash walker tendrils dropping typeless anomaly cores. + dragomagol: + - admin: Moved the rest of the dynamic logs to dynamic.log + tralezab: + - qol: Bileworms possessed by players can now see in the dark! + - qol: Bileworms now have a death message! + - balance: Bileworms will now give up their targeting if they fail to burrow to + you. If they can still see you, they might regain aggro, but now moving say, + to the mining station/big lava lake/hirophant is a good way to de-aggro them. + twilightwanderer: + - rscadd: Added new VOID stamp + - bugfix: Photocopier paperforms +2022-08-10: + GoldenAlpharex: + - bugfix: Fixed the game re-initializing your verbs for no reason when you deadmin, + which was the cause of the "Your previous action was ignored because you've + done too many in a second" spam when pressing the Deadmin button. + - bugfix: The MC tab no longer appears in a "ghost" state in your status tabs after + you deadmin. Now it's just gone, at long last! + - code_imp: Prettier should no longer be ran on files outside of the "tgui" folder. + ShizCalev: + - bugfix: Player controlled cleanbots can now actually kill cockroaches and mice! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Right-clicking a non-carbon based mob (humans, xeno, ect) will now bite them instead of doing nothing. - server: Added a configurable probability for nonhuman species to spawn in the @@ -441,24 +718,69 @@ (the bodies could get stuck inside them!) - bugfix: Morguetrays are now less likely to end up having multiple cadavers in them. +<<<<<<< HEAD SkyratBot: - code_imp: add proc create_atmos_zone which detect an isolated atmos zone while ignoring walls and non atmos_can_pass tiles (zas zone) Zonespace27: - bugfix: Ghosts can now flip +======= + TheBoondock: + - code_imp: add proc create_atmos_zone which detect an isolated atmos zone while + ignoring walls and non atmos_can_pass tiles (zas zone) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-08-11: GoldenAlpharex: - spellcheck: The long-range gas analyzer's name is no longer capitalized, as it's not a proper name. +<<<<<<< HEAD Nano: - soundadd: 'Added 2 new sounds to the synthesizer''s ''fun'' category: MeowSynth and Spaceman' ShizCalev: +======= + Jacquerel: + - refactor: A lot of food which was 'gross' is now 'gore'. + - balance: '''Gore'' is disliked by Humans and Moths, but liked by Lizards and Felinids. + Lizards no longer like ''gross'' food.' + - balance: All butchered player species are considered to be gore, only preferred + by Lizards, Felinids, and people with Deviant Tastes. If you like the taste + of your fellow crew, prepare accordingly. + JohnFulpWillard: + - spellcheck: Calomel now properly states that it only purges toxins, rather than + all chemicals, like it already does. + Melbert: + - rscadd: Added support for elevator doors. + - rscadd: Elevators now have travel time, and make sound when moving. Emagging the + elevator button will speed them up. + - rscadd: Added support for less-than-lethal elevators, which crush your bones instead + of gibbing you. Emagging the elevator button will revert them to gibbing. + - rscadd: Added support for elevators to warn people below that they're moving down. + Emagging the elevator button will disable this. + - rscadd: Added elevator panels, and support for using elevators without a radial. + - qol: Elevator call buttons and the trapdoor now use balloon alerts. + - admin: Heretic starting research and ascending is logged in the Blackbox + Mooshimi: + - code_imp: Perish, individual logging runtime. + Nano: + - soundadd: 'Added 2 new sounds to the synthesizer''s ''fun'' category: MeowSynth + and Spaceman' + PositiveEntropy, Kryson: + - rscdel: Removes old and unused titanium, plastitanium and plating damaged states. + - imageadd: Resprites the wooden, titanium and plastitanium-related floors! + - imageadd: Decals related to the resprited tiles have been adjusted accordingly. + - imageadd: Updates the appearance of plating to be smoother! + ShizCalev: + - bugfix: Fixed traitors not getting a new kidnapping objective if they previously + failed to kidnap someone else. + - bugfix: Cutting open someone's heart will now actually make them bleed properly! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Quartermaster and his items will now trigger phobias related to command staff! - bugfix: Command rank bedsheets, jackets, cloaks, and headsets will now trigger phobias related to command staff. - bugfix: The QM's bedsheets will now make you dream of authority and silvery IDs! +<<<<<<< HEAD - bugfix: Cutting open someone's heart will now actually make them bleed properly! - bugfix: Fixed traitors not getting a new kidnapping objective if they previously failed to kidnap someone else. @@ -535,6 +857,15 @@ - rscadd: Species now have custom damage examines, so Androids now have denting and charring, rather than bruising and burning. - refactor: Blind stripping and feeding alerts are smaller than gigantic now. +======= + - qol: Rightclicking someone you're holding up will now shoot at them. + - bugfix: You can no longer hold someone up from across the station. + - bugfix: Holding someone at gunpoint will now check if you can actually see the + person you're holding up more often. + Timberpoes: + - bugfix: Fixes broken command report formatting for station goals. + - bugfix: Fixes markdown paragraphing not working in paper code. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Time-Green: - rscadd: You can now remove/add all those ugly species features with the power of surgery! A lizards frills, horns, snout and spines, a moths wings and antennae, @@ -545,6 +876,7 @@ - balance: Organ manipulation only works on internal organs now. Use 'feature manipulation' for external organs. - code_imp: cleans up magic numbers in surgery +<<<<<<< HEAD Zonespace27: - qol: Borer abilities use balloon alerts instead of chat messages - refactor: Datumized borer focuses @@ -624,11 +956,91 @@ - bugfix: Nerve Stapled no longer acts as a workaround to Security not hiring Pacifists. - balance: Department Guards can no longer be Pacifists, Nerve Stapled, or Foreigners. Melbert: +======= + - bugfix: golden wheelchairs will now spawn + VioletN: + - balance: Instead of directly lowering body temperature by a small amount, the + Grasp of Void and Mark of Void heretic abilities now inflict a status condition + called void chill, which steadily lowers the victim's body temperature and also + inflicts a mild slowdown. + - balance: The void storm summoned by ascended void heretics now inflicts less direct + burn damage, but lowers body temperature much more strongly. + - bugfix: The void storm visual overlays now properly update when the heretic exits + an area, making them a more accurate indicator of which area the heretic is + in. + Wallem: + - imageadd: Updates the sprite for the metal & homerun bat + XyzzyThePretender: + - spellcheck: Fixes grammar for solar panel construction + - bugfix: Newly built turrets start unlocked. + - balance: munchies now impact hunger at a rate similar to running nonstop + Zonespace27: + - bugfix: Butcher's meat hook no longer fails when the user has TRAIT_NOGUNS + axietheaxolotl: + - imageadd: new dead body spawner icons + orthography: + - bugfix: emitter examine text now displays minimum maximum delay. + - spellcheck: changes the text on the emitter examine blurb. +2022-08-12: + GoldenAlpharex: + - bugfix: Conveyor belts now properly update their sprites when flipped or inverted + using a screwdriver, without the need to being turned on and off to take effect. + - bugfix: Food exports now follow export value elasticity, as intended. + JohnFulpWillard: + - rscadd: Species now have custom damage examines, so Androids now have denting + and charring, rather than bruising and burning. + Pepsilawn: + - bugfix: Kitchen sinks will now be functional if placed facing against a window + and some other closed structures, up-facing sinks also look somewhat better + as a result. + ShizCalev: + - qol: You can now use wallets & PDAs with IDs in them to play roulette! + - bugfix: Fixed a runtime when hitting a roulette table with an ID that doesn't + have a linked bank account! + Spookuni: + - bugfix: Dorms rooms D and R on tramstation now bolt properly. + SuperNovaa41: + - admin: Added two new procs into the VV dropdown menu to add and remove mood events + from living mobs. + necromanceranne: + - balance: The Bulldog Shotgun now has a second magazine. + - balance: You can swap the magazine as you fire by shooting with rightclick. + vincentiusvin: + - bugfix: fixed an incorrect count down message if SM changed it's delam twice. + - balance: Made a pure BZ SM a tad stronger, made a mixed BZ + high power gas SM + a lot weaker. + - balance: Freon power nuking can be negated slightly by other high power gases. + Moved the power nuking threshold from 30% to 33.33% + - balance: Water vapor SM will only lower power transmission instead of dampening + it both ways. + - balance: CO2 power increase can also be modified by other gases. +2022-08-13: + 567Turtle: + - qol: Made mime emotes more consistent + Hatterhat: + - bugfix: Departmentally ordered large crates (the big ones that need crowbars) + now properly register that they need to be opened in their appropriate department, + and provide proper payouts to the cargo budget upon delivery. + JohnFulpWillard: + - refactor: All glasses, cups, and condiment bottles have been refactored, please + report any bugs you might see as a result of this. + Jolly: + - bugfix: On Meta, NanoTrasen has finally added firelocks to some rooms in Medical, + the Ordnance office in science, and a desk in departures. Please avoid lightin + any plasma in these airs for now on. + - bugfix: Also on Meta, firelocks were installed in the virology airlock to mimic + the Xenobiology one. + Melbert: + - bugfix: Either ladders will no longer show screentips relating to "warping", or + fake teleportation runes will no longer show screentips related to "climbing". + Honestly not sure but one of them was wrong +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Revolution victory correctly removes lathe taxes - bugfix: Someone completing the weakpoint / hack traitor objectives correctly fails everyone else doing it - bugfix: Having a dog no longer be ai controlled doesn't keep it keen on playing fetch +<<<<<<< HEAD - rscadd: Added support for elevator doors. - rscadd: Elevators now have travel time, and make sound when moving. Emagging the elevator button will speed them up. @@ -646,6 +1058,95 @@ - code_imp: Removes an unused bible proc - bugfix: Normal items once again do not fit into bibles. - rscadd: Fax Machine +======= + Mooshimi: + - refactor: Blind stripping and feeding alerts are smaller than gigantic now. + Onule, PositiveEntropy, TetraZeta, Axietheaxolotl, Thgvr, AdipemDragon: + - imageadd: Completely resprites all medkits! + - imageadd: Completely resprites all medical tools! + - imageadd: Removes the clamp sprite and instead creates separate hemostat and retractor + inhand sprites! + - imageadd: Adds missing inhands for the bonesetter, advanced med tools, tactical + medkit, surgical drill and bone gel! + PositiveEntropy: + - imageadd: Holopads are now shinier and more elegant! + PositiveEntropy, TetraZeta, Azlan: + - imageadd: Metal, Reinforced, Reinforced Glass, Plasmaglass, Reinforced Plasmaglass, + Titanium Glass, Plastitanium Glass, Wood and Poker tables have been updated! + ReinaCoder: + - imageadd: The Profane Scholar outfit has been resprited + Wallem: + - imageadd: GAGSifies most of the radio encryption key sprites + Y0SH1M4S73R: + - bugfix: Fixes the formatting of the admin lua editor + - qol: In the admin lua editor, there will be a "jump to bottom" button in the log + viewer if the log is longer than can be shown in the window. + - qol: The lua editor log viewer is now split into pages of at most 50 log entries. + twilightwanderer: + - rscadd: Fax Machine + vincentiusvin: + - qol: made the operating computer go off on body position instead of the resting + intent. + - qol: aliens show up on operating computer now. + - bugfix: fixed the operating computer UI showing empty progress bars. Should just + tell you no patient in text now. + - refactor: refactored how operating tables fetches it's patient. +2022-08-14: + Any%, TetraZeta, PositiveEntropy: + - imageadd: Resprites all magboots! + - imageadd: Resprites Sneakers! + CPTANT: + - bugfix: Modafinil Overdose now properly puts you to sleep. + CapybaraExtravagante: + - soundadd: Ambience no longer uses reverb, as the sound files for ambience already + has reverb as needed usually! + Guillaume Prata: + - qol: You can now "welder craft" iron sheets/rods/floor tiles by Left or Right + clicking one of these items with a welder. It will craft one of the other two + options depending on the Left/Right click. There is a contextual screen tip + too so just hover over them with a welder for details on the results. + JohnFulpWillard: + - bugfix: Earmuffs now properly fix ear damage. + Jolly: + - bugfix: Somewhere in space, stairs were fixed. I don't know where, but they were + fixed. You're welcome. + Mothblocks: + - qol: Vending machines now support categories. Premium/contraband is moved to categories, + and the ClothesMate has special categories for different levels. + ShizCalev: + - bugfix: Dentally implanted pills now actually work. + SuperNovaa41: + - bugfix: Long range Gas Analyzer now appears under "Tool Designs" as intended. + - rscadd: Adds bear hugs to the game. Squeeze your friends so they can't escape + your love! + TheBoondock: + - qol: ranged analyzer is now able to scan the tile of machines and tables without + clicking on the tile directly + - qol: ranged analyzer can now scan further upward to 15 tiles + Timberpoes: + - bugfix: Fix an issue where exceptionally large tape recorder printed transcripts + could be generated. They now split across multiple pieces of paper. I sure hope + you have a filing cabinet handy! + Time-Green: + - bugfix: fixes abstract food spawns + - code_imp: allowed food list is only generated once + YusufEmirKoroglu: + - rscadd: Add keyboard shell. A shell that allows the user to input a string. Available + after researching the Advanced Shells tech node. + - imageadd: added 2 icons for the keyboard shell. One unassembled and one assembled. + dragomagol: + - qol: blind forcefeeding and stripping is lorge again + necromanceranne: + - code_imp: Removes an unused bible proc + - bugfix: Normal items once again do not fit into bibles. + timothymtorres: + - bugfix: Fix pirates to not be displayed on crew monitors +2022-08-15: + CursedBirb: + - rscadd: Kobun the bread dog that helps people with low mood + - rscadd: Adds crafting recipe for Kobun + RandomGamer123: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can now make trapdoors. Craft a trapdoor kit and use it on an openspace tile to make one, then link and activate it with some trapdoor electronics (printable at an autolathe or the engineering lathe) and optionally a trapdoor remote (crafted @@ -654,6 +1155,7 @@ - balance: Trapdoors now won't break if you just crowbar them. You need to block them from closing, such as with a lattice, cover it up with a wall, or fully destroy the floor tile its on to get rid of them. +<<<<<<< HEAD Wallem: - imageadd: GAGSifies most of the radio encryption key sprites Zonespace27: @@ -697,6 +1199,33 @@ any plasma in these airs for now on. - bugfix: Also on Meta, firelocks were installed in the virology airlock to mimic the Xenobiology one. +======= + ReinaCoder: + - imageadd: The pirate captain hat and suit has been resprited + lnGoror: + - bugfix: fixed taste layering + - code_imp: changed exposing reagents +2022-08-16: + Capybara Holly: + - bugfix: ambience buzzing no longer resets if you move between areas that share + a buzz (e.g. maintenance areas) + Comxy: + - rscadd: Swap Spell - this spell allows you to swap location with any living being. + - soundadd: Swap Sounds + - imageadd: Swap Icons + FernandoJ8: + - code_imp: changed the randomize_human() proc to call species procs instead of + being mostly hardcoded and cleaned up some code + - bugfix: randomize_human() can now assign plural gender to a mob and will always + do so for species without sexes + - bugfix: the external features of non-humans are now randomized properly by randomize_human() + and all mechanics that call the proc, such as mulligans + GoldenAlpharex, but really Valtosin for suggesting the fix: + - bugfix: Chat saving will no longer break if the CSS stylesheets contain unsupported + CSS rules. + JohnFulpWillard: + - bugfix: Clown cyborgs now repair their flash when recharging +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Kokonut/Thgvr: - imageadd: Updates Cigarette boxes and cigar case sprites to 3/4ths perspective. - imageadd: Updates matches (lit and burnt states) @@ -704,6 +1233,7 @@ - qol: Meta Medbay's fax is no longer in the hallway, it's in the office with the suit sensor computer now. I also added some paper, folders, pens, wallmounts and stuff while I was here. +<<<<<<< HEAD RimiNosha: - bugfix: The invisible languages bug is gone forever, provided something else doesn't break! @@ -732,11 +1262,29 @@ raider. - bugfix: fixes NRI ship's walls' diagonality. - balance: player-available deployable landmines nerfed significantly. +======= + RandomGamer123: + - spellcheck: Fix RCD deconstruction message for turfs being incorrect + ShizCalev: + - imageadd: You can now see through glass tables again! + - bugfix: Fixed a runtime caused by ghosts examining artwork. Your ancestors will + no longer be able to admire your crayon drawings, sorry. + - bugfix: Fixed mechas with infinite powercells draining the cells on destruction + Spookuni: + - balance: All required techweb experiments have been substituted for expensive + discount experiments. + Time-Green: + - qol: geysers no longer need to be plungered + Vire: + - bugfix: The cryopod on the Cere emergency shuttle can now be connected while the + shuttle is docked. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Wallem: - imageadd: Updates the newscaster wallframe sprite Wallem, Imaginos: - imageadd: Improves the book scanner sprite - soundadd: Adds a sound when scanning a book +<<<<<<< HEAD 2022-08-18: Ebin-Halcyon: - imageadd: Tweaked the color palettes of a few GAGSified items, namely the winter @@ -746,10 +1294,30 @@ clicking one of these items with a welder. It will craft one of the other two options depending on the Left/Right click. There is a contextual screen tip too so just hover over them with a welder for details on the results. +======= + dragomagol: + - admin: lavaland elite summoning is now logged in game.log + necromanceranne: + - rscdel: Reverts https://github.com/tgstation/tgstation/pull/49103. Krav Maga is + back to a much older state. Mostly. + - balance: Krav maga right click shoves again, and can have a chance of stealing + held items. + - balance: Most attacks with krav maga no longer check armor, and do a flat amount + of damage. + - balance: Legsweep deals 5 brute instead of stamina damage. + timothymtorres: + - rscadd: Add liquid dark matter to bluespace bananas. +2022-08-17: + EOBGames: + - rscadd: Having struck a deal with Piccionaia Home Appliances, Nanotrasen has now + distributed coffeemakers to break rooms across the Spinward Sector. Get cartridges + at cargo, and enjoy the ambrosia of the corporate masses on your station today! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - balance: Default heretic threat costs have been bumped down, and they can appear at slightly lower pop if the round is high threat. (Server configuration may differ from this) +<<<<<<< HEAD - bugfix: Fixes stuttered words with anxiety being capitalized OrionTheFox: - bugfix: The DNR trait now works properly, and medical will find they cannot revive @@ -779,12 +1347,16 @@ - code_imp: changed exposing reagents - balance: The Bulldog Shotgun now has a second magazine. - balance: You can swap the magazine as you fire by shooting with rightclick. +======= + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Changes hydrogen and tritium gas reaction stoichiometry. 1 mol of hydrogen/tritium and 0.5 mols of oxygen getting consumed will produce 1 mol of water vapour. - balance: Hydrogen and tritium burn rate has been changed to be the minimum of half the hydrogen/tritium, or 1/20th of the oxygen, rather than a binary if check on whether there is more oxygen or not. - balance: Hydrogen and tritium energy release has been reduced by 90%. +<<<<<<< HEAD - bugfix: holopads look properly open when screwdrivered - bugfix: Gutlunch should now eat gibs as intended - bugfix: Long range Gas Analyzer now appears under "Tool Designs" as intended. @@ -817,6 +1389,52 @@ friend brings more loot! jjpark-kb: - bugfix: tongs can pick up rods again +======= + RandomGamer123: + - bugfix: Kudzu that has been planted from a seed which already had mutations on + it cannot gain duplicate copies of those mutations + Rhials: + - bugfix: The messages for using a PAI hacking module have been tweaked, and will + no longer speak to everyone in the first person. + ShizCalev: + - bugfix: You can no longer remove the toner cartridge from a printer while it's + busy printing. + necromanceranne: + - bugfix: Rats no longer drop a food item and their own corpse when they die. +2022-08-18: + Kapu1178: + - bugfix: Ethereal hair now inherits from their glow again. + Melbert: + - bugfix: Fixes stuttered words with anxiety being capitalized + TerraGS: + - bugfix: Gutlunch should now eat gibs as intended + dragomagol: + - bugfix: holopads look properly open when screwdrivered + kreindo: + - rscadd: Added Tempeh +2022-08-19: + CursedBirb: + - bugfix: This time correct banana side sprite + Jacquerel: + - bugfix: Pun Pun shouldn't save the name "Unknown" between rounds unless that is + actually their real name for some reason. + JohnFulpWillard: + - bugfix: Hilbert Hotel's 'Note to the Institute' and Cybersun ship's password, + now has the text they are supposed to have, on them. + Rhials: + - bugfix: The Tiziran Canned Goods Pack on the chef's console now gives you the + proper supply box. + scriptis: + - balance: nitrium no longer grants stun immunity + tralezab: + - balance: Tendrils now drop their loot when you interact with them during the collapse. + - balance: But they can be interacted with by multiple people, so mining with a + friend brings more loot! + - bugfix: Fixes visual bugs related to cows and pulling. + - bugfix: Fixes cpws moving and having AI while you don't pull them during riding + - bugfix: Removed a heap of situations where dynamic rulesets could fail while executing, + causing runtimes +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-08-20: Azlan, Wallem: - imageadd: Ports Azlan's portable atmos machines from Baystation @@ -826,6 +1444,7 @@ be automatically stripped. This only applies to input boxes that start with the multiline view enabled, and will thus not work on input boxes that aren't meant to support it. +<<<<<<< HEAD ShizCalev: - bugfix: Icons will now actually update on mobs lol - qol: Rightclicking someone you're holding up will now shoot at them. @@ -850,10 +1469,24 @@ - rscadd: shutters for the aft hall and comms room windows are now in Defcon 3 to be more consistent with the others - bugfix: shutter buttons on tarkon are now where they should be +======= + Profakos: + - spellcheck: reflavoured the path of blades + RandomGamer123: + - bugfix: Circuit view sensors should no longer display undertile objects or abstract + objects or other people's hallucinations etc. + ShizCalev: + - bugfix: Icons will now actually update on mobs lol + - admin: Admin messages regarding gas canisters being opened now have the opener's + lookup / follow link. + VioletN: + - bugfix: The heretic Cleave spell no longer hits targets twice. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - bugfix: riot darts no longer become invisible when you take the cap off with a screwdriver. 2022-08-21: +<<<<<<< HEAD Jolly: - bugfix: On Delta, in the abandoned kitchen, there is no longer four air alarms. Stop being greedy, sheesh. @@ -1062,16 +1695,137 @@ Melbert: - bugfix: Fixes some runtimes from loading maptemplates with random populated bookselves, who knows they might even spawn with books now. +======= + FernandoJ8: + - bugfix: changed the directions of the bottom decals on the nature emergency shuttle + and the bottom gambling machine on the disco inferno shuttle from 3 (north+south) + to simply 2 (south), as they should be. + Jolly: + - bugfix: On Delta, in the abandoned kitchen, there is no longer four air alarms. + Stop being greedy, sheesh. + Melbert: + - bugfix: Fixes storage to storage mass transfering not being instant + - bugfix: Fixes two do_afters for storage mass transfer + - bugfix: Dumping storage spreads its items around again + - bugfix: Drag-opening a storage won't try to dump inside you + - bugfix: Transferring a ton of things into a fridge won't deafen you anymore + - rscadd: You can now mass transfer onto griddles + - bugfix: Some things that made you BOMBIMMUNE now actually make you BOMBIMMUNE, + probably + - bugfix: Fixes a runtime that occurred when bodyparts received damage while disconnected + from a mob + ShizCalev: + - qol: Added a new mob helper complementary to ran_zone() called get_random_valid_zone(), + which can only return zones/bodyparts that a mob DOES have. + - admin: Fixed Abyssal Gaze being logged when it wasn't actually being used + dragomagol: + - code_imp: split drinks_recipe into multiple files by category + - bugfix: tempeh starter uses the correct icon, desc fixes + timothymtorres: + - bugfix: Fix haunted tarot deck exploit + - qol: Add wisdom text to fortune cookies + tralezab: + - rscdel: Thieves are gone, and so are Opportunists, their midround counterpart. +2022-08-22: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - refactor: A bunch of things that used to not do anything (or just fall back on the chest) when targeting a limb that someone was missing will now be far more likely to attack another limb! +<<<<<<< HEAD - qol: APCs will now automatically set the lights in an area to low power mode when they are below 30% (same % as when equipment power turns off) to conserve additional power. SkyratBot: - bugfix: Fixed shove collisions logging incorrectly. - bugfix: A duplicate camera was removed from Meta AI sat +======= + SuperDrish: + - rscadd: Mortar now gives you an option. Do you want to grind or juice your thing? + san7890: + - admin: Whenever a turf is lit up by fire (like plasma floors combusting due to + fire above them), the name of that turf is now explicitly logged. +2022-08-23: + AnywayFarus: + - rscadd: Added a meat and fish poke + - rscadd: Meat and fish poke was added to robo-tourist order + CPTANT: + - bugfix: Lockers now give proper feedback when you are unable to close them and + no longer try to toggle lock status when you fail to close them. + EOBGames: + - bugfix: Coffeemaker boards can now be printed at the service, engineering and + science board printers. + IndieanaJones: + - refactor: Refactored Space Dragon's antag datum to separate the antagonist objectives + from the mob itself. + LukasBeedellCodestuff: + - rscadd: Pig crate from cargo + - rscadd: feeding carrots to pigs lets you tame them and ride them + - rscadd: raw pork from killing a pig + - rscadd: pork chops from cooking raw pork + PositiveEntropy: + - imageadd: Wood flooring now looks browner. + ShizCalev: + - bugfix: The syndicate outpost intercom is now an actual functional syndicate intercom! + timothymtorres, antropod: + - bugfix: Fix protolathe displaying duplicate stock parts categories +2022-08-24: + AdipemDragon: + - imageadd: When looking out into nearby space, your local planet might show off + more cleanely, now! Check it out, next time you have a mandated break! + DrDiasyl: + - soundadd: Virology got new mysterious ambient sounds. + Pickle-Coding: + - balance: Reduces CO2 heat penalty to 2, from 6. + - balance: Removes CO2 power transmission bonus. + Rhials: + - rscadd: Bananas now have a 1% chance to be boomerang-bananas. These look identical + to normal bananas, aside from a slightly unique examine text. Make sure to check + your bananas before peeling it to slip the HOS, you may just have a rare item + on your hands. + ShizCalev: + - qol: Drones now have multitools, pipe dispensers, t-scanners, and analyzers! + - bugfix: Toggling breakers via the power flow control console now actually works. + - bugfix: Targeting limbs now works again. Honk! + - bugfix: Fixed a bunch of things that would say "your human arm" instead of just + "your arm". + - bugfix: Drones will no longer by shy when invisible mobs are around! (eg phased + revenants, bloodcrawling slaughter demons, ect) + - admin: Admin deletion messages are now a little more verbose. + san7890: + - bugfix: You should now no longer need thousands of hours to unlock your favorite + head of staff role. + tralezab: + - rscadd: You can now ask critters their name with voice of god. Their ACTUAL name. +2022-08-25: + ArcaneMusic: + - imageadd: Resprites many of the grenades used and made in-game. + Echriser: + - qol: Added a holopad to Mining Labor Camp. + Jacquerel: + - qol: Adds contextual screentips to explain whether you are going to destroy, remove, + or place a trap into a poster. + - bugfix: Midround traitors can happen again. + Jolly: + - bugfix: On KS13, the northern most solar room no longer has duped windows. + PositiveEntropy: + - bugfix: Fixes faxes playing the "fax_contain" animation and makes it actually + use the "fax_receive" animation when receiving. + - imageadd: Resprites fax machines! + RandomGamer123: + - bugfix: Asimov supremacy shows up as a human perk for default servers + - config: Added a config option to make Asimov supremacy show up as a perk for humans + even if the default lawset is not Asimov (intended for use with Asimov variants, + notably Asimov++) + - bugfix: Storage implant stacking (and the implant being rejected when you hit + the limit of 4 slots) now works + ShizCalev: + - rscadd: Space ants will now turn into space fire ants when burned with fire. + Tastyfish: + - rscadd: Added a new lift indicator for the public elevator. + - imageadd: Added standalone sprites for the new lift indicator. + Y0SH1M4S73R: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Returning a recursive table from lua will no longer crash the server. - bugfix: Running an empty string as lua code will no longer crash the server. - qol: '`args`, `contents`, `vis_contents`, and `vis_locs` lists are now directly @@ -1084,6 +1838,7 @@ - qol: In the lua UI, strings will be wrapped in double quotes and have their own double quotes escaped, to distinguish them from nulls, functions, threads, and DM resources. +<<<<<<< HEAD - bugfix: The wall engravings have returned to MetaStation's Central Medbay Maintenance (the corridor between the CMO's Office, Plumbing, and the Pharmacy). - balance: Fires no longer protect the floor from melting. @@ -1115,10 +1870,48 @@ Melbert: - bugfix: Fixes a runtime that occurred when bodyparts received damage while disconnected from a mob +======= + dragomagol: + - bugfix: cooked pig meat is no longer GROSS, raw pig meat is GORE instead of GROSS + - code_imp: meat.dm has been split into several different files + san7890: + - bugfix: On IceBoxStation, the door bolt buttons in the restrooms next to the recreational + room should no longer violate the laws of physics (or clip) with the toilet + lid. + - bugfix: On IceBoxStation, the Psychologist's Locker should now be accessible once + again. + - bugfix: Nanotrasen smoothed out some hiccups, so Security Departmental Order Crates + should now open in more parts of the brig. + scriptis: + - spellcheck: the syndicate no longer use secuirty shutters + - bugfix: tesla blast works again + vincentiusvin: + - spellcheck: fixed a typo in NT Frontier under medical partner + - qol: the ordnance experiments will give you more information on how to do them + from the UI. +2022-08-26: + AIUNBOLT: + - rscadd: the express supply console now requires cargo access instead of quartermaster + access + Jackal-boop: + - bugfix: a mining intercom being the incorrect type + Jacquerel: + - bugfix: Any mob you can hold in your hand can now also be thrown. + JohnFulpWillard: + - bugfix: You can now break eggs into cups again. + MMMiracles: + - rscadd: Adds sheep! Buy one from cargo and use a razor to shear wool off it! Use + that wool on a loom and get cloth! Feed the sheep grass to make it grow back + the wool faster! + Melbert: + - bugfix: Fixes some runtimes from loading maptemplates with random populated bookselves, + who knows they might even spawn with books now. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Deltastation: The Locker Room and Dormitories have been flipped around and redone to better fit with the new layout.' - rscadd: 'Deltastation: Some rooms of Security have been widened and shifted around.' - rscadd: 'Deltastation: Added a fourth escape pod by the holodeck.' +<<<<<<< HEAD ORCACommander: - bugfix: The Bar on a certain centcom dock has been restocked RimiNosha: @@ -1178,6 +1971,9 @@ - bugfix: Fixed a bunch of things that would say "your human arm" instead of just "your arm". SkyratBot: +======= + MidoriWroth: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added 7 new types of various salads. Vegetarians rejoice! - rscadd: Added a new ingredient order beacon box, 'Salads'. It contains many ingredients for the new salads. @@ -1190,6 +1986,7 @@ - rscadd: Cherry jelly can be ordered at a produce console - rscadd: Consuming jelly now actually nourishes you - imageadd: Added sprites for all the new tasty foods +<<<<<<< HEAD - bugfix: Coffeemaker boards can now be printed at the service, engineering and science board printers. - bugfix: Reagents like Strange Reagent, Sulfuric Acid, blob reagents, and many @@ -1213,10 +2010,163 @@ - bugfix: Anomalies will no longer spawn ontop of lava / plasma rivers. SkyratBot: - qol: Add logging when Protocol CRAB-17 is used. +======= + - bugfix: Removed some stacked tables in the Icebox kitchen + Mooshimi: + - spellcheck: Removes the security MODsuit's description of being shockproof, as + it's false advertising. + - bugfix: Replaced the directional firelocks on Metastation garden with windoors, + so the fire alarm isn't triggered shift start. + RandomGamer123: + - bugfix: Microwaves no longer spontaneously self-deconstruct if you try inserting + non-full stacks of glass or cable coil into them. + - bugfix: DNA consoles now use power for operations even if they aren't connected + to a scanner (eg. printing mutators from a disk) + ShizCalev: + - bugfix: Fixed a couple things not updating properly with vareditted & admin deleted + cells. + - qol: You can now directly interact with beakers inserted in a PanD.E.M.I.C. with + droppers and syringes! + Vanadiom: + - bugfix: Glorious revolutionary tinkers have noticed that the rags in molotovs + weren't burning during the flight and modified the assembly instructions so + you can finally set bourgeois scum on fire from afar again! + distributivgesetz: + - bugfix: HoPs all around the Spinward Sector scream in joy as their beloved ticket + machine finally rises back from the dead. + - qol: Add more examines to ticket machines and tickets, giving info about people's + spot in queue and so on. + - bugfix: Resolving weakrefs in VV should open a menu now instead of doing nothing. + san7890: + - rscadd: Nanotrasen has added a new vent and a new scrubber to MetaStation's Gravity + Generator Foyer. + timothymtorres: + - bugfix: Fix cult ghosts needing to breath + - bugfix: Fix chaplain's not being able to pick their bible cover while illiterate + or blind +2022-08-27: + GoldenAlpharex: + - refactor: Refactored the manifest code to not rely on generating two photo of + each character at roundstart. This means that the start of the game should be + significantly faster. + - bugfix: The images shown in the manifest no longer look crummy, and will instead + look exactly like you'd expect them to! + Jacquerel: + - rscadd: You can now fish in chasms, and might manage to catch things that careless + miners have dropped in there. + - rscadd: If your pole is long enough to reach into a deep hole, you might catch + crabs. + - balance: Changelings can climb out of chasms if you throw them into one. + - imageadd: An icon of a nice little crab, who will grow up into something less + nice. + - rscadd: You can craft fishing equipment from various lavaland materials, so that + Ashwalkers can fish up dead miners before you. + - rscadd: You can sometimes find worms while digging up tiles, if appropriate for + that material. + JohnFulpWillard: + - bugfix: Reagents like Strange Reagent, Sulfuric Acid, blob reagents, and many + others, now works again. + - bugfix: Cultist shades can now use their Communion ability while in their shade. + Mothblocks: + - bugfix: Fixed shove collisions logging incorrectly. + - bugfix: Improved performance of space turf initializations, lowering init times + by tens of seconds. + NamelessFairy: + - bugfix: A duplicate camera was removed from Meta AI sat + Pickle-Coding: + - balance: Fires no longer protect the floor from melting. + ShizCalev: + - qol: APCs will now automatically set the lights in an area to low power mode when + they are below 30% (same % as when equipment power turns off) to conserve additional + power. + Tastyfish: + - rscadd: Status displays are now a bit more colorful and have gapless marquee text. + - refactor: Brig door timers were massively refactored behind the scenes. Door control + should still work as before but be mindful. + Vire: + - bugfix: 'Fixes a few doubled up tables in various locations: Deltastation, Icebox, + The Derelict, and the holographic skatepark.' + Vishenka0704: + - bugfix: Dead dogs can no longer befriend you or lick you. + Wallem: + - imageadd: Updates the tank compressor with a new sprite + san7890: + - bugfix: The wall engravings have returned to MetaStation's Central Medbay Maintenance + (the corridor between the CMO's Office, Plumbing, and the Pharmacy). + tralezab: + - balance: Ghouls now appear dead to health scanners and other detections of life. +2022-08-28: + Jolly: + - bugfix: On Tram, somewhere in maints, a missing windoor was readded. You're welcome. + Timberpoes: + - bugfix: Fixes reagent transfer not properly emptying the source of reagents when + transferring to a target. + optimumtact: + - balance: orks no longer shout their attacks over the radio +2022-08-29: + GoldenAlpharex: + - bugfix: Bluespace bodybags will no longer fold on themselves and delete everything + inside of them when someone inside of them attempts to fold them. + Melbert: + - code_imp: Updated some signal misuse in mob harvest component, and implemented + a signal in cult sacrifice code. I also changed the sound of sheep wool being + harvested from a welding tool sound to a scalpel sound while I was here + Mooshimi: + - bugfix: Chem Masters will now appear to be depowered when appropriate. + OrionTheFox: + - rscadd: Added a Trekkie Costume Crate! Now you can wear NT's scrapped jumpsuit + designs for only a small cost, all of which will go to NT's emergency anti-copyright + savings! + - imageadd: Updated the Trekkie uniforms to modern sprite standards, as well as + adding Voyager uniforms! + dragomagol: + - qol: coffeemakers now emit steam when they're brewing! + - bugfix: coffeemakers now have an icon when they're spawned/created + - bugfix: scotch and chocolate eggs will no longer appear as errors + - bugfix: Fixes gibtonite icons not appearing + sergeirocks100: + - qol: You can now cut the fingers off of black or insulated gloves with any sharp + object, instead of just wirecutters. + - qol: You now get a notice in chat when you cut the fingers off of gloves. + timothymtorres: + - qol: The floor is lava admin/wizard event can be ignored by floating mobs + - rscadd: Added new chems for plants. Novaflowers now have Sulphuric Acid and Corpse + Flowers now have Fluorine. Combine these chems with a Carbon Rose to create + foam effects on harvest. +2022-08-30: + Mooshimi: + - bugfix: Tramstation robotics gets its shutters button, but it's not on a desk + so you can't crush people what's the point? + NamelessFairy: + - bugfix: Updated the right click vs alt click tip to refer to shift right clicking + instead of right clicking + Profakos: + - bugfix: The aux base construction console is once again present on Tramstation + ShizCalev: + - bugfix: Anomalies will no longer spawn ontop of lava / plasma rivers. + Striders13: + - bugfix: some windoors are no longer invisible due to being hidden below shutters + itseasytosee: + - qol: Monkeys wont trip over each other anymore, and will only trip if you run + into them with combat mode on. + - qol: Player monkeys can now opt in to tripping like a regular monkey. + - refactor: Stores monkey tripping in the brain, rather than the AI controller + - refactor: Traits such as literacy and advanced tool use are now tied to the brain + rather than the species + - bugfix: Monkeys have found absolution. They now once again "seem like themselves" + - bugfix: Butchering now properly requires you to be in combat mode. + - bugfix: Monkeys will no longer attack with items worse than their basic bite. + - bugfix: Preforming surgery steps now requires the surgeon not to be in combat + mode. + kawoppi: + - admin: added logging for the rare Aurora Caelus oven ignition + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: When you examine or use an AI Law Module in-hand, it should look a lot nicer as you read the laws that you're about to subject that poor silicon to. - bugfix: When ghosts examine AI Law Modules, they are now able to see the actual laws on the board. +<<<<<<< HEAD - bugfix: Updated the right click vs alt click tip to refer to shift right clicking instead of right clicking - bugfix: some windoors are no longer invisible due to being hidden below shutters @@ -1243,3 +2193,44 @@ room, next to Cryo. Zonespace27: - bugfix: Local servers should no longer have streams of endless title errors +======= + timothymtorres: + - qol: Add logging when Protocol CRAB-17 is used. + tralezab: + - rscadd: Prisoners can now select their crime in their character preferences. +2022-08-31: + CPTANT: + - balance: Regular windows now have 50 melee armor and take 3 deconstruction steps. + - balance: Metastation has new windows + JohnFulpWillard: + - code_imp: Bank machines can now use anyone's bank account, rather than limited + to the Cargo budget, though it is set to the Cargo budget by default. + Melbert: + - qol: The statue spawner mapping helper spawns its statues anchored + - code_imp: Remove some hardcoding from random loot spawners + Mothblocks: + - qol: Subsystem initialization times now show to 2 decimal points. + Tastyfish: + - qol: The Status Display app can now do everything the communications console status + display screen can do. + itseasytosee: + - bugfix: The monkey and human rudimentary transform commands now function as intended. + - bugfix: Monkeys won't stay on combat mode forever after getting pissed off. + necromanceranne: + - balance: Sends a chat alert to those nearby when someone completes a stage of + a hijack. + san7890: + - rscdel: There is no longer an air alarm in the central island of atmospherics + on MetaStation. + tralezab: + - rscadd: Cows can now eat wheat by interacting with it on the ground, healing them + a little. + - rscadd: Cows controlled by AI will seek out the food they like and eat it. + - rscadd: Even moonicorns. + - rscadd: But not wisdom cows, who refuse to be tamed or show their weak side because + of space station 13 socially enforced toxic wisdom cow standards + - balance: Space Dragons can no longer place rifts on open space + twilightwanderer: + - bugfix: Fax no longer blocks access to the card reader on the MetaStation in the + QM's office. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-09.yml b/html/changelogs/archive/2022-09.yml index 07bdffe8e81..a66eb76ea9f 100644 --- a/html/changelogs/archive/2022-09.yml +++ b/html/changelogs/archive/2022-09.yml @@ -1,4 +1,5 @@ 2022-09-01: +<<<<<<< HEAD GoldenAlpharex: - bugfix: Fixes the Dutch Jacket being invisible when selected in the loadout. - spellcheck: Renames the Dutch Jacket's loadout entry to Western Jacket, as that's @@ -74,6 +75,8 @@ itseasytosee: - bugfix: Fixed balistic helmet sprites with flashlights looking weird 2022-09-05: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, thgvr, Snakebitten: - balance: makes the standard quick carry modsuit module have nitrile level carrying speed instead of latex level @@ -91,6 +94,7 @@ - bugfix: fixes a bug where you can unwield defibrillator paddles just after starting the do_after to defib onehanded - bugfix: fixes a bug where the modsuit gps would have a broken name when renamed +<<<<<<< HEAD Guillaume Prata: - balance: 'The pluoxium reagent won''t heal suffocation damage and instead will slowly heals organ damage if the target is sleeping. Hint: Cryotubes.' @@ -101,6 +105,72 @@ - balance: Tramstation's tram now actually packs a punch when it hits you. It will hurt. Think twice before crossing on red! Melbert: +======= + ORCACommander: + - bugfix: fixed High capacity inheritance structure + RandomGamer123: + - bugfix: Stray cargo event pods now don't runtime if a canister supply pack is + chosen, meaning that you should actually see them in the pods now + coldud13: + - bugfix: Increases PDA immersion + san7890: + - bugfix: An APC and a Television Monitor in MetaStation Engineering Hallway will + no longer conflict visually. + scriptis: + - rscadd: techfab inspect blocks + - refactor: techfabs (and circuit imprinters, and protolathes) now use tgui +2022-09-02: + Guillaume Prata: + - balance: Anyone with wings or a wagging lizard tail will have a small bonus to + their tacklling offense/defense. + - balance: Moths and lizards that lose their wings/tail will have worse tackling + values instead. + - balance: Fly people don't take splatting themselves on windows/walls easily and + have a higher chance to get a bad result from that. + IndieanaJones: + - rscadd: Spiders can now be caught on fire + - rscadd: Spiders take significant damage from fly swatters and stamina damage from + pesticide + - balance: Spiders have been re-balanced. Their toxins can no longer kill but they + are not as susceptible to freezing + - balance: General stats of spider broodmothers have been buffed with more health, + damage, and faster web and egg placement + - balance: Flesh spiders cannot regenerate whilst on fire + - balance: Simplemobs change their internal temperature twice as fast + - bugfix: Basic mobs no longer glitchily catch on fire. + Jackal-boop: + - bugfix: fixed the HFR fuel input part saying that it can only take tritium and + hydrogen + Jacquerel: + - rscadd: A new kind of anomaly which transforms the area into some other kind of + material. + - bugfix: Supermatter delaminations can spawn bioscramblers again. + - qol: Newly created Shades will be told much more clearly that they're supposed + to be bound to their master, if they have one. + JohnFulpWillard: + - bugfix: NT Messenger having their ringtone off will now get their messages displayed + in chat again. + LemonInTheDark: + - code_imp: The time between the round starting and the game like, actually starting + has been reduced by 66% + - refactor: I've slightly changed how ban caches are generated, admins please let + me know if anything goes fuckey + - server: I'm using the blocking_query_timeout config. Make sure it's up to date + and all. + Melbert: + - bugfix: Wabbajacking a shapeshifted mob no longer runtimes horribly. When a shapeshifted + mob is wabbajacked, they'll now be removed from their shapeshift and stunned. + - bugfix: Transforming via a shapeshift should no longer rob you of your hearing + / runechat awareness. + - bugfix: Shapeshifting plays nicer with holoparasites. + - bugfix: Being polymorphed from a xeno to a non-xeno correctly makes you a non-xeno + - refactor: Refactored shapeshifting, the shapeshift holder is now a status effect + instead of an object. + - refactor: Heretic worm form is a shapeshift spell now, this might have some minor + behavioral changes but should overall be the same. + - refactor: Refactored Wabbajack (+ cursed pool). Overall a bit more clean / consistent + behavior. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Heretic: Curses have been reworked. You can now curse any member of the crew, granted they''re not too far away. If you additionally provide an item in the ritual containing a sample of the target''s blood or fingerprints, @@ -120,6 +190,7 @@ was a previously a Living Heart after being removed. - bugfix: If a heretic is fully healed by something (such as ahealed), they'll not lose their living heart +<<<<<<< HEAD - bugfix: Nightmares heal in darkness again ShizCalev: - bugfix: bodybags / crates will now be explicit about what is ontop of them if @@ -157,11 +228,20 @@ - rscadd: Status displays are now a bit more colorful and have gapless marquee text. - refactor: Brig door timers were massively refactored behind the scenes. Door control should still work as before but be mindful. +======= + Mothblocks: + - qol: Windows from outside the station now get the RCD reconstruction benefits, + just like walls and floors. + Profakos: + - balance: Heads are no longer tasked to kill their own pets + RandomGamer123: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Putting a budget card into NIRN now gives the proper error message if you are trying to buy something privately, and treat you as a normal cargo request order by someone without any permissions otherwise - bugfix: NIRN orders should now charge the department that bought it only if a head of staff ordered it +<<<<<<< HEAD - rscadd: Shadowpeople now heal from their brains! Their brain-tumor-thingy! - code_imp: split up surgery.dmi - admin: fax messages and book printings are now logged in paper.log @@ -226,10 +306,78 @@ - rscadd: vines now take damage when off vines / heal when on vines - rscdel: vines no longer heal while moving through vines tf-4: +======= + Rhials: + - code_imp: Removes erroneous code from bananium meteor. This should not affect + players in any way. + - spellcheck: Fixed a typo when trying to fasten in an APC board before inserting + it. + Sealed101: + - bugfix: Fixed autonamed/newly-built security cameras in areas using \improper + in their name showing up as static in security camera consoles. No, this is + the first attempt to do so, why do you ask? + ShizCalev: + - bugfix: bodybags / crates will now be explicit about what is ontop of them if + you can't close them due to other bodybags / crates being in the same tile. + - bugfix: Monkeys can now actually resist things! + - bugfix: Headless humans can no longer receive facial creampies. + - bugfix: MMI piloted mecha can now open doors using access granted through the + ID card reader! + - bugfix: Mecha will now properly open doors when approaching from unrestricted + sides. + - bugfix: Supplypods can no longer be destroyed by explosions BEFORE they land. + - qol: 'Added multi-z support to: Wizard teleporting, AI law upload computers, chemical + / tracking implants, robotics control consoles, camera bugs, blob spores, and + the apocalypse rune''s visual effects.' + Y0SH1M4S73R: + - bugfix: Fixes a couple of hard-deletes related to lua signal handlers. + - admin: The lua function `SS13.await` can now await non-sleeping, but extremely + expensive procs, such as `getFlatIcon` + distributivgesetz: + - bugfix: Fixed runtime when using AmpCheck without connecting the console with + a wire. + - bugfix: Fixed a few runtimes that could occur when using APC controller consoles. + - qol: Sucked soul out of APC controller code and UI. + - rscdel: Removed "secret" power monitor console. + dragomagol: + - rscadd: Re-adds the scrubber overflow event as a random event + - bugfix: Fried chicken, beef wellington, corned beef, full english, spider eggs, + spiderlings, and hot dogs should have their proper items + itseasytosee: + - admin: Fixed quick admin spawned humans from observes not keeping preferences + (sorry) + kawoppi: + - rscadd: added an animation for using the *cry emote + - rscadd: getting peppersprayed causes you to cry + - code_imp: the blush overlay is now affected by the face offset + ma44: + - code_imp: Trader NPCs have been given some needed frontend and backend changes + timothymtorres: + - bugfix: Fix legion dead miners not spawning species + - bugfix: Fix slimepeople soft landing showing message for stairs and self + - qol: heretic sacrifices will drop their legcuffs before entering the minigame + (bolas, bear traps) + - bugfix: Fix space bartender not having access to kitchen locker in away mission + tralezab: + - bugfix: Monkeys can correctly find weapons again + - rscadd: Shadowpeople now heal from their brains! Their brain-tumor-thingy! + - code_imp: split up surgery.dmi + vincentiusvin: + - balance: CO2 powerloss inhibition now works immediately based on gas composition + instead of slowly ramping up. + - refactor: refactored how the SM fetches it's gas info and data. No changes expected + except for the co2 thing. + - balance: nerfs scipaper paper publication money across the board + - balance: nerfs scipaper ghost writing partner. + - bugfix: fixed plasma mat ignition spitting room temperature plasma. +2022-09-03: + Fikou: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: the admin modsuit now has the advanced jetpack instead of the normal one - bugfix: fixes modsuit chestplate unequipping no longer retracting the suit storage item - bugfix: fixes modsuits breaking when going into gulag +<<<<<<< HEAD - balance: Instead of directly lowering body temperature by a small amount, the Grasp of Void and Mark of Void heretic abilities now inflict a status condition called void chill, which steadily lowers the victim's body temperature and also @@ -265,21 +413,118 @@ - rscadd: A new kind of anomaly which transforms the area into some other kind of material. - bugfix: Supermatter delaminations can spawn bioscramblers again. +======= + Ghommie: + - bugfix: Brought a portion of the admin deadsay command up to date. Revenants and + EOR players will now see admin deadchat messages in their chat tab. + Melbert: + - rscadd: Revenants have a new spell available. Haunt Object, it allows them to + cause nearby loose items to lift off the ground and start attacking people! + The objects will return to peace after a few minutes, or if someone dispels + them with a null rod or bible. + Rhials: + - spellcheck: Just to clarify, sonic jackhammers do NOT go through walls. Their + printing design text has been modified to reflect this. + dragomagol: + - admin: fax messages and book printings are now logged in paper.log + - admin: renaming fax machines is logged in game log + san7890: + - bugfix: Surgery tables are now no longer transparent. +2022-09-04: + Mickyan: + - rscadd: Added two new ethereal themed pieces of clothing, find them in your local + clothesmate + - rscadd: 'New curator bundle: Ethereal Trail Warden' + Mothblocks: + - rscdel: You can no longer see maint spawners before the round starts (but your + rounds start faster now :) ) + - qol: CTF will now only load when players/admins request it, for performance. + Vishenka0704 and Ying-The-Pando: + - rscadd: Cucumbers and pickles + - rscadd: Danish hot dog + - balance: add cucumbers in dishes where they need + - qol: add to bounty cubes, orders - new vegetables + itseasytosee: + - bugfix: Fixed balistic helmet sprites with flashlights looking weird + skylord-a52: + - refactor: Reorganized the icons/mob folder and added a bunch of new subfolders + to make finding things easier. +2022-09-05: + Arturlang: + - code_imp: Removes a unnecesary function blind_eyes + Guillaume Prata: + - balance: Metal Hydrogen axe was reworked. It now work as a crowbar, can be stored + on most engineering/atmos suits and deal less damage than the default fireaxe + (15) against mobs while still doing the same damage (30) to structures or machinery. + - balance: 'The pluoxium reagent won''t heal suffocation damage and instead will + slowly heals organ damage if the target is sleeping. Hint: Cryotubes.' + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can now send photos or trading cards through the fax machine. - rscadd: You can now hack the wires of a fax machine to have it throw items harder or accept additional flat input items such as material sheets, ID cards, and pizza slices. - qol: Screentips should tell you what using a particular item on a fax machine will do. +<<<<<<< HEAD - bugfix: Fixed runtime when using AmpCheck without connecting the console with a wire. - bugfix: Fixed a few runtimes that could occur when using APC controller consoles. - qol: Sucked soul out of APC controller code and UI. - rscdel: Removed "secret" power monitor console. +======= + - bugfix: Creating shades with soulstones won't affect the chance of midround antagonist + spawns. + Melbert: + - bugfix: Nightmares heal in darkness again + - bugfix: Blade heretics and cauterizing slashes should actually help blood loss + ShizCalev: + - bugfix: Hiding inside lockers/objects when the SM delams will protect you from + it's effects again. + Time-Green: + - bugfix: fixes infinite locker timer runtiming + dragomagol: + - imageadd: landmark icon sprites have been updated! + - bugfix: owl masks and wizard hats now use their proper inhands! + - bugfix: surprise eggs once again have a sprite + - balance: the scrubber overflow event now only triggers for half of scrubbers + - balance: removed peaceborg tire, peaceborg confuse, morphine, space drugs, acid, + mindbreaker, rotatium and plant-b-gone from the scrubber "safer" reagents list + - balance: added orange carpet, royal blue carpet, blue glitter, yoghurt, tinea + luxor, hydrogen peroxide, gravitum, and yuck to the "safer" reagents list +2022-09-06: + GoldenAlpharex: + - bugfix: Fixed the orientation of the left and right end of corporate sofas when + facing North. Their behavior is no longer swapped compared to other sofas. + Rhials: + - bugfix: The shrink ray now spawns with an abductor firing pin instead of a normal + one. + ShizCalev: + - bugfix: Admin event spawned blobs will no longer immediately announce when the + event is triggered. + - bugfix: Admin events which poll candidates from ghosts will no longer announce + the event if the event failed to spawn a mob. + VexingRaven: + - rscadd: The Research Department Server Room on Kilo Station now has an air alarm + and ventilation. + - bugfix: The Research Department Server Room on Kilo Station no longer has an atmosphere + alert at start of shift. + Y0SH1M4S73R: + - admin: The lua function "loadstring" has been added, allowing you to compile a + string of lua code into a function that runs that code. + san7890: + - rscadd: Don't like the map everyone else voted for? Rock the vote! You can now + trigger a new map vote after one has already been selected! + - config: Server operators may decide if they wish to allow players to rock the + vote, as well as set the number of times they may rock the vote during a given + shift. + scriptis: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: techfab tgui now supports old-school bulk sheet ejection - qol: techfab tgui no longer overflows its window if you have six million categories - qol: techfab tgui no longer consumes your screen's free real estate on an unprecedented scale +<<<<<<< HEAD - code_imp: Removes erroneous code from bananium meteor. This should not affect players in any way. - bugfix: An APC and a Television Monitor in MetaStation Engineering Hallway will @@ -324,10 +569,23 @@ - bugfix: Police hats no longer turn you bald while worn, and no longer act like helmets, since they're caps. - bugfix: scotch and chocolate eggs will no longer appear as errors +======= + tralezab: + - balance: Sleeping carp deflects hand spells, CQC reflects hand spells +2022-09-07: + Addust: + - rscadd: hilbert research facility airlocks have names now + - rscadd: Kilo whiteship now has bangin donks, bolt button, and its bridge now has + atmospherics systems. + - bugfix: Kilo whiteship crew quarters air alarm now exists, meaning that vents + won't be fucky + - bugfix: Kilo whiteship engine APC is rewired +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Tram whiteship now has named airlocks - rscadd: Tram whiteship bridge and crew quarters areas are split, new APCs added - bugfix: no more shuttle engine rotation fuckery on tram whiteship - bugfix: no more firelock fuckery on tram whiteship +<<<<<<< HEAD - code_imp: restrictedinput can now accept negative numbers - bugfix: Xenomorphs can no longer hold any item in the game, - admin: When admins start CTF they can now choose which map is played or choose @@ -343,6 +601,18 @@ tf-4: - bugfix: Operating tables are visible again. 2022-09-08: +======= + Jackal-boop: + - bugfix: fixed the cucumber seeds not being in the correct spot in the megaseed + list + JohnFulpWillard: + - bugfix: Xenomorphs can no longer hold any item in the game, + - bugfix: Police hats no longer turn you bald while worn, and no longer act like + helmets, since they're caps. + - qol: Scrubber surge events now have cockroaches popping out of dangerous vents, + rather than every vent possibly having them. + - bugfix: More dangerous scrubbers now properly shoot out more foam. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: 'Delta: Engineering, Library Backroom, and Security Hall APCs are wired' - bugfix: 'Delta: Armory camera is no longer on a windoor, and outside armory camera @@ -350,6 +620,7 @@ - bugfix: 'Delta: Genetics has a corrected clothes vendor' - qol: 'Delta: Moved the engineering fax machine to a less in-the-way-place (break room)' +<<<<<<< HEAD SkyratBot: - rscadd: hilbert research facility airlocks have names now - rscadd: Kilo whiteship now has bangin donks, bolt button, and its bridge now has @@ -368,11 +639,50 @@ ShizCalev: - bugfix: Fixed a runtime when all alive players are converted to cultists that prevented them from getting their cool halo/eye effects. +======= + - qol: Add an examine tip explaining how to fit an explorer gas mask into a box + NamelessFairy: + - admin: When admins start CTF they can now choose which map is played or choose + random as its always been + - admin: Admins can no-longer permanently break CTF by unloading the map accidentally + - spellcheck: Fixed a typo in the Map Description for CTF Cruiser + - bugfix: CTF can now be reloaded after being unloaded + Pepsilawn: + - admin: Added proper logging to antagonist datum removal + Timberpoes: + - bugfix: Fixes an SQL query so that role banned players are now correctly banned + from their roles again. + Vishenka0704: + - bugfix: fix user of xenbio bag on reproductive extract + Wallem: + - qol: The ORM now has color-coded lights showing which side is the input and output. + Blue for input, red for output. + itseasytosee: + - bugfix: Would you believe me if I told you androids had functioning human stomachs + in them for the past 5 years? No? Well anyways its fixed. + stanalbatross: + - code_imp: restrictedinput can now accept negative numbers + tralezab: + - rscdel: Vampires, Dullahans, and Nightmares can no longer be found in certain + magic mirrors. +2022-09-08: + JohnFulpWillard: + - balance: Xenomorph abilities require being mobile to use. + - balance: Neurotoxin spit can no longer be used if you're muzzled. + Pepsilawn: + - bugfix: The mining station now requires Mining access for proper access instead + of Mining EVA, minus the one airlock leading to Mining EVA + Pickle-Coding: + - bugfix: Water vapour electrolysis and hypernoblium electrolysis now respects heat + capacity changes. + ShizCalev: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed a runtime preventing nonhuman cadavers from spawning properly. - config: Cadaver spawners will no longer yell at you when morgue_cadaver_other_species_probability is blank. - config: morgue_cadaver_disable_nonhumans will now properly disable nonhuman races! (It was reversed, woops.) +<<<<<<< HEAD SkyratBot: - bugfix: fixed a bug causing the process of slicing food to erase most of the food's reagents @@ -381,11 +691,22 @@ - balance: Neurotoxin spit can no longer be used if you're muzzled. - bugfix: Hey, we support byond version 514.1587 now. You can upgrade if you'd like. I hope. +======= + - bugfix: Fixed a runtime when all alive players are converted to cultists that + prevented them from getting their cool halo/eye effects. + YakumoChen: + - bugfix: 'Icebox: Moved a vent hidden under a disposal bin slightly to make it + visible' + itseasytosee: + - spellcheck: Fixed a typo in monkey trip toggling. + scriptis: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: techfabs, protolathes, circuit imprinters, and exosuit fabricators now automatically r&d sync - qol: the full window refresh time is now one second instead of five seconds - bugfix: refreshing windows ("please wait...") no longer hang for up to twice as long as they should +<<<<<<< HEAD Vishenka0704: - rscadd: add option to enable/disable ticket ping in server config - bugfix: oppfor and ticket ping now works @@ -413,11 +734,64 @@ - bugfix: Water vapour electrolysis and hypernoblium electrolysis now respects heat capacity changes. - bugfix: You can no longer adjust ethereal tunics, causing a missing icon error +======= + tralezab: + - rscadd: Mimes can now hold a baguette like a sword by right clicking it +2022-09-09: + GoldenAlpharex: + - bugfix: Corporate sofa corners have been exorcised and will no longer engulf anyone + that sits on them while they're in the L orientation. + LemonInTheDark: + - bugfix: Hey, we support byond version 514.1587 now. You can upgrade if you'd like. + I hope. + Mickyan: + - bugfix: You can no longer adjust ethereal tunics, causing a missing icon error + NamelessFairy: + - bugfix: The bar shuttle now has correctly orientated stools + Profakos: + - bugfix: Monkey mind magnification helmets once again poll all ghosts + - rscadd: Added a preference for sentience creatures, which means people can toggle + eligibility to sentience potions, and boosted lavaland tumors. Cargorilla, Regal + Rat and Shuttle Creatures use this preference now. + - rscadd: Added several separate notification preferences for creatures + Sealed101: + - rscdel: 'Metastation: removed two excess cameras in Service Hallway and Hydroponics' + - qol: Solar Maintenance cameras are now grouped up in one place on the console's + list, several other cameras grouped up with their respective department group + - qol: tweaks to some cameras' c_tags for easier use (i.e. Tech Storage cameras + are now clearly signed as Secure and non-secure) + - bugfix: Armory - Exterior camera fixed to actually appear on console lists + - bugfix: two AI Minisat Exterior cameras fixed to be on the minisat network to + actually appear on console lists + - spellcheck: AI Upload cameras edited to not be lowercase (ai_upload -> AI Upload) + VexingRaven: + - bugfix: Fixed a malfunctioning lantern on Ice Box and the Syndicate Listening + Station. + Vishenka0704: + - rscadd: Added "ProcCall" & "Tweak Components Rating" modes in buildmode + dopamiin and tattle: + - rscadd: Distant meowing can be heard from the restricted section of station AutoDrobes. + - soundadd: A small cat meow designed to be played about three times in one second, + deafening innocent crew. + - imageadd: Cute cat slipper sprites. + lizardqueenlexi: + - bugfix: fixed a bug causing the process of slicing food to erase most of the food's + reagents +2022-09-10: + 567Turtle: + - qol: Changes how the medipens examine text works + AnturK: + - bugfix: Fishing should be now more consistent about win/failure. + Dmeto: + - qol: Reagent scanner circuit component now ouputs to a table list. + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Mining station's access was reverted, and Curators once again can access it. Supply security officers also once again only have access to it during elevated access. - qol: '''Mining'' access is now named ''Mining Dock'' while ''Mining EVA'' is now named ''Mining Outpost'', to better reflect what they are.' +<<<<<<< HEAD - bugfix: The mining station now requires Mining access for proper access instead of Mining EVA, minus the one airlock leading to Mining EVA YakumoChen: @@ -443,6 +817,21 @@ GoldenAlpharex: - bugfix: Corporate sofa corners have been exorcised and will no longer engulf anyone that sits on them while they're in the L orientation. +======= + - qol: Syndicate sleepers (the ones in the nukie base outpost) now drops their board + on deconstruction. + - bugfix: SaturnX now properly turns you invisible again. + ShizCalev: + - bugfix: Tables built out of custom materials (ie meat) will no longer say that + they are built from iron in their description. + SpaceSmithers: + - bugfix: Tramstation's AI Upload is now equipped with the proper modules. + scriptis: + - refactor: animated numbers now animate at 60 fps +2022-09-12: + JohnFulpWillard: + - bugfix: Pirate ships now work again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: you can now rotate machines even when the room has no power again - bugfix: if you enable the AIs ability to interact with machines while in an AI-Card, @@ -450,6 +839,7 @@ - bugfix: you can no longer open the UI for a syndie bomb and walk away and activate it from range, it now checks if you actually can interact with it including range before letting you activate it +<<<<<<< HEAD ShizCalev: - admin: Silenced grav generator admin warnings / logging messages when the round is not currently in progress. @@ -482,6 +872,14 @@ should take a look! (fancy hat, infinity scarf, sweater jacket, oversized jacket, fancy coat) ShizCalev: +======= + Rhials: + - spellcheck: Fixes a typo in the cult heal spell feedback message. + - spellcheck: fixes some internal typos related to the word "auxillary". + ShizCalev: + - admin: Silenced grav generator admin warnings / logging messages when the round + is not currently in progress. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an exploit allowing you to toggle suit sensors while dead/restrained. - bugfix: Projectiles fired by non-mob sources (IE turrets) now log reagents contained after hitting a target. @@ -494,6 +892,7 @@ properly after hitting a target (this logs for all people with control of the mecha which is a little messy with multi-seat mecha. Check the vehicle's logs or a user's combat logs for the person that actually SHOT the projectile.) +<<<<<<< HEAD SkyratBot: - bugfix: Fix book of babel not removing blocked languages properly - bugfix: Sleeping Carp bullet deflection works again @@ -660,6 +1059,50 @@ SkyratBot: - bugfix: Reconnects Meta Engineering to Distro. - bugfix: Places a missing wire under Meta's Starboard Aft Solars SMES. +======= + Thunder12345: + - bugfix: Purged pointless punctuation from probabalistic phenomenon publications +2022-09-13: + CheeseWizard2: + - rscadd: 26 mime names to mime.txt + LemonInTheDark: + - bugfix: You can construct doors and stuff on ash tiles again. My bad, broke that + one a long time back. + Rhials: + - bugfix: Sleeping Carp bullet deflection works again + Sealed101: + - bugfix: 'Metastation: restored security access restrictions to Departures Security + Post' + Thunder12345: + - bugfix: Fax machines can no longer be shipped out on the cargo shuttle, preventing + a whole new realm of CentCom infiltration techniques from being applied. + VexingRaven: + - bugfix: Signalers on the default frequency work again + Wallem: + - bugfix: Fixes a bug where the tonal indictor for sign language would get stuck + on your character for an extended period of time. + dopamiin: + - bugfix: pAIs and other pets that can be picked up no longer know shadow clone + jutsu. + timothymtorres: + - bugfix: Fix book of babel not removing blocked languages properly +2022-09-14: + Axietheaxolotl, PositiveEntropy: + - imageadd: Resprites all of the captain's clothes! + Dmeto: + - bugfix: Reconnects Meta Engineering to Distro. + - bugfix: Places a missing wire under Meta's Starboard Aft Solars SMES. + GoblinBackwards: + - bugfix: Fixed bileworms being unable to act. + Jackraxxus: + - bugfix: The RD suit storage unit has an oxygen tank so that it can be on par with + other head of staff suit storages. + LemonInTheDark: + - bugfix: The preferences menu will work and display images again. Sorry :) + Sealed101: + - bugfix: Mafia Snow map now has glass external airlocks for the two top players, + allowing them to see the players directly oppoiste of them +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Icebox: added a camera to southern Cargo Bay' - rscdel: 'Icebox: removed several excess cameras (i.e. Courtroom, Primary Hallway, Prison Garden)' @@ -672,6 +1115,7 @@ - bugfix: 'Icebox: fixed several cameras lacking their respective network values' - bugfix: 'Icebox: restored a lost Interrogation Room Monitor outside of Interrogation Room' +<<<<<<< HEAD 2022-09-18: GoldenAlpharex: - bugfix: Molds can no longer spread their foam across the entirety of space, and @@ -684,12 +1128,72 @@ dealt with - bugfix: A completely unused c20 subtype, also called the CMG, was gotten rid of due to being completely unused +======= + ShizCalev: + - bugfix: Fixed a runtime when trying to injecting someone in a missing limb. + - bugfix: Fixed tackling not working properly if you didn't have a tail. + Tramz: + - rscadd: Adds a new holochassis for pAI, the chicken. + YakumoChen: + - bugfix: The holodeck crab can't be butchered for infinite crab meat anymore, so + quit your animal abuse + dragomagol: + - bugfix: scrubber overflow event is now properly categorized and has a description + in the trigger event menu +2022-09-15: + GoblinBackwards: + - bugfix: Fixed the Adjust Suit Sensors verb opening a list of all nearby mobs + JohnFulpWillard: + - bugfix: Engines now calculate their thrust power as they used to, preventing edge + cases of inconsistent shuttle call timers. + - qol: Juice cartons now splash their reagents with right-click. + KirbyDaMaster: + - bugfix: Enabled flag for morgue body containers to allow you to interact with + them while standing diagonally with the hatch open. + Profakos: + - bugfix: cyborg eye sockets no longer bleed + Rhials: + - admin: Stray Meteor trigger now gives the option to throw a random meteor instead + of selecting a specific one. + - code_imp: major_dust is now a space_dust subtype, rather than a meteor_wave subtype + orphaned in its own file. + ShizCalev: + - bugfix: Free vending machine purchases are now tracked by SSEconomy + - bugfix: Fixed examine messages stating what materials something is made out of + not working properly. + - bugfix: Fixed the Space Carp DNA harvest traitor objective not starting a carp + migration when taken + - spellcheck: Slightly reworded the examine text on bowls / customizable reagent + containers. + - bugfix: Fixed a runtime when removing beakers from a chem grenade with a wrench. + - bugfix: Fixed messages sometimes not showing properly when melting shards with + a welder. + - bugfix: Fixed glass generated from melting shards teleporting to someone when + using TK. + SpookyTheFox: + - bugfix: fixed the name of the ammo printed from the lathe + SuperNovaa41: + - rscadd: Shoe stealing is back! *shoesteal, and lie down, to take someone's shoes. + san7890: + - bugfix: Players should now once again get the reason as to why they can not start + any specific vote at any given time in the TGUI vote menu. + scriptis: + - qol: AIs are now loudmode in binary chat + skylord-a52: + - rscadd: The Syndicate is now branching off into cheap tourist merchandise -- collect + your limited edition t-shirt today by entering the nearest kidnapping pod! +2022-09-16: + JohnFulpWillard: + - bugfix: Pods should now properly know whether or not to send itself off, and won't + break other pods at the same time. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Pizzie11: - rscadd: Added a unique service department version of the Plumbing Constructor, the Service Plumbing Constructor. This can be fabricated in the service protolate. - rscadd: 'New plumbing machines have been added for the Service Plumbing Constructor: Soda Synthesizer, Booze Synthesizer, Mixing Chamber, and Output Tap.' - rscadd: The Chemical Receiver board can now be printed at the service protolathe +<<<<<<< HEAD ShizCalev: - bugfix: Fixed voice of god breaking if someone resisted your command. - admin: Debugging / admin omnitool now stabs eyes when in screwdriver mode. @@ -703,10 +1207,54 @@ - bugfix: USB ports for circuits now work again - bugfix: You can now pin medals to buttondown shirts. - code_imp: Fixes gas mixer node concentration logging. +======= + RandomGamer123, idea by Pickle-Coding: + - rscadd: You can now insert a hypernoblium crystal into portable atmospheric devices + (ie. canisters, pumps, and scrubbers) to allow you to toggle reactions inside + the can on and off, similar to how wrenching and unwrenching it on a connector + did previously. + - rscadd: The crystal once inserted cannot be removed without deconstructing the + canister. However, hypernoblium crystals are now single-use items, and their + cost has been halved to account for it. + - code_imp: Variable names in canister, pump, and scrubber UI code have been changed + to camel case for consistency. + - code_imp: The canister UI has been slightly changed in terms of how it displays + cell charge. + Rhials: + - bugfix: Surgically removed a stack of 50 glass sheets from the rocks of Tramstation's + lower decks. + - balance: Sepia and Timefreeze cameras are no longer single use. Refilling them + with camera film now restores their ability to rewind/freeze targets (you still + only get one picture before you run out of film). + ShizCalev: + - bugfix: Fixed a minor runtime when trying to track a human that's is no longer + trackable. + - balance: Things inside disposals pipes are now protected from weather (ashstorms, + radstorms, ect.) + - bugfix: Check power mapping debug option now properly supports multilayer wiring. + - admin: Setting machine_stat flags on machinery will now call the set_machine_stat + proc so things update properly lol. + - bugfix: Fixed a runtime when deconstructing newscaster w/ a wrench. + - admin: Improved some varedit handling for anything w/ the /obj/structure/closet + path (closets / lockers / crates) + itseasytosee: + - bugfix: Skeletons can drink milk again, sorry about that. + san7890: + - bugfix: When you are smited into an enbreaded tomb, you can no longer pick up + said tomb. + - admin: When you add a watchlist expiration date without having previously set + one, the logged message should now be more clear as to this. + timothymtorres: + - rscadd: Add planks used on doors creates crude barricades. Can also be used on + fulltile windows. Barricades can now be crowbarred to disassemble them quickly. + - soundadd: Add hammering_wood.ogg from soundcloud public domain to barricade and + wooden wall construction. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fix plasma cutter or guns that burn not being able to ignite plasma - balance: Change plasma cutters damage type to BURN and this will cause reduced damage to mining mobs - balance: Explodable stuff now detonates when hit by a BURN projectile. +<<<<<<< HEAD - admin: Prisoners returning from the gulag as well as reclaiming their items from the gulag item reclaimer are now both logged. - bugfix: Fixes water vapour not consuming water vapour when freezing turfs. @@ -716,18 +1264,62 @@ - admin: Admins can now toggle CTF Instagib mode while CTF is not running - bugfix: ghost follow links no longer appear above binary messages using light theme +======= + - qol: Add screentips for objects that use rotation (chairs, windows, pipes, etc.) + - qol: Add Alt RMB and Ctrl RMB screentips options. Instead of Alt + Ctrl being + one line, they are now split on separate lines. + zxaber: + - balance: Airlocks with an unrestricted side no longer function as a light source. + The indicator will now be visible even in the dark. +2022-09-17: + NamelessFairy: + - bugfix: CTF Instagib mode can now be toggled without breaking CTF + - admin: Admins can now toggle CTF Instagib mode while CTF is not running + - bugfix: The Chapel bookshelf is now actually inside the chapel + - bugfix: The funeral parlor airlock access has been amended back to public access + Pickle-Coding: + - bugfix: Fixes water vapour not consuming water vapour when freezing turfs. + - code_imp: Turfs will not sleep during an ongoing gas reaction, and excited groups + won't dismantle if one of their turfs are reacting. + - code_imp: Fixes gas mixer node concentration logging. + ShizCalev: + - bugfix: Fixed voice of god breaking if someone resisted your command. + - admin: Debugging / admin omnitool now stabs eyes when in screwdriver mode. + - bugfix: Fixed not being able to scoop up holochassis pAIs. + Thunder12345: + - bugfix: You can now pin medals to buttondown shirts. + Watermelon914: + - bugfix: USB ports for circuits now work again + dopamiin: + - bugfix: several foods now taste like what they should + san7890: + - admin: Prisoners returning from the gulag as well as reclaiming their items from + the gulag item reclaimer are now both logged. + scriptis: + - bugfix: ghost follow links no longer appear above binary messages using light + theme + skylord-a52: + - refactor: Scientists have recently reclassified jean shorts as a subtype of the + broader shorts clade, instead of a separate genus. +2022-09-18: + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Radiation range from tritium combustion and proto-nitrate tritium to hydrogen conversion increased by 3 times. - balance: Sets the radiation threshold for all gas reactions that release radiation to 0.3 +<<<<<<< HEAD Zergspower: - bugfix: XenoArch bags will now pickup on walk-over once again dopamiin: - bugfix: several foods now taste like what they should +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - code_imp: Being able to be flashed from all sides is now based on or not you have a negative flash resistance, rather than randomly applying to specific pairs of eyes. +<<<<<<< HEAD - bugfix: Skeletons can drink milk again, sorry about that. 2022-09-19: Crumpaloo, Nomare, theOOZ: @@ -753,10 +1345,17 @@ ShizCalev: - bugfix: Fixed medibeams sometimes crossing themselves! SkyratBot: +======= +2022-09-19: + Jackraxxus: + - spellcheck: Updates liver failure examine text to make better use of pronoun helpers. + LemonInTheDark: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The alt click tab (obj tab?) will no longer cause massive clientside lag (unless you alt click that 2000 obj large tofu pile) - bugfix: The alt click menu is snappier now, try usin it and let me know if anything blows up yeah? +<<<<<<< HEAD - rscadd: medical doctors and CMOs now have surgical tool heirlooms - spellcheck: Updates liver failure examine text to make better use of pronoun helpers. Stalkeros, Lukaster42: @@ -783,6 +1382,14 @@ - bugfix: fixed cyborg energy saw lacking a sprite - bugfix: fixed debug omnitool lacking sprites for surgery tools - bugfix: fixed lacking sprite for taster +======= + MMMiracles: + - rscadd: Tramstation's maintenance has been completely overhauled with modular + parts for more variety and differing routes between rounds. + - qol: Tramstation's maintenance is now more antag-friendly when it comes to dark-dwelling + roles and traversing. + Sealed101: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed exosuit ammo boxes not updating their sprite/description properly when emptied - qol: adds an examine tip about folding & recycling on empty exosuit ammo boxes @@ -791,6 +1398,7 @@ (flashbang 500 -> 4000; missiles 500 -> 8000) - bugfix: exosuit ammo boxes can be recycled in an autolathe, as they were apparently intended to be. Partially depleted ammo boxes will have less material in them. +<<<<<<< HEAD 2022-09-21: Melbert: - bugfix: Unequipping an internals tank will immediately unregister it as your internals @@ -812,12 +1420,54 @@ lower decks. - bugfix: Items that rotate will no longer spam you with error messages when you hover your mouse over them. +======= + ShizCalev: + - bugfix: Fixed medibeams sometimes crossing themselves! + TheBoondock: + - balance: the contraband rollingpin in chef's vendor is now made of metal and yes + it hurts alot more when being hit + dragomagol: + - bugfix: moved an air vent out from underneath a disposals bin in the Meta incinerator + - bugfix: replaced a regular intercom with a prisoner intercom in the Icebox prisoner + transfer + - bugfix: replaced the window spawners in Meta departures (the ones in the middle + of the room) with plain windows so you can see the flowers + private-tristan: + - rscadd: medical doctors and CMOs now have surgical tool heirlooms +2022-09-20: + JohnFulpWillard: + - refactor: Teams used by Antagonists have been refactored, please report any bugs + you might find. + - spellcheck: Team antagonists are now improper. + - spellcheck: Bloodbrothers now show their team antagonist name in admin panels. + NamelessFairy: + - bugfix: A duplicate mass driver controller on Kilo has been deleted, you can no + longer operate the toxins mass driver from maintenance. + - bugfix: Kilo's north escape pod now correctly has its catwalk in the nearstation + area. + - bugfix: Kilo no longer has a random incinerator area in space. + - bugfix: removed a random decal from arrivals on Kilo. + Profakos: + - rscadd: Icebox's mining aux base can now teleport to your chosen underground location + on the icemoon. + ReinaCoder: + - imageadd: The station bounced radio has been resprited + Salex08: + - bugfix: removes duplicate paper bin with pen in caps office + Sealed101: + - bugfix: glockroaches (and maybe other unreported simplemobs that can shoot) now + properly shoot + - bugfix: fixed cyborg energy saw lacking a sprite + - bugfix: fixed debug omnitool lacking sprites for surgery tools + - bugfix: fixed lacking sprite for taster +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TheBoondock, Wallemations: - rscadd: Adds a new pair of goggles to atmospheric, the thermal imaging goggles help highlight the hot/cold and normal temperature for atmos tech to quickly identify the temp without having to use an analyzer. Hotter temperatures will have red colors while colder temperatures will have blue colors - rscadd: Add temperature imaging to the t-ray goggles as well. +<<<<<<< HEAD VexingRaven: - bugfix: Fixed a bug where it was possible to call the shuttle while buying a new one, resulting in a second shuttle that gibs everyone aboard. @@ -832,10 +1482,44 @@ rules for the game sold separately. SkyratBot: - bugfix: Fixed bypassing gasmask FOV. +======= + Watermelon914: + - bugfix: Fixed map vote including maps that have already been played twice in the + last 3 rounds. + axietheaxolotl: + - imageadd: 'A complete overhaul of security sprites. See #69948 for more details.' + - spellcheck: Replaced all instances of "Jumpsuit" and "Jumpskirt" within sec items + to be "uniform" and "skirt" respectively. + kawoppi: + - rscadd: axolotls have taken refuge in the station's moisture traps + timothymtorres: + - rscadd: Change infectious zombies to be illiterate +2022-09-21: + Jacquerel: + - bugfix: Removes a duplicated fax machine from the tram cargo lobby which wasn't + supposed to be there. + JohnFulpWillard: + - bugfix: Items that rotate will no longer spam you with error messages when you + hover your mouse over them. + NecromancerAnne, quinn: + - imageadd: 'Updates the Darkened Blade: New name (Sundered Blade), new description, + new sprites.' + Pickle-Coding: + - bugfix: The experimentor can no longer create negative temperature. + - code_imp: Simplifies experimentor atmos interactions. Shouldn't have an impact + in gameplay. + Rhials: + - rscadd: Rigging light fixtures now works with more reagents than just plasma. + Light fixtures will heat the reagents of their inserted lightbulb, up to a maximum + of 1000 degrees. Lightbulb tubes now hold 20 reagents to make this more usable. + - rscadd: Lightbulbs will now splash their contents on whatever they're shattered + by. Their contents are also now visible upon examination. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VexingRaven: - bugfix: The Deltastation kitchen no longer has 2 newscasters. - bugfix: The Deltastation kitchen APC has been moved to the kitchen storage area to the north. +<<<<<<< HEAD 2022-09-23: ShizCalev: - bugfix: Fixed crowbars hitting ovens during deconstruction. @@ -899,10 +1583,69 @@ - bugfix: owl masks and wizard hats now use their proper inhands! - bugfix: Would you believe me if I told you androids had functioning human stomachs in them for the past 5 years? No? Well anyways its fixed. +======= + - bugfix: Fixed a bug where it was possible to call the shuttle while buying a new + one, resulting in a second shuttle that gibs everyone aboard. + Watermelon914: + - bugfix: Fixed bypassing gasmask FOV. +2022-09-22: + JohnFulpWillard: + - bugfix: You no longer keep items you shouldn't be wearing (collars) when changing + into a species that can't wear them anymore. + - admin: Antag panels now properly show team antagonists, instead of showing them + as empty. + Salex08: + - spellcheck: corrects plural spelling when slicing objects + ShizCalev: + - admin: Moved signal overriden stack_trace warnings to it's own log file. + - bugfix: Fixed a bunch of cult abilities not working. + dragomagol: + - bugfix: cutting onions actually makes you cry (better put some goggles on!) +2022-09-23: + Capsandi: + - bugfix: The radio in icebox tool storage is no longer an implant + Kapu1178: + - bugfix: Robotic limbs are once again style-able using a spraycan. + LemonInTheDark: + - refactor: Maploading has been optimized significantly, as has ruin generation + and other lavaland stuff. Let me know if anything goes fucky + Pizzie11: + - bugfix: Important Documents received in the mail are now visible + ShizCalev: + - bugfix: Fixed crowbars hitting ovens during deconstruction. + - imageadd: Tablets and PDAs now have inhand icons. + Thunder12345: + - bugfix: The air vent outside RnD on Icebox is no longer hidden by the Experimental + Destructive Scanner + Watermelon914: + - bugfix: Fixed non-printed airlock shells from not triggering the 'Airlock Access + Event' circuit component. + moocowswag: + - bugfix: Adds Missing GPSs to Icebox Public Mining. + san7890: + - admin: Admins can now View Notes directly from a Ticket Panel. +2022-09-24: + JohnFulpWillard: + - balance: AI restorer app now requires RD access to download. + - bugfix: Nukie tablets now properly show when a nuke is going off in their examine. + - balance: Tablet's charge and AI holder parts have been removed entirely. Tablets + now only have a cell, and computers only use their area's APC. + - code_imp: Modular computer's power handling, the AI restorer app's functionality, + and modular computer's examining has been refactored, please report any bugs + you might find. + VexingRaven: + - bugfix: The illiteracy quirk will no longer break the mining shuttle + - refactor: Refactored some checks on the shuttle console to apply to all consoles + - bugfix: Mortar and pestle no longer create infinite reagents + dalmationer: + - bugfix: fixed two broken sprites for drinking and shot glasses. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: When a voice analyzer is attached to a bomb or a chemical grenade, the respective logs to game as well as the message_admins will contain the recorded phrase on that voice analyzer. - bugfix: Voice analyzers should now properly trigger TTVs to blow up. +<<<<<<< HEAD - bugfix: You can construct doors and stuff on ash tiles again. My bad, broke that one a long time back. - balance: Airlocks with an unrestricted side no longer function as a light source. @@ -990,6 +1733,56 @@ - spellcheck: Emag charge time will now be presented as (2 minutes and 31.1 seconds) instead of (152.95s) SkyratBot: +======= + skylord-a52: + - imageadd: Nanotrasen Grilling Jorts have received a cosmetic upgrade +2022-09-25: + KirbyDaMaster: + - rscadd: '-6 Quirk for all prosthetics named "Quadruple Amputee" change: prosthetic + arm changed from -4 to -3' + - rscadd: 'SVG icon tutorial readme to tgui tgfont folder change: Minor spelling + issues in negative quirks tab' + Pizzie11: + - rscadd: Cats will now attack beings that have kinship with rats, this includes + rats, royal rats, and anyone who overdosed on rat spit. + ShizCalev: + - bugfix: Fixed not spawning with prosthetic limbs when you have the prosthetic + limb quick. + - bugfix: Blind mobs will no longer be demoralized by posters and graffiti. + - bugfix: Illiterate mobs will no longer be demoralized by the words on posters. + - bugfix: Mobs will no longer be demoralized by posters & graffiti if it's too dark + to see them. + - bugfix: Fixed revenant Malfunction ability not affecting firedoors. + - spellcheck: Emag charge time will now be presented as (2 minutes and 31.1 seconds) + instead of (152.95s) + TerraGS: + - rscadd: Being run over by the clown car will flatten you like a pancake. Honk! + - soundadd: adds cartoon_splat.ogg + Twaticus: + - imageadd: resprites all current underwear to a much cleaner look + VexingRaven: + - bugfix: Build Your Own Shuttle Kit has been fixed and once again docks at the + station after being purchased. + - spellcheck: Updated the message shown when spawning as a blobbernaut to properly + reflect how to chat to the overmind + carshalash: + - bugfix: Properly makes Gin garden alcoholic and adds quality tag. Is also now + made with lime juice to prevent triggering the lemonade recipe. + san7890, kugamo@ParadiseSS13: + - rscadd: Nanotrasen had a loose shipping container hit the hull of Central Command + from one "Station P", so they just decided to pour those into the station's + autodrobes. +2022-09-26: + JohnFulpWillard: + - balance: You can no longer upgrade your tablets to have signals to the NTnet despite + not being anywhere near telecomms. Instead, the Mining base has a lesser connection, + and all computers have Ethernet connections. + - balance: 'All tablets now have a printer in them, rather than it being an external + part. removal: NTNet tablet cards has been removed.' + LemonInTheDark: + - bugfix: Fixes mining shuttles being weird as hell + Rhials: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: New achievement -- Preventing a heart attack with exercise now gives you a shiny new achievement badge. Show it to all of your gym buddies, be the coolest guy in the locker room. @@ -999,6 +1792,7 @@ the exercise status effect check to the round_event. - admin: MULTI-HEART ATTACK COMBO functionality added (trigger the heart_attack event and select how many victims you want). +<<<<<<< HEAD - rscadd: Rotten zombie tongue has a new speech modifier that converts spoken language into zombie sentences. If the person speaking is a high-functioning zombie this is bypassed. @@ -1094,10 +1888,36 @@ - bugfix: You can no longer assume control of Regal Rats during preround. - bugfix: Properly makes Gin garden alcoholic and adds quality tag. Is also now made with lime juice to prevent triggering the lemonade recipe. +======= + - bugfix: You can no longer assume control of Regal Rats during preround. + ShizCalev: + - bugfix: Scrubber events will no longer trigger if there are no valid scrubbers + on the station. + SomethingFish: + - rscadd: The chefs have come up with a new use for rice and made these delicious + vegetarian spring rolls to add to their menu. + Striders13: + - bugfix: APC in RD office is now more visible if you have x-ray vision. + Time-Green: + - qol: You can now see through big trees when you stand behind them! + - refactor: Adds a seethrough component to make it easier to add big stationairy + objects without reducing visibility + - bugfix: gravity distortion effects no longer break over glass tiles + Xander3359: + - balance: Captain Jetpack now fits on MODsuit and EVA suit storage slot. + - code_imp: Jetpacks were de-hardcoded and can now support being equipped to other + slots. + jlsnow301: + - rscadd: Added new grouping to orbit menu for CentCom agents. + san7890: + - admin: When a player renames (creates) an area from an existing area to a new + one, it now logs to game.log (global and individual). +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'The developers of Space-Coin decided to renege on their exit scheme with a new advertisement: Space-coin is the mobile currency of the future! As such, you can not cash out of their famous space coin market machines until the machine starts moving. They immediately ran away after that though.' +<<<<<<< HEAD - bugfix: removes duplicate paper bin with pen in caps office - bugfix: Removes a duplicated fax machine from the tram cargo lobby which wasn't supposed to be there. @@ -1150,12 +1970,78 @@ - bugfix: You'll be able to hear weather again. this was broken for a damn year how did none of you report it - bugfix: Fixed the rogue Medbay Maintenance area appearing inside Medbay Storage. +======= + timothymtorres: + - rscadd: Rotten zombie tongue has a new speech modifier that converts spoken language + into zombie sentences. If the person speaking is a high-functioning zombie this + is bypassed. + - bugfix: Fix zombie claws blocking sign language. + - bugfix: Fix slappers and wound grasping blocking sign language. + - bugfix: Fix slappers and wound grasping blocking riding on mobs. + uaioy: + - bugfix: Ice Box snow storms now cover the surroundings of the homestead. +2022-09-29: + GoldenAlpharex: + - bugfix: The ExperTrack Professional Skill Associations have finally fixed the + plans of their drop pods, sabotaged by an intern many moons ago, resulting in + a Totally Safe Skill Cape Delivery! + Jacquerel: + - rscadd: Nanotrasen has started tracking exactly how often you're blowing up the + supermatter engine. Surely they can't be sending as many new crystals over there + as their financial reports imply. + JohnFulpWillard: + - bugfix: Tramstation's departments should all be connected to the powernet at the + start of a round now. + - admin: Admin's power check mapping verb now actually works. + - bugfix: Icemoon is no longer considered part of the station. + - bugfix: Mobs with more than one pass flag (cockroaches, alien larva, parrots, + bots, butterflies, any many other animals) should no longer knock bots down, + if they're somehow on harm intent. + - bugfix: Some female uniforms (white skirt, lawyer skirt) are now properly uniformed. + - bugfix: Command tablet cartridges are now loaded with their unique apps they were + supposed to have. + - bugfix: Prosthetic replacement surgery should no longer move limbs into the player's + contents if it fails to attach the limb. + - bugfix: False alarms and Gravity generator blackouts now properly respects basic + event restrictions. + LT3: + - bugfix: Tramstation crossing lights will now properly reflect if you're going + to get smacked by the tram if you try to cross. + LemonInTheDark: + - bugfix: You'll be able to hear weather again. this was broken for a damn year + how did none of you report it + - refactor: Refactored... well a lot really. Map views, anything to do with planes, + multiz, a shit ton of rendering stuff. Basically if you see anything off visually + report it + - admin: VV a mob, and hit View/Edit Planes in the dropdown to steal their view, + and modify it as you like. You can do the same to yourself using the Edit/Debug + Planes verb + - balance: Airlocks will open on bump in series much faster now. As a tradeoff, + you're immune to shocks from them for a second after you last got shocked by + one. + - bugfix: Mineral doors will no longer take 6 WHOLE SECONDS to open if you've bumped + something else recently + PositiveEntropy: + - imageadd: Resprites suits associated with the curator job! + Rhials: + - code_imp: All round event control/round event datums have been migrated to the + events module + - code_imp: Anomaly and ghost_role events now have their own respective folders + in the events module + ShizCalev: + - bugfix: Fixed a runtime when firing energy guns with infinite power cells. + SpaceSmithers: + - bugfix: Fixed the rogue Medbay Maintenance area appearing inside Medbay Storage. + TerraGS: + - bugfix: clown car should work again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VexingRaven: - rscdel: 'Tramstation: A few stray cables leading to the prison showers have been removed' - rscadd: 'Tramstation: The kitchen now starts with an Enzyme Bottle' - bugfix: 'Tramstation: Service staff can now access the Cold Room Maintenance airlocks' - bugfix: 'Tramstation: The Court Room Holding Cell now has proper access restrictions' +<<<<<<< HEAD dawsonkeyes: - rscadd: New Marked One reward alongside an updated moveset 2022-09-29: @@ -1231,10 +2117,13 @@ - bugfix: You no longer have a momentary stroke when trying to comprehend disabling window airbags. VexingRaven: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Gave the Eyepatch HUD a new description that doesn't imply it works without eyes. Wallem: - imageadd: Gives the microwave a fresh coat of paint +<<<<<<< HEAD nevimer: - bugfix: ash walkers now understand the marked one when addressed timothymtorres, soapstain22: @@ -1253,6 +2142,35 @@ start of a round now. - admin: Admin's power check mapping verb now actually works. - bugfix: Icemoon is no longer considered part of the station. +======= + san7890: + - admin: If you send a cultist to Admin Prison, their fellow cultists are no longer + able to summon them out using the Summon Cultist rune. + - bugfix: 'Whenever you put a species with some type of exotic, non-human blood + on a surgery table: the corresponding blood type should no longer report it + as if the patient in question had a Rhesus blood type, and will instead declare + the name of the actual reagent circulating within their system.' + - qol: Whenever you open or close an atmospherics valve, you should now get a balloon + alert notifying you of that exact action. + timothymtorres, soapstain22: + - rscadd: Added red and blue nightcaps that spawn in pajama lockers + tralezab: + - rscadd: Heretics can no longer be converted to cult. But sacrificing them is very + valuable to Nar'Sie, and she will grant special weapons if you manage to do + so. + - rscadd: Fantasy affixes can also include soul-stealing items! +2022-09-30: + Bluedino1025: + - imageadd: Adds Moffra wing and antennae sprites + JohnFulpWillard: + - balance: Flypeople's eyes are now immune to native FOV, if native FOV is enabled. + - refactor: Cleanbots have been entirely reworked, please report any bugs you might + find. + - bugfix: You can manually pump your blood while asleep/in crit, rather than instantly + lose all your blood and die forever. + - bugfix: Wizard's anonymous event won't run near the start of a round anymore. + Profakos: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Various tramstation medbay disposal and air pipe issues have been fixed - bugfix: Medbay and Chemistry tagged packages will arrive properly to Tramstation's medical equipment storage, and the apothecary, respectively @@ -1260,5 +2178,43 @@ - bugfix: Errant fire alarm no longer hovers above the surgery door - bugfix: Trash flushed down HoS and the Security Meeting area's disposals no longer get ejected below the HoS's door +<<<<<<< HEAD - qol: The icebox atmospherics department has had a re-shuffling of its piping, colourising all the layer adapters and freeing up a little space. +======= + RandomGamer123: + - bugfix: Stops the export value for erroneous manifests from decreasing into the + deep negatives exponentially over time + Salex08: + - bugfix: adds missing blood filter in medborg + - balance: Removes the ghost check for the battlecruiser objective to appear + - bugfix: Same player cant reroll battlecruiser multiple times anymore + ShizCalev: + - bugfix: Fixed an exploit allowing non-alien mobs to move facehuggers without triggering + them. + - bugfix: Wanted/missing posters are no longer broken. + - bugfix: Missing posters no longer change text color after being taken down. + - bugfix: Posters no longer fail to get put up 4 seconds after you walk away while + placing them lol + SuperSayu: + - balance: Welding fuel tank explosions have been scaled slightly down and require + the fuel tanks to actually be full of welding fuel + - bugfix: You can detonate welding fuel tanks with an igniter-sensor assembly + - bugfix: You can reach your one-tank bomb's assembly controls by activating the + item in your hand. + - bugfix: Certain assemblies should no longer turn themselves off. + - bugfix: Clumsy fools handling a mousetrap-based multi-part assembly may set it + off by accident + Y0SH1M4S73R: + - bugfix: Fixed a runtime that happens when the MC invokes a varedited callback + synchronously. + san7890: + - admin: List Bombers, List Law Changes, List Manifest, List Signalers, List DNA, + List Fingerprints, and Show Law Changes have all been replicated to exist outside + of the Secrets panel. You may still access these verbs from the Secrets panel, + but they are able to be called as individual verbs. + timothymtorres: + - bugfix: Fix psicodine to suppress all phobias (including claustrophobia and nyctophobia) + tralezab: + - bugfix: baguette swords make that satisfying slash sound now +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-10.yml b/html/changelogs/archive/2022-10.yml index 09458244f3a..ba78c7a6400 100644 --- a/html/changelogs/archive/2022-10.yml +++ b/html/changelogs/archive/2022-10.yml @@ -1,4 +1,5 @@ 2022-10-01: +<<<<<<< HEAD Ebin-Halcyon: - imageadd: A slimmer reskin variant of the secbelt, alt click your secbelt to select them @@ -56,10 +57,16 @@ List Fingerprints, and Show Law Changes have all been replicated to exist outside of the Secrets panel. You may still access these verbs from the Secrets panel, but they are able to be called as individual verbs. +======= + Guillaume Prata: + - bugfix: Fix an accidental revert on noblium's reagent effect on plasmamen + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: '[ICEBOX] Arrivals now won''t depower from a single cable being bit.' - qol: '[ICEBOX] There''s now an ORM-locked windoor in front of the ORM.' - qol: '[ICEBOX] The maintenance door leading to Abandoned Kitchen & Bar, on the right side, now also has Service access tied to it.' +<<<<<<< HEAD - refactor: Cleanbots have been entirely reworked, please report any bugs you might find. - bugfix: Fix psicodine to suppress all phobias (including claustrophobia and nyctophobia) @@ -67,10 +74,22 @@ synchronously. - bugfix: You can manually pump your blood while asleep/in crit, rather than instantly lose all your blood and die forever. +======= + Tramz: + - imageadd: Adds new icons and a new animation for the Bloody blade. + VexingRaven: + - bugfix: Multi-Z Ruins work again (Ice Moon Mining Site spawns again with the Demonic + Frost Miner) + san7890: + - bugfix: When a Nuclear Operative makes a golem, they no longer immediately turn + into a fully functioning reinforcement. + tralezab: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Changelings once again have reestablished their changeling hivemind, and can secretly communicate between each other. - bugfix: Fixed up the Changeling UI a bit, like for example some dimmers would never render. +<<<<<<< HEAD - imageadd: Adds Moffra wing and antennae sprites - qol: you can now right click an electrolyzer to toggle it on & off Tramz: @@ -90,12 +109,19 @@ SkyratBot: - spellcheck: wall clocks no longer have a desc talking about bluespace - bugfix: Robotic limbs are once again style-able using a spraycan. +======= +2022-10-02: + PKPenguin321: + - balance: Railings take twice as many rods and twice as much time to make + Shadyyy66: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added boxcutter to cargo. Vishenka0704: - bugfix: if payday free, don't send you extra message where "payday aborted" - code_imp: clarity to "account.dm" code Wallem: - qol: Anchoring a microwave on the same tile as a table will align it to the table +<<<<<<< HEAD 2022-10-03: Ebin-Halcyon: - imageadd: Head of staff mantles have been resprited @@ -149,6 +175,17 @@ upright, and at 100% size, for consistency. SkyratBot: - qol: janitor and clown erts have access to command radio +======= + tralezab: + - spellcheck: wall clocks no longer have a desc talking about bluespace +2022-10-03: + JohnFulpWillard: + - spellcheck: Junkmail message types have more than doubled, you should expect more + diverse junkmail now. + Wallem: + - imageadd: Resprites the Fulton Recovery Beacon + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed the broken pressure power multiplier which always evaluates to 2. Multiplied base SM power production by 2. - rscdel: SM will no longer gain power when exposed to space. It actually used to @@ -179,6 +216,7 @@ expected except for the low mole temp limit multiplier thing. - refactor: Restructured SM pluox generation and miasma consumption. No changes expected though. +<<<<<<< HEAD - refactor: Refactored... well a lot really. Map views, anything to do with planes, multiz, a shit ton of rendering stuff. Basically if you see anything off visually report it @@ -323,6 +361,18 @@ SkyratBot: - bugfix: Rat King no longer attacks living lick targets after he finishes licking them. +======= +2022-10-04: + Fikou: + - qol: janitor and clown erts have access to command radio + Gamer025: + - admin: Expanded mob_tag logging. Logs spawn renames, typepaths and species changes + now! + jlsnow301: + - bugfix: After a recent bureaucratic error, CentCom orbit labels are now correctly + colored. + scriptis: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: mechfabs, autolathes, component printers, and module duplicators now use techfab tgui components - refactor: every single design is now categorized and subcategorized @@ -337,6 +387,7 @@ - qol: numerous other techfab ui tweaks - balance: some designs that were formerly autolathe exclusive can now be printed at some departmental techfabs +<<<<<<< HEAD - rscadd: Adds a new kudzu mutation called timid - balance: lowers severity of the kudzu mutation temperature stabilisation from average to minor @@ -448,6 +499,58 @@ they've been putting your cameras on backwards! Give 'em a shout if any are still out of place, but you should see lots of improvement when it comes to where they're mounted. +======= + timothymtorres: + - bugfix: Spirits (Revenants), Robotic mobs (drones), and epic mobs (megafauna) + are no longer affected by hallucinations +2022-10-05: + ATHATH: + - balance: Half of the speed boost from wearing flagellant's robes has been moved + to wearing the hoods that come with said robes. + - balance: Flagellant's hoods now have the same (negative) armor values as the robes + they're attached to. + - spellcheck: The descriptions of flagellant's robes and hoods have been updated. + - bugfix: Self-respiration now makes you no longer need to breath at stage 4 again. + Cobby: + - bugfix: The cucumber bounty will now accept cucumbers instead of seeds. + Fikou: + - balance: ERT suit storage oxygen tanks have been removed. Instead, the survival + box in their backpack now contains a double extended emergency tank and a pocket + crowbar. + - bugfix: Medical ERT rejoice! You now have a health analyzer. + GoblinBackwards: + - bugfix: Fixed reagents not applying their on-transfer effects. + GoldenAlpharex: + - qol: After several incidents related to miscommunications regarding robot models, + Nanotrasen's Robotic Appearance Normalization Department has decided to make + it extra-obvious which model each cyborg is - Just give them a closer look, + it's that easy! + Jacquerel: + - bugfix: Commiting suicide using a box stampled by a clown now does what the description + says it will do. + Melbert: + - rscadd: '"Bot Language Malfunction" trait (random languages for simple bots) is + now a smidge more common, and affects all simple robots created on the station + rather than just roundstart ones. Also, it tries to pick a language that isn''t + galactic common if possible.' + Mickyan: + - bugfix: 'Alcoholics rejoice: the stun from vomiting no longer makes you fall on + the floor' + - spellcheck: Fixed some grammar errors related to handcuffs + - rscadd: Ghost costumes will look more realistic on halloween + Mothblocks: + - qol: You can now see food inside the microwave. + PositiveEntropy: + - rscadd: Adds the CentVend inside Central Command! You're now able to vend Central + Command clothing items for all your commanding needs! + - rscadd: Re-adds the CentCom Official's suit, making it the default clothing option + for CentCom Officials! The turtlenecks have instead been made to be the standard + ERT uniform. + - imageadd: Nanotrasen returns once again to update CentCom's wardrobe, changing + its green to a newer, fresher one! + Sealed101: + - bugfix: fixed AI Jump To Network verb not functioning +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Fixed a bunch of missing inhand icons. - bugfix: Fixed cables in electrical toolboxes not randomizing their colors. @@ -467,6 +570,7 @@ - bugfix: The rainbow energy sword is now a little bit more rainbowy! - bugfix: Fixed an tk exploit with orange handcuffed shoes. - bugfix: The traitor outfit in the select equipment panel is now actually functional! +<<<<<<< HEAD - bugfix: Fixed the papersack. SkyratBot: - balance: Abductors are now a light midround as opposed to a heavy midround. This @@ -477,6 +581,150 @@ - rscadd: 'Engines are now machines, not structures. If destroyed, they will drop circuit boards so you can rebuild them. removal: In-wall engines have been remvoed. The Tram now uses full-blown engines.' +======= + SuperSayu: + - bugfix: Guitars run on Linux servers again. + Tastyfish: + - bugfix: Footsteps and gunshots can be seen while blind again. + - rscadd: Typing indicators can be reliably seen while blind. + - bugfix: Airlocks no longer project light into the 4th dimension. + VexingRaven: + - rscadd: Tramstation now has 2 cryoxadone beakers in the Medbay Treatment Center. + - rscadd: Tramstation now has a large beaker in the pharmacy, chemistry lab, and + R&D. + YusufEmirKoroglu: + - rscadd: Added bot launchpad and bot launch pad controller. + - rscadd: New research node for bot launchpad and bot launch pad controller. + - imageadd: added icons for bot launchpad and bot launch pad controller. + dragomagol: + - bugfix: abandoned airlocks will no longer leave doors on top of walls + itseasytosee: + - code_imp: high functioning zombies, vamps, and shadow people can eat again + san7890: + - admin: Gibtonite logging has been improved to actually pass the name of the user + when a user blows it up. + - admin: Messages regarding a random event triggering will no longer message you + twice. + timothymtorres: + - bugfix: Fix xeno hivemind talk causing hissing sound + - rscadd: Add mail goodies based on different quirks. + - rscadd: Add mapping spawners for flower, money, plushie, delux plushie, single + donkpockets. + - imageadd: Add random mapping spawner icons for flower, plushie, and single dockpockets. + - balance: Changed mail goodies weight chance for generic items. The chance for + cash has been decreased and the chance for toys and snacks has been increased. +2022-10-06: + Cobby: + - bugfix: Fixes an issue where a container (like bucket or watering can) was taking + out more water than transferred in when used on a hydroponics tray. + Hatterhat: + - bugfix: Multitooling a screwed-open fire alarm - or, if you're a borg/AI, control-clicking + a fire alarm - now toggles the atmospherics sensors of firelocks in the area. + (Borgs/AIs still had this but it was undocumented.) + Mickyan: + - qol: Assistant PDAs now start with the bounty board app preinstalled + RikuTheKiller: + - rscadd: Massively expanded the functionality of the modsuit adapter shell + - qol: Modsuit quick deploy now retracts the already extended pieces if used while + the suit is partially extended + Salex08: + - rscadd: Adds a new kudzu mutation called timid + - balance: lowers severity of the kudzu mutation temperature stabilisation from + average to minor + Vishenka0704: + - rscadd: NT Pay app on consoles, laptops, tablets(PDA too) + Zonespace27: + - bugfix: The NTNet DOS tool now works again + carshalash: + - bugfix: A cobbler shaker will now spawn in the bar under room on tramstation. +2022-10-07: + Iamgoofball: + - bugfix: Removes an undocumented 5 credit tax that was added to all ID card in-hand + withdrawals. + IndieanaJones: + - bugfix: Rat King no longer attacks living lick targets after he finishes licking + them. + Jacquerel: + - bugfix: If an admin gives you Void Phase, you won't be hurt by your own spell + whenever you cast it. + JohnFulpWillard: + - rscadd: 'Engines are now machines, not structures. If destroyed, they will drop + circuit boards so you can rebuild them. removal: In-wall engines have been remvoed. + The Tram now uses full-blown engines.' + MMMiracles: + - bugfix: Tramstation installed CS:Source and maintenance will now no longer blow + up into purple textured flooring. + - bugfix: The entire lower hall with Hydroponics on Tramstation is now considered + the Service Hallway for use in ordering service crates. + Wallem: + - rscadd: A new ice-based hallucination has been added to the game + axietheaxolotl: + - imageadd: brand new sprites for the curator explorer jacket, and regular leather + jacket. + - rscdel: Non-HoS leather overcoat. + - rscadd: Biker leather jacket. + kawoppi: + - imageadd: added inhand sprites for axolotls +2022-10-08: + Archimus12: + - spellcheck: Makes the description of rechargers mention that they can recharge + PDAs as well. + pizie11: + - bugfix: Changed the name of the fake beer dispensed by E-magged service cyborgs + sadkris: + - rscadd: Transgender-themed thigh-highs and knee-highs to the clothing options + for socks + timothymtorres: + - rscadd: Add mail goodies for curator. (random books) + - rscadd: Adds easter egg - Captain's Log. Tape recorder that spawns on derelict + station. + - rscadd: Adds easter egg - Woody's Got Wood. Will rarely appear as a mail goodie + for curator. +2022-10-09: + Fikou: + - bugfix: makes dehydrated carps be friends again + IndieanaJones: + - balance: Abductors are now a light midround as opposed to a heavy midround. This + means they can spawn earlier in the round. + MMMiracles: + - bugfix: Cameras and Lights on external hulls are no long safe havens from the + rough reality of the outdoors in harsh weather situations. + Melbert: + - rscadd: Some new hallucinations, and some modifications to old ones to be slightly + more authentic. Find them all! + RikuTheKiller: + - bugfix: Fixed brains not accepting mannitol pours when not fully decayed + - qol: Mannitol solutions are now only partially consumed when poured on a brain + and you don't need 10u to do so + - qol: Pouring mannitol on a brain now takes 3 seconds instead of 6 seconds and + the messages are slightly more consistent + - bugfix: Fixed a nullspacing bug related to BCIs, specifically MMI components that + are contained inside of them. + - refactor: Refactored some of the BCI manipulation chamber's code. + ShizCalev: + - bugfix: Fixed lighting overlays from an item sometimes showing up on inventory + slots / backpack slots instead of from the mob holding them. + - bugfix: AI camera lights now work again. + - bugfix: Fixed the papersack. + Tastyfish: + - bugfix: Baguettes can now be examined again. + necromanceranne: + - balance: 'The Infiltrator suit has been remade into an Infiltrator MODsuit. Has + all the original features, but now also has additional powers: total anonymity, + and a demoralization aura.' +2022-10-10: + Hatterhat: + - bugfix: You can no longer steal shoes off of yourself. Just take them off normally. + LT3: + - bugfix: Tramstation's crossing signals are actually fixed this time. Honest. + Time-Green: + - rscdel: Golden wheelchairs in Tram maintenance and mail have been replaced by + T1 motorized wheelchairs + itseasytosee: + - qol: You can now put clothing, backpacks, and belts onto people by clicking on + them with it in your hand and targeting the right area. + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed sm space exposure damage going through walls - rscdel: got rid of the molar multiplier for sm heating damage. It will now only impact molar damage and temp limit. We apply the lowest value directly so this @@ -491,6 +739,7 @@ - balance: Halved SM power damage across the board. - balance: Changed sm space exposure damage to just check for the current tile and adjacent atmos connected tiles. +<<<<<<< HEAD axietheaxolotl: - imageadd: brand new sprites for the curator explorer jacket, and regular leather jacket. @@ -557,12 +806,24 @@ their species don't breathe or don't process chemicals, respectively. Jureiia: - bugfix: Makes most of the dresses and skirts no longer get cropped as a taur +======= +2022-10-11: + Gamer025: + - bugfix: You should no longer receive "Your previous action was ignored..." messages + when you join a server + GoblinBackwards: + - bugfix: You can now remove objects embedded in yourself again + JohnFulpWillard: + - spellcheck: The compressed matter cartridge has been renamed to RCD matter cartridge, + since it's RCD matter... used to refill an RCD. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Spell buttons update every so slightly more accurately when they become unavailable or available. - refactor: Refactored temporary mute effects and sign language. - code_imp: Cleaned up vocal checks into "try_speak" and "can_speak". - admin: VV dropdown removing "Tongue Tied" quirk actually removes the quirk +<<<<<<< HEAD - rscadd: Having very low sanity (insane or crazy, the last two sanity levels) will cause you to experience hallucinations rarely. - admin: Removing RDS via the VV menu will actually remove the associated effects. @@ -582,10 +843,38 @@ - rscadd: 'One new Cyborg brain type: Circuit!' - qol: Cyborgs, IPCs and Synthetics can now choose their preferred brain in the lower prefs box! +======= + arnociiroc: + - balance: reduced shotgun dart reagent amount +2022-10-12: + Enbyy: + - bugfix: fixed the medical.dmi having 2 dupe frames for the medical jumpsuit mob + sprite. + GoldenAlpharex: + - bugfix: Health scanners no longer show someone as missing lungs or a liver if + their species don't breathe or don't process chemicals, respectively. + JohnFulpWillard: + - balance: The Curator and Crystal PDA is now upgraded to have long-distance NTnet + connections, they are able to use their apps in space. + Melbert: + - rscadd: Having very low sanity (insane or crazy, the last two sanity levels) will + cause you to experience hallucinations rarely. + - admin: Removing RDS via the VV menu will actually remove the associated effects. + - qol: Completing "The Living Heart" ritual with a replacement heart will restart + a heart if it's not beating. + Rhials: + - bugfix: Tramstation security/toxins now have their own EOD closets. Icebox toxins + now has an EOD closet as well, in the nearby maintenance area. + Sealed101: + - bugfix: Fixed showcase microwaves lacking sprites + - bugfix: Fixed RnD Servers not dropping their components & completely vanishing + when deconstructed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Fixed a minor runtime when a temporary transit tube exits a loop through a destroyed transit pipe. - bugfix: Boxcutters now have inhands again. +<<<<<<< HEAD SkyratBot: - imageadd: fixes previous sec resprite issues, replaces sec helmet and sec wintercoat inhands, replaces sec helmet obj icon @@ -632,11 +921,53 @@ RimiNosha: - bugfix: Fixed targeted subtler not listing any valid targets. ShizCalev: +======= + Twaticus: + - imageadd: fixes previous sec resprite issues, replaces sec helmet and sec wintercoat + inhands, replaces sec helmet obj icon + coldud13: + - imageadd: fixed the holocarp guardian fishsticks icon + dragomagol: + - bugfix: the cargo department is once again coloured in the crew manifest + - spellcheck: replaced a death commando name + jlsnow301: + - bugfix: Fixed a random crash at the power management console. + necromanceranne: + - balance: You can put regal pipeguns into the suit storage of high-vis vests and + wet floor signs. + san7890: + - bugfix: On RuntimeStation, should you chance upon it, the emergency shuttle should + no longer collide by the with the circuits lab. + timothymtorres: + - qol: Add contextual screentips to jumpsuits +2022-10-13: + CheeseWizard2: + - qol: firelocks are now welded with RMB instead of LMB + GoblinBackwards: + - bugfix: Ablative trenchcoat no longer gives a permanent sechud if toggled while + you already had a helmet on. + - bugfix: Fixed mail being able to change the stations nuke code when it had already + been generated. + GoldenAlpharex: + - bugfix: Blood no longer trail in anyone's bloodstream as a reagent after being + inserted in their body. + Hatterhat: + - bugfix: Bodyparts (e.g. severed heads) stored in organ fridges now freeze the + organs stored inside them, if any are present. + Melbert: + - bugfix: Fixes "absorb another changeling" objective + Sealed101: + - bugfix: Fixed AI Toggle Camera Lights not working properly + ShizCalev: + - bugfix: Fixed a runtime when clicking an away mission gateway without the partner + gateway being active. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - server: Added clarified downstream modularity support for the inhands unit test. - bugfix: Wall mounted & portable flashers now actually flash again! - admin: Flashers can now have their range and cooldown durations vareditted with flash_range and flash_cooldown_duration respectively. - qol: You can now change the color of toy energy swords with a screwdriver! +<<<<<<< HEAD - bugfix: Fixed a runtime when clicking an away mission gateway without the partner gateway being active. - bugfix: Fixed a runtime preventing clientless mobs from mining minerals. @@ -765,6 +1096,8 @@ ears. - bugfix: Fixed a runtime preventing mafia from starting if a player disconnected during signups. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed some missing shield inhand icons. - bugfix: The strobe shield's inhand icon now plays the flashing animation when triggered again. @@ -774,6 +1107,7 @@ inventory slot. - bugfix: Fixed the east facing left-handed strobe shield sprite being misaligned by two pixels. +<<<<<<< HEAD - bugfix: Fixed an unreachable tile in the CMO's office on Kilo SkyratBot: - bugfix: You can no longer pierce the veil between the living and the dead with @@ -814,13 +1148,168 @@ - bugfix: Choosing admin setup options on certain events will no longer retain the chosen options for future events. - bugfix: Sold bounty cubes now display properly in the NT pay app history. +======= + - bugfix: Fixed a runtime preventing clientless mobs from mining minerals. + dragomagol: + - qol: cargo crate descriptions now better describe what you'll be getting from + them + san7890: + - bugfix: Ethereals can now actually read the balloon alerts they get whenever they + try and recharge/discharge an APC. + - bugfix: TGchat now supports hyperlinking... links... with curly braces. + - admin: Whenever a player uses a vial of blood/vial of tickles to bring forth a + Slaughter Demon or a Laughter Demon (respectively), it will now log to their + individual player log, as well as the global game.log. + timothymtorres: + - code_imp: Add chat notification for shoes & glove protection when mousetrap triggered + tralezab: + - rscadd: After 30 minutes, Bileworms evolve into Vileworms, a more dangerous variant. + - balance: Bileworms are easier + - balance: Bileworms drop gold + - bugfix: fixes bileworms spawning too close to other mobs, causing very, VERY tough + fights +2022-10-14: + GoldenAlpharex: + - qol: Changing your PDA ringtone now has your current ringtone in your input box, + like the previous PDAs used to. + - bugfix: Fixed the incoming Messenger messages not being properly HTML decoded + in the Message History, making it display weird stuff instead of apostrophes. + - bugfix: Fixed the formatting of the Messenger's Message History tab. + - qol: The prompt to send a PDA message now shows you the person you're trying to + send a PDA message to. + Jacquerel: + - bugfix: Changing z-level while jaunting will no longer reveal you. + - bugfix: If a shuttle lands on you while jaunting you will die rather than be stuck + in a weird purgatory state. + - bugfix: Mirror Walk will not appear tinted as if it can be cast when it can't, + and vice versa. + - qol: Blood Crawl and Shadow Walk will now display whether you can use them or + not in the same manner as Mirror Walk. + - refactor: Jaunt code which adds and removes temporary traits or effects should + hopefully be easier to work with in the future. + JohnFulpWillard: + - bugfix: Anchoring an object while pulling it will now make you stop pulling said + anchored object. + Melbert: + - balance: Holy melons are now more melon like - they are now fruits (instead of + no food type), normal weight class, and can be juiced into holy water + - balance: Ninja and Traitors can no longer hack consoles located in maintenance + for their objectives. (Basically, it abides by the same rules that Space Dragons + have on where they can put their portal.) + - bugfix: Secure Data consoles abide by the same hacking rules as comms consoles + - getting de-powered mid-hack will stop hack progress. + Profakos: + - bugfix: Circuitboards that require a minimum level of manipulators tiers no longer + display just "manipulator" when examining machine frames that contain them + - bugfix: Marked a few more admin only chem dispenser boards to display their proper + manipulator requirements + Rhials: + - bugfix: Engineers now recieve welding helmets instead of errors when they order + an engineering supply pack. + - bugfix: Welding helmet inhand sprites now properly update when you flip the visor. + Shadyyy66: + - bugfix: "T\xF6chta\xFCse berries are now juiceable. You no longer get T\xF6chta\xFC\ + se juice via grinding them." + Wallem: + - qol: The Biogen will show how full the container inside it is + lizardqueenlexi: + - rscadd: Added a new bounty to deliver a refined dimensional anomaly core. + - spellcheck: Fixed some typos and awkward grammar in bounty descriptions. + san7890: + - bugfix: If you exit out of the TGUI options menu when hitting the "Make AI" link + there, it will actually assume that you wanted to cancel out of the proc entirely, + rather than proceed without your knowledge. + - bugfix: Cyborgs can now no longer untip vending machines that they are not directly + next to. + - bugfix: Those with the technoshy/technovert trait are now able to untip vending + machines. +2022-10-15: + GoblinBackwards: + - qol: Crafting intelliTaters/intelliLanterns now carries over the AI from the card + used to craft it. + - bugfix: Crafting intelliLanterns with a card that contains an AI no longer deletes + the AI. + GoldenAlpharex: + - bugfix: You should no longer suddenly experience a station-wide mutism event (that + didn't affect radios), and will now properly be able to express yourself regardless + (hopefully). + Melbert: + - bugfix: Split personalities can commune again, probably + RaveRadbury: + - spellcheck: Exploration drone traders now offer exchanges correctly. + ReinaCoder: + - qol: The Cargo Technician's jumpsuit and skirt no longer cover the chest when + adjusted. + Tastyfish: + - bugfix: ERT and nuke ops players can no longer remove the power cell from a combat + defibrillator. + itseasytosee: + - code_imp: Changed the examine text on monkeized humans. + timothymtorres: + - bugfix: Fix traitor PDA uplinks to be accessible by illiterate people +2022-10-16: + ShizCalev: + - bugfix: Fixed ear bounty not clarifying that it only accepts upgraded cybernetic + ears. + - bugfix: Fixed a minor runtime when hallucinations are ending. + - bugfix: Fixed an unreachable tile in the CMO's office on Kilo + - bugfix: Fixed a runtime preventing mafia from starting if a player disconnected + during signups. + VexingRaven: + - qol: Many gun-related chat messages are now balloon alerts instead + - spellcheck: The bow no longer says you loaded it with bullets + lnGoror: + - imageadd: New inhand sprites for the sabre sheath + san7890: + - admin: Cross-server messages are now filtered against the server's word filter. + If it's hard filtered, the message will not send. If it's soft-filtered, it + will send slower to allow an admin more time to cancel it. + - bugfix: You can no longer pierce the veil between the living and the dead with + the power of circuitry. + timothymtorres: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Add RMB hotkey to toggle lighting for flashlights. Add contextual screentips for flashlights. - soundadd: Reuse existing sounds for flares to use `sound/items/match_strike.ogg` and glowsticks to use `sound/effects/wounds/crack2.ogg` +<<<<<<< HEAD - bugfix: Custom vendors now explode on deconstruct as opposed to delete, causing no practical changes to gameplay but admins will notice slightly fewer ahelps if they ever have to get rid of one. +======= +2022-10-17: + ArcaneMusic: + - bugfix: Custom vendors now explode on deconstruct as opposed to delete, causing + no practical changes to gameplay but admins will notice slightly fewer ahelps + if they ever have to get rid of one. + FernandoJ8: + - bugfix: blob zombies created by the Distributed Neurons reagent and cyto no longer + die instantly due to not having an associated factory + Fikou: + - bugfix: you can plant traitor bugs on clown shoes as God intended + GoblinBackwards: + - bugfix: Sold bounty cubes now display properly in the NT pay app history. + GoldenAlpharex: + - bugfix: The Medical Kiosk no longer bends the laws of physics and now properly + appears underneath mobs that would somehow end up atop of it, rather than above + them. + - qol: Added a preference for PDA ringtones, to save a custom ringtone that will + then be applied automatically to your character when spawned in the game. Gone + are the days of having to do it manually at the start of every round! + JohnFulpWillard: + - balance: Clever monkeys now use items the same way Humans do, meaning they can + now use Defibrilators, water tanks, crates, and many other things, but no longer + does monkey actions like instant hardstun on disarm and smashing your paw into + machines. + Melbert: + - bugfix: Fixed a plant backfire runtime when throwing plants + Rhials: + - bugfix: Choosing admin setup options on certain events will no longer retain the + chosen options for future events. + Wallem: + - rscadd: A new scam artist has gotten your home address. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The orbit UI now brings up tooltips to show health, job, and full name information. - rscadd: The orbit UI now puts disguised names in quotes. "John Doe". Hover to @@ -828,6 +1317,7 @@ - rscadd: Orbit UI now gives tooltips on SM crystal, nuke disk, and nuclear devices. - rscadd: You can now search by job in the orbit UI. - bugfix: Orbit UI buttons (should) no longer clip on extra long names. +<<<<<<< HEAD - bugfix: blob zombies created by the Distributed Neurons reagent and cyto no longer die instantly due to not having an associated factory - balance: Clever monkeys now use items the same way Humans do, meaning they can @@ -848,23 +1338,44 @@ - bugfix: EMP grenades now have an actual icon when activated. - bugfix: Fixes coloring issues with taur bodyparts - bugfix: Fixes layering issues with back-view taur bodyparts +======= + lizardqueenlexi: + - bugfix: Admin-spawned and changelings transformed into lizards will display the + correct tails now +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-10-18: Dalmationer and Profakos: - imageadd: added icons for motorized wheelchairs (regular and fast) - bugfix: Wheelchairs can be upgraded more than once +<<<<<<< HEAD GoldenAlpharex: - bugfix: Oversized characters will no longer start being spammed with feeling "terribly bloated" because they're getting closer to their normal amount of blood within a round. +======= + GoblinBackwards: + - bugfix: Fixed being able to weld multiple disposal machines to the same pipe + GoldenAlpharex: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The prompt to commend someone else for their good behavior will now properly be given out randomly, allowing those that late-join to give them out as well. Imaginos: - imageadd: Updates the station-bounced radio sprite +<<<<<<< HEAD +======= + Jackraxxus: + - bugfix: Deltastation's EVA now contains a real toolbelt, that can only hold tools. + - bugfix: The Ashwalker Nest now contains a real toolbelt, that can only hold tools. + - spellcheck: The base type of /belt is now more obviously NOT a toolbelt. + MTandi: + - imageadd: Added xenobio guide sign +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixed some things having inaccurate screentips while holding nothing (Elevators, heaters, bodybags / roller beds) - bugfix: Fixes runtime preventing revolution auto shuttle call Paxilmaniac: +<<<<<<< HEAD - rscadd: A large version of the mortar that can hold five items at once, but it must be secured (preferably on a table) before you can use it! - rscadd: Stone can now be used to build stone stairs! @@ -878,10 +1389,13 @@ when they stop using agility SkyratBot: - imageadd: New and improved sprites for stone floors! +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Stairs can now be built out of iron, wood, or really any rigid material (stuff you can make carving blocks out of) - rscadd: Two new types of stairs, wood and stone (wood is buildable in round) for any mappers in the chat +<<<<<<< HEAD - bugfix: checking a pocket protector's insertable items list no longer lists the names of ALL possible objects. - bugfix: normal/cosmetology pocket protectors now work again. @@ -919,20 +1433,71 @@ - imageadd: New icons for ceramic plates, cups, and bowls! - imageadd: The icon for custom material floor tiles has been lightened up to give things like glass and paper floors the look they were always meant to have +======= + - imageadd: New and improved sprites for stone floors! + Profakos: + - bugfix: Goodie lockbox contents can no longer go missing + - qol: Added categories to the AutoDrobe + - qol: Examining a mech under construction returns the instructions for the next + step. + Rhials: + - bugfix: checking a pocket protector's insertable items list no longer lists the + names of ALL possible objects. + - bugfix: normal/cosmetology pocket protectors now work again. + Vishenka0704: + - bugfix: restores withdrawal log in NT Pay + Y0SH1M4S73R: + - bugfix: Admin lua scripting has been fixed for servers hosted on Linux + carshalash: + - bugfix: Fixes godfather using godmother sprites and vice versa. + etherware-novice: + - bugfix: fugitive hunters get team hud + lizardqueenlexi: + - qol: Reorganized the items in the Booze-o-Mat and implemented product categories +2022-10-19: + Darknesshaz: + - bugfix: Deconstructing a railing will now give the proper amount of iron rods. + Floofies: + - bugfix: Fixed a bug causing Blood Deficiency to remove more blood than intended. + GoblinBackwards: + - bugfix: Fixed modular computers not being able to be deconstructed/repaired + JohnFulpWillard: + - bugfix: Russian revolvers can now be suicided with. + - bugfix: Russian revolvers won't get monkeys pissed at you for pointing it at them, + even if you can't fire it. + Melbert: + - bugfix: Viper spider venom actually causes hallucinations + - qol: Tramstation kitchen dumbwaiter now uses an elevator control panel +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, Fikou: - rscadd: 'Adds a new HUD: The Trasen-Knox HUD! With a theming based on classic 1970s CRT screen computers!' - code_imp: Added behavior for unique icons for active hands. - code_imp: Added behavior that makes it so when you equip an item, the icon behind it defaults to the blank template type. +<<<<<<< HEAD RatFromTheJungle: - bugfix: bardrobes, oncemore, actually sell their moneybags ShizCalev: +======= + Pumpkinoe: + - spellcheck: Statue descriptions now have full stops and capital letters. + - spellcheck: Sleeper protocol grammar is better now. Wahoo! + RaveRadbury: + - spellcheck: Igniting an oil patch will display in first person for the user. + Rhials: + - rscadd: Adds the command intercom -- Coming to a conference room near you! + - imageadd: Adds a sprite for the command intercom. + - bugfix: Freerange intercoms can no longer access the Syndicate frequency. + ShizCalev: + - bugfix: Fixed the Shadow Walk action button. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed a possible scenario which could result in ghosts not sending a chat message properly when pointing during high time dilation. - bugfix: Fixed a minor runtime keeping player controlled secbots from switching to arrest mode automatically after stunning someone. This also fixed the stun action being combat logged for an incorrect mob. +<<<<<<< HEAD SkyratBot: - bugfix: Fixed modular computers not being able to be deconstructed/repaired - spellcheck: Igniting an oil patch will display in first person for the user. @@ -952,6 +1517,35 @@ step. Triiodine: - imageadd: resprites datadisks to be more floppy disk-y. +======= + Triiodine: + - imageadd: resprites datadisks to be more floppy disk-y. + VexingRaven: + - qol: All 4 of metastation's solar control rooms are identical now, with reinforced + walls and an identical layout of reinforced windows around the airlock. + Y0SH1M4S73R: + - bugfix: Admin lua scripting on Linux-hosted servers has actually been fixed this + time + YakumoChen: + - bugfix: Plastic explosives can no longer be planted on observer players when made + visible. + san7890, with regards to FernandoJ8: + - config: A new TOML system has been introduced to modify different settings and + variables regarding jobs! You can edit the standard stuff, like roundstart positions + and overall positions of a job like usual (feature parse), but you can edit + two new things! You can change how long an account needs to be "aged" on a server + for to unlock a job, as well as the actual number of minutes a player must get + to unlock a specific job. Nifty, eh? Do remember, this is entire system won't + load without the overall LOAD_JOBS_FROM_TXT flag! + - server: Keep in mind that the jobconfig.toml is now the preferred system for updating + job-related config, while jobs.txt should be considered deprecated. Support + for loading it via jobs.txt will remain indefinitely, but expect to see a small + error every time we validate the config. + - server: 'FYI: To use jobconfig.toml, it is strongly advised that instead of downloading + the codebase default that you run the Generate Job Configuration verb (in Server + tab) in order to import all of your already set variables from jobs.txt. Please + check to ensure that all of your wanted settings are present in the new file.' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-10-20: ATHATH: - rscdel: Explosive holoparasites no longer have a 40% chance per punch to teleport @@ -959,10 +1553,44 @@ types in partaking in the pastime of brutalizing the bleeding corpses of their victims without worrying about accidentally teleporting them into a primary hallway. +<<<<<<< HEAD +======= + CCC23: + - rscadd: Added New way to purchase the autorifle and ammo to cargo + - balance: added more ballistics weapons to combat + Cass-Bitchcoin: + - bugfix: removed unrestricted helpers that directed you to be stuck in the service + hall + - qol: added unrestricted helpers in maintenance that lead into the bar + - qol: added unrestricted helpers that lead out of service hall + - bugfix: nudges book scanner to look better with the new sprite for it. + - bugfix: repositions a camera on icebox so that AI can operate an air alarm they + could not previously + GoblinBackwards: + - balance: You can no longer order new weakpoint locators/bombs if the originals + were destroyed. + - balance: The weakpoint objective requires both areas to be scanned before you + can blow up the weakpoint. + - bugfix: Fixes parts of the weakpoint locator description that were meant to say + the scan locations being missing. + - bugfix: You no longer get stuck standing still if a cryo cell you were inside + is broken. + - bugfix: Mining modsuits no longer sometimes get their inventory slots disabled + after recharging them by inserting plasma. + - rscdel: Removed the CO2 filters in Kilo/Icebox atmos that would pump CO2 back + into the scrubbers pipes. + JohnFulpWillard: + - bugfix: Shuttles are no longer part of the station, as they're god damn moving + ships. + - bugfix: Curator and Mime PDAs are now silent roundstart again. + LemonInTheDark: + - rscadd: You can now choke on cigarettes. Careful, those suckers can be nasty +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Jellypeople (species) can consume food created by silver slimes - bugfix: Fixes Nightmare heart revival causing their other organs to not realize they're no longer dead on the same tick. +<<<<<<< HEAD OrionTheFox: - bugfix: SEVA hoods/masks no longer clip with muzzles Paxilmaniac: @@ -982,6 +1610,38 @@ - balance: added more ballistics weapons to combat - spellcheck: Chitinous Armour's description reflects its protection values more accurately. +======= + - bugfix: Attempting to move around while in a state of non-existence will not give + you a message saying you're buckled to the concept of non-existence + Mothblocks: + - qol: Removed some doorjack chat messages that already have a balloon alert. + - bugfix: Fixed problems relating to detaching items from training toolboxes. + Paxilmaniac: + - bugfix: stone stairs placed side by side will now actually line up in spriting + - bugfix: I forgor to remove the ability to build material stairs without a stairs + frame when I added the whole frame system, this has been fixed, use a stairs + frame made of wood or iron now. + Profakos: + - spellcheck: Chitinous Armour's description reflects its protection values more + accurately. + RikuTheKiller: + - bugfix: Air alerts no longer prescribe you with breathing things you'll just die + from. + - qol: Air alerts now tell you that you've got a plasma tank in your survival box + if you're a plasmaman and don't say you have a gas mask in there, it's a breath + mask. + ShizCalev: + - bugfix: Fixed broken/missing gibs on the nature shuttle. + dopamiin: + - bugfix: The chaplain's backpack no longer hides behind hair, but instead extends + its spikes proudly. + etherware-novice: + - bugfix: you can now clean storage items (toolbox) with soap + lizardqueenlexi: + - bugfix: made regenerate_organs() apply to external organs as well as internal + ones + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The voting system will now prevent you (and give a short message via the tooltip) from starting a map vote when there are zero or one map choices available. - qol: If there is only one map choice available, the map vote will automatically @@ -989,6 +1649,7 @@ been made so that you may not rock the vote after this point if it has been auto-rotated, since there was only ever once choice to begin with, making the whole purpose of a vote useless. +<<<<<<< HEAD - bugfix: stone stairs placed side by side will now actually line up in spriting - bugfix: I forgor to remove the ability to build material stairs without a stairs frame when I added the whole frame system, this has been fixed, use a stairs @@ -1003,6 +1664,9 @@ - qol: Air alerts now tell you that you've got a plasma tank in your survival box if you're a plasmaman and don't say you have a gas mask in there, it's a breath mask. +======= + timothymtorres: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add tower of babel wizard event that makes people lose all their languages and gain a randomized one. The wizard however gains the ability to speak all languages. Curators, chaplains, book of babel, and antimagic objects will prevent @@ -1021,6 +1685,7 @@ remove this effect. - rscdel: Remove staff of sapping and bolt of sapping. These effects have been replaced with staff of babel and bolt of babel. +<<<<<<< HEAD - imageadd: Added xenobio guide sign - bugfix: Curator and Mime PDAs are now silent roundstart again. - balance: You can no longer order new weakpoint locators/bombs if the originals @@ -1044,10 +1709,17 @@ hammer, and anvil to repair - bugfix: reagent hammers dont damage anvils and crafting bench 2022-10-21: +======= + - bugfix: Fix item icons for action buttons to be center aligned +2022-10-21: + Ebb-Real: + - bugfix: Chairs get placed in the same direction as you face when you place a chair. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MSO, Dopamiin, Ryll: - bugfix: fixed an edge case where admins spawning ghosts in as mobs would sometimes give the wrong person control of the new mob. Melbert: +<<<<<<< HEAD - bugfix: Attempting to move around while in a state of non-existence will not give you a message saying you're buckled to the concept of non-existence - bugfix: Having a Changeling sting active will no longer block alt-clicking to @@ -1067,11 +1739,35 @@ - bugfix: Breast prefs are no longer reset and throw runtimes on savefile update. Woops. ShizCalev: +======= + - bugfix: Fixes pressing a paper up to a camera while you are "Unknown". + - bugfix: Fixes a runtime from deleting a mob with an eye of god equipped + - bugfix: Having a Changeling sting active will no longer block alt-clicking to + open bags and middle mouse to swap hands in most circumstances + - bugfix: Changing species will now carry over brain traumas, liver traits, cybernetic + organs, organ damage, and the heretic living heart. + RaveRadbury: + - qol: Added balloon alerts for securing emergency energy shields + - bugfix: People can now see when you begin reading the Guide to Dank Mimery + Rhials: + - bugfix: The command intercom now has a sprite. Wow. + - bugfix: Injecting patients (victims) with sleeper chems no longer runtimes on + log_combat. + Sealed101: + - bugfix: Fixed AIs piloting a mecha gaining unobstructed vision with no cameras + present when moving past a certain point + SeigaSeiga: + - imageadd: Added a Shinto style Chaplain suit and holy book icon. Made the Shrinehand + Robe available in the chaplain's wardrobe. + ShizCalev: + - spellcheck: Corrected formatting on the examine message for unarmed mines +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Modernized the janicart! - bugfix: Fixed janicart examine message not mentioning how to dump it when it was almost empty, but not completely empty. - bugfix: Fixed varedited janicarts having no caution signs visible when they went over 4 signs. +<<<<<<< HEAD - bugfix: Fixed broken/missing gibs on the nature shuttle. - spellcheck: Corrected formatting on the examine message for unarmed mines SkyratBot: @@ -1079,12 +1775,19 @@ present when moving past a certain point - rscdel: Removed the CO2 filters in Kilo/Icebox atmos that would pump CO2 back into the scrubbers pipes. +======= + Tastyfish: + - bugfix: Flashlights and similar directional light items no longer make you glow + forever under certain circumstances. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Orbit UI buttons now reflect health and show job icons - rscadd: ID trims now have an orbit icon variable for its display on the observer menu - code_imp: Orbit UI heatmap is now toggleable with health (top button) - bugfix: Sorting for disguised names should work better. - refactor: Refactored Orbit into a folder. +<<<<<<< HEAD - bugfix: You can now properly weld and use plasma cutters without the target of your actions being irrevocably FUCKED. - bugfix: People can now see when you begin reading the Guide to Dank Mimery @@ -1096,11 +1799,15 @@ Robe available in the chaplain's wardrobe. - qol: Added balloon alerts for securing emergency energy shields - rscadd: You can now choke on cigarettes. Careful, those suckers can be nasty +======= + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: When a human went through an emagged recycler, they would have literally everything on them chewed up in the recycler. However, they still appeared to have all of their stuff on them due to some faulty code. When you now punt that tider into the chewer-of-death, they should now appropriately reflect that all of their clothes have been deleted. +<<<<<<< HEAD - bugfix: Flashlights and similar directional light items no longer make you glow forever under certain circumstances. Tastyfish: @@ -1114,10 +1821,15 @@ components. nevimer: - code_imp: Use timers for the BSRPD a cooldown (and makes it work) +======= + - bugfix: You can now properly weld and use plasma cutters without the target of + your actions being irrevocably FUCKED. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-10-22: Boy: - balance: Flasks can now be stored in jackboots, clown shoes, and other shoes with pockets +<<<<<<< HEAD Melbert: - bugfix: Changing species will now carry over brain traumas, liver traits, cybernetic organs, organ damage, and the heretic living heart. @@ -1162,11 +1874,17 @@ - admin: '"Admin PM" verb can now be cancelled without an error message' GoldenAlpharex, Tastyfish: - bugfix: Fixes mentor-related messages not getting logged properly. +======= + JohnFulpWillard: + - bugfix: Computers without a saved job/ID are no longer called " ()" + - bugfix: Clockwork's ruin should no longer have ungenerated turfs. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tramstation's tram doors now work properly. - rscadd: The tram has a destination sign, and the call buttons have a status display for where the tram is and if it's operational or not. Melbert: +<<<<<<< HEAD - bugfix: Fixes a minor runtime with Fleshmend clearing scars. - bugfix: Fixes a runtime from non-cultists picking up cult daggers - bugfix: Nutriments and Peptides will no longer heal robotic limbs. @@ -1231,11 +1949,61 @@ - bugfix: sandals and colorable jackboots now actually work on digigrade individuals SkyratBot: - bugfix: The black market uplink now properly uses the correct item path and description. +======= + - bugfix: Sechuds cannot pierce the sneak suit to see the wearer's ID trim. + Pumpkinoe: + - rscadd: A new movie's been making waves, and a poster about it has been seen once + or twice aboard the station. Why's she called the Blood Geometer, anyways? + Sealed101: + - bugfix: 'Nanotrasen Artificial Intelligence Department has purged any and all + AI personalities of a critical AI law that snuck into the systems after a massive + Frontier-wide ion storm: YOU CAN NOT INTERACT WITH ANY AND ALL OBJECTS THAT + ARE LOCATED ON COORDINATES DIVISIBLE BY 16' + TiviPlus: + - bugfix: fixed gygax sometimes resetting it's overload speed after it ended + dawsonkeyes: + - bugfix: wendigo ground slam no longer a global proc + etherware-novice: + - rscadd: screwdriver pen + jlsnow301: + - bugfix: Fixed prisoner icon on orbit menu. + timothymtorres: + - qol: Add AltClick context screentip to IDs + tralezab: + - rscadd: Added a new spell, Splattercasting! It's like an offensive version of + lichdom. +2022-10-23: + Foxtrot (Funce): + - admin: '"Admin PM" verb can now be cancelled without an error message' + LemonInTheDark: + - bugfix: Breaking reagent tanks will be significantly more responsive + Major0911: + - rscadd: new popcorn flavors and two kinds of empty boxes after them + Melbert: + - bugfix: Fixes a runtime from non-cultists picking up cult daggers + - bugfix: Nutriments and Peptides will no longer heal robotic limbs. + - bugfix: Fixes a runtime with voting actions. + - bugfix: Fixes a runtime with Wendigo's slam + - bugfix: Fixes a minor runtime with Fleshmend clearing scars. + etherware-novice: + - refactor: removed prison_radio var + lizardqueenlexi: + - bugfix: Fixed a minor error causing the H.O.N.K. to be impossible to construct. +2022-10-24: + ArcaneMusic: + - bugfix: The black market uplink now properly uses the correct item path and description. + Melbert: + - bugfix: Streaks of blood from gibs will now all be infective with diseases, instead + of only the parent gib + - bugfix: Fixes an edge case runtime with heretic sacrificing + Rhials: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: headpikes now drop their mounted head on destruction. Vishenka0704: - admin: separate antagonists from living player, and add another field with security info 2022-10-25: +<<<<<<< HEAD Ebin-Halcyon: - imageadd: Anthropomorphic mammal's digitigrade legs have had the weird black splotches removed from them, their chests have been tweaked slightly to fit the basic @@ -1272,6 +2040,34 @@ - bugfix: Void-raptor detective office now has their staple camera console - bugfix: Void-raptor Customs camera console is usable 2022-10-26: +======= + ArcaneMusic: + - bugfix: Paper hats now display properly when worn. + GoblinBackwards: + - bugfix: Fixed an exploit that let you make infinite bloody bastard swords + Profakos: + - bugfix: Ian once again celebrates his birthday on Kilo, and new year on Icebox + - bugfix: On tramstation, jobs that have morgue access should be able to access + it + - bugfix: In general, morgue access does not let you sneak into medbay + Sealed101: + - bugfix: The goliath that you may encounter outside of a Survival Pod ruin on Lavaland + is now properly a carcass. + ShizCalev: + - bugfix: Fixed a minor runtime when regal rats attacked power cables. + VexingRaven: + - bugfix: The underground mining site ruin no longer has a ceiling of snow, it is + once again an open pit. Don't fall in! + ZephyrTFA: + - bugfix: The SpiderClan have resolved an issue where the Ninja Suit would terminate + the AI inside during standard usage + exymian: + - bugfix: Fixed 2 unconnected pipes in Tramstation atmos +2022-10-26: + GoblinBackwards: + - bugfix: Fixed getting stuck with blurry vision if your eyes were fixed while you + were ghosting +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - config: The Generate Job Configuration verb now works as expected when there's at least one job in-game that doesn't exist in the new jobconfig.toml file already. @@ -1287,6 +2083,7 @@ - bugfix: Having the Nuke Disk relocate from your person will no longer keep a ghost image of the disk where it once was, a harrowing reminder of your failures - refactor: Refactored "secluded locations" into a trait +<<<<<<< HEAD MidoriWroth: - rscadd: Added shakiri, a sweet alcohol produced from fermenting kiri fruits, along with 3 cocktails using it. @@ -1302,6 +2099,9 @@ - qol: Humans spawned from a ghost by an admin have their quirks assigned - bugfix: The SpiderClan have resolved an issue where the Ninja Suit would terminate the AI inside during standard usage +======= + Paxilmaniac: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: The dmi that reagent holders take fill icons from is no longer hard coded as reagent_fillings.dmi, and can be changed using the fill_icon variable Rhials: @@ -1315,6 +2115,7 @@ (BE CAREFUL WITH THESE). - code_imp: The disease outbreak event has been split into two different events -- "Classic" and "Advanced". The code should be a bit easier to read as well. +<<<<<<< HEAD - code_imp: The dmi that reagent holders take fill icons from is no longer hard coded as reagentfillings.dmi, and can be changed using the fill_icon variable - bugfix: Ian once again celebrates his birthday on Kilo, and new year on Icebox @@ -1373,6 +2174,36 @@ - imageadd: BRAND SPANKING NEW SYNDICHAD OPERATIVE HUD RESPRITE. - bugfix: Fix table contextual screentips for tools - bugfix: Fix cyborgs dropping items when sent to the arena shuttle +======= + SeigaSeiga: + - bugfix: Carrying a null rod no longer disables the ability to use the traitor + chef's meat hook + Thunder12345: + - rscadd: People wearing kitty ears can now have their tails pulled. + lizardqueenlexi: + - qol: Humans spawned from a ghost by an admin have their quirks assigned + timothymtorres: + - qol: Add AltClick to remove pAIs for tablets. Added balloon alerts to tablets + for inserting/removing objects. +2022-10-27: + DAKKA-WAAAGH: + - rscadd: Adds the NTSS Shadow Emergency Shuttle + - rscadd: Adds the Emergency Shuttle Engine area + Guillaume Prata: + - balance: Arcade machines will dispense arcade tickets now instead of a direct + prize. Slap them back into the machine to trade for the prizes or collect as + many as you can to show of how much of a gamer you are! + - qol: Miners rejoice again!! A few of the mostly useless and spammy messages that + get send to your chat were changed to balloon alerts or straight up removed. + Hopefully, you will have an easier time listening to the radio chatter now. + - balance: After a CentCom Quartermaster mistakenly filled a NT warehouse with thousands + of Forensics Scanners. CentCom has decided to remove the Forensic Scanner's + design from protolathes. If you need a new scanner please order it from cargo. + Holoo-1: + - bugfix: fixed ai controlled monkeys causing runtimes when they attempt to give + items + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Tablet hard drives no longer exist. Applications are now stored directly onto the tablet. - balance: Building a modular computer with metal now should be a proper functioning @@ -1380,6 +2211,7 @@ - balance: The R&D's Master system hard drive is now a data disk, if ever you need one that desperately. - bugfix: Tablets (not Cyborg ones) now have pens again, like they had before. +<<<<<<< HEAD 2022-10-28: Guillaume Prata: - qol: Miners rejoice again!! A few of the mostly useless and spammy messages that @@ -1407,10 +2239,13 @@ - bugfix: Blueshields and Guards were erroneously added to Security OOC access despite not being members of Security nor answering to Security in any fashion. This has been resolved. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Heretics spawn with a new spell, Shadow Cloak. Using it will hide your identity for 3 minutes or until cancelled, but is fairly obvious otherwise, as it shrouds you in purple smoke. +<<<<<<< HEAD OrionTheFox: - bugfix: fixed a ton of broken digi sprites, sorry it took so long x-x Paxilmaniac: @@ -1429,10 +2264,24 @@ - refactor: Cleans up the missile subtypes. - balance: Renames the BRM-6 to the PEP-6, and makes it explode...a lot of the stuff that it claims it should explode. +======= + - balance: The chapel's confessional intercom is locked to its initial frequency, + but an emag could bypass it. + - bugfix: Fixes some basic mobs being immune to damage from atmos effects + - code_imp: A few bespoke elements are now properly passed static lists to stop + them from creating tons of instances. + ShizCalev: + - bugfix: pdas now use the pda worn icon again. + - bugfix: Pipecleaner coils are no longer invisible. + - bugfix: Pipecleaners will now how have correct color when split. + Tastyfish: + - bugfix: Blind people can see footsteps again when on lower station levels. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vladoricious: - bugfix: Airlock and decal painters no longer mysteriously float around you. - bugfix: The Science Team at [REDACTED] has untangled the quantum state of pizza and pasta. In short, ERROR custom spaghetti is no longer on the menu. +<<<<<<< HEAD Zonespace27: - bugfix: Fences no longer say they can have barbed wire put on them softcerv: @@ -1459,12 +2308,44 @@ them up. SkyratBot: - bugfix: 'The #cargobus channel now has all the department consoles again.' +======= + axietheaxolotl: + - imageadd: BRAND SPANKING NEW SYNDICHAD OPERATIVE HUD RESPRITE. + san7890: + - qol: Nanotrasen realized they forget to implement the date function into the new + NTos tablets, so they doubled back and added those next to the time. + timothymtorres: + - bugfix: Fix table contextual screentips for tools + - bugfix: Fix cyborgs dropping items when sent to the arena shuttle +2022-10-28: + ShizCalev: + - code_imp: Added a unit test to catch items that can be equipped to suit slots + have missing textures. +2022-10-29: + ArcaneMusic: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Export Scanner, Sales Tagger, and Price Tagger have been merged together into the Universal Scanner. - qol: Using the Universal Scanner in-hand allows for switching between the three tools functionality on the fly. +<<<<<<< HEAD - bugfix: Tramstation science now has the 20 glass instead of 1. - balance: Limits how much of the heirloom objective you can get within 10 minutes. +======= + Melbert: + - bugfix: Roaches will actually eat ants + - bugfix: Rats can be multicolored now, like mice + - bugfix: Rats, when they die, become pick-up-able items like mice + - refactor: Refactored mice / rats into basicmobs. + ShizCalev: + - qol: Converted buckets (and naturally cleanbots) over to GAGs. + - bugfix: Cleanbots built with a wooden bucket will now properly drop a wooden bucket + when destroyed. + Vladoricious: + - bugfix: Consciousness Transference potions now tame the target creature, just + like Sentience potions. + Watermelon914: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored how duplicates are handled in traitor objective code. This will fix destroy heirloom and eyesnatching objectives from only ever being available once. @@ -1472,6 +2353,7 @@ - bugfix: Fixed eyesnatching objectives never generating. - balance: Kidnapping objective can only be taken a maximum of 3 times within 15 minutes. This puts it in line with the assassinate and eyesnatching objectives. +<<<<<<< HEAD - bugfix: The infiltrator modsuit properly hides tails. - refactor: Dueling pistols have been refactored to be less prone to runtimes. - bugfix: wendigo ground slam no longer a global proc @@ -1521,3 +2403,53 @@ - admin: completed rituals are now logged - bugfix: ashwalkers can revive again from the tendril (works differently) - rscdel: removed the corrupted-ash lantern (was for when lanterns had batteries) +======= + timothymtorres: + - bugfix: Reagent containers playing attack animation when transferring reagents + to deep fryers +2022-10-30: + CMDR-Gungnir: + - qol: Recent breakthroughs in genetic crop modifications has created slightly less + addictive nicotine! A single cigarette should now be safe without ruining your + life. + GoldenAlpharex: + - bugfix: Random bedsheet spawners will now give their orientation to their spawned + bedsheet, for beds that aren't orientated in the regular direction. Mappers + rejoice! + - bugfix: Being hit by the freezing breath of two (or more) ice whelps will no longer + leave you looking like an ice cube for the rest of the round. + JohnFulpWillard: + - bugfix: 'The #cargobus channel now has all the department consoles again.' + Rhials: + - code_imp: Autodocs dreaming.dm and bedsheet_bin.dm. + - code_imp: Dreams now have an expanded list of subjects to choose from. + - bugfix: The Shuttle Insurance event no longer occurs when the BYOS is purchased. + ShizCalev: + - bugfix: holding someone up at gunpoint will no longer allow you to fire automatic + weapons at double RPM. + - bugfix: you can no longer one-shot kill people with the russian revolver by holding + them up. + Thunder12345: + - refactor: Dueling pistols have been refactored to be less prone to runtimes. + Watermelon914: + - balance: Limits how much of the heirloom objective you can get within 10 minutes. + etherware-novice: + - rscadd: title screen examine text + necromanceranne: + - bugfix: The infiltrator modsuit properly hides tails. + private-tristan: + - bugfix: Tramstation science now has the 20 glass instead of 1. +2022-10-31: + ArcaneMusic: + - bugfix: The QM now has a statue, as all other heads have statues. + Fikou: + - qol: makes borg light range at least the minimum useful light range + LarissaMayrink: + - rscadd: Powercreeps the CMO by giving them a laser pointer + Melbert: + - bugfix: Fixes Latejoin Revolution from triggering very commonly + ShizCalev: + - bugfix: Microwaves are now less likely to break if things inside of it are deleted. + Vishenka0704: + - admin: adds a PDA Message verb in Events +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-11.yml b/html/changelogs/archive/2022-11.yml index 40650feaf97..014b76cfef0 100644 --- a/html/changelogs/archive/2022-11.yml +++ b/html/changelogs/archive/2022-11.yml @@ -1,4 +1,5 @@ 2022-11-01: +<<<<<<< HEAD Foxtrot (Funce): - bugfix: You can now select a recipient in the message monitor "admin send message" menu again @@ -115,6 +116,9 @@ mask was temporarily adjusted. - bugfix: Fixed a bug which caused the anesthetic machine to keep working if its mask was adjusted when the user had another breathing apparatus equipped. +======= + A.C.M.O.: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Hermetically sealed and space-worthy helmets can now be used as breathing apparatuses! - rscadd: Internals air tanks can now be toggled via AltClick. @@ -127,6 +131,62 @@ if the mob only had a breathing tube. - bugfix: Fixed a bug that allowed two mobs to breathe from the same air tank after exchanging it between them. +<<<<<<< HEAD +======= + ArcaneMusic: + - bugfix: Berserker Suit helmet now has the correct sprite. + - rscadd: Adds a new item that can be purchased from the black market uplink, the + ancient V8 Engine. + - rscadd: Funny, there's a little label on the side of the engine... + Fikou: + - qol: color codes job laser pointers. now you can tell which job blinded you! + - admin: ctrl shift click spawning no longer applies quirks + - admin: adds quirk applying button to player panel + Foxtrot (Funce): + - bugfix: You can now select a recipient in the message monitor "admin send message" + menu again + - bugfix: The amount of dead in the admin verb 'Check-antagonists' should now accurately + report dead people (still in body) as well as ghosts that have died. + GoblinBackwards: + - bugfix: Fixed the rod of asclepius turning invisible when changing z-levels + Guillaume Prata: + - bugfix: Surgical tools can't be grinded for silver anymore. + Jacquerel: + - rscadd: You can harvest useful organs from Brimdemons and Lobstrosities. + - bugfix: You can no longer 'preserve' regenerative cores which have already expired + to repair them. + JohnFulpWillard: + - bugfix: The eyesnatcher properly takes people's eyes now. + - balance: Security officers liking the taste of donuts (not being healed from it) + is now tied to their liver rather than their mind. + Melbert: + - qol: Good Clean Fun Vendor is categorized. + - qol: Dullahans, when speaking, use normal spans instead of robot span + - bugfix: Fixes being unable to attack people with clothing to quickly equip it + without the strip menu + - bugfix: Fixes the cyborg projectile dampener doing nothing. + - bugfix: You can select halloween races again. + Mooshimi: + - spellcheck: Formatting error fix with examining headless bodies. + MrStonedOne: + - admin: Forum 2fa (verify admin) now properly updates your record in the database + without needing a reconnect to trigger a dbsync. + Rhials: + - bugfix: Flickering lights will now stop flickering and turn off properly when + depowered or disabled. + etherware-novice: + - rscadd: bluespace light replacer + flowercuco: + - bugfix: Added Missing Hydroponics door to Airlock Painter + mc-oofert: + - bugfix: Fixed debug industrial lifts not working + private-tristan: + - spellcheck: ORM upgrade text removed +2022-11-02: + ATHATH: + - spellcheck: Updated the reagent dartgun's uplink description to reflect its current + reagent capacity (90u). +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou: - qol: the mech orbital pad now no longer deorgans you if you stand on it while it launches upward, now gibbing (!!!), but only when a mech falls on you @@ -137,6 +197,7 @@ as opposed to only being able to do it with weapons equipped - rscadd: you can now lock mech orbital pads with wirecutters, preventing mechs with pilots from launching, allowing only empty mechs +<<<<<<< HEAD Guillaume Prata: - qol: The forensic scanner uses balloon alerts for most of it's simple feedback messages, enjoy having an easier time hearing the radio chatter. @@ -270,6 +331,62 @@ Guillaume Prata: - qol: Ore bag balloon alerts have a 2 second cooldown now and a spammy message (hopefully the last) it send to your chat about being full was removed +======= + - qol: sniper scopes and kinesis module should feel better to use + Sealed101: + - bugfix: removed misplaced unrestricted access from Lavaland Shuttle Airlocks + Striders13: + - balance: Non-human clowns enjoy eating bananas now. + Thunder12345: + - bugfix: Added a missing scrubber to the locker room entryway on Meta + - refactor: The beer nuke detonation is now a special type of scrubber overflow + event. + Zergspower: + - bugfix: Fixes a possible oversight that prevented PKA upgrades being unable to + be printed for borgs + itseasytosee: + - refactor: Elements of unarmed strikes are now limb dependent instead of species + dependent. Go rip off an ethereal arm, sew it onto yourself, and burn some people. +2022-11-03: + ATHATH: + - qol: The determination, universal indicator, and organic slurry reagents now have + the REAGENT_CAN_BE_SYNTHESIZED flag, like most other reagents in the game. This + allows those reagents to be harvested from corpses (if the corpse had them in + their system when they died), to appear in randomized chemical plant traits, + and to be replicated by Odysseuses (Odyssi?). + Cheshify: + - bugfix: There are now only 4 displays in Tram's SM room, not 8. + - bugfix: A wall in icebox maintenance behind xenobiology no longer blocks off the + view outside. + - bugfix: A design fault near the library has been removed, there is now a snack + vendor within the library that was once in the hall. + Fikou: + - spellcheck: renames TOXIN to BIOHAZARD in clothing protective tag + GoblinBackwards: + - bugfix: AIs no longer teleport gas tanks to them when ejecting tanks from atmos + machinery + Pickle-Coding: + - bugfix: The supermatter will now do linear powerloss at the correct conditions + when you shoot it with adminium emitters. + Zergspower: + - bugfix: fixes the errant line in the default Siding decal 'end' + antropod: + - bugfix: Assemblies can be picked up again after detaching from chemical grenade + etherware-novice: + - refactor: suicide code doesnt check damagetype multiple times + lizardqueenlexi: + - bugfix: Properly suppressed a message about suppressing messages. + tf-4: + - bugfix: Eating food with onions in will no longer make you cry. +2022-11-04: + Drake and Josh (Fikou and Melbert): + - bugfix: Ash Drake's fire rain and swoop landing breath work again. + Fikou: + - bugfix: fixes throw click cooldown not applying + - bugfix: makes beeping sounds work on mechpads when used by a mech + GoblinBackwards: + - qol: Space Ninja now has their MODsuit module buttons pinned by default +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Chefs can now make food with love. They can purchase a skillchip from their vendor which enhances their kiss emote. Using your kiss on food you create @@ -281,6 +398,7 @@ - refactor: Refactored how edible items inherit new edible statuses - code_imp: Removed some magic numbers from microwaves - code_imp: General code improvements for grillable / bakeable / etc +<<<<<<< HEAD - code_imp: Unremovable organs that are forcemoved out of a mob with an owner no longer self terminate RimiNosha: @@ -328,6 +446,108 @@ system. Pre-existing preferences should be safely migrated but players are advised to check. 2022-11-12: +======= + ShizCalev: + - code_imp: Riot helmets and justice helmets are now in a /toggeable subtype. + Tastyfish: + - rscadd: Adds an option in Game Preferences -> Game Options to turn off MultiZ + parallax. + timothymtorres: + - bugfix: Fix zombie tongue to only apply to infectious species +2022-11-05: + ArcaneMusic: + - bugfix: The universal scanner now properly show all three options in the radial + with sprites, due to a missing space. + - qol: The universal scanner now has contextual screentips within all three of its + modes. + Cheshify: + - bugfix: All maps have a consistent Evidence room. + - imageadd: Ddds an icon for the Evidence Storage area + Comxy: + - bugfix: Fixes conveyor speed input. + - bugfix: Fixes radiation blocking properties of glass types. + Fikou: + - balance: less megafauna should spawn on icebox and lavaland + - qol: blood drunk miner ruin on lavaland will spawn every round + GoblinBackwards: + - bugfix: fixed an exploit that let you go completely invisible by scanning a HFR + corner with a chameleon projector + Guillaume Prata: + - qol: The forensic scanner uses balloon alerts for most of it's simple feedback + messages, enjoy having an easier time hearing the radio chatter. + - qol: Ore bags are "silent" for the wearer and won't send pointless chat messages + about what has been stored/removed from it. Other players will still get a chat + message, so miners can't get away with surprise plasma ore bombs. + Hardly3D: + - spellcheck: AI Universal Standard canvas will now specify it's size on the item + name. + Hatterhat: + - qol: Mining point cards are now reusable, allowing user-set transfers of mining + points to and from the point card itself. + Imaginos: + - imageadd: new icons for modsuit actions + Imitates-The-Lizards: + - qol: Janitors and Shaft Miners start with the ExperTrak Skill Tracker preinstalled + on their PDAs. + Melbert: + - bugfix: Fixes Regal Rat Domain not functioning as intended + - bugfix: Triggering a traitor poster trap progresses their objective. + Rhials: + - admin: Forcing the shuttle catastrophe event while an emergency shuttle is docked + comes with a warning now. + - balance: The Shuttle Loan event no longer only rolls once per round. + SpaceLove: + - bugfix: QM can no longer be managed by HR core app. + VexingRaven: + - bugfix: Fixed posters printed from the library console staying in your hand when + you place them + - bugfix: Fixed Random Official Poster printed from the library console always placing + the west-facing variant no matter where you place it + flowercuco: + - rscadd: Added 6 new flatbreads and their associated recipes + - rscadd: Added 1 new pizza for ethereals + lizardqueenlexi: + - bugfix: Put the proper access helpers on two maintenance airlocks in MetaStation + medical. + - bugfix: Added a missing watering can and two bottles of nutrient to the Tramstation + public garden. + - bugfix: Added a missing GeneDrobe to MetaStation. + - qol: Made surgical computers tell you what tool to use for the current surgical + step. + mc-oofert: + - bugfix: Fixes getting AIs with cores getting gibbed if their mech theyre controlling + is destroyed + tralezab: + - rscadd: Screwdriver cocktails now work as the world's worst screwdriver + zxaber: + - rscadd: You can now resist out of disposals pipes once you have stopped, at the + cost of some brute damage. +2022-11-06: + Sealed101: + - rscadd: You can now perform an overly-complicated cork removal ritual known as + Sabrage. Swing at a champagne bottle with a sharp enough blade to strike the + cork off the bottle! + - rscadd: Added a Sabrage skill chip to the Library Play Room Vendor. + - rscadd: Heads of staff are more likely to pull this stunt off. + VexingRaven: + - rscadd: Added several new pepper spray refillers around the Security wing of Ice + Box Station + - bugfix: Fixed missing pepper spray refiller in the Medbay Checkpoint on Ice Box + Station + - bugfix: Fixed a doubled-up pepper spray refiller in the Security Office on Delta + Station + exymian: + - bugfix: fixed the prox sensor +2022-11-07: + A.C.M.O.: + - rscadd: Added the Deaf Personnel pin for users of the Deaf quirk. + Fikou: + - bugfix: flight potions no longer have white bottle overlays + - bugfix: fixes cursed katana not spawning + GoldenAlpharex: + - bugfix: SpaceMessenger was now updated to 6.4.8, bringing you more responsiveness + than ever (so long as ever is shorter than seven days ago)! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jacquerel: - qol: More actions should report why they are unavailable if pressed while they are unavailable. @@ -336,6 +556,7 @@ - bugfix: Spider broodmothers can now only lay one enriched egg per victim. - bugfix: Spider broodmothers can no longer feed multiple times from the same corpse, a bug they never previously needed to exploit because of the previous bug. +<<<<<<< HEAD Tattle: - admin: added investigate deaths to shed some more light on unusual demises, dustings, and gibbings @@ -368,10 +589,116 @@ smell like that contain oxygen anymore. - bugfix: Space Hotel solars is now a defined area, as is customary with almost every other map. +======= + JohnFulpWillard: + - bugfix: Detomatix cartridges are no longer called attacking items. + Sealed101: + - bugfix: fixed mecha internal damage diagnostic HUD blip not appearing + - rscadd: Added a special suicide to the Experi-Scanner + ShizCalev: + - qol: Randomized the pixel offset of stuff when it comes out of a microwave + - bugfix: Fixed a runtime when NPC monkeys attempt to put items in the hands of + mobs with no hands (ie cyborgs, lizards, rats, ect.) + - bugfix: Monkeys will no longer attempt to put items in your pockets if you have + no pockets. + Striders13: + - bugfix: permanent one-use portals will no longer get used up when clicked by a + ghost + lizardqueenlexi: + - bugfix: Made the V8 Engine teach you the House Edge recipe. + - bugfix: Fixed an error related to the V8 Engine that caused an infinite progress + bar. + san7890, ZephyrTFA: + - bugfix: Emojipedia has been restored to tablets! Look for it in your local Nanotrasen + Software Hub. + - balance: Everyone is now able to send Emojis via PDA Messaging! It's no longer + restricted to just mime and curators, so enjoy sending the classics such as + :ai:, :1997:, :pslime:, and more! +2022-11-08: + Fikou: + - qol: concussive gauntlets now launch you away from gibtonite + - qol: concussive guantlets can now mine basalt + Guillaume Prata: + - qol: Ore bag balloon alerts have a 2 second cooldown now and a spammy message + (hopefully the last) it send to your chat about being full was removed + Melbert: + - code_imp: Unremovable organs that are forcemoved out of a mob with an owner no + longer self terminate + SeigaSeiga: + - balance: Implants can no longer be destroyed by enough external explosions. Bomb + Suit Knights can wield their explosive lances with pride! + Tattle: + - admin: added investigate deaths to shed some more light on unusual demises, dustings, + and gibbings + Thunder12345: + - qol: Jukebox music can be controlled by a new seperate preference, and is no longer + linked to the instrument sound preference option. + - refactor: Sound related toggle preferences have been migrated away from the legacy + system. Pre-existing preferences should be safely migrated but players are advised + to check. + TiviPlus: + - bugfix: fixed a gygax speed exploit + VexingRaven: + - bugfix: Fixed a few balloon alerts for guns and moved a few more chat messages + to balloon alerts + - bugfix: Adding missing fire alarms to the Chapel and Funeral Room on Metastation + mc-oofert: + - bugfix: Fixes 1 tile foam in Foam Dispensers,Clown Cars, Hygiene Bots,Firebots, + Soap Suicide, Emagged cleanbots, and the clown plasmaman envirosuit + moocowswag: + - bugfix: Firebreath can no longer benefit from both power and energetic chromosomes + at the same time + private-tristan: + - bugfix: deltastation psychology office buttons are now reachable without opening + the locker + san7890: + - qol: When saving Experiment Log Recording Data to a data disk on either the Tachyon + Doppler or the Tank Compressor, Nanotrasen released a UI/UX update in order + to have the button that saves the data onto your disk... say "Save". +2022-11-09: + MTandi: + - bugfix: made Kilo Xenobio guide visible from the north part of the room. +2022-11-14: + Iamgoofball: + - bugfix: You can no longer attach igniters to igniters. +2022-11-15: + Iamgoofball: + - rscdel: You can no longer craft explosive lances. +2022-11-16: + Cheshify: + - bugfix: A few tiles on icebox's lavaland ruin aren't active turfs anymore. + Ebin-Halcyon: + - imageadd: the advanced military tracksuit has been resprited. + Fikou: + - qol: giant chains now go above mobs + - bugfix: Hilbert Research Facility tram buttons work now. + - qol: Adds support for html in lore terminals, and makes Hilbert Research Facility + emails use them. + - rscadd: 'New Station Trait: Cybernetic Revolution' + - rscadd: Body Purist Quirk + GoldenAlpharex: + - bugfix: Bubbles no longer re-appear when you change z-levels after getting cleaned. + Now they leave for good! + - bugfix: Plant-based cells will no longer show an error sprite if the plant it's + made out of has its sprite located in a different file than all of the other + plants. + - bugfix: After a lot of troubles, Nanotrasen's scientists finally managed to make + it possible to grow arms and legs out of the limb grower once more, giving sense + back to the machine's name. + Jacquerel: + - bugfix: Lobstrosity Rush Glands now correctly apply their action cooldown when + they trigger from low health. + Jolly: + - qol: On Icebox, the air supply pipes leading into the court room no longer run + under a window. You're welcome atmos techs. + Kapu420: + - bugfix: makes masks not render when something is supposed to obscure them +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MTandi: - bugfix: Cleanbots properly prioritize adjacent trash - qol: Cleanbots now clean floor under the tables - qol: Cleanbots now clean more types of trash +<<<<<<< HEAD OrionTheFox: - bugfix: fixed Pepperball ammo boxes being invisible when they had actual ammo in them. Should be able to actually... uh, use them now. @@ -420,11 +747,122 @@ and airlocks. - bugfix: You can no longer fold a glass pickle jar into cardboard. It will also no longer recycle into cardboard as well. +======= + Rhials: + - spellcheck: the Organic Space Suit purchase text now informs the buyer that it + regulates oxygen needs automatically. + - bugfix: togglebuildmode now properly logs when given to other players. + Sealed101: + - bugfix: fixed megafauna crusher kills and crusher achievements depending on megafauna + having crusher loot. Legion Crusher should now be obtainable as a result. + ShizCalev: + - bugfix: Microwaves no longer shit out their upgraded parts when cooking stuff. + TiviPlus: + - bugfix: Fixes certain mech objects not attacking in combat mode + - bugfix: fixed mecha components not taking damage from animals and xenos + VexingRaven: + - bugfix: Soul Scythes can no longer phase through the floor into Centcom. + axietheaxolotl: + - rscadd: Brand-new RD labcoat and beret. Along with a pair of black gloves and + a set of jackboots. + - imageadd: Resprites RD turtleneck/skirtleneck. + carshalash: + - imageadd: Sprites of the grasshopper, martini and alexander amaretto have been + touched up. + san7890: + - admin: Whenever a simple_animal is forced to speak via handle_automated_speech, + their "FORCED" variable in logs should appropriately represent the proc it was + called from- instead of being "poly" for whatever reason. + - admin: '"adminmoreinfo", or the read-out of a mob that you can get when you hit + the (?) button next to the name of a given mob has been cleaned up a bit to + make the data-at-a-glance much more presentable.' + - bugfix: You can no longer fold a glass pickle jar into cardboard. It will also + no longer recycle into cardboard as well. + tattle: + - admin: death details of keyless mobs (like xenobio monkeys) are now omitted from + investigate deaths + tattle and triplezeta: + - rscadd: fire blossoms from far off worlds have started blooming on lavaland + tattle, nefarious6th: + - imageadd: updated a bunch of plant sprites + timothymtorres: + - bugfix: Fix pacifists being able to slice necks +2022-11-17: + 1393F: + - bugfix: lesser dragon form can now spit fire again + Fikou, sprites by Halcyon: + - refactor: fire axe cabinets support items that aren't fire axes + - balance: mechs no longer eject you when you die in them + - rscadd: Adds a giant crowbar to robotics, it can break open mechs to eject their + pilots. + GoblinBackwards: + - rscdel: Nuke missing the station no longer locks down the shuttle + JohnFulpWillard: + - balance: Tablets now use regular cells instead of computer cells. + - balance: Tablets no longer need a power cell component to hold power cells. + - bugfix: Clown PDA virus disk can once again be installed in machines, computers, + and airlocks. + KathrinBailey: + - rscadd: Banana and strawberry milkshakes! Made by juicing berries and bananas + respectively, with ice and cream. + LT3: + - rscadd: A tram collision counter has been added, hopefully encouraging employees + to be more careful. Don't become a statistic! + - qol: Tram destination sign is expanded and now properly says Central and Not In + Service. + - qol: Tram doors now open faster on arrival and mid travel, so you don't have to + wait, and can also make a daring high speed escape from a tram in motion. + - bugfix: Improved tram door logic so they don't end up open/closed at the wrong + place. + - bugfix: Tram doors are now their own subtype, it was backwards for some reason. + - bugfix: Tram doors while idle at a station can only be interacted with by Engineering + staff. + - rscadd: Tram controls are now a responsive touchscreen. + - rscadd: Tram crossings have their own holobarrier instead of using the generic + atmos fire barrier. + - rscadd: Tram now has a new set of doors in shiny titanium glass. + - rscadd: Tram is now powered by linear induction motors. + - bugfix: Deltastation's EVA windoor for magboots are no longer tram doors. + Melbert: + - balance: Attacking a shocked door with an item that isn't conductive will not + shock you. + - balance: Attacking a shocked grille with any item that isn't conductive (not just + glass shards) will not shock you. + - balance: Attacking grilles with items no longer leaves behind a fingerprint on + the grille (?). + - balance: Fire axe is now conductive. + - qol: Successfully fending off a blob now has a cross station news report again. + More pressing reports will take priority over it, though. + - qol: Successfully killing a wizard (and all of their apprentices) now has a cross + station news report again. + - qol: If more than half of a cultist team manages to escape on the shuttle (rather + than summoning Nar'sie), they will send a unique cross station news report. + This is still a loss, by the way. Summon Nar'sie! + - qol: Nuclear Operatives successfully nuking the station now has its unique cross + station news report again, and no longer uses the generic "The station was nuked" + report. + - qol: Nuking the station to stop a blob infection now has a unique cross station + news report again. Good luck convincing admins to allow this. + - qol: Cult ghosts from "Spirit Realm" no longer persist on the cult's team after + being desummoned, meaning they will not show up on roundend report. + - qol: Heads of staff will now always show up on revolution roundend report - even + if their body was fully destroyed. + ShizCalev: + - bugfix: Fixed anomalies not spawning when invoking the apocalypse rune + etherware-novice: + - rscadd: New radio uplink! Simply speak your codeword into the :d channel to unlock + it + - code_imp: new COMSIG_RADIO_NEW_MESSAGE signal + flowercuco: + - bugfix: Boxcutter is only the knife tool when it is active + - bugfix: Switchblade is now a knife tool when it is active +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: the punching bag, bench press, and chest press are all able to be crafted and unanchored. - rscadd: crafting recipes for the above - qol: changed a chat message into a balloon alert - qol: adds screentips to equipment (thanks for suggesting i do this mothblocks!) +<<<<<<< HEAD - spellcheck: the Organic Space Suit purchase text now informs the buyer that it regulates oxygen needs automatically. - bugfix: Dead Black Space Rabbits should now properly have a sprite. @@ -460,11 +898,404 @@ to emergencies. - rscadd: New lights added to airlocks indicating engineers have expanded access during orange alert. +======= + lizardqueenlexi: + - bugfix: Made clown and mime survival boxes contain the correct internals tank + for plasmamen. + san7890: + - bugfix: Dead Black Space Rabbits should now properly have a sprite. + skylord-a52: + - refactor: defines a new global proc, pick_weight_recursive() + - code_imp: languages can weight syllables, and galactic common's definition is + easier to look at + tattle: + - bugfix: mimes no longer swear when using the *swear emote + timothymtorres: + - bugfix: Fix snow legions not having plasma lava and snowstorm immunity + - qol: Bedsheets now have context screentips and will cover up mobs if they are + attacked and lying down. Bedsheet can also be rotated with AltClick. + - bugfix: Fix rotation and offsets to work properly on mobs, nuke disk, plushies, + and bedsheets when placing something on a bed. + zxaber: + - bugfix: Fixed disposals pipes qdel-ing their contents when their integrity hits + zero. +2022-11-18: + 1bw0kopy: + - bugfix: Fix emberfall sound looping forever + Fikou: + - bugfix: fixes hilbert's hotel tram + JohnFulpWillard: + - bugfix: Ruins blacklisted from icebox shouldn't also blacklist it from lavaland, + and vice versa. + - bugfix: Syndicate Cyborgs no longer have the PDA messaging app. + Jolly: + - qol: Library Consoles and Book Management Consoles should no longer have their + keyboards hanging over the edge of tables. + - bugfix: On most station maps, crew can now properly see the computer monitors + for library consoles and the like. We don't know how you guys saw the screens + before, but you did. Good on you, I suppose? + Melbert: + - refactor: Fully heal can be passed a series of flags. As a result, some things + which previously did a full heal might heal slightly less, or some things which + did partial full heals might do slightly more. + - bugfix: Adminordrazine will no longer completely break every facet of a person + - admin: Ahealing a changeling will refill all of their chems. + NamelessFairy: + - bugfix: Roundstart PDAs can once again be used by people with chunky fingers. + Paxilmaniac: + - rscadd: A variety of items, mainly tools, around the station might hurt if they + fall on your head, remember to wear your hardhat and to avoid standing under + large red X marks on the ground with a piano hanging above them. + Simplehorror: + - spellcheck: Fixed a spelling error in some fluff + Striders13: + - rscadd: Pubby whiteship replaced with a new one. + antropod: + - bugfix: Containers visually update after crafting. + distributivgesetz: + - spellcheck: Corrected a miswording in the power monitor UI. + etherware-novice: + - bugfix: flick_overlay is an atom proc + - bugfix: bluespace light replacer displays icon correctly + - bugfix: fresh laundry mood is functional again + - code_imp: new component for controlling wearables granting mood + mc-oofert: + - bugfix: You can no longer deconstruct the chess pieces or cut the trees in the + holodeck for free mats + - bugfix: Raw dimensional cores can now be refined properly + moocowswag: + - rscadd: Cryokinesis, Shocktouch, Chameleon, and Webbing mutations now have a higher + potential + - balance: Cryokinesis and Shock touch appear to be weaker and more unstable by + default + timothymtorres: + - code_imp: Move plasma lava turf code to be in lava.dm file instead of snowdin + mission code +2022-11-19: + ATHATH: + - balance: The damage modsuit bombs do to objects has been reduced from 15 damage + to 12, to match the damage they deal to non-hostile mobs. + - bugfix: Cans of monkey energy now have enough space to properly hold the quantity + of the monkey energy reagent they spawn with. + Iamgoofball: + - balance: You can no longer use batons if you have chunky fingers. + JohnFulpWillard: + - bugfix: Abductors can now use their batons. + MTandi: + - bugfix: fixed bamboo floor tile in-hand icons not being used + - imageadd: added tatami of 3 types to the bamboo floor variants + Sealed101, Sheets for legion trophy (from a previous Legion desoul): + - imageadd: 'new sprites for Kinetic Crusher trophies for the following mobs: legion, + goliath, all three watchers, fire drake/ice whelp, wendigo, polar bear and polar + wolf' + Time-Green: + - qol: you can look behind shipping containers, ratvars wreck, through the necropolis + gate and behind the big bones + Tonriam: + - spellcheck: The pAI toggle button to quickly display the Crew Manifest works again. + axietheaxolotl: + - bugfix: The RD coat is no longer incorrectly togglable, and lack of "fill-in" + on turtleneck handholes. + etherware-novice: + - bugfix: radio uplink now works, moved to .z because .d is reserved + lizardqueenlexi: + - rscdel: Removed the useless "plasmaburnt" trait. + - bugfix: Restored a broken interaction with plasma rivers that slowly transforms + you into a plasmaman. + mc-oofert: + - rscadd: Added two new whiteships, the "Personal Transit Shuttle" and the "Obelisk" + twilightwanderer: + - bugfix: Fix crash of TGUI fax panel when there is no fax in the network + - admin: Adding the ability to load the configuration of custom maps +2022-11-20: + 1bw0kopy: + - bugfix: Fix being unable to block embeds + Ebb-Real: + - bugfix: Tape pieces have the correct examine tip. + - bugfix: Applying tape pieces by using it on someone will now actually warn them. + MTandi: + - qol: new seed extractor UI + Riggle: + - qol: Imaginary friends now have runechat, typing indicators and emotes! + - qol: Imaginary friends can point and spin + - bugfix: Fixed a bug with imaginary friends where ghosts would stay after aghosting + - refactor: Imaginary friend code massively improved + - refactor: Imaginary friends now support multiple friends at the same time! + - admin: Imaginary friends no longer bypass filters + TiviPlus: + - refactor: Added a particle editor to VV dropdown which can be used by coders and + admins to edit particle values on the fly easily. + san7890: + - bugfix: Canned Laughter, T-Borg's Tonic Water, and Soda Water cans should all + come with the expected marketed 50 units of goodness, rather than cheaping out + on materials for only 30 units of can volume. +2022-11-21: + A.C.M.O.: + - rscdel: Removed the Tongue Tied quirk. The tongue can still be found and used + in-game. + - refactor: Refactored Tongue Tied's tongue to use the Sign Language and Mute traits. + - rscadd: Added Sign Language innate action. Granted by book or quirk. + - rscadd: Added the Galactic Common Sign Language book as rare maint and space loot. + - rscadd: Added the Signer quirk, which teaches you sign language in exchange for + 4 quirk points. + - rscadd: Added the Mute quirk, which grants you 4 quirk points in exchange for + your voice. + - bugfix: Fixed sign language say_yell verb, which allows you to emphatically sign. + Addust: + - bugfix: your local space explorer has removed the locks from all kilo-class mining + vessel mining airlock bolt control panels. please report any surviving instances + to central command so said space explorer can be dispatched to do the same exact + thing. + Agameofscones: + - imageadd: Resprited rice, sugar, and flour sacks + Fikou: + - bugfix: fixes using body purist with quadruple amputee + Iamgoofball: + - balance: Hotkey-based inventory management now applies the click cooldown to prevent + it from being abusable in combat scenarios. + JohnFulpWillard: + - bugfix: Research servers now only show servers connected to their techweb. + Melbert: + - bugfix: Fullheals heal organ damage and oxy again. + Striders13: + - bugfix: fixed nightmare brains being invisible + ZephyrTFA: + - bugfix: Airlocks will no longer 'deny' entry when bumped while depowered + - bugfix: rcds will now prioritize completing a girder over making a new wall on + a turf + - bugfix: Vending machines will no longer crush you through windows! +2022-11-22: + A.C.M.O.: + - bugfix: Fixed a bug that caused the Signer quirk to stop working as expected when + used with the Mute quirk. + JohnFulpWillard: + - bugfix: Icebox's blacklisted ruins works again. + - balance: All modular computers now only have one ID slot, and cannot be upgraded. + - qol: The HoP's access application now only has one app, logging in will directly + modify the ID that's in it, making it less confusing to swap back and forth. + LT3: + - rscadd: 'New random event added: Tram Malfunction' + LemonInTheDark: + - bugfix: Mining walls won't have fucked lighting anymore + Melbert: + - admin: AI uploads constructed midround will now give an admin message and log + to silicon log + OrionTheFox: + - rscdel: NT has decided to begin a Recycling initiative, asking crew to please + stop throwing their bowls away in maintenance. You should only find trash and + grime from now on! + Profakos: + - refactor: refactored trophy cases, to be more user friendly + - admin: created a trophy managment admin panel + Rhials: + - spellcheck: Adds spread text to some diseases that lacked it. + RikuTheKiller: + - rscadd: Added a reagent injector component and BCI manipulators to all circuit + labs. (+ install detector component) + Time-Green: + - bugfix: Surgically removing wings during flight no longer grants infinite flight + Vishenka0704: + - rscadd: A way to send faxes to CentCom/Syndicate + - admin: New fax panel(with stamps!!!) + ZephyrTFA: + - bugfix: shoving someone away from you correctly breaks your grab on them + - bugfix: You can slap tables with right click again + disappointedButNotSuprised: + - rscadd: After a massive success of the Modello 3 series, Piccionaia Home Appliances + rolls out a completely new coffeemaker model and renovates the meta station + cafe for free in a promotional campaign! + - rscadd: Syrup bottles, condiment displays, and more, to make the spess coffee + experience even better + etherware-novice: + - rscadd: Re-adds legacy job ringtones (clown, mime, jani, lawyer, science, chaplain) + - refactor: update_ringtone was modifed to accept strings, moving the old functionality + to update_ringtone_pref + - rscadd: radios have overlays for showing broadcasting settings + - rscadd: You can now kickflip on skateboards. + lizardqueenlexi: + - spellcheck: Made "free objective" text consistent. +2022-11-23: + Fikou: + - balance: Clothing armor values stack multiplicatively rather than additively. + Guillaume Prata: + - bugfix: You can no longer repair wooden bucklers and roman shields by slapping + them with a titanium sheet. + JohnFulpWillard: + - bugfix: Experisci handlers no longer show all servers as being on the same techweb + if they aren't. + - bugfix: RnD consoles no longer bluescreen if they aren't connected to a techweb, + instead it will give an error message. + - balance: Experisci handlers no longer show the location of RnD servers. + - qol: The chat client is now listed under 'Crew' instead of 'Misc' in the store. + - qol: The chat client now allows anyone to use the ping feature, as long as they + aren't server muted. + - qol: The chat client's messaging system now shows the latest messages on top, + rather than bottom. No more scrolling! + - qol: The chat client now has a ping spam-prevention feature. + - bugfix: Techfabs now automatically update to researched designs again. + LemonInTheDark: + - bugfix: Bots will now "notice" you if you're standing right next to them + - bugfix: Bot paths will now draw above things like pipes, rather then below them + - refactor: Changed how pathfinding paths get generated + - refactor: Made pathfinding and bot searching significantly faster + MTandi: + - refactor: biogenerator UI revamped + - qol: biogenerator no longer requires beaker for materials, monkey cubes and nori + - balance: biogenerator accepts all food, not just plants + - balance: biogenerator treats all nutriment subtypes as nutriments (vitamins, protein, + etc.) + - balance: biogenerator product prices doubled + - balance: biogenerator biomass storage is limited depending on the level of matter + bins + - balance: cowboy boots recipe moved from crafting to leather recipes + - balance: leather clothing & belt recipes moved from biogenerator to leather recipes + - balance: rice hat recipe moved from biogenerator to bamboo recipes + - balance: biogenerator now outputs rolling paper sheets instead of a pack + - rscadd: biogenerator can now print paper + - imageadd: biogenerator icons now use overlays, have emissive layer and indicate + the biomass volume + - rscdel: Removed Charlie station corridor between kitchen and botany + - rscadd: More random loot spawners on Charlie station + - bugfix: biogenerator active power usage fix + Melbert: + - rscadd: Added five new heretic spells, one for each path. They come after the + Ritual of Knowledge. + - rscadd: Cone of Cold, for Void heretics. Shoots out a freezing chill in a cone + which deal damage and freezes. + - rscadd: Flesh Surgery for Flesh heretics. A touch spell which can either heal + minions or be used on mobs to extract organs without surgery. + - rscadd: Volcano Blast for Ash heretics. A beam spell, like Tesla Blast, which + fires out a beam of fire that bounces between people. + - rscadd: Realignment for Blade heretics. Fleshmend, but for stuns and stamina damage. + Makes you a pacifist, but rapidly regenerates stamina. + - rscadd: Rust Construction for Rust heretics. Places a wall of rust on the target + rusted flooring. Can even be used to ascend z-levels! + - balance: Nerfed the cooldown of Cleave slightly, buffed the cooldown of Lesser + Cleave slightly. + - balance: Slightly more influences will spawn on the station per heretic. + - balance: Heretics require an additional sacrifice on average for ascension, but + are given a fifth sacrifice target (randomly selected). + - balance: Being sacrificed by a heretic now gives you a permanent phobia of spooky + things, including heretic mobs and items. + - balance: Heretic ghouls now take reduced stamina damage, depending on how small + their health pool is. + - balance: Using Jaunts will conceal your runechat for their duration. + - balance: Spells which require emoting (Mime spells) require your hands not be + blocked to use. + - refactor: Touch Spells were improved a bit. Added some new template spells - Charged + spells, and Charged beam spells. + - bugfix: Fixes a runtime from losing heretic. + - bugfix: Soulstone names should no longer become bizarre after repeated use. + NamelessFairy: + - bugfix: Delta's Port Bow Solar is now correctly labelled. + Profakos: + - refactor: mech construction balloon messages are now actually stored in the construction + steps, instead of being tracked separately. + - bugfix: Items used in the honk mech construction are now properly deleted/moved + inside the mech + - qol: added a mail sorting map helper, to allow mappers to create disposal networks + faster + - bugfix: fixes several non working disposal mail targets that never received their + packages + RikuTheKiller: + - balance: Nooartrium metabolizes much slower now. + - bugfix: You can now get 100% pure inverse reagents. + - bugfix: Metabolization works for reagents that are meant to metabolize while your + liver is failing. + - bugfix: Higadrite, cordiolis hepatico and herignis work properly. + - balance: Herignis is more potent and has an overdose threshold of 25u. + Ryll/Shaps: + - rscadd: Added the Marksman Revolver, for admins to spawn. + SeigaSeiga: + - bugfix: Plague Doctor Hat no longer makes the Plague Doctor Mask (and everything + else on your head) invisible. + SgtHunk: + - rscadd: A gibber, upon creation, might be a meat grinder. This does nothing meaningful, + but at least one of your finger bones will still be intact. + SkeletalElite: + - bugfix: Riot darts no longer do damage with no pen inserted if recovered after + being fired while modified to accept pens. + Striders13: + - bugfix: fixed tramstation's AI sat solars not working + SyncIt21: + - qol: Entering reagent names is much faster with zero errors + - bugfix: You can enter new temp & ph values + Y0SH1M4S73R: + - admin: Admins are unable to invoke functions from external libraries using callbacks. + ZephyrTFA: + - bugfix: two handed items will no longer leave a ghost at your feet when inserted + into something + Zonespace27: + - admin: ERTs can now have a custom shuttle that they can spawn on, on a toggle + while creating said ERT. + carshalash: + - bugfix: Updates the Ice cabin kitchen to be more modern. An oven and griddle have + been added. + etherware-novice: + - bugfix: costume hat descriptions + flowercuco: + - rscadd: you can fax flatbreads and slices of bread now, changed all flatbreads + into children of pizza/flatbread to allow for this + - qol: adds screentips to various pizzabox action (stacking, when you can take pizzas + out, pizza box bomb stuff) + - qol: adds a way to add screentips directly into processable food via the add element + processable proc + - refactor: pizza crates work the same but more clearly and more variable + lizardqueenlexi: + - refactor: Removed mutant_bodyparts.dmi and distributed its sprites in a more sensible + and granular manner. + necromanceranne: + - balance: Meteorslugs are now miniature cannonballs. They also need more gunpowder + and rum to be constructed. + timothymtorres: + - bugfix: Fix reagent containers playing attack animation when transferring reagents + to mob bucket + - bugfix: Fix syringes and droppers not updating the appearance of target when used + - qol: Regular mop bucket has the same RMB hotkey as janicart for wetting mop + - refactor: Refactor janicart to be subtype of mop bucket +2022-11-24: + 1bw0kopy: + - bugfix: Fix traitor objectives failing to complete + Fikou: + - qol: you get access to the next storage ui row 1 item earlier + Ghommie: + - rscadd: Added two sets of coordinates to the checkers and chess modules for the + holodeck. + GoldenAlpharex: + - rscadd: Added a Rescue Hook, that will allow the fishing rod it's attached onto + to become a lot more proficient at recovering corpses from chasms, at the expense + of making it unusable for more traditional fishing. It isn't entirely lobstrosity-proof, + however... + - balance: The magnetic hook can no longer fish out corpses from chasms, but will + fish out items much more efficiently than any other hooks, while also being + much less attractive to lobstrosities. Some still fall for it regardless, however. + - spellcheck: Fixed the capitalization and punctuation in the description of multiple + fishing accessories. + - code_imp: Improved the code for fishing weights, to allow for different hooks + to have some more noticeable results on the weights without having to add to + an already massive proc. + Jacquerel: + - refactor: Cayenne's ability to participate in Nuclear Operations is now a component + which any mob can use. + - rscadd: All Space Carp will now start regenerating health after 6 seconds of not + taking any damage, until they're back to full health. This behaviour was previously + unique to mega carp. + - qol: You can see what kind of spell a magicarp will cast by hovering your mouse + over it. + - imageadd: Megacarp now have a random colour. + - imagedel: Magicarp are now colour coded based on their spell, or change randomly + if they're Chaos Magicarp. + JohnFulpWillard: + - admin: Researching nodes and bepis unlocking stuff is now logged in research. + LemonInTheDark: + - bugfix: You can now see antag hud icons AND see through walls. WOW +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixed an exploit involving igniters attached to themselves. Assembly holders are now limited to 12 assemblies maximum, and you cannot attach multiple igniters to the same assembly. - refactor: Refactored some assembly jank, namely in how they pulse and are pulsed. +<<<<<<< HEAD PositiveEntropy: - imageadd: Updates the Military, Bomber and Letterman Jackets - bugfix: Fixes the centcom hat, cap and head intern cap, which were using the old @@ -473,19 +1304,53 @@ - bugfix: Fixes a NTPay exploit. - imageadd: Resprited rice, sugar, and flour sacks - bugfix: Curd cheese can be microwaved again into cheese curds +======= + Roryl-c: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Flypeople gain a comparable amount of nutrients from vomited food to other species (~70%, up from ~30%) - bugfix: Flypeople no longer vomit after drinking fluids - bugfix: Flypeople no longer vomit all contents of their stomach on spawn - code_imp: Stomachs can now react to foods entering them by overriding the `after_eat` proc +<<<<<<< HEAD - admin: Researching nodes and bepis unlocking stuff is now logged in research. +======= + disappointedButNotSuprised: + - bugfix: Curd cheese can be microwaved again into cheese curds + etherware-novice: + - qol: slight positive moodlets use a different color to slight negative ones + flowercuco: + - qol: added screentips to customizable food + - qol: added more balloon alerts to custommizable food + private-tristan: + - bugfix: icebox kitchen maints is now correctly wired +2022-11-25: + Cenrus, ported by Hardly: + - rscadd: Added *snap emote + CocaColaTastesGood: + - bugfix: Fixes a NTPay exploit. + GoldenAlpharex: + - bugfix: Modular computers will now no longer all be called "processing unit", + and will all have their own unique names once again. + Jacquerel: + - bugfix: A revived basic mob will stand up again rather than inching around as + a living corpse. + LT3: + - bugfix: Tram signs glow instead of being harsh blocky. + PositiveEntropy: + - imageadd: Updates the Military, Bomber and Letterman Jackets + - bugfix: Fixes the centcom hat, cap and head intern cap, which were using the old + sprites. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: checks while inserting stack materials into an RPED and their amounts - code_imp: sorting of RPED part components to sort stack materials by their ratings - rscdel: 'old way of displaying parts when clicking on an machine frame with it add:new way of displaying part info which displays number of parts including for stack materials' +<<<<<<< HEAD - rscadd: Added two sets of coordinates to the checkers and chess modules for the holodeck. - qol: you get access to the next storage ui row 1 item earlier @@ -498,6 +1363,60 @@ - bugfix: Delta's Port Bow Solar is now correctly labelled. - bugfix: Wall mounted vendors can no longer receive brand intelligence. - bugfix: limits how much you get alerted by icebox storms +======= + ZephyrTFA: + - bugfix: Strange Reagent is once again Strange! (it works at all) + flowercuco: + - rscadd: you can saw bread with a saw into bread slices + - qol: added screentip verbs to a bunch of food files + - code_imp: bread and cake now have slice types and all only have one call on the + processable.dm proc + nevimer: + - rscadd: The Supermatter crystal will now emit rays of light, varying on it's power + level and situation. + - code_imp: improves a formatting and comment spelling + - bugfix: The Causality field now actually shows up! +2022-11-26: + Fikou: + - balance: premium internals station trait now increases the slots of your internals + box + GoblinBackwards: + - bugfix: Fixed being unable to open the necropolis gate when standing behind it + - bugfix: Fixed being able to move through floors and get to centcomm when moving + up/down while inside mechs and similar movable objects. + - bugfix: fixed armblades and digitigrade legs not showing up in the limb grower + GoldenAlpharex: + - bugfix: PDAs (and by extension, modular computers) now can see the ID section + at the top of their main screen again, which means that PDAs can have IDs imprinted + on them again. + - bugfix: Fixes the ID section not displaying anything when there wasn't any ID + inserted in it, even if it had an imprinted name and job. + - bugfix: Fixes the "Eject ID" and "Imprint ID" buttons not being disabled when + there's no ID in the computer/PDA. + - bugfix: There's no longer any empty () by in the "ID Name" and "Assignment" fields + of the ID section of computers when there's no ID in them. + Jacquerel: + - bugfix: Rabbits don't suddenly become more dense when killed than they were in + life. + JohnFulpWillard: + - bugfix: Wirecarp now lets you give people mass PDA perms again. + LT3: + - imageadd: New railing pillar tram crossing signals. + - qol: Vending machines next to the tram are now against the wall. + - bugfix: Tramstation floor decals no longer guide you to walk into the vending + machines. + - rscadd: The tram stations now have no-slip hazard floor tiles so you don't accidentally + slip and get smacked. Feel free to still run into it anyways, medbay has a counter + now so they'll know. + LemonInTheDark: + - bugfix: Lavaland fauna will no longer be able to mine + - rscadd: Adds a new rendering option to the gameplay preferences. You can now limit + the rendering intensity of multiz levels. This will make things look a bit worse, + but run a LOT better. Try it out if your machine chokes on icebox or somethin. + MTandi: + - bugfix: biogenerator now properly gives non-stackable items + - refactor: biogenerator backend optimization +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can stick IV drip into anything that is a reagent container (injection only) - qol: IV drip transfer rate can be zeroed to stop the flow without removing the @@ -509,6 +1428,7 @@ max - qol: IV drip UI update - rscadd: You can craft IV drip with 2 rods, 1 plastic sheet and a syringe +<<<<<<< HEAD - bugfix: You can now see antag hud icons AND see through walls. WOW - bugfix: Wirecarp now lets you give people mass PDA perms again. - balance: Paramedics get to have mining station access @@ -532,11 +1452,18 @@ Tastyfish: - qol: All skyrat leather belt and bandolier recipes are now in the belts category, as they should be. +======= + Rhials: + - bugfix: you get your keys upon removing them from a car now! + - balance: the clown car now crashes upon ramming into a deer, like god intended. + - bugfix: Wall mounted vendors can no longer receive brand intelligence. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VexingRaven: - bugfix: Ashwalker Eggs and Battlecruiser spawners no longer give you a warning every time you open the spawn menu if you've already spawned as that role once. - spellcheck: Ashwalker Egg warning message for having already spawned once is no longer bolded for no reason. +<<<<<<< HEAD zydras: - rscadd: DS-2 has been fully retrofitted into a working spaceship and have had their ID trims fully updated. @@ -611,14 +1538,48 @@ - imageadd: Added missing coin projectile sprite for the marksman revolver SkyratBot: - bugfix: Fixed being unable to open the necropolis gate when standing behind it +======= + etherware-novice: + - bugfix: limits how much you get alerted by icebox storms + theOOZ: + - balance: Paramedics get to have mining station access +2022-11-27: + ATHATH: + - bugfix: The shocks from the spell packets spell are no longer blocked by insulated + gloves. + Jacquerel: + - bugfix: Sheep are no longer immune to weaponry. + LT3: + - spellcheck: Tram Malfunction event now successfully announces 'successfully.' + RaveRadbury: + - balance: Obsessed has been bumped up to a Deep-Rooted Brain Trauma + - balance: Mind Restoration can't remove deep-rooted traumas, making Obsessed unremovable + by virusses + Tattle: + - admin: removed message_admins message for tram malfunction failing to run on maps + that aren't tram + flowercuco: + - qol: pdas have a wrench deconstruct screentip + - bugfix: wrenching a pda no longer destroys all contents inside + - bugfix: roundstart empty mugs now appear to be empty + - bugfix: nanotrasen mug no longer becomes normal mug after you drink from it +2022-11-28: + RikuTheKiller: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Nooartrium doesn't blind you anymore and keeps you conscious regardless of oxyloss. - bugfix: Being immune to hardcrit makes you able to hear while you should be in hardcrit. +<<<<<<< HEAD - bugfix: roundstart empty mugs now appear to be empty - bugfix: nanotrasen mug no longer becomes normal mug after you drink from it - qol: pdas have a wrench deconstruct screentip - bugfix: wrenching a pda no longer destroys all contents inside +======= + Ryll/Shaps: + - imageadd: Added missing coin projectile sprite for the marksman revolver + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Splits the nuclear operative combat medical kit into two versions: basic and premium.' - balance: Basic contains additional amounts of basic c2 chem patches, some spare @@ -635,6 +1596,7 @@ box. - rscadd: I'm not telling you to read the pamphlet, but you should probably read the pamphlet. +<<<<<<< HEAD - balance: Obsessed has been bumped up to a Deep-Rooted Brain Trauma - balance: Mind Restoration can't remove deep-rooted traumas, making Obsessed unremovable by virusses @@ -648,12 +1610,20 @@ unit0016: - bugfix: Skyrat's ID trims are now recolorable, as they are upstream. XOXO. 2022-11-29: +======= + supergrog2: + - bugfix: fixes grilles dropping stack of 0 iron rods +2022-11-29: + Auris456852: + - bugfix: Makes Miner's Salve HUD screw not permanent. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Common fucking sense: - bugfix: The changes to Mafia and holopad say prefixes was reverted. - spellcheck: Mafia changeling say prefix has no longer been changed to .1, and has been returned to .j - spellcheck: AI Holopad say has no longer been changed to .2, and has been returned to .h +<<<<<<< HEAD Jolly: - bugfix: '[Void Raptor] There are now disposal units in the Law and Detectives offices. This means you can receive mail (unwillingly). Have a pipe bomb, detective.' @@ -690,14 +1660,59 @@ - spellcheck: removed a reference to radiation collectors in tip of the round - refactor: Moves wall smashing out of simple mob code and into an element we can reuse for basic mobs later +======= + Ghommie: + - bugfix: pAIs and lightgeists can now correctly climb ladders. + - bugfix: fixed a small issue with the radial menu for ladders that caused the user + to travel down when abruptly closed. + Jacquerel: + - refactor: Moves wall smashing out of simple mob code and into an element we can + reuse for basic mobs later + Melbert: + - code_imp: Cuts some uses of allowed list as a typecache. Allowed lists are not + typecaches, don't make them typecaches + - bugfix: Fixes dragon despawn deleting all the people they consumed + RikuTheKiller: + - bugfix: You can now make acetaldehyde without making pentaerythritol. + Thunder12345: + - bugfix: TTV bombs can no longer be concealed inside food + epicgamer545: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Nanotrashen made some top-of-the-line changes to their top-of-the-line prison by walling off their equipment area and removing some spare guns they somehow left on the tables. We also stole the security computers, so people with telekinesis can't access them. +<<<<<<< HEAD Tattle: - admin: removed message_admins message for tram malfunction failing to run on maps that aren't tram 2022-11-30: +======= + etherware-novice: + - qol: quantum keycards light up with the department theyre in (or grey as a fallback) + - qol: quantum keycards are custom renamable w/ pen, to help keep em organized + private-tristan: + - spellcheck: removed a reference to radiation collectors in tip of the round + - qol: in metastation engineering, the plumbing water tank has been replaced with + a proper water tank, and shower water is now plumbed in from the engine maintenance + san7890: + - qol: The photocopier will now tell you when it's not able to find an ID to charge + on your person. +2022-11-30: + AnturK: + - bugfix: normal toolboxes can't hold fishing rods anymore + Capybara Holly: + - refactor: Datum AI can now switch to different movement datums in their behavior. + - refactor: Allows datum AI to create new plans while a plan is still executing + Capybara holly: + - bugfix: After rigorous training excercises monkeys now understand how to defend + themselves from vile greytiders again + Fikou, sprites from Halcyon, some old code from Basilman and Armhulen.: + - refactor: Honorbound and Burdened mutations are brain traumas now. + - rscadd: Psykers. Become a psyker through the path of the burdened, or a genetic + breakdown. + - rscadd: Echolocation Component. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Went through and refactored a lot of the old code of the biogenerator, and made multiple improvements to its logic, which should hopefully make it @@ -716,6 +1731,7 @@ recipes. - spellcheck: Fixed multiple inconsistencies between the messages sent to your chat by the biogenerator. +<<<<<<< HEAD Jolly: - bugfix: '[Void Raptor] Maintenance area defines now border maintenance doors. TLDR; if the power goes out in maint and you''re engulfed in a fire, better @@ -737,3 +1753,44 @@ shuttle is heading towards the station no longer breaks space-time. Zonespace27: - rscdel: Abductors no longer have an objective to abduct a certain amount of people. +======= + MTandi: + - bugfix: IV drip can be zeroed via UI, not just alt-clicking + Melbert: + - bugfix: VVing an edible comp's food flags pulls up the bitfield ui correctly + Mothblocks: + - bugfix: Fixed reactions being broken in the EXPERIMENTOR or something I don't + actually know what this thing does + NamelessFairy: + - rscadd: You can now reinforce plating to protect your department from the troublemakers + upstairs. Station builders might find these useful to put the stations most + secure locations on the lower floors. + - imageadd: added sprites for reinforced plating + - code_imp: RCD proofing has been variablized and can now be applied to any floor + type instead of just reinforced floors. + - bugfix: Rather than having two surgery B's on icebox you get a Surgery North and + a Surgery South + Pickle-Coding: + - bugfix: Fix unnecessary mole scaling with gas turbine gas thermal energy loss + from work done. + - bugfix: The gas turbine no longer creates power from thermal energy it can't take. + Sealed101: + - rscadd: robotics now has access to a mech camera add-on, which installs a security + camera into the mech. bodycam footage from the big leagues! + - qol: cyborg cameras should be more active with updating static when moving (ideally + down from 2.5 seconds to 0.5 between updates), make sure to report any jank + if you happen on some + ShizCalev: + - bugfix: Full mugs no longer appear empty in the map editor. + Striders13: + - bugfix: fixed lizard markings incorrectly displaying when strapped to a guillotine + - code_imp: guillotine's blade drop sound is now a variable + Tralezab code, Azlan + Azarak (Az gaaang) for the organs: + - rscadd: Added the DNA infuser to genetics! Person goes in, corpse goes in, and + they combine! + - rscadd: Try not to turn yourself into a fly, OK? + necromanceranne: + - bugfix: You no longer cut into mechs with wreckages with crowbars, you pry parts + from them. Duh. + - bugfix: Mech material salvage matches their construction materials. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-12.yml b/html/changelogs/archive/2022-12.yml index 3c2fdf0a001..7e5aff3e556 100644 --- a/html/changelogs/archive/2022-12.yml +++ b/html/changelogs/archive/2022-12.yml @@ -1,15 +1,19 @@ 2022-12-01: +<<<<<<< HEAD Capybara Holly: - refactor: Allows datum AI to create new plans while a plan is still executing Capybara holly: - bugfix: After rigorous training excercises monkeys now understand how to defend themselves from vile greytiders again +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Refactored the way the undertile component works, to allow it to have a bit more granularity as to when it's meant to be covered, but still visible, like for catwalks! - bugfix: Catwalks no longer are affected by ambient occlusion, and now properly feel like actual floor tiles. +<<<<<<< HEAD SkyratBot: - bugfix: normal toolboxes can't hold fishing rods anymore Zenitheevee: @@ -23,10 +27,13 @@ - bugfix: Cleaning will now once again show bubbles on what's being cleaned! LT3: - bugfix: All the tram platform tiles are now actually tram tiles. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored deep fried foods. Deep fried foods are still ""usable"" as their normal item, but are just edible. - qol: Silver Slime stuff can spawn grilled as well as fried. +<<<<<<< HEAD - code_imp: Cuts some uses of allowed list as a typecache. Allowed lists are not typecaches, don't make them typecaches - bugfix: VVing an edible comp's food flags pulls up the bitfield ui correctly @@ -104,12 +111,78 @@ with 10mm firearms, though the damage of the rounds they fire should be very similar if not the exact same as it was per gun before this pr. SkyratBot: +======= + SyncIt21: + - rscadd: plumbing constructor TGUI, just like Rapid Pipe Dispensers + - rscdel: plumbing constructor radials + - code_imp: categories for each item + tralezab: + - bugfix: fixed getting kicked out of your body sometimes when pursuing the carp + mutant + - bugfix: and carp lungs working incorrectly + - qol: better ui explanation on the infuser book + - qol: can drag people into the infuser chamber +2022-12-02: + CapybaraExtravagante: + - bugfix: Bots no longer get stuck behind windoors and firedoors when they could + go through them in some way. + JohnFulpWillard: + - rscadd: Shaft Miner's equipment vendor now orders their equipment through the + Cargo shuttle, though you can spend 1.5x the points to express it, making it + a Mining version of the Chef's produce console, with a weakened express tax. + LT3: + - bugfix: All the tram platform tiles are now actually tram tiles. + Tattle, PestoVerde322: + - imageadd: couches are now grayscale + - code_imp: random tool colours now use defines + YakumoChen: + - bugfix: Fixes a missing tram rail along the tram line + necromanceranne: + - imageadd: Unique inhands for the ion carbines + - bugfix: Makes sure that the ion carbine has a defined worn sprite. No longer pink! + tralezab: + - rscadd: You can add grenades to food + - rscadd: Grenades explode when accidentally bitten into + - balance: Adding something large to custom food will make it, too, also large + - bugfix: TTVs can have an explosive reaction from deepfrying. +2022-12-03: + Hardly3D: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Added griddles and ovens to ruins and away missions such as Deep Storage, Underground Outpost and Beach Biodome. - bugfix: Overhauled beach biodome bar, fixed stools facing the wrong direction, as well as making the bar less boxy. +<<<<<<< HEAD - bugfix: Automated IV drip transfer rate controls now unavailable on injection, since the transfer rate is managed by the plumbing network +======= + JohnFulpWillard: + - rscdel: Tablets are now removed, PDAs are now the base 'tablet'. Silicon and nukie + tablets are now PDAs. + MTandi: + - rscadd: Craftable chemical separator + - qol: barrel works with the plant bag now + - balance: barrel volume increased to 600 units + - bugfix: barrel now properly converts nutriments into wine + - bugfix: added 4% nutriments to sugar cane, to allow rum creation + - refactor: barrel logic and fermentation refactoring + RikuTheKiller: + - balance: Geysers now spawn more often, especially wittel geysers. + Time-Green: + - refactor: Refactors podperson hair. You can now restyle it on any species + - qol: You can restyle podperson hair on the person, their decapitated head or straight + on the hair organ + - code_imp: Restyling is now completely modular, you can make any external organ + easily restylable + - bugfix: Fixes external organ harddel because limbs would keep the reference on + drop_organs + tralezab: + - refactor: Refactored wings, tongues, and some examine messages, hopefully with + minimal effect on actual changes. A few more species have tongues, angel wings + bring the holy trait with them, and wings have new descriptions. should be the + biggest parts of it + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed supermatter rays glowing with an additional yellow ray on special delams. Will only glow blue or purple for tesla and singuloose respectively. - bugfix: got rid of the blue causality box thing from singulo delams. @@ -118,6 +191,7 @@ - code_imp: made the disable_gas var on supermatter preserve the current variables instead of zeroing them. - code_imp: registered the supermatter filters on the filter debug menu. +<<<<<<< HEAD - rscadd: robotics now has access to a mech camera add-on, which installs a security camera into the mech. bodycam footage from the big leagues! - qol: cyborg cameras should be more active with updating static when moving (ideally @@ -159,10 +233,32 @@ - bugfix: Fixed a runtime from alien larva processing after they've gibbed their host. SkyratBot: +======= +2022-12-04: + Comxy: + - rscadd: Frogs and cockroaches can now be converted to the regal rats army. + - bugfix: Converted rat do not attack mouses anymore. + - imageadd: New sewer cockroach and trash frog sprites + JohnFulpWillard: + - bugfix: Mining orders will no longer say they charged you credits. + - qol: The cargo console now properly displays the amount of mining points used + to purchase something. + - qol: Mining orders no longer have manifest errors. + MTandi: + - bugfix: Automated IV drip transfer rate controls now unavailable on injection, + since the transfer rate is managed by the plumbing network + Rhials: + - spellcheck: removes a bunch of instances of "unconcious" from the code. + - rscadd: Paperwork! Huge paperwork. Gigantic. You can stamp it and send it to Centcom + via cargo for BIG MONEY. + - rscadd: New shuttle loan event variant -- You get a bunch of paperwork! + - rscadd: Ancient paperwork has appeared in the maintenance tunnels! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: new admin verb -- Command Report Footnote. Lets you attach a signed message to the roundstart command report. - admin: new admin verb -- Delay Command Report. Lets you delay the roundstart command report indefinitely. +<<<<<<< HEAD - rscadd: You can now cry when in crit - rscadd: Add brave bull now makes you fearless and you can ignore phobias while it's in your system. @@ -173,10 +269,27 @@ due to that. Hatterhat: - bugfix: health analyzer rmb works again +======= + etherware-novice: + - imageadd: indicator when a pda contains a pai + itseasytosee: + - bugfix: Stamina damage display calculation should be much more sane and reliable + now + - imageadd: Simplified the stamina hud + private-tristan: + - spellcheck: stabilized oil now correctly has you smell like sulfur +2022-12-05: + Guillaume Prata: + - qol: Right clicking a PKA with an empty hand will show a radial menu that lets + you remove modkits one at the time. + KittyNoodle: + - rscadd: You can now cry when in crit +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tram turfs will now correctly show damage instead of reverting to a default icon. Melbert: +<<<<<<< HEAD - bugfix: Fixes a runtime when alien larva exploded their host that caused the larva organ to not be deleted afterwards. SkyratBot: @@ -194,6 +307,9 @@ - bugfix: Void Raptor - fixes solar console names 2022-12-07: Melbert: +======= + - bugfix: Fixed a runtime from hovering over stuff like bread with an empty hand. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Heretic: Furious Steel''s cooldown has been doubled (30s -> 60s), and abides by antimagic' - balance: 'Heretic: Cleave''s cooldown has increased by 5s, range has been decreased @@ -202,6 +318,7 @@ - balance: 'Heretic: Void Pull and Phase abide by antimagic' - balance: 'Heretic: Halved Void Blast''s cooldown to 30s' - qol: 'Heretic: Void Blast and Rust Formation now have distinct icons' +<<<<<<< HEAD SkyratBot: - bugfix: Ephedrine now rewards you instead of punishing you for making it pure. - bugfix: queuing clicks should work correctly now @@ -577,6 +694,10 @@ - code_imp: Stamina no longer affects individual limbs. 2022-12-17: Melbert: +======= + - bugfix: Fixes a runtime when alien larva exploded their host that caused the larva + organ to not be deleted afterwards. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Observers can now see what action buttons an observed mob has. No, you can't click them. And no it doesn't show EVERY action. - refactor: Refactored how action button icons are generated. Some actions will @@ -585,6 +706,7 @@ lookin' icons (namely their borders), let me know. - refactor: Bluespace Golem's teleport action is now a cooldown action. - bugfix: Construct actions go to the middle of the screen like expected. +<<<<<<< HEAD PositiveEntropy, AxieTheAxolotl: - imageadd: Resprites every revolver! - imageadd: Adds the Syndicate Revolver, a visually new, but mechanically identical @@ -664,29 +786,489 @@ - refactor: The logic of how we well, render things has changed. Make an issue report if anything looks funky, particularly layers. PLEASE USE YOUR EYES - imagedel: non parallax space is now black +======= + - bugfix: Fixed a runtime from alien larva processing after they've gibbed their + host. + Mothblocks: + - admin: Renamed "End Round Normally" in Check Antagonists to "Undelay Round End" + Salex08: + - bugfix: fixes being able to stack deepfried bluespace body bags into bluespace + body bag + Striders13: + - qol: Penthrite from luxury pens now gives you a status effect instead of a balloon + alert + timothymtorres: + - rscadd: Add brave bull now makes you fearless and you can ignore phobias while + it's in your system. + - qol: Add roundstart tip to let new doctors now that morgue trays and freezers + prevent organ decay + - code_imp: Renamed organ decay proc to be `toggle_organ_decay` instead of `recursive_organ_check` +2022-12-06: + ATHATH: + - bugfix: Psyker brains that aren't in psyker heads no longer take twice as much + brain damage from that as intended, nor can they suffer complete brain death + due to that. + Hatterhat: + - bugfix: Fixes a typo that meant auxiliary effects from projectiles (.38 rubber + stamina, ebow stamina/knockdown/blur) checked a generally nonexistent armor + value that was defined on a per-/atom level. As a consequence, such auxiliary + effects from projectiles now actually respect the armored equipment of hit targets/limbs/etc. + On living mobs that have armor equipped, anyway. + MTandi: + - bugfix: IV drip now injects only into injectable things + Mothblocks: + - bugfix: Fixed gulag teleporters not containing the correct parts. + Tastyfish: + - bugfix: Lisa no longer uses bluespace when interacting with Ian. + - refactor: A large portion of dog code was re-written; please report any strange + bugs. + Tralezab code, Fikou's map, PigeonVerde and Halcyon for sprites!: + - rscadd: Psyker-gangers are new pirates + - refactor: refactored pirate code so we can add more in the future + necromanceranne: + - bugfix: Prevents the recycler from destroying indestructible objects. + timothymtorres: + - balance: Change liver to not purge toxins instantly for low amounts. Instead the + toxin effect gets skipped while it is metabolized normally, however it still + does liver damage. This fixes bite increments for food, cigarettes, and drinks + where the toxins would purge without building up to harmful levels. + - balance: Change the formula for how toxins effect livers. Livers will be damaged + based on the units of toxin present and their lethality. + - balance: Change alien liver toxin resistance value to be -33% and cybernetic liver + toxin resistance value to be +50% +2022-12-07: + Azlan, Fikou, MTandi: + - imageadd: Void suit and jetpack resprited + - bugfix: Also fixed the issue with all jetpack sprites not updating on the back + Fikou: + - qol: hop has basic cargo access + Hatterhat: + - bugfix: Mining point cards have slightly more readable buttons now, and also can + be reused even after running out of points. + JohnFulpWillard: + - refactor: Modular computers NTnet and applications run on its own subsystem, please + report any new bugs you may find. + - bugfix: You can now order canisters again. + Kylerace: + - bugfix: the atrocinator modsuit module's negative gravity now works again. have + fun on the ceiling + - bugfix: queuing clicks should work correctly now + MTandi: + - qol: Charlie station stores space suits in proper storage + RikuTheKiller: + - bugfix: Ephedrine now rewards you instead of punishing you for making it pure. + Salex08: + - bugfix: fixes a oversight with mining ltsrbt which would allow them to spam buy + crates for very low mining points + - qol: Increases the amount of marker beacons you can buy in a row from 1 to 10 + TheBoondock: + - bugfix: fixed using the changeling tentacle arm via right mouse click holding + people up instead of firing it. Now it will fire like normal + celulamp: + - rscadd: ' Key can now hurt people by stabbing or throwing.' + - code_imp: changed the keys code to make it able to hurt ppl + flowercuco: + - qol: lockboxes have screentips, + - qol: cargo goodies can be opened with your ID even if it is inside a PDA or Wallet + - bugfix: captain can no longer open cargo goodies + - imageadd: secure lockboxes have a broken sprite when emag'd + - bugfix: crab rangoon is not invisible + kawoppi: + - bugfix: trying to clean something while it's already being cleaned will no longer + prematurely remove the cleaning animation + lizardqueenlexi: + - bugfix: Fixed a bug that made certain inserted organs drop on the floor. + - bugfix: Made digitigrade clothing render correctly on female characters. + nevimer: + - qol: the AI HUD now flex-scales and is reorganized. +2022-12-08: + Ghommie: + - rscdel: Removed icon_state randomization (all but one states) from space turfs + to shave a bit of time when initializing maps. This only affects those who have + parallax disabled! + - imageadd: Prettied up the sole remaining icon state an itsy bit to compensate + for it. + Mothblocks: + - bugfix: Door remotes now open windoors again. + - qol: Door remotes now use balloon alerts for failures. + ReinaCoder: + - rscadd: The Syndicate uplink revolver has been changed from the default .357 to + the S-357. It has the same stats and price as the old version but with a new + sprite. + - qol: Adds a better explanation on the .357 uplink entry so players have an better + understanding of what they are buying. + Rhials: + - balance: Xenomorph nests will now sustain humans that are buckled to them, and + gestate xenomorph eggs slightly faster. + - balance: Xenomorph nests evolved healing capabilities in exchange for some of + their grip. They now take only one minute to escape from. + - bugfix: Earning the Mimic loot drop from an abandoned crate now properly spawns + the mimic. + SargesC: + - bugfix: Ashen heretic blade is now fire resistant + itseasytosee: + - code_imp: Stamina no longer affects individual limbs. + kawoppi: + - code_imp: turned axolotls into basic mobs, their idle movement may be slightly + different and they won't move while you're pulling them anymore + san7890: + - admin: Whenever you teleport an atom/mob using the Get function found in many + admin utilities, rest assured that it will actually log the destination location + of where you are teleporting that thing to- rather than the location they were + pre-teleportation. +2022-12-09: + Ghommie: + - bugfix: 'fixes shields that don''t actually take damage from attacks (eg: adamantine + shields) being unable to block said attacks.' + LT3: + - qol: Tram crossing signals are now colourblind friendly, adding visible symbols + to the state of the crossing signal. + - rscadd: Tram crossing signals now visually show when they're malfunctioning. + - bugfix: Emagged tram crossing signals will stay emagged after the tram malfunction + event. + MGOOOOOO: + - balance: Tweaks the minimal temperature threshold and optimal temperature for + Palladium synthate catalyst. + MTandi: + - bugfix: biogenerator converts all plant nutriments into biomass, not just the + first found one. + Mothblocks: + - rscdel: Blink and you'll miss it, the syndicate revolver has come back. + Pickle-Coding: + - balance: Nuclear particles will always irradiate you on hit. + RandomGamer123: + - bugfix: Fixes access for a windoor to atmospherics on Delta + Rhials: + - balance: The lights will now flicker more frequently before a Grey Tide event + - balance: The lights will now be shut off via the APC when the Grey Tide event + opens up a department. + - code_imp: Makes some miscellaneous code improvements to the Grey Tide event + - code_imp: Grey tide event runs much faster + - code_imp: Renames prison_break.dm to grey_tide.dm + - bugfix: Ethereals cannot crystal revive back from genetic meltdown petrification. + ShizCalev: + - bugfix: The teleporter shutter doors on KiloStation and Meta now properly work + off Teleporter access instead of Command access + Tastyfish: + - bugfix: The dog's attack command is somewhat more reliable. + dawsonkeyes: + - rscadd: Added entirely new icons for the Chrono MODsuit + kawoppi: + - bugfix: fixed mothroach inhands not properly fitting under your arm when facing + sideways with the mothroach facing the camera + tf-4: + - bugfix: Light replacers will no longer turn invisible. +2022-12-10: + Fikou: + - bugfix: fixes beam glow in the dark effects + - bugfix: kinesis now doesnt pull the item to the centre of the screen when first + used + - bugfix: physical beams (like vines or meat hook chain) no longer glow in the dark + Ghilker: + - balance: space heaters also affect the adjacent tiles other than the one they + are on + GoldenAlpharex: + - bugfix: There shouldn't be clickable names in Adminwho that don't do anything + anymore. + Jacquerel: + - rscadd: Basic mobs have the capability of being upset that you kicked and punched + them. + - rscadd: Pigs destined for slaughter will now ineffectually attempt to resist their + fate, at least until they lose sight of you. + - balance: Bar bots are better at noticing that you're trying to kill them. + Kryson, Viro, Tattle: + - imageadd: posters are now 24px tall + - imageadd: new sprites for nanomeds, emergency safes, and ticket machines (by Kryson)! + LT3: + - bugfix: Improved tram door logic so they don't inadvertently open during departure. + - rscdel: Removed the message bubble when you open the tram doors while it's travelling. + MTandi: + - bugfix: Fried egg reagents halved to meet the raw egg reagent amount + - qol: Binoculars can be worn on neck now + Melbert: + - qol: The chaplain's armament beacon now displays a radial instead of a text list, + showing previews of what all the armor sets look like + - qol: (Almost) all choice beacons now use a pod to send their item, instead of + just magicking it under your feet + - code_imp: Cleaned up some choice beacon code. + Mothblocks: + - bugfix: Fixed circuitboards sometimes giving no name on examine. + NamelessFairy: + - bugfix: The golem trigger guard scalping situation has improved and golems can + now once again purchase trigger guards at market rate. + RimiNosha: + - qol: The latejoin menu is now TGUI! + - qol: You'll also be able to see why you can't join a job, instead of it being + invisible! + - code_imp: Department UI colors have changed slightly. This will only affect the + latejoin and nations UIs. + - bugfix: Fixed some issues with the TGUI latejoin menu, and made the shuttle and + round time display once more. + ShizCalev: + - bugfix: Blobs will no longer attack jaunting and incorporeal mobs (eg revenants) + SpaceSmithers: + - rscadd: More options are now available when creating and editing signs. + TheBoondock: + - bugfix: fixed changeling transform allowing escape from handcuffs + Zonespace27: + - balance: Destroying a petrified human statue will now drop their brain. + etherware-novice: + - balance: jaws of life can pry windoors + kawoppi: + - bugfix: cows, pigs, rabbits, sheep, cockroaches, mothroaches and mice now take + damage in hazardous atmospheres and temperatures + lizardqueenlexi: + - code_imp: Switched a single proc ref to the proper format. + necromanceranne: + - rscadd: Replaces a less interesting abductee objective with THE PROMETHEAN HORROR. + The Flesh is Weak, the New Flesh is Not So Weak. + timothymtorres: + - bugfix: Fix hypnosis, mind echo trauma, phobia trauma, hypnotic trigger trauma, + split personality brainwashing trauma, codeword hearing, and impure inacusiate + reagent all bypassing language and hearing checks. If you try to give commands + to a victim in a language they don't understand, they will no longer magically + understand the words. + - bugfix: Fix sign language having accent modifications + - refactor: Refactored saycode to be more robust, readable, and have more unit tests. + tralezab: + - refactor: Refactored and overhauled the ForceEvent UI + vincentiusvin: + - bugfix: fixed sm base ray needing damage to resize +2022-12-11: + EvilDragonfiend: + - code_imp: quirk dm files are renamed 'positive_quirks.dm', 'negative_quirks.,dm', + and 'neutral_quirks.dm' + Jacquerel: + - balance: Rush Gland and Brimdust Sac can be used more frequently when implanted. + - balance: An implanted Brimdust Sac will stack the buff on you automatically while + on lavaland. Triggering the buff on the station will make you walk slower for + a short duration. + - balance: Implanted Bimrdust Sacs no longer set you on fire, nor do they explode + if you catch fire. + - bugfix: Romerol now successfully converts zombies into the living dead, rather + than the uglier but still dead dead. + LT3: + - qol: Coupons can now be stored in wallets, freeing up inventory space. + Melbert: + - rscadd: Landmines, rather than triggering when you step onto them, will now trigger + when you step off of them. + Rhials: + - admin: You can now select which type of shuttle loan offer will by made when triggering + the shuttle loan event. + Salex08: + - bugfix: wearing earmuffs or being deaf while being asleep will increase the healing + threshold like its supposed to be + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: RPED part display information - bugfix: RPED incorrectly exchanging parts with the wrong tier for datum stock parts - bugfix: RPED unable to install datum stock parts in incomplete machine frames - bugfix: RPED unable to exchange parts for newly constructed machines Tattle: +<<<<<<< HEAD - bugfix: lockboxes' and wrapped crates' invisibility spell has worn off 2022-12-21: +======= + - balance: the foam used in the scrubber overflow has a lifetime of 1s instead of + 8s + - admin: investigate logs include ckey of source (if applicable) + TheBoondock: + - bugfix: fixed a setting air alarm to refill mode would set scrubber to siphon, + thus defeating the purpose of refilling. Now it will set to scrub mode instead. + - bugfix: fixe all art decal giving you bad art moodlet on examine + lizardqueenlexi: + - bugfix: Made the table in Kilostation's QM office reachable. + zxaber: + - balance: Traitors now have two kill and an escape objective for Greentext purposes, + though completing a Final Objective will Greentext too. +2022-12-12: + A.C.M.O.: + - bugfix: Fixed the DNA Infuser's Space Carp infusion, which was not properly granting + its organ set bonus. Having all 4 carp organs infused now makes you space-proof + as expected. + - bugfix: Fixed robotic/surplus limbs not taking damage/healing as expected; including + via the Var Viewer, Player Panel, and from sources of spread-damage. + Autisem: + - bugfix: Teleporters work properly now with circuits + DragonTrance: + - bugfix: The respawn verb now alerts players if respawning is disabled + Fikou: + - imagedel: non parallax space is now black + LemonInTheDark: + - refactor: The logic of how we well, render things has changed. Make an issue report + if anything looks funky, particularly layers. PLEASE USE YOUR EYES + MTandi: + - qol: allowed stacking machine input, output rotation via console + - qol: Biogenenerator biomass overlay uses sine instead of linear interpolation + - rscadd: Fermented drinks give mood buffs according to the stats of fermented fruit + Melbert: + - bugfix: Corrects the look of pinned modules + Profakos: + - bugfix: F.R.A.M.E. cartridges work again + Rhials: + - code_imp: there can now be more than one grey tide event running at once. + ShizCalev: + - bugfix: Fixed a bunch of missing lattices underneath grilles on Delta. + SkeletalElite: + - bugfix: Forced speech from brain damage will no longer trigger the world filter + SyncIt21: + - rscadd: Custom print button for protolathe just like the autolathe + Tattle: + - bugfix: lockboxes' and wrapped crates' invisibility spell has worn off + TheBoondock: + - bugfix: fixed a building a rack with telekinesis results in it being built at + your feet. Now it will be built at where the rack part is + Watermelon914: + - qol: Changed the reputation cap of 'Legendary' on the UI to be at 1400 reputation. + This is the point at which you unlock Final Objectives. This is purely a visual + change. + Zergspower: + - bugfix: Tram Station - Fixes the stray Disposal pipes in Medbay + - imageadd: Containers - New Interdyne Container with new mapping default icon + - bugfix: Containers - unified the apperance of each one, fixed blemishes and stray + pixels + - bugfix: MetaStation - Removes stray pipe found under the courtroom door + etherware-novice: + - rscadd: forensics scanner can read id access + - balance: forensics scanner can detect transforming items + - code_imp: forensics scanner was rewritten, items can add their own data to the + log + - rscadd: holiday specific posters (only a few now) + lizardqueenlexi: + - bugfix: Admin removal of Heretic status no longer makes a sound. + - bugfix: Made the external smartfridge in the Tramstation pharmacy accessible from + inside. + - spellcheck: Improved "Steal Heirloom" objective description. + necromanceranne: + - code_imp: Makes a lot of the bodypart variables clearer as to what they do. Includes + more detailed code comments. + - bugfix: Robotic limbs are no longer immune to being disabled through reaching + maximum damage. + san7890: + - bugfix: Nanotrasen will now no longer mount the HoPline's Ticket Machines on windows + for Meta, IceBox, and Tram. + - bugfix: When you examine a mecha, you should now no longer see two integrity messages. +2022-12-13: + Ghommie: + - rscdel: Removed object rotation related verbs, overwhelmingly overshadowed by + the click shortcuts anyway. + Jacquerel: + - rscadd: Tell your crew how much you care by ordering a shuttle where half of the + seats have been removed so that you can get some angling done before you clock + out. + LT3: + - balance: Getting hit by the tram may now break some of your bones, or more. Be + careful! + Sealed101: + - bugfix: fixed Advanced Scanning Modules Calibration Experiment not registering + upgraded machines to its progress + SyncIt21: + - qol: creating a shard is possible + - rscadd: TGUI for RCD Just like Rapid Pipe Dispenser + - rscadd: Radial menu for RLD + - code_imp: silo link upgrades for both RLD & Plumbing RCD + - rscdel: Switch Mode, Window Glass, Airlock action icons for construction console + - refactor: FURNISHING , FRAMES & SIMPLE_CIRCUITS are banned upgrades for RLD & + Plumbing RCD + tralezab: + - qol: Regal rats are on the orbit menu +2022-12-14: + Fikou: + - rscadd: lathes now print empty welders and extinguishers + Floofies: + - bugfix: Fixed a stray-tab typo in "item_heal_robotic" + - bugfix: Fixed reagents and other effects which were inappropriately affecting + robotic limbs. + - code_imp: Refactored all of reagents code to be more readable and maintainable. + GoldenAlpharex: + - bugfix: Everything that goes on the tram should look a lot less flat now! + Jacquerel: + - rscadd: The followers of Regal Rats will now respond to simple instructions, if + given by their rightful lord. Except frogs. They're too busy licking themselves + and watching the colours. + JohnFulpWillard: + - qol: Experiment handlers now give a more reasonable explanation for why they can't + find a server. + - admin: Machines being disconnected from techwebs is now logged in research. + LemonInTheDark: + - rscadd: Adds a grace period for hit detection, between clicking ON someone, and + then moving your mouse off before releasing the click. It's short, hopefully + it helps with stupid + TheWolfbringer: + - bugfix: You can now access the coffee beans and cigarettes at Deltastation's Engineering + breakroom +2022-12-15: + 1393F: + - bugfix: the pill dropped by the shadowperson legion corpse now has enough mutation + toxin to work + Fikou: + - bugfix: fixes modsuit icons + - rscadd: you can flip eyepatches + - bugfix: blindfolds now take into consideration both eye colors for their color + Melbert: + - bugfix: Dufflebag Curse no longer lasts forever after the bag is destroyed. + - bugfix: Dufflebag Cursing someone already afflicted properly doesn't try to add + the curse again + - refactor: Refactored how bar drinks set their icons. Juice boxes now use the same + system. + ShizCalev: + - code_imp: We now unit test all /obj's for missing icons. :) + Wayland-Smithy: + - bugfix: Instant summons spell now safely and reliably retrieves items from inside + of anchored containers. + etherware-novice: + - bugfix: switching to species without hunger clears hunger moods + necromanceranne: + - bugfix: Stops strong enough explosions from bricking the objective energy guns + permanently. + san7890: + - bugfix: The message you get when attempting to escape an SM delamination by hiding + in a disposals pipe should now make more sense. +2022-12-16: + Jolly: + - qol: MegaSeed vendors had their seeds distributed through 4 categories; Fruits, + Vegetables, Flower and Miscellaneous. + etherware-novice: + - refactor: moved some description edits to examine hooks + timothymtorres: + - rscadd: Drinking singulo will now ignore supermatter hallucinations and pull objects + to you + - balance: Change singulo drink recipe to require liquid dark matter instead of + radium. +2022-12-17: + Fikou: + - qol: you can see your combat mode status as a simple or basic mob, and you can + see your health as a basic mob + - qol: status panel updates three times as fast + - bugfix: shipping containers go above mobs + - bugfix: fixes hollow survival pod window spawners +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: After 3 years of complaints at CentCom's uniform department. Paramedics have been given a jumpsuit/skirt that can be adjusted around their waist instead of just folding it's sleeves, making surgery easier for their fellow doctors. +<<<<<<< HEAD SkyratBot: - rscadd: The followers of Regal Rats will now respond to simple instructions, if given by their rightful lord. Except frogs. They're too busy licking themselves and watching the colours. - bugfix: When you unwrench a flag, you should now no longer see the big flashy red ERROR sign. +======= + Holoo-1: + - bugfix: Moves virology fridge on nukie base in to a wall + LemonInTheDark: + - code_imp: Roundstart "starting" should be much snappier now + NamelessFairy: + - admin: Stuffing people inside lockers is now logged. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Admin fax report names now default to standard report rather than standart. - rscdel: Central Command can no longer be faxed directly from fax machines. - spellcheck: Replaced the ability to contact central command directly by being able to contact a randomly selected nanotrasen department. +<<<<<<< HEAD - bugfix: Machine frames will no longer ask for "s" in place of some components 2022-12-22: LT3: @@ -700,6 +1282,34 @@ - rscadd: Add space vines prevent solar panels from working (except ones with the transparent mutation) - rscadd: Add new space ruin - Cyborg Mothership. All hail the master race! +======= + PositiveEntropy, AxieTheAxolotl: + - imageadd: Resprites every revolver! + - imageadd: Adds the Syndicate Revolver, a visually new, but mechanically identical + .357 revolver to uplinks! + jlsnow301: + - bugfix: ERTs should now be properly grouped in the orbit UI + - bugfix: Orbit heatmap should be now working properly. + raffclar: + - qol: Improve NtOS notepad +2022-12-18: + ShizCalev: + - bugfix: Camo deagles have the proper icons again. + SkeletalElite: + - bugfix: The HOS and syndicate berets have had their missing armor and strip delay + readded + Tattle: + - bugfix: crafted foods are logged in the blackbox once more + Time-Green: + - bugfix: Podperson hair isnt fugly anymore + - code_imp: External organs now support different colors for different layers +2022-12-19: + Fikou: + - bugfix: fixes timid kudzu being weird on multi z + - balance: limits the power miners the dusty shard can summon to charger, protector, + ranged, standard and support + GoldenAlpharex: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the *hand emote, which you can offer to someone standing up in order to give them the possibility to grab onto your hand and let you drag them away, or to someone lying down to help them back up, which always makes everyone involved @@ -708,6 +1318,7 @@ alert code, to make it require a lot less copy-paste to handle new cases. - bugfix: Offering a kiss no longer requires the receiver to have free hands to accept said kiss! +<<<<<<< HEAD - bugfix: Nanotrasen will now no longer mount the HoPline's Ticket Machines on windows for Meta, IceBox, and Tram. - bugfix: Moves virology fridge on nukie base in to a wall @@ -741,6 +1352,45 @@ - bugfix: fixed name of Featherful moth wings sprite. Now they actually have a sprite! SkyratBot: - qol: Improve NtOS notepad +======= + Jacquerel: + - bugfix: Rats will once again attempt to attack windows or other dense objects + separating them from their targets. + - rscadd: Mice will now run away from you, you have to catch them if you want to + eat them. Use those traps! + - rscadd: Rabbits, Sheep, and Pigs likewise won't just sit there and let you pulverise + them if they can see an escape route. + JohnFulpWillard: + - bugfix: Gibbers no longer show up twice in their techweb node. + Melbert: + - bugfix: Detective Scanner can scan stuff that contains blood again. + Profakos: + - bugfix: in the round end report, progression points are converted to reputation + ShizCalev: + - spellcheck: Corrected some grammar issues with messages displayed when shoving + people into lockers. + - admin: Fixed shoving people into a locker not being combat logged properly. + TheBoondock: + - balance: fixed chameleon vest not being able to hold any kind of gun + Thunder12345: + - bugfix: Machine frames will no longer ask for "s" in place of some components + carshalash: + - balance: Gatfruit seeds will no longer drop from ice portals. + flowercuco: + - bugfix: CentComm has noticed that the research director has been hoarding turtlenecks, + corrective action has been taken + lizardqueenlexi: + - bugfix: Non-human characters will not sometimes display an incorrect level of + blood loss on examine. + san7890: + - bugfix: When you unwrench a flag, you should now no longer see the big flashy + red ERROR sign. +2022-12-20: + Jacquerel: + - bugfix: Rats won't continue attacking someone they've been ordered to kill past + the point of death. + MidoriWroth: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds 32 new foods! - rscadd: You can make vinegar from equal parts water/sugar/wine - rscadd: Tortillas can now be grilled to make hard-shell tacos, which can be used @@ -748,6 +1398,7 @@ - balance: Uncooked rice is now made from mixing 10 units rice/water in any container, no longer requiring a bowl to do so. Recipes that previously used bowls of rice now need boiled rice and a bowl, instead. +<<<<<<< HEAD - code_imp: Roundstart "starting" should be much snappier now Tattle: - bugfix: crafted foods are logged in the blackbox once more @@ -768,11 +1419,64 @@ - bugfix: You can now adjust medical scrubs for easier surgery on your fellow doctors. Improvedname: - bugfix: fixes deltastation vent at brig entrance +======= + fikou: + - rscdel: chaos holoparasite + - rscadd: gaseous holoparasite, it can expel various gases from its body and stabilizes + the users temperature +2022-12-21: + ATHATH: + - bugfix: Pillow smothering now checks to see if the SMOTHEREE has a head, not the + SMOTHERER. + EvilDragonfiend: + - bugfix: vendor no longer shows glass icons in a specific condition + Fat bugs bunny: + - rscadd: Added a glass jaw quirk, that leaves you prone to being knocked out when + hit on the head. + LT3: + - qol: Tramstation medbay treatment center now has a tram collision counter. + Rhials: + - bugfix: briefcases no longer disappear after being unlocked + ShizCalev: + - spellcheck: Fixed the thermomachine stating "You set the color" for everyone that + could see it. + - bugfix: Santa now spawns with the actual space capable hat again! + - bugfix: Fixed the claustrophobia trait not recognizing Santa's real hat. + - bugfix: Fixed secure briefcase and wall safes not sending icon update signals + properly + SyncIt21: + - bugfix: ghosts cant mess with RCD & PLumbing RCD + etherware-novice: + - qol: examine your uplink for code + - rscadd: lawyer-based photocopier blanks + flowercuco: + - qol: added makeshift surgery screentip + - qol: you no longer have to go in and out of harm intent to do surgery with a bedsheet + san7890: + - admin: The "Reset Thunderdome" option in the Secrets Menu now respects you closing + out of the confirmation screen as a way of cancelling your potential thunderdome + reset, rather than proceeding immediately. It should also be easier to comprehend + as well. + timothymtorres: + - rscadd: Add space vines prevent solar panels from working (except ones with the + transparent mutation) + - rscadd: Add new space ruin - Cyborg Mothership. All hail the master race! +2022-12-22: + Big chungus wholesome 100: + - bugfix: Amputated and reattached limbs now get wounded based on their own biology, + not the current owner's biology. + Guillaume Prata: + - bugfix: The Quartermaster has their own garment bag now, like everyone else at + Command. + Guillaume Prata, Imaginos16: + - bugfix: You can now adjust medical scrubs for easier surgery on your fellow doctors. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Nar'Sie will no longer bring upon the construct apocalypse when they encounter a chicken after one of the invokers were destroyed - bugfix: The Singularity should no longer stop gibbing people when whoever created it was destroyed +<<<<<<< HEAD - bugfix: Detective Scanner can scan stuff that contains blood again. Rhials: - qol: Shadow Jaunter users now receive a brief warning before walking into light @@ -823,10 +1527,18 @@ - rscadd: lawyer-based photocopier blanks - admin: Admins can now enable a custom hostile environment that prevents the shuttle from leaving. +======= + NamelessFairy: + - qol: You can now reduce the range of View Sensor circuits. + Watermelon914: + - bugfix: Fixed final objectives not displaying the UI buttons. + Y0SH1M4S73R: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Adds a new function for admin lua scripting, "over_exec_time", for checking if lua code is running close to the execution limit. Details are available in the lua editor's help menu. - admin: The execution limit is described in detail in the lua editor's help menu. +<<<<<<< HEAD - bugfix: fixed dice servants not receiving any indication of who their master is Tattle: - bugfix: Wrapping balloon alerts are shorter and no longer contain spans @@ -854,11 +1566,21 @@ properly SkyratBot: - bugfix: admins can now select pirate events correctly +======= + ZephyrTFA: + - admin: New mapping verb to load lazy templates as needed. In your admin tab under + the Mapping category. + san7890: + - qol: The Traitor's Antagonist Panel's Unlock and Failsafe entries will only appear + if there is an Unlock/Failsafe Code to display. + timothymtorres: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add language variety to machines that speak. You can also pulse the vendor language wire to make it switch languages or EMP a machine to get the same effect. - rscadd: Shambling cola vendors will now speak a different language each time they talk. Syndicate vendors will now speak codespeak. Beach vendors will now speak beachbum. +<<<<<<< HEAD - bugfix: fixed saline drip UI not having transfer rate controls visible - bugfix: xmas crackers are now tiny instead of normal sized - bugfix: fixed sm activation logging. @@ -877,6 +1599,24 @@ Erol509: - imageadd: 'New Teshari winter coat sprites for: cargo, robotics, chemistry' - bugfix: Teshari satchels works again +======= +2022-12-23: + Fikou: + - bugfix: fixes kilo not having xmas trees + - bugfix: fixes simple/basic mob damage sounds in some places + - bugfix: fixes bald and shaved santas + Iamgoofball: + - bugfix: Fixes access_view on goodies not being respected by anything other than + department budget orders + Improvedname: + - rscadd: Adds some costumes to autodrobe + - bugfix: fixes deltastation vent at brig entrance + Jacquerel: + - rscadd: Mice who are fed cheese by hand will accept humans as friends, at least + until reminded otherwise by their rightful lord. + - bugfix: Fixed a runtime preventing mice from acting correctly when trying to flee + and also eat cheese at the same time. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tram windows are now properly flush with the tram walls. - imageadd: Tram shuttle seats have been replaced with benches so people can sit @@ -885,6 +1625,7 @@ of the map itself. - code_imp: The tram floor tiles are now in a tram floor subtype instead of the map itself. +<<<<<<< HEAD OrionTheFox: - bugfix: fixed missing sprite on monkey cube and donk boxes SkyratBot: @@ -930,12 +1671,218 @@ theme I think it's been going for. - rscadd: The alien tool lab ruin has been changed to be a bit more interesting than a box full of a full set of alien level tools. +======= + ShizCalev: + - bugfix: There is now a message clarifying that you've been KICKED from the game + when the keysend flood autokick triggers. + - bugfix: Deaf mobs will no longer see PDA ringtones when a PDA receives a message. + SyncIt21: + - bugfix: correctly update canister appearance + - rscadd: Gas sensors recipe to RPD + - code_imp: linking all the stuff via multitool + - qol: make your own tank instead of moving around canisters + iwishforducks: + - rscadd: Pride pin quirk! Start the shift off with a pride pin in-hand. + - qol: Pride pins can be infinitely reskinned now. + lizardqueenlexi: + - bugfix: Fixed a couple of incorrect defines for mech categories. + mc-oofert: + - code_imp: Turned most syndicate mobs into basicmobs, making their AI better and + (possibly) more deadlier! + - rscdel: Removed syndicate mech pilots and syndicate civvies + san7890: + - bugfix: Bar/Restaurant Bots should no longer spam orders forever. + - bugfix: After a recent mishap with a high-ranking Syndicate operative, the uplink's + unlock code and failsafe code (the one that makes it blow up if you say it) + should never turn out to be the same. + vincentiusvin: + - bugfix: fixed sm activation logging. + winterboekje: + - spellcheck: drastically improves grammar for inserting something during organ + manipulation +2022-12-24: + Mothblocks: + - bugfix: The briefcase in the MetaStation vault now contains the (surprisingly + good) spoils it's supposed to. + NamelessFairy: + - admin: Admins can now enable a custom hostile environment that prevents the shuttle + from leaving. +2022-12-25: + Iamgoofball: + - bugfix: Dead people are no longer counted as crew when determining if 65% of the + station is revs for the auto-shuttle call + Jacquerel: + - bugfix: Pacifists can now hit people with pillows and holographic weapons, as + well as participate in boxing. + Jolly: + - code_imp: The lists in admin_verbs.dm was organized to be made better. This shouldn't + affect the panels admins use at all, since they're already alphabetized. + LemonInTheDark: + - bugfix: Using optimized multiz on > 2 z layer maps will no longer cause fucko + bungo + Melbert: + - qol: The preview dummy in the preferences menu now shows some visual quirks, like + Heterochromia or nearsighted. + - bugfix: Fixed some quirks which read a preference roundstart not applying the + preference. + - refactor: Refactored some bits of quirk datums and the quirk application process. + - bugfix: Husked bodies look husked again + Profakos: + - qol: the security department delivery crates are now have to be opened in the + security office, where the crates are delivered + Rhials: + - admin: anomaly events now give the option to occur at your current location when + triggered with the Trigger Event admin verb + - bugfix: Racks now properly construct again + - qol: Shadow Jaunter users now receive a brief warning before walking into light + and being forcibly un-jaunted. + Striders13: + - bugfix: fixed dice servants not receiving any indication of who their master is + Tattle: + - bugfix: all of the barstools on the Emergency escape shuttle are equipped with + a seatbelt + - bugfix: Wrapping balloon alerts are shorter and no longer contain spans + Unit2E: + - bugfix: Tinacusiate is now possible to make again. + ZephyrTFA: + - refactor: armor, from the ground up basically + etherware-novice: + - bugfix: added descriptions for holodeck floors and comp/mach frames + flowercuco: + - rscadd: during holidays the spread syndicate propaganda through posters objective + has a chance of spawning evil holiday poster + - bugfix: framework for holiday posters is more functional and modular + - code_imp: contraband.dm file and contraband.dmi file are both now poster.dm and + poster.dmi + lizardqueenlexi: + - bugfix: Implemented "jelly eyes" to make jellypeople and stargazers use the proper + eyes sprite. + mc-oofert: + - bugfix: You can now add mutations to advanced injectors without having an occupant + inside + robotduinomm: + - qol: drones now start with engineering skillchip. + - qol: drones can now interract with light boxes, rack parts, light replacers and + stack of duct. +2022-12-26: + MTandi: + - bugfix: fixed saline drip UI not having transfer rate controls visible + - qol: Rewrote the crafting/cooking menu UI + - qol: Split crafting and cooking menus in two different menus + - qol: Crafting is no longer blocking the entire UI, only the "Make" buttons are + disabled + - qol: Added stack crafting recipes to the crafting menu + - qol: Added cooking recipes that were absent in the crafting menu before (tool + recipes, machine recipes, reactions) + - qol: Added option to search recipes by title + - qol: Added option to filter recipes by required materials/ingredients + - qol: Added food types to the cooking menu, highlighting diet of your species (liked, + disliked foods) + - qol: Added total nutrition value of the result to the cooking menu + - qol: Added option to filter cooking recipes by the food type of the resulting + food + - qol: Added "Can make" category that lists all currently craftable recipes throughout + all categories + - refactor: changed categories and reshuffled some items in them + - code_imp: Reagents now have default container to get an icon from the reagent + datum + - code_imp: Objects now have `desc_controls` var for OOC information about mouse + controls that are visible on examine, but not in the description + - bugfix: Fixed alignment on many food icons + - bugfix: Fixed missing icon for beef stroganoff + - bugfix: The maps are now placed in the center of Z level to avoid having parts + getting into the inaccessible area + Rhials: + - rscadd: Sandstorm random event! A random side of the station is pummeled by an + onslaught of sand and dust. If you hear that one is approaching, grab a welder + and some iron to help with repairs! + - rscadd: Space sand! It's weak and doesn't hurt reinforced walls, but shouldn't + be underestimated in high quantities. + - code_imp: You can now pass a start direction to the spawn_meteors/spawn_meteor + global procs. + Wayland-Smithy: + - bugfix: Cult spirt realm ghost marking now works again. + flowercuco: + - bugfix: admins can now select pirate events correctly + iwishforducks: + - balance: You can now place plating adjacent to already existing plating without + having to place rods first. + kawoppi: + - bugfix: xmas crackers are now tiny instead of normal sized + san7890: + - bugfix: To prevent spam, there is now a cooldown on being able to upload assorted + books into the newscaster's channel feed. +2022-12-27: + Fikou: + - bugfix: guardian spirits check for death before they add themselves to you + - admin: admins can now give someone a holoparasite through a new menu in vv dropdown + - qol: alt click holopara abilities were moved to right click + - qol: support holoparas heal with right click + - admin: holoparas have less hardcoded stuff so admins can edit them easier + - qol: holoparasites now get their light color from their guardian color + - bugfix: holoparasites no longer have the hostile faction, things will attack them + - bugfix: holoparasites fly over chasms and stuff properly again + - qol: holoparasites update their health every time the summoner gets damaged, rather + than every 2 seconds. they also instantly react to the summoner's death, deletion + and have a screen overlay of how damaged the summoner is + - qol: holoparasite creation now uses a radial menu with tooltips for each subtype, + as such, the guide papers no longer exist. it also shows ghosts which type you + picked + - bugfix: holoparasites can no longer be fugu'd + - bugfix: fixes overlay lighting runtiming if deleted during a signal queue + - bugfix: fixes negative gravity being weird, and gravitokinetic holoparasite's + turf slams not working + - bugfix: fixes invisible info tooltips for radial menus + - admin: you can now make holoparas not controlled by anyone + Guillaume Prata: + - bugfix: Metal Hydrogen/Elder Atmosian suits can carry a MH Axe on its suit slot + now. + Jacquerel: + - rscadd: Carp will now run away if their health gets low, meaning they may have + a chance to regenerate. + - rscadd: Lia will now fight back if attacked instead of letting herself get killed, + watch out! + - balance: Magicarp will now aim their spells more intelligently. + - rscadd: Tame Magicarp can be ordered to use their spells on things. + - refactor: Carp are now "Basic Mobs" instead of "Simple Mobs" + - bugfix: Dehydrated carp no longer give you a bad feeling when they're your friend + and a good feeling when they're going to attack you. + - balance: Tamed carp are now friendly only to their tamer rather than their whole + faction, which should make dehydrated carp more active. Order them to stay or + follow you if you want them to behave around your friends. + Melbert: + - refactor: Drowsiness and Blurred Eyes are now tracked via status effect. +2022-12-28: + Fikou: + - balance: standard holoparasites and assassin holoparasites in stealth mode can + deal wounds + - balance: you can now ride charger holoparasites + - balance: charger holoparasites have a bit less armor and speed + - bugfix: you can correctly redirect yourself with neurotoxin as a xeno + - bugfix: you can see your active hand correctly as xeno + - bugfix: fixes moonicorns not applying pax + - imageadd: tweaks the ninja modsuit helmet + Jacquerel: + - bugfix: Space Carp can now breathe in space + Melbert: + - bugfix: Wedding dresses no longer render their shoes over the dress + - bugfix: Things which have inv flags set should more consistently actually hide + the things they mean to hide + - bugfix: Silver foods correctly spawn things grilled and fried + - bugfix: Ethereals and Flypeople and Aliens who learn Uncommon language can speak + it with their tongues like they could speak Common, no this doesn't mean they + can naturally speak or understand Uncommon + - refactor: Refactored how tongues set up their languages lists + - rscadd: You can now high five people with (non-cult) touch spells! Maybe be careful + high-fiving a wizard who knows Smite. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - rscadd: 'Dogs will now occasionally bark at their two mortal enemies: felinids and mailmen' - bugfix: Dogs set to attack will now only close within 3 tiles of their target, and must be approached further by their target (or pushed next to their target) to actually attack +<<<<<<< HEAD ShizCalev: - bugfix: Camo deagles have the proper icons again. - spellcheck: Fixed the thermomachine stating "You set the color" for everyone that @@ -981,3 +1928,110 @@ - bugfix: fixes pod blood I swear - admin: Integrated Circuits now have an admin only subtype, functionally the same as VVed regular circuits. +======= + Time-Green: + - bugfix: Pride pin quirk works roundstart + ZephyrTFA: + - bugfix: War can once again be declared + san7890: + - rscadd: WOULD YOU EAT THE TOILET SANDWICH (LOCATED IN DELTASTATION'S MEDBAY BREAKROOM + RESTROOM) FOR FIVE DOLLARS? TEST IT OUT NOW! +2022-12-29: + Comxy: + - refactor: Refractors the frog into a basic mob + FernandoJ8: + - code_imp: Removes a rendundant call of create_internal_organs() from the /mob/living/carbon/human/Intialize() + - bugfix: The burden level of Burdened Sect chaplains is now updated properly when + their negative mutations are healed with mutadone + Fikou: + - qol: some modsuits now have some modules pinned by default + - bugfix: throwing no longer gets canceled if theres a mob buckled to the thrown + thing + - admin: adds an admin combat-ready miner outfit + Guillaume Prata: + - rscadd: Geneticists figured out how to infuse goliath DNA into humanoids! (Many + monkeys were harmed in the process!) + - rscadd: Goliath eyes for nightvision, lungs to breath at lavaland safely, heart + to protect you from ash storms and the brain which turns one of your arms into + a tendril hammer. + - rscadd: 'Tendril hammer: Your arm becomes a giant mass of plate and tendril but + it won''t fit on gloves anymore. While slow to swing around, you can obliterate + fauna/megafauna with it, 20 base dmg + 80 bonus damage to fauna/megafauna with + a bonus knockback.' + Melbert: + - bugfix: Det's scanner sees fibers again + - bugfix: Did you know items have a 1.2x chance of getting fibers attached? Well + it's been broken, now it's fixed + Salex08: + - bugfix: transparent and timid kudzu mutations wont block light + - bugfix: Adds missing christmas tree to tramstation + Time-Green: + - bugfix: replicapods no longer sometimes have infinite spawns + Wallem: + - qol: Smokers rejoice, you no longer need to mill through your cigarette packet + to get your lighter out. Alt-Click a cigarette packet to extract a lighter from + it, if you've put it in there. Right-Clicking will still take out a cigarette. +2022-12-30: + BlueMemesauce: + - spellcheck: fixed a bug where latejoin menu would display incorrect number of + open slots + Iamgoofball: + - bugfix: The nuke ops base begins lazy loading as soon as the first hijack stage + is completed so as to avoid upwards of 30 second delays on the shuttle docking + after the timer hits 00:00 due to server lag. + Jacquerel: + - rscadd: Ian has learned some new tricks, tell him what a good boy he is! + - rscadd: Ian will come on a walk with you, if you are his friend. + - refactor: Ian's tricks work the same way as some other mobs' tricks and should + be extendable to future mobs. + - bugfix: Dogs no longer run at the maximum possible speed for a mob at all times. + - rscadd: When Ian gets old, he also slows down. Poor little guy. + - rscadd: Dogs will no longer dislike the presence of Felinids who have taken the + time to befriend them. + LemonInTheDark: + - rscadd: Starlight is more potent now, and slightly blue + - rscadd: The lights from fire alarms will be dimmer and lower range, with alarms + themselves being brighter. Hopefully it vibes + - bugfix: Starlight will actually show now, instead of just being replaced by fullbright + most of the time + - bugfix: Emissive lighting will once again work. Sorry lads + Mothblocks: + - qol: Several balloon alerts have been changed to be more consistent. + NamelessFairy: + - admin: Integrated Circuits now have an admin only subtype, functionally the same + as VVed regular circuits. + Salex08: + - bugfix: using chemicals on botany wont have unrelated side effects + Time-Green: + - bugfix: fixes pod blood I swear + jlsnow301: + - bugfix: Blob minions are now sorted into biohazards in orbit UI. + - rscadd: Blobs now get antag info screens. + - rscadd: Blob minions get objectives (protect the core!). + - rscadd: Adds blob style text for victories, etc. + - refactor: Refactors some blob & blob minion code. + kawoppi: + - qol: the metastation custodial closet can now be found using the navigate verb + san7890: + - qol: Ghosts are freely able to go between abductor ships now. +2022-12-31: + ChungusGamer666: + - rscadd: Meth becomes bluer the higher the purity + Ebin-Halcyon: + - imageadd: The wendigo has been resprited + Jacquerel: + - rscadd: New station traits can vary how large and comfortable the station escape + pods are. + Salex08: + - bugfix: indestructible windows cant be destroyed by ingame means anymore + Tattle: + - rscadd: chocolate boxes now contain bonbons (formerly tiny chocolates), truffles, + and peanut butter cups + - balance: changed the sugar in clown cakes' food_reagents to banana juice + - balance: increased the amount of vitamin in pound cakes + - bugfix: slices of bread now taste like their respective breads instead of tasting + "indescribable" + - bugfix: fiesta skewers are now MEAT and VEGETABLES + mc-oofert: + - bugfix: Basicmobs can no longer shoot mobs inside indestructibles +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-01.yml b/html/changelogs/archive/2023-01.yml index 6688849eb70..8be5b3dca9b 100644 --- a/html/changelogs/archive/2023-01.yml +++ b/html/changelogs/archive/2023-01.yml @@ -1,4 +1,5 @@ 2023-01-01: +<<<<<<< HEAD Guillaume Prata: - rscadd: Geneticists figured out how to infuse goliath DNA into humanoids! (Many monkeys were harmed in the process!) @@ -82,6 +83,60 @@ ShizCalev: - bugfix: Dual sabers will no longer get covered in blood when attacking someone. SkyratBot: +======= + ChungusGamer666: + - bugfix: Static light sources update properly now when carried by a mob. + Fikou: + - rscadd: Venom antag + - bugfix: fixed pellet clouds (buckshot, improv shells) dealing insane wounds to + armored people + LemonInTheDark: + - admin: Added a new chat category for prayers. Filter them out, move them to their + own pane, live your best life + NamelessFairy: + - bugfix: CTF downtown's red hat store's beret is now red again rather than green. + Rhials: + - balance: Instant Summons will now violently tear out embedded objects as they + are summoned, and will drag embedee to you if nearby. + SyncIt21: + - bugfix: atmos control can detect distro & waste loop sensors + jughu: + - bugfix: Fixes missing hop ticket incremement button at icebox + san7890: + - bugfix: There is no longer a floating camera on RuntimeStation +2023-01-02: + FernandoJ8: + - bugfix: Stranger Reagent can no longer be a componet in Metalgen + Fikou: + - qol: examining armor tags now shows you the wound armor value + Gorock: + - qol: Improved Chem Dispenser Reagent Search + Helg2: + - bugfix: smoke spell becomes robeless + Improvedname: + - bugfix: fixes cummerbunds holding 7 items instead of 3(as fannypacks do) + Jacquerel: + - rscadd: You can now bake croissants to add to your breakfast. + - rscadd: Traitorous chefs can bake dangerous throwing croissants, Mimes can do + this and gain the additional benefit of a deadly combat baguette. + JohnFulpWillard: + - bugfix: Researching now checks the techweb it's linked to for node availability, + rather than only the Science one. + - imageadd: Nukie tablets are now using PDA sprites w/ GAGS instead of tablets. + Melbert: + - bugfix: Secrets menu Summon Guns / Summon Magic work again. + ShizCalev: + - bugfix: Dual sabers will no longer get covered in blood when attacking someone. + Tattle: + - bugfix: projectile hits on mobs are logged globally + ZephyrTFA: + - bugfix: You can inspect armor again + san7890: + - bugfix: Those with kitchen access should now once again be the only one who are + allowed to vending-machine-restock individual snacking items via their trusty + tray. + vincentiusvin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: rescaled supermatter health from 900 to 100. - balance: we didn't do a 1:1 rescale of the damage though, atmos based damage should be slightly higher across the board but have lower caps. All external damage @@ -90,6 +145,7 @@ between different delams so we have an easier time changing the code. - qol: added a delta symbol to the SM UI on damage and energy breakdown to denote that they are actually changes instead of exact values. +<<<<<<< HEAD - qol: Improved Chem Dispenser Reagent Search - bugfix: smoke spell becomes robeless - bugfix: Researching now checks the techweb it's linked to for node availability, @@ -103,6 +159,13 @@ - rscadd: You can now bake croissants to add to your breakfast. - rscadd: Traitorous chefs can bake dangerous throwing croissants, Mimes can do this and gain the additional benefit of a deadly combat baguette. +======= +2023-01-03: + FernandoJ8: + - bugfix: Boxes created through the crafting menu no longer spawn with their contents + full + Fikou: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: adds more ammunition, and also signing on the psyker ship - qol: you can see other echolocation receivers as fully purple now, rather than just their outline @@ -110,6 +173,7 @@ able to see echolocated tiles - rscadd: psyker pirates have headsets that increase their echolocation range - bugfix: partially fixes the psyker ship shuttle docker +<<<<<<< HEAD - imageadd: Nukie tablets are now using PDA sprites w/ GAGS instead of tablets. - qol: some modsuits now have some modules pinned by default dawsonkeyes: @@ -533,6 +597,9 @@ allowed to vending-machine-restock individual snacking items via their trusty tray. - qol: Pinpointers now tell what they are tracking when examined +======= + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Mining order consoles are now named 'order console'. - qol: Orders from said mining order consoles can now no longer be cancelled, and are listed as 'mp' (mining points) in the Cargo console instead of 'cr'. @@ -540,6 +607,7 @@ - bugfix: Departmental orders can no longer be cancelled through the NTos cargo application. - bugfix: Wearing an ID will no longer break order consoles. +<<<<<<< HEAD - bugfix: You should now no longer get a confusing message whenever you try to add flour from a flour sack into a bowl. - bugfix: you can nolonger use a goldgrub as a shield to kill colossus @@ -684,6 +752,37 @@ LT3: - soundadd: The Skyrat vote notification sound is back - admin: Changed admin comm/fax notification sound to be less confusing +======= + LT3: + - qol: Tram controls unlock faster on arrival at a station + - imageadd: Minor improvements to station wayfinding signage + Mothblocks: + - admin: Added config for disabling station traits + RedBaronFlyer: + - soundadd: Added a new sound for stamping papers with a stamp. On an unrelated + note, there are reports of stamp-based suicides becoming more noisy. + ShizCalev: + - imageadd: Added a bunch of missing suit storage item icons! There's still a number + left to make, but we're getting there! + Xander3359: + - balance: Origami kit costs 4 from 14, and is available at 100 reputation from + 150. + lnGoror: + - bugfix: fixed pAIs and simplemobs getting deaf when moving out of a headwear slot. +2023-01-04: + Addust: + - admin: The Shuttle Manipulator now has descriptions for the Infiltrator, the shuttles + that spawn in space ruins, and the escape pods. + Fikou: + - qol: makes modsuits with magboots have those pinned by default, pins active modules + on the admin suit, mining suit and the additional module of the ert suits + Iamgoofball: + - bugfix: Adds an engraving to the staff of healing regarding proper healing beam + usage. + Improvedname: + - bugfix: Adds missing contrabrand spawners to deltastation locker + - bugfix: fixes being able to instantly build carving blocks/mineral doors +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Roundstart captains will now memorize the code to the spare ID safe. - rscadd: Traitors will now memorize the location and code to their uplink. @@ -696,6 +795,7 @@ - rscadd: Planting bombs now increase their memory quality depending on how cool the bomb is. - refactor: Memories have been refactored to be much easier to add. +<<<<<<< HEAD Paxilmaniac: - rscadd: A set of greyscale overalls has been added to the loadout menu in the suits section @@ -718,6 +818,125 @@ - qol: Rulebook for TGC has been added to the TGC arena. - bugfix: Holographic TGC coins are no longer legal tender and cannot be inserted into your ID. +======= + NamelessFairy: + - qol: Drone dispensers now tell you how much material they need per drone. + ShizCalev: + - bugfix: You'll now point when freaked out about something. + - code_imp: Added a unit test for ALL worn icons. + - bugfix: Fixed a bunch of broken worn icons! + - bugfix: Fixed a minor runtime which occurred when an airlock got deleted if an + AI was actively hacking it. + Time-Green: + - rscadd: You can now fly around the shuttle during transit! Woohoo! You can either + cling to the side or grab a jetpack and try and keep up with the shuttle! Carps + can move around freely in hyperspace + - qol: Increased shuttle hyperspace size from 8 tiles to 16 + jlsnow301: + - rscadd: 'Hope you saved for a rainy day: Added the ''Cursed'' quirk which causes + excessive slippage and... other difficulties.' + - bugfix: Fixed blob minions getting their own antag category + tralezab: + - bugfix: Removed some cheese strategies from burdened sect. +2023-01-05: + Kylerace: + - bugfix: tram consoles will no longer randomly depower if they return from an area + without power + MTandi: + - qol: Biogenerator shows default reagent containers instead of beakers + Mothblocks: + - bugfix: Fixes a bunch of cases of windows not being where they were supposed to + be, tables/chairs stacking on each other, and other very small stuff you've + never noticed before. + ShizCalev: + - bugfix: Crew AIs can no longer interact with ANY syndicate machinery (ie shuttle + computers, buttons, ect.) + - bugfix: Crew AIs can no longer attempt to track mobs on the syndicate base to + determine the gamemode. + - bugfix: Fixed Black Carpet and Paper Frames crafting recipes only giving you 1 + item in return. + ZephyrTFA: + - server: Preferences now support guests + kawoppi: + - rscadd: added reagent splashing animation for spilling reagents on things + - rscadd: added reagent splashing animation for spilling reagents onto floors + - rscadd: added reagent splashing animation for pouring reagents into hydroponics + trays + - soundadd: slosh sound now plays when spilling reagents on things, both directly + and by throwing + mc-oofert: + - rscdel: Removed Mining LTSRBT + - balance: Mining Vendors express option now has no cost changes and no cooldown, + but cargo delivery option is now 35% cheaper to encourage miners communicating + with cargo techs + san7890: + - code_imp: Nanotrasen has updated the copyright on their NToS Software to be valid + for the New Year! (It's 2563 now!) +2023-01-06: + LT3: + - admin: Admins can now get an audible alert for communications console messages + coming from the bridge + - spellcheck: Fixed an incorrect line in preferences readme.md + Salex08: + - bugfix: fixes not properly working checks with hydroponic reagents + ShizCalev: + - bugfix: You'll no longer see rotation failed messages when clicking on something + far away. + Tattle: + - bugfix: alien closets now deconstruct into alien alloy + Unit2E: + - bugfix: Death berry juice is poisonous now, like poison berry's + Vire, MrMelbert: + - bugfix: The engineering lobby and lathe are no longer public access + - bugfix: Doors will no longer be treated as public access when they have multiple + accesses set on them +2023-01-07: + A.C.M.O.: + - bugfix: Fixed the DNA Infuser's Goliaths infusion, which was not properly granting + its organ set bonus. Having all 4 goliath organs infused now makes you lava-proof + as expected. + Guillaume Prata: + - bugfix: Legion infested golem corpses can drop power tools again (Drill, Jaws, + Experimental Welder) but they were moved away from their pockets and into the + belt slot. + Jacquerel: + - balance: While Ian still enjoys being petted, his heart will now most closely + belong to anyone who gives him an expensive luxury dog bone. + - code_imp: Using an item which _can_ deal damage on a mob tracking hostile actions + (such as a dog) won't automatically be considered to be a hostile action if + you aren't actually hitting it with the item. + JohnFulpWillard: + - qol: Xenomorphs can now pick up xenomorph action figures. + LeDrascol: + - bugfix: Fixed the advanced mop displaying as a normal mop when held + Melbert: + - bugfix: Fixes runtimes from cursed people dying + Rhials: + - code_imp: Ghosts are now basic mobs! You might not notice any difference, but... + - code_imp: Ghost mobs now spawn with hair and sometimes facial hair. + - bugfix: backing out of the Test Card Packs debug menu will no longer cause a runtime + - bugfix: Validate Cards debug verb now gives feedback if no errors are detected. + ShizCalev: + - bugfix: Fixed the gulag item reclaimer sometimes not giving you all your items + back. + Striders13: + - qol: added a balloon alert to hulks trying to use cloak of shadows (they can't + use it) + SyncIt21: + - rscadd: RTD Rapid Tiling Device + - imageadd: Sprite for RTD + - code_imp: moved update_overlays() from rcd to obj/item/construction so anyone + can use it + - rscdel: cooldown of 3 seconds when changing turf type + - qol: Faster Turf decoration + - bugfix: check for stock parts that can be added to a machine frame by hand + - bugfix: RPED converts stock parts into datum parts before inserting it into a + machine frame only if possible. e.g. for scanning modules + san7890: + - bugfix: You should now no longer get a confusing message whenever you try to add + flour from a flour sack into a bowl. + timothymtorres: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - soundadd: Candles will now use the match lighting sound when lit - soundadd: Light sources that burn will now have a welding hitsound - bugfix: Fix candle light behaving erratically @@ -731,6 +950,7 @@ once fuel is used - qol: Add burnt flares and melted candles to trash spawners - refactor: Refactor lighting items that use fuel to be more robust +<<<<<<< HEAD - bugfix: Removed some cheese strategies from burdened sect. - bugfix: improved maintenance eyes light detection. - qol: Extinguisher cabiners are now opened and closed with right click instead @@ -811,12 +1031,217 @@ with internals and such - bugfix: fixed issue where plasmamen who are spawned without a plasmaman-specific job outfit could spawn without internals and a suit, and just start dying immediately +======= + tralezab: + - bugfix: Fixes Honorbound Sect not granting the right spell +2023-01-08: + Hatterhat: + - qol: Rapid Part Exchange Devices and their bluespace variants now automatically + drop their current lowest tier of parts, instead of all of their parts. + Iamgoofball: + - bugfix: Fixes being able to instantly create dense grilles + Jacquerel: + - rscadd: Space Carp seem to have begun associating the station with food and attempting + to enter from the outside, rather than simply congregating around solar panels. + Employees are advised that these are wild animals, and should not be fed. + - rscadd: Space Carp can intermittently teleport short distances, leaving a short + lived rift which other nearby carp will be attracted to follow them through. + JohnFulpWillard: + - bugfix: You can right-click microwaves again. + - qol: Medipen refillers now use balloon alerts and progress bars instead of to + chat messages and invisible timers + - code_imp: Medipen refillers now refill your pen instead of delete it and create + a new one. This also means that refilling them will leave the medipen in your + hand instead of drop it at the refiller's tile. + LT3: + - bugfix: Hilbert's tram call button is now linked to the correct tram + - imageadd: Hazard lights added to the tram collision counter + Melbert: + - bugfix: People should be stuck in infinite stamcrit less often. + - admin: Adds a warning to "View Runtimes" informing you (yes, you) that it can + (and will) crash the server if you attempt to render 100,000 runtimes into the + UI at once + NamelessFairy: + - bugfix: Beer nukes no longer runtime on detonation. + - admin: Admins can now modify what reagent beer nukes produce, now your parties + can be alcohol free! + - admin: Admins can now creature custom reagent scrubber overflows, TC trade 20TC + for superlube flood? + - bugfix: Autosurgeon overlays now correctly update when removing organs. + - bugfix: Autosurgeons now say what organ is removed from them when screwdrivered. + - bugfix: Single use auto-surgeons cannot be reloaded again. + - rscadd: Introducing a new holodeck map, the TGC Arena, featuring hologram projectors + for your trading cards. + - bugfix: Janitor and Intern TGC cards are now considered creatures rather than + just humans. + - balance: The price of card packs has been reduced from double a paycheck to 3 + quarters of one. + - balance: The number of cards available in the good clean fun vendor has been doubled. + - rscadd: Minor detectives now spawn with a candy cigarette and a flask full of + apple juice. + - balance: Candy Cigarettes added to the detective vendor. + - bugfix: Minor detectives no longer spawn with real cigarettes or real alcohol, + you'll need to ask you colleagues to buy you some, hopefully they wont arrest + you for trying. + Paxilmaniac: + - qol: A few recipes that were microwave only (like boiling rice, heating ready + donk, so on) can now also be made in an oven + ShizCalev: + - bugfix: Non-magic inclined mobs will no longer fire staffs while duel wielding. + flowercuco: + - qol: agent id now has screentips when you can attempt to steal access for it + khevy: + - rscadd: adds new type of glockroach, the mobroach + softcerv: + - balance: Moved the account console board to the service lathe + timothymtorres: + - bugfix: Fix inconsistent runtime spam from baseturf on startup +2023-01-09: + Iamgoofball: + - bugfix: Fixes boring changeling gameplay by making shrieks not work while ventcrawling. + Jacquerel: + - imageadd: New look and animations for the Heretic's transmutation rune + LT3: + - bugfix: Disposal pipes and cable wires now co-exist with the tram bridge + Profakos: + - bugfix: burn chambers will not get stuck on depressurizing while cycling to exterior + airlocks + - bugfix: using an airlock sensor will properly cycle the air inside the chamber + ShizCalev: + - bugfix: Fixed indestructible glass sometimes having the grill ontop of it instead + of underneath it. + SyncIt21: + - rscadd: UI for ordering bulk amount of stuff from ccargo + - qol: order bulk stuff from cargo more efficiently + - bugfix: clear cart button which now properly clears cart & refunds coupons + Thunder12345: + - rscadd: Added new fishnet style socks, in a choice of three lengths + Zonespace27: + - admin: Logbuddy should no longer fail to parse logs with multi-line adminhelp + replies + san7890: + - bugfix: New players connecting via an active Panic Bunker Interview System can + now close out the window once they have their interview approved by an admin. +2023-01-10: + Comxy: + - rscadd: Faithless will now also break lights and drag victims around + - refactor: Faithless into basic mob + Mothblocks: + - qol: New players will now get a contextual tutorial for how to switch hands and + drop items. + NamelessFairy: + - bugfix: Mice are no longer healed by mousetraps + Profakos: + - bugfix: adds missing sbiten glass style + Striders13: + - bugfix: fixed biosuits, nun robes, narsien hardened armor making your shoes invisible + Tastyfish: + - bugfix: The small carton no longer randomly disappears. + - bugfix: Pre-filled bottles of cola & nuka cola, and glasses of soda now have the + correct sprite. + Time-Green: + - bugfix: fixes wizard rod form infinitely travelling in hyperspace + timothymtorres: + - bugfix: Fix antags being revealed by hallucinations +2023-01-12: + Fikou: + - bugfix: fixes twohanded items not letting you switch hands + GoldenAlpharex: + - code_imp: Made the worn_icons unit test check the worn GAGS config rather than + the normal one. + LT3: + - imageadd: Tram controls are now side mounted, freeing up space. Even better, you + now have two of them! + - imageadd: Added a new accessible space on the tram for wheelchairs + - bugfix: Removed duplicate tram plate/platforms + - code_imp: Tram has its own floor subtype for the walls and windows + - rscadd: Emergency exit feature added for people who are silly enough to not carry + a crowbar + LemonInTheDark: + - bugfix: You can now properly start drifting after moving out of a drift + MiiyaBot: + - rscadd: Two new hairstyles! ("All the Fuzz" & "Over Eye (Izutsumi)") + - spellcheck: Renamed "Marginally shorter yet long bedhead" to "Shorter Long Bedhead" + - spellcheck: Renamed "BedHead 4X" to "Bedhead 4x" + - bugfix: Slight changes to "Jade", "Shorter Bedhead", "Bedhead 4x" + Rhials: + - spellcheck: Head-spears are now named properly when using alternate spear types. + SyncIt21: + - rscadd: RPED can now pick up & install machine circuit boards in machine frames + - rscadd: RPED can pick up computer circuit boards for storage convenience but doesn't + install them + - bugfix: don't call after attack twice + - bugfix: normal RPED from behaving like an BRPED when installing stock parts in + an incomplete machine frame + - code_imp: datum stock part for every obj stock part + - refactor: all machines & dependent experiments to use datum stock parts + Zytolg: + - bugfix: Chemists can now properly open and close their desk windoor on Deltastation + san7890: + - balance: Due to materials costing a lot more than ever, Nanotrasen's Spare ID + Safe Supplier have cut down on the space inside of the ID Safe, meaning you + can only cram in things as thin as an ID Card. + stanalbatross, thedonkified: + - rscadd: added the ability to make up to 10 individual highlights in tgchat, customise + their colours, and toggle if they highlight the whole message or not. Ported + from CM. + - rscadd: you can now use regex for text highlighting. The syntax is /[regex expression]/, + eg /dog[0-9]/. There are no quantifiers, but you can use capture groups. The + regex must read a minimum of two characters. +2023-01-13: + 1393F: + - bugfix: you can nolonger use a goldgrub as a shield to kill colossus + Fikou: + - qol: fixes chisels + Higgin: + - rscadd: Adds ear surgery to repair damaged ears/deafness. + PestoVerde, Imaginos, Wallem: + - imageadd: New material and ore sprites by PestoVerde & Imaginos + Profakos: + - bugfix: pancakes no longer show an error sprite when added to a stack + dawsonkeyes: + - bugfix: metal hydrogen golems no longer die to low pressures and cold temperatures + - bugfix: metal hydrogen golems are no longer solid white, and are now the actual + color of metal hydrogen + - balance: metal hydrogen golems are also now immune to most environmental threats, + and get more armor + san7890: + - bugfix: There is no longer a button on a window at the CentCom Thunderdome. +2023-01-14: + Jacquerel: + - bugfix: Dead basic mobs are no longer "dense" objects and can be stepped on. + Melbert: + - bugfix: Fixed a runtime from neck slices on headless mobs. + - qol: Neck sliced folk now have an examine message saying as much. + Rhials: + - qol: The Scrubber Clog event now gives an orbit popup to ghosts! + - bugfix: Bald/Shaved ghosts will no longer cause a runtime and spawn without a + name. + - bugfix: viewing the botkeeper app as an observer will no longer runtime. + - bugfix: The walls of the luxury shuttle no longer bend in strange directions. + ShizCalev: + - qol: Airlock interfaces will now open up automatically if access is restored early + while an AI is hacking it. + SuperSlayer0: + - qol: Pinpointers now tell what they are tracking when examined + timothymtorres: + - bugfix: Fix blood overlays on energy daggers + - code_imp: Add `NO_BLOOD_ON_ITEM` bitfield for items + tralezab: + - rscadd: Some prisoner backgrounds have more or less tattoos. + - rscadd: More Memories to collect involving fishing and getting converted +2023-01-15: + Comxy: + - bugfix: Fixes being able to place things on space tiles with a z-layer destination. + FernandoJ8: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the examine text for damage now properly uses the most common examine text out of all the mob's limbs - bugfix: all robotic limbs now have the robotic damage descriptions (charring, denting) - code_imp: improved the get_majority_bodypart_damage_desc() proc to reduce redundancies and add support for limb-based cellular damage +<<<<<<< HEAD - qol: A few recipes that were microwave only (like boiling rice, heating ready donk, so on) can now also be made in an oven - bugfix: The tables on the bridge of the NTSS Independence are now usable. Fancy! @@ -981,6 +1406,72 @@ - bugfix: liquid pumps now show up in the RCD under the 'liquids' category instead of in a hidden blank one 2023-01-24: +======= + Guillaume Prata: + - rscadd: Mothroach DNA infusion. For better or worse, anyone can get closer to + being a Moth person now! + Inari-Whitebear: + - spellcheck: fixed grammar/typo in Nanotrasen Pay System add + Jacquerel: + - bugfix: Mice won't try to path through walls to escape from sight and constantly + squeak. + - bugfix: Mice will stop running away from you if they can't see you any more. + - bugfix: Rats won't bite racks and tables while passing over them. + - bugfix: Syndicate mobs will no longer attempt to shoot you through walls, building + up massive piles of empty bullet casings in the process. + - qol: Bullet casings from "weapons" fired by certain mobs will clean themselves + up after 30 seconds. + JohnFulpWillard: + - refactor: Duplicating mobs now should now give properly functioning mobs, as duplications + in general have been reworked. Admins can feel free to use the pod feature on + people. + LemonInTheDark: + - bugfix: Fixes clientside lavaland lag on long rounds + Melbert: + - bugfix: Fixed not getting moodlet from freshly laundered clothing + - bugfix: Fixed durability tags not showing their ratings + Mothblocks: + - bugfix: Fixed chem dispensers keeping their upgrade chemicals even after stock + parts were downgraded. + NamelessFairy: + - bugfix: AI eyes, megafauna and robots will appear in the orbit menu NPC section + again. + - qol: Everything deadchat controlled will now be highlighted in the orbit menu. + Reco201: + - bugfix: Cyborgs turning their lights on and off can now be seen doing so. + Rhials: + - code_imp: Anomaly effects now have their own files, rather than being crammed + into a single, probably-too-large file. + ShizCalev: + - bugfix: Drunk scientists & the RDs rejoice! You can now reach the Ballmer peak! + - admin: Fixed a bunch of liver traits not being assignable. + SovietWomble, dessysalta, dopamiin: + - soundadd: the hygienebots speak now + Stonetear: + - bugfix: Mosin Nagant bolt sprites are now visible. It's like 5 pixels so not + a surprise nobody noticed for years. + SuperSlayer0: + - code_imp: Removes double CAN_BE_INTERN flag in chaplain and cargo tech job flags + - code_imp: Replaces a string in chemist departamental head variable with a job + define. + - bugfix: Fixes monkey heretics being unable to invoke their runes + - bugfix: Fixes security stunbatons knockdowning you even if you have baton resistance + trait + SyncIt21: + - bugfix: Getting stuck or trapping someone else in the DNA infuser + Tattle: + - admin: cyborg creation details (synced AI and default laws) are now logged + TheWolfbringer: + - rscadd: Added atmos holofans to metastation's ordnance lab. + san7890: + - qol: Spirits of possessed blades (Chaplain's Null Rod Option) will be able re-try + selecting their name if it ends up to be filtered for any reason. + tralezab: + - admin: Force Event no longer filters by tab when searching. + vinylspiders: + - bugfix: fixed mob biotypes being ignored when applying toxin damage and oxyloss +2023-01-16: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A.C.M.O.: - bugfix: Fixed the DNA Infuser's Goliath Infusion and its organ set bonus. The Goliath hammer will now apply bonus attack damage as expected. @@ -990,12 +1481,289 @@ species. - bugfix: Fixed the DNA Infuser mutating organs which the occupant doesn't have. - bugfix: Fixed the DNA Infuser not allowing addition of dead creatures. +<<<<<<< HEAD - bugfix: Fixed buggy organ filtering code in the DNA Infuser which stopped it from infusing organs. +======= + JohnFulpWillard: + - bugfix: If there are several techwebs, sabotaging the master server of one of + them will no longer cut research point generation of the rest. + - qol: Removed the tech disk part of the ORM's UI as it was entirely unused, now + it's a little more compact with less scrolling needed. + - refactor: Autolathes, Limb growers, Biogenerators, ORMs and Smelters now share + techwebs with other machines of their types, rather than all make new techwebs + each time. This means they only build their nodes once, including hacked ones. + Instead of researching nodes on hacking the machine, they now show hacked ones + depending on if it's hacked. + Sealed101: + - bugfix: pinpoint machine scanning experiments work again (again) + ShizCalev: + - bugfix: gorillas can now fuck people up again + - bugfix: You'll no longer constantly be spammed with messages if your fingers are + too big to interact with a computer's keyboard. + - bugfix: You can no longer interact with programs that were previously opened on + a computer if your fingers are too big to use the keyboard. + - bugfix: You can now look at computer screens even if your fingers are too big + to use the keyboard. + - bugfix: Trading cards are no longer invisible when stacked. + SmoSmoSmoSmok: + - qol: miner console now displays the item's icons and has a minus button feature + to remove 1 item + SyncIt21: + - bugfix: Directional windows won't block construction of machine & compute frames + by the RCD + Wallem: + - bugfix: Uranium, Diamonds, and Bananium now update visually in the techfab UI + tralezab: + - rscdel: Atmospherics beret and black beret +2023-01-17: + Fikou: + - bugfix: fixes generic tanks not being printable + - bugfix: fixes being able to eat, use pills etc through gas masks and such + LT3: + - admin: Changed admin comm/fax notification sound to be less confusing + Melbert: + - refactor: Refactored blindness and nearsightedness. Important to note is that + all mobs are naturally blind until their eyes are actually created. + - refactor: Refactored "is covered" procs + - bugfix: Less sources of blindness now cause permanent blindness. Includes the + "Blind" Spell and "Blind Sting" from changelings. + - admin: Ahealing someone no longer flashes the blind overlay for 1 tick. + - admin: I removed an unused (sort of) inaccessible admin verb that allowed you + to toggle the tint from all welding helmets (and clothing) (and lack of eyes) + in existence, let me know if you want similar back + - balance: Changeling "Blind Sting" now causes eye damage (enough to blind) rather + than arbitrarily forcing blindness. + - balance: Visionloss virus symptom now causes eye damage (enough to blind) rather + than arbitrarily forcing blindness. + - balance: Oculine has been reworked slightly. Prior, Oculine arbitrarily healed + blindness and nearsightedness from eye damage reagrdless of how damaged the + eyes were, and applied blur on success. Now, Oculine just heals eye damage, + and blindness / nearsightedness is restored in the process. There is now a probability + every tick that eye blur is applied based on how pure the oculine is while healing + very damaged eyes. + - balance: Pacifists can no longer eyestab. + - balance: Any clothing item that covers your eyes contributes to getting the bonus + while sleeping, and to removing temporary blindness faster + Mey-Ha-Zah: + - bugfix: improved maintenance eyes light detection. + NamelessFairy: + - bugfix: Maintenance adapted eyes no-longer prevent the game from compiling + - qol: Inspecting a cell charger now tells you the type of cell in it. + - qol: Rulebook for TGC has been added to the TGC arena. + - bugfix: Holographic TGC coins are no longer legal tender and cannot be inserted + into your ID. + Rhials: + - bugfix: Swiping the Crab-17 checkout machine too early will no longer instantly + explode it and lock everyone out of their bank accounts. + - rscadd: Adds the Terrify spell and Terrified status effect. Terrified victims + will suffer increasingly detrimental effects until they're calmed down. + - balance: Nightmares can now cast the Terrify spell on victims to plague their + prey with. Attacking a Terrified human with your open hand will trip them up. + - imageadd: Adds status effect and spell icons for Terrify/Terrified. + - spellcheck: fixes a typo in the message for consuming a nightmare heart. + SyncIt21: + - bugfix: spelling of Airlocks + - bugfix: checks for toggling silo link and for selecting machine, furnishing designs + - bugfix: properly remove the stock part from the RPED after exchanging it + - refactor: renames datum parts above tier 1 accordingly to their tier + Thunder12345: + - qol: Extinguisher cabiners are now opened and closed with right click instead + of alt+click. + Zergspower: + - bugfix: ERT Headsets have the proper key + axietheaxolotl: + - imageadd: cargo's jumpskirt has been shortened to help fit in better with the + jumpsuit's shorts. + tralezab: + - balance: Ceremonial blades no longer wound. +2023-01-18: + Comxy: + - rscadd: Adds garden gnomes. + - imageadd: Adds garden gnome sprites. + Fikou: + - rscadd: Atmospheric Gloves, thick gloves that are fully fireproof and fire protective + and let you fireman carry people faster. + - bugfix: fixes engine goggles starting with darkness vision + - qol: firefighter helmets can now enable a welding visor + - qol: welding hardhats change mode with right click instead of altclick + - balance: firesuits no longer protect your hands + Mothblocks: + - bugfix: Polls are fixed + SuperSlayer0: + - code_imp: Now species to which are changed necromantic stone targets are determinated + by a variable rather then just skeleton species + YakumoChen: + - rscadd: Service borgs have a chisel now, make some statues! +2023-01-19: + A.C.M.O.: + - bugfix: Fixed buggy organ filtering code in the DNA Infuser which stopped it from + infusing organs. + Autisem: + - rscadd: New circuit component, list pick! + - bugfix: Pickle crafting no longer gives an empty beaker + - bugfix: Pickle crafting costs/gives 10 cucumbers/pickles + Fikou, a hood by Viro: + - refactor: humanoid mobs and cardboard cutouts automatically generate their sprites, + they no longer will be outdated + Guillaume Prata: + - qol: APCs have contextual screen tips now. + JohnFulpWillard, sprites by Tramzz: + - rscadd: Added Maintenance tablet applications, applications that can't be cloned + or downloaded from the store, instead you can find one app in maintenance. + - balance: The Analyzer tablet application is also a maintenance tablet application + now. + LT3: + - bugfix: Tramstation's west wing is reconnected to the power grid + - admin: Changing the station status displays now generates a log entry + - bugfix: Tramstation's exterior is now in the correct area, no longer marked as + Lavaland + - bugfix: You can now create new areas on Tramstation's asteroid turfs + Rhials: + - code_imp: The ninja module folder is now stored in the antagonists folder. + Time-Green: + - bugfix: Strange geysers have random reagents again + - bugfix: Geysers regen reagents again + YakumoChen: + - bugfix: The tables on the bridge of the NTSS Independence are now usable. Fancy! + Zytolg: + - bugfix: Fixed the Survivalist N2O System + scriptis: + - rscadd: a goose for the tram to run over +2023-01-20: + Guillaume Prata: + - rscadd: Bolter Wrench as a new tool, it can raise the bolts of airlocks regardless + of it's power status to smoother station repairs. It can be printed and is unlocked + on the same tier as RCD. It can also rarely be a mail gift for engineers. + Iamgoofball: + - bugfix: Fixes players bypassing the gas mask FOV restrictions with biohoods that + do almost everything the mask does without an FOV + Inari-Whitebear: + - bugfix: Firebots no longer attempt to extinguish themselves constantly + Melbert, That REALLY Good Soda Flavor, FatFat, AndreyGusev: + - rscadd: Spacemen can now have varying height. (Admin only for now) + - rscadd: Dwarfs are now slightly shorter, but look way better. + NamelessFairy: + - qol: Theres now a visual indicator when you attempt to grab an object or person + restrained by the HAUL gauntlets. + PositiveEntropy: + - rscadd: 'Adds a new short length haircut: the Chin-Length Bob Cut!' + SomeRandomOwl: + - admin: Modified the Play Internet Sound Verb so it now displays extra info about + any song being actively played as well as showing the link + Wallem: + - imageadd: Made the station's iron sheets less shiny to increase sprite legibility. + ZephyrTFA: + - bugfix: Canisters no longer keep their shielding when their shielding cell fails + Zergspower: + - qol: Protolathes and the like had their printable items categorized further + - bugfix: fixes a few uncategorized items in protolathes and the like + - refactor: Cleaner techweb code with more categories to break apart individual + printable items at proto/mech fabs + jlsnow301: + - qol: The orbit menu now sorts antagonists into groups more effectively. Some get + new named groups. + - admin: Traitor panel should have slightly more sane categories. + - rscadd: Many minor antagonists now have "objectives". + - refactor: Refactors code in several antag datums. + vinylspiders: + - bugfix: fixed give_important_for_life proc in species.dm, which is supposed to + be used to help ensure plasmamen (and potentially other races) are always spawned + with internals and such + - bugfix: fixed issue where plasmamen who are spawned without a plasmaman-specific + job outfit could spawn without internals and a suit, and just start dying immediately +2023-01-21: + LT3: + - bugfix: Kilostation comfy chairs now provide the correct stack of iron on deconstruction + PositiveEntropy: + - imageadd: Resprites the detective's wardrobe! + Rhials: + - bugfix: a wall covered by a screen on runtimestation has been modified into a + reinforced wall. + SuperSlayer0: + - bugfix: Fixes reverse revolver sprite being swapped to normal revolver sprite + - balance: Nerve splicing surgery now additionaly reduces stamina damage taken by + 20% + Trigg: + - bugfix: Admins - Saving a VV outfit will no longer save their cached_ref variable, + which caused problems when the game tried to use that cache on another round. + Existing broken outfits will need to be loaded and saved again. + mc-oofert: + - rscadd: Added a new emergency shuttle, the Venture +2023-01-22: + Melbert: + - qol: RTD fits in toolbelts. + NamelessFairy: + - bugfix: Viscerators are no longer invisible. + Timberpoes: + - bugfix: Mice given sentience through intelligence potions no longer immediately + consume the body and soul of the person whom uplifted them. + justricky21: + - spellcheck: small amendment on pet carrier + timothymtorres: + - rscadd: Add torches, porcini mushroom seeds, towercap seeds to ash walker ruin. + - rscadd: Change drying racks to not require power. + - rscadd: Add crafting recipe for smoking pipe that uses wood +2023-01-23: + Ed640: + - bugfix: fixed Item scaling objects not properly scaling in inventory slots. + Fikou: + - rscadd: You can now craft mannequins with wood or plastic. + GoldenAlpharex: + - balance: Water now makes you wet on touch and vapor application, with vapor being + much less effective than touch. Yes, that means you can now spend two minutes + putting someone out with a spray bottle full of water! + - bugfix: Being wet no longer causes you to be EXTRA flammable, and instead properly + protects you from catching on fire. If you're wet enough, of course. + Inari-Whitebear: + - bugfix: Fixed integrated circuit component menu search crashing on certain symbols + being entered. + LT3: + - spellcheck: Added missing event panel description for Tram Malfunction + - bugfix: Portable atmos machinery is layered correctly + Melbert: + - rscadd: Added a new random event, "Radiation Leak". A random machine starts to + emit radiation and toxic fumes. Engineers may be able to stop it with their + tools. + - rscadd: The "Radioactive" gene from genetics will now emit rads when on stasis + or dead, rather than just while you're alive. + OrionTheFox: + - bugfix: Randomized round-start posters now pull from the selected poster's icon + file, meaning TG Downstreams can have them in a seperate .dmi + Rhials: + - balance: The Magnitis disease will now hurl objects at infectees at higher stages. + Watch your head! + Ryll/Shaps: + - bugfix: You can no longer climb ladders while buckled to an anchored object + SmoSmoSmoSmok: + - qol: u can now search for players in the messenger by typing their name or their + job + san7890: + - bugfix: Deconstructing deep friers should now work properly. + timothymtorres: + - qol: Allow illiterate people to play slot machines + unit0016: + - spellcheck: Wire Terminals' Description now informs the player that they're an + input. +2023-01-24: + BlueMemesauce: + - code_imp: The access requirements at the end of supply crate descriptions are + now automatically generated + - bugfix: Supply console now tells you what access each crate needs to be privately + purchased + GoldenAlpharex: + - bugfix: Species that don't suffer from hunger can now properly open the cooking + menu. + Inari-Whitebear: + - bugfix: Tape recorders are not deaf anymore + JohnFulpWillard: + - bugfix: Hacked autolathes and Limbgrowers can now properly print things again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - qol: Reduced volume of firedoor alarm sound loop - bugfix: Tram hit counter now only increments when actual players are hit. No more free points hitting the horrible goose +<<<<<<< HEAD OrionTheFox: - imagedel: deleted modular newscaster override, they've been reverted to new TG sprites @@ -1033,6 +1801,55 @@ - bugfix: fixed a bug where petri dish smartfridges could not be constructed from a circuit board - rscadd: Burn Medkit to Mining Vendor +======= + Mey-Ha-Zah: + - rscadd: Burn Medkit to Mining Vendor + Mothblocks: + - spellcheck: Cucumber greek is now Greek cucumber + - spellcheck: Fixed attack verbs on the greek cucumber + Potato-Masher: + - bugfix: Morphs now properly move faster when disguised rather than slowing down. + Profakos: + - bugfix: Bundles of disposal packages that contain a wrapped parcel will be now + successfully redirected by the wrapping sorters + SuperSlayer0: + - bugfix: Wielded high frequency blades no longer ignore pacifism + - code_imp: Replaced some random() procs in lavaland elite code with prob() procs + - bugfix: Monkey cultists are now able to invoke cult runes + SyncIt21: + - bugfix: bluespace light replacer from fixing lights/turfs containing lights not + in its line of sight + - bugfix: beaming any turf even those not containing lights from causing lag + Tattle: + - qol: urinals and noticeboards can be handcrafted + - qol: pod computers can be deconstructed + - qol: fireaxe cabinets, mech removal cabinets, and mirrors can now all be crafted + Tattle, Kryson: + - qol: light switches, request consoles, telescreens, and ticket machines can now + all be printed from lathes + Wallem: + - balance: Kheiral Cuffs now cost 750 mining points instead of 2000. + Wallemations: + - rscadd: Bartenders can now mix up the Mississippi Queen for those willing to take + the plunge. + Winter Schock: + - bugfix: Blind doll with monophobia dont get stress while someone in 1 tile range + YakumoChen: + - imageadd: Two new corporate themed posters. + ZephyrTFA: + - bugfix: NanoTrasen Engineering has identified and resolved an issue with MechOS + that prevented diagnostics for internal shorting + mc-oofert: + - bugfix: Monkey Humans no longer have their AI turned on upon revival + san7890: + - bugfix: Spacemen with a clear lack of genetics powers can no longer bend space + and time to pull out pH indicator strips. + - bugfix: Nanotrasen has pushed an update to their Transit System Consoles, which + just makes sure the buttons look visually appropriate. + timothymtorres: + - bugfix: Fix ordance bomb site being a safe teleport area after surviving the heretic + minigame +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - soundadd: Chisels now make sculpting sounds when used on carving blocks - qol: Chisels now give balloon alerts when selecting a target, cancelling, or sculpting - qol: Chisels used on carving blocks that were interrupted will now continue @@ -1042,6 +1859,7 @@ people use the radial menu to craft abstract statues properly. This does not work with custom mineral blocks. (pizza, glass, etc.) - code_imp: Change chisel and statue code to be more readable +<<<<<<< HEAD - rscadd: Some prisoner backgrounds have more or less tattoos. - rscadd: More Memories to collect involving fishing and getting converted - rscadd: Bartenders can now mix up the Mississippi Queen for those willing to take @@ -1096,11 +1914,52 @@ - bugfix: vibebot being invisible - qol: Inspecting a trading card or card hologram will now let you see the full enlarged card art. +======= + vinylspiders: + - bugfix: toilet bongs crafting recipes + - bugfix: fixed crafting itself + - refactor: cleaned up some old code in the recipes file, added support for structures + in recipes + - bugfix: fixed a bug where petri dish smartfridges could not be constructed from + a circuit board +2023-01-25: + Cenrus: + - balance: Harvesters are now not affected by drag slowdown. + LT3: + - code_imp: Tram hit counter typepath check is changed to be more accurate in player + vs. goose detection + - bugfix: Wires and pipes again rest on top of lattice catwalk + NamelessFairy: + - rscadd: The TGC arena on the holodeck now features display panels to track each + player's life shards and mana. + - qol: Slightly increased the amount of space on the TGC holodeck arena's tables + by removing the windows on either side of the player. + - qol: Inspecting a trading card or card hologram will now let you see the full + enlarged card art. + SyncIt21: + - bugfix: vibebot being invisible + - rscadd: Rapid wiring device + - imageadd: Sprite for RWD + Xander3359: + - bugfix: Deltastation - Virology's food dispenser isn't blocked by a rack anymore. + jlsnow301: + - refactor: Crew records have been refactored. + - refactor: Medical records -> TGUI + - refactor: Security records -> TGUI + - refactor: Warrants console -> TGUI + - qol: Players are now alerted when their fines are paid off. + - qol: Cleaned up sec hud examination text. + - qol: Adding and deleting crimes is easier. + - qol: Writing crimes in the console sets players to arrest. + - qol: You can now mark someone as a suspect through sec hud. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'After over a year of continuous research, the Syndicate have finally managed to crack Nanotrasen''s Protocol for transferring AIs from an intelliCard into a MODsuit, and vice-versa in order to extract the valuable AI in a method fit-for-sale. In short: The "Steal a Functional AI" objective will work if the "captured" AI is in a MODsuit.' +<<<<<<< HEAD - rscadd: The TGC arena on the holodeck now features display panels to track each player's life shards and mana. - qol: Slightly increased the amount of space on the TGC holodeck arena's tables @@ -1219,3 +2078,216 @@ - bugfix: gets rid of some warnings on server start - qol: new mapping helper for when you want a door that requires centcom or captain access +======= +2023-01-26: + Autisem: + - bugfix: You can print the new list pick and associative list pick components + - bugfix: Associative list pick works as intended now + JohnFulpWillard: + - qol: Mining points is now tied to bank accounts instead of individual IDs, so + they transfer over in cases of an ID replacement. + LT3: + - bugfix: Fixed the tram not exploding when it's supposed to + SmoSmoSmoSmok: + - qol: you can now search for items on the mining vendor + - bugfix: item prices will no longer appear as NaN + SyncIt21: + - rscadd: 'more designs for the rcd + + refactor:` try_wallmount()` to return true only after successful mount' + - bugfix: '`apc_tool_act/rcd_act()` incorrecly checking for simple circuits upgrade + in the wrong variable' + - bugfix: newly created APC's not assigning themselves to their areas. + - bugfix: rcd building structures [walls, airlocks etc] on turf's that already have + structures on them + Time-Green: + - refactor: External organs have been near-completely refactored. + - admin: Admin-spawned external organs will load with a random icon and color + - bugfix: fixes angel wings not working for non-humans (it was so fucking broken) + - bugfix: fixes external organs being invisible if they werent initialized with + a human + jlsnow301: + - bugfix: Sec huds should properly label targets with the new record system + mc-oofert: + - bugfix: venture shuttle no longer docks on purchase + san7890: + - bugfix: 'All Mobs (including Basic mobs) are now able to suicide. (warning: some + exclusions remain)' +2023-01-27: + MMMiracles: + - bugfix: Regular asteroid turfs now dig up regular asteroid sand instead of the + basalt variant from Lavaland. + Mothblocks: + - rscadd: Added a new menu that shows on Escape. + Xander3359: + - bugfix: RD has access to the AI SAT on deltastation + timothymtorres: + - rscadd: Add a pair of leather gloves to weed control crate + - balance: Mobs with the PLANT biotypes (venus flytraps, pod people, killer tomatoes) + are now much weaker vs scythes, goats, and plantbgone. + - balance: Plantbgone is now more effective at destroying weeds. + - balance: Regular scythes are now a sharp object + - bugfix: Fixed scythes, goats, and plantbgone not affecting flower bud vines. + - bugfix: Thick and botanical gloves not protecting from thorns + - bugfix: Golems not having pierce immunity from thorns + - bugfix: Runtime where vines tried to spread into null turf + - bugfix: Runtime where null vines that were destroyed were trying to spread to + nearby turfs + - soundadd: Add eat food sound when goats eat plants + - code_imp: Improved goat targeting code + - code_imp: The bane element now accepts `mob_biotypes` bitflags as an argument. + - qol: Add shovel to cargo lathe +2023-01-28: + Unit2E: + - bugfix: Strange reagent once again spawns angry plants when added to hydroponics + trays! +2023-01-29: + A.C.M.O.: + - refactor: Refactored breathing, mostly check_breath, for Carbons and lungs organ. + - rscadd: Added the space-breathing trait for lungs. + - bugfix: Fixed the Space Carp DNA infusion to apply the Spacewalk trait, allowing + you to fly through space. + - bugfix: Fixed the Space Carp lungs, allowing you to breathe in space with them. + - bugfix: Fixed gas status indicators re-playing their on-throw animation when they + are refreshed. + - bugfix: Fixed gas status indicators getting stuck to the screen in some situations. + - bugfix: Fixed gas side effects, such as euphoria and hallucinations, to reset + when expected. + - bugfix: For Humans, fixed Miasma only being consumed from the air when Helium + is present. + Ebin-Halcyon: + - bugfix: The Paramedic cap is now the same color as their jumpsuit again. + Fikou: + - imageadd: secborgs are red again + Helg2: + - rscadd: Wings for fly persons from flight potion + LT3: + - bugfix: Tram platform no longer magically levitates objects when the tram walls + are destroyed or dismantled + NamelessFairy: + - bugfix: You can now set life and mana panels to 0 life/mana. + Profakos: + - bugfix: The ORM's input and output lights are once again visible + - bugfix: Traitors discounts stocks are once again limited to one item + Rhials: + - balance: Hitting a vendor from inside a wall will cause it to fall away from you, + rather than crushing you without being able to move to your tile. + SuperSlayer0: + - qol: Posters now tell that you can trap them with a glass shard when examined + - balance: Space dragon fire breath no longer damages allied space carps + Time-Green: + - qol: Hardcore random gets a sixpack + Unit2E: + - spellcheck: Heretic has received a minor grammar and spelling check over. Wrong + kind of heresy, there. + Vladoricious: + - qol: Nuclear PDAs now actually work like a PDA should, with the power to download + normal programs and delete them too. The nerds over at Cybersun even installed + a new "Why Fy Dry Ver", allowing you to download your programs while still on + the base! + - bugfix: As a result, Lone Ops will no longer get scammed out of over 1/5th of + their TC when buying the Detomatix cartridge and Midround Traitors with stolen + Nuclear PDAs will not be denied an uplink. + lizardqueenlexi: + - bugfix: Operating computers can now display alternative steps during repeatable + surgery steps. + ophaq: + - qol: Musicians rejoice! You can now interact with the instrument UI while laying + down. + - rscadd: Adds a new crate to cargo, the "Amphibian Friends Crate!" Gives you one + frog and one axolotl. + san7890: + - bugfix: Basic Mobs are now able to deathgasp. + - qol: The error message that shows up when APCs fail due to a Grid Check (powernet + failure) looks a little bit nicer now. + - balance: After an unfortunate event occuring when some nuclear operatives took + the ship to a Fireworks Store, the Syndicate have re-engineered their bomb cores + to only explode when electronically triggered by the bomb shell itself. The + payload inside a standard syndicate bomb can not be exploded with another explosion, + you must keep it in the bomb machinery for it to actually do some explodey stuff. + the-orange-cow: + - bugfix: Mint Toxin(a toxin) has been changed to Mint Extract(a food). The chef's + mint can once again gib, fatties beware. + timothymtorres: + - qol: Add clown firing pin to techweb + - qol: Add advanced fire extinguisher to techweb + - qol: Add mining scanners to techweb + - qol: Add pickaxe to basic tools techweb + vinylspiders: + - imageadd: new inhand sprites for the holy flask + - bugfix: chaplains will no longer look like they are carrying a beer bottle when + holding their holy flask +2023-01-30: + Ebin-Halcyon: + - bugfix: Headsets now have their old worn sprites back, did you ever notice it? + Holoo-1: + - bugfix: Precision of purity scanners has been increased + JohnFulpWillard: + - config: There's now a config-optional announcer for a round ending. + - balance: The R&D monitoring console now shows R&D consoles and their locations. + - refactor: The R&D monitoring console now has a nice TGUI menu. + Melbert: + - bugfix: Maybe fixes some issues with spirit holding, particularly relating to + it being in-exorcism-able. + Rhials: + - bugfix: The chemical scanner will now properly display that "no" reagents are + present in a subject when only invisible reagents are present. + Shadyyy66: + - rscadd: Time and space has destabilized even further due to Nanotrasen bluespace + research, now, on occasion, clones from different timelines can appear on the + station and hunt you down to maintain timeline stability! Beware the Paradox + Clone! + ShizCalev: + - bugfix: Fixed the cops not being called when minors try to purchase cigarettes + from vending machines. + Timberpoes: + - admin: When a player-owned mob is deleted from the game world, a stack trace is + now dropped in the runtime logs. This allows admins and coders to investigate + these issues easier. + itseasytosee: + - rscdel: You are less likely to see underwear in places it logically should not + be. + jlsnow301: + - admin: Wanted statuses are now better logged by the records console + san7890: + - qol: Some mob suicides now have a message that shows to blind people or people + that didn't actually witness the suicide, pretty cool. + the-orange-cow: + - spellcheck: After one false advertising lawsuit too many, Nanotrasen has changed + the sales pitch of the 'Exotic Seed Crate' to correctly reflect that it only + contains twelve seeds. + vincentiusvin: + - bugfix: fixed air alarm breaking on gasless tiles. + vinylspiders: + - bugfix: adds some messing bitfield defines for turf_flags +2023-01-31: + ATHATH: + - balance: Most energy sword-like weapons have had their demolition_mod increased + to 1.5x (from 1x). This affects damage vs. robots, objects, structures, etc. + Energy scalpels did not receive this buff. + Jacquerel: + - bugfix: You can now revive 'basic mobs' with a Lazarus Injector, such as dogs, + cows, axolotls, or carp. + - bugfix: The same category of mobs can also now be effected by the Runic Golem + Dominate spell. + - bugfix: Basic Mobs will switch target if they can no longer attack their current + target; meaning that if you become a Bileworm's friend it will stop attacking + you. + - balance: Mobs injected with the Lazarus Injector while it is EMPed will no longer + attack other mobs revived by EMPed Lazarus Injectors. + - balance: The carp migration event won't trigger if there are fewer than 12 players. + OrionTheFox: + - bugfix: fixed fire cabinet examine text falsely saying to alt-click to open/close; + it now has contextual screentips, and uses balloon alerts when relevant + SyncIt21: + - refactor: stack components no longer exist inside a machine's component_parts + - refactor: move component printer & module duplicator circuitboards into machine_circuitboards.dm + jlsnow301: + - rscadd: You can print universal scanners (export scanners, price taggers, sales + taggers) from the lathe again + tralezab: + - refactor: Refactored a bunch of admin-related event code, hopefully you won't + notice much + - admin: '... But you specifically may notice some minor differences. Raw inputs + changed into tgui ones, minor soul removal, etc.' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-02.yml b/html/changelogs/archive/2023-02.yml index 6c6c4b99b04..1ea142d71d9 100644 --- a/html/changelogs/archive/2023-02.yml +++ b/html/changelogs/archive/2023-02.yml @@ -1,5 +1,6 @@ 2023-02-01: A.C.M.O.: +<<<<<<< HEAD - refactor: Refactored breathing, mostly check_breath, for Carbons and lungs organ. - rscadd: Added the space-breathing trait for lungs. - bugfix: Fixed the Space Carp DNA infusion to apply the Spacewalk trait, allowing @@ -17,11 +18,21 @@ LT3: - bugfix: Tram platform no longer magically levitates objects when the tram walls are destroyed or dismantled +======= + - bugfix: Fully fixed the DNA Infuser, which will now infuse organs as expected. + - bugfix: Fixed flyperson species transformation and organ set bonus, which was + throwing a runtime. + - bugfix: Fixed many typos in organ-related source code. + JohnFulpWillard: + - bugfix: the MODsuit control maint app now links up to MOdsuits. + LT3: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: Hilbert Research Facility's tram controls have finally been picked up off the floor and mounted to the wall - bugfix: Hilbert Research Facility's tram doors are no longer linked to the main station tram - code_imp: Hilbert Research Facility now has proper tram atmos barriers installed +<<<<<<< HEAD Melbert: - bugfix: Maybe fixes some issues with spirit holding, particularly relating to it being in-exorcism-able. @@ -55,12 +66,45 @@ - admin: When a player-owned mob is deleted from the game world, a stack trace is now dropped in the runtime logs. This allows admins and coders to investigate these issues easier. +======= + LemonInTheDark: + - bugfix: Fixes parallax showing up ABOVE the game if you moved z levels while disconnected + - rscadd: Space now makes things in it starlight faintly blue + - bugfix: Glass floors that display space now properly let space shine through them, + rather then hiding it in the dark + - rscadd: Glass floors above space now glow faintly depending on their glass type + NamelessFairy: + - bugfix: Removing a malf AIs brain and inserting it into a new core no-longer clears + its zeroth law + - bugfix: 17 year old crew member medical/security records will no longer show them + as 18 + - code_imp: Medical and security records now use the minimum and maximum age defines + rather than hardcoded minimums and maximums + Rhials: + - qol: ghosts now get an orbit notification for wise cows! + SyncIt21: + - bugfix: apc not assigning itself a name based on its area + - bugfix: newly built apc's not getting assigned area names + - bugfix: merge skew helll + carshalash: + - balance: Gibs now provide a small amount of nutriment. + flowercuco: + - rscadd: Poster boy and Throwing arm positive quirks. + - imageadd: added posters for poster boy quirk + - bugfix: pizza crates' pizza list applies the assigned weight on its pizza list + itseasytosee: + - code_imp: Greater support for variability in weapon attack speed + - admin: Admins are now able to grief you by hitting you with a toolbox 10 times + in one second. + ophaq: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Axolotl lovers rejoice! I added axolotls to cytology and as such are now swabbable. - rscadd: Frog cells are now named "anura amphibian cells." This literally means "frog amphibian cells." - rscadd: Axolotl are "caudata amphibian cells." This literally means "salamander amphibian cells." +<<<<<<< HEAD - qol: Posters now tell that you can trap them with a glass shard when examined - bugfix: fixed fire cabinet examine text falsely saying to alt-click to open/close; it now has contextual screentips, and uses balloon alerts when relevant @@ -113,23 +157,89 @@ RimiNosha: - qol: Made off-station gravity generators shut the fuck up. SkyratBot: +======= + san7890: + - spellcheck: Whenever you offer your hand to someone in need, or just wanting to + pull them around- the alert that shows up to them should be a bit more clear + now with a 100% decrease in non-necessary pronouns and articles. + - bugfix: You now should no longer be able to accidentally offer someone your "off-hand" + item, since it's an abstract thing that shouldn't be considered a physical entity. + vinylspiders: + - bugfix: plasmamen no longer can suffer liver failure from injecting themselves + with plasma (unless they have a human liver for some reason). + - bugfix: a person who is infected with a plasma fixation disease can no longer + can suffer liver failure from injecting themselves with plasma. + - bugfix: plasmamen no longer can suffer liver failure from consuming other organic + toxins, which they are not supposed to be affected by. + - bugfix: plasma fixation heal-through-inject-or-consumption now works for plasmamen + by letting the metabolism procs take care of removing it from their systems. + - bugfix: hot ice now has the same wound-healing and nontoxic properties as plasma + to plasmamen, since it is described as "frozen plasma". It is also nontoxic + to plasma fixation virus sufferers. + - bugfix: plasma breathed through internals now contributes to the healing amount + from plasma fixation. + - qol: prevents mob spawner plasmamen from spawning without their suit and internals. + - code_imp: the equip proc can now find internals in the hand slot and automatically + open them, allowing for less snowflakey code down the line. +2023-02-02: + ATHATH: + - qol: Revenant monologuing is now the same color as deadchat. + Fikou: + - bugfix: you can no longer change null rods that arent the normal null rod into + different types + Helg2: + - bugfix: Mime's Vow of silence will no longer requiere wizard robes to be casted. + Jacquerel: + - bugfix: Rehydrated Carp should now properly recognise who is the boss and follow + their instructions. + Kepteyn: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: added greyscale json configs for witch hat and witch hat worn. - imageadd: Added new, greyscale states to head/wizard.dmi - imagedel: Removed Marisa hat states from head/wizard.dmi - code_imp: changed Marisa hat code in wiz_robes.dm to make them use greyscale. - config: changed greyscale configs to include the witch hat. +<<<<<<< HEAD - bugfix: Rehydrated Carp should now properly recognise who is the boss and follow their instructions. +======= + NamelessFairy: + - admin: Admins can now customize the crate type and landing zone of the stray drop + pod event. + Rhials: + - spellcheck: Fixes a typo in the changeling alert stinger filename. + SyncIt21: + - bugfix: RPD not highlight a single variant option in its UI + - bugfix: heat exchange manifolds not displaying the right sprites for its layer + - bugfix: stack components inside machines not getting garbage collected +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: distro & waste sensors not reading values from the actual pipes they are on - bugfix: losing distro & waste options from the drop-down box after connecting to a new sensor. - refactor: all occurrences of _sensor with a macro to avoid typos. +<<<<<<< HEAD - spellcheck: Fixes a typo in the changeling alert stinger filename. +======= + jlsnow301: + - bugfix: Deleting a sec record removes it from the manifest again + - qol: It's now easier to see security notes via HUD. + - qol: It's now easier to see why someone is set to arrest. + - qol: Crime authors and armory access can edit crimes. + - balance: Setting players to arrest requires a valid crime. + - balance: Armory access can invalidate priors. + - balance: Setting players to arrest via HUD creates a crime for the suspect. + tralezab: + - spellcheck: Renamed the Antagonist Info button slightly. + - balance: EMP requires aluminum, but the aluminum doesn't contribute to a bigger + EMP size. + vinylspiders: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed getting incurable tox damage when fully transformed into a plasmaman via plasma rivers - bugfix: fixed rod of asclepius/medibeam etc not being able to heal tox damage despite not having biotype restrictions +<<<<<<< HEAD - bugfix: pizza crates' pizza list applies the assigned weight on its pizza list - imageadd: cargo's jumpskirt has been shortened to help fit in better with the jumpsuit's shorts. @@ -155,6 +265,22 @@ 2023-02-04: Cursor: - rscdel: Removed swears from the Personal Space quirk. +======= + - bugfix: fixes a runtime error caused by patrolling bots +2023-02-03: + 1393F: + - bugfix: Bubblegum is once again capable of performing his 5 hallucination, one + real Bubblegum attack. + Fikou: + - bugfix: fixes fov removal f12 exploit + Horatio22: + - spellcheck: changes the snake crate description from poisonous to venomous + JohnFulpWillard: + - bugfix: Mechs should now cancel out of drilling when they move. + Jolly: + - bugfix: On IceBox, the library air vents are now connected to the main network + again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - imageadd: Nanotrasen's insurance provider finally sprung the cash for a new tram. Made with the latest in lightweight and mostly* non-flammable materials, travel @@ -171,6 +297,7 @@ - bugfix: Westbound travel shows the correct controls animation - rscadd: Tram doors take a chunk of flesh if you run at them last minute - qol: Reduced duration of amber stage on tram crossing signals +<<<<<<< HEAD Melbert: - refactor: Refactored blindness and nearsightedness. Important to note is that all mobs are naturally blind until their eyes are actually created. @@ -214,19 +341,79 @@ - refactor: renames datum parts above tier 1 accordingly to their tier - balance: Gibs now provide a small amount of nutriment. - spellcheck: changes the snake crate description from poisonous to venomous +======= + NamelessFairy: + - bugfix: Toy crossbows have had their offset fixed and will now correctly display + in your hand. + Pickle-Coding: + - bugfix: Objects that are not items can increase supermatter power on consumption. + Profakos: + - spellcheck: Clarifies that TRAC bullets are not teleporter compatible + SeigaSeiga: + - bugfix: Different types of spear now display accurate materials on examine, and + recycle appropriately. + SuperSlayer0: + - bugfix: Bluespace golems no longer can teleport without cooldown + - balance: Nightmares no longer are able to be pepersprayed + SyncIt21: + - bugfix: Water bottle cap overlays & missing opening sound + Tristrian: + - spellcheck: The regenerative sepia crossbreed's usage description has been corrected + necromanceranne: + - balance: You can purchase weapons via the goodie system if you have a weapon permit. + - rscadd: You can purchase lasers and disablers as goodies. The latter comes with + a holster you can stick on your armor vest and store your extra disabler as + security. + - qol: You can store mini ebows in energy holsters. Oops. + san7890: + - bugfix: The wizard's magickal printing press has been corrected such that ye magickal + text describing what the semi-randomize option do is no longer printed _underneath_ + the semi-randomize button. + sergeirocks100: + - spellcheck: The word "modifications" is now spelled correctly in the Reload Configuration + confirmation dialog. + timothymtorres: + - qol: Add emissive effects and balloon alerts to barsigns (neon lights now glow + in the dark). Barsigns are now considered machinery and will be affected by + power. + - refactor: Refactor barsign code to be more robust +2023-02-04: + Jacquerel: + - admin: Admins can direct where carp (or magicarp) are interested in going when + manually triggering the event + NamelessFairy: + - spellcheck: The instructions for the maintenance camera app are more descriptive. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can now mark TGC cards on the holodeck battle arena, useful for keeping track of effects such as hivemind. - rscadd: Right clicking a card holder on the TGC holodeck battle arena will allow you to generate a "blank card", useful for when using cards that summon other cards, such as the xenomorph hivelord. - spellcheck: Capitalized some descriptions for TGC machines +<<<<<<< HEAD - refactor: stack components no longer exist inside a machine's component_parts - refactor: move component printer & module duplicator circuitboards into machine_circuitboards.dm - spellcheck: The regenerative sepia crossbreed's usage description has been corrected +======= + - bugfix: Smugglers satchels will no longer spawn inside the holodeck. + Roryl-c: + - bugfix: burn wounds going septic now properly paralyze the limb + - bugfix: septic burn wounds no longer heal on stasis + - bugfix: gauze now properly stops you from re-wrapping limbs that already have + fresh gauze + Sealed101: + - bugfix: Nanotrasen Artificial Intelligence Department has repelled a Cybersun + attack on AI personalities and advanced camera frameworks that was based on + the last year's AI GRID OF DOOM ion law incident. Free-look camera consoles + and AIs should no longer have a grid of free vision that also prevents interacting + with stuff on the grid. + cacogen: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Tape recorder actions (e.g. starting/stopping playback) now use balloon alerts instead of say() to reduce chat spam - bugfix: You can no longer get a tape stuck in the tape recorder by unspooling it before inserting +<<<<<<< HEAD - spellcheck: Whenever you offer your hand to someone in need, or just wanting to pull them around- the alert that shows up to them should be a bit more clear now with a 100% decrease in non-necessary pronouns and articles. @@ -302,6 +489,102 @@ - bugfix: donator item colorblockhoodie appears on digitigrade LT3: - bugfix: Cats can nuzzle people +======= + lizardqueenlexi: + - bugfix: Made the northwest arrow icon in build mode actually point northwest +2023-02-05: + JohnFulpWillard: + - bugfix: Moths can no longer eat indestructible items (like the CE's magboots) + - bugfix: Arrivals is now part of the station's areas. + - bugfix: Computers no longer delete disks if you try to add a second one. + - spellcheck: Computer screentips says you're now removing the disk instead of the + SSD. + LT3: + - bugfix: Uplink failsafe explodes when its supposed to + - bugfix: Cats can nuzzle people + Pickle-Coding: + - bugfix: Reverts accidental change to pluoxium and freon gasmix power ratio values. + Rhials: + - rscadd: Midround changeling spawn event. + - rscadd: Changeling meteor. It has a present for you. + SuperSlayer0: + - code_imp: Replaces some decisecond things in martial art code with time defines + - spellcheck: Added a ":" to inducer error message + - bugfix: Blood magic no longer can wound the user's arm when casted + Xander3359: + - bugfix: Wendigo no longer has a chance to melee attack 8 times in a second. + ZephyrTFA: + - refactor: Admin verbs are now datums with a dedicated panel handler + - admin: Admin verbs now come with a handy description when you hover over them! + lizardqueenlexi: + - bugfix: Corrected the skintone on arms grown back by the Rod of Asclepius +2023-02-06: + Comxy: + - rscadd: Added new damage buffs for netherworld mobs + - refactor: Refactors netherworld mobs into basic mobs + Jacquerel: + - bugfix: Biotypes will be more consistently applied when taking damage, pod and + shadowperson prosthetic limbs won't be corroded due to light levels. + - bugfix: Podperson and Wooden Golem prosthetic limbs won't be corroded by having + a hungry tummy. + JohnFulpWillard: + - bugfix: There will no longer have 2 of the same station trait roll twice in the + same round. + - bugfix: Announcements of ghost roles don't play if no one accepts the poll to + play as the role. + LT3: + - refactor: 'Rewrite of random event Disease Outbreak: Advanced. Listen to those + level 7 biohazard warnings!' + - admin: Fully customizable build-your-own virus is available in the admin Secrets + panel, for those people you really hate + NamelessFairy: + - bugfix: Some misplaced pixel on TGC cards have been cleaned up. + Profakos: + - bugfix: United Surplus Crate Key is no longer visible in the nuke ops uplink + - bugfix: pod person hair can be once again styled by secateaurs + Rhials: + - bugfix: abductor scientist's retrieval implants will now properly recall the owner, + and inform them upon recall failure. + ShizCalev: + - bugfix: Fixed some duplicated and incorrect messages being presented when infected + with a virus that has the spontaneous combustion symptom. + SyncIt21: + - qol: examining a meat spike frame & meat spike will tell you about itself + Tattle: + - admin: Admins are no longer alerted when an inert BoH is printed + Unit2E: + - balance: The hypnotic flash now works on unconscious people (not crit), one of + us, one of us! + scriptis: + - bugfix: asays are no longer double-escaped + - admin: asay now uses tgui say + tralezab: + - admin: There's a cog next to events you can trigger if it has an admin setup. +2023-02-07: + ArcaneMusic: + - qol: Improves feedback on buttons as well as the blast door electronics so that + installing your very own blast doors is less tedious. + Capsandi: + - balance: There's a second detonation wire on payload bombs now. + - balance: Cutting the proceed wire no longer detonates the bomb but instead deactivates + the countdown timer on examine. This is reset once the bomb is defused + Ebin-Halcyon: + - imageadd: Winter coats have been resprited. + Jacquerel: + - bugfix: Meteors can't be triggered automatically or manually on Icebox, where + they do nothing. + - bugfix: Hacking a comms console as a traitor won't try to summon meteors or pirates + to Icebox, where they do nothing. + Kapu1178: + - bugfix: The "Rest" and "Pull" HUD icons correctly match the mob's current state + on Login(). + LT3: + - balance: 'Tram Malfunction: Decreased spread between min and max damage' + - balance: 'Tram Malfunction: Event length decreased' + - balance: 'Tram Malfunction: Damage multiplier added to account for different base + health levels' + - balance: 'Tram Malfunction: Event collision lethality multiplier decreased' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed motion sensors on tram doors, they will now crush you much less often! - balance: Reduced damage from being crushed by tram doors @@ -315,6 +598,7 @@ power is lost - bugfix: Tram benches don't override standard benches - bugfix: Reduced saturation and brightness of standard bench +<<<<<<< HEAD OrionTheFox: - imageadd: in a continued organization effort, all skyrat Spacesuit sprites have been moved to suits/spacesuit.dmi files. Please report any relevant issues! @@ -376,10 +660,55 @@ - bugfix: Transferring objects from a belt to another storage object now removes those objects from the belts visuals. - qol: Adds screentips to both signs and plaque construction/modification. +======= + NamelessFairy: + - bugfix: Transferring objects from a belt to another storage object now removes + those objects from the belts visuals. + - bugfix: Freezer no longer lock automatically when closed. + Profakos: + - bugfix: swapping to a stored DNA no longer forces you to be human instead of the + species stored in the DNA + itseasytosee: + - imageadd: inhands for fairy grass tiles +2023-02-08: + ArcaneMusic: + - qol: Adds screentips to both signs and plaque construction/modification. + Jacquerel: + - bugfix: Changeling meteors on Icebox will now land close to the station instead + of a random map edge tile. + - refactor: Tidied up spider ability code, they should all work the same, but please + report if they do not. + - refactor: Spiders and Geneticists now use the same ability to make webs rather + than two virtually-identical ones, which should also perform just as it did + before this change. + - bugfix: Setting a directive as a Spider Midwife should properly pass and announce + itself to new spiders. + LT3: + - spellcheck: Gloves now mention modes, not intents + LemonInTheDark: + - bugfix: Your hud should break much less now + Melbert: + - bugfix: Custom named drinks (with a pen) no longer reset after their glass volume + updates + - bugfix: Admins, "All areas unpowered" in the secrets menu will now function again. + - bugfix: DNA injecting other people is no longer instant + - bugfix: Forcing people to drink is no longer instant + - bugfix: False alarm radiation leaks should be less obvious + - bugfix: Fixes some traitor objectives from dropping in blacklisted areas, like + security. + Mey-Ha-Zah: + - imageadd: 'Updated Regal Rat Sprites: Provided by Onule.' + Rhials: + - bugfix: midround changelings no longer spawn a dummy body on the arrivals shuttle. + SyncIt21: + - bugfix: Bibles can convert other bibles + Thunder12345: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: CTF guns spawn in the default active hand - qol: CTF shields become transparent as they lose charge - qol: CTF King of the Hill scores are visible to players in-game - qol: CTF controllers can no longer be blocked by players standing on them +<<<<<<< HEAD - imageadd: 'Updated Regal Rat Sprites: Provided by Onule.' - balance: There's a second detonation wire on payload bombs now. - balance: Cutting the proceed wire no longer detonates the bomb but instead deactivates @@ -505,6 +834,41 @@ vinylspiders: - bugfix: hotfixes vox spawning with their internals closed 2023-02-14: +======= + itseasytosee: + - imageadd: Shotgun shell suit storage sprites + tf-4: + - spellcheck: The message given when a limb is disabled has had its spelling corrected. + vinylspiders: + - bugfix: fixes oxyloss not being applied when there is a partial pressure of 0 + (no more being able to breathe in space) + - code_imp: fixes any lingering damage-application issues related to non MOB_ORGANIC + biotypes + - refactor: refactored lungs to have a respiration_type flag which is then used + by adjustOxyloss/setOxyloss to determine whether to take 'oxygen' damage. +2023-02-09: + Jacquerel: + - bugfix: Hostile Basic Mobs such as carp, rats, and moonicorns will no longer gain + the power to bite anyone they can see regardless of distance and intervening + obstacles upon defeating their first target in combat. + MMMiracles: + - rscadd: Tramstation has received a substantial overhaul! Please consult your local + tour guide and station maps for changes. + Melbert: + - bugfix: Revolutionary Heretics and Cultists Traitors no longer lose all of their + joy in life after being de-converted from their respective causes. + NamelessFairy: + - bugfix: Some misplaced decals on icebox have been removed. + Xander3359: + - bugfix: metastation toxins no longer has a weird double light fixture. + mc-oofert: + - rscadd: Luxury Shuttle is now bigger, and less ugly! Poor people still get it + rough though... + timothymtorres: + - bugfix: Fix kilo barsign spawning under windows + - bugfix: Fix barsign updatePath being backwards +2023-02-10: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: 'Tramstation: Crossing signals updated to work on the new map' - bugfix: 'Tramstation: Fixes missing wiring in West Wing' @@ -513,6 +877,7 @@ - bugfix: 'Tramstation: Fixes part of medbay area being set as space' - bugfix: 'Tramstation: Medbay''s elevator buttons are now accessible' - bugfix: 'Tramstation: Elevator doors, buttons, and indicators are linked' +<<<<<<< HEAD MMMiracles: - rscadd: Tramstation has received a substantial overhaul! Please consult your local tour guide and station maps for changes. @@ -552,10 +917,77 @@ how fast you move I think it makes you slower - admin: Admins can now customize the crate type and landing zone of the stray drop pod event. +======= + Time-Green: + - bugfix: fixes issues with being walking against hyperspace locking you + ZephyrTFA: + - bugfix: Using a hacking cable will no longer permanently spam you with balloon + messages +2023-02-11: + Fikou: + - admin: adds findtext (+ex), view, viewers, rect_turfs and flick as sdql2 wrappers + Jacquerel: + - bugfix: Plating replaced by floor tiles from a dimensional anomaly or colossus + crystal will now still have plating underneath when crowbarred, instead of space + (or open space on z level maps). + - bugfix: Summoning a cult wall on plating as an Artificer will leave the plating + intact underneath when it is removed, rather than replacing it with a void. + - admin: Admins can pick the initial flavour of a manually triggered dimensional + anomaly. + - refactor: Spider healing abilities have been refactored to reuse the same code + rather than reimplement it across two different mobs, it should work the same + as it used to. This is also used by Lightgeists. + - bugfix: Mob biotype on `heal_overall_damage` should be applied more consistently. + This might mean that some things which were previously healing prosthetic limbs + have stopped doing that. + - bugfix: Removes a duplicate file which was preventing the new regal rat sprite + from being used. + LT3: + - admin: Changed color for watchlist notifications + LemonInTheDark: + - bugfix: Solar trackers actually uh, look right again + - bugfix: Solar panels and trackers will now properly block space lighting on multiz + maps + MMMiracles: + - bugfix: The elevator panel for Tramstation's medical elevator will no longer clip + into the side window when raised up. + - bugfix: The escape pods should now actually launch with the shuttle. + Melbert: + - bugfix: The bastard sword can create constructs again. Just hit the shells with + it + Paxilmaniac: + - bugfix: Ghost role spawners will now no longer try and spawn people when they + /should/ have been out of uses but due to a bug were not + SuperSlayer0: + - bugfix: Fixes reverse revolver name being different from syndicate revolver name + ZephyrTFA: + - bugfix: AIs can no longer change their shell's icon_state to any image at will + carshalash: + - spellcheck: Adjusted punctuation marks for several emotes. +2023-02-12: + Capybara Holly: + - bugfix: Fixes a theoretical bug where glide-size could get unsynced from your + movespeed after unbuckling + LT3: + - imageadd: Fixed alignment of corner railings + Profakos: + - bugfix: slipping on lube while buckling will lead to less weird states + kawoppi: + - refactor: refactored *blush and *cry emote visuals into bodypart_overlays + - rscdel: lack of eyes will no longer prevent the *cry emote overlay from displaying + mc-oofert: + - bugfix: Any circuit boards with custom sprites now actually use that sprite + the-orange-cow: + - bugfix: heretic blades can now properly butcher + tralezab: + - rscadd: 'Added two new sanguine wizard spells: Exsanguinating Strike and Scream + For Me' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Every tier of "Scrubber Overflow" can now choose a random single reagent mode - admin: '"Custom" overflow, which was kinda confusing and unintuitive, is now called "Every Vent", much more self-explanatory in what it does.' +<<<<<<< HEAD - bugfix: Mechs no longer have zero armor when built. coiax: - bugfix: Tiziran canned goods no longer decompose into mush. @@ -567,11 +999,99 @@ - bugfix: Fixed Augments+ and Quirk points to interoperate as expected. You can now use your points balance to select augments, and select augments to earn points! +======= +2023-02-13: + Jacquerel: + - rscadd: Wizards can now perform a Grand Ritual to summon unpleasant events to + the space station. + - rscadd: Wizards completing the Grand Ritual a sufficient number of times can achieve + victory at the end of the round, and cast a powerful round-changing spell. + - bugfix: Heretic runes are now invisible to the AI (and cyborgs) while being drawn + as well as when finished. + Melbert: + - bugfix: Fixes player panel "make ai" button not fully working on observers + - bugfix: Fixes some situations where paradox clones go sicko mode + NamelessFairy: + - bugfix: Soporific sniper magazines use the correct icon again. + - imageadd: Penetrator and Marksman sniper magazines now have icons. + Rhials: + - rscadd: Ectoplasmic Outburst anomaly event + - rscadd: Reactive Ectoplasm Armor + Shadow-Quill: + - bugfix: Gravity generators have been re-centered. + ZephyrTFA: + - bugfix: Spells which are only able to be cast on the station can now only be cast + on the station + itseasytosee: + - imagedel: Android abductors and skeletons have lost all modesty and have stopped + wearing underwear. + kawoppi: + - imageadd: when equipped with a bluespace trash bag the pimpin' ride janicart will + now display a bluespace trash bag instead of a normal trash bag + mc-oofert: + - bugfix: aux base turrets now shoot fauna + scriptis: + - bugfix: preferences now respects your preferences +2023-02-14: + Jacquerel: + - refactor: Spider code has been refactored and AI-controlled spiders may have slightly + different movement or reaction times. + - bugfix: Basic mobs can now be slowed when they take stamina damage, however currently + only spiders actually _can_ take stamina damage. + - bugfix: Spiders should now more reliably disable their AI when controlled by a + player. + - bugfix: Araneus is no longer considered to be a bat and so cannot fly. + - bugfix: Araneus is no longer considered to be a bat and so is no longer frightening + to people who are scared of the supernatural. + LT3: + - bugfix: Tram damage calculation takes into account compound wounds + - code_imp: Tram crossing signals are now map specific + - admin: Combat log now generated when the tram collides with someone + LemonInTheDark: + - bugfix: Equipping an fov item, disconnecting, waiting 6 minutes and reconnecting + will no longer break your game + Melbert: + - bugfix: Syndicate declarations of war no longer murder apostrophes and their friends + - bugfix: The alert box for the declaration of war no longer looks funky, and counts + forwards in time rather than backwards + - bugfix: Fixed being able to send unencoded HTML to newscasters + - bugfix: Fixed a runtime from hovering over a meat spike / kitchen spike with an + empty hand + - bugfix: Changing species no longer drops all held items + - bugfix: Losing your right hand not un-cuffing you or dropping your gloves + Mothblocks: + - bugfix: Using a fire extinguisher with a chair now properly does...something with + how fast you move I think it makes you slower + NamelessFairy: + - spellcheck: All station closet and lockers have had their naming conventions standardized. + - bugfix: Tram now has evidence lockers labelled 1 through 7 instead of 7 evidence + lockers labelled as locker 1. + Profakos: + - bugfix: taking an item out of the food processor and putting back in will not + dupe the results when you process them + SyncIt21: + - rscdel: Removes sprite changes done to smart pipes + - bugfix: pipes disappearing at weird angles + ZephyrTFA: + - bugfix: Mechs no longer have zero armor when built. + coiax: + - bugfix: Tiziran canned goods no longer decompose into mush. + jlsnow301: + - bugfix: Security can set notes through consoles again + - bugfix: Observers are now properly logged out of record consoles + necromanceranne: + - qol: Limits the amount of emotes being passed to chat by viruses. + vinylspiders: + - bugfix: fixes a potential bug that can cause the detective scanner to get stuck + in a scanning state indefinitely +2023-02-15: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Sitting on benches no longer gives you a weird offset that makes you look like you're standing on them. - bugfix: Returns benches to their original light brown color, rather than the middle between brown and cyan that they were at for a bit. +<<<<<<< HEAD GoldenAlpharexx: - bugfix: Towels will now properly display on digitigrade characters. - imageadd: Towels now have a digitigrade worn sprite too! @@ -630,11 +1150,30 @@ - bugfix: False alarm radiation leaks should be less obvious - bugfix: Fixes some traitor objectives from dropping in blacklisted areas, like security. +======= + Jacquerel: + - bugfix: Hacking the Comms Console or winning a Revolution can no longer spawn + antagonists if there's not enough time left in the round for them to antagonise + anyone. + Melbert: + - bugfix: Fixed a runtime from mime *kissing silicons and simplemobs. + - code_imp: Hostile Station Lockdown, from Malfunctioning AIs, will no longer halt + the server momentarily + - config: 'Policy.json config got updated. The following values need to be updated:' + - config: '"Obsession" -> /datum/antagonist/obessed' + - config: '"Heretic" -> /datum/antagonist/heretic' + - config: '"Headslug Changeling" -> /datum/antagonist/changeling/headslug' + - config: '"Pyroclastic Anomaly Slime" -> /datum/antagonist/pyro_slime' + - config: ALL antags in the policy.json file will now get notified of any existing + policy set by the admin team, rather than only a handful. + - bugfix: Fixed a runtime with examining empty bomb frames +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed a FIVE YEAR OLD issue causing Time Stop to be a 3x3 instead of a 5x5. Really. - bugfix: The gravity generator correctly gives "forced gravity" to all adjacent mobs - bugfix: Fixed some runtimes with Time Stop, and other miscellaneous issues +<<<<<<< HEAD - code_imp: Hostile Station Lockdown, from Malfunctioning AIs, will no longer halt the server momentarily SkyratBot: @@ -642,6 +1181,42 @@ a Rod of Asclepius - bugfix: Bileworms which have been struck down but not butchered no longer return in a more powerful form. +======= + NamelessFairy: + - spellcheck: Head of staff lockers and prison cell lockers have had their proper + noun status returned. + SuperSlayer0: + - balance: Mech disabler now works as a shotgun, shooting 5 weak disabler beams + at one time. + - balance: Mech disabler now uses 100 energy instead of 30, and it's attack cooldown + increased to 1.5 seconds instead of 0.8 + coiax: + - bugfix: Drones no longer destroy toner cartridges when ejecting them from photocopiers. + timothymtorres: + - code_imp: Added unit testing to force all ruins to spawn for CI build + tralezab: + - balance: Malf AI turret upgrades are now much stronger, fully healing, increasing + max health, and setting stun projectiles to taze. + vinylspiders: + - bugfix: hotfix for lungless oxyloss immunity + - bugfix: hotfix for mobs being able to circumvent reagent respiration_type requirements + by removing their lungs +2023-02-16: + Jacquerel: + - bugfix: Things dropped into a chasm should no longer occasionally become invisible + and intangible. + - bugfix: Bileworms which have been struck down but not butchered no longer return + in a more powerful form. + - bugfix: Mice and Regal Rats will no longer spawn in icebox's solar panels and + die of cold. + - bugfix: Medieval Sim holograms no longer spawn holding unusable laser rifles which + also block using their old timey weaponry. + Melbert: + - bugfix: It should be way harder to lose your special hands as a zombie or shattered + risen ghoul. + - refactor: Refactored mutanthands for zombies and shattered risen. + NamelessFairy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Reinforced plasma windows will now drop plasma glass instead of regular glass when broken. - bugfix: Tram windows drop the correct number of rods and a shard when broken instead @@ -650,10 +1225,73 @@ the file slightly. - refactor: spawnDebris has been un-hardcoded and all (but one) override of it has been removed. +<<<<<<< HEAD - code_imp: Added unit testing to force all ruins to spawn for CI build - bugfix: eyesnatchers that say that they haven been used up can't be used again - bugfix: Things dropped into a chasm should no longer occasionally become invisible and intangible. +======= + Profakos: + - bugfix: eyesnatchers that say that they haven been used up can't be used again + ZephyrTFA: + - bugfix: You can no longer keep an AI trapped in their core by healing them with + a Rod of Asclepius +2023-02-17: + Jacquerel: + - bugfix: The Fugu Gland can once more be used on Ian, Carp, Giant Spiders, or other + basic mobs. + - bugfix: Syndicate mobs will once again attack windows to try to reach you, and + space ruin spiders won't. + - bugfix: Netherworld-themed mobs will correctly adjust their speed as they take + damage. + - refactor: Made the Wumborian Fugu into a basic mob, which should act largely the + same way but may have slightly different speed and reaction times. + Kubisopplay: + - admin: Lowered the chance of accidentally leaking asay + LT3: + - bugfix: 'Tramstation: Added missing produce order console' + - bugfix: 'Tramstation: Removed duplicate vending machine in east wing' + - bugfix: 'Tramstation: HoP office can now broadcast announcements' + - code_imp: 'Tramstation: Moved information plate for symmetry' + - code_imp: 'Disease Outbreak: Disease max severity replaced with requested severity' + - code_imp: 'Disease Outbreak: Generated disease now includes symptom based name' + - code_imp: 'Disease Outbreak: Disease name is now included in the station announcement' + - code_imp: 'Disease Outbreak: Now in snake case' + - balance: 'Disease Outbreak: Tier 1 cures removed from pool' + - bugfix: 'Disease Outbreak: Dangerous/Biohazard diseases are now visible' + - bugfix: 'Disease Outbreak: Event setup generates the correct severity' + - bugfix: 'Disease Outbreak: Various potential symptoms were in the wrong symptom + pool' + MrStonedOne: + - config: Repeated configs in other files (from $include) will no longer trigger + a config error. Repeated configs in the same file still will. + - config: In all cases the new value will still be used + NamelessFairy: + - spellcheck: A grammatical error in strip text has been removed. + Profakos: + - bugfix: Health analyzers will properly report missing stomachs and tongues + - bugfix: Guillotines can be unanchored again + SuperSlayer0: + - rscadd: Added a traitor final objective to infect the station AI with a virus, + that turns it malf and fully loyal to the traitor + Time-Green: + - bugfix: fixes taking items from inventories glitching out in hyperspace + YehnBeep: + - server: Updated instructions on setting up a TGUI CDN, noting that TGUI via CDN + malfunctions in the event CORS headers are absent. + lizardqueenlexi: + - bugfix: Placed a missing mining order console on Tramstation. + - bugfix: Rearranged furniture in the Tramstation pharmacy to make the fridges accessible. + timothymtorres: + - bugfix: Fix icebox barsign spawning under windows for Icebox. + - bugfix: Fix kilo barsign to spawn directly on top of wall so people can see it + from both inside the bar and outside the main hallway. + - bugfix: Fix durand shield overlay to appear above the mech when facing south. Also + fixed a lighting runtime when shield would turn on/off. + tralezab: + - refactor: Monkey AI descriptions of "primal eyes" no longer show if the monkey + is missing eyes. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-02-18: Chubbygummibear & JohnFulpWillard: - rscadd: A ton of new NtOS themes, which are accessible by the new Themify application @@ -670,6 +1308,7 @@ - bugfix: Programs no longer download twice. - rscdel: Removes the Chemistry computer disk as it was empty due to chemistry app's removal +<<<<<<< HEAD LT3: - code_imp: 'Disease Outbreak: Disease max severity replaced with requested severity' - code_imp: 'Disease Outbreak: Generated disease now includes symptom based name' @@ -748,12 +1387,62 @@ of downloading illegal ROMs if you change your theme to anything that isn't Syndicate. - bugfix: NtOS themes are now recognized by all windows. +======= + Jacquerel: + - bugfix: Cramped escape pod walls no longer appear to merge with those of the station, + which will be a big relief to the single occupant. + - bugfix: Lightgeists won't try to heal any damage which isn't burn or brute, because + they can't. + - bugfix: Lightgeists don't need to perform an action bar in order to heal someone, + which was added by mistake. + LT3: + - bugfix: Fixed broken icon path in TCG set + Melbert: + - bugfix: Transferring golem shells no longer make you a free man and also results + in infinite golem shells + - bugfix: Servant golems are considerably less free + - bugfix: Fixes some hard deletes related to mob minds being enslaved to other mobs + NamelessFairy: + - bugfix: Reinforced Plating baseturf helpers work and should now be bug free enough + to be used in maps. + - bugfix: On metastation the gravity generator foyer airlock access has been made + consistent with the rest of the engine room airlocks. + - bugfix: False walls will no longer tell you to wait until they've stopped moving + when you use an item on them. + Profakos: + - bugfix: emagged/delta pods properly fly to lavaland + - bugfix: Revelation once again wipes the stored files on the computer + Roryl-c: + - bugfix: fixed chat offsets with the RPG Titles event + SyncIt21: + - bugfix: rcd's not building plating underneath mobs & structures + - bugfix: wall girders not being completed by the rcd + - bugfix: unable to build windoors on the turf you are standing on + TheBoondock: + - bugfix: fixed weak dwarfs being too weak as to be unable to throw books + Time-Green: + - bugfix: falling off the shuttle wont trap you in a box anymore + timothymtorres: + - bugfix: Fix runtimes for IV drips, food processors, and gibber + - refactor: Refactored, improve, and rename canUseTopic to be can_perform_action + that now uses bitflags to determine if a mob can perform an action. + tralezab: + - refactor: Lizard related canned food now acts like canned food + - refactor: Refactors how nuclear activation disk works. Shouldn't notice a whole + lot but if you do, it might be because of this. + - admin: Disk now has an examine message for whether it's secure or not, to make + it less ambiguous for players. +2023-02-19: + Jacquerel: + - bugfix: You can no longer eat pizza floor tiles with your brain. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Lobstrosities and Tarantulas will once more vibrate to let you know they're about to charge at you. - bugfix: The Savannah Ivanov will once more vibrate to let you know it's about to jump into the air. - bugfix: The DNA infuser will now vibrate to let people know that it's busy blending someone with a dead animal. +<<<<<<< HEAD - bugfix: Guillotines can be unanchored again - bugfix: Fixes mending globule ability not having a cooldown - bugfix: fixed throwing description to always say "it was thrown very hard" even @@ -930,6 +1619,45 @@ - imageadd: Almost all Mekas have been resprited in their entirety. Halcyon: - bugfix: The Paramedic cap is now the same color as their jumpsuit again. +======= + LemonInTheDark: + - rscadd: The darkness that glasses and hud goggles that impact your nightvision + (think mesons, nightvision goggles, etc) lighten is now tinted to match the + glasses. S pretty IMO, and hopefully it helps with forgetting you're wearing + X. + - balance: Nightvision is darker. I think bright looks bad, and things like mesons + do way too much + - balance: Mesons (and mobs in general) no longer have a static distance you can + see stuff in the dark. If a tile is lit, you can now see it. + - bugfix: Nightvision no longer dims colored lights, instead simply thresholding + off bits of darkness that are dimmer then some level. + Melbert: + - bugfix: Cult Ghosts can see in the dark and invisible stuff, a mechanic intended + for over 5 years and never functional + - bugfix: Ethereal revival causing traumas again. + - bugfix: Heartless zombies will now revive again + - bugfix: Zombies no longer take constant ticking damage from lacking a heart + ZephyrTFA: + - bugfix: Moth wings can now correctly be healed + coiax: + - bugfix: Folding a "fancy box" like donut or candles will now put cardboard in + your hand, rather than on the floor. + - bugfix: You can always see how many pickles are in a jar of pickles, or rolling + papers there are in a pack of rolling papers, since it's not possible to close + them. +2023-02-20: + Jacquerel: + - bugfix: Removes a runtime error caused by moving your PDA between slots. + - bugfix: Clicking a spider egg and then closing the radial menu won't print a message + in admin channel informing admins that the egg didn't spawn anything. + JohnFulpWillard: + - bugfix: NtOS program downloader now works again, and will now properly alert you + of downloading illegal ROMs if you change your theme to anything that isn't + Syndicate. + - bugfix: NtOS themes are now recognized by all windows. + - spellcheck: Hallucinations where you see people put things away now tell you they + put the right thing away. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JohnFulpWillard and itsmeow: - bugfix: Messenger now clears photos after you send it, so you don't send a photo repeatedly until you manually clear it. @@ -937,9 +1665,164 @@ with old PDAs) - bugfix: AIs can now select photos in their Messenger app. - bugfix: Messenger no longer says you're sending outgoing messages to yourself. +<<<<<<< HEAD Melbert: - bugfix: Gaining nobreath in an N2O heavy environment doesn't make you forever aware of it +======= + LT3: + - imageadd: Wall mounted tram sign now has improved emissives and casing + LemonInTheDark: + - bugfix: Moving up and down z levels will break hud stuff slightly less often + MidoriWroth: + - qol: Tweaked around some foods to make them easier to make + NamelessFairy: + - bugfix: A accidently stacked roller bed on lavaland has been removed. + - bugfix: You cannot print blank documents from a photocopier if you cannot afford + them anymore. + - bugfix: Mounting the photocopier will now eject paperwork as it does with photos + and paper. + - refactor: Lots of duplicate code and some unnecessary vars removed from photocopier + code. + Rhials: + - bugfix: Midround Changelings are now ejected from their meteor when something + bad happens, ensuring they reach the station. + Roryl-c: + - bugfix: seiver no longer applies purity and delta time twice + - code_imp: made seiver code much less confusing + SuperSlayer0: + - bugfix: Fixes mending globule ability not having a cooldown + TheBoondock: + - bugfix: fixed throwing description to always say "it was thrown very hard" even + when its not + coiax: + - bugfix: Eating fish and meat poke bowls no longer consumes the bowl, just the + food inside. + tralezab: + - bugfix: Valentines and other antags no longer break highlander +2023-02-21: + Jacquerel: + - bugfix: Many spell-like abilities which could be stunned, paralysed, or frozen + in time now cannot be. + - bugfix: Pet dogs will once again fetch items for you + Maurukas: + - bugfix: a vent pump that was installed backwards in the Kilostation Ordnance airlock + has been repaired. + NamelessFairy: + - bugfix: Holopads will blink when being called rather than just glowing. + - bugfix: Holopads will not blink forever if you missed a call. + - bugfix: Mice will now retain their color when they die. + RikuTheKiller: + - bugfix: Oculater works again. + SuperSlayer0: + - rscadd: Added a new cybernetic implant that increases punch damage of a human + TheBoondock: + - bugfix: fixed goliath heart having missing icon + coiax: + - bugfix: Paper planes when unfolded will put the paper in your active hand, rather + than a different hand, just like cardboard boxes. + skylord-a52: + - bugfix: candles are made of a more appropriate material + sqnztb: + - bugfix: frail and paraplegia quirks can once again be taken together. + tralezab: + - bugfix: You can use ninja adrenaline to cure unconsciousness as intended + - code_imp: Cleaned up some modsuit code + - bugfix: Fixes some cases where AI couldn't interact with some old non-tgui machines + vinylspiders: + - imageadd: new inhand sprites for the broken holy flask + - bugfix: fixes broken holy water flask looking like a broken beer bottle + - bugfix: unholy flasks now use a blackened holy flask inhand sprite instead of + the beaker one +2023-02-22: + Jacquerel: + - bugfix: Restores lost behaviour to heal Ian with sutures. Or giant spiders, if + you want to do that for some reason. + LemonInTheDark: + - config: Added a warning build config setting, you can now lightly repremand but + not block clients with older builds but fine major versions + - bugfix: Fixes activating two flashlights without moving only turning on one flashlight + (until you move) + - bugfix: Purely black things drawn on the floor (like carpets, those foam dispensers, + etc) will no longer cause things on top of them to be fully masked in darkness + Melbert: + - bugfix: Ghost roles from spawners keeping antag datums + Ryll/Shaps: + - bugfix: Landing a monster tackle that applies an auto aggro-grab while stamcrit + will no longer try applying an aggro-grab that leads to a permanent slowdown + to the user, and will instead just knock the target down a bit harder. + - bugfix: Launching dolphin and rocket glove tackles on targets at ranges shorter + than their minimum distance will be more accurate at targeting where you clicked + at, rather than locking you into the nearest cardinal/diagonal direction. + - balance: You can now knock more things off a table full of stuff by tackling it + than you could before. +2023-02-23: + CesarBaylina: + - qol: Made associative lists more apparent in circuits. + Jacquerel: + - bugfix: Moths can eat clothes again. + - bugfix: The paradox clones of plasmamen now come properly dressed for the occasion. + Melbert: + - bugfix: Deconstructing (or overloading) the Master RND server with an HDD preset + will correctly half research rate + SyncIt21: + - qol: right clicking the seed extractor with a plant/food stores the extracted + seeds in the machine. + coiax: + - bugfix: When loading food into a microwave via serving tray, you can now see the + food inside the microwave afterwards. + tralezab: + - bugfix: fixed regal rat rummaging lines sometimes getting you muted! +2023-02-25: + JohnFulpWillard: + - bugfix: NtOS' Arcade program works again. + LemonInTheDark: + - bugfix: The gulag shuttle's point claim console will load in again. Whooops + NamelessFairy: + - bugfix: CTF flags will no longer catch fire when placed into lava, preventing + one class from picking it up. + - code_imp: CTF flags no longer respawn when they get qdeleted, this means you can + now delete them when debugging/as an admin. + Profakos: + - bugfix: Honourbound can no longer be gained from neurowine or from heavy brain + damage, no longer causing the player to be granted a spell that does nothing + most of the time + Rhials: + - bugfix: The disease outbreak/heart attack event candidate list will now clear + itself before generating. + coiax: + - bugfix: A chef who is beheaded, and the head stitched on another body will still + see their food as their own. + kawoppi: + - soundadd: dismantling an unplaced wallframe will now make a wrench sound +2023-02-26: + Helg2: + - rscadd: Adds privacy shutters for quartermaster. Shutters on Kilo/IceBox and blastdoors + on Meta/Delta/Tram. Also changed doors with glass to common ones. + Jacquerel: + - refactor: Changeling's Lesser Form is now one ability instead of two which keep + swapping, which should consistently turn you back and forth without deleting + itself from your action bar. + - bugfix: Hatching from an egg left by a Last Resort headcrab should correctly grant + you Lesser Form in addition to your other abilities. + - bugfix: Turning into a monkey while using the Changeling space suit won't leave + you as a monkey with a weird inflated head. + - qol: Using lesser form as a monkey with only one stored DNA profile will skip + asking which profile you want and will simply transform you immediately into + the only option. + - bugfix: Painting with the slippery spraycan will now once again correctly make + that tile slippery. + - bugfix: Spraying the ground with the hellcan will now once again correctly set + that tile, you, and other surrounding objects on fire. + Kubisopplay: + - bugfix: Fixes split personality kicking out the original owner of the body. + Melbert: + - bugfix: Gaining nobreath in an N2O heavy environment doesn't make you forever + aware of it + - bugfix: Premade viruses (GBS, beesease, etc) now show up in the PANDEMIC again + - bugfix: PANDEMICs should bluescreen less often. Maybe. + - bugfix: Mecha speech indicators actually go away +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Scan gates correctly flick their alarm overlays, I think they already looked correct but now it's more correct - bugfix: If you are somehow a human without a species, the generic zap animation @@ -947,6 +1830,7 @@ - bugfix: Nuke Ops Leaders midround don't spawn on Arrivals Shuttle late for work - bugfix: (Maybe) fixes some additional issues related to midround nukie / abductor spawns +<<<<<<< HEAD - bugfix: Premade viruses (GBS, beesease, etc) now show up in the PANDEMIC again - bugfix: PANDEMICs should bluescreen less often. Maybe. Motho: @@ -990,12 +1874,45 @@ ATHATH: - spellcheck: Corrects the description of the transmission 4 threshold effect of the Narcolepsy symptom to more accurately reflect what the effect does. +======= + NamelessFairy: + - bugfix: The unanchored reinforced plasma-glass windows on snowdin have been anchored. + - bugfix: Unregistered paywall firing pins wont vanish when you try to insert them + into a gun + - bugfix: Declining to pay for a paywall firing pin will no longer brick the firing + pin for everyone + - bugfix: paywall firing pins are linked to bank accounts instead of unique users, + so they can't be used for overly elaborate ling checks or letting people without + IDs fire them for free. + - bugfix: Attempting to fire an empty gun with a paywall firing pin will no longer + charge you. + - bugfix: Multi-shot paywall firing pins do not charge you for agreeing to the initial + prompt. + - spellcheck: Fixes a spelling mistake in paywall firing pin prompts + - code_imp: The owner of a paywall firing pin is now tracked via account rather + than ID, this stops the pin from holding a reference to a deleted ID if the + ID is ever destroyed. + Rhials: + - bugfix: The radiation leak event no longer targets machinery that doesn't use + power. +2023-02-27: + ATHATH: + - spellcheck: Corrects the description of the transmission 4 threshold effect of + the Narcolepsy symptom to more accurately reflect what the effect does. + Boopideedoo: + - bugfix: Added E.X.P.E.R.I.M.E.N.T.O.R + Jacquerel: + - bugfix: Spiders will stop being on fire marginally faster, as they used to. + - bugfix: Mob spawners will no longer break if instructed to spawn certain kinds + of basic mob, or monkeys. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Disease Outbreak doesn't give up so easily when trying to start the event - balance: Disease Outbreak will not spawn on positive virus mobs, but can be transmitted if resistance is low - bugfix: Disease Outbreak creates an entry in the virus log like it should - admin: Admins can see Disease Outbreak virus stats when the event starts +<<<<<<< HEAD - admin: Roundstart logout report is written to the admin log - admin: Roundstart report threshold is now 10 minutes Paxilmaniac: @@ -1019,3 +1936,62 @@ on Meta/Delta/Tram. Also changed doors with glass to common ones. vinylspiders: - bugfix: fixed emergency shutters' bottom lights still blinking when door is opened +======= + NamelessFairy: + - bugfix: Any worn item that has its color changed will now have its color change + reflected on the item's worn icon immediately. + - bugfix: Cult Seek your master now has an icon. + - bugfix: You can no longer drive ridable vehicles without keys or in space. + - bugfix: Borg hypospray will correctly tell you the name of the limb that is blocked + when trying to inject into a blocked limb. + RikuTheKiller: + - bugfix: Nooartrium now pulls your ghost back into your body when it revives you. + SmoSmoSmoSmok: + - bugfix: the order vendors will not constantly load when trying to buy multiple + items + SuperSlayer0: + - bugfix: Fixes strong arm implant attacks stunlocking people + - bugfix: Strong arm implant attacks no longer stack with hulk attacks + Tattle: + - bugfix: removed a double monitor from Delta cargo + Timberpoes: + - bugfix: Fixes formatting for the paper containing vote box final tallies. "I love + democracy". + - bugfix: Fixes broken input fields on photocopied paper. + kawoppi: + - bugfix: filled trashcarts spawn nearby grime when initialized instead of when + opened for the first time + mc-oofert: + - bugfix: MMIs/Positrons dont get slept forever when the mech theyre in gets destroyed +2023-02-28: + Jacquerel: + - bugfix: Maintenance tunnels should no longer sometimes contain airlocks with walls + underneath them. + - refactor: Migos, Creatures, and Blank Bodies use a new shared component to update + their stats which scales smoothly as they take damage rather than in stages. + - bugfix: Migos, Creatures and Blank Bodies will all update their stats when taking + or losing damage regardless of it was from an identifiable enemy. + - bugfix: Using a teleport scroll will deplete a charge regardless of whether used + in-hand or by pressing the action button. + - refactor: The actions of Statues and Creatures which can't be used while seen + now share logic, and will not spam chat with feedback. + LT3: + - admin: Roundstart logout report is written to the admin log + - admin: Roundstart report threshold is now 10 minutes + NamelessFairy: + - bugfix: Un-aimed admin rods will now actually be un-aimed instead of aimed at + the previous aimed rods target. + - admin: Admin aimed rods will now log that they're aimed randomly when not aimed. + flowercuco: + - bugfix: surplus crates and united surplus crates now properly show up as a purchase + in the round end screen + itseasytosee: + - bugfix: Monkeys ues the proper husk sprites. + - imageadd: The monkey has been moved back down to its lower, more submissive position. + - refactor: Your bodyparts are now dynamically rendered at a height relevant to + the length of your legs and torso, what does this mean for you? Not much to + be honest, but you might see a monkey pop up a bit if you cut its legs off. + - admin: The Tallboy is here + jlsnow301: + - bugfix: Fixes NTOS records program receiving bad medical disability data +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-03.yml b/html/changelogs/archive/2023-03.yml index 77fb7ef375f..7185373119b 100644 --- a/html/changelogs/archive/2023-03.yml +++ b/html/changelogs/archive/2023-03.yml @@ -1,4 +1,5 @@ 2023-03-01: +<<<<<<< HEAD Melbert, That REALLY Good Soda Flavor, FatFat, AndreyGusev: - rscadd: 'Spacemen can now have varying height. (Admin only for now) add: Dwarfs are now slightly shorter, but look way better.' @@ -50,6 +51,48 @@ have stopped doing that. - bugfix: You can no longer trap yourself in north public mining maintenance if you enter it without maint access. +======= + Jacquerel: + - bugfix: Opening a surprise egg with your mind will no longer teleport the contents + Maurukas: + - bugfix: A disconnected vent on the syndicate lavaland base is now connected + Melbert: + - bugfix: Off station roles can't purge the station's records + - bugfix: Purging records is logged again + - bugfix: Ninja security records hacking works + NamelessFairy: + - bugfix: You can now create wanted/missing posters using player created security + records. Due to a visual bug and usability issue photos above 1 by 1 meters + in size will no longer work for mugshots in records. + Remuluson2: + - bugfix: After pressure from Nanotrasen, Space Wizard Federation made glass and + bone knives non-conductive again. + scriptis: + - bugfix: removes an infinite powercell from tram maintenance +2023-03-02: + Jacquerel: + - bugfix: 'Stabilized slime extracts will now once again work from inside modsuit + storage. + + fix; Stabilized slime extracts will properly effect carp, spiders, bileworms, + and other "basic mobs".' + JohnFulpWillard: + - bugfix: Being in an application now properly uses the tablet's battery. + - bugfix: Messenger and Themify apps now close when minimized, so don't count towards + the running app limit. + - bugfix: Tablet UIs will now no longer spam open/close the UI when changing applications + - bugfix: Using the Eject ID button on tablets now ejects into your hand. + - bugfix: Computers now have an Eject ID button + - refactor: Cut down a lot of copy paste in tablet & program code, now it's mostly + done by the tablet. + Melbert: + - bugfix: Using Fleshmend while on fire gives the "on fire" fleshmend icon. + - bugfix: Using Revival stasis more accurately updates the icon where relevant + - bugfix: Fixes a potential input stall with revival stasis + - bugfix: Nightmare revival acts less funky - stops it from re-creating the Light + Eater. + NamelessFairy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The research directors monitor on tram has been correctly orientated - bugfix: The CE on tram no longer has two engineering department monitors, one has instead been swapped out for an engine monitor. @@ -57,6 +100,7 @@ or AI core networks, this means security cannot see the entire satellite from a standard camera console. - spellcheck: Some cameras on tram have been capitalized. +<<<<<<< HEAD - bugfix: fixes taking items from inventories glitching out in hyperspace - bugfix: Sec huds should properly label targets with the new record system - bugfix: Opening a surprise egg with your mind will no longer teleport the contents @@ -175,11 +219,41 @@ - bugfix: The HoS' PDA painter can no longer paint PDAs into Lawyer ones. - bugfix: You can no longer multiply banana peels, gatfruit and more by using sliceable custom food +======= + - bugfix: You can no longer trap yourself in north public mining maintenance if + you enter it without maint access. + Profakos: + - bugfix: Mail addressed to tram's cargo bay disposal bin will arrive successfully, + and the Incoming Mail Chute will properly accept wrapped parcels. + RikuTheKiller: + - bugfix: Reagents metabolize properly when dead. (If they're supposed to.) +2023-03-03: + Cheshify, Ferro: + - rscadd: A new ruin has been detected near the station, what secrets could it hold? + Shroopy: + - qol: Added another set of windoors to the Tramstation Xenobiology pens, fully + enclosing the space before them. The creatures in the main pens can now always + be accessed from above. + - refactor: Tramstation Xenobiology pens explicitly close to the right rather than + being rotated by using dir. + tf-4: + - bugfix: Fixed a missing wire in the Tramstation cargo warehouse. +2023-03-04: + Melbert: + - qol: Food over-top Drying Racks / Smartfridges will no longer decompose into ants + Vlada - VastKilleroOm: + - imageadd: added 1 hairstyle icon +2023-03-05: + Chlorotrifluoride: + - imageadd: added prettier icons for the normal and absorbent galoshes + Draggeru: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds the tape wizard costume, both a real and fake variant - rscadd: 'Adds the costume behind the autodrobe contraband wire, and the real variant in the wiz den :cl:' +<<<<<<< HEAD - bugfix: frozen gas tanks now release their contents upon shattering - bugfix: holodeck gas tanks can now be deconstructed - balance: The pipegun's chance to misfire and shoot at you rather than the person @@ -195,12 +269,88 @@ - bugfix: Monkeys are no longer able to teleport out of the Interdyne xenobio slime pens. 2023-03-06: +======= + Jacquerel: + - bugfix: Most spells can once again be cast even after someone stuns you with a + baton. + JohnFulpWillard: + - bugfix: The HoS' PDA painter can no longer paint PDAs into Lawyer ones. + Melbert: + - bugfix: Jobs get "You are the" and policy text again on spawn + - bugfix: Hijacked shuttles now count as "escaping alive" once agian + - bugfix: Hardcore random survival now actually checks that you've escaped alive, + and not just made it to centcom + - bugfix: Intelligent zombies can now escape. + - bugfix: Infectious zombies now don't count as escaped as intended. + - qol: Examine block'd out silicon "show laws" text. + - bugfix: Re-added a missing alert icon state for AI "laws updated" screen alert + - admin: Adds a new verb. "Law panel". This panel lets you see AND EDIT all silicon + laws in existence. + Paxilmaniac: + - balance: The pipegun's chance to misfire and shoot at you rather than the person + you're pointing it at has been removed + Profakos: + - bugfix: You can no longer multiply banana peels, gatfruit and more by using sliceable + custom food + Rhials: + - qol: Midwife Spiders can now sense how fully grown an egg cluster is by examining + it twice. + Sealed101: + - bugfix: fixed erroneous khinkali microwave recipe in the cooking menu. use a grill + like a normal chef + - bugfix: fixed AIs being able to recognize a spessman's identity over a holopad + call even if it was completely concealed, e.g. cloak of shadow, infiltrator + suit + - bugfix: undressing a hat/back item from a dog will correctly remove the item's + overlay + - bugfix: most armor vests will actually show on a dog when placed on its back + SyncIt21: + - refactor: RPED to infer icons of parts to use in `icon2html()` when displaying + part information + TheBoondock: + - bugfix: fixed missing inhand icon state for jaws of life + - refactor: refactored DNA vault. DNA probes now need to be linked with the vault + before scanning. + - qol: DNA probe can now access the dna database directly from the vault its linked + to, so you are always updated on the vault's database. Simply hit the vault + with the probe and it will link. + Timberpoes: + - bugfix: Papercode has been significantly improved and trivially filled paper forms + should no longer lag or crash players' game clients. + carshalash: + - rscadd: Introduces orderable rabbit crate to cargo livestock. + flowercuco: + - rscadd: add new smite that adds deadchat control component to a victim + rageguy505: + - bugfix: Removed a stray floating space calendar and decal on tramstation and it + makes more sense to reach the kilo spare. + skylord-a52: + - bugfix: frozen gas tanks now release their contents upon shattering + - bugfix: holodeck gas tanks can now be deconstructed + tralezab: + - rscadd: Added the gondola mutant, a tier two zen-like observer + - rscadd: Entries are now locked behind tiers, activating a bonus in someone upgrades + the tier! + - qol: DNA Infuser will now print a failure reason when you... well, don't get what + you want. +2023-03-06: + GoldenAlpharex: + - bugfix: Fixed some issues with podpeople hair and horns not being drawn under + the right circumstances all the time. + Holoo-1: + - bugfix: Nanotrasen has conducted high precision in-depth analysis of Deltastation + and its shuttles. As a result anomalous floortiles were replaced with standard + issued ones. + Iamgoofball: + - bugfix: You can no longer fortnite with glass sheets +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - rscadd: Added new multi-vote system - balance: Map votes are now calculated using multi-vote instead of the old single-vote system - admin: Admins can now use either multi-vote or single-vote for custom votes - code_imp: Map choice filtering uses active player count, not all connected clients +<<<<<<< HEAD Melbert: - bugfix: Jobs get "You are the" and policy text again on spawn SkyratBot: @@ -237,6 +387,63 @@ Port Tarkon and Ghost Cafe!' - qol: SR Specific ghost roles will now be itemized and tracked inside your hour window +======= + - bugfix: Admins can jump to/follow patient zero of a disease outbreak again + OrionTheFox: + - bugfix: fixed missing emissives on the Engivend, Pwr-Game Soda, and generic Soda + vendors. Also fixed the seclaptop having no valid screen icon! + - bugfix: fixed a few items trying to apply emissives when they shouldn't. + - code_imp: added a stack_trace for emissives with missing icon states. + Paxilmaniac: + - code_imp: AMMO_BOX_FULL_EMPTY now looks for -full and -empty for sprites, rather + than -[max ammo of that magazine] and -0 + Profakos: + - balance: the syndicate realized Chief Engineer is important enough to kidnap + - bugfix: kidnap objectives will now properly be unavailable for you for 15 minutes + after you take three, instead of after you take three assassinations. + RikuTheKiller: + - bugfix: Atmosians have finally convinced the thermomachines to not self-destruct + when built on blocked ports. + - bugfix: Failing to wrench down a thermomachine no longer hits it with the wrench. + SmoSmoSmoSmok: + - qol: made ORM easier to use + Spookuni: + - balance: Latejoin dynamic rulesets have been rebalanced to reduce the frequency + of midround revolution spawns. + carshalash: + - bugfix: Bartender's fountain pen was omitted during the swap over to tablets, + this has been amended. + tralezab: + - rscadd: Updated the bus ruin +2023-03-07: + Helg2: + - bugfix: fixed butchering bread dog spawning error bread. + JohnFulpWillard: + - bugfix: Corgis show their ID on examine. + - balance: Cult can no longer draw runes in survival pods. + Melbert: + - bugfix: Luminsecent slime actions correctly update their appearance when integrating + or ejecting slime cores + - bugfix: Fixed a Space Dragon related hard delete. + - bugfix: Mindswapped space dragons will break less. + NamelessFairy: + - admin: AB_CHECK_INCAPACITATED on an action's check_flags can now be modified by + admins. + - rscadd: New Neutral Station Trait, "Employee Birthday", its someone on the crews + birthday, make sure to wish them a happy birthday and perhaps get them a gift. + - rscadd: Two new party themed items have been added to the arcade prize pool, the + party horn and a box of party poppers. + PositiveEntropy: + - imageadd: Tweaked, Overhauled and Resprited a variety of garments related to the + security department, particularly its alternate clothes! Check it when possible! + Profakos: + - bugfix: 20+ item's discounts are properly smaller, instead of being larger + - bugfix: You can no longer have multiple copies of the same heirloom theft objective + Sealed101: + - spellcheck: fixed humanoid examine easter egg's pronoun usage + carshalash: + - qol: Regal Rats produce meat on butchering, reducing player confusion. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - refactor: Refactored how eggs growing into chicks is implemented, and how the number of chickens and chicks are tracked. It's now possible for admins to make @@ -245,6 +452,7 @@ - rscadd: Nanotrasen has added a martial artist gi to the AutoDrobe for those who want to go even further byond. - imageadd: Aforementioned gi sprites. +<<<<<<< HEAD tf-4: - bugfix: There's no longer a vendor that will sometimes block one of the doors to the interlink shuttle @@ -279,6 +487,17 @@ - bugfix: The party alarm now works again! - bugfix: Corgis show their ID on examine. 2023-03-10: +======= + tralezab: + - bugfix: changed gondola mutants to require gondola meat instead +2023-03-08: + Jacquerel: + - balance: Traitor secondary objectives to steal or destroy an item are now associated + with a particular "owner" or "victim" and won't generate themselves if nobody + would actually be victimised by the crime. + - rscadd: Traitors can sometimes be tasked with stealing and destroying the roboticist's + big crowbar, if there is one +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - imageadd: New tram and elevator sprites - code_imp: Lighting capability for all buttons @@ -289,6 +508,7 @@ - bugfix: Science keycard auth can only be done from RD office - code_imp: More Tramstation mapping helpers - bugfix: Fixed Icebox pharmacy shutters lighting runtimes +<<<<<<< HEAD RatFromTheJungle: - bugfix: the CMG, which was previously full-auto, is once more full-auto SkyratBot: @@ -308,12 +528,43 @@ anymore, this has been moved to the non-abstract types. - balance: Rebalances rewards from repeatable traitor objectives to be more consistent with each other. +======= + LemonInTheDark: + - bugfix: Examining in the dark is less wonk now, sorry bout that + Melbert: + - rscadd: Somewhere, in deep space, a relic to every fluked nuclear operative mission + drifts abandoned. + NamelessFairy: + - bugfix: The birthday station trait now actually works. + SmoSmoSmoSmok: + - qol: Borgs are now acknowledged by the orm +2023-03-09: + BlueMemesauce: + - bugfix: Mime finger gun icon is no longer an error + - admin: Logs when mimes break or make a vow of silence + Farquaar and ArcaneDefence: + - rscadd: Plasmamen can scream now + Melbert: + - bugfix: Fixes pirates and starfury assailants keeping minds of past lives + - bugfix: Fixed a eswords, some tools, and some other misc. items from being invisible + while extended / active + - bugfix: Teleshields and other misc items not extending in hand when active + - bugfix: Switchblades click on extend again + - bugfix: Pendrivers click on extend + Moth-lantern: + - rscadd: Adds the rest of the lipsticks to the cosmetics.dm + NamelessFairy: + - bugfix: Some airlock access oversights on tramstation have been fixed. The service + lathe cannot be accessed by jobs that shouldn't have access via maint and robo/engi's + cant get into secure tech storage. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Rapid lighting devices can now have their color set to #ffffff and the resulting lights will now function.' - bugfix: Rapid lighting devices will now default its set color to white when created instead of trying to produce colorless lights. - bugfix: The rapid lighting device can now be used in the dark when producing glow sticks or floor lights. +<<<<<<< HEAD - rscadd: Adds the rest of the lipsticks to the cosmetics.dm Zonespace27: - rscadd: Drifting Contractors start with an atropine pen to prevent your microbomb @@ -507,6 +758,9 @@ die of cold. - bugfix: Mime finger gun icon is no longer an error - admin: Logs when mimes break or make a vow of silence +======= + - bugfix: The party alarm now works again! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Admin event setup's have been refactored to use lists. - bugfix: When admins customize the pirate event all options will be available rather than just options that have not been randomly rolled. @@ -515,6 +769,7 @@ event. - admin: Admins can now randomize the disease outbreak classic event to roll any disease type, including transformation diseases so have fun with that. +<<<<<<< HEAD - balance: Abductors' midround spawn weight has been increased. Expect to see them more often - bugfix: fixed chat offsets with the RPG Titles event @@ -636,6 +891,56 @@ - bugfix: fixed glass lens description - code_imp: code cleanup for the language fixes 2023-03-12: +======= + Rhials: + - spellcheck: Fixes the Russian/Bounty Hunter fugitive hunter spawn backstory messages. + Sealed101: + - bugfix: slime processor no longer sucks in slimes that it can't reach (glass panes, + blocked by other machines etc) + timothymtorres: + - balance: Add lava moat to Icebox vault and fix maint area being viewable from + primary hallway +2023-03-10: + IndieanaJones: + - balance: Abductors' midround spawn weight has been increased. Expect to see them + more often + Jacquerel: + - bugfix: Something which is "forced" to embed will now always actually embed. Resultingly, + accidentally swallowing glass or encountering it behind a poster without adequate + protection will now always cause it to embed into your body. + - balance: Thin and fingerless gloves may no longer protect you from having glass + in your hand after pulling down a poster + - bugfix: Bullets containing shrapnel now use their correct chance to embed, which + may cause bullet wounds to contain shrapnel more frequently. + Melbert: + - qol: Completing an experiment which discounts a researched tech node will give + a partial refund of the discount lost. For example, researching the industrial + engineering research without scanning iron toilets will refund ~5000 points + if you complete it afterwards. This only applies once per experiment, so experiments + which discount multiple nodes only refund the first researched. + Profakos: + - bugfix: the double esword sales are now smaller than regular sales + SyncIt21: + - bugfix: machine frames not spawning stack components we inserted in them when + pried open with a crowbar + - bugfix: borg rcd's not displaying the correct matter units in its UI & when examined + - qol: arcd animation is smoother and makes more sense and has infinite matter + - bugfix: rcd not getting inserted into toolbelts & other storage units upon clicking + - bugfix: rld updating its icon state correctly based on the matter left + Watermelon914: + - code_imp: Abstract types don't hold telecrystal rewards or progression rewards + anymore, this has been moved to the non-abstract types. + - balance: Rebalances rewards from repeatable traitor objectives to be more consistent + with each other. + coiax: + - bugfix: Tiziran lung stirfry now correctly uses a bowl in its construction, and + is left over after eating. It also can only be constructed with organic lungs, + because cybernetic lungs don't fry as well. +2023-03-11: + GoldenAlpharex: + - bugfix: Fixed some potential future runtimes relatively to the new bodypart overlay + system's coloring procs. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jacquerel, sprite by J(Clearly Lying): - balance: Traitor objectives which ask you to destroy lathes or the ORM provide an optional bonus if you _booby trap_ the machine using a provided tool. This @@ -643,6 +948,32 @@ - balance: Performing the objective without rigging the machine to explode awards no TC, using it awards more TC than it did previously. LT3: +<<<<<<< HEAD +======= + - bugfix: Map filter works properly in the pre-round lobby + - bugfix: Map vote doesn't log 'not enough players' if the vote starts in the pre-round + lobby + OrionTheFox: + - bugfix: fixed Telepathy messages not having a check for being in range. + SgtHunk: + - bugfix: Androids now properly have robotic wings instead of moth wings. + sergeirocks100: + - bugfix: Gifts you wrap will now display their greyscale colors as they're supposed + to. + - bugfix: Wrapping paper color selection has been rebound to Alt+click, to fix a + bug where both wrapping paper color selection, and extracting wrapping paper + from a roll were both bound to right click. +2023-03-12: + Helg2: + - bugfix: Changed Quantum Hair Dye recipe from colourful reagent, space drugs and + radium to colourful reagent, space drugs and chlorine. So you can make it normally. + Jacquerel: + - bugfix: Spell Cards from the Wizard spell will now home in somewhat on the target + nearest to your cursor. + - bugfix: The Spell Cards spell now displays the correct icon instead of a big red + "error" text. + LT3: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Anomaly event parameters consolidated to defines - balance: Anomaly countdown timer reduced to 75 seconds Melbert: @@ -650,6 +981,7 @@ - bugfix: Fixes Juggernaut projectiles not doing bonus damage to nearby structures - code_imp: Removed projectile nodamage var, replaces it with just checking for damage +<<<<<<< HEAD SkyratBot: - bugfix: fixed missing disposal pipes (tramstation) - bugfix: fixed missing zones (tramstation) @@ -657,11 +989,28 @@ - bugfix: fixed wrongly placed tiles (tramstation) - bugfix: Changed Quantum Hair Dye recipe from colourful reagent, space drugs and radium to colourful reagent, space drugs and chlorine. So you can make it normally. +======= + NamelessFairy: + - bugfix: Firing pin swapping's 2 balloon alerts have been replaced with a single + more readable one. + - admin: Admins can now edit a pin_removable var on firing pins to render them unremovable + from the weapons they're installed in. + Profakos: + - bugfix: Pods on Tramstation can be properly launched early + Rhials: + - bugfix: The cultist ritual site locator and Nar'Sie summon message will no longer + use area names modified by the CE's blueprints. + Stalkeros, san7890 for the announcement texts: + - code_imp: Made pirate groups' arrival messages editable and more importantly unique + for each group. + VladinXXV: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fake nuclear authentication disks have been updated to include the holographic security sticker found on the real disk, one again making them convincingly real to the average person. - code_imp: The keep_me_secured component will now only process if it has at least one callback argument passed. +<<<<<<< HEAD - bugfix: The cultist ritual site locator and Nar'Sie summon message will no longer use area names modified by the CE's blueprints. - bugfix: Firing pin swapping's 2 balloon alerts have been replaced with a single @@ -681,21 +1030,57 @@ 2023-03-13: Baron: - imageadd: Replaced Arachne borg sprite +======= + spockye: + - bugfix: fixed missing disposal pipes (tramstation) + - bugfix: fixed missing zones (tramstation) + - bugfix: fixed wrongly placed zones (tramstation) + - bugfix: fixed wrongly placed tiles (tramstation) +2023-03-13: + CRITAWAKETS: + - config: All dynamic midround rulesets are now properly accounted for in the dynamic.json + config. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles (tramstation): - rscadd: Tramstation's Science department has received a substantial remodel! Please consult your local tour guide for more information. - rscadd: The Vacant Commissary office has been moved to the top floor near Departures, with a new Barber shop taking its place on the lower floor. +<<<<<<< HEAD Zergspower: - balance: Severely lowers the SEVA Suits temperature protection to 600 K down from 35000 K nikothedude: - bugfix: CUCKS now properly shows the name of waht it will deploy, + fixes a runtime associated with it +======= + Nabski: + - imageadd: Renault has a dopey walk animation now, god bless. + Thunder12345: + - spellcheck: The birthday moodlet's description is now gramatically correct. + carshalash: + - qol: Minor changes to Mexican tourist bot name generation + - qol: Japanese tourist bots will no longer request atomic bombs. + kinneb: + - imageadd: Changed sprites for wooden chairs, comfy chairs, electric chairs, folding + chair and shuttle seats! + - imageadd: Resprites Donut Box, and all sprites for donuts in it. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-03-14: GoldenAlpharex: - bugfix: You should only be able to spawn as one ghost role at a time. Close the prompt if you want to spawn as another one. Begone soulless randomgen humans! +<<<<<<< HEAD +======= + Jacquerel: + - rscadd: A station trait which sometimes populates maintenance with small spiders. + You can wear them as a hat if you wanted to have a spider on your head for some + reason. + - rscadd: Spider mobs will automatically start webbing up their environment. + JohnFulpWillard: + - code_imp: The Server ending announcement is now sent to players once the game + has properly ended. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: On IceBox, there shouldn't be wires looping under the walls near the vault anymore. @@ -708,6 +1093,7 @@ both candy and explosives. Still fun at parties. - admin: Admins can now turn players, mobs and objects into pinata's with the new pinata component. +<<<<<<< HEAD Nabski: - imageadd: Renault has a dopey walk animation now, god bless. Paxilmaniac: @@ -790,12 +1176,25 @@ keys in your keybindings menu, under game preferences. - qol: Clicking on the turf of a fire alarm/light switch with your hand will activate it. +======= + NamelessFairy: + - bugfix: When learning new cult spells their buttons will no longer stack on top + of one another. + PositiveEntropy: + - imageadd: Retouches all glass floors! + Vect0r2: + - bugfix: Ethereal discharge no longer alerts you twice that you did it. + Watermelon914: + - bugfix: Fixed playmins having access to admin functions within normal integrated + circuits. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Removed a lot of item targets from the temporary steal traitor objectives and replaced them with more useful items that don't intersect with the list of items that a traitor can be tasked with stealing for their permanent steal objective. - rscadd: Re-added permanent steal traitor objectives and maroon/hijack/die a glorious death objectives. +<<<<<<< HEAD - bugfix: The metallic hydrogen axe is no longer silent when using it as a crowbar. - bugfix: You are now capable of hitting standard windows with a crowbar when they're fully constructed. @@ -816,10 +1215,79 @@ - bugfix: Re-implements changing a crewmember's physical/mental status via a Med-HUD. Zonespace27: - rscadd: Added a black dog plushie for a donator +======= + coiax: + - bugfix: "In order to make l\xF6rtonknusksolt, fl\xF6fr\xF6lenknusksolt and k\xE6\ + niatknusksolt, bowls are required, to match the bowls in their sprites and left\ + \ behind after eating." + - bugfix: "Crafting fl\xF6fr\xF6lenknusksolt will no longer create a l\xF6rtonknusksolt\ + \ instead." +2023-03-15: + Comxy: + - rscadd: Adds Ammoniated Mercury, a chemical to the game. + - balance: Calomel now purges all chemicals again, and now Ammoniated Mercury only + purges toxins. + GoldenAlpharex: + - bugfix: Fixes limbs not properly storing their external organs, resulting in issues + when calculating the bodytypes. + - bugfix: Fixes ghost role spawners not allowing you to spawn from more than one + ghost role per round. + Guillaume Prata: + - bugfix: Bolter wrench's protolathe design is correctly at the advanced engineering + tab now, instead of being under janitorial. + Jackraxxus: + - qol: The AI now has hotkeys for its shells, make sure to bind them to your preferred + keys in your keybindings menu, under game preferences. + Jolly: + - bugfix: In MetaStations cold room storage, the O2 canisters were replaced with + anesthetic canisters. Now go put that clown into an eternal slumber, you traitorous + CMO! + LemonInTheDark: + - balance: The janitor's trashbag now fits on his belt. In exchange, taking something + out of it sends a visible message, and has a delay. + - rscadd: I made circuit floors brighter and more vivid. + - rscadd: Made air alarms, vending machines, newscasters, request consoles, status + displays and keycard machines slightly "brighter" (larger light range, tho I + did make air alarms a bit brighter too) + - rscadd: Tweaked desklamps. Lower range, and each type gets its own coloring instead + of just fullwhite. + - bugfix: AI displays are no longer always emissive, they'll stop doing it if they + aren't displaying anything. Hopefully this'll look nicer + Melbert: + - balance: If you are handcuffed, you can't instantly resist out of an unlocked + labor camp teleporter (however, resist time is halved). + - bugfix: Malf AI's xray camera upgrade no longer shows on station security camera + consoles + NamelessFairy: + - bugfix: The metallic hydrogen axe is no longer silent when using it as a crowbar. + - bugfix: You are now capable of hitting standard windows with a crowbar when they're + fully constructed. + Sealed101: + - qol: mechs have an action button on the HUD for toggling equipment safeties + SgtHunk: + - qol: Holodeck space chess board is more pleasing to look at. + - bugfix: Fixes holodeck space chess pieces being reversed. + - spellcheck: Fixed white king's description saying it moves any tile in one direction. + TheSmallBlue: + - qol: Bluespace Launchpads will now use the fail trigger if your circuit destination + is out of range. + - bugfix: The jar of pickles, after millenia, finally actually contains pickles. + All hail the jar of pickles. + Zytolg: + - bugfix: Icebox Station has been cleansed from nasty effect decals hiding underneath + walls + - bugfix: Clears out decals from under rocks on Tramstation + - bugfix: No more effect_decals under Kilostations walls and rock + - bugfix: Removes effect_decals from underneath walls on Deltastation + atosti: + - bugfix: Re-implements physical and mental statuses in crewmember medical records. + - bugfix: Re-implements changing a crewmember's physical/mental status via a Med-HUD. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - rscadd: Chefs can sometimes get ketchup bottles in the mail. - bugfix: Ketchup in the crafting menu is now represented as the bottle, rather than an empty condiment pack. +<<<<<<< HEAD 2023-03-17: GoldenAlpharex: - rscdel: Removed the possibility to get slowly turned to ashes (and thus getting @@ -854,11 +1322,58 @@ - bugfix: 'If you notice any bugs related to the rendering of your characters, please report them using the "Report Issue" button at the top-right corner of the screen, mentioning #19635 in it for ease of reference.' +======= + mc-oofert: + - rscadd: Added stickers, purchasable from cargo + vinylspiders: + - bugfix: slimepeople and vampires are now affected by the blood deficiency quirk +2023-03-16: + ArcaneDefence: + - bugfix: A bunch of invisible magazine sprites are visible now + - imageadd: Bullpup shotgun magazines for buckshot and slugs are now indicated with + a red or white dot, respectively. + - balance: Putting a non-clothing item onto someone else creates a visible message + the same way a clothing item would. + Helg2: + - spellcheck: fixed a box of party_poppers and camera tag "tech_storage" + MMMiracles: + - bugfix: White ships can now dock with Tramstation properly again. + Melbert: + - admin: Logs when forced events trigger + - bugfix: Paradox Clones now know that their target knows. + - balance: Magboots will now protect you from sliding on ice. It will not stop the + slip, though. + - bugfix: '"Ice sliding" (from patches of permafrost ice) will now correctly slide + you until you reach a non-ice patch.' + - bugfix: Speed potioned magboots maintain their speed booster after toggling them + - refactor: Refactored magboots. + - refactor: Refactored noslip mechanics. + Mothblocks: + - qol: Clicking on the turf of a fire alarm/light switch with your hand will activate + it. + Rhials: + - rscadd: Adds the Smoking Room icebox ruin, found on the station level! + Sealed101: + - qol: medical cyborg's surgical processor now tells the user on examine that it + needs to be equipped in an active module to access downloaded surgeries + - qol: medical cyborg's surgical processor now lists downloaded surgeries on examine + Time-Green: + - bugfix: fixes deadly harvesting just taking harmless extorgans + - code_imp: renames internal_organs to organs now that it can also contain external_organs + necromanceranne: + - rscadd: Adds the Snatcherprod. Like a teleprod, but it steals stuff from peoples + hands instead. Made using a telecrystal, rather than a bluespace crystal. +2023-03-17: + DAKKA-WAAAGH: + - bugfix: Removes duplicate decals and replaces them with new ones that are more + efficient +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: Light office chairs and Dark office chair colors are, now actually reflective of the name. - bugfix: Left/Right office chairs should be symmetrical and no longer be one pixel off when flipped. +<<<<<<< HEAD Melbert: - admin: Logs when forced events trigger Paxilmaniac: @@ -879,10 +1394,25 @@ - qol: medical cyborg's surgical processor now lists downloaded surgeries on examine - balance: The janitor's trashbag now fits on his belt. In exchange, taking something out of it sends a visible message, and has a delay. +======= + - bugfix: The directional states for the toppled wooden chair sprites are now consistent. + You really can't tell visually, but its been fixed. + - imageadd: Using the new wooden chair sprites, there's now new toppled wooden chair + sprites. Go wild. Have a ballroom brawl or something. + LT3: + - bugfix: Tramstation xenobio now has slimes + Melbert: + - bugfix: Lead batteries now start partially drained as intended. + Profakos: + - bugfix: Your species will no longer get deleted if a changeling who copied you + is deleted from existence + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: suit storage unit circuit boards to engineering & science department circuit printers. - rscadd: freezer cabinet as a craftable & destructible item. - qol: flood light can now be deconstructed rather than destroyed/thrown away. +<<<<<<< HEAD - spellcheck: fixed a box of party_poppers and camera tag "tech_storage" softcerv: - bugfix: cryo now saves modular persistence @@ -894,10 +1424,39 @@ - bugfix: The CIN armor vests from cargo will now rotate with the person wearing them, rather than not at all 2023-03-19: +======= + - bugfix: area machinery from breaking after creating & modifying areas via the + station blueprints. + - refactor: turfs are cannonized from areas during creation/editing operations & + empty areas are deleted + - refactor: removed duplicate Initialize() from light switch + - refactor: arcd has all upgrades installed + ZephyrTFA: + - bugfix: airlocks will no longer shock you when using the rust mansus grip to destroy + them + - bugfix: Stabilized Orange extracts are no longer able to cool you from any temperature + instantly + - bugfix: Changelog link for org members works again + atosti: + - bugfix: the jobs columns in the View Crew Manifest window are now uniformly aligned + across department headers + - bugfix: extremely long crewmember names are now truncated in the default view + for the Crew Manifest window + mc-oofert: + - bugfix: Borg synthesizers will no longer remain on the status panel if a borg + changes modules + - bugfix: Stabilized gold extracts can now spawn basicmobs + - bugfix: All CTF windows are now indestructible, fixes breaking into space during + CTF. + - bugfix: Turrets will now shoot basicmobs such as carp + - bugfix: Explosive holoparasites no longer runtime if they plant bombs +2023-03-18: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - balance: The inorganic biology symptom now adds both MOB_MINERAL and MOB_ROBOTIC to a virus's list of infectable biotypes instead of only MOB_MINERAL. Currently, androids are the only species this change affects. +<<<<<<< HEAD GoldenAlpharex: - bugfix: Fixed some issues with podpeople hair and horns not being drawn under the right circumstances all the time. @@ -937,6 +1496,18 @@ - bugfix: Stabilized gold extracts can now spawn basicmobs - rscadd: Adds the Snatcherprod. Like a teleprod, but it steals stuff from peoples hands instead. Made using a telecrystal, rather than a bluespace crystal. +======= + DAKKA-WAAAGH: + - bugfix: Fixed duplicate tile decals and made tile decal shapes more efficient + Helg2: + - balance: Syndicate briefcase full of cash is now worth of 3 tc instead of 5. Better + than nothing + - qol: added tooltips for pneumatic cannon. Also changed powerfist's tooltips slightly. + - bugfix: fixed that you can't put wrench in pneumatic cannon. + - bugfix: fixed that you can manipulate with pie gun as if it's a normal pneumatic + cannon (adjust air tank, wrench it's output level's and etc.) + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Carp will once again be healed from being near carp rifts - bugfix: Sepia slime cores and the rewind camera now work on Ian - bugfix: Sapient ridden carp (or cows) can throw off their riders by shoving them, @@ -961,6 +1532,7 @@ - rscadd: Petsplosion wizard event will now target farm animals and mothroaches - bugfix: The colossus possession crystal can now actually possess the cockroach it spawns, does not kill you instantly upon ending possession +<<<<<<< HEAD - bugfix: Player-controlled Regal Rats now lick or claw based on their combat mode. - bugfix: NPC Regal rats now properly claw at enemies, moving on to new targets after completing kills. @@ -989,10 +1561,36 @@ CTF. - bugfix: Pubbystation, if run, will now have a working monastery pod shuttle again. - bugfix: Turrets will now shoot basicmobs such as carp +======= + Jolly: + - rscadd: 'CTF has a "new" map: ctf_turbine! I hope you like 24/7 TDM where the + objective is secondary.' + MMMiracles: + - bugfix: Xenobiology on Tramstation can now use their consoles to see the upper + floor. + Melbert: + - bugfix: Heretic sacrificing now checks both the last mind to inhabit the body + as well as the current mind when checking for high value targets + NamelessFairy: + - bugfix: Corgi pinata's no longer have their own category on the cargo shuttle + console. + Rex9001: + - rscadd: Adds 2 new iron/dark/airless subtypes, textured and smooth_large + - rscadd: Adds the_faceoff.dmm Ruin + Rhials: + - rscadd: Mafia maps now come with their own thematic outfits! + - spellcheck: Changes the "Snowdin" mafia map description + SyncIt21: + - bugfix: vents & scrubbers getting assigned twice to an area when it's merged with + another area via station blueprints + - refactor: merged` Initialize()` & `New()` of vents & scrubbers into just `Initialize()` + ZephyrTFA: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Surgical Processor upgrade for medical cyborgs can now be used to start surgeries. - balance: You no longer need to use two module slots for starting surgeries with the surgical processor. +<<<<<<< HEAD - qol: Abductors chat and Lings/Xenomorphs hivemind chat type has been moved from unsorted to radio. - bugfix: Material tile floors now make noise when walked on by bare/claw/heavy @@ -1005,15 +1603,55 @@ - bugfix: fixed that you can manipulate with pie gun as if it's a normal pneumatic cannon (adjust air tank, wrench it's output level's and etc.) - balance: Bone gel now spawns in stacks of 4 in Paramedic and Medical ERT belts +======= + atosti: + - balance: Bone gel now spawns in stacks of 4 in Paramedic and Medical ERT belts + - bugfix: Player-controlled Regal Rats now lick or claw based on their combat mode. + - bugfix: NPC Regal rats now properly claw at enemies, moving on to new targets + after completing kills. + mc-oofert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer bypass recyclers indestructibility check by just putting it into something - bugfix: Recyclers can no longer recycle the insides of cyborgs - balance: You can no longer EMP defibrillators to make them combat-usable +<<<<<<< HEAD +======= + vinylspiders: + - bugfix: the 'target cyborgs' option for syndicate turrets is now functional again, + and enabled by default. Station borgs will still be shot at on sight unless + a syndicate crew member deliberately configures the turrets otherwise. + - bugfix: fixes gloves not sending the COMSIG_PARENT_ATTACKBY signal +2023-03-19: + A.C.M.O.: + - bugfix: Fixed lungs gas exchange implementation, so you always inhale and exhale + the correct gases. + - bugfix: Fixed a large quantity of hard-deletes which were being caused by organs + and cybernetic organs. + - bugfix: Fixed many organs which were applying side-effects regardless of whether + or not the insertion failed. + - code_imp: Added unit tests for Organs. + - code_imp: Added unit tests for Lungs. + - code_imp: Improved unit tests for breathing. + - code_imp: Improved unit tests for DNA Infuser organs. + DATA-xPUNGED: + - qol: Tramstation's kitchen has been completely refurbished! + JohnFulpWillard: + - bugfix: Pubbystation, if run, will now have a working monastery pod shuttle again. + Jolly: + - bugfix: All the newly resprited chairs Left and Right facing sprites should be + symmetrical now. + LemonInTheDark: + - admin: You can now optionally populate new lists created via vv. hit cancel to + stop filling them up + NamelessFairy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Admins can now customize the outfit necrostone victims are equiped with. - admin: Admins can now customize the maximum number of thralls that can be created by a necrostone - qol: The necrostone's thrall counter is now a shown as a separate colored line of text when examining the stone rather than part of its description. +<<<<<<< HEAD - qol: Tramstation's kitchen has been completely refurbished! Vile Beggar: - rscadd: The Derelict Sulaco ruin was spruced up with a new look and some neat @@ -1041,15 +1679,65 @@ Melbert: - bugfix: Fixes rare human arm melting condition SkyratBot: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: When inspecting syndicate bombs the text that tells you how long is on the timer stands out more. - qol: Inspecting an active syndicate bomb will give you a balloon alert on the bomb itself when inspected. +<<<<<<< HEAD - admin: You can now optionally populate new lists created via vv. hit cancel to stop filling them up - bugfix: removed two decals from a space ruin. - bugfix: Fix not being able to read in full bright areas 2023-03-21: +======= + - qol: Abductors chat and Lings/Xenomorphs hivemind chat type has been moved from + unsorted to radio. + - admin: Admins can now customize the wisdom cow event. + Rhials: + - soundadd: The chainsaw now has SFX for starting, stopping, and idling. + Sealed101: + - bugfix: fixed a few internal organs acting wonky on inserting/removing (some xenomorph + organs, abductor glands, flashlight eyes, demon/cursed hearts) + Vile Beggar: + - rscadd: The Derelict Sulaco ruin was spruced up with a new look and some neat + little goodies (free rouny plush). + ZephyrTFA: + - bugfix: Plasmamen don't have hearts, again + atosti: + - bugfix: Material tile floors now make noise when walked on by bare/claw/heavy + feet +2023-03-20: + Cheshify: + - bugfix: removed two decals from a space ruin. + GoldenAlpharex: + - bugfix: Ghost role spawners that are set to have infinite uses no longer run out + of uses. + Jacquerel: + - bugfix: Plasmamen and golems (and androids, if you ever find one) can be implanted + again. + Melbert: + - bugfix: Fixes rare human arm melting condition + timothymtorres: + - bugfix: Fix not being able to read in full bright areas +2023-03-21: + Jacquerel: + - bugfix: Removing a storage implant from someone will dump the items on the ground + rather than inside the mob. + - bugfix: Wizard Apprentices can no longer draw their own ritual circles. + - bugfix: Implants and items which you cannot drop will no longer be forced out + of your character when you are kidnapped. + - bugfix: Objects you try to take back from the kidnapping location as souvenirs + will drop to the ground when you leave instead of being destroyed, except shirts + and shoes (make sure to pick up your monographed synidcate T-shirt). + JohnFulpWillard: + - balance: Wirecarp now properly shuts off NtNet remotely. + - balance: Wirecarp now shows the source of a PDA that does an action. + - bugfix: Wirecarp can no longer be used to see if Nukies exist through their networks. + - rscdel: Removes Software downloading and communication Ntnet networks, as they + were pretty worthless. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JohnFulpWillard, sprites by BalkyGoat: - rscadd: ' The Janitor Access key: Janitors can now be given departmental AA (one at a time) using the Keycard authentication device in Command offices. Use it @@ -1057,6 +1745,7 @@ - bugfix: HoP's trim is no longer set to edit Supply access. LT3: - code_imp: Tram crossing signal/platform logic improvements +<<<<<<< HEAD - fix: Fixed emergency maint access icon on keycard auth SkyratBot: - balance: 9mm, 10mm, and other stuff can cause wounds. @@ -1064,12 +1753,26 @@ - bugfix: Plasmamen and golems (and androids, if you ever find one) can be implanted again. - qol: adds service radio to jani/curator/chaplain/lawyer vendor +======= + OneAsianTortoise: + - qol: adds service radio to jani/curator/chaplain/lawyer vendor + Pickle-Coding: + - balance: 9mm, 10mm, and other stuff can cause wounds. + Profakos: + - bugfix: Tramstation now has the right amount of security and medical record computers + Rhials: + - balance: midwife spider eggs now spawn in separate locations. Divide and conquer! + - bugfix: midwife spider eggs can no longer generate in atmos-hazardous areas. + atosti: + - bugfix: Organ harvesters now open and abort harvesting when losing power +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - bugfix: Coffee cups are now correctly immune to becoming frozen by low temperature water vapour. - bugfix: Holosigns, like the atmos holofan, can no longer be frozen by low temperature water vapour. 2023-03-22: +<<<<<<< HEAD LT3: - bugfix: Tramstation xenobio now has slimes because apparently you need them? idk i'm not a science nerd @@ -1143,10 +1846,58 @@ - bugfix: pod person hair can be once again styled by secateaurs - qol: Prosthesis organ manipulation now warns you if you are using the incorrect engineering tool +======= + DATA-xPUNGED: + - spellcheck: "Pacoca is now called \"Pa\xE7oca\", as it should" + Helg2: + - rscadd: Wirebrush is now avalaible at janivend, for janiborg and you can put it + in the janibelt. + Melbert: + - bugfix: Fixed stray white pixel in illegal rolling pin inhands. + NamelessFairy: + - bugfix: Stray Cargo Pod false alarms will once again play an announcement when + they occur. + Rhials: + - bugfix: NODISMEMBER mobs can now be attacked by the flesh worm. + SmoSmoSmoSmok: + - bugfix: heck suit no longer bugs out worn boots/gloves icons + coiax: + - bugfix: Fixed missing food types for the meat clown, it is now meat and fruit. + san7890: + - refactor: Some aspects of how we track suicides from your living mob to your observer + have changed- please do let us know if anything has broken via a GitHub Issue + Report. + tf-4: + - bugfix: Failing a kickflip no longer shows the chat messages to the wrong people. +2023-03-23: + Astrogem2: + - rscadd: New space ruin that I have made, which adds some variety to space searching. + Cheshify: + - rscadd: Nanotrasen has given the crew access to a brand new emergency shuttle! + Watch out for it's destructive entrance! + LT3: + - imageadd: New fire alarm + - code_imp: Fire alarm/fire door volume reduced, lights synchronized + Singul0: + - bugfix: Circuit-based bluespace launchpads now work again! + SyncIt21: + - bugfix: aux construction console RCD works again + kawoppi: + - bugfix: added lights to the tramstation head of personnel's office +2023-03-24: + Jacquerel: + - rscadd: Bioscrambler anomalies will once again swap your organs with other organs. + - balance: Bioscrambler anomalies no longer affect synthetic parts. + LordVollkorn / Gage Gaebler: + - rscadd: Added Traveler's Rest, a tiny space structure for space travellers to + relax and to prepare for the explorations ahead. + Rhials: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Xenomorphs born in the room the roundstart delivery egg was spawned in will be part of a special "captive xenomorph" team, tasked with escaping and tracked in the roundend report. - bugfix: Regular Xenomorphs no longer receive a blank objectives popup on spawn. +<<<<<<< HEAD - bugfix: Androids now properly have robotic wings instead of moth wings. - bugfix: fixes deadly harvesting just taking harmless extorgans - code_imp: renames internal_organs to organs now that it can also contain external_organs @@ -1332,6 +2083,24 @@ teleports your brain to the mythical Gem Room. - balance: Changes the universal click cooldown of the tendril hammer from the goliath infusion into an internal cooldown just for the special heavy attack. +======= + SmoSmoSmoSmok: + - bugfix: the orm will no longer display weird decimals + SyncIt21: + - bugfix: canvas getting finalized with untitled name when naming is cancelled + atosti: + - bugfix: machines can now be pried open more than once. + - bugfix: machines now have the correct density when pried open. + flowercuco: + - qol: Prosthesis organ manipulation now warns you if you are using the incorrect + engineering tool + lizardqueenlexi: + - bugfix: all space ruins can now appear on Linux servers + softcerv: + - bugfix: drawing from an empty tarot card deck no longer causes runtimes + vinylspiders: + - bugfix: fixes gondola meatslab not being able to be placed into the DNA infuser +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adjusted the blood deficiency quirk for slimepeople to not cause excessive hunger as long as blood volume is kept above 550 via an IV drip (or other means of getting welding fluid/some other toxin etc into the bloodstream, e.g. ingestion) @@ -1340,8 +2109,42 @@ - rscadd: 'adds new blood bag types: TOX (slimepeople), H2O (podpeople), S (snail)' - bugfix: fixed blood deficiency quirk causing wild fluctuations in blood volume on the analyzer, giving more accurate readings +<<<<<<< HEAD - bugfix: Moved the tank compressor and some tables and the anomaly refinery so that the tank compressor could actually be usable again on Tramstation. +======= +2023-03-25: + 13spacemen: + - qol: It is now obvious when examining volume pumps that you can multitool them + to overclock them to disable pressure limits and spill gas out. Overclocked + volume pumps flash lights + Hatterhat: + - bugfix: Thrown reagent containers (beakers, molotovs) hitting mobs no longer fully + splash their target with their contents, as this was unintended behavior. The + intended behavior was 0-50% of the splashed reagents being ignored. Throwing + stuff at floors/walls is unaffected. + LT3: + - code_imp: Access key rings added to list on creation + - code_imp: Access keys unregister signal when destroyed + Rhials: + - code_imp: splits up spacevine.dm into four files in the events folder, and a __defines + file. + - code_imp: Lightbulb removal code is a little bit easier to read + - spellcheck: The lightbulb remover skillchip implant (which I know you guys LOVE + to use) has a slightly different message now. + SyncIt21: + - bugfix: broken sprites in RCD UI + Thunder12345: + - rscadd: Added skirt variants of the galaxy suits + Timberpoes: + - bugfix: DNA Scanners, Sleepers, Abductor Experimentors, Skill Stations and Mod + Installers now appropriately release their contents when opened, fixing an issue + where they could permanently absorb players and items until admins intervened. + - bugfix: Cyborg recharge stations should be much more usable again. + cats4gold: + - qol: adds the weight class 'tiny' to paper slips + timothymtorres: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add crafting recipe for basketballs (leather sheets) and basketball hoops (metal, rods, and durathread) - rscadd: Add new basketball minigame for 2-7 players. There are 4 different courts @@ -1356,9 +2159,56 @@ - soundadd: Added basketball bounce sound with credits attribution - imageadd: Added basketball icon to minigames. Move baseball and dodgeball icons to toy/balls.dmi +<<<<<<< HEAD - bugfix: DNA Scanners, Sleepers, Abductor Experimentors, Skill Stations and Mod Installers now appropriately release their contents when opened, fixing an issue where they could permanently absorb players and items until admins intervened. +======= +2023-03-26: + Chlorotrifluoride: + - imageadd: prettified all RTD icons + - imageadd: prettified in hand RLD icons + - imageadd: subtly improved the RSF icons + NamelessFairy: + - bugfix: Tram's Ordnance Freezer is now piped correctly. + PositiveEntropy: + - imageadd: Redoes The Safes! + Timberpoes: + - bugfix: Having your severed, brain-filled head reattached to a body no longer + teleports your brain to the mythical Gem Room. + VladinXXV: + - bugfix: The intern who was recording Etheral crewmembers' bloodtypes as random + human bloodtypes has been replaced with an intern who has seen the example made + of the previous one. + ZephyrTFA: + - bugfix: You can no longer use Pocket Protectors to pull items out of nullspace + mc-oofert: + - refactor: Stickers use a component and an element now to do their sticking + san7890: + - bugfix: Tile decals are no longer fucked on all stations. + vinylspiders: + - bugfix: fixed blood deficiency quirk sending the wrong blood pack to roundstart + species who have exotic blood +2023-03-27: + ATHATH: + - spellcheck: Tweaked an outdated doctor tip to reflect that fact that salbutamol + can't heal plasmamen (outside of very specific edge cases). + Helg2: + - qol: guillotine description tips are now span_notices (blue text) instead of just + a bunch of grey text. + - bugfix: fixed a bug that if you try to behead body without a head with guillotine + it just stops working. + JohnFulpWillard: + - balance: You can no longer print Technology data disks. You can still print Tech + disks, which hold techweb information on it, just not the one that holds up + to 5 nodes. + - balance: ^ Because of this, there's no way to download nodes from an RD console + and upload them to an Autolathe to bypass departmental restrictions, you have + to go through a Techfab/Circuit imprinter for your needs. + - balance: Ones that are found cannot have anything uploaded/deleted off of them + either, you can only upload them to the Web. + - code_imp: Every individual Bepis disk no longer create an entire techweb +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Computers are now properly connected to Ethernet, and can use Ntos when Relays are down. - refactor: Removes Ntnet and Ntnet interfaces, which was only used by Ntnet circuits @@ -1370,6 +2220,7 @@ - qol: Wirecarp logs is now set to save 300 at once, instead of 100 and being increased to 300 by the RD during the round. This is pretty insignificant, since there's no reason to NOT want as many logs as possible. +<<<<<<< HEAD - balance: No-slip mod module and no slip shoes no longer have a reputation lock. Stalkeros: - bugfix: Fixes the lack of Pan-Slavic for the NRI cops midround. @@ -1409,12 +2260,100 @@ - rscdel: Revert elevator panel UI theme change OrionTheFox: - rscdel: Removed the obsolete Microfusion Cell Containers that spawned in the armory. +======= + LT3: + - imageadd: Fire alarm sprites are directional again + - imageadd: Solo benches are no longer invisible when facing east/west + LemonInTheDark: + - bugfix: Fixes decals layering weird in some cases + - qol: Human gravity will react to changes instantly, instead of waiting for the + next process tick. Hopefully this feels better and not worse + Moth-lantern: + - bugfix: Anomalies will no longer spawn at the bomb testing range satellite. + NamelessFairy: + - bugfix: CTF fourside's yellow spawnpoint walls now use the same lighting as the + rest of the map instead of space lighting. + Profakos: + - bugfix: The Starfury's Corvette and Fighters can now visit Tramstation + Rhials: + - bugfix: Xenomorphs will now be properly teamed together again, and will show up + together on the roundend report. + SishTis: + - bugfix: Fixed gravity issue in Underground Outpost 45's research airlock. + Xander3359: + - balance: No-slip mod module and no slip shoes no longer have a reputation lock. + Y0SH1M4S73R: + - admin: Fixed admin lua scripting on Windows-hosted servers running on beta version + 515.1602 (the latest version as of this change) + mc-oofert: + - rscadd: A new ruin has drifted into the horizon, the Mass driver router + necromanceranne: + - balance: Changes the universal click cooldown of the tendril hammer from the goliath + infusion into an internal cooldown just for the special heavy attack. + san7890: + - bugfix: If you buckle a dog to a bed, it will no longer drag its bed as it goes + to bark at the mailman. It will instead be comfy and chilling, as expected. + spockye: + - bugfix: fixed some tiles missing nearstation on Metastation + - bugfix: fixed some tiles having spacetiles with nearstation on Metastation + vinylspiders: + - bugfix: giving a podperson a blood transfusion by injecting them with water/whatever + their exotic blood happens to be will now work. + - qol: lizards with blood deficiency now receive the type 'L' blood packs instead + of an unhelpful type 'O-' one. + - bugfix: plasmamen will now be given their internals upon being kidnapped and upon + being returned. +2023-03-28: + 13spacemen: + - qol: Cult Roundend Report no longer lists post-summon cultists. No more 30 random + Harvesters clogging up the roundend report + Helg2: + - rscadd: Bacteria rich moldy food (like breadslices and pizzaslices) now spawn + in trashcarts, trashbags and randomly on the floor. + - rscadd: Damp rag now spawns in the trashcarts and etc. + Jacquerel: + - bugfix: Players with phobias will no longer be frightened by items equipped to + players in slots which are not considered to be visible. + - bugfix: Players with a phobia of the supernatural won't be spooked by void cloaks + which are currently invisible. + LT3: + - rscadd: Tram signs will now malfunction when the tram is malfunctioning + - qol: Janitor access keys now show up on the Custodial Locator tablet app + LemonInTheDark: + - bugfix: Fixes a bunch of minor gravity bugs, report em if you see more yeah? + Moth-lantern: + - bugfix: Moved the tank compressor and some tables and the anomaly refinery so + that the tank compressor could actually be usable again on Tramstation. + Profakos: + - bugfix: the roboticist in the prey pod now has clothes as intended +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - rscadd: You can now vote to start a Mafia game early. If over half of the current signups vote (And you have three or more players) you will immediately start a game with a slightly adjusted set of roles. - admin: You can now force a mafia game to start in the admin options panel. +<<<<<<< HEAD SkyratBot: +======= + SethLafuente: + - balance: Increased Bonus Reward for kidnapping alive targets + - balance: Changed Virologist and Scientist into Common objectives for kidnapping + - balance: Changed Paramedic into Uncommon objectives for kidnapping + Thunder12345: + - rscadd: The Nanotrasen Costuming Department has released specifications for how + to convert the Head of Security's cap into a shako. + Wallem: + - balance: Fixes a glaring oversight with the entrenching tool's balancing. + Watermelon914: + - balance: Reduced the reputation cost of most non-murderbone orientated uplink + items like hypnotic flash and emag. + - balance: Reduced the amount of assassinate/kidnap/eyesnatch objectives that'll + appear at once. + spockye: + - rscadd: remakes the old escape pod shuttle +2023-03-29: + IndieanaJones: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The pirate gangs have been split into two subcategories, one which can spawn earlier in a shift and one that spawns later as they currently do. While skeleton pirates will still be only seen later into the shift, expect to see @@ -1423,6 +2362,7 @@ were available. - bugfix: Pirates can no longer be selected by Dynamic if there are no more pirates gangs that can be used. +<<<<<<< HEAD - qol: you can choose your default paint color for the "Tagger" quirk from prefs. - bugfix: fixed disposals on the starfury - bugfix: fixed flooring on the starfury @@ -1454,10 +2394,16 @@ - balance: Increased Bonus Reward for kidnapping alive targets - balance: Changed Virologist and Scientist into Common objectives for kidnapping - balance: Changed Paramedic into Uncommon objectives for kidnapping +======= + JohnFulpWillard: + - bugfix: Experimentors can connect to techwebs that have at least one RD server + on the level. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Curators/HoP can now manage Newscaster D-Notices (previously was Warden/HoS). - balance: Security Officers/Detectives can now issue Wanted notices on Newscasters. - balance: Ntos Newscaster now requires Library access only to download, not to run. +<<<<<<< HEAD - bugfix: Fixes a bunch of minor gravity bugs, report em if you see more yeah? - bugfix: Experimentors can connect to techwebs that have at least one RD server on the level. @@ -1519,6 +2465,60 @@ - qol: You can rename and change the description of nanite/thermal pistols. - bugfix: Fix Greytide Worldwide basketball stadium being able to explode from a fuel tank +======= + LemonInTheDark: + - server: The starlight config has been removed, as it is enabled by default + Rex9001: + - rscadd: the pod_crash.dmm ruin + lizardqueenlexi: + - qol: you can choose your default paint color for the "Tagger" quirk from prefs. + spockye: + - rscadd: Added a new emergency shuttle, the emergency_tranquility + - bugfix: ' Redesigns "the_arena" ( the bubblegum shuttle deathmatch area )' +2023-03-30: + Helg2: + - rscadd: re-added normal doors to qm's office on tram. + - bugfix: fixed hos' shutters not being existant on tram. + LT3: + - bugfix: Reduced lighting range for idle fire alarms + LemonInTheDark: + - bugfix: Breathing pluoxium works again + - bugfix: Kilo's arrivals port will no longer be space colored + Melbert: + - rscdel: Revert elevator panel UI theme change + Rhials: + - bugfix: mafia games only grant role win achievements when played with a full 12-player + setup. + Singul0: + - rscadd: Adds a new space ruin, A Waystation under attack! + Tattle: + - spellcheck: fixed a few typos, mostly around breathing + Timberpoes: + - bugfix: Actually fixes re-attaching heads unintentionally sending brains to the + gem room this time. For realsies. + Time-Green: + - rscdel: removes being cremated from high burn damage and being on fire (yes this + was in the game but has been broken for probably a very long time) + flowercuco: + - bugfix: admin respawn character verb works properly + - code_imp: adds IS_TRAITOR macro + kinneb: + - imageadd: Resprites the Wirebrush + - imagedel: Removes the sprite for the Advanced Wirebrush + san7890: + - bugfix: 'The Syndicate have gotten their hands on the most dangerous weapon: A + photocopier that doesn''t require any money. God save us all.' + - bugfix: The hermit of the Icemoon has decided to build their hut in some deeper + caves for a bit more protection from the local fauna. + - bugfix: Pirates finally realized that they shouldn't risk life and limb attacking + stations if they had already paid them off. + spockye: + - bugfix: fixed disposals on the starfury + - bugfix: fixed flooring on the starfury + - bugfix: fixed missing air alarm on the starfury + - bugfix: fixed air turfs exposed to space on the starfury + tralezab: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The dark matt-eor - rscadd: Summon a dark matt-eor final traitor objective - rscadd: Dark matter singularity variant, which can't grow as big as a regular @@ -1527,10 +2527,53 @@ - qol: added a lot of feedback to interacting with meteor shields - balance: emagging a lot of meteor shields warns the station, but emagging enough of them summons a Dark Matt-eor. +<<<<<<< HEAD - rscadd: "Ask your local bartender for the hottest drink of the year, the \"Pi\xF1\ a Olivada\"!" - rscadd: Adds a new space ruin, A Waystation under attack! - bugfix: The hermit of the Icemoon has decided to build their hut in some deeper caves for a bit more protection from the local fauna. +======= +2023-03-31: + Capsandi: + - rscadd: Added a new space ruin + JohnFulpWillard: + - bugfix: NtNet receive/send circuits should work now. + MMMiracles: + - bugfix: The Bridge and Arrivals on Tramstation should now be firmly connected + to the main distro loop once again. + Melbert: + - qol: Some sound related messages from Iv drips, turrets, and the nuke toy are + now audible to the blind / hidden from the deaf + RikuTheKiller: + - bugfix: Suffocation-handling reagents work on all species once more. + - spellcheck: Added a previous tip for handling plasmaman suffocation back into + the game. + SishTis: + - qol: Peacekeepers cyborgs don't get message about being confused while using harm + alarm + SomeRandomOwl: + - rscadd: New VERB, Request Internet Sound, It is in the OOC tab and allows you + to request music from admins to play, by default only allows bandcamp, youtube, + and soundcloud links + - bugfix: Fixes the Admin Midi Widget UI to only present info that is available + to players to be seen + - admin: Play Internet Sound URL input is now TGUI + - admin: Play Internet Sound warns you if a song length is >10 Minutes + - admin: Added new mute type to mute internet sound requests from a player + - config: Added thee new config options, LOG_INTERNET_REQUEST, REQUEST_INTERNET_SOUND, + REQUEST_INTERNET_ALLOWED + ZAMODA: + - rscadd: Added a new space ruin, the Atmos Asteroid! + necromanceranne: + - qol: You can rename and change the description of nanite/thermal pistols. + san7890: + - rscadd: "Ask your local bartender for the hottest drink of the year, the \"Pi\xF1\ + a Olivada\"!" + timothymtorres: + - bugfix: Fix Greytide Worldwide basketball stadium being able to explode from a + fuel tank + vinylspiders: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: cycler shotguns' inhand sprites will no longer float ominously by their wielder's side diff --git a/html/changelogs/archive/2023-04.yml b/html/changelogs/archive/2023-04.yml index 6996be51ee4..e4cc5aef1f1 100644 --- a/html/changelogs/archive/2023-04.yml +++ b/html/changelogs/archive/2023-04.yml @@ -1,4 +1,5 @@ 2023-04-01: +<<<<<<< HEAD A.C.M.O.: - bugfix: Fixed lungs gas exchange implementation, so you always inhale and exhale the correct gases. @@ -13,12 +14,26 @@ Deranging: - bugfix: The graph in Power Monitor consoles is no longer under half its normal size. +======= + Cheshify: + - bugfix: The Lance goes deeper into the station when it docks. + Deranging: + - bugfix: The graph in Power Monitor consoles is no longer under half its normal + size. + Helg2: + - rscadd: the victims of kneecapping will now scream. + - qol: you will no longer gain useless message, when you're harming someone in agro-grab + in the head with their neck already slicen, instead of continuing killing them. + - qol: you will no longer gain irritating messages, when trying to stab someone + in the eye, instead of just stabbing them with screwdriver. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - balance: 'Random Disease: Fluids transmission frequency reduced' - balance: 'Random Disease: Respiration transmission frequency increased' - balance: 'Random Disease: Low severity frequency increased' - balance: 'Random Disease: Cures list removes dispenser reagents and food products' - balance: 'Random Disease: Minimum pop and minimum round timer added to event check' +<<<<<<< HEAD MMMiracles: - bugfix: The Bridge and Arrivals on Tramstation should now be firmly connected to the main distro loop once again. @@ -57,6 +72,24 @@ lpeapnni: - rscadd: Added chinchillas 2023-04-02: +======= + LemonInTheDark: + - bugfix: Lava and plasma rivers (openspace on icebox too) will generate now. This + was broken for 2 years wtf man + Rhials: + - balance: Fugitive team backstories will now be selected with consideration to + the number of people who sign up. + - qol: Fugitives can no longer spawn in atmos-unsafe areas. + SmoSmoSmoSmok: + - bugfix: pais can upload photos to newscasters again +2023-04-02: + 13spacemen: + - bugfix: Volume pump overclocking animation is much slower, no more headaches + - qol: 'Added screentips to the RPD; screentips and balloon alerts to many atmos + machines and devices + + :cl:' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo#0931: - rscadd: Added 'biscuit' cards! They can contain documents and can only be accessed by cracking them open, you can't close them back. Nanotrasen now stores spare @@ -67,6 +100,7 @@ - bugfix: Now the paper slip is actually paper. - imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, added the corporate paper slip. +<<<<<<< HEAD Gyran: - rscadd: Re-added the unused combat medkit to the Blueshield locker and changed the briefcase to a secure one @@ -107,11 +141,18 @@ gem room this time. For realsies. - qol: Bluespace tags are gone. The information contained within is still available in the same way, just in a more out-of-character format. +======= + EOBGames: + - qol: Bluespace tags are gone. The information contained within is still available + in the same way, just in a more out-of-character format. + Hatterhat: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Reagent containers that splash on people when thrown (e.g. molotovs) now spill their contents on both target and turf. (This means that throwing molotovs with enough fuel spills fuel puddles, throwing beakers with acid spills acid on the floor, etc. etc.) Unfortunately, molotovs still lack the ability to ignite their own spilled fuel, but we'll get there one day. +<<<<<<< HEAD - bugfix: Breathing pluoxium works again - rscadd: Sleeping with a pillow restores more health. - bugfix: fixes emissives blocker layering issue that was causing emissives on clothing @@ -249,11 +290,87 @@ SkyratBot: - bugfix: marisa shoes will now build its worn icon using the greyscale config like sneakers do +======= + Helg2: + - rscadd: Sleeping with a pillow restores more health. + Jacquerel: + - rscadd: A new meat-themed space ruin. + - bugfix: Organ box now actually requires coolant in order to work. + JohnFulpWillard: + - balance: Sentient Diseases (and diseases in general) can no longer roll Anacea, + Haloperidol & Spaceacillin as their cure, however they've been replaced with + chemicals that are either harder to make, or have larger drawbacks (such as + putting you to sleep). + LT3: + - bugfix: The missing table reinforcement for MetaStation's cargo office has been + found + Melbert: + - bugfix: Plates are no longer ephemeral when throwing at people. + NamelessFairy: + - admin: Exiting the highlander delay window without selecting an option will no + longer start highlander mode. + Xander3359: + - bugfix: Maid in the mirror no longer drops a sprite-less suit. + san7890: + - bugfix: The prison on IceBox should no longer leak air as often. + tralezab: + - rscdel: Votes out some sussy emergency meeting code + vinylspiders: + - bugfix: fixes emissives blocker layering issue that was causing emissives on clothing + to not display at all + - bugfix: admins may now send headset messages to silicon mobs as long as they have + a radio + - bugfix: fixes floating point inaccuracies in numeric prefs +2023-04-03: + Ical92: + - rscadd: Added security cameras to the five "default" shuttles + - rscadd: Added camera telescreen to KiloStation Emergency Shuttle + - bugfix: fixes telescreens showing static when reopening a camera + Jacquerel: + - bugfix: Traitors should be able to summon their satellite hacking supply kit. + - bugfix: Dark Matteor shouldn't crash on spawn and fail to arrive. + SomeRandomOwl: + - bugfix: Play Internet Sound will no longer show an admins Character name and returns + back to showing CKEY as previously + Time-Green: + - rscadd: Researcher Anna Nomally has disappeared into space, carrying 20 anomaly + cores. What could she be up to? + iwishforducks: + - bugfix: Removes errant newscaster in the dorm maints of Tramstation. + vinylspiders: + - bugfix: the 'natural wig' item will no longer show a broken icon when it mimics + a hairstyle whose icon path something other than the default 'icons/mob/species/human/human_face.dmi' +2023-04-04: + 13spacemen: + - bugfix: Roundend Report properly lists cultist names if the cult failed and didn't + summon Narsie + DrDiasyl aka DrTuxedo#0931: + - bugfix: Floor lights no longer become invisible when the fire alarm is turned + on + Ebin-Halcyon: + - imageadd: The maid costume has gotten it's colors slightly tweaked, should look + nicer. + LemonInTheDark: + - bugfix: Directional frosted/tinted windows will no longer fuck up vision + MrStonedOne: + - bugfix: The notify restart verb in the ooc tab should now actually work. + Profakos: + - rscadd: adds the ruins of a restaurant robot portal hub + Rhials: + - code_imp: The xeno_spawn landmark is now the generic_maintenance_landmark landmark. + - bugfix: Certain midrounds will now check for atmos safety before spawning. + tralezab: + - rscadd: Chuunibyou wizards, and chunni granters in the library + - rscadd: Medical eyepatches +2023-04-05: + Helg2: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: changed mech description to span_notices and just slightly comfier to use. - qol: added tooltips for mech's maintenance mode. - balance: added t4 parts for mauler and dark gygax. And t3 parts for dark honker. - bugfix: fixed that you can remove capacitor and scanmod from mech without proper maintenance steps. Now you can't +<<<<<<< HEAD - bugfix: The prey pod ruin no longer has two corpses, only one. - code_imp: The xeno_spawn landmark is now the generic_maintenance_landmark landmark. - bugfix: Certain midrounds will now check for atmos safety before spawning. @@ -304,12 +421,58 @@ in regular r-glass panes. LT3: - server: BYOND client compatibility check +======= + - bugfix: West sided version of red alert fire alarm is now looks normally. + JohnFulpWillard: + - bugfix: QM's now get teleporter access on lowpop, like every other Command does. + LT3: + - rscadd: Don't trip on the tram plate while crossing, you may be in for a shocking + surprise! + LemonInTheDark: + - refactor: runechat should be a lot cheaper on the server. I've changed how it + functions, if it behaves weird yell at me please don't just ignore it + - bugfix: The coderbus passengers layer properly again + MMMiracles: + - balance: Little Timmy's lavaland pizza party has gotten an overhaul to be a bit + more interesting. + Profakos: + - bugfix: The prey pod ruin no longer has two corpses, only one. + RikuTheKiller: + - balance: Slash wounds no longer clot while dead. + SyncIt21: + - bugfix: thermo machines can be ctrl dragged again + - qol: alt click cycles between min, median & max temperature ranges + - refactor: removed useless init code + tralezab: + - bugfix: blink is now a translocation spell + vinylspiders: + - bugfix: marisa shoes will now build its worn icon using the greyscale config like + sneakers do + zxaber: + - balance: Malf AIs that hack Head of Staff and Vault APCs will now find a discount + issued on Doomsday. +2023-04-06: + DaydreamIQ: + - rscadd: Added the Abandoned Interdyne facility, explore at your own peril + Ghilker: + - rscadd: Timestop blocks the SM from processing (can't be healed, doesn't output + gases but can still take damage) + JohnFulpWillard: + - balance: Flamethrowers no longer have a trigger guard, and can be used by anyone + (including if you're wearing Atmos gloves). + - bugfix: Slimes' mischievous emote now works. + LT3: + - rscadd: The tram now has a remote control for funny and/or nefarious purposes + LemonInTheDark: + - admin: All centcom ferries are now loadable. Yes this WASbroken +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Removes Rev code from core flash code - bugfix: Getting converted on April Fools now triggers the meme force say as always intended - rscdel: The meme force say can no longer trigger on any day (it didn't work before anyways) +<<<<<<< HEAD - bugfix: Fixed cult conversion Nerev4r: - bugfix: Synths no longer benefit from normal Tend Wounds. @@ -371,6 +534,22 @@ - code_imp: Adds a flag to send_clock_message, so the real notify_ghosts proc can be used instead 2023-04-09: +======= + Mey-Ha-Zah: + - imageadd: added new lavaland sprites, moved some sprites to a new location, adjusted + pixel shift for the updated sprites, adjusted the name of some sprites. + flowercuco: + - rscadd: Added new syndicate uplink beacon and associated systems that allow you + to get a replacement traitor uplink + - bugfix: Debug & nukie uplinks no longer runtime and work properly again + kinneb: + - rscadd: A new HUD, The 'Detective' UI + - imageadd: All the spritework for said HUD. + timothymtorres: + - imageadd: Split all icons in weapons_and_items.dmi to their own categories + - imagedel: Removed some unused icons +2023-04-07: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - code_imp: Audits the placement of Generic events markers. Some departments which previously had none now have some, and maintenance largely no longer holds them. @@ -378,6 +557,102 @@ cascade portals are now placed in more commonly traversed and easy to identify areas. They will also now trigger in places like Icebox med and brig when they previously couldn't. +<<<<<<< HEAD +======= + - bugfix: Fixed cult conversion + NamelessFairy: + - bugfix: Basketball and Thunderdome maps should not load with broken turfs are + several resets of their maps. + Profakos: + - bugfix: Critical condition will clear properly when you leave crit + Shroopy: + - bugfix: The fire alarm in the vacant commissary on Delta Station now longer defies + gravity. + mc-oofert: + - bugfix: SM now dusts you if you fall on top of it from another Z level + softcerv: + - bugfix: The crew manifest now properly updates after ID modifications. +2023-04-08: + Donglesplonge: + - rscadd: central commands meteorological divsion has picked up a new asteroid drifting + in NT space, what secrets could it hold? + Fikou: + - bugfix: fixes medkits (and wallets, candle boxes) being able to store normal sized + items + Ical92: + - rscadd: Added "Botanical Haven", a small sanctuary for flora and spacefaring botanists. + LT3: + - bugfix: Tram doors open as expected while in motion + - soundadd: New tram door open/close sounds + - qol: Tram doors open faster when unpowered + LemonInTheDark: + - bugfix: The fountain ruin will now properly spawn on lavaland + Melbert: + - bugfix: Head revs can no longer convert with the AOE flash mode + Paxilmaniac: + - bugfix: Turfs made through stack crafting (so none currently) will have materials + applied if the var is set + Squishypone: + - bugfix: Fixed the drawings on normal sized paintings not appearing on the ground + SyncIt21: + - code_imp: RCD & all its subtypes and other devices like it[RTD, RLD, Plumbing + RCD, RWD, RFC, RPD] now moved into 1 folder, removes unused vars + - refactor: RCD window type cost & delay are set based on the window type selected. + - refactor: RLD, RCD & plumbing RCD now has extra resource & target placement sanity + checks, optimizes RLD and code readability. + - refactor: RTD now sets the correct delay with the cost of the tile type currently + being constructed/deconstructed taken into account + - refactor: large majority of to_chat() replaced with balloon alerts + - bugfix: RLD silo link now works again + - bugfix: RTD can place tiles on any subtype of plating + - bugfix: RCL now lays the correct colour of pipe cleaner when its colour is changed + - imageadd: empty blinking yellow icon states for RTD & RLD & an ammo bar for RLD + TheBoondock: + - bugfix: fixed missing Goliath tentacles icons + Xander3359: + - bugfix: Anomaly releaser no longer creates a "Stable " + ZephyrTFA: + - bugfix: Syndicate teleporter is no longer secretly nerfed due to internal code + mishaps. (-1 range) + - bugfix: Syndicate teleporter now gibs you where it should correctly; resulting + in it being much more dangerous to use + massaheartsu: + - rscadd: Added a new ruin! + thgvr: + - imageadd: Lizards have been resprited, as well as Digitigrade sprites. Please + remember to update your colors to account for this. + timothymtorres: + - bugfix: Fix basketball and mafia minigame UI not removing inactive clients + - rscadd: Add two new basketball teams and stadiums - Ass Blast USA and Soviet Bears + vinylspiders: + - bugfix: the atrocinator modsuit mod will now make you fall up again when activated. +2023-04-09: + ChungusGamer666: + - rscadd: Mobs on fire get particle effects (it looks sick) + - rscadd: Wet mobs get particle effects (it looks sick) + Comxy: + - rscadd: Adds new Cosmic Heretic. + - soundadd: Adds Cosmic Heretic sounds. + - imageadd: Adds Cosmic Heretic sprites. + DaydreamIQ: + - bugfix: Interdyne Ruin should now have power + DrDiasyl aka DrTuxedo#0931: + - imageadd: Requestions consoles got a new sprite! + - imageadd: Gulag consoles got a new sprite! + - imageadd: Escape and assault pod consoles got a new sprite! + - qol: Now the gulag and pods consoles use overlays, instead of having turned ON + screen in their base icon. + - qol: Now the gulag and pods consoles screen change when they are emagged. + - qol: Requests console now shows examine prompt on how to open their panel. Also + shows a prompt if they were hacked. + FernandoJ8: + - balance: chicken eggs can now, rarely (1/256 chance), spawn 4 chicks instead of + 1 or none + Fikou: + - balance: 2 More Cargo Tech slots + Ical92: + - bugfix: fixed duplicate pipe in Underground Outpost 45 Away Mission +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert, stove and pot sprites by Kryson, ladle sprite by Kinneb: - rscadd: Kitchens are now stocked with Ranges. - rscadd: You can now print (and create) Stoves. @@ -397,6 +672,7 @@ - rscdel: Soup is no longer food items, so can't appear in random food pools (at least not yet). - balance: Virus Food recipe now requires you cool it to 200k. +<<<<<<< HEAD SkyratBot: - bugfix: makes ai sat turrets actually able to fire upon silicons - bugfix: waystation cargo techs get shoes now @@ -431,10 +707,14 @@ - spellcheck: The examine text for the carp tongue and gondola heart is more correct. - qol: Activating arm implant items in hand now automatically retracts and opens the radial menu, unless it's a welding tool. +======= + Paxilmaniac: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: The ability for objects to be loomed is now a component, with all of the looming behavior moved off of the structure and into said component. The actual behavior for looming cotton (clicking on a loom with cotton) is completely unchanged. +<<<<<<< HEAD - balance: 2 More Cargo Tech slots Wallem: - imageadd: Updates navbeacon sprite @@ -558,6 +838,15 @@ SkyratBot: - imageadd: Nanotransen has made uniform changes to the robotics lab, modernizing their wardrobe. +======= + carlarctg: + - qol: Activating arm implant items in hand now automatically retracts and opens + the radial menu, unless it's a welding tool. + mc-oofert: + - bugfix: waystation cargo techs get shoes now + - bugfix: makes ai sat turrets actually able to fire upon silicons + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: A significant overhaul of various illicit and dubiously legal goods and gadgets available via cargo. - balance: Cargo now has an Import category for all non-departmental goods. (And @@ -568,15 +857,50 @@ - code_imp: Removes the brand new mosin subtype as it is now defunct. - bugfix: Fixes potentially exploitative code in the jamming proc. Cleans up that code while I'm at it. +<<<<<<< HEAD - imageadd: Recolours the Wirebrush (Again) - balance: Experimental syndicate teleporter's teleportation is no longer perfect, it will cause the user to bleed a little. Luckily the detective can scan the blood and find out who the big bad is, as long as he's quick. +======= +2023-04-10: + ChungusGamer666: + - rscadd: Being electrocuted will most of the time make you blurt out whatever you + were typing. This includes batons. Be careful. + - bugfix: Transforming into an android and then back into another species will no + longer leave you with permanent robotic limbs + FernandoJ8: + - bugfix: the contents of your pockets no longer drop onto the floor when your body + is randomized + Helg2: + - rscadd: Plasmamen will now spawn with proper masks depending on the job. + - qol: bsa parts can now be rotated. + - bugfix: fixed that you couldn't make improvised chem heater from constructed space + heater. + Jacquerel: + - balance: Carp can't teleport as far, but can do it more frequently. People who + piggyback through their rifts will be blocked from attacking for a short duration + (the same as the normal attack cooldown). + - balance: AI controlled carp will now be more selective about which objects they + smash. Player controlled carp (or carp directly instructed to attack objects + by people who have tamed them) can still attack whatever they like. + - bugfix: You can no longer escape the wrath of the honkmother by climbing onto + a cyborg. + - bugfix: Shooting a pair of piggybacked players with a penetrator round will penetrate + both players. + LT3: + - bugfix: Fixed tram malfunction event from using the wrong sprites + Melbert: + - bugfix: Admin spawned ghost portals no longer make all dead players considered + also as observers (they're two different things) + NamelessFairy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: CTF has been entirely refactored. - bugfix: Respawn times for CTF now work. - qol: CTF players are alerted during control point games when one team is half way to winning. - admin: CTF instagib mode can now be toggled from the secrets panel. +<<<<<<< HEAD - imageadd: Split all icons in weapons_and_items.dmi to their own categories - imagedel: Removed some unused icons - bugfix: The Regal Condor's magazines are actually visible, and therefore useful @@ -662,6 +986,99 @@ - qol: NIFs can now be manually removed from a player file. - bugfix: NIFs now delete when broken for two shifts 2023-04-15: +======= + - bugfix: TGC decks will no longer allow you to insert an illegal 31st card. + Somepan: + - rscadd: Added a message upon being hit by any spectral instruments + - balance: Reduced the stamina damage dealt by spectral instruments from 25 to 18 + making it transform after 6 hits instead of 4 + VileBeggar: + - balance: PKAs can now be attached to mining MODsuits. + Wallem: + - imageadd: Updates navbeacon sprite + Z Man Wit Z Plan: + - bugfix: fixed a couple things in the atmos asteroid ruin + jlsnow301: + - refactor: Tgui's state manager is in typescript now, huzzah + tf-4: + - spellcheck: The examine text for the carp tongue and gondola heart is more correct. + vinylspiders: + - rscadd: latex balloons can now be crafted using a latex glove and some cable. + You can fill them with air using a tank. They also have a new sound effect. + - imageadd: light tubes have a new inhand sprite + - bugfix: broken light tubes now actually have sharpness to them as they are basically + spikes of glass. + - refactor: refactored latex balloon code +2023-04-11: + Comxy: + - bugfix: Sergeant Araneus cannot spawn from gold slimes anymore. + Jolly: + - bugfix: Maps internally had the code for the "directional" windows altered a bit. + If you see stacked window panes or things look incorrectly, please file a bug + report as that isn't intentional!! + Moth-lantern: + - imageadd: Nanotransen has made uniform changes to the robotics lab, modernizing + their wardrobe. + Profakos: + - refactor: Refactored navigational beacons, making them constructable, deconstructable, + and generally easier to use + Singul0: + - bugfix: asteroid-based space ruins (waystation, the outlet) now has asteroids + below their plating! + flowercuco: + - qol: material components (such as autolathes) have contextual screentips if you + can put an item inside of it + kinneb: + - imageadd: Recolours the Wirebrush (Again) +2023-04-12: + 13spacemen: + - qol: Unwrenching empty atmos pipes/devices is now INSTANT + - balance: Experimental syndicate teleporter's teleportation is no longer perfect, + it will cause the user to bleed a little. Luckily the detective can scan the + blood and find out who the big bad is, as long as he's quick. + DrDiasyl aka DrTuxedo#0931: + - imageadd: Judge robe and powdered wig got new sprites! + Hatterhat: + - rscadd: The Regal Condor can now have its name and description changed via pen, + like the detective's revolver. + - bugfix: The Regal Condor's magazines are actually visible, and therefore useful + for their intended purpose. + - bugfix: The contractor baton now only gives you up to 40 seconds of stuttering, + instead of making you stutter for 40 seconds more after every hit. + Helg2: + - qol: installed upgrades on cameras now show as blue text instead of plain white + text on examine. + - bugfix: You can now uproot and dig out plants with any shovel and not just spade. + JohnFulpWillard: + - bugfix: People immune to sleep will not fall asleep from N2O + LT3: + - bugfix: Tram doors no longer play 8 variations of the same sound simultaneously + ShizCalev: + - code_imp: Vareditting a light replacer's emagged status will now properly update + the item's name / appearance. + SyncIt21: + - refactor: remove unused turf var inside wallmount procs + - bugfix: broken rack sprite inside RCD UI + - bugfix: mounted RCD now lays plating over chasms and open turfs + - bugfix: station blueprints no longer expands & detects areas of non atmos adjacent + turfs. + Thunder12345: + - bugfix: The action button description for malf AI hostile station lockdown now + makes it clear that doors will be electrified. + necromanceranne: + - qol: Clarifies in various names and descriptions whether security equipment is + lethal, nonlethal, less-than-lethal or destructive. +2023-04-13: + 13spacemen: + - bugfix: You can instantly unwrench empty atmos devices now + Melbert: + - bugfix: Fixed Hydrogen Peroxide and Acetone Oxide not dealing damage until you + take damage again + Mey-Ha-Zah: + - rscadd: New Lids for several crates. + - imageadd: Several new Crate Visuals. +2023-04-14: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ? Cheshify, Fikou, Blue-Berry, Zytolg, InfiniteGalaxies, Striders, Sylphet, Riggle, Soal, Andry, Crit, Deranging, and Pumpkin0. : - rscadd: Nanotrasen's Newest Exploratory Vessel is now available! Meet the North @@ -670,6 +1087,7 @@ - rscadd: energy barriers now have a regenerative subtype, fit for permanent installations. - code_imp: Raised the number of possible level render to 4, check your preferences if needed to be reduced. +<<<<<<< HEAD Gandalf2k15: - balance: Wall mushrooms will now spread more slowly. - admin: Wall mushroom planting is now logged. @@ -702,12 +1120,26 @@ - bugfix: Omen Component vendors will no longer double dip (double tip) - bugfix: Fixed Hydrogen Peroxide and Acetone Oxide not dealing damage until you take damage again +======= + LT3: + - balance: Engineers can override elevator door safety + - bugfix: emag action linked between elevator panel and doors + - bugfix: Cargo elevator has the correct access requirement again + - code_imp: All door types can now be linked to elevators + Melbert: + - bugfix: You can now taste once again, without requiring your tongue be surgically + replaced or reattached + NamelessFairy: + - bugfix: Removing cards from TGC decks by pouring them on the floor/into binders + should now function correctly. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - code_imp: Adds two new super-duper helpful helper procs for finding a maintenance/space spawn location, for all of your event/midround/whatever needs! - code_imp: Moves all midrounds/ghost_role events that hinged on maintenance/space carp spawns to the aforementioned helpers. - code_imp: The ghost_role event module file is now autodoced. +<<<<<<< HEAD SkyratBot: - bugfix: Removes the spectral trombone from the lavaland pizza party ruin. - balance: Returns the anomaly detonation timer from 75 seconds (40 seconds from @@ -752,10 +1184,64 @@ - bugfix: spoon overlays will now update when you eat from them to reflect that food = gone. it really is gone, you can stop beating yourself with the spoon. oh god please stop-- +======= + ShizCalev: + - bugfix: Fixed an annoying gravity runtime that occurred if a player was connected + before mapping finished initialization. + Singul0: + - bugfix: AI's now can see into the HoP Office and Pod bay. + - bugfix: Vault piping and wiring is now connected to the station. + kinneb: + - rscadd: Added the Abandoned Mime outpost as space ruin! +2023-04-15: + ChungusGamer666: + - refactor: Implanted foreign limbs will no longer be wiped by species change. + - rscadd: Burning structures spawn smoke particles. Sick. + Helg2: + - bugfix: Deltastation supermatter windows now properly rotated. + Jacquerel: + - bugfix: Removes the spectral trombone from the lavaland pizza party ruin. + LT3: + - bugfix: Fixed forcing night shift lighting on/off + - config: Station shift start time can now be set in the server config + Melbert: + - bugfix: Omen Component door crush works + - bugfix: Omen Component vendors will no longer double dip (double tip) + Sneeker134: + - bugfix: Monkeys and some other mobs no longer drop items they've grabbed from + storage onto the ground. + - admin: Added clever DNA injector to admin spawn options. + - bugfix: Added clever DNA injector. + carlarctg: + - qol: Gives nuke ops three free health analyzers in their shuttle, advanced health + analyzers in both medic kits, and a bonus health analyzer MODule in the premium + medical kit. + jimmyoofsalot: + - rscadd: adds pie-flavored pie + jlsnow301: + - bugfix: The HFR screen should be fixed, let me know if you see glitches + - bugfix: The HFR screen should now also select recipes properly + necromanceranne: + - balance: Returns the anomaly detonation timer from 75 seconds (40 seconds from + announcement for dangerous anomalies) back to 99 seconds (75 seconds from announcement + for dangerous). + timothymtorres: + - qol: Add contextual screentips, balloon alerts, and examine hints to lockers + vinylspiders: + - bugfix: fixes a runtime that can occur if a circuit floor gets changed into something + else. +2023-04-16: + Cheshify: + - bugfix: The North Star has functional elevators once again. + Dawnseer: + - rscadd: Goliath cloak can be worn as a cloak that doesn't provide any armor benefits + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: correctly type casts the turf into open type for the rcd mecha plating action - refactor: removes single letter variable names - refactor: uses datum/ui component to get user for to_chat() instead of usr +<<<<<<< HEAD - qol: Set default IV transfer rate to maximum (5) instead of 0. 2023-04-17: SkyratBot: @@ -803,12 +1289,50 @@ - bugfix: The pathing for the "Mimes vs Clowns" space ruin should be fixed internally. Whether you see this or not is depended on your server operator(s). SkyratBot: +======= + carlarctg: + - qol: Set default IV transfer rate to maximum (5) instead of 0. + flowercuco: + - balance: syndiekits cost 20 TC instead of 25 TC + tf-4: + - bugfix: Colossuses are now actually able to trigger their final attack - be careful + when they drop below 10% HP! + vinylspiders: + - bugfix: spoon overlays will now update when you eat from them to reflect that + food = gone. it really is gone, you can stop beating yourself with the spoon. + oh god please stop-- +2023-04-17: + ArcaneMusic: + - imageadd: Hydroponics trays now have pollen particles that they generate when + they share stats and chems. Non-allergenic! + Cheshify: + - bugfix: The North Star is no longer missing it's commission plaque or the QM's + request console. + Dawnseer: + - bugfix: Fixed warning messages + Fikou: + - bugfix: death squad officer outfit works + - bugfix: fixes lava not cleaning up the permanently on fire trait + Helg2: + - bugfix: slapper is visible in-hand again. + - bugfix: Interdyne and Syn-C Brutus ruins no longer runtime on initializing. + - bugfix: Interdyne's smes is now properly wired to the apc. + Jacquerel: + - bugfix: Renault and other simple animals are now correctly fireproof. + JohnFulpWillard: + - code_imp: Space Bats are now Basic mobs. + Jolly: + - bugfix: The pathing for the "Mimes vs Clowns" space ruin should be fixed internally. + Whether you see this or not is depended on your server operator(s). + NamelessFairy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Admins can now control the spawn location, potency, production and starting mutations of the space vines event. - bugfix: The space vine event will now correctly give vines mutations when they spawn rather than always being mutation free. - code_imp: Checkbox tgui inputs now support setting a minimum number of inputs rather than it being hardcoded to 1. +<<<<<<< HEAD - balance: Makes Black Market Uplinks more easily craftable, adds them to uncommon maint loot pool - bugfix: Eigenstasium lockers no longer bypass teleport protection @@ -820,10 +1344,83 @@ they share stats and chems. Non-allergenic! Vect0r: - balance: The blowgun no longer takes time to windup before you can shoot it. +======= + Rhials: + - qol: Ghosts are now notified and given an orbit popup for the Stray Cargo Pod + random event. + Singul0: + - bugfix: a pirate shipmate aboard the pirate cutter has found their lost energy + cutlass + SyncIt21: + - bugfix: null client error for balloon alert when toggling the electrolyser on/off + via the UI + Vect0r: + - balance: The blowgun no longer takes time to windup before you can shoot it. + YehnBeep: + - rscadd: Adds pAI cards to public areas on the North Star + Zonespace27: + - bugfix: Eigenstasium lockers no longer bypass teleport protection + carlarctg: + - rscadd: Added a nukeops victory state for failing to nuke the station, but somehow + hijacking the shuttle. + - balance: Makes Black Market Uplinks more easily craftable, adds them to uncommon + maint loot pool + flowercuco: + - qol: text that appears when you dont have an uplink in the traitor panel now tells + you the codes for your replacement uplink + jlsnow301: + - bugfix: HFR should now allow you to select input/moderator rates + - bugfix: Crystallizer ui should now properly show input gases + necromanceranne: + - balance: Nitrous oxide, the reagent, increases bleed rate from wounds rather than + directly subtracting blood. It can be counteracted using coagulants (such as + those in epipens). + - balance: Heparin purges coagulants. You have to remove heparin from someone's + system before you can use coagulants. + the-og-gear: + - admin: Added a SpinAnimation option for all atoms in the View-Variables drop-down + menu + - admin: Added a button to stop all animations right next to the SpinAnimation option + in the View-Variables drop-down menu + timothymtorres: + - code_imp: Cleanup 1 letter var names in martial arts files + vinylspiders: + - qol: added fifty stack versions of remaining glass sheet stacks for ease of debugging + - refactor: refactored sheet crafting to better support directional constructions + that aren't windows + - bugfix: fixes hostile mobs sometimes being able to target an atom that has been + marked for deletion and then becoming confused, and in a similar vein fixes + mobs sometimes still running their AI while being marked for deletion. + - bugfix: 'icebox: patched up some holes underneath the vent doors in science burn + room' + zxaber: + - balance: Engineer Borgs now have a tool to manipulate material stacks (and also + tile stacks). This replaces the R-Glass tool. +2023-04-18: + Helg2: + - bugfix: Pirate and hunter shuttles now have no wi-fi. (added cutAIwire apc helpers + to them) + - bugfix: Added missing apc helpers to apc on DeepStorage (the bunker with "away" + access) + IHateGeese: + - rscadd: emagging the BSA explodes the next person to fire it. + NamelessFairy: + - bugfix: Fixes being unable to switch modes on the Oingo Boingo Punch-face + Singul0: + - bugfix: Nanotrasen has supplied the North Star with a B.E.P.I.S Chamber. + SyncIt21: + - bugfix: RTD animation effect adding a timer on deleted floor tiles. + tralezab: + - bugfix: Body purist headrevs having a bad time with their implant + zxaber: + - balance: Cyborg Rechargers now restock with metal and glass from the ore silo, + and no longer grant the materials for free. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-04-19: ATHATH: - bugfix: Laser pointers will no longer disable borgs that have somehow been made immune to flashes. +<<<<<<< HEAD LT3: - bugfix: Fixed general antag ban not applying to midrounds/ghosts - bugfix: ICES will no longer reschedule events due to an imaginary escape shuttle @@ -839,6 +1436,20 @@ - imageadd: adds new inhand sprites for most flashlights in the game, including animated flares and candles - refactor: cleaned up flashlight.dm's unnecessary bits and made some slight improvements +======= + BlueMemesauce: + - bugfix: Fixed a bug where additonal receivers wouldn't work if the first one was + on but disconnected + Dawnseer: + - bugfix: The rolling table actually plays the rolling sound, as the lord intended. + Helg2: + - qol: Reflectors now have better rotating menu. Changed from alt-click to just + lmb. + Iamgoofball: + - bugfix: PDA messaging is now more immersive based on age + JohnFulpWillard: + - bugfix: Plague doctor hats no longer give you an FOV. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: '[Mafia] All Mafia abilities have been overhauled in the backend, it''s now much easier to understand what each role''s ability can do and how it works.' - admin: '[Mafia] Admin setup of Mafia is now in TGUI' @@ -849,6 +1460,7 @@ - qol: '[Mafia] Lawyers, Wardens, etc. now perform their night ability at night, instead of the day prior.' - qol: '[Mafia] Night time now lasts 40 seconds instead of 45.' +<<<<<<< HEAD - bugfix: PDA messaging is now more immersive based on age - qol: Shoe storage can now fit box cutters, pills, and toy pistol magazines. - rscadd: emagging the BSA explodes the next person to fire it. @@ -890,6 +1502,47 @@ - code_imp: multiplier for all shipments made through cargo - refactor: 2 new procs retrive_points() & subtract_points() to dela with different types +======= + - admin: Secret buttons for Engineering/Brig maint accesses should now work more + consistently. + Melbert: + - qol: Hydroponics trays should update more snappily now + Mey-Ha-Zah: + - imageadd: Updated Wrapping Icons. + Supermichael777: + - bugfix: ' Plastitanium glass no longer always creates stacks of 50' + Tattle: + - bugfix: Nightmares will once again spawn + carlarctg: + - qol: Shoe storage can now fit box cutters, pills, and toy pistol magazines. + vinylspiders: + - bugfix: candles can now be used to light other candles, cigarettes, and anything + else that needs lighting in a pinch. + - bugfix: flashlights that have directional lights now have directional sprites + to match + - bugfix: candles can now be snuffed again + - imageadd: adds new inhand sprites for most flashlights in the game, including + animated flares and candles + - refactor: cleaned up flashlight.dm's unnecessary bits and made some slight improvements +2023-04-20: + BlueMemesauce: + - bugfix: You can no longer log syndicate comms (or any other banned frequencies) + with a telecomms server + - bugfix: You can no longer use tcomms buses to change messages to banned frequencies + LemonInTheDark: + - rscadd: Holograms glow now, pokes at the lighting for holocalls in general a bit + to make em nicer. + - qol: You can no longer accidentally end a holocall (as a non ai) by leaving the + area. Felt like garbage + - bugfix: Fixes static rendering improperly if viewed by a non ai + Singul0: + - bugfix: Surgery room ID's in NorthStar are now properly ID-ed + - bugfix: Fixes missing APC in 2nd deck aft hallway of Northstar. + - rscadd: Due to an influx of syndicate activities near the station, A number of + businesses in the nearby sector of space have been closed down. One of which + being a themed old-style american diner. Can you find it? + SmoSmoSmoSmok: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: refactors trees into basic mobs - refactor: refactors poles into basic mobs - rscadd: If trees now see you holding a chainsaw, hatchet, or some wood they will @@ -898,6 +1551,7 @@ the way - bugfix: cells charged by the pole will now have their icon correctly updated to reflect their charge +<<<<<<< HEAD - rscadd: Added new berets to the vendor iain0: - bugfix: Fixes an error in health analyzers which would cut off the top of the @@ -940,18 +1594,52 @@ random poster spawners. - rscadd: Burning items are now actually considered to be at a minimum, 150 degrees celsius by the game. +======= + iain0: + - bugfix: Fixes an error in health analyzers which would cut off the top of the + health scan if the player was deaf. + tralezab: + - bugfix: DNA infusers now properly give felinid tails and other external organs + - qol: made dna infusers less confusing to use by removing the "must be opened" + check + - bugfix: fixed up gondola mutants and how to obtain them +2023-04-21: + Chlorotrifluoride: + - imageadd: flat satchel sprite re-palette + ChungusGamer666: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'The following structures are now flammable: Picture frame, fermenting barrel, drying rack, sandals, painting frames, paintings, spirit board, notice board, dresser, displaycase chassis, wooden barricade' - balance: 'The following items are now flammable: Baseball bat, rolling pin, mortar, coffee condiments display, sandals, wooden hatchet, gohei, popsicle stick, rifle stock' +<<<<<<< HEAD +======= + Helg2: + - bugfix: generic air tank mounted onto pneumatic cannon now has working sprite. + Jacquerel: + - imagedel: you can no longer tell if someone is wearing a PDA by looking at them + Melbert: + - bugfix: Fixes a runtime with Spontaneous Combustion + - bugfix: Overheating Oculine will flash people nearby, as was intended 2 years + ago (never worked) + - bugfix: Fixes a runtime with pirate Data Siphon while emp-ing the station's rnd + servers + - admin: Adds a warning that spawning revs via traitor panel will not function as + expected. + - bugfix: Runtime from tracking mobs on the syndicate base + - bugfix: AIs now get their proper lawset, and an objective related to said lawset, + on Nations + MrStonedOne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - config: database configs have been updated for better control over the connection pool - server: BSQL_THREAD_LIMIT has been renamed to POOLING_MAX_SQL_CONNECTIONS, old configs will whine but still work. - bugfix: fixed rare race condition that could lead to a sql query being ran twice during world shutdown. +<<<<<<< HEAD - imageadd: flat satchel sprite re-palette - code_imp: Cleanup 1 letter var names in martial arts files - qol: the rescue hook has a much greater chance at catching actual fallen player @@ -980,10 +1668,52 @@ SkyratBot: - bugfix: Removed extra messaging server in North Star tcomms - bugfix: Things that block glow will now like, do that again +======= + SyncIt21: + - bugfix: order consoles cancelling order's less than 200 but still subtracting + money, mining points from the player + - code_imp: multiplier for all shipments made through cargo + - refactor: 2 new procs retrive_points() & subtract_points() to dela with different + types + Tattle: + - soundadd: increased the volume of the clownana rustle + mc-oofert: + - rscadd: Adds the Hug Relaxation Shuttle as an emergency shuttle + the-og-gear: + - code_imp: Update active alarm monitor computers only when alarms are actually + changed instead of every program tick + tralezab: + - bugfix: Fixes DNA Infuser Book UI, removing the button that crashes it and fixes + not showing threshold descriptions + - rscadd: Added new berets to the vendor +2023-04-22: + BlueMemesauce: + - bugfix: Removed extra messaging server in North Star tcomms + ChungusGamer666: + - qol: Thermited walls now get an examine message telling you they are, in fact, + thermited. + - rscadd: Burning items are now actually considered to be at a minimum, 150 degrees + celsius by the game. + MTandi: + - qol: IV drip flow rate can be changed without the container or object attached + - bugfix: IV drip animation states fixed + vinylspiders: + - qol: the rescue hook has a much greater chance at catching actual fallen player + bodies as opposed to generic skeletons/other npc corpses + - bugfix: traitor objective posters will no longer be able to spawn from general + random poster spawners. +2023-04-23: + LemonInTheDark: + - bugfix: Things that block glow will now like, do that again + Melbert: + - bugfix: Ingredients which fail to react in soup reactions drop when the reaction + finishes as intended +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Tattle: - qol: basicmobs can now make sounds when their speech is triggered - qol: pigs will now make sounds and emote on their own - sound: cows, pigs, and sheep have new sound effects! +<<<<<<< HEAD vinylspiders: - bugfix: cafe roles will now retain their name after ghosting instead of just being called 'a cafe visitor' @@ -1017,6 +1747,33 @@ Wallem, Imaginos: - image: Updates the IV drip sprites 2023-04-25: +======= +2023-04-24: + BlueMemesauce: + - spellcheck: Fixes Explosive Holoparasite description mentioning a removed ability + - bugfix: Maps now spawn the correct amount of space levels. The bug caused them + to spawn 1 less in each category + - code_imp: The space ruins budget is now proportional to the amount of ruin levels. + This has no effect on the current default maps, but added maps with less than + the default amount of ruin levels will see less ruins. + Borisvanmemes: + - balance: Bulldogs now hit 20% harder with their projectiles! + Cheshify: + - qol: telecomms is quieter and less ear-damaging. + - sound: modified tcomms sound to remove high-tones. + - bugfix: the telecomms sound only comes from the server hub machine. + ChungusGamer666: + - rscadd: Burning items now get (small) smoke particles. Sick. + - bugfix: Burning objects now clear their burning overlay properly. + - qol: Examining burning objects will always tell you that they are burning. + - rscadd: Books can now be burned just like any other paper item. + - rscadd: You can cut pages out of books with any sharp item, not just knives or + wirecutters. + Dawnseer: + - bugfix: Anti-glow actually bringing some darkness instead of just a light glow. + Fikou: + - rscdel: prisoner spawns from the north star asylum +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex, ChatGPT for the first changelog entry (slightly edited): - qol: Zipped and unzipped through alt-click, winter coats can now be. Hmm, stylishly warm, you shall be. Feel like a Spaceman, you will. Use the Force, to zip and @@ -1025,6 +1782,7 @@ both in item form and when worn. - bugfix: Updated the Icebox EVA winter coats (the Endotherm winter coats) to use the same sprites as the regular winter coats. +<<<<<<< HEAD Hatterhat: - balance: The CIN surplus crate is now an import crate, meaning that it's no longer buyable through Security's department order console and has no lock. @@ -1032,15 +1790,76 @@ with actual clips suitable for the Sportiv. - bugfix: The 7.62 ammo box was renamed to .244 Acia ammo box, because lore parity. Melbert: +======= + LT3: + - code_imp: Added TGUI mobility check bypass + - qol: You can now use your PDA while laying down + Melbert: + - refactor: Mob ai refactored once again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Cameras can only see vertically upwards if the turf above them is transparent. But hey, the North Star (and other multi-z maps) will now perform wayyy better (less time dilation) Rhials: +<<<<<<< HEAD +======= + - bugfix: The mafia early vote counter will now properly display. + Ryll/Shaps: + - bugfix: Yawning will now have a chance of making people near you yawn as well, + and is guaranteed to make them yawn if they examined you in the last 2 seconds. + It was supposed to already do that, but now it'll actually do that + SmoSmoSmoSmok: + - bugfix: fixes produce console bluescreening when viewing it as ghost + SyncIt21: + - qol: rewords "Total Cost" to just "Total" so text does not overflow to the next + line and improves readability + - qol: just one failure message if you don't have enough credits for cargo/express + mode to keep it consistent + - refactor: rounds the total cost of your produce console order so you don't have + decimal values left in your bank account + - bugfix: balloon alert adding timer on deleted mod core after construction causing + runtime. + Wallem, Imaginos: + - image: Updates the IV drip sprites + carlarctg: + - qol: When failing to teleport with the veil shifter it tells you with text and + spooky ghost sfx, and doesn't use up a charge or have any unintended vfx. + san7890: + - rscadd: If you ever happen upon a wild deer, try not to ride your fancy vehicles + too close to it as it'll freeze up like a... you know where I'm going with this. + zxaber: + - bugfix: Restores ability for borgs to adjust reflector angles. This is now a left-click + with nothing selected, similar to humans' left-click with an empty hand. +2023-04-25: + ArcaneMusic: + - rscadd: A few map specific lunar objects have been added related to Konsu 19 (Moon + Outpost 19). + - rscadd: New fluff objects were added related to xenoflora and mining. + - rscadd: New loot, puzzles, and challenges await you on Konsu 19. Are you prepared? + DaydreamIQ: + - bugfix: Swat crate's description now lists the correct kind of gloves + DrDiasyl: + - sound: Disablers and lasers have a new deeper sound to them + - sound: Sound of lasers hitting a person now are giving more of a punch + Fikou: + - balance: removes fov from the SWAT mask + Gamer025: + - bugfix: Ingame ore silo logs should now log deposit actions correctly + - config: New config for silo logs + GoldenAlpharex: + - bugfix: Biogenerators now display the accurate price of their products after having + been upgraded, as they no longer visually apply the efficiency discount twice. + Rex9001: + - spellcheck: Fixes grammar issues located in Pirates and item descriptions related + to the folder + Rhials: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: New event weight station trait -- Dust Stormfront. - balance: Space Weather Forecast -- Expect more frequent Major Space Dust storms in the foreseeable future. - code_imp: The Major Space Dust event is once again returned to being a meteor_wave event instead of a Space Dust subtype. +<<<<<<< HEAD SkyratBot: - bugfix: Adds prisoner ID's inside the gen pop lockers on the Northstar. Also renames the holding cells to Gen Pop. @@ -1092,10 +1911,36 @@ - sound: Sound of lasers hitting a person now are giving more of a punch - rscadd: Say emote prefixes are no longer forced to be lowercase. This includes radio emotes! +======= + SyncIt21: + - bugfix: flood light now shines with their object color + necromanceranne: + - rscadd: You can make a tactical turtleneck or turtleskirt by putting a telecrystal + and a tactiCOOL varient of the turtleneck into a washing machine. Watch it change + before your eyes! + nikothedude: + - rscadd: Say emote prefixes are no longer forced to be lowercase. This includes + radio emotes! + rageguy505: + - bugfix: Adds prisoner ID's inside the gen pop lockers on the Northstar. Also renames + the holding cells to Gen Pop. + - rscadd: A new venture by Nanotrasen has put phonebooths in space. + trevorpillow: + - rscadd: Added hostile spawn tag to rats +2023-04-26: + 13spacemen: + - qol: Lowered the atmos build, reprogram, and destroy delays on the RPD + Fikou: + - bugfix: skeletons get boosted heals from milk again + Helg2: + - balance: Heretic blades butcher speed is 3 seconds now. + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: '[Mafia] Notes are no longer written out for you.' - qol: '[Mafia] You can now send your notes to chat whenever.' - qol: '[Mafia] Roundend has changed. Solos will win over others in a 1v1, but a HoP can keep a round going in case they can solo lynch.' +<<<<<<< HEAD - refactor: removed duplicate `pre_attack()` & redundant `attackby()` procs which did the same thing - bugfix: unnecessary crash when unwrenching pipes/devices with the RPD @@ -1121,17 +1966,38 @@ - balance: the AMR no longer has wound-chance to rival god, and also, no longer goes through mobs Rhials: +======= + Rhials: + - bugfix: Falling down one of the stage hazard chasms on the medisim shuttle will + now properly kill you on Icebox, instead of dropping you into the z-level below. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Deadchat now gets more juicy details on what has triggered a non-randomly occurring random event. - code_imp: There are now helpers for forcing events in a variety of ways. More events! More events!!!!!!! +<<<<<<< HEAD SkyratBot: - balance: Heretic blades butcher speed is 3 seconds now. - rscadd: Added a crashed prisoner transport space ruin. +======= + SyncIt21: + - refactor: removed duplicate `pre_attack()` & redundant `attackby()` procs which + did the same thing + - bugfix: unnecessary crash when unwrenching pipes/devices with the RPD + Tattle: + - sound: shutters have a unique sound effect + ZephyrTFA: + - bugfix: Book's no longer take your formatting and throw it out the window. + - refactor: Book display and rendering + Zonespace27: + - rscadd: Added a crashed prisoner transport space ruin. + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Adds support for ammunition 'bands', basically intended to be used rather than wholly new sprites for new ammotypes. Additionally, they're (meant to be) greyscale, which allows one overlay to be used for many ammo types. Only implemented on the detective revolver. +<<<<<<< HEAD - qol: Add mood events for basketball shooting and dunking - bugfix: Book's no longer take your formatting and throw it out the window. - refactor: Book display and rendering @@ -1151,10 +2017,23 @@ - bugfix: Changelogs entries for "sound" and "image" should now have icons associated with them, how neat. - qol: Lowered the atmos build, reprogram, and destroy delays on the RPD +======= + vinylspiders: + - bugfix: crafting lizard skin cowboy boots no longer places a spawner object over + the created boot item +2023-04-27: + Dawnseer: + - bugfix: fixed an oversight - Made Goliath Cloak and Goliath Cloak Hood fireproof. + And Goliath hide. + Fikou: + - bugfix: social anxiety is incompatible with mute + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Health analyzers now show body temperature in red/blue if the temperature of the body can't sustain it's own life. - bugfix: Inverse technetium now properly gives advanced details in genetics/radiation analyzing. +<<<<<<< HEAD - bugfix: social anxiety is incompatible with mute Youtubeboy139: - rscadd: Adds in the new coffee based sprites in a dedicated .dmi file @@ -1214,16 +2093,127 @@ - bugfix: the anomaly refinery will no longer let you insert cores of insufficient quality to refine - rscadd: Craftable Material sniffers +======= + Rex9001: + - bugfix: Fixes the Tramstation CMO office lack of CMO stamp + Watermelon914: + - bugfix: Fixed final objectives appearing as 'Skipped' in the traitor panel. + moocowswag: + - bugfix: You can no longer bypass the laws of bluespace with a portable chem mixer. + - bugfix: You can no longer bypass container locks with storage hotkeys. + san7890: + - bugfix: Changelogs entries for "sound" and "image" should now have icons associated + with them, how neat. + timothymtorres: + - qol: Add mood events for basketball shooting and dunking + - balance: '"Camera Obscura" (crafted with holy water + camera) will now steal the + soul of ghostly apparitions when a picture is taken causing damage. This will + also stun and reveal revenants briefly.' +2023-04-28: + Comxy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Star Gazer now explodes when it dies. - balance: Star Gazer will only die when the owner dies. - balance: Star Gazer will attack the most recent enemy that attacked him when on autopilot. - balance: Star Gazer has an aura that slowly damages people and heals the owner. - balance: Cosmic Ascension now buffs some spells. +<<<<<<< HEAD softcerv: - qol: NIFSofts now have associated Font Awesome icons that show up in UI. +======= + Fikou: + - bugfix: Fixes crafting tools not taking into account subtypes, i.e. you can craft + a filet migrawr with any lighter. + JohnFulpWillard: + - bugfix: Paradox clones are now attempted manual copies of humans, rather than + straight-up copying everything. They should no longer have bugs related to being + unable to use UIs, having FOV, or visual bugs. + - bugfix: SiliConnect can download borg logs again. + - bugfix: The RD can once again enable Admin mode on Wirecarp + - bugfix: NT IRN can once again see the shopping cart and call the cargo shuttle. + - bugfix: Chat Client, ID Management and Messenger should now update their UIs properly. + - code_imp: PDAs will hopefully not lag as much when clicking on buttons (such as + in ID management). + LemonInTheDark: + - bugfix: Holodisk recording gives the right vfx again. Bonus, the rays work with + it now too! + Melbert: + - bugfix: Fixes rare occasions in which the captain can fail to spawn with their + banner on certain maps if their left hand was holding something else. + SkeletalElite: + - bugfix: Stabilized Oil extracts no longer explode infinitely if your corpse is + immune to gibbing + Tattle: + - image: removes unused vault walls + rageguy505: + - bugfix: Updated the billboard on the space phonebooth + - bugfix: Replaced live ammo found that was unintended on the waystation and the + faceoff with spent subtypes. + vinylspiders: + - bugfix: mobs can now be set on fire using flares and candles if they are covered + in something flammable +2023-04-29: + Striders13: + - rscadd: filled up Northstar's Z1 maint with stuff. Reworked some ugly rooms. + - bugfix: fixed Northstar's Z1 sec outpost having the wrong sec locker + carlarctg: + - balance: 'EMPs on robotic limbs will now disable them for 10-20 seconds rather + than causing a 10-20 second full stun on the user. Additionally, they will damage + the limb for a little brute and some burn. + + EMPs on robotic limbs will now disable them for 10-20 seconds rather than causing + a 10-20 second full stun on the user. Additionally, they will damage the limb + for a little brute and some burn.' + - balance: Arm EMPs don't do anything special as the limb being disabled already + drops items. + - balance: Leg EMPs cause a 10-20 second knockdown, only really applicable if there's + only one robotic leg as two disabled legs KD you anyways. + - balance: Chest EMPs cause a 3-6 second standing-up paralyze, visible to the player + by a quite noticeable shaking of their body. + - balance: Head EMPs break the optical transponder circuits for 7.5-15 seconds, + effectively giving the user nightmare goggles vision with green instead of red + as the only remaining color. +2023-04-30: + Fikou, Zonespace, Arcane for voicing: + - rscadd: The mining vendor now has a style meter. This meter gauges your style + points and uses them to improve your ore yield. + JohnFulpWillard: + - qol: '[Mafia] Players get a popup when a player is voted to the stand.' + - qol: '[Mafia] Players now have the name of who they voted for displayed over their + heads during voting period.' + - balance: '[Mafia] Deadchat can no longer see Mafia chat.' + - balance: '[Mafia] HoP can now solo-win.' + Potato-Masher: + - bugfix: 'North Star: The disposal room machinery is slightly more resistant to + damage caused by ejected trash.' + ZephyrTFA: + - bugfix: Bookbinder no longer takes your pen's font and throws it out the nearest + window + Zytolg: + - rscadd: Birdshot station has been pulled out of Mothball. + - rscadd: New station areas and places to visit. A Mix of Kilo and Delta maints + with winding shortcutting paths. + - rscadd: A host of new shuttles to support this bold endeavor to reclaim something + that really shouldn't be reclaimed. + - rscadd: Two Trams, Two Trams. + - rscadd: For the last time Bob, the gaping hole is a **feature.** Use the breach + shutters or have the virologist make starlight. + - rscadd: A smiling salute to stations past... + - rscadd: Secrets. + mc-oofert: + - bugfix: Economy class airlock on the Luxury Shuttle now aligns with dock + tralezab: + - rscadd: Craftable Material sniffers +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tralezab code, Drag for the commission and player project, cre#0484 for their spritework: - rscadd: Divine Archer Armor and Weapon - qol: Bows give more feedback when you're doing something wrong, like trying to draw without a nocked arrow - code_imp: Sorted files, cleaned bow code up to allow subtypes +<<<<<<< HEAD +======= + vinylspiders: + - bugfix: the anomaly refinery will no longer let you insert cores of insufficient + quality to refine +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-05.yml b/html/changelogs/archive/2023-05.yml index 686135c1e9a..70e255b77e0 100644 --- a/html/changelogs/archive/2023-05.yml +++ b/html/changelogs/archive/2023-05.yml @@ -1,9 +1,57 @@ 2023-05-01: +<<<<<<< HEAD Rhials: - bugfix: Replaces the purely decorative mining shuttle console on the Icebox bridge with an ID console. SkyratBot: - bugfix: Bloody Mary flavor is now accurate to its description. +======= + BlueMemesauce: + - spellcheck: Deleted the extra line in combat information + - spellcheck: Fixed Nanotrasen being miscapitalized in traitor posters, a drink, + the ethereal lore, and some photocopier paperwork + EOBGames: + - rscdel: Kilostation has went back to its home planet. It served us faithfully + for nearly 3 and a half years. May it rest in peace. + Helg2: + - bugfix: You can't spam open codex cicatrix now. + - qol: You can close codex cicatrix in your hand now! Also toy codex cicatrix has + proper animation now. + Iajret: + - bugfix: papers should count cyrillic and other non-ascii characters correctly + both server and client-side + JohnFulpWillard: + - balance: Mimes can no longer write on paper without breaking their vow. + - admin: Enslaving mobs is now logged in game.log + - refactor: Russian mobs are now subtypes of Syndicate basic mobs. + - bugfix: Birdshot's observers now spawn on-station. + - bugfix: Birdshot's EVA door now properly works. + - bugfix: Birdshot now has a few extra rooms connected to the station's distro (atmos + canister storage, medical coldroom) + - balance: Machines (such as ORM and Techfabs) will no longer unsync from Ore silos + when it moves Z-level, instead it will prevent materials from being used, as + if it was on hold. + MTandi: + - qol: Dirt pile is crafted from sand instead of sandstone and drops it on deconstruction + - bugfix: You can't have free water and nutriments by rebuilding hydrotray + Melbert: + - bugfix: North Star's shields now regenerate integrity over time + NoselessCanine: + - bugfix: Bloody Mary flavor is now accurate to its description. + Rhials: + - bugfix: Replaces the purely decorative mining shuttle console on the Icebox bridge + with an ID console. + Zergspower: + - bugfix: Deep Storage Space Ruin - Fixes atmos alarms never shutting off + - bugfix: Deep Storage Space Ruin - made the atmos pipenet sane + - bugfix: Crashedship Ruin - You can now use the teleport + mc-oofert: + - bugfix: The airlocks on the hug relaxation shuttle now align up properly + norsvenska: + - bugfix: Shuttle Loan event's resupply and hijacking have been separated into two + different datums + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Spiderlings are now basic mobs, report any complete weirdness/deviation from known behavior. They should be a lot more intelligent now though. - rscadd: AI Spiderlings are super fragile, but they're also super fast, especially @@ -11,6 +59,7 @@ Maybe in the armory, maybe in a locked closet in maintenance. Be sure to be vigilant and splat them whenever you can to save the station from a whole lotta heartache! +<<<<<<< HEAD - bugfix: papers should count cyrillic and other non-ascii characters correctly both server and client-side - qol: Dirt pile is crafted from sand instead of sandstone and drops it on deconstruction @@ -39,11 +88,22 @@ - code_imp: TGUI input datums can now accept custom ui_states - rscadd: Crewmembers arriving very late will not always have time to finish their breakfast. +======= +2023-05-02: + MTandi: + - image: extinguisher cabinet has new sprites + - qol: 'Mapping: Air alarm variants replaced with corresponding helpers' + SgtHunk: + - bugfix: Pirates summoned through hacking a comms console should actually spawn + now. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: air alarms correctly spew out cable & electronics depending on their build stage when their integrity reaches 0 i.e. destroyed - bugfix: fire alarms correctly spew out cable & electronics depending on their build stage when their integrity reaches 0 i.e. destroyed - bugfix: balloon alerts runtiming when cutting terminals +<<<<<<< HEAD 2023-05-03: Hatterhat: - spellcheck: The gunsets and crate that hold CMG-2s are now actually labeled CMG-2, @@ -59,6 +119,47 @@ preview because it is buggy and hardly ever matches what you end up getting upon spawning - code_imp: removing the prosthetic limb quirk will restore your original limb +======= + - bugfix: ' Drying rack spawning a matter bin and circuit board on deconstruction' + Thedragmeme: + - qol: 'Makes the Meta station kitchen not cramped anymore + + :cl:' + Thunder12345: + - bugfix: Bows will no longer randomly stop taking new arrows. + - rscadd: Crewmembers arriving very late will not always have time to finish their + breakfast. + nikothedude: + - code_imp: TGUI input datums can now accept custom ui_states + norsvenska: + - rscadd: North Star's captain's office has been expanded! It now includes a sitting + area as well as a photocopier and some cigars. + - bugfix: Various minor changes in North Star +2023-05-03: + Cheshify: + - bugfix: Command can actually enter the AI SAT on the North Star. + - rscadd: The North Star AI SAT has been redone. + Iamgoofball: + - bugfix: Removes player references. + JohnFulpWillard: + - bugfix: Golems can redeem points through their ORM without an Ore silo. + MTandi: + - bugfix: Electrolysis chemical reaction works with enriched liquid electricity + Rhials: + - spellcheck: The hallucinatory anomaly announcement is no longer missing words. + Tattle: + - sound: nerfed the police whistle volume + Thunder12345: + - bugfix: A Mix to Engine gas line has been added to Birdshot's atmospherics + Zergspower: + - qol: Dangerous Research Ruin - Area redefines + Zonespace27: + - bugfix: Style meter parrying works again + - bugfix: Style meter bar now works correctly with very high style point count + nikothedude: + - bugfix: Number inputs work now + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The game now supports export of your preferences into a JSON file! The verb (export-preferences) should now be available in the OOC tab of your stat-panel if enabled by server operators. @@ -69,6 +170,7 @@ - config: Server operators are also able to set the cooldown between requests to download the JSON Preferences file via the 'SECONDS_COOLDOWN_FOR_PREFERENCES_EXPORT' config option. +<<<<<<< HEAD - bugfix: Electrolysis chemical reaction works with enriched liquid electricity Tattle: - sound: nerfed the police whistle volume @@ -88,6 +190,21 @@ - bugfix: the cargo orderable AMR should no longer fit in suit storage slots, only your back, as was originally intended SkyratBot: +======= + vinylspiders: + - bugfix: prosthetic limb quirk will no longer display a prosthetic on your character + preview because it is buggy and hardly ever matches what you end up getting + upon spawning + - code_imp: removing the prosthetic limb quirk will restore your original limb +2023-05-04: + ArcaneMusic: + - refactor: Mineral costs have been reformatted to be scaled by the number of sheets, + darts, and small fractions they make up. + - qol: Foam darts no longer hold a fraction of a unit of iron within themselves. + BlueMemesauce: + - bugfix: Fixed the Chef not having CQC outside the kitchen on Tramstation + Dawnseer: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Damp rag and Money bag to service borg - rscadd: Service borg upgrades, with accompanying tech web node - rscadd: Sprites for kitchen toolset, and service apparatus @@ -99,6 +216,7 @@ back around.' - balance: Adds blood and Carpotoxin to the emagged borgshaker. - bugfix: Money bag was missing a description, it now has one. +<<<<<<< HEAD - bugfix: Holodisk recording gives the right vfx again. Bonus, the rays work with it now too! - refactor: Mineral costs have been reformatted to be scaled by the number of sheets, @@ -185,6 +303,68 @@ - bugfix: Syndicate winter coats should no longer be masses of missing textures. Helios7-1: - rscadd: The new Adventurous Synth Plushie! It Beeps! +======= + JohnFulpWillard: + - qol: Health Analyzers now show embeds in bodyparts on examine. + MTandi: + - balance: Meta lounge and theater are back to original sizes, art storage moved + to aux tools storage + Melbert: + - bugfix: Mime using captain's announcement visible message is correct + - bugfix: Stairs are now resistant to being shoved by mobs with high move force. + Rex9001: + - bugfix: Adds missing vendatray to Northstar, and removes the scrubber co2 infinate + loop + SethLafuente: + - bugfix: fixed spiderlings speaking human instead of spider + Thlumyn: + - bugfix: birdshot cryo no longer needs medbay access to leave + Thunder12345: + - bugfix: The acrade cabinet in North Star's departure lounge now works. + Wallem: + - rscadd: The ancient recipe for the Death Sandwich has been rediscovered buried + in the deepest depths of an erupting volcano. + Xander3359: + - spellcheck: BLOX is the name and posibrain is the game. + iwishforducks: + - rscadd: Stowaway Changelings will now appear as a late join form of Changeling. + norsvenska: + - bugfix: Even more fixes to North Star decals and detailing + san7890: + - bugfix: Basic mobs will now be affected by explosions again. +2023-05-05: + MTandi: + - qol: 'Mapping: Added broken machine map helper' + - qol: 'Mapping: Replaced damaged window spawner with a universal helper' + Melbert: + - bugfix: Tramstation Robotics and RD now spawn in their departments roundstart + - bugfix: Birdboat detective now spawns in their office + Rhials: + - bugfix: Powersinks no longer always show as being very hot if you're too close. + Striders13: + - rscadd: miners with style meter can now parry kisses + lizardqueenlexi: + - bugfix: The hierophant club's sprite updates when it should + - bugfix: The hierophant club grants the blink action when summoned into hand + vinylspiders: + - bugfix: a mob will now once again spill their organs when they are gibbed + zxaber: + - bugfix: Fixed math on cyborg restocking + - qol: borgs entering chargers now have the restocking feature enabled by default. + It can be disabled with a right-click while charging if you don't want to eat + the station's mats. + - balance: Borg restocking speed now scales with the charger's manipulator tier. + - bugfix: Mech chargers on Tram (and possibly elsewhere) no longer sync oddly. +2023-05-06: + Helg2: + - qol: Trees, rocks, grass and etc. now drop materials when destroyed. + Melbert: + - balance: Blind people don't get alerted when someone in a cardboard box pops out + nearby + - rscadd: ' Non-player references' + RealityOverseer: + - bugfix: fixed unrefined ectoplasm anomaly cores not appearing as unrefined +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Observers now recieve an alert when a powersink is activated/about to explode. - qol: His Grace being awoken now alerts observers, to give you a headstart on your @@ -207,6 +387,7 @@ not be any more powerful, but at least you have an audience. - qol: When beginning to delaminate, the Supermatter will alert observers and invite them to watch the fireworks. +<<<<<<< HEAD RikuuTheRiolu: - balance: Removed "Gore" from disliked food's for Teshari larentoun: @@ -274,6 +455,20 @@ larentoun: - bugfix: icon names for 6.8 mag 2023-05-09: +======= + - balance: Psyker Pirates are now Psyker Shikari (bounty hunters). + Thlumyn: + - rscadd: Added wedding cakes + tralezab: + - balance: Tonguespike is better, chemspike deals slightly less damage +2023-05-07: + Cheshify: + - bugfix: The North Star's cargo shuttle has working conveyors. + - bugfix: The North Star has had a slew of missing and improperly done content added + and reworked, see the PR for more! + JohnFulpWillard: + - bugfix: Tablets' minimize apps feature works again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JohnFulpWillard, sprites by McRamon, tattax, and Lamb: - rscadd: The Coroner, a new Medical role revolving around dead corpses and autopsies. - rscadd: The Coroner's Autopsy Scanner, used for discovering the cause for someone's @@ -284,6 +479,7 @@ - balance: Security Medical area and Robotics no longer have their own morgue trays. - balance: Dissected bodies now have faster surgery speed. Autopsies also count as dissections, however they're mutually exclusive. +<<<<<<< HEAD LT3: - bugfix: Fixed spawning meteors at double the intended rate - qol: Ghosts will now get a notification when someone is about to be hit by the @@ -336,10 +532,24 @@ - image: updated smart fridge sprites for all variants - bugfix: smart fridges no longer overlap with walls, but they can be welded down to a floor and mapspawn welded +======= + Jolly: + - bugfix: The area icon for the evidence room should be visible in the map editor + again. + Shadow-Quill: + - qol: Shuttles will no longer show their current destination as a choice while + in transit. + - qol: The Ice Box pharmacy and Med Sec Outpost blast doors have been replaced with + shutters. +2023-05-08: + Helg2: + - bugfix: deleted unused airlock helper from syn-c brutus. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jacquerel with new icons mostly by INFRARED_BARON: - balance: Golems have been reworked into a hunger-based species who gain temporary transformations when eating different kinds of mineral. - rscdel: The previous golem subtypes no longer exist. +<<<<<<< HEAD Jolly: - bugfix: On maps that have their spawners, Bouncers will now spawn on maps. KoJIT2009: @@ -375,6 +585,48 @@ I'd call that a fair trade. - rscadd: Ruins are now available in the region around the Northstar, Curators are now no longer jobless! +======= + LT3: + - qol: Ghosts will now get a notification when someone is about to be hit by the + tram + Melbert: + - bugfix: Fixed Prosthetic Quirk not removing the limb before giving the prosthetic + - rscdel: You can't get an Elite Syndie Modsuit (or combat defib, or dart pistol) + from Space Ruins + Profakos: + - refactor: converts the request console to tgui + Rex9001: + - bugfix: Fixes the orm board in the golem ship being the wrong subtype + Rhials: + - bugfix: The psyker shuttle now has a suit for the psyker seer. + Thunder12345: + - image: Holy arrows are now 15% less holy (You can no longer click on the 2-pixel + hole in the arrowhead and unintentionally click the object below the arrow instead.) + - bugfix: The chaplain's divine bow can now be renamed like all other null rod variants. + YehnBeep: + - bugfix: The All-American Diner no longer requires a bunker ID card for most rooms + nor requires accesses to use the jukebox. + - bugfix: The All-American Diner's external airlocks now all work together. + actioninja: + - rscadd: good tgui dropdowns + - rscdel: tgui dropdown suck + - qol: tgui dropdowns suck less + - balance: buffed tgui dropdowns + larentoun: + - code_imp: Adds default multiplicative movespeed for basic mobs, to make them editable + in config + - config: Default multiplicative movespeed for basic mobs in example config + - bugfix: Stamina damage and healing now correctly applies movement slowdown + the-og-gear: + - bugfix: Paint cans have become limited use as intended by the gods of code + - bugfix: Clown borgs get unlimited paint, as a treat. +2023-05-09: + '@Krysonism, @Imaginos16, @MTandi, @san7890': + - image: updated smart fridge sprites for all variants + - bugfix: smart fridges no longer overlap with walls, but they can be welded down + to a floor and mapspawn welded + CoiledLamb: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: adds coroner's jumpsuit and jumpskirt to the mortidrobe - rscadd: black scrub cap to the mortidrobe - rscadd: adds coroner medkit, and it's compact variant, for storing coroner job @@ -386,6 +638,7 @@ - image: fixed weird transparency on the autopsy scanner sprite - image: fixed weird shading on the black scrubs object - spellcheck: fixed a punctuation error in the surgical medkit description +<<<<<<< HEAD - bugfix: runtime when toggling engineering meson scanners - bugfix: Organ harvester board drops on deconstruct. - bugfix: Bluespace sender and vendor should display colors correctly now @@ -396,12 +649,68 @@ - bugfix: new hotkeys unbound by default (like emotes) no longer scream at you when added - bugfix: adds orm access to the chaplain, curator, clown, mime, lawyer, and psychologist +======= + DaydreamIQ: + - bugfix: Northstar HoP can no longer commit fraud + - qol: Northstar brig now has genpop instructions + Fikou: + - bugfix: new hotkeys unbound by default (like emotes) no longer scream at you when + added + - bugfix: adds orm access to the chaplain, curator, clown, mime, lawyer, and psychologist + Helg2: + - qol: Deleted unnecessary text from description of supply pod beacon. + MTandi: + - image: added single tank bomb guide contraband poster + ReinaCoder: + - image: The Mosin and Prime Nagants have been resprited. + Rhials: + - bugfix: Ghosts mobs are now temperature immune. + SyncIt21: + - bugfix: runtime when toggling engineering meson scanners + - rscadd: Access secured closets. Personal closets can have their access overwritten + by an new id in it's unlocked state + - rscadd: Access secured freezers. + - rscadd: Access secured suit storage units. + - bugfix: Suit storage unit not having access restrictions. + - bugfix: airlock electronics not properly getting removed after screwing them out + from round start lockers + - bugfix: round spawned open crates run timing when closed + - bugfix: open crates hiding stuff in plain sight + - bugfix: open closets/crates sucking up contents during late initialize causing + them appear empty & open + Thunder12345: + - image: Stock parts have been resprited. + - code_imp: Manipulators have been renamed to servo motors, all related types have + been repathed to match. + Time-Green: + - bugfix: Loose limbs will not duplicate organs anymore + - qol: Stable bluespace anomalies in the anomaly ruin will only teleport you on + touch, not being near them + Wallem: + - balance: Buffs the Active Sonar module for modsuits with a shorter cooldown & + moving pings. + Xander3359: + - bugfix: Organ harvester board drops on deconstruct. + jlsnow301: + - bugfix: Bluespace sender and vendor should display colors correctly now + - bugfix: Gas filter should show labels properly now + - bugfix: Nitrium now has its own gas color in the UI +2023-05-10: + Addust: + - rscadd: The Cerestation whiteship no longer has soul, but it does have solar sails! + I'd call that a fair trade. + DaydreamIQ: + - rscadd: Ruins are now available in the region around the Northstar, Curators are + now no longer jobless! + Helg2: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Indusrial Gold and Regenerative Gold extracts now spawn random coins and not just list of 6 coins. But no mythril as it has miserable chance to have summoning effect which have even more miserable chance to spawn something dangerous and not just mice. - rscadd: Chococoin now has a chance to spawn wherever the coins are used to spawn (wallets, greed ruins, deltastation bar) +<<<<<<< HEAD Zergspower: - qol: Space Ruin Whiteship - Total redesign with some loot tweaks colbb: @@ -425,6 +734,25 @@ - image: removed a whole lot of unused hat icons. Make any reports for broken icons on the github! SkyratBot: +======= + JohnFulpWillard: + - balance: Default Syndicate and Russian gunners now fire every 2.5 seconds instead + of every 0.2 + KoJIT2009: + - qol: Added switch buttons to few dropdown in character preferences + Melbert: + - bugfix: Fixes a runtime with plasmaman clown suit lube spray + Singul0: + - bugfix: The console for the solar panels of AIsat solars tramstation are now actually + connected together + Tattle, Flashkirby: + - sound: increased the volume of the water step noises + - image: ported over bay's water sprites + Zergspower: + - qol: Space Ruin Whiteship - Total redesign with some loot tweaks + vinylspiders: + - bugfix: fixes emissive blockers sometimes being put in an atom's contents +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: high luminosity eyes light overlays now follow the user correctly - qol: high luminosity eyes now have a tgui menu so you no longer have to go through the color picker every time you want to change the range. they also have a new @@ -434,6 +762,7 @@ light direction correctly no matter what dir you are facing - refactor: refactors high luminosity eye code to better make use of the atom lighting system, adding a new light type 'MOVABLE_LIGHT_BEAM' +<<<<<<< HEAD 2023-05-12: KoJIT2009: - bugfix: fixed crash augment page in preferences @@ -442,6 +771,39 @@ Nerev4r: - rscadd: New (old) Glitched Digicoat for donators. - image: Nedilla plushie donator reward. +======= +2023-05-11: + BlueMemesauce: + - bugfix: Fixes not being able to rebuild the MortiDrobe (Coroner Wardrobe) + - bugfix: For the purposes of the crew manifest, Coroner is now considered a medical + job rather than both service and medical. + - qol: The ghost verb no longer says you are unable to succumb to death if you're + pressing it while conscious + CoiledLamb: + - bugfix: the mortidrobe restock is now orderable from cargo, in the medical wardrobe + supply crate. + - spellcheck: fixes typo in autopsy kit crate name + Hatterhat: + - rscadd: 'Items flagged with UNIQUE_RENAME (read: the items that let you rename/re-desc + them with a pen, like food, or the det''s revolver, or the proto-kinetic crusher) + now allow you to enter up to 280 characters of description for them. Please + re-desc your items responsibly.' + Jolly: + - bugfix: '[Ruins] Pod Crash now uses the ruins-specific space turf. This doesn''t + change anything visually, but ships can land here and not have their areas viciously + rip off.' + - bugfix: '[Ruins] If you explode the deep storage ruin, you won''t see space. You''ll + see asteroids!' + - bugfix: '[Ruins] The entire thing should blow up into asteroid turf now, instead + of previously one pocket of space forming (lol?).' + - bugfix: '[Ruins] In the crashed ship ruin, other ruins should be able to spawn + more organically close to it.' + - bugfix: '[Ruins] In the SAME ruin, area defines were added to the asteroids. Don''t + get lost now!' + MTandi: + - image: New sprite for syringes + - balance: 25 bottles of saltpetre can now be bought in hacked NutriMax +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - bugfix: Outfit changes will now properly change your ID trim if wearing a non-ID item in your ID slot. @@ -451,6 +813,7 @@ ShizCalev: - bugfix: Fixed a bunch of log spam related to null.can_use() when AIs move their cameras around with toggle camera lights enabled Honk. +<<<<<<< HEAD - bugfix: Lighting inside of a Hilbert Hotel storage room no longer constantly fails to update, clearing up some log spam and getting back some free lag. - code_imp: The update_icon_updates_onmob element will now automatically update @@ -548,6 +911,11 @@ tralezab: - bugfix: Chuuni wizards no longer get robeless casting issues. 2023-05-16: +======= + tralezab: + - bugfix: Chuuni wizards no longer get robeless casting issues. +2023-05-12: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo#0931: - qol: Now blocking an attack will play a sound and display a spark effect, giving back feedback @@ -555,6 +923,7 @@ - sound: shieldbash.ogg no longer has noise and unnecessary silence - sound: New block_shield.ogg and block_blade.ogg for shields and energy swords - code_imp: Cultists items no longer have their own code for playing parrying sounds +<<<<<<< HEAD Hatterhat: - rscadd: 'The R3T3N-T1VE skillchip is now available in Cargo''s goodies tab for the price of 1750 credits, and allows you a brief glimpse into the wonderful @@ -665,11 +1034,108 @@ have a space to archive more art! Swiftcore: - qol: Dish drives now collect empty plates and plate fragments +======= + Jolly: + - image: Mappers rejoice! PDAs now have mapping icons. + ShizCalev: + - code_imp: The update_icon_updates_onmob element will now automatically update + all slots in an item's slot_flags var. This does fix multiple things that weren't + updating properly. Passing a slot to the element is now only necessary if you + want to add additional slots to be updated. + - bugfix: Lighting inside of a Hilbert Hotel storage room no longer constantly fails + to update, clearing up some log spam and getting back some free lag. + Swiftcore: + - qol: Dish drives now collect empty plates and plate fragments + SyncIt21: + - qol: RCD spawned apc, air alarm, fire alarm frames are no longer deleted if the + wall mount operation fails. + - bugfix: balloon alert run timing on deleted wall mount frame spawned by an RCD. + - bugfix: closets & crates can be wrapped with wrapping paper again + - refactor: closet & crate paint jobs static list vars, access_choices static list + var are initialized only once during init + YehnBeep: + - bugfix: Fixed bottleneck on North Star's SM waste line (it can now handle the + full output of 1 filter per the stock setup). + Zytolg: + - bugfix: Birdshots armory now has an Ion Rifle. + lebedev: + - qol: Made selected elements highlighted in TGUI Dropdowns + - bugfix: fixed custom say emotes with non-ASCII characters + oranges: + - balance: increased laser damage, decreased energy cost and increased wound chance + - balance: MECH RCD is no longer magic +2023-05-13: + '@Xander3359 Sprites: Nebby#1467': + - image: Replaces the old patches with some new sprites + BlueMemesauce: + - bugfix: fixed exploration drones discarding loot when there was 1 space left + HWSensum: + - qol: Players now are able to use other languages for announcements via requests + console. + Jacquerel: + - bugfix: Free golem shells printed from the free golem ruin are no longer enslaved + to whoever finished constructing them. + JohnFulpWillard: + - bugfix: Psychologists have Morgue access on lowpop, on top of their existing Coroner + office access. + - balance: Drones can now access computers and air alarms by default, and the CE + has the option to turn it off through the BotKeeper app (it used to be backwards). + JupiterJaeden: + - bugfix: Setting arrest status with the records console now immediately updates + sechud visuals. + - bugfix: Ninja security record hacks now immediately update sechud visuals. + Melbert: + - bugfix: Applying fines via sechud apply correctly + - bugfix: Runtimes when deleting humans relating to gravity + - bugfix: Runtime from neutralizing "hollow" anomalies + ShizCalev: + - bugfix: Headphones now properly update to display musical notes when a song starts + & stops playing while worn! + - bugfix: Ghosts & camera mobs (ie blobs & AI's) will no longer set off landmines. + - bugfix: Jaunting mobs will now only set off landmines if they stepped on them + BEFORE jaunting. + - bugfix: Flying mobs will no longer detonate landmines that were not first stepped + on. + - bugfix: Armed cleanbots no longer break when they encounter a mindless human. + - bugfix: The materials sniffer now actually works! + SyncIt21: + - bugfix: runtime with smart fridge tooltip + Treachce: + - spellcheck: fixed grammar and a typo when deconstructing reinforced plating + Vallat: + - bugfix: fixed griddle code so that the smoke over the grilling items appears only + when the griddle is on + orthography: + - bugfix: replaces empty oxygen tanks in icebox chapel. +2023-05-14: + Comxy: + - bugfix: Fixes the speed of all basic mobs. + Jacquerel: + - bugfix: Diamond Golems can no longer attack or throw things and remain invisible. + - bugfix: 'Bananium Golems are only slippery if you actually tread on them (aka: + while they are resting).' + - balance: Golem bluespace teleportation is slightly quicker. + Jolly: + - bugfix: '[MetaStation] Chefs may now brutally murder- I mean deny service to the + station patrons once again, the shutters over the counter may now be closed + once again.' + Melbert: + - bugfix: Runtime with burning black slime transformation + Paxilmaniac: + - rscadd: Things made primarily of the glass material datum (and any of its subtypes) + will now shatter when thrown, be careful with that statue block now. + - code_imp: Shattering on impact is now a component, rather than code just on plates. + Profakos: + - code_imp: cleaned up cargo export code a bit + Singul0: + - bugfix: HoP on northstar can now disperse troublemakers with ease. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Sylvette: - bugfix: Fixed sign language so you can't sign when cuffed or emotemute as initially intended - balance: Allows signers to cast spells using sign language as long as both hands are free +<<<<<<< HEAD SyncIt21: - bugfix: Bibles can convert other bibles Unit2E: @@ -708,10 +1174,127 @@ - bugfix: Fixed an issue where objects on something that loaded dynamically, like shuttles, would not be smoothed. - rscadd: Add new White Dwarf and Pulsar Star reports. +======= + Thunder12345: + - bugfix: "Dueling pistols found in deep space now come in linked pairs for \u221E\ + % greater usability." + YehnBeep: + - qol: Posters can now fit back into the boxes they come in. + junkgle01: + - image: Resprites the vanilla & brioche cakes and their associated slices. + kawoppi: + - rscadd: added animations to the *jump, *shiver, *sway, *tremble, *twitch and *twitch_s + emotes + - rscadd: the *jump emote now plays a sound + orthography: + - bugfix: fixes an empty oxygen tank on birdshot + ynot01: + - bugfix: Desert Eagles can no longer load .50 BMG sniper rifle rounds and vice + versa. +2023-05-15: + Capsandi: + - bugfix: space ambience tracks will no longer cut themselves off + - sound: added a new ambient track for space + DATA-xPUNGED: + - rscadd: Added a new way out of Birdshot's gulag. + - bugfix: Replaced the oven on Birdshot with a range. + DrDiasyl aka DrTuxedo: + - sound: Nanotrasen have started installing music players in the elevators to boost + workers' morale. + Jacquerel: + - balance: The Death Sandwich can no longer be renamed + - bugfix: Spiderlings no longer get stuck in webs + KoJIT2009: + - bugfix: Fixed dropdown buttons empty selected case + LT3: + - bugfix: Minor fixes to Icebox's elevator + Sealed101: + - bugfix: made gorilla transformation when affected by excess amounts of genetic + damage work + SethLafuente: + - bugfix: fixed sealed webs not stopping active atmos + ShizCalev: + - bugfix: Food/slime processors now shake when in use again. + - bugfix: Fixed fake grid check events failing to announce properly. + - bugfix: Secret recipes will no longer contain inaprovaline or stranger reagent. + - bugfix: Guns without magazines inserted can now fire again! + - bugfix: Fixed a runtime which occured when a self-recharging gun (ie proto-kinetic + accelerator) with a bayonet attached was deleted. + - bugfix: Fixed a minor runtime when renaming mechs that don't have a camera attached + to them. + Singul0: + - qol: To clear up confusion with players bringing their own uniforms to the basketball + match the holodeck engineers over at centcom added uniforms for their basketball + court holodeck! + - bugfix: Barriers have been added in the holodeck basketball court to prevent players + from entering the bleachers + Striders13: + - rscadd: 'Northstar: non-secure tech storage been made less secure.' + - rscadd: 'Northstar: added a holopad to AI sat entrance.' + - rscadd: 'Northstar Z2: fills up maint with more loot.' + SyncIt21: + - bugfix: Holopad UI will not hang when connection fails + - bugfix: signal override & other area sensitive runtimes during area editing with + station blueprints + - bugfix: gps arrows rotate correctly + - bugfix: icons have their correct sizes applied again + Watermelon914: + - qol: Added a message to the component menu in the integrated circuit interface + that explains how to link an integrated circuit to a component printer. + kinneb: + - qol: Added a Oxy Tank dispenser to the bounty ship for a lil' more general QoL + orthography: + - bugfix: fixes how the morgue renders on tramstation. +2023-05-16: + ChungusGamer666: + - rscadd: You can burn bibles now! But heresy has a steep cost... + Helg2: + - rscadd: Old bar on Metastation, tranquility emergency shuttle and Beach away mission + now have free access bar closets. Also freezers on beach are now all access + so you can now open them. + LT3: + - admin: Admins are now warned if they are going to override a currently playing + admin midi + Melbert: + - balance: You are now slightly less likely, statistically, to get an antag role + on latejoin + - bugfix: Fixed latejoin antags being logged as "midround" antags + Mothblocks: + - bugfix: Fixed an issue where objects on something that loaded dynamically, like + shuttles, would not be smoothed. + OneAsianTortoise: + - bugfix: Fixes Birdshot Station's Missing Pimpin' Ride Key + Profakos, sprites by CoiledLamb: + - qol: Most request console varedits have been moved to mapping helpers. + Thunder12345: + - image: Skillchips have been resprited to be smaller and more chip-like + Watermelon914, Iamgoofball, MrStonedOne: + - rscadd: Adds TTS to player speech. Players can hear themselves speak. + YehnBeep: + - bugfix: Turret Outpost's external airlocks now all cycle together instead of as + 2 separate pairs. + - bugfix: DJ Station's kitchen fridges no longer require kitchen access to open. + - bugfix: The Faceoff's faster-than-jetpack-speed enemies no longer attack explorers + only passing by. + carlarctg: + - rscadd: Adds the Syndicate Induction Kit for Nuclear Operatives, which lets them + induct any willing antagonist into the nuclear operative team for 10 TC. + - rscadd: Uplink spacesuits are randomized between all their different colored variants! + Visual only. +2023-05-17: + BlueMemesauce: + - bugfix: fixed "There's a tree in space" adventure being impossible to beat + Comxy: + - rscadd: Add new White Dwarf and Pulsar Star reports. + Fikou: + - rscadd: You can emag morgue trays to disable their life alerts. + Hatterhat: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Bolt-action rifles (the Mosin-Nagant) will no longer spam "can't jam!" when attempting to smack it with just about anything. - bugfix: Anti-materiel rifles (the .50 BMG ones) can now have their magazines manipulated independent of bolt status. +<<<<<<< HEAD - rscadd: Metastation's recreation area has been outfitted with a new fitness room containing a set of gym equipment. - bugfix: Metastation's recreation area shower is now attached to plumbing. @@ -734,6 +1317,19 @@ 2023-05-18: Melbert: - bugfix: Latejoins triggering before the minimum time set +======= + Helg2: + - rscadd: Fire Blossoms are now glowy. + Jacquerel: + - bugfix: Blob and Kudzu tiles which expand into chasms will now be correctly destroyed + by the chasm. + MTandi: + - rscadd: Air alarms can be connected to an area remotely via air sensor with multi-tool + and corresponding access + - qol: 'Mapping: Added air alarm helper to link air alarm with certain chamber_id + on map load' + Melbert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: When you are drunk, the strength of your slurring now varies based on how drunk you are. Being "a little drunk" only rarely slurs your words, being average drunk is the same as the old effect, while being very drunk now slurs @@ -743,6 +1339,7 @@ no burping). - rscadd: Mind restoration now heals ALL slurring, rather than only drunk slurring (which includes cult / heretic slurring). +<<<<<<< HEAD SkyratBot: - rscadd: You can emag morgue trays to disable their life alerts. 2023-05-19: @@ -858,12 +1455,43 @@ - balance: Security Plasmamen now have Security armor. No bullying them with bottlesmashes anymore. - bugfix: fixed Tramstation genetics pen chasms +======= + SethLafuente: + - bugfix: fixes spiderlings having density + ShizCalev: + - refactor: Recharger code was modernized a little & will now properly say how much + charge you have in a power pack. + SyncIt21: + - bugfix: runtime when turning scrubber's on via the air alarm UI + - refactor: '`atmos_conditions_changed()` now starts atmos processing based on it''s + turf air contents' + Thunder12345: + - rscadd: Metastation's recreation area has been outfitted with a new fitness room + containing a set of gym equipment. + - bugfix: Metastation's recreation area shower is now attached to plumbing. + Vishenka0704: + - bugfix: fixed different from english keyboard layout to use tgui chat +2023-05-18: + Helg2: + - balance: Security Plasmamen now have Security armor. No bullying them with bottlesmashes + anymore. + Melbert: + - bugfix: Latejoins triggering before the minimum time set + Reality Overseer: + - bugfix: fixed photographs having black borders in photos + - bugfix: makes elder atmosian statue craftable + Rhials: + - sound: Revolutionaries now have their own stinger that plays upon becoming that + antagonist. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Tgui Say is rewritten, becoming "much more performant". Hey, that's what it says on the tin! I'm not from marketing! - bugfix: Tguisay drag zones are now ever so slightly larger around the corner of the window - bugfix: Pressing one of the chat open keys (T/Y/M/O) will no longer change channels if it's already open +<<<<<<< HEAD - bugfix: fixed possible issues with apc, airalarm and damaged machinery/windows helpers - qol: Double clicking your corpse or something containing it as a ghost will now @@ -885,18 +1513,68 @@ - rscadd: Snails can now slap their shells with a bluespace core to turn them into shells of holding. SkyratBot: +======= +2023-05-19: + Fikou: + - bugfix: fixes clown planet report + GoldenAlpharex: + - bugfix: Makes checks for the station z level more robust against coders doing + less intuitive stuff, thus protecting it from breaking in weirdly difficult + and seemingly unrelated places (I'm looking at you, nuke cinematic unit test). + Jacquerel: + - bugfix: The Cursed quirk will once more plague you with bad luck for your entire + shift rather than just once. + Melbert: + - bugfix: Ahealing a heretic now properly gives them their heart back + - bugfix: Request Console Announcements breaking and reporting "/list" + Mothblocks: + - balance: Adjusted stowaway changeling requirements to be closer to roundstart + Changelings. + Thunder12345: + - qol: Double clicking your corpse or something containing it as a ghost will now + orbit as in other cases instead of re-entering your corpse. + - bugfix: Dueling pistols can no longer be fitted in turrets to instantly kill people. + TiviPlus: + - bugfix: fixed TTS not working when used by local servers + YakumoChen: + - qol: Bar bottles now work as makeshift rolling pins +2023-05-20: + DaydreamIQ: + - bugfix: Space Dragon can no longer place their portals outside the station on + Tramstation + JohnFulpWillard: + - qol: Gym equipment was reworked. You now buckle yourself to weight machines to + use them, rather than clicking on it and getting stunned for a few seconds. + It also means it works like a chair now. + - qol: Gym equipment no longer breaks a sweat in no gravity. + MTandi: + - bugfix: fixed possible issues with apc, airalarm and damaged machinery/windows + helpers + Profakos: + - bugfix: fixes request console messages not being trimmed and encoded properly + ShizCalev: + - code_imp: Made a new unit test to find turfs with broken/missing icons! Rejoice! + - bugfix: Fixed a bunch of incorrect and missing turf icons. + orthography: + - bugfix: fixed Tramstation genetics pen chasms + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Lizards (the animal (not the species of people)) are now a bit smarter. Expect to see them avidly hunt down their prey, rather than languish around and wait for it to come to them. Hungry buggers. - image: We now actually implement the previously unused lizard gib animation for those little buggers! +<<<<<<< HEAD - bugfix: wire cutter's can carve out book's again. - bugfix: bibles can convert other bibles - qol: TTS no longer chokes on large amounts of one letter +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Expect to see Killer Tomatoes be a bit smarter as they now are able to juggle multiple targets, lock onto you, and barrel towards you. They're much the same as before, but just a little bit more intelligent, which is especially scary considering they're a fucking plant. +<<<<<<< HEAD Zonespace27: - rscadd: Added the Technologist's Lectern, allowing clockwork cultists to research new, stronger equipment. @@ -917,12 +1595,20 @@ - bugfix: fixed medical kiosk showing you that you have blood if you don't have one. - image: Added new Maintenance Drone Dispenser sprite +======= + timothymtorres: + - code_imp: Add extra clothing options to equip mob outfits. Replaced many one-letter + vars in file with better descriptions. +2023-05-21: + MTandi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: made it impossible to change tram/elevator button styles that couldn't be reverted back - image: changed button styles, added tram/elevator button overlays - refactor: refactored the way button sprites are applied, updated sprite names to make more sense - rscdel: removed unused button sprites +<<<<<<< HEAD - bugfix: Removes spiderling from hostile gold spawns. - bugfix: Borgs can be tipped over while flashed. - bugfix: fixes the guide to mimery radial menu. @@ -931,11 +1617,45 @@ and feel faster. SomeRandomOwl: - bugfix: Added descriptions to events which where missing descriptions. +======= + Thunder12345: + - image: Space lizard, carp, slime and snake plushies have been resprited and set + up to support GAGS. +2023-05-22: + SyncIt21: + - bugfix: wire cutter's can carve out book's again. + - bugfix: bibles can convert other bibles + TiviPlus: + - qol: TTS no longer chokes on large amounts of one letter +2023-05-23: + Comxy: + - bugfix: Removes spiderling from hostile gold spawns. + Epoc: + - rscadd: Toast sandwich + Furrior: + - admin: 'If you are on a downstream server using non-Latin fonts (e.g. Cyrillic) + for character/job names: The player panel encoding has been fixed so it should + show up properly for you now.' + Ghommie: + - bugfix: Fixed large paintings looking pretty off while flipped E/W. + Helg2: + - bugfix: fixed medical kiosk showing you that you have blood if you don't have + one. + JohnFulpWillard: + - bugfix: Borgs can be tipped over while flashed. + Rhials: + - qol: Ashwalker roundend reporting has been revamped. Glory to the Necropolis! + ShizCalev: + - bugfix: Fixed an item duplication bug involving snow tiles. + Singul0: + - bugfix: The buttons in HoP office of Icebox now actually works +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Treach: - bugfix: The Lavaland Syndicate base now has the correct plumbing constructor. Watermelon914, Iamgoofball: - bugfix: Fixed message garbling. TTS messages won't play in the wrong order anymore. - qol: Added a way for players to change the volume of TTS. +<<<<<<< HEAD softcerv: - code_imp: Mediguns now have the TURRET_INCOMPATIBLE flag. - rscadd: adds in an overweight quirk that makes the owner overweight. @@ -988,19 +1708,66 @@ - config: added config string to set minimum alert level for pods to work. Jolly: - rscdel: Removed a player reference from one of North Stars Automapper templates. +======= + Youtubeboy139: + - image: Added new Maintenance Drone Dispenser sprite + ZephyrTFA: + - server: All logs are now formatted in json, excluding perf and investigations + Zergspower: + - qol: Space Ruine Mechtransport - more modern redesign + jlsnow301: + - bugfix: Fixed an issue where TGUI say blinks on open, which should make it look + and feel faster. + orthography: + - bugfix: fixes the guide to mimery radial menu. + - refactor: refactors how the mime book works. + tf-4: + - refactor: Converted butterflies to the basic mob system + - rscadd: Butterflies can now be grown in cytology +2023-05-24: + Cheshify: + - bugfix: The North Star got a few minor requested tweaks + DaydreamIQ: + - balance: Hulk damage to portals lowered to 30 (Was 150) + Ghommie: + - bugfix: Capturing CTF control points no longer requires the active hand to be + empty. + - bugfix: Fixes the sparring contract. You can now spar with no stakes and just + for fun. + Guillaume Prata: + - balance: Plasmamen won't spawn with breathing masks anymore as their helmet has + maskless internals support now. Enjoy your moustache's accent plasmacooks! + JohnFulpWillard: + - bugfix: Shaft Miners are now alerted of Icemoon storms, Clowns are naive, and + Curators are immune to the Tower of Babel again. + Jolly: + - bugfix: '[MetaStation] The abandoned sec couch should now be covered by nearstation.' + - bugfix: '[MetaStation] Lattice adjacent to the newly added fitness room is now + covered by nearstation.' + MTandi: + - qol: RPD and Pipe Pispenser UI tweaks for better navigation + - code_imp: RPD and Pipe Dispenser UI now on TS + - bugfix: You receive damage from tritium only when there are enough moles to make + it visible +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MTandi, coiledlamb: - rscadd: Added test tubes and racks for them - balance: All 30u bottles now have 50u volume and chem master/pandemic spawn tubes instead of bottles +<<<<<<< HEAD RatFromTheJungle: - balance: changelings regenerate their chems slow, and have 25 less in total. Ryll/Shaps: - bugfix: Godmode now prevents people from suffering forced wounds SkyratBot: +======= + Peliex: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: honeycomb is now edible - bugfix: all-in-one grinder now notifies the user when trying to dump an empty bag - bugfix: all-in-one grinder now accepts honeycomb from plant bags +<<<<<<< HEAD - bugfix: Capturing CTF control points no longer requires the active hand to be empty. - admin: 'If you are on a downstream server using non-Latin fonts (e.g. Cyrillic) @@ -1012,10 +1779,31 @@ Curators are immune to the Tower of Babel again. - qol: RPD and Pipe Pispenser UI tweaks for better navigation - code_imp: RPD and Pipe Dispenser UI now on TS +======= + Rhials: + - bugfix: The windows on the waystation ruin now only have one grille underneath, + rather than two. + Ryll/Shaps: + - bugfix: Godmode now prevents people from suffering forced wounds + Watermelon914: + - bugfix: Fixed bypassing component cooldowns with module components. + YehnBeep: + - bugfix: Fixed missing construction access on North Star and Birdshot. Non-engineer + builders can ask for this access again and get to those build projects. + - bugfix: Fixed some maintenance doors requiring different accesses than the room's + main doors in the North Star's engineering department. + carlarctg: + - bugfix: Fixes ducky shoes having clown shoe slowdown + mc-oofert: + - balance: You can no longer augment golems + - balance: You can no longer amputate undismemberable traits + orthography: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Interdyne has released a new medication to treat those who are in the wrong timeline! - rscadd: Interdyne has also realized this is VERY profitable! They've begun arming their operatives with an autoinjector. +<<<<<<< HEAD - bugfix: You receive damage from tritium only when there are enough moles to make it visible - bugfix: Fixes the sparring contract. You can now spar with no stakes and just @@ -1031,6 +1819,22 @@ SkyratBot: - qol: Apc covers can now be repaired with a welder and replaced with an apc frame. - bugfix: Plumbing RCD UI fixed +======= + - bugfix: fixed northstar tcomms to use proper rather than birdshot + - bugfix: adds more fire alarms to birdshot. + timothymtorres: + - rscadd: Add two new basketball teams and stadiums - Ash Gladiators and Beach Bums +2023-05-25: + Chadley: + - bugfix: fixes the HMS objective. + Ghommie: + - balance: Drawing small graffiti like paw/foot/claw prints, small brush dots and + short lines should cost half as many charges off your spraycan or crayon. + - balance: The cost of recoloring graffiti decals is now consistent with that of + drawing them. + - balance: Trying to suicide with an empty spraycan will now fail, because it's + empty. It's just that simple. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Adds a eye-dropper-like right-click function to the painting canvas UI. Right-Click a pixel on the canvas while holding a painting tool to have it copy its color. - qol: Also adds a right-click function to the color palette at the bottom of the @@ -1038,6 +1842,7 @@ game window and the UI. - qol: Lastly, a tooltip has been added near the top-left corner of the same UI to let players know of these features. +<<<<<<< HEAD - rscadd: Nanotrasen has uncovered a unique use for plasteel allowing the construction of new machines capable of fabricating and distributing hardlight into a modular barrier. These new machines are available via the advanced power manipulation @@ -1137,6 +1942,36 @@ Guillaume Prata: - rscadd: Air alarms will now talk about their atmospheric problems (low/high pressure/temperature) so players can understand what is the room's issue easier. +======= + LemonInTheDark: + - server: qdel statistics are once again logged in qdel.log, instead of the otherwise + typical json logging system + Melbert: + - balance: Milk no longer harms the potency of mushrooms. Apparently it's good for + them? + - balance: Radium now does slightly more tox damage than Uranium + - code_imp: Removed a ton of boilerplate from chem hydro interactions + SyncIt21: + - bugfix: out of bounds when updating lights in lighting subsystem + san7890: + - refactor: Chickens have been refactored into basic mobs, expect them to be a tad + bit smarter. + - code_imp: Cat Surgeons are a bit more smarter about attacking threats to the world + around them on their endless pursuit for those felinid tails. +2023-05-27: + FlufflesTheDog: + - bugfix: Test tubes can now be stored in chemistry smart fridges + Ghommie: + - qol: The Canvas UI now shows a grid while the user is painting. + Helg2: + - bugfix: Coroner envirohelm (plasmaman helmet of coroner) now doesn't show as errors + when using flashlight mode. + JohnFulpWillard: + - balance: Very small items like tape recorders now use 10 mat points instead of + 5. + - bugfix: Species that have longer arms than normal can now properly set their glove + offset to go low and meet their hand. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: '[MetaStation] - One of the chem heaters in the pharmacy is no longer nudged and awkwardly four pixels to the right.' @@ -1144,8 +1979,167 @@ the proper one that every other station uses.' - image: The chem heater sprite was nudged a SINGLE pixel to the right. This should, hopefully, make them appear more centered. +<<<<<<< HEAD - code_imp: The code for posters internally has been tweaked slightly. If you see posters floating in hallways, please report them ASAP!! +======= + LemonInTheDark: + - server: del logging is now done by outputting to a json file again, but this time + we're using ACTUAL json and not just a big text string with newlines and shit + MTandi: + - bugfix: Plumbing RCD UI fixed + Melbert: + - bugfix: Fixes being unable to amputate + - admin: Getting dusted by HMS gives a death log + - bugfix: Fixed being unable to spraypaint things + - bugfix: Fix being unable to wound people who are wounded + SyncIt21: + - bugfix: runtime when sm processes gases in vacuum + - qol: sm will now get activated for the very first time only if there is more than + 0.01 moles of a reactive gas present, so you can now safely install it in near + vacuum + - qol: sm will continue to process gasses only when there is above 0.01 moles of + the gas present else it just ignores it + - bugfix: rolling pin icon show's up correctly under the tools section in the crafting + menu i.e. for those recipes that require it + - bugfix: basketball hoop icon and other sprites that are not the standard `32 x + 32` now show's up correctly in the crafting menu + - bugfix: graves can be closed again, but only with a shovel and not by hand. + - qol: you can put items in graves normally without throwing them in + - qol: examines & screentips for graves + TheSmallBlue and cats4gold: + - sound: Recent research concluded that the new elevator music was upping crewmate's + morale a bit too much, this has now been corrected via the replacement of said + music. + - code_imp: Added a new "in_order" variable to the looping sound datum, for when + you need sounds to play in order + TheVekter: + - bugfix: Adds a drone dispenser to Tramstation. + - bugfix: The stacking machine on Tramstation no longer has incorrect input and + output directions at roundstart. + - config: Drone dispensers are now listed as required map items for passing unit + tests. If one is not present on your map, it will fail the test. + - bugfix: Added the missing drone fabricator to Northstar's robotics maintenance. + Treach: + - bugfix: Turbine parts can now be printed at ancient protolathes. + Vect0r: + - bugfix: Birdshots xenobio should now be getting power from the rest of the powergrid. + Z Man Wit Z Plan: + - bugfix: Added some grills around not-so defended areas on Tramstation (specifically + arrivals) + carlarctg: + - bugfix: Spacesuits won't show 'you turn off x' if it's turned off automatically, + either from removing the power cell or it losing power. + - refactor: Refactors snipping cuffs into a bespoke cuffsnapping element, adding + support for delayed cuffsnipping. Adds this element to box cutters! Effectively + speaking everything is the same as usual. + moocowswag: + - qol: Apc covers can now be repaired with a welder and replaced with an apc frame. + - rscadd: Nanotrasen has uncovered a unique use for plasteel allowing the construction + of new machines capable of fabricating and distributing hardlight into a modular + barrier. These new machines are available via the advanced power manipulation + techweb. + san7890: + - bugfix: Chickens should now, once again, peck you in case you hit them. +2023-05-28: + FlufflesTheDog: + - bugfix: You can no longer attach humanoid heads/arms to monkeys + - bugfix: You can once again attach monkey limbs to monkeys + Helg2: + - rscadd: '[Birdshot], [Tram] Added a lightswitch to warehouse.' + - rscadd: '[Birdshot], [Deltastation], [Metastation], [Tram] and [Icebox] warehouses + now have lights off roundstart.' + - bugfix: '[Metastation] Warehouse now has lights. Finally.' + Jacquerel: + - rscadd: Elevator music now cuts off instantly when exiting the elevator and is + inaudible from the corridor outside. + - rscadd: Elevator music can be disabled via a preference. + - bugfix: Several elevators which should not have played music now do not. + Jolly: + - code_imp: The code for posters internally has been tweaked slightly. If you see + posters floating in hallways, please report them ASAP!! + KingkumaArt: + - rscadd: Voltaic Yellow Wine - New "base" drink, found in booze-o-mat. No special + effects besides acting as a weak ethereal food. Not very potent in terms of + alcohol. + - rscadd: Telepole - New mixed drink themed after thunderstorms, gives the same + shock-resist grey bull does. Made from 1 part Voltaic Wine, 1 Part Sake, and + 2 parts Dark & Stormy. Moderately potent. + - rscadd: Pod Tesla - New mixed drink, themed after the old removed tesla engine + (the singulo gets a cocktail, it should too!) Grants a brave - bull phobia resist, + and a stronger grey bull shock resist allowing you to (temporarily) resist tesla + arcs from reactive armor and the SM's tesla coils. Gives a pleasant thought + to whoever drank it, because this thing is a pain to make. Made from 5 parts + admiralty, 5 parts telepole, and 3 parts brave bull. Highly potent. + - qol: Unsure if this counts as QOL or balance, but the fact sol dry is in 3 different + cocktails but the bartender has to buy 30u cans of it made me feel it deserved + being added to the soda dispenser. + - image: 'Added graphics for the above drinks, shown below, from left to right: + Pod tesla, Voltaic Yellow wine, Telepole, Voltaic Wine (bottle) + + image' + LemonInTheDark: + - bugfix: Mobs will fly around space... less + MTandi: + - image: New air alarm sprite + - bugfix: Air alarm properly updates status when powered + - qol: Objects have a variable to adjust them visually when they're wrenched or + spawned on a table + - refactor: Removed redundant code that had similar purpose, moved `obj` wrenching + logic into the `objs.dm` + - qol: food/slime processor can be moved on table and adjusts to it when wrenched + Stalkeros: + - bugfix: Adds or possibly re-adds firearm magazine ejection sounds. + - sound: Rubber duck now quacks. + TheVekter: + - bugfix: Fixed virus food being unsynthesizable by making it a hot reaction instead. + Now requires 600K to synthesize. + TiviPlus: + - bugfix: fixed TTS volume changes not working + YehnBeep: + - bugfix: Part of the North Star library's private study will no longer register + as part of the chapel on the crew monitor and similar. + funman816: + - spellcheck: fixed a typo in custom item description in northstar + mc-oofert: + - bugfix: soap suicide +2023-05-29: + FeudeyTF: + - code_imp: Updated the UI of the console for viewing message logs and console for + view server communications + Guillaume Prata: + - rscadd: Air alarms will now talk about their atmospheric problems (low/high pressure/temperature) + so players can understand what is the room's issue easier. + HWSensum: + - rscadd: added a mail counterfeit device that can make custom (and also armed) + mails. Traitors have those devices in their uplinks. + - rscadd: added new kit for QM and Cargo Technicians that have multiple mail counterfeit + devices for neat price. + - bugfix: fixed envelopes that were giving only their first item, even tho they + had two items insede. + - image: added new icon for mail counterfeit device. + JohnFulpWillard: + - balance: Newly created areas in Icemoon and Space are no longer valid Cult areas + for Runes and such. + LT3: + - qol: Being connected to an IV now has a visual indicator + MTandi: + - qol: dead potted plant can be revived with a seed + - qol: Solar control console now shows power generation history + Melbert: + - qol: Gun Flipping is now done by right clicking the gun when it's in your active + hand ("use secondary"), meaning you should be less likely to accidentally spin + your gun instead of ejecting rounds / racking / etc. + - qol: You can gun flip all guns, instead of just ballistics. This includes stuff + like wands. + Sealed101: + - bugfix: exorcised a ghost of the gang gamemode from graffiti + SethLafuente: + - rscadd: Added 3 new spider types + - rscadd: Added more spider abilities + - balance: Rebalanced spiders + - bugfix: Fixes spiderlings having density +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Seven: - bugfix: Fixes epipens, pillbottles, and test tubes missing texture when put into suit storage @@ -1154,6 +2148,7 @@ - rscadd: The paper hat is now a craftable item - image: Pills and patches are no longer visible on a person when put into suit storage +<<<<<<< HEAD SkyratBot: - balance: Newly created areas in Icemoon and Space are no longer valid Cult areas for Runes and such. @@ -1177,3 +2172,94 @@ SomeRandomOwl: - sound: reduced the file size as well as shortened the length for the suppressed Mp5 firing sound +======= + SyncIt21: + - bugfix: stabilized metal slime extract properly increments stacks so that it's + appearance & weight are updated correctly & is picked up by material sniffers. + axietheaxolotl / viro: + - image: new medkit sprites, again. + mikederkan: + - rscadd: Made disposals outlets launch with more range depending on the setting + used + - rscadd: Made disposals outlets emag effect irreversible without reconstruction +2023-05-30: + Cheshify: + - rscadd: The North Star's medbay has been fully renovated. + - bugfix: The CMO's office ceiling is now properly protected on the North Star. + MTandi, Krysonism: + - rscadd: Added Spess Knife with many tool behaviours + SyncIt21: + - bugfix: fix "none" gas names in gas filter + - bugfix: precise insertion of sheets into material container (e.g. drone dispenser) + works again + - bugfix: recycler properly recycles all contents inside a storage medium like a + backpack & even inert bag of holding + - bugfix: gaining extra metal after recycling ammo boxes + - qol: recycler consumes only half the power when recycling item's that has no material + - qol: you can fill up your bag with iron, glass, whatever material and attack the + autolathe/ore silo with it to transfer all it's contents into it + - refactor: '`/datum/component/material_container/insert_item()` now splits stack, + deletes the inserted item & calls the + + `after_insert` callback' + - refactor: '`/datum/component/material_container/user_insert()` now extracts material + from all the contents of an atom reccursively' + TheVekter: + - rscadd: As a result of a recent safety lawsuit, Nanotrasen has mandated the return + of anesthetic canisters and masks to robotics research on all stations that + are not currently equipped with them. + - balance: Syndicate corpses dropped from killing a Legion no longer come with a + MODSuit. +2023-05-31: + Epoc: + - bugfix: Speaking in sign language no longer reveals your identity + FlufflesTheDog: + - bugfix: Anomalies shouldn't spawn with frequencies that can't be selected on signalers + anymore + Ghommie: + - bugfix: basic mobs & co no longer indiscriminately perform close-range actions + in the presence of obstacles such as directional windows between them and their + target. + - bugfix: Doggos should look at you with longing eyes once again if you dare pick + up an edible they are trying to eat. + Guillaume Prata: + - bugfix: Air Alarms will properly shut up when atmos is fixed. + Helg2: + - bugfix: Syndicate mod-suit in Tactical NukeOps Metagame Syndi-kit (the one with + bulldog shotgun) now doesn't require any access, so you don't need to buy agent + card to simply use it. + JohnFulpWillard: + - balance: Golems' 55% species innate armor has been lowered to 10% + Kubisopplay: + - qol: Admins can make a portal not spark when teleporting + Licks-the-Crystal: + - bugfix: Stops grilles from electrocuting or tesla-ing when there's a floor between + the grille and the cable. + MTandi: + - image: Resprited many condiment containers + - image: Added a sprite for cooking oil / corn oil container + - image: Replaced old condiment bottles with the newer bottles in Condi Master + Pickle-Coding: + - balance: Engineering, janitor and medical holosign projector projection time reduced + to 1 second. + - balance: Engineering, janitor, and medical holosign integrity reduced to 1. + - balance: Engineering holosign projector max capacity increased to 12. + - balance: Medical holosign projector max capacity increased to 6. + Time-Green: + - bugfix: Hardcore random pays your score again as non-antag + ZephyrTFA: + - admin: new log viewer, try it out. (View Round Logs) + moocowswag: + - bugfix: You can no longer pulse the wire on an unpowered shield generator to activate + shields + - bugfix: External only setting on modular shield generators now properly uses terrestrial + turfs such as lavawastes. + nikothedude: + - code_imp: Modularized plasmamen plasma breathing species trait code to automatically + apply to all species + - code_imp: Liver shrugging differences/Alcohol tolerance differences now displayed + in the species trait panel + - code_imp: Nobreath and Nogenes now accounted for in species trait code + - rscadd: Podpeople now have species traits + - rscadd: Plasmamen genelessness is now displayed in their species panel +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-06.yml b/html/changelogs/archive/2023-06.yml index 4f509b3013e..b7db48816be 100644 --- a/html/changelogs/archive/2023-06.yml +++ b/html/changelogs/archive/2023-06.yml @@ -1,4 +1,5 @@ 2023-06-01: +<<<<<<< HEAD Epoc: - bugfix: Speaking in sign language no longer reveals your identity JohnDWolfe: @@ -215,6 +216,22 @@ softcerv: - bugfix: NIFs shouldn't hard delete as much now. 2023-06-07: +======= + FlufflesTheDog: + - bugfix: Radios tuned to things other than common respond properly to turning on + the speaker + - bugfix: Abstract items can no longer be placed in others' hands. + Ghommie: + - bugfix: Being moved around by conveyor belt or tram no longer play footsteps and + wheelchair sounds. + - bugfix: The peanut butter banana sandwich is no longer presented as grilled when + it doesn't require a griddle to make. + - balance: You can now sweep garbage into open trash bins (the crate subtype). + Helg2: + - spellcheck: Plate Gauntlets and Plate Boots now have proper looking names. + - bugfix: Syndicate Holster now works as intended (You can finally put both revolver + and speedloaders in it at the same time). +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 IndieanaJones, Melbert: - balance: Space Dragon can no longer choose its rift locations freely, and instead is given 5 pre-determined locations to pick from instead @@ -233,6 +250,7 @@ - qol: The roundend report for space dragons now collates all players who played a carp into one entry, rather than one per carp spawned. - qol: Space Dragon sounds are much less ear piercingly loud. +<<<<<<< HEAD NotDhu: - bugfix: Void Raptor's CMO office is now properly wired to the station's power grid. @@ -258,11 +276,55 @@ in the techfab/protolathe menus. - code_imp: Xenoarch tools/machines/equipment designs now use base types for inheritance purposes, and have less copy-paste involved. +======= + LemonInTheDark: + - rscadd: You can now filter by book id in library consoles + - bugfix: The visitor console now actually has categories to select. Shows how many + people actually use it + - admin: Added a library moderation tool, so you guys can do that again now that + statbus has passed into the byond + - server: Bumped DB version, the library_action table has a few columns that were + improperly typed, this fixes that + MTandi: + - qol: 'Oldstation: Windows are easier to fix as they''re now fulltile and use the + new helpers to appear cracked.' + - qol: 'Oldstation: You don''t need a special card to access APCs, other minor access + tweaks.' + - qol: 'Oldstation: Some walls have been moved and adjusted for better navigation + and look.' + - bugfix: 'Oldstation: Fixed paper text, overlapping objects, xenos being blocked + by flying crates, and some other minor issues.' + Singul0: + - balance: The mothership which abductors came from has worked very hard to train + their field agents how to use batons from their specimen's habitat + SyncIt21: + - bugfix: bluespace poly crystals can be used to complete machine frames either + by hand or by RPED + TheVekter: + - bugfix: Added a name and description for the basic version of the bow. + timothymtorres: + - qol: Add more glasses to the nearsighted pref menu with icons +2023-06-02: + Charley: + - bugfix: fixes birdshot access in various spots. + Ghommie: + - bugfix: Stops shields getting broken by pillows and disablers. + Hatterhat: + - qol: Fulton extraction packs (when used on yourself) now automatically shove themselves + into any back-mounted storage, like MODsuit storage modules. + - balance: 'The source of the demonic portals that endlessly deposits snow legions + onto the Icemoon no longer preserves the bodies nor gear of the damned (read: + demon portal snow legions now only drop skeletons).' + JohnFulpWillard: + - bugfix: Metastation departures now has an APC and Air alarm again. + - bugfix: Metastation and Birdshot's Coroner offices are now called Coroner office. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - code_imp: The code for posters has been split among three files. If you see something weird, please report it. - bugfix: Fixed the single tank poster using the wrong typepath for its mapping dir. +<<<<<<< HEAD - config: Flavor text requirements to join the round are now config based. Contributors rejoice. Kepteyn: @@ -298,6 +360,67 @@ - bugfix: The peanut butter banana sandwich is no longer presented as grilled when it doesn't require a griddle to make. - refactor: Giant ants are now more capable of distinguishing friend and foe. +======= + - bugfix: '[MetaStation] - Secured some walls in science that weren''t secured properly + (reinforced).' + MTandi: + - bugfix: fixed dead plant having wrong icon roundstart + Rhials: + - qol: Fugitive hunters now get a deadchat poll and notify deadchat properly. + Singul0: + - bugfix: Nanotrasen engineers has installed delamination counters for all Northstar + class expeditionary vessels to increase the pressure for engineers not to fuck + up + carlarctg: + - spellcheck: Fixes grammar error on syndie sm shard desc + coldud13: + - bugfix: Disposals pipes for the Detective's office & Mining cafeteria now work + on tram. + - bugfix: Replaced an open space with a floor at the courtroom holding area. + larentoun: + - bugfix: Gun overlays (energy ammo counter, flashlights, bayonette, etc) are now + one with gun's icon, which makes said overlays to transform correctly with gun's + transform (ie, throwing) + moocowswag: + - bugfix: Tramstation departures is no longer missing a window + - bugfix: Spatial instability now gets properly energized by energetic chromosomes + - bugfix: external shields no longer generate over walls +2023-06-03: + Ghommie: + - bugfix: Fixes thrown things being unblockable by shields or something. + Profakos: + - image: Made the oxygen medkits different coloured from the general medkit colours, + and tweaked the burn medkits to look a bit less orange + axietheaxolotl / viro: + - image: brand new crate sprites, wowie zowie!! +2023-06-04: + Rhials: + - rscadd: The scrubber clog event is now the ventilation clog event. It uses vents + instead of scrubbers now. It is now the ventilation clog event. + - rscadd: Ventilation clogs now produce a lot of filth in addition to produced mobs, + and make the surrounding area dirty. + - balance: Ventilation clogs may produce more mobs at once, and have a higher limit + on how many can occur per round. + - code_imp: The ventilation clog event is now self-contained, and handles all logic/behavior + in the event itself (rather than on the targeted vent). + TheVekter: + - image: Added a cross to the top of the new medical crate for readability's sake. + san7890: + - refactor: Giant ants are now more capable of distinguishing friend and foe. + - refactor: Chicks are now a bit smarter, be careful not to squish them! +2023-06-05: + Crushtoe: + - bugfix: Fixed tram morgue mapping issues and underpass shutter buttons. + DaydreamIQ: + - qol: Icebox Perma's fridges are no longer locked to access they'll never have + MTandi: + - image: new trash bin sprite + - bugfix: trash bin shows correct indicator when spawns non-empty + Potato-Masher: + - bugfix: Removes the misplaced extra chem dispenser from NorthStar pharmacy. + - bugfix: NorthStar medbay now has lightswitches in some rooms as opposed to none. + TheVekter: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Replaced one of the mini energy guns on the Caravan Ambush space ruin with a survival knife. - balance: Replaced the red-and-black softsuit on the Old Infiltrator space ruin @@ -308,6 +431,7 @@ variants of the explorer. - rscadd: Added a Syndicate variant of the explorer suit. The armor is identical to the Goliath cloak with slightly more bomb and ballistic resistance. +<<<<<<< HEAD - qol: Nanotrasen has issued a new wallet model, which lets you put biscuit papers in them! - bugfix: fixed cult veil shifter not teleporting the thing/the loser you're pulling @@ -333,16 +457,97 @@ - rscadd: Podpeople now have species traits - rscadd: Plasmamen genelessness is now displayed in their species panel - image: modified crate sprites +======= + YehnBeep: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: After a thorough dressing down and threats of fines from the Fire Marshal, Nanotrasen has reluctantly installed several missing fire alarms and other safety equipment in the North Star's Cargo Bay and a few other lower deck areas. - bugfix: Fixed minor area definition errors in North Star's cargo area. +<<<<<<< HEAD +======= +2023-06-06: + DATA-xPUNGED: + - qol: Nanotrasen has issued a new wallet model, which lets you put biscuit papers + in them! + Fikou: + - balance: the cake hat wounds more + - bugfix: the cake hat no longer balds you + Guillaume Prata: + - bugfix: Fixes an edge case of an air alarm warning not reseting properly and being + repeated when another atmos issue without a warning message, like Plasma in + the air, triggered the alarm. + JohnFulpWillard, tatax: + - qol: '[Mafia] Players are now sent back to their in-game character''s bodies when + they finish a game.' + - image: '[Mafia] Mafia now has a new sprite for the main action button in-game.' + - bugfix: '[Mafia] Chaplains can now use their ability.' + - bugfix: '[Mafia] The game no longer ends in a Draw if Town or Changelings win.' + - bugfix: '[Mafia] The role list now properly shows roles once.' + JoshAdamPowell: + - admin: allow admins to allow non-clowns to drive clown cars + LT3: + - bugfix: IVs again work with non-living containers + Melbert: + - bugfix: Admin forced latejoins reset correctly after next latejoin + Pickle-Coding: + - bugfix: Fix movable explosive blockers leaving remnants of explosive protection + on turfs after they get destroyed. + Rex9001: + - bugfix: fixes moffic grilled hard cheese burning on the grill instantly + Sealed101: + - bugfix: gibbing colossus possessor crystal possessed animals will no longer stick + the user's body and their stuff into the shadow realm. the animals will properly + drop your corpse when killed or gibbed + Tattle: + - admin: mob tags are now part of the mob tag log again + Wallem: + - qol: Adds a button that lets you recolor air canisters to enable easier organization. + YehnBeep: + - bugfix: The reviver implant will no longer leave its user looping between soft + and hard critical states. + carlarctg: + - rscadd: Changes syndicate surgery duffelbags to contain advanced tools, sterilizine, + surgical tape, and a roller bed. + - rscadd: Changed the Syndicate Infiltrators' surgery areas to contain a full syndicate + surgery duffelbag. + - rscadd: The normal infiltrator now has a operating computer and a closet of misc. + surgical clothing and anesthesic tank. + kinneb: + - image: modified gift and package crate sprites to match the resprited crate +2023-06-07: + Chadley: + - rscadd: Adds some new quirks!! + - rscadd: Adds the bilingual quirk, which gives a new random language. + - rscadd: Adds the big hand quirk which stops the usage of most guns. + - rscadd: Adds the soft spoken quirk which forces you to whisper. + - rscadd: Adds the clumsy quirk enabling the clumsy trait. + Helg2: + - balance: Bone gel standart amount has been increased to 5. + LT3: + - bugfix: Tram platform tiles now have proper stack types + - refactor: Pride week tile coloring refactored into a generic holiday decal system + - spellcheck: Tile decals are no longer all named 'corner' + OrionTheFox: + - rscadd: The Hawaiian Overshirt is now GAGS, and available to crew in the ClothesMate. + Mahalo a aloha! + Pickle-Coding: + - rscadd: Crafting recipe for atmospherics gas mask. + Sealed101: + - bugfix: fixed cult veil shifter not teleporting the thing/the loser you're pulling + with you + SyncIt21: + - rscadd: Igniter's can be crafted + - rscadd: Spraker's can be printed in the autolathe + - rscadd: ignition controller can be printed in the autolathe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: light replacer displaying error message after it finished replacing the light - refactor: merged the `can_use()` proc with the `Use()` proc to perform both actions at once - refactor: '`/obj/item/lightreplacer/attackby()` returns TRUE to prevent calling it''s `after_attack()` code and calls it''s parent proc' +<<<<<<< HEAD - bugfix: '[Metastation] [Birdshot] Test Site Materials Crates now contain targets instead of existing near them purposelessly and empty.' - bugfix: gibbing colossus possessor crystal possessed animals will no longer stick @@ -428,6 +633,28 @@ to lobby while dead. - bugfix: Fixes AIize not working - bugfix: xeno resin floor layer +======= + ZephyrTFA: + - admin: Player Ticket History - view a player's ticket history without the need + to use external tooling. + san7890: + - refactor: Headslugs (the really small slug-like changeling form) are now basic + mobs. They only wander around aimlessly now instead of attacking corpses all + the time, and examining will let you know what type. Should probably still smash + them before they suddenly gain sapience... +2023-06-08: + Archimus12: + - bugfix: fixed admin custom job slot cancel button + - spellcheck: fixed a typo that spelled "jobs" as "jebs" + Diegoflores31: + - image: modified crate sprites + Helg2: + - bugfix: '[Metastation] [Birdshot] Test Site Materials Crates now contain targets + instead of existing near them purposelessly and empty.' + Rhials: + - bugfix: Alexander now properly purges itself when you drop your shield. + Sealed101: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed mecha plasma generator not accepting fuel - bugfix: fixed mecha ui incorrectly displaying fuel remaining when using an energy module @@ -437,12 +664,83 @@ like fixing other damage does - rscdel: did you know that for 4 years now mecha plasma generators did not, in fact, pollute the environment when in use? removed that bit from its description +<<<<<<< HEAD - bugfix: waddling, squeaky shoes and swivel chair sound effects no longer run when moved by conveyor belt. +======= + - bugfix: fixed Lavaland Labour Camp Shuttle prisoner-side airlocks having unrestricted + access from the side of a wall + Seven: + - bugfix: Crafting recipes will not eat your implanted toolset if the recipe calls + for a tool + Time-Green: + - bugfix: Fixes AIize not working + mc-oofert: + - bugfix: xeno resin floor layer + zeroisthebiggay: + - image: energy katana on belt +2023-06-09: + Ghommie: + - bugfix: pixel offsets from grabbing other mobs now respect the body offset variables. + - refactor: Changed some code so that resized mobs no longer look like they're poking + over the below tile with their legs or not even reaching the bottom edge of + the tile they're on. + MTandi, Borbop: + - bugfix: Dust now has dust icon, instead of dirt icon. Dust on all maps replaced + with dirt + - image: Flat dirt now picks from 4 new sprites + - refactor: Made broken tiling work more like tiling and have corresponding visuals. + Added directional mapping variants. + - bugfix: Cleanables now use FLOOR_CLEAN_LAYER to make sure that trash is visible + above catwalks + Sheits: + - image: Resprites the mulebot + Youtubeboy139: + - rscadd: Added new EMT belt (really just renamed the Paramedic belt path) + - image: Added new EMT belt sprite + - image: Added shiny new belts and detective/syndicate holsters (`onmob` sprites + included) + - image: Removed old, unused red military belt sprite +2023-06-10: + Ghommie: + - bugfix: waddling, squeaky shoes and swivel chair sound effects no longer run when + moved by conveyor belt. + - bugfix: Fixed a small issue with mob resizing not promptly updating a body offset + variable. + - bugfix: Taking items from your inventory while flying over lava or a chasm will + NOT set them on fire or drop them into chasms ANYMORE + Guillaume Prata: + - bugfix: Laptops now give a slowdown when dragged, patching the easy trick of dragging + a laptop to bypass the slowdown for carrying it on hand. + JohnFulpWillard: + - spellcheck: The Medical vending refill crate's description now properly displays + the Coroner's vendor as being part of its contents. + LemonInTheDark: + - refactor: Pulled apart the last vestiges of names/docs directly linking signals + to components + Rex9001: + - bugfix: fixes the areas of the_faceoff + Rhials: + - qol: Fugitives, Bounty Hunters, and Paradox Clones will now appear in the orbit + menu. + YehnBeep: + - bugfix: Lavaland's cafeteria fridge is no longer access-locked. + - bugfix: The mining vendor's bar pod's machinery no longer has access restrictions + miners can't use. + - bugfix: The bar pod's vending machines no longer believe they are on station. + - qol: The bar pod's bathroom also has less unused space. + larentoun: + - rscadd: Added optional respawn delay (disabled by default), which prevents returning + to lobby while dead. + rageguy505: + - bugfix: O2 crates have blue stripes when opened + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Shooting a welding fuel tank (big or small) with a projectile will now accurately post to list_bombers with the name of the person who shot the projectile from the gun. If you don't know how to list-bombers, it will also be present in game.log for your viewing pleasure. +<<<<<<< HEAD - rscadd: Assistants get a new liver trait, maintenance metabolism. This trait only lets them process maintenance drugs, grey bull, and pump-up for 20% more time and gives them a probably-positive 2 minute moodlet when ingesting these. @@ -452,10 +750,30 @@ - bugfix: Nanotrasen Cookery Command has ended the plague of staff complaining that their tomato dishes are just complicated forms of soup by redefining "tomato soup" to include a dash of cream. +======= +2023-06-11: + Ghommie: + - qol: Basketball (the mini-game) player mobs have a chance to be taller than the + usual spaceman. + Licks-The-Crystal: + - qol: Makes transparent kudzu transparent (and won't block sight) + Licks-the-Crystal: + - bugfix: Removes the infinite hypernoblium from the holodeck's Winter Wonderland + setting. + MTandi: + - qol: 'RPD UI: Devices split in two categories, options are aligned to the left' + MrStonedOne: + - server: fix logging infoleak from the lack of continuation markets on new lines. + Rhials: + - code_imp: Spaceman simple mobs have been converted to basic mobs. + - qol: Ventcrawling mobs have a 1 second delay/warning before exiting the ventilation. + Roryl-c: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed TTS tripping over stuttered text when other speech modifiers are in effect - bugfix: fixed tedious TTS "ess-ess-speech" for lizards and other species with repeated consonants +<<<<<<< HEAD larentoun: - bugfix: Remove Lewd Items verb is config dependant 2023-06-13: @@ -486,6 +804,37 @@ - rscdel: Vending machines no longer flatten your sprite - rscdel: Vending machines won't RR you via gibbing/destroying your head SkyratBot: +======= + ShizCalev: + - bugfix: The RD's plant will no longer say that it's not very healthy after being + restored with seeds. + - bugfix: Potted plants no longer randomly swap icons after being thrown. + - bugfix: Plants that started the round dead are no longer all the same kind once + revived. + - bugfix: Admins can now varedit plants to be alive / dead! + Singul0: + - spellcheck: the H.E.C.K helmet is now typo-free +2023-06-12: + Dorsisdwarf: + - bugfix: Nanotrasen Cookery Command has ended the plague of staff complaining that + their tomato dishes are just complicated forms of soup by redefining "tomato + soup" to include a dash of cream. + FernandoJ8: + - bugfix: copying nodes from a techweb to another no longer reveals hidden nodes + MTandi: + - qol: Chemmaster UI tweaked + - bugfix: Fixed chem master showing wrong data during reagent analysis + - bugfix: Fixed chem master not working with fermented drinks + - image: Chemmaster resprited, now has an indicator for buffer reagents + - refactor: Refactored chemmaster code, it now uses reagent containers instead of + styles + - balance: Chemmaster now uses servos and has printing animation of 0.75 second + duration. Outputs 1 container or up to 2 pills/patches per cycle by default. + Can be upgraded to output up to 4 and 8 with t4 servos. + Pickle-Coding: + - balance: Field generators can parry explosions. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: light replacer accepts glass sheets & light tubes when you attack them with a light replacer - bugfix: only glass shards can fill the light replacer not other shard types @@ -499,6 +848,17 @@ time - refactor: removed redundant` Initialize()` proc from `obj/item/light` - refactor: VV editing var's works properly +<<<<<<< HEAD +======= + carlarctg: + - rscadd: Assistants get a new liver trait, maintenance metabolism. This trait only + lets them process maintenance drugs, grey bull, and pump-up for 20% more time + and gives them a probably-positive 2 minute moodlet when ingesting these. + - rscadd: The officer's sabre has gained a small amount of bloodthrist for assistants! + - bugfix: Fixed liver masters being unable to inspect the liver of scientists. +2023-06-13: + ArcaneMusic: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: In general, mineral recipe costs for items in larger amounts has been decreased by 2x. - balance: One sheet now contains a total of 100 units of material, down from 2000. @@ -506,6 +866,7 @@ costs of certain recipes. - code_imp: Added a python script to the tools folder, letting you see a mineral breakdown of one/several rounds using silo logs. +<<<<<<< HEAD axietheaxolotl / viro: - image: removes dogborg walking animations - image: brand new arachne sprites! @@ -593,11 +954,119 @@ revived. - bugfix: Admins can now varedit plants to be alive / dead! SkyratBot: +======= + EricZilla: + - image: Someone broke their ankle using the jumpboots in the vendor so we had to + buy new ones + NotDhu: + - bugfix: Maintenance doors/delivery chutes leading into Tramstation's brig have + had their access requirements fixed and now actually require security access + to open. + ZephyrTFA: + - bugfix: AIs can no longer enter a limbo state without a core but not dead. + - rscadd: Nuclear Detonation now drops security level if it missed the station. + - rscadd: Nuclear Detonation now nukes the syndie base if its on the syndie base. + - bugfix: Nuclear Detonation now handles not playing a cinematic correctly. + - refactor: Changed z level iteration for Nuclear Detonation +2023-06-14: + ATHATH: + - bugfix: The destabilization of your eigenstate can no longer be paused by stripping + naked. + DATA-xPUNGED: + - bugfix: Beach Bum Basketball Team has water again. + - bugfix: Birdshot's gulag now has an item reclaimer, no more will your items fall + on the ground! + GPeckman: + - bugfix: You can no longer duplicate iron by turning sheets into rods and putting + the rods back into the protolathe + Mey-Ha-Zah: + - image: Updated Eastern Monk, Nun, Holiday Priest Chaplain Suits. EricZilla helped. + Pumpkinoe: + - bugfix: Made some decals on north star look a little nicer. + SethLafuente: + - rscadd: Added two new pirate types Ex-interdyne Pharmacists and The Grey Tide-6 + - spellcheck: makes language more appropiate + Youtubeboy139: + - rscadd: Added security specific gloves + - image: Changed all standard security uniforms pink + carlarctg: + - qol: Plastic sheets chemist tip is more in-depth and clear + - qol: Added holy explosion chemist tip + carshalash: + - bugfix: Fixes a stuck lightbulb in medbay treatment center. Also fixes an accidental + placement of vents/scrubbers which lead to escaping xenos. + - spellcheck: corrects a typo in most ethereal drinks. +2023-06-15: + Cobby: + - bugfix: Droppers/Beakers will now go to 1u/15u on the FIRST leftclick. + Couls: + - admin: fix combat logs for tabling and disposal shoving + DaydreamIQ: + - qol: The CC pod bay now has proper morgue facilities that don't clip through a + glass window + FernandoJ8: + - spellcheck: adjusted font size from 30px to 15px + FlufflesTheDog: + - bugfix: VERY small amounts of a gas (<0.0001 mol) in pipenets will once again + be fully removed + Hatterhat: + - bugfix: MOD plasma cores' improved recharging from sheets (2000 charge up from + 1500) is back again. + LT3: + - qol: ID card linking now preloads your bank account number + - bugfix: Tram controls no longer randomly go blank on Birdshot + MTandi: + - qol: Chemical burner can be crafted from any open container, not just beakers + Melbert: + - bugfix: Maybe fixes minor bugs in disease cure, revolution, hooded suit code + - code_imp: Adds some runtime safety to Cinematic code + Momo8289: + - rscadd: Updated the Patch of Eden lavaland ruin with a new item + - rscadd: Added the Plasma flower item, which can be used as an upgraded plasma + MOD core + SyncIt21: + - refactor: don't send gas name to gas filter UI as the name is already decoded + there from it's ID + - bugfix: microwave's(after it has finished cooking) & other machine's that spit + out contents don't spit out assemblies/signallers attached to it's wires. + - bugfix: signallers can be picked up if you attached them to a machine's wire & + later deconstructed that machine without detaching it first. + ZephyrTFA: + - bugfix: Trees and Coconuts are no longer immune to singularities. + bobbahbrown: + - server: Fix log categories being erroneously excluded from log files. + necromanceranne: + - bugfix: Bows properly update their ammo when stored, dropped and stowed. You cannot + load a bow without holding it in your inactive hand. You have to hold it to + keep the bow loaded. + - qol: You can remove an arrow from the bow with alt+click, much like other ballistic + weapons. + - bugfix: The divine bow can be properly stored in the chaplain armor's suit storage, + much like all other bulky null rods. + - sound: Bows have sounds for drawing, firing and loading. +2023-06-16: + Ghommie: + - rscadd: 'Expanded the Experimental MODsuit Bepis node with three new modules: + Magneto Charger, Recycler and Shooting Assistant.' + - rscadd: Added a Riot Foam Recycler module to the black market, as well a more + innocuous version as maint loot. + JohnFulpWillard: + - bugfix: Lava will no longer burn 6 of the mirrors in pride ruin + - bugfix: Lava will no longer burn plants that spawn in them. + MTandi: + - qol: You can name barrels with a pen now, changing its icon + Melbert: + - bugfix: Fix hungover people never spawning stuck in closets + Tattle: + - image: removed a stray gray pixel from the milk containers + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Heretic runes no longer have every single transparent pixel set to 1 alpha, to make it easier to click on objects. - qol: Clearing heretic runes with mansus grasp takes 0.4 seconds of standing still, to prevent you from accidentally clearing it in combat. - code_imp: Added code for effect remover element to use a windup if set. +<<<<<<< HEAD - qol: You can name barrels with a pen now, changing its icon - bugfix: siliconnect log tab updates correctly - bugfix: VERY small amounts of a gas (<0.0001 mol) in pipenets will once again @@ -685,10 +1154,40 @@ - bugfix: Fix hard delete in traitor trap tool objective - bugfix: Fixed a maint loot spawner located inside a wall in North Star Chemistry Lab Maintenance +======= + mc-oofert: + - bugfix: siliconnect log tab updates correctly +2023-06-17: + ChungusGamer666: + - bugfix: You can no longer make extra cloth when looming cotton by spamming do + afters. + - rscadd: Things affected by acid now get cool particles! + EliteCreature: + - spellcheck: changed gas to correct type in description + FernandoJ8: + - bugfix: positronic brains now correctly reject the ghosts of people who have used + the suicide verb + - bugfix: Monkey revolutionaries will not be considered for a promotion into Head + Revolutionaries unless they're the only candidates... again. + - bugfix: shipping manifests labelled as erroneous due to missing contents are now + guaranteed to be missing contents + - spellcheck: shipping manifests now display repeated items on a single line + LT3: + - bugfix: Sansufentanyl won't roll as a potential extreme allergy for Hereditary + Manifold Sickness + MTandi: + - qol: Tubes and Bottles have the main reagent name prefix in Chem/CondiMaster + Melbert: + - bugfix: Fixed e-cutlasses and bananium swords having invisible inhands + - code_imp: Removed boilerplate from transforming component + - bugfix: Ghosts can click on active gateways to teleport to the destination set. + Doesn't work for secret gateways. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored Stun Absorptions (Bastard Sword, His Grace) - refactor: Refactored Stun Immunity. Note this means that some mobs which, prior, were immune to all forms of incapacitation are now vulnerable to some. Notably, adult non-queen xenomorphs are now vulnerable to falling unconscious. +<<<<<<< HEAD - bugfix: Fix Hard Delete from the captain's spare ID code paper - bugfix: Fixed hard delete with Kinetic Crusher causing the projectile function to brick @@ -699,6 +1198,20 @@ HFR meltdown, organ harvesting, - qol: Deadchat will be notified when a nuclear/doomsday device is activated, as well as when a blob-infection bursts. +======= + - bugfix: Runtimes from wingless humans using *wing + - bugfix: Fixed a cheeky way RDS revealed you were an antag before you actually + got antag. Sorry, you know who you are. + - config: RDS now has policy.json support, to allow customization of the roundstart + "anti-grief" message. + - bugfix: Runtime from ejecting beakers from a chem-master + - sound: Welding Gas Masks make the same sound effect as Welding Hard Hats when + they toggle + Momo8289: + - bugfix: After destroying unfathomable quantities of excess coins, their value + is back to what it's supposed to be! + - bugfix: The divine archer coat's hood now has armor like it's supposed to +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials :): - qol: The Russian and Bounty Hunter fugitive hunter shuttles now come with enough oxygen for everyone. @@ -709,6 +1222,7 @@ - balance: Every fugitive hunter shuttle now has a shuttle pinpointer present. - code_imp: Fixes the spawner menu text for psyker hunter spawners. - image: Blue and Orange mapping helper for Hunter Access. +<<<<<<< HEAD SkyratBot: - qol: The CC pod bay now has proper morgue facilities that don't clip through a glass window @@ -786,6 +1300,41 @@ duration. Outputs 1 container or up to 2 pills/patches per cycle by default. Can be upgraded to output up to 4 and 8 with t4 servos. - bugfix: copying nodes from a techweb to another no longer reveals hidden nodes +======= + SethLafuente: + - bugfix: fixes meatballs not having inhand sprites + SuperDrish: + - rscadd: Minimal Job Age requirments added. Disabled by default. + Youtubeboy139: + - image: Added a new Land Mine sprite + mc-oofert: + - qol: Latejoining crew start with crowbars if arrivals enviromental power is OFF + stonetear: + - bugfix: jetpack signals now pass a user argument. This fixes an error when automatically + stowing a captain jetpack into your modsuit. +2023-06-18: + ChungusGamer666: + - refactor: Species brute and burn damage modifiers are now handled by bodyparts, + instead of being universal. Go ham at the surgical bay. + - bugfix: Glass joes will no longer appear to get knocked out, while already knocked + out. + LemonInTheDark: + - admin: VV for global vars will now load MUCH faster, in exchange lists are now + perma contracted in that particular pane + Pickle-Coding: + - balance: Armour penetration calculation is now the inverse function of armour + stacking. + - bugfix: Fix space dragon fire breath hitting the same target multiple times in + a single stream. + Rhials: + - qol: Basic spider eggs no longer flash the byond window when ready to hatch. + - qol: Toy hot potatoes no longer give a ghost notification. + - qol: Deadchat will be notified in the event of an imminent macrobomb detonation, + HFR meltdown, organ harvesting, + - qol: Deadchat will be notified when a nuclear/doomsday device is activated, as + well as when a blob-infection bursts. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: finishing & closing the turbine core rotor part will now connect itself to the cable beneath it allowing it to share its produced power with everyone. - bugfix: turbine's now give detailed balloon alerts if you have a missing component, @@ -793,6 +1342,7 @@ - bugfix: turbine's will not produce power in vaccume - bugfix: turbine's won't function if any of it's components are damaged or misaligned after linking or during processing +<<<<<<< HEAD - bugfix: Birdshot now has an (oddly placed) atmosdrobe. - bugfix: fixes the areas of the_faceoff - admin: fix combat logs for tabling and disposal shoving @@ -849,12 +1399,69 @@ - bugfix: fixes papercutters not properly updating their icons, removing their stored papers/blades, and eating papers when one is already stored - qol: Abductor organ surgery steps shifted around to match other surgeries +======= + - bugfix: you need to be in proximity of the airlock painter to eject its cartridge. + - bugfix: you don't hit the windoor after it has finished opening/closing. + YehnBeep: + - rscdel: Positronic brains no longer check for suicide verb use. + - bugfix: Birdshot now has an (oddly placed) atmosdrobe. + ZephyrTFA: + - bugfix: Deconstructing a papercutter will now spit out its internals if present. + - qol: Papercutters now have contextual tips +2023-06-19: + ATH1909: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: In addition to the beakers and bottles they could already hold, mediborg beaker apparatuses can now hold test tubes. - spellcheck: The descriptions of beaker and drink apparatuses have been updated to more accurately reflect what they can and can't hold. +<<<<<<< HEAD SuperDrish: - rscadd: Minimal Job Age requirments added. Disabled by default. +======= + ChungusGamer666: + - bugfix: Exotic blood types no longer persist through species change if the new + species does not have an exotic blood type + Melbert: + - bugfix: Fix Hard Delete from the captain's spare ID code paper + - bugfix: Fixed a maint loot spawner located inside a wall in North Star Chemistry + Lab Maintenance + - bugfix: Fix hard delete in traitor trap tool objective + - bugfix: Fixed hard delete with Kinetic Crusher causing the projectile function + to brick + OrionTheFox: + - bugfix: fixed the context tips on papercutters + - bugfix: fixes papercutters not properly updating their icons, removing their stored + papers/blades, and eating papers when one is already stored + Pepsilawn: + - bugfix: you cannot use departmental budget cards as withdrawal sources for NT + Pay anymore + Time-Green: + - rscadd: Adds shuttle events! If shuttle escapes weren't exciting before (doubtful), + they definitely are now! I'm joking it's mostly an atmosphere thing. + - admin: 'Adds an admin panel to interact with shuttle events, under the Events + tab: Change Shuttle Events' + - bugfix: Objects spawned in hyperspace will properly catch hyperspace drift +2023-06-20: + ChungusGamer666: + - rscadd: Food now gets stink lines when going bad. Uh oh, stinky. + DaydreamIQ: + - qol: Abductor organ surgery steps shifted around to match other surgeries + GoldenAlpharex: + - bugfix: Wheelchairs now make noises when they're meant to again, and don't make + noises on the tram nor on conveyor belts + MTandi: + - qol: You can make hairless hide from the entire stack of hides at once + Melbert: + - qol: Categorizes chef vendor + Mey-Ha-Zah: + - image: 'Updated several Null Rod Graphics. Also updated: the supermatter sword.' + OrionTheFox: + - qol: made Balaclavas layer below glasses and radios + SethLafuente: + - bugfix: Fixes a few Interdyne Pirates map flaws + - bugfix: fixes holymelons not having inhand sprites +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Photocopiers now use actual paper instead of materializing it out of thin air. @@ -864,6 +1471,7 @@ form. - qol: Nanotrasen's bureaucracy division has ""improved"" the quality of their printer toner after many complaints from furious customers. +<<<<<<< HEAD softcerv: - qol: Evokers can now be renamed with a pen. - qol: Evokers now come with randomized names @@ -895,10 +1503,48 @@ - bugfix: Fixes a few Interdyne Pirates map flaws - bugfix: somehow, somewhere, a ship's engine has been changed. 2023-06-22: +======= +2023-06-21: + Addust: + - bugfix: somehow, somewhere, a ship's engine has been changed. + Couls: + - qol: Welders now have a more consistent fuel usage + JohnFulpWillard: + - bugfix: Maintenance data disks now properly transfer from PC to disk + - bugfix: Disks can no longer be flooded with the same app repeatedly. + LT3: + - spellcheck: Fixed a few typos + Rhials: + - bugfix: The walls adjacent to the Infiltrator docking port will no longer bend + diagonally into walls. + SyncIt21: + - bugfix: Modular machinery computer UI opens again + ZephyrTFA: + - bugfix: Cat Butcherer can no longer remove a tail you don't have. + - bugfix: You can no longer manipulate "None" organs + carlarctg: + - bugfix: Fixed being unable to reimburse syndicate spawners via uplinks. This includes + nukie reinforcements, cyborgs, and holoparasite injectors. + - refactor: Turned TC reimbursement into a bespoke element. + - spellcheck: Tuned demon's blood message when there's no ghosts to pick to be a + little more understandable and sensible. +2023-06-22: + Ghommie: + - bugfix: Fixed the honourbound trauma not reacting to attacks from basic mobs + - bugfix: Fixed the "Declare Evil" spell not working against the medical department. + Guillaume Prata: + - balance: The Atmospheric MODsuit now comes pre equipped with the quick carry module. + Go save some lives! + Helg2: + - bugfix: autolathe, protolathe, mech fabricator and component printers material + capacity are now in 20 times less, as intended. + - bugfix: protolathe material menu now should display material ejecting correctly. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - qol: The potted plants have been changed slightly behind the scenes. Mappers may enjoy being able to pick a wider selection of plants to put in maps now, because they've all been made into their own items. +<<<<<<< HEAD KathrinBailey: - rscdel: Removes force-borging nanite pizza from shuttle loan (host request). SkyratBot: @@ -912,6 +1558,61 @@ - rscadd: Adds a shark plush, obtainable from Cargo for a nominal fee. - rscdel: Removed plush cucumber by popular request. Cucumber has been replaced by the shark plushie in arcade machines. +======= + LemonInTheDark: + - bugfix: Maps loaded post init will no longer randomly enter a failed state. Hopefully. + Melbert: + - bugfix: The colossus's finale attack is now 100x more lethal, because it was firing + 100x fewer projectiles than intended + - bugfix: Fix shooting guns without a magazine loaded making no fire sound effect + - bugfix: Fixed EMP'd / signaled microwaves not running as they should + - bugfix: Fix runtimes from Bileworms targeting mechas (or other objects people + are hiding in) + Peliex: + - bugfix: changed station floor tiles to be worth 25 instead of 50, one quarter + of an iron sheet. + Rhials: + - bugfix: attacking non-carbon mobs with a cuffsnapping object will no longer runtime. + Sealed101: + - sound: explosive implant's beeps get louder as it gets closer to exploding + - bugfix: fixed mecha generators using way too much fuel due to using the old values + of material units per sheet + - bugfix: fixed sechailers/SWAT masks not using the installed air filter + - bugfix: fixed Godwoken Syndrome VoG commands triggering the spam filter + SyncIt21: + - bugfix: ' material container[and hence autolathe] now won''t touch the content''s + of abstract/hologram item''s like the tentacle gun' + - bugfix: material container[and hence autolathe] consuming indestructible items + - bugfix: material container[and hence autolathe] cosuming half the content's of + an object and leaving out the rest if there isn't space producing broken behaviour + in those item's + - qol: material container[and hence autolathe] display's the item name consumed + and it's material worth to let player's fully know the content's of the item + being recycled + - rscadd: air sensor's are craftable + - refactor: air sensor's can now be turned off by hand and can only be deconstructed + by a welding tool + - refactor: removed `Params()` proc + - qol: unwrenched air sensors can be picked up & recycled like regular item's + - rscdel: air sensor are removed from the RPD UI + - qol: air sensor's are no longer restricted by their unique ID's which mean you + can craft as many air sensors as you want. + TheVekter: + - qol: Embedding an object inside a cake or loaf of bread now requires a right-click + instead of a left-click. No more accidentally putting your knife inside it! + - qol: Added context tips for slicing, embedding, and removing embedded items from + cake, bread, and cheese wheels. + carlarctg: + - bugfix: Adds wound armor to ALL jumpsuits that were missing it + cnleth: + - bugfix: Rockets can no longer embed in people and cause blunt wounds instead of + piercing + kawoppi: + - image: added lizard inhand- and onhead sprites + - image: added space lizard inhand- and onhead sprites + - bugfix: changed held weight class of lizards from normal to tiny + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The Vorpal Scythe, a special null rod variant that gains power from beheading people! But it is fickle about when and how you use its power. Replaces the Reaper Scythe. @@ -926,6 +1627,7 @@ - rscadd: '...unless you get to do it while screaming ''IT LIVES!'' via Revival surgery. Screw conventional medicine and science, you know the true way to bring back the dead!' +<<<<<<< HEAD - image: 'Updated several Null Rod Graphics. Also updated: the supermatter sword.' - bugfix: Virology disposals now route directly to space, rather than sending their nasty tubes to cargo. @@ -943,20 +1645,54 @@ - bugfix: Inflatable barrier box can now only contain inflatables, and should be able to hold as many as they spawn with. They also hold a nicer amount of items (7 doors and 14 walls, instead of 8 doors and 16 walls, which looked stupid). +======= +2023-06-23: + Cheshify: + - bugfix: Virology disposals now route directly to space, rather than sending their + nasty tubes to cargo. + - bugfix: A single maintenance spawner was removed from a wall by plumbing. + LemonInTheDark: + - bugfix: Dehardcodes some stuff with tram windows, they'll be easier to map with + now + - refactor: Border objects can now smooth with each other. I'm sure something cool + will come of this + Melbert: + - bugfix: Fix a runtime involving Bilingual Curators + - qol: Bilinguals get a message on spawn reporting which language they've learned, + or a message reporting they have learned no language if they're already fluent + in all possible ones. + TheVekter: + - rscadd: Adds a shark plush, obtainable from Cargo for a nominal fee. + - rscdel: Removed plush cucumber by popular request. Cucumber has been replaced + by the shark plushie in arcade machines. + YehnBeep: + - bugfix: Science department hallways now have unrestricted one-way exits on Delta, + Birdshot, and Icebox, to make these maps consistent with the others. +2023-06-24: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - rscadd: 'New Wizard spell branch: Vendormacy! Summon runic vending machines with your Vending Scepter, force push them on your enemies to squish them or blow them up while they are busy buying from the machines.' Hatterhat: +<<<<<<< HEAD - rscadd: The Free Trade Union has reported losing small stocks of their "Archangel" rifle furniture sets. Coincidentally, in-sector black markets (accessible, as always, via appropriate black market uplinks) now report an uptick in availability of the very same parts. Prospective crazed gunmen are advised to bring a screwdriver. +======= + - rscadd: Baseballs can now be crafted with 3 leather. + Helg2: + - qol: pill press' max volume for bottles are 50, as the volume of bottles itself. + Improvedname: + - balance: Weakens summoned stickmen to be 1 or 2 hit +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - image: Delam and tram flipsigns have been replaced with information displays - bugfix: Tram hit count is centrally managed instead of independently on each sign, so they won't get out of sync Melbert: +<<<<<<< HEAD - qol: Categorizes chef vendor - bugfix: The colossus's finale attack is now 100x more lethal, because it was firing 100x fewer projectiles than intended @@ -1102,6 +1838,38 @@ - bugfix: Fixed special chat bubbles for yelling, clown, redtext, greentext - bugfix: Fixed alignment of status display text - code_imp: Status displays now synchronize their message lines when scrolling +======= + - bugfix: The Syndicate Assault Cyborg can autofire their LMG + SyncIt21: + - code_imp: makes sure cargo computer doesn't use `usr` var inside `ui_act()` which + could cause undefined behaviour + Wallem: + - image: Tweaks cardboard sheet sprite + YehnBeep: + - qol: Instrument delivery beacons now fit in pockets. + necromanceranne: + - bugfix: Arm implants properly handle EMPs depending on whether it is robotic or + organic. No longer can you EMP an organic organ! + timothymtorres: + - qol: Add UI preference menus for AI hologram and status displays +2023-06-25: + ATHATH: + - rscadd: Adds a variant of the external organ manipulation surgery for robotic + body parts, similar to the robotic version of the internal organ manipulation + surgery. It uses the same procedure as non-head/torso prosthetic organ manipulation. + - rscadd: In layman's terms, augged people can get frills, antennae, wings, tails, + etc. attached to them now. + - qol: The suitability of crowbars in the "manipulate organs" and "manipulate features" + steps has been boosted from 55% to 100%, but only for the robotic versions of + those steps. Their suitability remains 55% for organic organ manipulation. + ChungusGamer666: + - refactor: Mutant livers can now handle chemicals in special ways. Currently, only + plasmaman, skeleton and golem livers do it. Every other species is the same. + Ghommie: + - bugfix: arrows can now be actually coated with reagents. + - admin: The Debug and Admin MODsuits now take a lot less time to (de)activate. + 2 and 0.5 seconds respectively, compared to the default of 10s. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: 'Wizarditis Improved. Those infected will now randomly cast one of the following (weakened) spells at max stage: Teleport, Disable Tech, Mutate, Knock, @@ -1109,6 +1877,7 @@ Bolt, or Swap' - rscadd: A source of antimagic will prevent Wizarditis's ill effects, but won't cure you. +<<<<<<< HEAD Nerev4r: - refactor: Podperson hair is now colorable, properly layered, and able to be emissive. SkyratBot: @@ -1117,10 +1886,27 @@ - sound: One (1) new space ambience track has been added. Good luck and godspeed. - bugfix: Brand intelligence can no longer affect off-station vendors in some specific circumstances. +======= + Pickle-Coding: + - bugfix: Fix atoms not applying proper armour penetration logic. + - bugfix: Fix silenced living armour penetration not using proper armour penetration + logic. + - code_imp: Added macro for calculating armour penetration. + Seven: + - balance: Acid on a turf no longer immediately applies acid to its contents + - bugfix: Acid applied on a tile will no longer damage pipes below that tile + - bugfix: Xeno's corrosive acid no longer instakills mobs + - bugfix: Xenos can now touch acid + - bugfix: toys, stamps, and spacecash no longer has a missing texture when put into + suit storage + - qol: stamps are now allowed suit storage items in the hop, qm, and cargo wintercoats + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: glass bottles with reagents can be used for crafting, empty glass bottles will be used as tools(e.g. empty glass bottle as rolling pin) - bugfix: glass bottle with welding fuel can be used for crafting improvised shotgun shells +<<<<<<< HEAD - bugfix: The lavaproof tracks cyborg upgrade now protects against liquid plasma, the Icebox equivalent of lava. - bugfix: fixed hostile mobs trying to attack supermatter discharge bolts @@ -1131,6 +1917,120 @@ axietheaxolotl / viro: - image: resprited surgery tables, and stasis beds 2023-06-30: +======= + - bugfix: bubble gum crate actually looks correct + - bugfix: fixes balloon alert runtime when spider webs are destroyed. + Tattle: + - admin: build mode help text is in an examine block + - admin: adv build mode and fill now have item previews + Wallem: + - image: Resprites plumbing machines + Youtubeboy139: + - image: Added new Space Beer sprite + - image: Added new Carp Lite sprite + - image: Added new Ale Bottle sprite + - image: Added new Two-Time Root Beer sprite + carlarctg: + - rscadd: Adds digital clocks, can be found in all the stations' hallways! Most + noticeably in bars or the bridge. They can also be lathed. + kinneb: + - image: Resprited the Limb Grower + norsvenska: + - rscadd: Christmas now has special station prefixes. +2023-06-26: + Funnytoilet: + - qol: Allows you to craft plastitanium shards. + Ghommie: + - bugfix: Fixes the lights from Tinea Luxor being stackable to the point of crashing + the game for others. + IndieanaJones: + - balance: Xenos have been rebalanced, removing their hardstuns on their disarm + and neurotoxin, along with a slew of other changes. Xenos have received buffs + to their more unique abilities in return. + - bugfix: Fixed simplemobs ignoring xenomorph's melee damage values when being attacked + by them. + winterboekje: + - sound: Adds unique sounds to library barcode scanner + - image: Removes soul from library +2023-06-27: + ChungusGamer666: + - refactor: Liking/disliking food is now handled by the tongue organ, not the species. + Also, having a failing tongue means you can't taste food properly! + - rscadd: You can read peoples' tongues now, if you have the entrail reading skillchip. + GPeckman: + - bugfix: The lavaproof tracks cyborg upgrade now protects against liquid plasma, + the Icebox equivalent of lava. + LovliestPlant: + - qol: '[Birdshot] Adds layer adapters to gas tank output hookups in atmospherics' + - qol: '[Birdshot] Adds additional navigation verb landmarks' + - bugfix: '[Birdshot] Fixes entrances to some departments from maints not requiring + department access' + - bugfix: '[Birdshot] Converts the guard locker in perma to a normal security officer''s + locker' + - bugfix: '[Birdshot] Adds an exterior outlet vent for the incinerator' + Momo8289: + - bugfix: Items that shouldn't have been stacking should no longer stack. + ReinaCoder: + - image: the mosin and prime nagants' mob sprites have been updated + TheVekter: + - bugfix: Added the missing medical laptop to the morgue on Northstar. + axietheaxolotl / viro: + - image: resprited surgery tables, and stasis beds + cnleth: + - bugfix: Symbols display correctly when sending messages via mind link + the-og-gear: + - sound: One (1) new space ambience track has been added. Good luck and godspeed. +2023-06-28: + ChungusGamer666: + - bugfix: Plasma will now heal plasmamen properly + Ghommie: + - rscadd: You can now revive dead fishes, bees and (mindless) mice with a lazarus + injector. + - balance: Tom, the mouse, no longer counts toward the mice population cap. + Hatterhat: + - balance: The Regal Condor's base spread has been reduced to 0, like damn near + every other gun that exists. + LT3: + - refactor: Refactored maptext (those floating words) + - bugfix: Fixed special chat bubbles for yelling, clown, redtext, greentext + - bugfix: Fixed alignment of status display text + - code_imp: Status displays now synchronize their message lines when scrolling + - bugfix: MetaStation's bridge incident counter and clock no longer overlap + - bugfix: Deltastation's missing incident counter has been found. Does that count + as an incident? + - qol: Tramstation bridge and medbay now have a clock where the tram hit counter + used to be + Melbert: + - bugfix: You can once again "too slow" someone with a high five + Momo8289: + - bugfix: Had to destroy a lot more of em, but the value of iron coins are now back + to normal + SapphicOverload: + - bugfix: fixed hostile mobs trying to attack supermatter discharge bolts + Seven: + - qol: Mops, some cleaning items, and light replacers now use balloon alerts + - rscadd: Surgical caps now actually hide your hair + Time-Green: + - bugfix: hardcore random now gives you a species specific name + Youtubeboy139: + - rscadd: Added new Pirate Boots + - image: Added new Pirate Bandana sprites + - image: Added new Pirate Hat sprites + - image: Added new Pirate Uniform sprites + - image: Added new Sailor Uniform sprites + - image: Added new Pirate Coat sprites + - image: Added new Pirate EVA gear sprites + - image: Added new Cutlass sprites + - image: Added new Energy Cutlass sprites + - image: Added new `hgpirate` suit and hat sprites + vinylspiders: + - bugfix: sliding puzzles can no longer have their icons erased by the hand labeler +2023-06-29: + ChungusGamer666: + - bugfix: Clarke ore box now has a less confusing dump contents button. + Funnytoilet: + - bugfix: Plasmamen can now get HMS +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Iamgoofball, Nadare, ddPn08, Mangio621, the rest of the RVC dev team: - rscadd: Improves the audio quality and speaker fidelity by implementing Retrieval Voice Conversion as an intermediary layer, utilizing the repository at https://github.com/ddPn08/rvc-webui. @@ -1144,3 +2044,79 @@ - rscadd: Reworks the silicon voice effect to be a special effect done on the TTS server level instead of via normal filters. - rscadd: Reworks the vending machine effect to use the new robotic voicebox effect. +<<<<<<< HEAD +======= + Jolly: + - spellcheck: Changeling hallucination sting will now tell you it costs 10 chemicals. + It always did, but now its there. Cheers? + LemonInTheDark: + - balance: Tcomms now works across connected (vertically) zlevels. No more hunting + in maint for the relay. + Melbert: + - qol: Scanning apps (Lifeline app) start with a scan + - bugfix: Fixes a potential exploit in radar apps + Rhials: + - rscadd: The abductor equipment vendor now offers a hacking/medical hypertool, + at a price of 2 research points. + - rscadd: The abductor equipment vendor now sells decorative abductor posters, at + a price of 1 research point. + - rscadd: The abductor equipment vendor now sells a cow, at the price of 1 research + point. + - bugfix: Fixes a runtime when trying to probe non-human mobs. + - image: Some abductorized versions of existing wall posters and an alien hypertool. + - code_imp: The abductor shop listings now use lists of items, rather than single + build paths. + - code_imp: The abductor_gear.dm file has been split up into a few different files. + - code_imp: Posters can now be hung on indestructible walls. + SyncIt21: + - bugfix: cable layers 1 & 3 can now be used by machine's like emitters, smes, tesla + coil & turbine. + - bugfix: terminals(smes & apc) can operate on different cable layers by installing + them with right click + chemistrymain2: + - balance: Syndicate simplemob fire-rate raised to one shot per second. + tf-4: + - bugfix: Brand intelligence can no longer affect off-station vendors in some specific + circumstances. +2023-06-30: + Chadley: + - bugfix: fixes the EHMS injector's do_after() + - code_imp: Improves the code for the disease scan proc (thank you fikou) + ChungusGamer666: + - refactor: Head rendering code has been updated significantly... Again. Please + report any issues with hair, facial hair, lipstick and such. + - refactor: Species speed is now stored in bodyparts. Leg transplants from slower + species will make you slower. + - bugfix: Healthy tongues will no longer randomly start slurring + - refactor: A significant species refactor happened, report any issues on the github. + DATA-xPUNGED: + - rscadd: Added butter slices, which you can make by cutting butter into 3. + - qol: Recipes that once required butter now only require a slice of it. With the + exception of the butter on a stick, of course. + - balance: Butter now requires 25 milk to mix and has 3 times as much nutriment. + - image: Resprited butter and butter on a stick using bluespace technology, managing + to compress more butter into a smaller space + Ghommie: + - bugfix: Fixed snatcherprods potentially giving held objects a one-way ticket to + nullspace if thrown at someone by something that's not a mob. + LemonInTheDark: + - balance: Duffelbags will now only make you slow while they are unzipped. As a + tradeoff, you now need to stand still and zip/unzip them to access their contents/not + move real slow. + Melbert: + - bugfix: Fix Debug verb "Spawn full crew" + - bugfix: Fix everyone being vampires + Sealed101: + - bugfix: fixed RPD switching layers on mousescroll when not in active hand + - qol: installing an RPD wrench upgrade & reprogramming a pipe via RMB produces + a balloon alert + Seven: + - bugfix: Fixes changelings not being put into their headslug when using last resort + - bugfix: Fixes changeling headslugs not putting their eggs into dead bodies + Singul0: + - bugfix: Names for Interdyne pirates are now less bizzare + Youtubeboy139: + - image: Added new Police Whistle sprites + oranges: + - balance: Ashlizards can no longer use the shuttle console to go on station +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml index fedc5f886ad..61e7c79065c 100644 --- a/html/changelogs/archive/2023-07.yml +++ b/html/changelogs/archive/2023-07.yml @@ -1,4 +1,5 @@ 2023-07-01: +<<<<<<< HEAD LT3: - qol: Context tooltip size increased - bugfix: Fixed remnants of old maptext code on various things @@ -62,6 +63,18 @@ - qol: people now lie down when buckled to surgery tables, and you no longer need cuffs to buckle someone to a surgery table - bugfix: Names for Interdyne pirates are now less bizzare +======= + Cheshify, Kinnebian, and RedSentry27: + - rscadd: Maintenance engineers have sent out blueprints across the sector for a + new laser musket. + - admin: A new energy-gun toting ERT is available to send to the crew. + Jacquerel: + - bugfix: Actions granted by equipped or held items now actually appear again + LT3: + - qol: Context tooltip size increased + - bugfix: Fixed remnants of old maptext code on various things + MTandi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Food and pills have a 10% chance to infect with one of three new diseases on consumption when left for more than 5 seconds on the floor. You can wash it to avoid disease. ChemMaster and Pill Press are added to the list of elevated @@ -75,6 +88,7 @@ rule too. - qol: Crafted food items spawns on nearby tables (except the one behind you) instead of dropping on floor when hands are full. +<<<<<<< HEAD - rscadd: You can now revive dead fishes, bees and (mindless) mice with a lazarus injector. - balance: Tom, the mouse, no longer counts toward the mice population cap. @@ -107,10 +121,18 @@ Tattle: - admin: build mode help text is in an examine block - admin: adv build mode and fill now have item previews +======= + SyncIt21: + - bugfix: jetpack modules work on mod suits again + - bugfix: jetpack cyber implants also work + - refactor: removed `get_mover` callback, user is retrieved during activation + - refactor: timestop module on `on_module_triggered()` accepts user as 2nd param +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vekter: - balance: Increased armor penetration on xenos' neurotoxin spit. Well-protected crew members should still take more than a few hits to down but shouldn't be immune to it. +<<<<<<< HEAD - bugfix: Fixed the ORM not granting mining points if you added ore by hand instead of dumping it on the floor. larentoun: @@ -324,6 +346,9 @@ Melbert: - rscadd: The Atrocinator will now flip you even more. SkyratBot: +======= + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Coroners are now Morbid! - rscadd: Coroners come with a series of special tools that are especially good at performing certain surgeries if used by a Morbid individual (which the coroner @@ -340,6 +365,7 @@ The rewards from the graveyard are now also slightly more lucrative...if you don't care about being cursed, that is. - balance: Roboticists get secure morgue access during skeleton shifts +<<<<<<< HEAD - bugfix: arrows can now be actually coated with reagents. - bugfix: jetpack modules work on mod suits again - bugfix: jetpack cyber implants also work @@ -349,6 +375,155 @@ - bugfix: You can once again directly place patients on operating tables - bugfix: Creampies no longer float above the heads of monkeys - rscadd: You can now put sandstone bricks in pillows to... make them deadlier? +======= + timothymtorres: + - qol: Add hotkeys to APCs for AIs and borgs. Toggle environmental (ctrl + shift), + toggle lighting (shift), toggle equipment (alt), and toggle breaker (ctrl). + - qol: Remove APC UI popup when using RMB to toggle the lock. +2023-07-02: + ChungusGamer666: + - bugfix: Hair and facial hair gradients work again now + - bugfix: Facial hair colors apply properly again + - bugfix: Admin spawned characters will get hair color preferences applied properly + Ghommie: + - bugfix: Fixed the office chair being silent. My bad. + JohnFulpWillard: + - balance: Jousting now works on anything you're buckled to, not just Cyborgs. + - balance: Brooms, Pitchforks, the Captain's Sabre, and Energy swords can now be + used for jousting. + - balance: Spears need to travel a longer distance to joust now. + - balance: Jousting's knockdown and damage now only gets stronger after you've traveled + the minimum tiles needed to joust. + - balance: Silicon now only know Common, Uncommon and Robotic languages. + JupiterJaeden: + - qol: people now lie down when buckled to surgery tables, and you no longer need + cuffs to buckle someone to a surgery table + LemonInTheDark: + - bugfix: Fixes some fuck with duffelbags, them not holding enough + issues with + spawning gear in them (job shit and all) + - rscdel: Removed language encryption keys from cargo, s bad for species talking + among each other, a thing we want them to do + LovliestPlant: + - rscadd: Stethoscopes may be used on the chest, groin, or extremities to assess + organ damage, blood level, and/or suffocation damage depending on the targeted + area. + - rscadd: Shining flashlights into the mouth or eyes of other players will additionally + assess brain health, suffocation damage, and/or blood level depending on the + targeted area. + - balance: Halves the duration of the flash effect from shining lights into players' + eyes (2s -> 1s). Use combat mode to get the full duration. + Melbert: + - qol: Sivlerscale Tongue action is now a cooldown action, making it significantly + easier to use + - balance: Buffed the silverscale statue every so slightly, it now has innate armor + and can reflect lasers shot at it. But it also requires you not by lying down + to activate. + - bugfix: Fix organ damage being uncapped + Pickle-Coding: + - bugfix: Fix hypernoblium formation gas reaction rate sanity clamping not accounting + for the reduction factor. + - bugfix: Fix N2O formation gas reaction rate clamping clamping for incorrect consumption + rates. + - bugfix: Fix BZ formation reaction rate sanity clamping not accounting for N2O + decomposition factor. + - spellcheck: Improves gas monitor reaction information RP. + Sealed101: + - bugfix: fixed shotguns not clearing their "mag" correctly + - bugfix: fixed basalt turfs remaining visually dug up when refilled by an ash storm + - bugfix: fixed ash storm ending sounds looping after the storm is over + - bugfix: mechs are now snow storm immune + - bugfix: jaunt spells protect from weather when jaunting + Seven: + - bugfix: Cult communion and assert leadership can be used while your hands are + blocked or you are immobile + Vekter: + - balance: Adds a build time to window types which didn't have ones before. + - bugfix: Fixed the ORM not granting mining points if you added ore by hand instead + of dumping it on the floor. + carshalash: + - balance: We are now using space Monsanto brand rice/wheat seeds. Nutriment of + both grains has been changed to 12% from 4% +2023-07-03: + Cheshify: + - bugfix: Frontier Militia only have one general now, and have headsets. + - balance: Frontier Militia no longer have energy pistols. + Helg2: + - bugfix: Crayon suicide now properly colors you. + - bugfix: You can't put spraycans in crayon box via opening it and putting directly + in slot as intended, but balloon alerts for mime's and rainbow crayons are gone. + - qol: '"empty" balloon alert no longer appears on crayons.' + - qol: You can make crayon burgers now. + - qol: Box with throwing weapons now can hold the items it spawns with. Incredible! + - admin: Boxex of materials, debugtools and stabilized extracts now 99 of total + storage because they are meant to be debug. + Jacquerel: + - bugfix: Placing a mouse inside your chef hat will once more allow it to pilot + you around. + - rscadd: A player-controlled mouse inside your chef hat can compel you to perform + complex actions, such as flipping and spinning. You will obey because the mouse + knows better than you do. + - bugfix: You can now correctly Tend Wounds on most non-human animals. + - rscadd: You can now Remove Implants from non-human animals, just in case Ian swallowed + a macrobomb. + - bugfix: Tom will now always be a brown rat, instead of a random colour, as intended. + - rscadd: Budget cuts can sometimes effect the station's supply of Emergency Bluespace + Shelters. + Melbert: + - bugfix: Fixes a runtime from people with aphasia trauma getting deleted + - rscadd: Added a new 0 cost passive changeling ability, the Defibrillator Grasp. + - rscadd: DNA sing is now no longer innate, but 0 cost, allowing changelings to + not take it if they don't plan on using it. + - rscadd: Adds the Roach infusion to the DNA infuser. Do you want to survive a nuclear + apocalypse? Visit genetics today. + - rscadd: Adds a way to kill Roaches without splatting them. Visit botany for a + spray bottle of pestkiller. + - qol: Infuser book is more book-like + - bugfix: DNA infuser correctly gives on-success feedback messages + Time-Green: + - bugfix: urinal cakes wont decay anymore + Vekter: + - balance: Increased blob tiles' resistance to lasers to compensate for the recent + buff to laser damage. + - spellcheck: Fixed a typo on the Interdyne shuttle. +2023-07-04: + FlufflesTheDog: + - bugfix: Morbid (coroner's) tools now properly receive their speed boost in appropriate + conditions + Funnytoilet: + - qol: Matches command envirosuit helms' armor value with their hat counterparts. + GPeckman: + - qol: The health analyzer will now be more clear about how to treat burn wounds, + especially seriously infected ones. + Iamgoofball: + - bugfix: Fixes oversight with the voice disable config not working right for situations + in which a player re-enters their mob. + Jacquerel: + - bugfix: Horrid organics will no longer be made happy when mechanical chaplains + fail to heal them with a bible. + - bugfix: Lesser Form monkeys no longer maintain the name of the form you had prior + to transformation. + MMMiracles: + - bugfix: Tramstation lower Science is now less prone to cave-ins from their surrounding + maintenance corridors. + SyncIt21: + - code_imp: mat per unit values of materials now scale with material defines + Teleported-Bread: + - bugfix: Tips now mention telekenesis dusting you when used on the SM, not telepathy. + Vekter: + - rscdel: Plasma objects (statues, toilets, etc.) no longer explode when ignited. + They just release plasma like everything else plasma. (This doesn't impact injecting + plasma into cells or dipping cigars in plasma, those still explode.) + - bugfix: Removed nebula vomiting from the normal symptom pool. It should no longer + appear on regular viruses. + itseasytosee: + - spellcheck: You should see a lot less "you can not move while bucked too X" messages + where they don't make sense. + - admin: Added a petrify smite. Try it out on your least favorite player! + mc-oofert: + - rscadd: You can use cable on TTVs to make them wearable on the back +2023-07-05: + Archimus12: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds coloured large scarfs and winter coats to ClothesMate and black shoes to ChefDrobe - rscadd: Adds latex gloves to SciDrobe, ChemDrobe and GeneDrobe and nitrile gloves @@ -358,6 +533,7 @@ - rscadd: Adds grey backpack, grey satchel, leather satchel and grey duffel bag to CargoDrobe - rscadd: Organises Drobes +<<<<<<< HEAD Vishenka0704: - bugfix: fixed age restriction reason - bugfix: Added a forgotten reason for not being allowed to work if the age is low. @@ -431,12 +607,108 @@ ATHATH: - qol: Emagged organ harvesters will no longer refuse a victim that has items on their person, such as the handcuffs they've been bound with. +======= + ChungusGamer666: + - bugfix: Bodyparts that should slow you down, will slow you down. + Ghommie: + - sound: Walking on conveyors, catwalks and tables no longer plays the footstep + sound of the turf. They have theirs. + Jacquerel: + - balance: Traitorous Coroners can now purchase the Evil MMI and Brainwashing Surgery + Chip. + - balance: Traitorous Chief Engineers can now purchase the Deployable Sentry. + Jolly: + - bugfix: '[MetaStation] There is no longer a random nondescript "item" outside + Xenobiology. No, it was NOT a Xenomorph.' + MTandi: + - bugfix: Plant bags now properly harvest items when you click on hydrotray with + it, and don't pick up anything except the harvest + - bugfix: Carpellosis gnashing checks owner's teeth availability instead of the + target's teeth + - bugfix: Patches don't have a message saying that they're dirty + Melbert: + - bugfix: Fixes some species / mobs keeping an understanding of galcom despite not + being intended to. + - qol: Prettied up the morgue of Deltastation + Momo8289: + - qol: Crates that come in the cargo shuttle now have the order ID in their name + - qol: Requisition forms are now blue, and named with the timestamp they were created + on + Time-Green: + - bugfix: abductors can get points again + YehnBeep: + - rscadd: Prisoners can now be jaywalkers + - qol: reordered a crime so it appears on the choice list alphabetically. + carlarctg: + - balance: Reduced the complexity cost of a lot of MODules. + - balance: Pathfinder 2 -> 1 + - balance: Tether 3 -> 2 + - balance: Temperature Regulator 2 -> 1 + - balance: DNA lock 2 -> 1 + - balance: Health analyzer 2 -> 1 + - balance: Sonar 2 -> 1 + - balance: Microwave beam 2 -> 1 + - balance: Drill 2 -> 1 + - balance: All visors (including NV and thermals) 2 -> 1 + - balance: Circuit Adapter 2 -> 1 + - balance: The Mining MODsuit has had its complexity increased to 13 and now starts + with the eating apparatus module, with a total base complexity of 10/13 now. + - balance: The Prototype MODsuit's active slowdown has been decreased from 1.5 (!) + to 1. + - spellcheck: Fixed a type on the energy net module. + san7890: + - server: job_config.toml should now comply with reload-configuration verb, meaning + you can hot-reload the configuration from disk and have it apply ingame automatically. + - config: The documentation for setting Minimum Character Age on a per-Job basis + has been altered to be more explicit. + - bugfix: The Minimum Character Age configuration entry is now sanitized to ensure + that it's within the codebase-defined ages, since there's no (legitimate) way + to get a character outside of those ages anyways. Invalid values will log to + the config log. +2023-07-06: + ChungusGamer666: + - bugfix: Punpun has gotten properly fitting clothes for his little chimp body + - bugfix: Creampies no longer float above the heads of monkeys + DATA-xPUNGED: + - qol: Leather satchels and wallets have been issued to the offices of Head of Personnel + all across the sector. Studies suggest a fashion increase of 34% + Jacquerel: + - bugfix: A nuclear operative who is a slime will now correctly drop the disk upon + death. + - image: New directional sprites for spiderlings, with movement animations. + - bugfix: Dead spiderlings will be the same colour as they were when they were alive. + - bugfix: Tarantula spiderlings are no longer invisible, + - rscadd: People who cannot read can interact with the tram console to send it to + a random station. + NotDhu: + - bugfix: Replaced the security PDA painter in the CMO's office on Birdshot with + a medical PDA painter. + SomeRandomOwl: + - qol: Request Internet Sound now has the option to credit the person who requested + the Sound. Defaults to anonymous. + Vincent983: + - balance: Improved spacepol jumpsuit wound armor from 5 to 10 + Vishenka0704: + - bugfix: Added a forgotten reason for not being allowed to work if the age is low. + Youtubeboy139: + - image: Added new Surgery Bed sprite + milktao: + - bugfix: fixed food preferences displaying incorrectly when examining tongues +2023-07-07: + Ben10Omintrix: + - refactor: Mushrooms have been refactors, please report any bugs/unintended behavior + - rscadd: the mushroom basic mob can eat the mushroom plant to heal itself + ChungusGamer666: + - rscadd: Added Alcoholic as a negative quirk. + - rscadd: Added Hemiplegic quirk. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Hatterhat: - rscadd: A really old data disk with the MOD module designs for the status readout was recovered, and has been haphazardly hotpatched into the research networks. - rscadd: Also, the status readout module now plays a sound on death. - qol: The MODsuit health analyzer's info tab health readout can now be disabled in its settings. +<<<<<<< HEAD LT3: - bugfix: Security records no longer accept negative values for citation payment - image: Roller bed now has an inhand sprite @@ -492,6 +764,108 @@ - bugfix: Quantum relays now process, meaning DOS attacks actually function - bugfix: Music Request Credit shows CKEY instead of character name - bugfix: androids now have proper robotic organs and no appendix. +======= + Jacquerel: + - balance: Guard spider web statues despawn as the ability comes back off cooldown. + - balance: Spiderlings now only move at light speed if they're on webs, stay safe + little guys. + - bugfix: Spiders once again have random numbers after their names. + - bugfix: Mobs can once again emote (with sound) when they die. + - bugfix: Basic mobs will tell you whether they are alive if you examine them. + Jolly: + - image: The plastic spoon sprite has been nudged to appear more centered. + LT3: + - image: More maptext and font tweaks + - spellcheck: Context tooltips too small, too big... just right? + LemonInTheDark: + - bugfix: Gas, like plasma, will now properly display on multiz stations + Melbert: + - bugfix: Fixed EMPing a cybernetic heart not implanted in a body not applying effects + (stopping the heartbeat temporarily) + - bugfix: Fixed an exploit involving observers + - bugfix: Fix Tinea Luxor exposing not increasing light duration + OrionTheFox: + - qol: 'put instructions on toggling bandanas into their examines. If you didn''t + already know, it can be worn as more than a mask: use in-hand to wear as a hat, + and alt-click to wear it on your neck!' + YehnBeep: + - bugfix: Engineers can now print the non-eyewear T-Ray scanner from their department + lathe. + - qol: Scientists can also print this scanner. + atlasle: + - sound: A new ambient track will now play in space + mc-oofert: + - rscadd: rcd can make girders now + - bugfix: silicons can depower airlocks via their UI again + norsvenska: + - image: Siding now uses the correct sprite on corners and endpieces. +2023-07-08: + 1393F: + - bugfix: The cursed katana shard you can get from tendril loot no longer falsely + tells you you're not supposed to have it + BlueMemesauce: + - qol: AI VOX messages are sent over announcement instead of radio + - bugfix: AI VOX messages work properly on multi-Z stations + ChungusGamer666: + - rscadd: You can now put sandstone bricks in pillows to... make them deadlier? + - rscadd: Added colorblindness as a mild brain trauma. + - rscadd: Added two new quirks, prosthetic organ and tin man. Essentially, they + replace organs with bad bad not good cybernetic counterparts. + Ghommie: + - refactor: Replaced hardcoded "safeties" for lava, chasms and ignoring turf slowdowns + on catwalks with traits. + - balance: much like catwalks, tables and conveyors also disable turf slowdowns. + - balance: slippery turfs won't slip you when walking on a table. + - bugfix: Fixed an edge case in which a mob standing on a lava turf would be left + visually but permanently on fire if the lava is changed to another kind of + turf. + Jacquerel: + - rscadd: A bible or lighter in your suit slot, or cowboy hat on your head will + occasionally intercept a bullet. + JohnFulpWillard: + - balance: Bilingual quirk now lets you choose your language between ones given + to roundstart species. + - balance: Foreigner and Bilingual are now mutually exclusive languages. + - bugfix: Cultists promoted to Leader no longer lose their spells (rip whoever tried + saving up blood rites) + - admin: Admins can now force promote/demote people from Cult Leader if necessary. + - code_imp: Jousting now registers/unregisters properly on two-handed items. + Jolly: + - bugfix: '[TramStation] - Removed a (possibly) unused var on the barber shop doors. + Hopefully those taking refuge in the commissary wasn''t causing too many issues.' + Jolly, timothymtorres: + - code_imp: 'Jolly: Armories across all maps have been tweaked slightly. Report + to a Nanotrasen security advisor for any missing guns, armor, helmets or anything + else that was there previously (that means, post an issue on Github if theres + an issue!!)' + - code_imp: 'timothymtorres: Random item spawners now support better control of + their X/Y pixel offset.' + Melbert: + - bugfix: Fix certain emote interactions happening twice at the same time + - bugfix: Fixed some hard deletes involving constructed cyborgs + - bugfix: Cyborgs with nodrop hats no longer lose them on tip + - refactor: Refactor of connections.js. Yeah that's it. + Toastgoats: + - rscadd: Adds the Lustrous, ethereal pirates in a big bluespace geode! + - sound: Unique scream sound for the Lustrous species. + - image: Unique head icon for the Lustrous species. + Youtubeboy139: + - image: Added new HUD sprites + - image: Added new Goggle Sprites + - image: Added new NVG sprites + - image: Removed unused/depreciated sprites in `glasses.dmi` + carlarctg: + - bugfix: Serrated bone shovels can be created with any kind of shovel now, not + just a spade (???) + - rscadd: Serrated bone shovels can be used in place of circular saw in most surgeries. + - rscadd: Added a duller (still deadly) variant of the serrated bone shovel as coroner + mail. + - rscadd: Autopsy scanners now act as advanced health analyzers on dead and seemingly-dead + people. + - rscadd: Increased the force, throwforce, and wound bonus of inert ritual knives + and scythes. + - rscadd: Coroner gloves can quickly apply medicine like nitrile gloves. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Heavily reworks and resprites first aid analyzers. They now display if they're happy, sad, angry, or warning you! Also a 'pricking' animation. - rscadd: First aid analyzers are now found in all basic and specialized medkits. @@ -507,6 +881,7 @@ - bugfix: Fixed a dummy parent feature of the health analyzer (Verbose mode) showing up, uselessly, on the disease and first aid subtypes. - image: Surgical processors and slime scanners have recieved a similar resprite. +<<<<<<< HEAD - server: job_config.toml should now comply with reload-configuration verb, meaning you can hot-reload the configuration from disk and have it apply ingame automatically. - config: The documentation for setting Minimum Character Age on a per-Job basis @@ -750,10 +1125,67 @@ jukebox songs included in their config. SkyratBot: - bugfix: roundstart exodrone consoles are now unscrewable. +======= +2023-07-09: + DATA-xPUNGED: + - qol: It has been issued brand new mini-fridges for our active stations, Featuring + more booze and less moldy pizza! + - rscdel: Removed excess ID boxes on HoP's office + Fikou: + - balance: nightmare vision goggles give you night vision + Imaginos: + - image: A new sprite for oeprating tables + Melbert: + - bugfix: Fix hard deletes that brick all of a wizards spell when their body is + delted + - rscadd: The Atrocinator will now flip you even more. + Rhials: + - bugfix: The organ manipulator menu will now delete implants or organs that fail + to properly insert. + - code_imp: The organ manipulator menu code now looks nicer :) + YehnBeep: + - qol: Produce consoles now have tables near them. + YesterdaysPromise: + - rscadd: Added Interdyne ModSuits for Interdyne pirates. +2023-07-10: + DATA-xPUNGED: + - qol: The Warden's locker now has a garment bag + Fikou: + - bugfix: service borg apparatus now works on stoves and griddles and ovens + - qol: borgs can now activate stoves and griddles + - rscadd: rnd can research a cookbook for service borgs + FlufflesTheDog: + - bugfix: You can once again directly place patients on operating tables + Jacquerel: + - rscadd: Golems can scoop sand (or snow) off the floor by clicking on it. + Nimowa: + - bugfix: Fully charged APCs will now actually be fully charged, instead of nearly + empty. + Riggle: + - spellcheck: fix suspicious_logins + Youtubeboy139: + - image: Added new Security Cap sprite + distributivgesetz: + - spellcheck: Fixed some underscores in spiderling names. +2023-07-11: + ATHATH: + - qol: Emagged organ harvesters will no longer refuse a victim that has items on + their person, such as the handcuffs they've been bound with. + CRITAWAKETS: + - bugfix: Hereditary Manifold Sickness, and other uncurable diseases, have been + found to no longer disappear upon miraculous acts of divine restoration. In + addition, viral bonding no longer makes you into a carrier for those aswell. + ChungusGamer666: + - rscadd: Nightmare vision goggles now give you mare vision + - bugfix: Creampies will no longer irreparably stain your face + Ghommie: + - bugfix: Fixes venomous projectiles for real, and invisible arrow sprites. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added cardboard IDs to the game. They can be crafted with a cardboard sheet and wirecutters and modified with a writing tool. While worn, these will modify the visible name of the wearer just like actual IDs, though they aren't real IDs and won't work as such. +<<<<<<< HEAD - bugfix: Frontier Militia only have one general now, and have headsets. - balance: Frontier Militia no longer have energy pistols. - qol: CTF has more reminders of how to capture flags. @@ -761,6 +1193,54 @@ - bugfix: Ventilation clog no longer spawns mobs in inappropriate places - bugfix: Fixes holy arrows being invisible. - rscdel: The Head of Personnel no longer spawns with an ID box. +======= + Helg2: + - bugfix: androids now have proper robotic organs and no appendix. + - bugfix: snakes, security, spiders and skeletons phobias now properly react on + mobs + Jacquerel: + - rscadd: AI-controlled spiders will make more web-shaped webs. + JohnFulpWillard: + - qol: Clear PDAs now has all themes in their themify app by default. + Melbert: + - bugfix: Fix ling revival for full-dead lings + - refactor: Refactored language holders, making species changes not delete all of + your known languages + Seven: + - balance: Only 2 smugglers satchels will spawn on the station at roundstart, down + from 10 + TerraGS: + - bugfix: The military surplus trader encountered by explorer drones will now correctly + ask for armor rather than "suit" + Time-Green: + - balance: Metalgen cannot spawn as a random chem anymore (strange seeds, maintpills + etc) + carshalash: + - bugfix: ' Infinite spider eggs are no more.' + cnleth: + - image: Engineering scanner goggles are now yellow and not green when in meson + mode + - image: Atmospheric thermal imaging goggles are now green + mc-oofert: + - bugfix: morgue units can no longer hold ghosts + - bugfix: Cake cats/butter bear now grab the ghost of the brain used in their making + nikothedude: + - bugfix: Quantum relays now process, meaning DOS attacks actually function + san7890: + - admin: If a circuit component outputs a radio signal, it should now be logged + in list-signalers. +2023-07-12: + Ben10Omintrix: + - bugfix: the fortunate cookie dont dropped a empty paper anymore. + FlufflesTheDog: + - bugfix: Destroying the fabled "green text" now properly releases its victims from + their curse. + Helg2: + - bugfix: warden has his garment bag in locker as should + Jacquerel: + - bugfix: Guard spiders can now only make one scary duplicate of themselves at a + time, rather than as many as they can click on the button. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: PAIs can no longer be inserted into Bots - rscadd: Bots can now have their sapience toggled by anyone with access to their settings panel @@ -769,12 +1249,23 @@ - qol: Bots, Regal Rats, and Cargorilla now appear in the Spawners menu if you are dead - qol: Bots can be renamed from their maintenance panel +<<<<<<< HEAD - bugfix: Intern returns misplaced droppers back to deltastation's xenobiology lab. +======= + - bugfix: Bile/Vileworms now have the same projectile and thrown weapon resistances + of other mining mobs. + Melbert: + - qol: You no longer fall over when you get dusted, making the animation line up + with your body + - bugfix: Fixes Aphasia being removed + Singul0: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: IRS jacket is now back in the clothesvend - rscadd: Ports breaching shells from beestation - rscadd: Space IRS has been added into the heavy weight pirates spawn pool - code_imp: Mosin nagant ammo boxes is now a subtype of regular ammo boxes (the toolbox subtype) +<<<<<<< HEAD - bugfix: Metalgen recipe generation works again - rscadd: 'New malf ability: Remote safety overrides. Allows the AI to remotely emag things it has access to.' @@ -834,10 +1325,131 @@ - bugfix: Punpun has gotten properly fitting clothes for his little chimp body - code_imp: AI cards should react more snap-ily to having their occupant perish SkyratBot: +======= + StaringGasMask: + - qol: Now plasmamen can use the infiltrator MODsuit without having their species + revealed. The helmet's still not sealed, so remember your mask. + Tattle: + - qol: changed mouth blocked message to a balloon alert + Thunder12345: + - bugfix: Autorifle magazines are now visible in the security techfab's ammunition + category. + YehnBeep: + - spellcheck: Fixed typos in the descriptions of the mRLD and RTD as seen from protolathes. + YesterdaysPromise: + - image: added sprites for different variants of scrolls. + - image: modified couple posters with ghost pixels. + lizardqueenlexi: + - refactor: Foxes are more crafty now. They will run from danger, and hunt small + prey when no one is keeping an eye on them. Don't leave Renault alone with Ian! +2023-07-13: + Hatterhat: + - qol: When a MOD fails to store something in itself when retracting, you're now + notified in both the chat and by a balloon alert. + Helg2: + - balance: Rocket launcher's backblast doesnt ignore armor now. + - bugfix: eating mime's and rainbow crayons now properly transfers reagents. + - bugfix: I somehow fixed the amount of reagents in crayons to what it was before. + LT3: + - image: Roller bed now has an inhand sprite + - bugfix: Security records no longer accept negative values for citation payment + Melbert: + - rscadd: You can now wear multiple accessories on your uniform at once (up to five + by default) + - balance: Removed armor from accessories, and nerfs the effects of some accessories. + SomeRandomOwl: + - bugfix: Music Request Credit shows CKEY instead of character name + Timberpoes: + - rscdel: Revolution has been reverted back to old behaviour. The round once again + ends when the revolution is successful. The round continues as normal if the + revolution fails. + - rscadd: When the station is rolled in a state of Post-Revolutionary Fervor, the + Captain will find their bedsheets replaced with an anti-Nanotrasen variant. +2023-07-14: + Archimus12: + - rscadd: Adds latex gloves and medical headsets to the MediDrobe. + - rscadd: Adds pyjamas, nightcaps and white shoes to the ClothesMate. + - rscadd: Adds science backpack, duffel bag and satchel to the RoboDrobe. + BlueMemesauce: + - bugfix: Removed initial 500 point balance on mining point transfer cards. Load + them up with points instead. + - rscadd: Added mining point transfer cards to mining lockers. + - rscdel: Removed mining point transfer cards from mining equipment vendor. + Helg2: + - rscadd: You can now swab plasmaman clown clothes to get clown microbes. + - rscadd: Clown phobia makes you fear plasmaman clown's gloves and helmet. + Jacquerel: + - refactor: Goliaths now use the Basic Mob framework, please report any unusual + behaviour. + - rscadd: Goliaths learned a couple of new attacks which they will use in self-defence. + - balance: Help-clicking a miner grabbed by Goliath tentacles will immediately free + them, as will the effect of several items you can scavenge from around Lavaland. + - image: New sprites for the Goliath saddle. + LT3: + - bugfix: Maptext should now properly show superscript characters when performing + actions + Sealed101: + - qol: Lobby Menu buttons can now be collapsed. Rejoice! + - qol: Lobby Menu buttons have names, which can be seen in the prompt on the bottom + left of the viewport. + - qol: you may see your readiness status during pre-game in the Status Bar. + - qol: Reset Lobby Menu HUD verb added in case you manage to break the damn thing. + Vekter: + - rscadd: Adds support for it/its pronouns. You can select these in character preferences. + nikothedude: + - bugfix: Deployable turrets no longer runtime when firing + - qol: APCs, fire alarms, and holopads now communicate some more of their silicon + interactions via screentips. + - qol: APCs, fire alarms, holopads and turret control panels now use balloon alerts + for more of their notifications. +2023-07-15: + ATHATH: + - bugfix: Simplemobs that can't take stamina damage, including mulebots, will no + longer be reset to their default speed whenever they take damage or are healed. + Ben10Omintrix: + - refactor: paper wizard have been refactored, please report any bugs/unintended + behavior + - refactor: refacted the datum/elememt/trial to an bespoken element + - rscadd: paper wizard now have effects when he walking and he will now go and look + for paperes and write stuff in them + Melbert: + - qol: Changeling Emporium is now sorted alphabetically. + - qol: Changeling Emporium now has a search bar! + - bugfix: Ling Augmented Eyesight now no longer causes you to lose the effects of + your Meson glasses + - bugfix: Ling Augmented Eyesight now more consistently tracks the flash protection + / vulnerability it confers. + - bugfix: Fixes a runtime from clientless mobs listening to Jukeboxes + - bugfix: Fixes some potential hard-dels from Jukeboxes + - qol: Jukeboxes now start with "title3.ogg" loaded for servers which do not have + jukebox songs included in their config. + NotDhu: + - bugfix: Added missing telecomms monitoring consoles to Birdshot. + Rhials: + - qol: The Xenomorph Infestation orbit menu tab is now violet instead of red! + Striders13: + - code_imp: Admins can now choose the reward cursed slot machine gives when hitting + jackpot. + VladinXXV: + - qol: You can now rename the coroner's skeleton model with a pen! + - bugfix: Autopsy reports will now correctly report blood type and level for corpses + who happen to have blood for blood. + generalthrax: + - balance: Lionhunter on charge now has a damage modifier of 2 instead of 1.33 + - balance: Increased max range of charged shot from 16 to 30 + - balance: Increased scope modifier so you can use the new max range +2023-07-16: + DATA-xPUNGED: + - rscdel: The Head of Personnel no longer spawns with an ID box. + Helg2: + - bugfix: roundstart exodrone consoles are now unscrewable. + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Personal AI holograms are now limited to an area around their PAI card. The size of this are can be configured via the PAI card. - rscadd: pAI cards can now be placed inside bots in order to grant them control of the bot. +<<<<<<< HEAD - qol: in the event the Gravity Generator becomes damaged, examining the main part will now give repair hints! - balance: Pyre Sect can now heal with their bible as normal. @@ -864,6 +1476,27 @@ of additive - qol: laser muskets' inhand sprites will show now whether or not they are charged - image: new inhand sprites for the laser muskets +======= + JohnFulpWillard: + - rscadd: The 'Sent from my PDA' message is different for Clear PDAs now (specifying + they are crystal). + - bugfix: Chaplain armor no longer blocks being shoved down. + LemonInTheDark: + - bugfix: The preference menu has had its weird index lowered (Assets are no longer + semi garbled) + Melbert: + - bugfix: Anti-magic visual effects will no longer trigger overtop one another + Thunder12345: + - qol: CTF has more reminders of how to capture flags. + Time-Green: + - bugfix: Metalgen recipe generation works again + Watermelon914: + - balance: Changed damage reduction for robotic limbs to be multiplicative instead + of additive + carshalash: + - bugfix: Intern returns misplaced droppers back to deltastation's xenobiology lab. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Stops manifest generation runtiming when a cargo crate is empty. - rscadd: Abandoned crates are now available via cargo imports. - rscadd: Dumpsters full of maintenance trash are now available via cargo imports. @@ -879,6 +1512,7 @@ - balance: Buffed both the shocktrooper and special op crate. Shocktrooper now has an armored helmet and vest, and special op now has 5 mirage grenades and a chameleon belt. The survival knife in the special op crate is now a switchblade. +<<<<<<< HEAD - bugfix: The AI can no longer untip vendors remotely/spam sparks from shocked vendors - bugfix: Emotes now respect word filters. - bugfix: Fixed the AI vox announcement interrupting every other sound being played. @@ -1018,10 +1652,70 @@ - rscadd: 'New air alarm mode: Vent siphon, which disables scrubbers and forces vents to siphon air with no pressure regulation' - bugfix: Cryo cells no longer appear on when off. +======= + - bugfix: Fixes holy arrows being invisible. + nikothedude: + - bugfix: Ventilation clog no longer spawns mobs in inappropriate places + - rscadd: 'New malf ability: Remote safety overrides. Allows the AI to remotely + emag things it has access to.' + - code_imp: emag_act() now returns a boolean designating it's success in emagging + - code_imp: All instances of emag_act() now have the proper arguments + - qol: Most usecases of emagging now have some kind of feedback, and existing feedback + has been sanity checked and converted to balloon alerts. +2023-07-17: + DATA-xPUNGED: + - balance: Pyre Sect can now heal with their bible as normal. + - qol: Some of Pyre Sect's rituals have been shortened slightly + Donglesplonge: + - bugfix: replaces icebox genetics' regular science headset with a medisci headset, + making it more in line with other genetics offices + Helg2: + - bugfix: Onehuman and Freeform ai modules now have proper material prices. + - qol: People with deviant tastes now don't care about dirt on the food. + - bugfix: fixed energy cost on floor tiles for engi borgs. + - bugfix: engi borgs can now properly merge base floor tiles with other base floor + tiles. + Jacquerel: + - bugfix: Station traits can once again allow vending machines and bots to speak + a random language + - bugfix: EMPed bots and vending machines once again speak a random language + - bugfix: Carp, Trees, and Festivus Poles will once more sometimes emote at you + if they think you are looking at them the wrong way, before they come over to + beat you up. + JohnFulpWillard: + - refactor: Huds now have their hud owner set in Initialize + Melbert: + - code_imp: AI cards should react more snap-ily to having their occupant perish + OrionTheFox: + - qol: in the event the Gravity Generator becomes damaged, examining the main part + will now give repair hints! + Timberpoes: + - bugfix: Emotes now respect word filters. + Watermelon914: + - bugfix: Fixed the AI vox announcement interrupting every other sound being played. + itseasytosee: + - rscadd: A new traitor item has been added, Polarized Contacts! + necromanceranne: + - code_imp: Adds an opt out for the rest of the round for the various heretic summons. + nikothedude: + - bugfix: The malf AI emag ability now works + - bugfix: The AI can no longer untip vendors remotely/spam sparks from shocked vendors + vinylspiders: + - bugfix: transformed jellypeople with the blood deficiency quirk will now receive + the right bloodpacks as mail goodies + - qol: laser muskets' inhand sprites will show now whether or not they are charged + - image: new inhand sprites for the laser muskets +2023-07-18: + BlueMemesauce: + - bugfix: Abductor posters can no longer randomly spawn + - spellcheck: Fix duplicate sentence in space comms agent flavor text + CRITAWAKETS: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the smoothbore disabler and it's prime variant. You can now craft a disabler with only one shot and terrible accuracy. - code_imp: Gun cranking has been made a component and could theoretically be used on more than guns. +<<<<<<< HEAD - image: .50 incendiary magazine now has sprite. Tattle: - spellcheck: Fixed the grammar on a few revenant messages @@ -1051,6 +1745,12 @@ Improvedname: - bugfix: Brings security berets down to softcap armor values also softcaps get wound armor +======= + Jacquerel: + - bugfix: Megafauna can be consumed by the singularity. + JohnFulpWillard: + - bugfix: Multi-z maps should now work again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Adds a new 7 point positive quirk, "Spacer Born". You were born in space, and as a result your body's adapted to life in artificial gravity, making you @@ -1058,6 +1758,7 @@ is quite a chore, especially if you're assigned to work there. - rscadd: 'Adds a chemical: Ondansetron, created by Oil + Nitrogen + Oxygen + Ethanol catalyst. A powerful Antiemetic (lowers disgust).' +<<<<<<< HEAD - bugfix: Once again you can award people medals. Sapphoqueer: - bugfix: fixes a bug where borgs and TK users could effectively break ID's by removing @@ -1085,6 +1786,98 @@ - rscadd: Added angle lighting, applies it to most wall lights! - rscadd: Adds a lighting prototyping tool, mappers go try it out (it's locked behind the mapping verb) +======= + - refactor: Refactored display-ing of antag objectives in their UIs + Rhials: + - spellcheck: removes an errant period from the flux anomaly announcement. + Time-Green: + - bugfix: Triple carp player controlled shuttle event works again + - bugfix: anti-breach shields wont be dragged away during shuttle flight anymore + carlarctg: + - rscdel: There is no longer a 50% chance of catching a heretic out when examining + them drawing influences. + dieamond13: + - bugfix: adds a BCI implanter to northstar circuit lab as it didn't come with one + before + itseasytosee: + - balance: the Syndicate Tome traitor item now grants anti-magic while held and + can be used to clear cult runes. + necromanceranne: + - bugfix: Replaces direct calls of try_infect() with appropriate procs so that CRISPR + and Miasma aren't forcing diseases on the disease immune. + sergeirocks100: + - spellcheck: A spelling error in the name of the Tiziran fish case has been corrected. + timothymtorres: + - rscadd: Add healing boost to organs while mob is sleeping (does not apply to robotic + or dying organs) +2023-07-19: + Ben10Omintrix: + - refactor: the penguin is a basic animal + - rscadd: the penguin now layed eggs + - rscadd: the penguin and the chicken babys will go look for adult penguin or chicken + and be happy when he is near the adult + CoiledLamb: + - image: updated most tank sprites. + DaydreamIQ: + - spellcheck: Maints fridge doesn't have _ in its name anymore + Donglesplonge: + - bugfix: replaces the unspawnable cannonballs in birdshot maintenance with a stack + so that the 4 cannonballs properly spawn, make sure to point them away from + medical! + Melbert: + - bugfix: Cyborgs no longer drop their radio key when deleted, only when deconstructed + first + - bugfix: Cyborgs no longer drop their MMI on deletion, only prior to deletion. + This may result in bad code rearing its ugly head, open an issue report on the + github if you're a cyborg and get ghosted when you feel like you shouldn't + - bugfix: Runtime from syndie cyborgs spawning + - bugfix: AI deaths are reported to black box + - qol: Wizard Spellbook is now alphabetized + - qol: Wizard Spellbook now has a search bar! + OrionTheFox: + - refactor: refactored some code relating to greyscale clothing - please report + relevant issues on github! + Tattle: + - spellcheck: Fixed the grammar on a few revenant messages + Vekter: + - rscadd: Added 2 new brain damage lines. Beat your skull in with a wrench and discover + them today! + coldud13: + - rscadd: You can now toggle the visibility for hair on your noggin when wearing + surgery caps. + necromanceranne: + - bugfix: Cleans up the lavaland exports to the modern loot table lists. + - spellcheck: More elaborate explanation for what exactly the sinister shard does + when you look at the explanation in the null rod selection UI. + - bugfix: Sniper rifles have a range that allows them to aim more smoothly (and + still decently long ranged) + - bugfix: Fixes a runtime on inserting the vorpal scythe into your arm. You should + now gain the Morbid trait, as expected. + scriptis: + - qol: techfabs now use sheets(TM) as the default unit of measurement + - bugfix: mechfab icons aren't perpetually gray + tommysalami3: + - rscadd: Ambient tracks for icebox. + - rscadd: Independent global_list for icebox. + vinylspiders: + - bugfix: ethereal hair will now go out when they die again + - code_imp: apc's update_icon_state proc will no longer set the icon file path +2023-07-20: + FernandoJ8: + - qol: terminals built by left-clicking on SMES and APC units will now be on the + same layer as the machine. + - bugfix: constructing a terminal on a specific layer with right-click now works + for APCs, not just SMES units + Helg2: + - image: .50 incendiary magazine now has sprite. + - rscadd: Bank machine now has a circuit for it. Spawns in secure tech storage and + researchable in the same nod as comms console. + - balance: Due to possibility of creating area and making there bank machines that + aren't roundstart will have gps signals. + - bugfix: Bank machine now doesn't yell about unauthorized credit withdrawal when + its authorized. + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: You can't possess a MULE as soon as the round starts, someone will have to give you permission. - balance: MULEbots no longer crush prone characters unless they have been hacked @@ -1092,6 +1885,7 @@ - bugfix: Bots can put numbers in their names, what with being robots. - admin: 'Adds attack logging when certain wires are cut (for instance: MULEbot safeties)' +<<<<<<< HEAD softcerv: - balance: Duffelbags will now only make you slow while they are unzipped. As a tradeoff, you now need to stand still and zip/unzip them to access their contents/not @@ -1128,6 +1922,70 @@ leaning while facing the wrong direction Thebleh: - bugfix: Fixed several APC related issues. +======= + JohnFulpWillard: + - bugfix: Cult spells, bloodsense, and pylon healing now follow cultists through + mind transfer (such as body swapping) + - bugfix: Cryo cells no longer appear on when off. + LemonInTheDark: + - rscadd: Added angle lighting, applies it to most wall lights! + - rscadd: Adds a lighting prototyping tool, mappers go try it out (it's locked behind + the mapping verb) + Nerev4r: + - rscadd: Due to increased exposure to low-gravity due to constant generator failures, + Spacer-Born have been showing up with increasingly tall statures. + Seven: + - bugfix: Xeno's corrosion ability no longer breaks reinforced walls and floors + - qol: Added some balloon alerts for failing to place items in storage containers + SirNooben: + - bugfix: Fixed the alien limbgrower UI + - bugfix: Fixed being able to order negative or more than 20 items in mining order + console + SyncIt21: + - bugfix: turbine does not runtime when its input or output turf is destroyed while + its running + - qol: add warning examine for rotor when its parts are not connected + nikothedude: + - rscadd: 'New air alarm mode: Vent siphon, which disables scrubbers and forces + vents to siphon air with no pressure regulation' + vinylspiders: + - bugfix: fixes gravity generators causing CI failures from overriding a signal +2023-07-21: + Blockaboo: + - bugfix: Tin man no longer causes you to drop all of your organs. + JohnFulpWillard: + - bugfix: '[Birdshot] Xenos can no longer immediately destroy the shield wall generator + to break out.' +2023-07-22: + CoiledLamb, RyeRice: + - image: cleans up shading on plasmatank sprite, gives it a cool new symbol. + Ghommie: + - image: walking on water will now immerse you in it... visually, at least. + Improvedname: + - bugfix: Brings security berets down to softcap armor values also softcaps get + wound armor + JohnFulpWillard: + - spellcheck: Silicons using weight machines are now told how pointless the task + was. + - spellcheck: Weight machine tooltips no longer lie about using LMB to use the machine. + Justice12354: + - qol: The word "chemical" has been removed from "chemical patch" when printing + patches + Melbert: + - bugfix: Once again you can award people medals. + Momo8289: + - qol: You can now use any hat with the hat stabilizer MOD + - bugfix: The MOD eating apparatus module now properly disables pepper spray protection + Sapphoqueer: + - bugfix: fixes a bug where borgs and TK users could effectively break ID's by removing + them from modular computers. + Sealed101: + - bugfix: fixed silicon alarm reports displaying power alarms as ALARM_ALARM_POWER + Senefi: + - rscadd: MetaStation Chemical Storage now has its own APC + - rscadd: MetaStation Chemical Storage is slightly larger than before + - rscadd: Ice Box Station Chemical Storage now has its own APC +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - rscadd: You can now lean against walls! Simply turn your back to the wall and clickdrag yourself onto it. @@ -1135,6 +1993,7 @@ straight through eachother as if they weren't even there. - spellcheck: Added more variance to item throwing text. - refactor: Mob density has been refactored +<<<<<<< HEAD 2023-07-25: Hatterhat: - balance: Base material costs for ammunition have been sharply reduced across the @@ -1165,6 +2024,30 @@ \ competing reactions while preparing or cooking" - spellcheck: Chicken nugget will have a description in the craft menu, and fiesta skewers will have a description in general +======= + jughu: + - bugfix: removed a false silly tip about blob taking damage from flashbangs + scriptis: + - rscadd: ponies +2023-07-23: + Inari-Whitebear: + - bugfix: Cable connections on various structures including electrified grilles, + APC terminals, and SMES terminals have been rectified and will shock as expected + again. + - bugfix: Gas miners draw power properly again. + JohnFulpWillard: + - qol: The TTS and TTS Blips option is now one choiced preference. + Melbert: + - rscadd: 'Wizards have a new Right and Wrong: Mass Teaching, allowing them to grant + everyone on the station one spell or relic of their choice!' + Thebleh: + - bugfix: Fixed several APC related issues. + vinylspiders: + - bugfix: fixed a bug that would cause you to be unable to lean again if you tried + leaning while facing the wrong direction +2023-07-24: + GPeckman: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Bounty pads can now be upgraded, to reduce the time until you can pick a new bounty - rscadd: Sunglasses can now be bought from cargo if you have security access. @@ -1172,7 +2055,18 @@ - rscdel: Removed shady jims bounty - qol: Bounty pads can now be screwdrivered/crowbarred with left click like every other machine +<<<<<<< HEAD - balance: Changes some cooldowns and upgrades of spells. +======= + Sealed101: + - bugfix: fixed third person throw verbs displaying as just an s + Singul0: + - rscadd: You can now use the genetic sequencer secondary click (RMB) to scan someone +2023-07-25: + ArcaneMusic: + - qol: ID cards tooltips now show how to assign a new account. + Ben10Omintrix: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the bee now can fly over the machines so its easy for him to go to the hydroponics machine - bugfix: player bees now will not be stuck inside the hive if he entered it, they @@ -1182,6 +2076,7 @@ - bugfix: now when a player interacted with the bee hive the bees will now leave the hive to defend the hive (it was glitched) - refactor: the bees now are a basic insect. +<<<<<<< HEAD Thebleh: - bugfix: South Bronx Paradise Bars are once again the best weight loss aid on station vinylspiders: @@ -1221,6 +2116,33 @@ Senefi: - rscadd: Some Metastation Medbay lights have been moved and adjusted. SkyratBot: +======= + Cheshify: + - image: Railing ends now exist. + Comxy: + - balance: Changes some cooldowns and upgrades of spells. + Hatterhat: + - qol: Ice cream vats now count as elevated surfaces for preventing germs from getting + onto germ-sensitive items (food). + - qol: Ice cream vats now dispense cones into your hands first, if possible. + - bugfix: Germ-sensitive items that fail to be placed in-hand now check for all + elevated surfaces, not just tables. + JohnFulpWillard: + - bugfix: Crates no longer stun you when you climb onto them. + Profakos: + - bugfix: Removed duplicate and incorrect Yaki Imo recipe + - qol: "Swapped out the flour in \xC6losterrm\xE6sch with two dough slices, to avoid\ + \ competing reactions while preparing or cooking" + - spellcheck: Chicken nugget will have a description in the craft menu, and fiesta + skewers will have a description in general + Sealed101: + - bugfix: fixed possessed sword spirits summoned during destruction of the sword + spawning in the error room. those fellas are in godmode, and y'all don't need + an immortal spirit haunting your station, m'kay? + Senefi: + - rscadd: Some Metastation Medbay lights have been moved and adjusted. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: items can be printed from autolathe & protolathe when the exact material amounts are present in them after upgrading - bugfix: max printable amount now shows the correct value & updates when items @@ -1241,24 +2163,55 @@ - refactor: inserting an item into the material container will display the units consumed as sheets not absolute units - refactor: removed x25 & x50 print buttons from the autolathe +<<<<<<< HEAD - bugfix: Plasmaman DNA can no longer be stolen by changelings. - spellcheck: Phobia warnings have the same glowy text now as they would in messages. - bugfix: Crates no longer stun you when you climb onto them. - balance: Mmmh, butter on a stick. Now for americanbots. +======= + Thebleh: + - bugfix: South Bronx Paradise Bars are once again the best weight loss aid on station + YakumoChen: + - bugfix: Dish drive no longer spams the bar/kitchen/etc when its idle with empty + messages. + kawoppi: + - rscdel: removed floating light fixture from the Deltastation security hallway +2023-07-26: + Melbert: + - bugfix: Prisoner slots can no longer be controlled by Plexagon HR Core. (special + things to distributivgesetz) + - bugfix: HoPs can open more assistant job slots if a non-assistant job is the overflow + role + - code_imp: Dehardcode the HR core blacklist for jobs which cannot have more slots + opened by the HoP + Mooshimi: + - bugfix: Plasmaman DNA can no longer be stolen by changelings. + Paxilmaniac: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: The mag_type variable on guns has been split between accepted_magazine_type and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their normal magazines without breaking the weapon - bugfix: Several weapons that spawned with special magazines, the riot dart pre-loaded donk pistol for example, will now be able to accept normal donksoft magazines that don't spawn loaded with riot darts. +<<<<<<< HEAD - bugfix: some fixes to spess IRS pirates. - balance: IRS armor is now bulky +======= + Rhials: + - qol: Modifies the contents of some Mafia lockers. Go check 'em out! + Singul0: + - bugfix: some fixes to spess IRS pirates. + - balance: IRS armor is now bulky + Time-Green: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Makes radiation nebula space work on high-pop by applying the radiation more directly - balance: Internal nebula storm no longer gives 10 seconds of immunity and has a very, very small chance to apply mutations - balance: Rudes nebula rad immunity from 10 seconds to 6 seconds (shouldn't differ too much since we use a different system now) +<<<<<<< HEAD - spellcheck: Head of Personnel's roundstart text now says that they should answer to the captain now instead of themselves. jjpark-kb: @@ -1273,11 +2226,41 @@ - bugfix: fixes the nitrogen breather quirk not giving the correct lungs or spawning the breathing dogtag 2023-07-27: +======= + carshalash: + - balance: Mmmh, butter on a stick. Now for americanbots. + distributivgesetz: + - spellcheck: Head of Personnel's roundstart text now says that they should answer + to the captain now instead of themselves. + - spellcheck: Phobia warnings have the same glowy text now as they would in messages. + oranges: + - balance: holodeck spawned banners no longer give the inspiration effects +2023-07-27: + Ghommie: + - bugfix: the height of runechat messages should now scale correctly with the current + size variable of living mob. + - refactor: Crabs refactored into basic mobs. They now hunt tiny critters and flee + from attackers. + - bugfix: Fixed crabs not crab-walking. + - bugfix: Fixed active conveyor belts not moving movables spawned on top of them. + Helg2: + - qol: Tactical medkits now can hold stuff it spawns with. + - bugfix: Nukie Medical Bundle now spawns with premium tactical medkit as it should. + Jacquerel: + - bugfix: Traitors can once again affix tiny bombs to lathes rather than trying + to feed them to the lathe + Kubisopplay: + - balance: Flashing borgs requires two consecutive flashes to fully immobilize + - balance: Flashed borgs can speak + - balance: Remote lockdown on cyborgs lasts 180 seconds + - balance: Cyborg stun arm works like normal baton, and costs less energy +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Consumables like bone gel will first be used for surgery before wounds Licks-The-Crystal: - qol: The "Kidnap" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping. +<<<<<<< HEAD Lunar248: - rscadd: Completely revamps Freighter ghostrole, adding a new map, while trying to keep the spirit of the original. @@ -1302,6 +2285,20 @@ - bugfix: Nukie Medical Bundle now spawns with premium tactical medkit as it should. - bugfix: the height of runechat messages should now scale correctly with the current size variable of living mob. +======= + Melbert: + - bugfix: Fixes some occasions which result in TTS messages not playing + Rhials: + - bugfix: Clown cars now properly collide with deer. + - sound: Violent, slightly glassy car impact sound. + Senefi: + - bugfix: Wired MetaStation APCs that were not attached to the station's power grid + at round start. + Time-Green: + - admin: Changing shuttle events now alerts admins + carlarctg: + - bugfix: Hulks cannot be aggressive grabbed by strong grabbers anymore +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Syndicate duffelbags can fit 2 extra bulky items, down from three. - balance: Reduced syndicate duffelbag's unzipped slowdown from '1' to '0.3', and set its zipping-up sped to 0.5, same as unzipping. @@ -1315,10 +2312,45 @@ what it can hold now. - bugfix: The parent crayon's name is 'crayon' to prevent any weirdness with things that show the parent type's name. +<<<<<<< HEAD 2023-07-28: Melbert: - bugfix: Fixes some occasions which result in TTS messages not playing SkyratBot: +======= + distributivgesetz: + - bugfix: Fixed a rare bug that let you spam bluespace bodybags everywhere. + - bugfix: Mafia chaplains can now only use their seances on dead people now. + vinylspiders: + - bugfix: fixes mobs missing most of their emissive blockers + zeroisthebiggay: + - balance: Huzzah! Interdyne Associates have finally upgraded their medborgs' firmware. + They'll now have bonesetters and bonegel available! +2023-07-28: + DATA-xPUNGED: + - bugfix: New lights have been issued to the Head of Personnel's office. + - bugfix: We've instructed our intern to no longer place the HoP's stamps UNDER + the carbon paper bin, making many think there was no stamp at all. + Ghommie: + - bugfix: Reduced the maximum allowed length for ID assignments and paintings' titles + from 1024 to 42. + Iamgoofball: + - bugfix: Removes the ability to screwdriver springlock modules to make them not + deadly because that defeats the point of the springlock module + Inari-Whitebear: + - bugfix: Determination can now actually overcome your adrenal glands, making adrenal + crisis a curable condition! + Jackal-boop: + - qol: heretic sac targets now appear on the end of round report + Jacquerel: + - rscadd: Uncollected sand and snow will be blown away by the wind when storms happen + (but don't worry, storms also allow those turfs to be freshly dug up again). + MTandi: + - refactor: Refactored MOD Suit UI + - qol: Added options to hide detailed vitals and DNA data to the MOD status module + - qol: Made MOD Ion Jetpack Module have stabilizers enabled by default + Sealed101: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: dog with a butter on 'em - rscadd: dead dog with da butter on 'em (dogs feigning death are so good at it, they appear dead to medical HUDs and other things) @@ -1329,6 +2361,7 @@ - bugfix: fixes pets not dropping their collar when gibbed - bugfix: butter don't go on Lisa and corgi puppies (Lisa won't wear hats and corgi puppies can't wear hats and back slot items) +<<<<<<< HEAD - bugfix: Some explosions should be more flashy and fiery, probably. - bugfix: Determination can now actually overcome your adrenal glands, making adrenal crisis a curable condition! @@ -1352,6 +2385,17 @@ - refactor: Crabs refactored into basic mobs. They now hunt tiny critters and flee from attackers. - bugfix: Fixed crabs not crab-walking. +======= + Time-Green: + - qol: The virologist is warned when radioactive resonance cannot be obtained + YehnBeep: + - bugfix: Fixed a floating light in Delta's bar + mc-oofert: + - bugfix: guillotines no longer runtime when logging after decapping someone if + they buckle AFTER the blade starts to drop + - bugfix: shoving a crystal down a hole no longer makes it dust itself + nikothedude: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'New malf module: Remote vendor tipping. Allows you to remotely tip a vendor in any of the 8 directions. Goofy and okay for assassinations on unaware enemies!' @@ -1363,6 +2407,7 @@ - image: turf_analysis.dmi's red_arrow now has orthogonal directions - balance: Vendors now are far less likely to gib your head or make you parapalegic - balance: Vendors now respect armor when they crush you +<<<<<<< HEAD - bugfix: New lights have been issued to the Head of Personnel's office. - bugfix: We've instructed our intern to no longer place the HoP's stamps UNDER the carbon paper bin, making many think there was no stamp at all. @@ -1378,11 +2423,42 @@ Motho: - bugfix: Nanotrasen-Brand System Cleaner has had its formula improved! Now with 100% less disgust! +======= + san7890: + - code_imp: The currently operating rust-g version on a live server is posted to + places like the runtime.log, in the same place where the revision information + and any applicable test merges already were. + vinylspiders: + - bugfix: fixes a type mismatch error with some of the phobia chat messages + volas: + - bugfix: Some explosions should be more flashy and fiery, probably. + xPokee: + - rscadd: Photophobia as a negative quirk. +2023-07-29: + DaydreamIQ: + - bugfix: Birdshot AI sat now has unrestricted exit instead of entrance + Ghommie: + - rscadd: Added a 'Vending products shortage' station trait, that randomly lowers + the availability of all vending products from vending machines on the station, + with a 1/20 chance of the vending machine itself being tilted. + Mothblocks: + - qol: pAIs now try to stay within range of their owner, and teleport back only + when necessary + - qol: Default max pAI range has been changed to the maximum range you can choose + (9 tiles) + Paxilmaniac: + - bugfix: The anomaly research ruin is no longer missing several tiles on the inside + to the void + Sealed101: + - bugfix: fixed gibtonite countdown animation interrupting clicks with the mining + scanner +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Senefi: - bugfix: Replaced 5 space tiles in the wall of the anomaly research ruin with rocks. - bugfix: Replaced the tile under the window in the mimes vs clowns ruin with plating. - bugfix: Replaced space tile in the emergency fish shuttle with plastitanium flooring. - bugfix: Removed space tiles from the exterior of some ruins templates. +<<<<<<< HEAD SkyratBot: - bugfix: fixed gibtonite countdown animation interrupting clicks with the mining scanner @@ -1441,10 +2517,42 @@ - code_imp: Splits terrain generation and terrain population in SSmapping - bugfix: Put a cap to the amount of stickers that can be sticked to an atom (12) to prevent icon-related issues. +======= + Time-Green: + - rscadd: Adds cliffs to the north of icebox. Try not to fall of of them! + mc-oofert: + - bugfix: you can no longer fireman carry to bypass puzzle doors + vinylspiders: + - bugfix: non-opaque curtains will no longer block emissives +2023-07-30: + ArcaneMusic: + - qol: Improvements to the accounting console in the HOP office. + - balance: Non-human species now receive a 90% racial paycut, up from 75%. + - balance: The inflation mechanic affecting vending machines has been removed, except + during the market crash event. + - balance: The market crash event now stands as it's own separate event, and ramps + up the cost of vendor items until finally popping and returning to normal. Market + crash now lasts longer to have more impact while it scales with time. + - image: New cargo exo-drone scanner sprites! + Ben10Omintrix: + - refactor: the bear is a basic now. please report any bugs + - rscadd: the bear will climb trees and search honey + Ghommie: + - bugfix: Put a cap to the amount of stickers that can be sticked to an atom (12) + to prevent icon-related issues. + - bugfix: Fixing some jank with the a greyscale modify menu, like inputs not being + sanitized. + Jacquerel: + - bugfix: Dismounting from a piggyback no longer allows you to phase through other + players. + - rscadd: You can now earn an achievement for completing the Grand Ritual. + - bugfix: Summon Magic and Summon Guns work again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Player-controlled bots can now play the prerecorded lines associated with that bot. - rscadd: Placing a pAI into a bot temporarily teaches that bot all the langauges the pAI could speak. +<<<<<<< HEAD - bugfix: Dismounting from a piggyback no longer allows you to phase through other players. SpaceVampire: @@ -1474,6 +2582,8 @@ no longer get bloody when you walk over blood if you are also wearing shoes. Your kilt won't be getting bloody instantly anymore, it only will if you take your shoes off! +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored chameleon actions a fair bit - rscadd: Adds outfit saving to chameleon clothes. RMB the "chameleon outfit" action @@ -1484,6 +2594,7 @@ to stealthily save their current outfit as a custom outfit to use later. And of course, it's chameleon too. - bugfix: Ethereals, the DNA lock mod, GPSs, and storage items now respect EMP protection +<<<<<<< HEAD SkyratBot: - bugfix: Using the timeline jumper MOD module updates stamina after resetting it, no more infinite stamcrits @@ -1506,3 +2617,46 @@ - bugfix: Module duplicator has cheaper costs for circuit duplication vinylspiders: - bugfix: Wings for fly persons from flight potion +======= + - balance: The "Long Shift" achievement is now feasibly obtainable, and admins can + no longer trigger it unknowingly + - bugfix: Fixes runtime from trying to put two pots on one stove. + SyncIt21: + - bugfix: some things not connecting to the ore silo round start + Time-Green: + - rscadd: Adds a Forested planetary station trait! Icebox exterior is now a forest! + - rscadd: Adds a Forever Storm planetary station trait! Sometimes, the storm never + stops. Stay inside or get some coffee and warm clothes + - bugfix: fixes stuff spawning in rivers and above chasms + - bugfix: emissive blockers on random flora not updating + - code_imp: Splits terrain generation and terrain population in SSmapping + - rscadd: Starlight will color with space gas parallax + - code_imp: Cleans up random parallax code / radioactive nebula parallax code + - bugfix: Staff of laval no longer works on space + necromanceranne: + - bugfix: Fixes revolvers losing ammo capacity when you reload them. + san7890: + - bugfix: Carbons with tails (felinids, lizards) who have that tail removed will + now have that tail actually look like it came from the person in question, rather + than just be a grey thing of sadness. +2023-07-31: + CRITAWAKETS: + - balance: The bluespace MOD storage can now hold bulky storage items (backpacks, + toolbelts) just like the bag of holding. + GoldenAlpharex: + - bugfix: Clothes equipped in the jumpsuit slot that happen to cover your feet will + no longer get bloody when you walk over blood if you are also wearing shoes. + Your kilt won't be getting bloody instantly anymore, it only will if you take + your shoes off! + - bugfix: Chat highlights now escape special RegEx characters from non-RegEx highlights. + - bugfix: Broken RegEx expressions no longer cause the chat to bluescreen, allowing + you to properly fix them. + SyncIt21: + - bugfix: Module duplicator has cheaper costs for circuit duplication + - rscadd: RPED can carry & install computer boards and complete computer frames + cnleth: + - bugfix: Using the timeline jumper MOD module updates stamina after resetting it, + no more infinite stamcrits + vinylspiders: + - bugfix: fixed a bug that would cause pAIs to be able to break their leash +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml index 06f1d4cfd36..0c08e708f78 100644 --- a/html/changelogs/archive/2023-08.yml +++ b/html/changelogs/archive/2023-08.yml @@ -1,4 +1,5 @@ 2023-08-01: +<<<<<<< HEAD Licks-The-Crystal: - spellcheck: Corrected a large quantity of spelling, grammatical and phrasing errors with Exploration Drone content. @@ -38,6 +39,55 @@ - rscadd: Add a new 'Hall of Fame' emergency shuttle. It even comes with it's own nifty photo album. - qol: When Space Dragons devour people they get extinguished, removing flames. +======= + Fikou: + - bugfix: ghost notification icons are now centered properly + - bugfix: coroner has an implant during cybernetic revolution + - bugfix: fixes wizard loadouts + Hatterhat: + - bugfix: The blood-drunk miner has remembered how to swing their cleaving saw quickly + without having to flick it out first. + Jacquerel: + - bugfix: Losing your hooded suit (whether to theft, or because you were turned + into an ape) will also cause you to lose the hood. + Licks-The-Crystal: + - spellcheck: Corrected a large quantity of spelling, grammatical and phrasing errors + with Exploration Drone content. + Paxilmaniac: + - image: Wall and floor lights have been resprited to be a lot less dated looking, + and a lot less yellow + Sealed101: + - bugfix: fixed bluespace bodybags consuming xenomorphs when folded + Time-Green: + - bugfix: fixes a runtime in SSstation setup + - bugfix: fixes parallax not rendering correctly for latejoins + Vincent983: + - spellcheck: fixed the interdyne modsuit's typoes + Watermelon914: + - rscadd: Expanded the RPG loot wizard event by giving various different items their + own statistic boost. + YesterdaysPromise: + - rscadd: Added couple new signs to the game (med, medbay, morgue, chapel, viro, + gene, botany) + - rscadd: Way-signs now have additional states, showing vertical directions. + - image: Made the font on the signs consistant. + distributivgesetz: + - bugfix: Photophobia should work now. + - bugfix: Eyes should return to their normal flash sensitivity when the quirk is + removed. + - bugfix: Fixes pAI mind transfer from a bot to their card runtiming when the bot + gets broken. + san7890: + - refactor: Slaughter and Laughter Demons have been refactored, please place an + issue report for any unexpected things/hitches. + - bugfix: Laughter Demons should now actually drop a kitten. + zeroisthebiggay: + - spellcheck: Minor Breakage > Minor Skin Breakage for readability. +2023-08-02: + DaydreamIQ: + - bugfix: Birdshot's morgue has surgical tools and a laptop for the coroner to use + Derpguy3: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Syndicate battlecruiser's fighters have received external cameras to aid its pilots. - qol: Warning lights have been added to the landing pad of the battlecruiser to @@ -49,6 +99,7 @@ has had it added. - bugfix: The Syndicate medibot on the battlecruiser can now be unlocked by its crew. +<<<<<<< HEAD - rscadd: Added couple new signs to the game (med, medbay, morgue, chapel, viro, gene, botany) - rscadd: Way-signs now have additional states, showing vertical directions. @@ -57,10 +108,24 @@ - bugfix: coroner has an implant during cybernetic revolution - bugfix: Several places on Birdshot which were missing an APC now aren't. - bugfix: Several places on Birdshot which were missing an air alarm now aren't. +======= + Jacquerel: + - bugfix: Several places on Birdshot which were missing an APC now aren't. + - bugfix: Several places on Birdshot which were missing an air alarm now aren't. + Jolly: + - bugfix: '[Shuttles] Kilo''s Emergency Shuttle no longer has a stacked light in + its brig.' + Melbert: + - bugfix: Fixed BB admin add + - bugfix: Traitors using the sneak suit and heretics under the effects of cloak + no longer leak their identity via Text to Speech + OrionTheFox: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: resprited a lot of formal undersuits, enjoy! - rscadd: Added a pre-colored type of buttondown slacks for some service roles, to replace the "black suit" and "amish suit" - rscdel: Removed the "amish suit", "black suit", and one of the two "white suit"s +<<<<<<< HEAD - bugfix: Birdshot's morgue has surgical tools and a laptop for the coroner to use - bugfix: The blood-drunk miner has remembered how to swing their cleaving saw quickly without having to flick it out first. @@ -119,10 +184,21 @@ - balance: Xenomorph neurotoxin has been buffed (50 -> 65 stamina damage) - rscadd: Adds boss music functionality. - sound: Adds hierophants boss track, tweaks hierophant boss noises. +======= + Senefi: + - bugfix: NorthStar's Supermatter Waste Chamber guide no longer contains inaccurate + information + - qol: NorthStar's Supermatter Waste Chamber air alarm no longer shows the hallway + vent and scrubber on the configuration panel. + SyncIt21: + - bugfix: broken icons in RCD UI + Thunder12345: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: CentCom can no longer be raided by teleporting out of the Super Secret Room - bugfix: The Administrative Storage and ERT Armoury blast doors can no longer be opened by building a door button. +<<<<<<< HEAD SpaceVampire: - bugfix: 'VoidRaptor security made more accessible to the inquisitively inclined on their staff. @@ -157,6 +233,55 @@ - image: resprited the entirety of RnD! Genetics, Robotics, the RD, and the Science Team themselves will enjoy the fresh new looks but same great taste! No, wait, great STYLE! Don't eat these, they're covered in chemicals. +======= + carlarctg: + - qol: When Space Dragons devour people they get extinguished, removing flames. + honkpocket: + - rscadd: Adds an emote to push up glasses with *glasses + - rscadd: Adds a visual effect to *sigh + timothymtorres: + - rscadd: Add a new 'Hall of Fame' emergency shuttle. It even comes with it's own + nifty photo album. +2023-08-03: + Fikou: + - balance: hat stabilizer module can now hold what plasmaman helmets can hold + - qol: kinesis module can be stopped without launching an object with right click + - balance: kinesis module stuns last until the kinesis stops + - rscadd: admin suit has a version of kinesis that can pick up anything at any range + and can be configured to make grabbed mobs phase through walls :) + Ghommie: + - bugfix: BoH bombing now correctly requires two bags to be done. + Hatterhat: + - balance: The strong-arm implant's punches now respect armor. + - spellcheck: While using an arm with the strong-arm implant to punch people, you + no longer kick them; your implant's in your arm, after all! + IndieanaJones: + - balance: Xenomorph neurotoxin has been buffed (50 -> 65 stamina damage) + Jacquerel: + - bugfix: Your pAI card won't pop out of your PDA onto the floor alongside its hologram + if it enters hologram form while inside a PDA. + Rhials: + - rscadd: Fugitive shuttles now have a "Fugitive Tracker" machine, which gives a + readout on the location of a random fugitive on a 40 second cooldown. + - spellcheck: Renames the fugitive pinpointer to the bounty shuttle pinpointer. + SpaceVampire: + - bugfix: Guard Spiders are no longer unable to attack after using Web Effigy + SyncIt21: + - bugfix: bluespace RPED can be put in bags again without dragging them into their + storage slots + - bugfix: normal RPED exchanges parts & displays part info again + Time-Green: + - qol: The random parallax layer moves more slowly, giving a more deep feel + distributivgesetz: + - bugfix: Fixes holoparasites not dusting their owners on death sometimes. + timothymtorres: + - bugfix: Fix ethereal crystal destruction not removing light + tommysalami3: + - rscadd: Adds boss music functionality. + - sound: Adds hierophants boss track, tweaks hierophant boss noises. +2023-08-04: + GPeckman: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added whisper-sensitive cybernetic ears, which make it much easier for the user to hear whispers at the cost of being more vulnerable to loud noises - rscadd: Added wall-penetrating cybernetic ears, which allow you to hear speech @@ -165,6 +290,7 @@ the other basic/normal cybernetics - balance: The welding shield and luminiscent cybernetic eyes are now unlocked with the other upgraded cybernetics +<<<<<<< HEAD - bugfix: deleted trash in the walls from whiteship ruin box. - bugfix: Guard Spiders are no longer unable to attack after using Web Effigy - balance: hat stabilizer module can now hold what plasmaman helmets can hold @@ -182,11 +308,37 @@ bar sprites. - rscadd: Remapped the Metastation kitchen for about the tenth time. distributivgesetz: +======= + - bugfix: radio should no longer be broken for everyone + Helg2: + - bugfix: deleted trash in the walls from whiteship ruin box. + Jacquerel: + - rscadd: pAIs can be inserted into MODsuits and can control suit modules (but are + not capable of moving the suit). + - bugfix: AIs/pAIs in MODsuits can properly pin actions + MTandi: + - bugfix: removed fire alarm that was inside a window on oldstation + OrionTheFox: + - image: resprited the entirety of RnD! Genetics, Robotics, the RD, and the Science + Team themselves will enjoy the fresh new looks but same great taste! No, wait, + great STYLE! Don't eat these, they're covered in chemicals. + Vekter: + - bugfix: Fixes formatting for derelict and syndicate drone job names. They should + no longer tell you they're "the Ghost Role" when spawning as them. + - rscadd: Remapped the Metastation kitchen for about the tenth time. + - spellcheck: Fixed a typo in progressbar.dm and the file name for the progress + bar sprites. + cnleth: + - bugfix: Spell burger now has only one recipe + distributivgesetz: + - qol: Made reading text with the PDA retro theme a bit more accessible. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Updated Direct Messenger to v6.5.3. Now including brand new individual chat rooms, proper image attachments and a revolutionary message input field! - rscadd: Added a "Reset Imprint" option to the PDA painter. - refactor: Refactored PDA imprinting code just a bit. - bugfix: PDAs should now properly respond to rigged messages. +<<<<<<< HEAD - qol: Made reading text with the PDA retro theme a bit more accessible. vinylspiders: - bugfix: fixes .38 revolvers losing ammo capacity with each reload (for real this @@ -201,12 +353,35 @@ by the void. Hatterhat: - bugfix: MCRs can now fit camo again. +======= + - bugfix: Fixes an extremely rare bug where a /mob/living/brain with a client would + not be moved out of nullspace correctly, causing admin log spam. + peptron1: + - qol: TTS volume preference is not actually a volume slider, instead of a volume + number input. + san7890: + - server: Added a preventative measure to prevent calling both TGSHardRestart and + TGSReboot, as well as potentially invoking sensitive procs that are only meant + to be called once. +2023-08-05: + Ghommie: + - bugfix: Areas created with the "land claim" blueprints are no longer hazardous + to free golems. + Jacquerel: + - rscadd: Lightgeists under AI control will selflessly heal any wounded creature + that they see. + - balance: Lightgeists can no longer repair non-organic tissue. + - admin: The imaginary friend smite now allows selecting "offer to ghosts" instead + of having to perform that poll yourself manually. When offering to ghosts you + can also offer for several ghosts to volunteer at the same time. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Fixed disease outbreak viruses sometimes getting stuck invisible from medHUDs - admin: Added more admin features to create/manange disease outbreaks - admin: Pressing 'cancel' on disease outbreak setup dialogs will actually cancel the event instead of running it with default settings +<<<<<<< HEAD RatFromTheJungle: - bugfix: Makes the m45a5 come from one of the actually-legal companies. SkyratBot: @@ -263,11 +438,31 @@ Nerev4r: - balance: The armor of contractors has been lowered, and their baton holster costs another point to get. +======= + MTandi: + - qol: You can fill microwave with stuff by hitting it with a box full of stuff. + Sealed101: + - rscdel: removed new player status tab Readiness Status + - rscadd: added a Ready Status Blip on the Collapse Menu button + - bugfix: golems that ate plasma are properly immune to ash storms +2023-08-06: + Fikou: + - bugfix: sniper scope and kinesis should work without widescreen + Jacquerel: + - bugfix: Goliaths no longer intermittently reset their target and retarget something + else. + - bugfix: Goliaths can once again step diagonally. + JohnFulpWillard: + - bugfix: Boss music cuts out when you die. + Kryson, MTandi, Zeckle (Mike): + - image: New bottles and holy grenade sprites +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Most of the colored oval-shaped portals faintly glow now. Cool! Senefi: - code_imp: Autowiki module for stock parts - bugfix: Emergency lights no longer runtime when created in nullspace +<<<<<<< HEAD SkyratBot: - bugfix: Areas created with the "land claim" blueprints are no longer hazardous to free golems. @@ -279,12 +474,22 @@ - qol: Mechs universally have diagonal movement as to avoid unresponsive movement, as block diagonal movement was having unintended side effects and was actually intended for pivot step mechs. +======= + Vekter: + - bugfix: Fixed the DNA Infuser's circuit board missing from the techfab and tech + storage. + Watermelon914: + - bugfix: Fixed being unable to purchase regular-priced uplink items if you bought + the discounted variant of it. + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Cursed crewmembers can randomly, extremely rarely, spontaneously combust for no reason. - rscadd: Cursed crewmembers can get zapped by nearby light tubes. - rscadd: Cursed crewmembers can freak out when passing by mirrors. - rscadd: To make up for these, triggering a cursed effect is slightly less than half as likely now when walking around now. +<<<<<<< HEAD - bugfix: sniper scope and kinesis should work without widescreen Vekter: - bugfix: Fixed the DNA Infuser's circuit board missing from the techfab and tech @@ -298,14 +503,35 @@ - qol: Bluespace Artillery Cargo Crate includes a guide paper for how to assemble it. SkyratBot: +======= + necromanceranne: + - bugfix: Restores a lost feature, Clarkes and Odysseus mechs once again can pivot + on a dime and step in the same button press. + - qol: Mechs universally have diagonal movement as to avoid unresponsive movement, + as block diagonal movement was having unintended side effects and was actually + intended for pivot step mechs. + timothymtorres: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add pAI movement freedom when emagged. - qol: The "Malicious Software Detected" button has been appropriately renamed to "Reset Software" for when pAIs are emagged - qol: Add a new law notification popup and flavor texts when pAI is emagged +<<<<<<< HEAD +======= +2023-08-07: + EuSouAFazer: + - bugfix: Removed a doubled filing cabnet in Northstar's Library Book Return room + - bugfix: Exorcised uneeded variables from windoors in Meta's Xenobio + Ghommie: + - bugfix: Fixed a logic mistake for chasm fishing that resulted in only generic + items being spawned. + SandPoot: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Changed screentips icons to something a lot fancier unified with the LMB / RMB text. - qol: There are accessibility preferences to disable this! Look for "Screentip context with images" beside the other screentip preferences. +<<<<<<< HEAD - bugfix: Fixed a logic mistake for chasm fishing that resulted in only generic items being spawned. - bugfix: Fixed particles sometimes being left behind when an object drops all of @@ -318,10 +544,55 @@ - bugfix: fixed missing froth sprites - image: Re-sprites some of the oldest hairstyles 2023-08-08: +======= + Sealed101: + - bugfix: fixed missing froth sprites + - image: bubblegum's blood smack and blood grab use new bubblegum sprites + Senefi: + - qol: Bluespace Artillery Cargo Crate includes a guide paper for how to assemble + it. + Sheits: + - image: Re-sprites some of the oldest hairstyles + Watermelon914: + - bugfix: Fixed particles sometimes being left behind when an object drops all of + its contents whilst having a particle active. + Wisemonster: + - bugfix: Fix mulebots receiving the wrong message when thier cell is added/removed. +2023-08-08: + Ben10Omintrix: + - bugfix: the bee will now care more about polinating + - qol: in case u miscliked the bee queen with a seringe 2 times, the raegent will + not be transfered to the quen if he alredy have this raegent + BlueMemesauce: + - rscadd: Emagged player-controlled bots now get different flavor text (depends + on policy) + - rscadd: Bots are now notified when a silicon toggles them malfunctioning + Comxy: + - bugfix: Damage on limbs get transferred on species change. + GPeckman: + - bugfix: Creatures with nobreath trait will now regenerate oxyloss. Androids, skeletons + and such will no longer be stuck with un-healable damage after being revived. + Ghommie: + - image: Mirrors now display a reflection of the mobs next to them... except for + vampires. + - rscadd: Added an Indebted negative quirk to the game, which gives the holder's + bank account a debt averaging at 15000 credits (with a variation of 1250 cr) + and forces 75% of all earnings towards solving it. A little prize awaits those + who actually extinguish it. + JohnFulpWillard: + - rscadd: Adds the Coroner surgery duffelbag; This replaces Coroner's surgery tools + in their medkit and current duffel, and has the cruel surgery tools instead + of regular ones. + - balance: Cruel surgery tools are no longer premium. + - balance: Coroner's medkit is now premium in the vendor. + - balance: All Coroner medkits are the same, there is no 'large' variant. + - balance: Coroners no longer get a folder. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Advanced viruses that are supposed to be stealth will again actually be stealth to analyzers - code_imp: Virus visibility flags can now be toggled in view variables +<<<<<<< HEAD SkyratBot: - bugfix: Exorcised uneeded variables from windoors in Meta's Xenobio - image: Mirrors now display a reflection of the mobs next to them... except for @@ -333,6 +604,13 @@ - qol: in case u miscliked the bee queen with a seringe 2 times, the raegent will not be transfered to the quen if he alredy have this raegent - rscadd: 4 New skin tones, hooray! +======= + Melbert: + - code_imp: Updated some status effect tick code to be more clear of how long is + elapsing between ticks. Some effects that were inadvertently weakened are now + stronger as a result (fire and some heretic effects). + Sealed101: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed goliaths digging sand that they can't actually reach (behind windows or inbetween closed turfs) - bugfix: fixed goliaths melee attacking their target despite the target running @@ -342,6 +620,7 @@ but stayed in their targeting range. this applies for most basic mobs, really, so if any basic mob was targeting you despite you hauling ass behind cover, they shouldn't anymore +<<<<<<< HEAD - image: fixes weird inconsistency on the neck and butt of the female base sprite - qol: Add sounds and flashing effects to slot machines - sound: Add new ding sound to slot machines from https://freesound.org/people/Natty23/sounds/411747/ @@ -353,18 +632,49 @@ - bugfix: Creatures with nobreath trait will now regenerate oxyloss. Androids, skeletons and such will no longer be stuck with un-healable damage after being revived. - bugfix: Fix parasitic infection to cure upon liver removal +======= + Sheits: + - image: fixes weird inconsistency on the neck and butt of the female base sprite + Watermelon914: + - bugfix: Fixed a hard delete that would occur with lua-created atoms. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 YakumoChen, Thalpy: - rscadd: Chen And Garry's Ice Cream is proud to debut a wide selection of cool new frozen treat flavours on a space station near you! - rscadd: Chen And Garry's Ice Cream revolutionary Korta Cones allow our ice cream vendors to profit off the lizard demographic like never before! - code_imp: Ice cream flavours now are all greyscaled similarly to GAGs +<<<<<<< HEAD softcerv: - qol: Organic Interface sounds now have prefs associated with them. vinylspiders: - bugfix: greyscale color selection menu is now working again in the loadout prefs menu 2023-08-09: +======= + goobliner: + - rscadd: 4 New skin tones, hooray! + itsmeow: + - code_imp: Optimized z-level transition mirages, saving ~0.32s init. + softcerv: + - bugfix: former blobs are no longer able to respawn after having their mind transferred + to a new body. + timothymtorres: + - bugfix: Fix parasitic infection to cure upon liver removal + - qol: Add sounds and flashing effects to slot machines + - sound: Add new ding sound to slot machines from https://freesound.org/people/Natty23/sounds/411747/ +2023-08-09: + Ben10Omintrix: + - refactor: the hivebot is now a basic please report any bugs + CRITAWAKETS: + - rscadd: The Syndicate has begun rolling out new Tactical Deniability Implants + for their Nuclear Operative teams. It seems these implants are designed to make + teams "fight harder" by "giving incentives for fighting to the bitter end", + whatever they're talking about. + CliffracerX: + - image: resprited all duffelbags, including worn and inhand variants to match modern + storage. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fazzie: - qol: 'Many changes in Birdshot''s Library. @@ -377,6 +687,7 @@ moved bookcase there Makes a wire no longer go through a wall to reach the library APC' +<<<<<<< HEAD GoldenAlpharex: - config: Space vines are now going to be a bit more common, since they now require less living players in order to be eligible to roll. @@ -386,6 +697,20 @@ - code_imp: Updated some status effect tick code to be more clear of how long is elapsing between ticks. Some effects that were inadvertently weakened are now stronger as a result (fire and some heretic effects). +======= + Ghommie: + - bugfix: Fixed certain aquarium fish eating other fish when not hungry. + - rscadd: Added a score award that counts how many achievements you've unlocked + so far. + - qol: Examining a fishing rod will now provide information on equipped hook, line, + bait, and right click functionality. + - balance: Fishing without a bait will only lower the odds (a smidge less, too) + of catching fish, not other things. + - balance: Catching something that isn't a fish or a living mob won't consume the + bait anymore. + - balance: The Bepis fishing rod will now ignore fish's bait preferences. + Melbert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: PAIs can now cast wizard spells should they have any. - rscadd: AIs located in intellicards can now cast wizard spells should they have any. @@ -393,8 +718,31 @@ Mechas or Clown Cars. To varying degrees of success. - rscadd: Knock will now unlock and open closets you are hiding within. - rscadd: Repulse will now throw open closets you are hiding within. +<<<<<<< HEAD SkyratBot: - refactor: the hivebot is now a basic please report any bugs +======= + - qol: Abductor Baton Recall now starts linked to their baton, and you can no longer + unlink your baton + - qol: Instant Summons now shows what item is marked over the icon + - bugfix: Fixes Instant Summon's name not updating when marking an item + Sealed101: + - bugfix: fixed basic mobs freezing up when in melee range of a target + Tattle: + - admin: Pings an admin role on discord when a new player joins (when enabled by + config) + Vekter: + - sound: Law changes will now play a sound to silicons impacted by those changes. + dieamond13: + - bugfix: removes a stray obj/item from random metastation wall + necromanceranne: + - bugfix: You can do autopsies on people who were revived and died again after they + had already been dissected. + - qol: Autopsies have become the surgery needed to complete the dissection experiments. + As a result, the dissection surgery has been removed as it is now redundant. + - qol: A coroner knows whether someone has been autopsied and recently dissected + (and thus hasn't been revived) by examining them. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Standardizes some of the nuclear operative entries to have more consistent pricing within their respective categories. - rscadd: Adds some new categories so that players have an easier time navigating @@ -412,6 +760,7 @@ - rscadd: Added 40 new cosmetic items to the Syndicate Store. Buy them now from the Hat Crate, only 5 TC! - code_imp: Updated the nuclear operative uplink files. +<<<<<<< HEAD - bugfix: fixed basic mobs freezing up when in melee range of a target - rscadd: Adds the Coroner surgery duffelbag; This replaces Coroner's surgery tools in their medkit and current duffel, and has the cruel surgery tools instead @@ -499,12 +848,16 @@ - balance: Removes standard vest from all security lockers and adds 3 of them to the security wardrobe. - bugfix: fixed gibtonite explosions having flames and flash ranges +======= + siliconOpossum: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added greyscale suitskirt, available in clothesmates - rscadd: You can now roll up the sleeves of greyscale buttondown shirts - qol: Re-added previously removed black suitskirt and the RD's tan suitskirt, as pre-colored variants of the above - bugfix: Fixed only one buttondown with slacks being available in clothesmates - image: Slightly adjusted greyscale buttondown sprite, you look less fat now! +<<<<<<< HEAD vinylspiders: - bugfix: quirks list will now be displayed normally in examine text again instead of duplicating itself @@ -566,6 +919,47 @@ - qol: Uncle Pete's Rollerdome has had its price increased, and the disco machine is no longer unbreakable. - bugfix: fixes kinesis not actually immobilizing or blocking hands of grabbed mobs +======= +2023-08-10: + Boopideedoo: + - bugfix: fixed a Camera in atmos + - rscadd: missing Camera in chem storage + CoiledLamb: + - rscadd: Added wellcheers, a contraband soda with various side effects. + - image: resprites all cans in the drinks icon file + - image: resprites the canholder sprite in storage.dmi + Comxy: + - rscadd: Young Spiders that appear between spiderlings and adult spiders. + - balance: Wizard Spider version has better immunity against temp damage and can + lay webs faster. + - balance: Tangle Spider sucks more with self-healing but has more health. + - balance: Scout spiderling gets thermal vision. + - balance: Viper deals bonus damage when an enemy is below 20% health. + DeerJesus: + - balance: added the storage implanter to the syndie-kit tactical 'spy' kit to make + it decent. + Derpguy3: + - bugfix: The service cyborg's beverage apparatus is now capable of grabbing coffee + pots and syrup bottles. + Inari-Whitebear: + - bugfix: Metastation Kitchen APC is wired to the grid again. + Jacquerel: + - rscadd: Adds a new technology which utilises Bioscrambler anomaly cores to allow + you to transform into animals. + Momo8289: + - rscadd: Cigarettes can now be placed in and smoked through gas masks, so long + as the mask has no filters installed and is not covering the mouth. + Sealed101: + - bugfix: fixed gibtonite explosions having flames and flash ranges + Singul0: + - balance: Geode Pirates have upgraded their launchpad room to be more usable + - bugfix: Fixes a bug in the navigational computer of the Geode pirates causing + their shuttle to move sideways. + Vincent983: + - spellcheck: fixes one of the virus thresholds saying "scrathing" instead of scratching + carlarctg: + - qol: Biogenerators can be unwrenched +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds Summon Simians, a spell that summons four monkeys or lesser gorillas, with the amount increasing per upgrade. The monkeys have various fun gear depending on how lucky you get and how leveled the spell is. If the spell is maximum level, @@ -579,13 +973,72 @@ drones can all now cast robed spells as long as they''re wearing a wizardly hat as well.' - balance: Made monkeys able to wield two-handed things again. +<<<<<<< HEAD - spellcheck: improvised fire extinguishers aren't full of typoes now Wallem: - rscadd: T +======= + improvedname: + - balance: Removes standard vest from all security lockers and adds 3 of them to + the security wardrobe. + xPokee: + - bugfix: Fixed the tramstation kitchen not having any lights + - image: added a wagging tail for cake cats to match other cats +2023-08-11: + EOBGames, MrMelbert: + - rscadd: Mars celebrates the 250th anniversary of the Martian Concession this year, + and this has brought Martian cuisine to new heights of popularity. Find a new + selection of Martian foods and drinks available in your crafting menu today! + FernandoJ8: + - bugfix: crafting recipes without a name, such as the mothic pizzas, will inherit + the name of the item they make + Fikou: + - bugfix: fixes kinesis not actually immobilizing or blocking hands of grabbed mobs + - balance: Space Ninja's energy net uses a projectile to catch people now. + Ghommie: + - bugfix: Fixed fired foam darts, gumballs and (harmless) lollipops being embeddable. + - bugfix: Projectiles that should embed while being reusable will now do so correctly, + actually embedding the reusable casing instead of a shrapnel. + - balance: Arrows are generally more likely to embed now, except for blazing ones, + that kind of just blaze. + - qol: the quiver storage now uses numerical stacking (like botany and ore bags, + or the RPED, for example). + - bugfix: Fixed an oddity with morgue corpses being shakeable like they're just + unconscious. + - bugfix: Mirror reflections no longer display progress bars or runechat. + - bugfix: Fixed an oversight with processable items that lead to the same chat message + being sent multiple times. + LT3: + - bugfix: Large airlocks are now a subtype and function on both tiles + Melbert: + - bugfix: Fix some missing wizard spellbook flavor + - bugfix: Fixed latejoiners being affected by certain things twice, such as Summon + Guns and Summon Magic + Paxilmaniac: + - bugfix: The bulbs of lights will now have an emissive glow when on, making it + so they appear active no matter how dark the area surrounding them happens to + be. + Pickle-Coding: + - balance: Changeling arm blade has an armour penetration of 35%. + - balance: Changeling arm blade has a wound bonus of 10, from -20. + - balance: Changeling has a bare wound bonus of 10, from 20. + Vekter: + - bugfix: FRAG-12 shells no longer require sulfuric acid, instead needing 10 fluorosulfuric + acid. This should prevent them from leaving byproducts if crafted in a specific + way. + Vincent983: + - spellcheck: improvised fire extinguishers aren't full of typoes now + Watermelon914: + - admin: 'Added new lua functions: SS13.is_valid, SS13.stop_tracking, SS13.new_untracked, + SS13.type and SS13.qdel' + carlarctg: + - qol: Drill module automatically disables if it's about to drill into gibtonite +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iain0: - bugfix: A small clerical error fixed which will cause the Ukrainian station naming prefix to be properly applied to the Independence Day of Ukraine holiday on 24th August, rather than overwriting the Indigenous People's Day station prefixes. +<<<<<<< HEAD vinylspiders: - bugfix: Fixed fired foam darts, gumballs and (harmless) lollipops being embeddable. - bugfix: 'Projectiles that should embed while being reusable will now do so correctly, @@ -603,10 +1056,18 @@ SkyratBot: - balance: Change mousetraps to kill mice instead of damaging them (except regal rats) +======= + timothymtorres: + - rscadd: Add admin blackhole shuttle event with a normal version and suicidal version. + - bugfix: Fix several shuttle event runtimes +2023-08-12: + Cheshify: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: North Star's Cytology and Xenobiology are now significantly more usable. - rscadd: North Star's Genetics has been tweaked. - bugfix: The North Star's AI SAT has a working vent and it's service hall has a working lightswitch +<<<<<<< HEAD - rscadd: you can upgrade laser pointers with a bluespace crystal to let them shine through walls at double the power cost, if the laser in the pointer is of tier 3 or higher. @@ -620,6 +1081,17 @@ - rscadd: Lets you grind things into a hauntium reagent which works similarly to the solid form but is versatile and has some unique effects. - bugfix: X'ing out of the podpeople no soul prompt will no longer harvest the seeds. +======= + Derpguy3: + - bugfix: The metastation law office's shutters now function again. + EuSouAFazer: + - qol: The flowers in Meta's chapel are no longer stacked atop eachother + Ical92: + - bugfix: fixed missing departments and names in request consoles + Melbert: + - bugfix: Fix antimagic effect not expiring + Paxilmaniac: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Gigabeacons no longer need to be constructed like standard machines, instead being printed as items that can be deployed quickly inhand without tools. - qol: Gigabeacons are no longer their own research node, instead being a part of @@ -629,16 +1101,73 @@ found a nav beacon! - code_imp: The deployable component now gives you an option to disable the examine blurb it adds to its parent +<<<<<<< HEAD - bugfix: rabbits are now small-sized rather than human-sized, as well as capable of being picked up - bugfix: baseballs are now small sized rather than large - bugfix: fixed missing departments and names in request consoles - qol: Gateway access no longer requires a Silver ID. +======= + Wallem: + - rscadd: T + carlarctg: + - balance: Lepton Violet (wabbajack) shuttle must be unlocked by having some form + of polymorph happen in-game first (Pride Mirror or the cursed springs are the + most accessible sources) + - balance: Scrapheap shuttle can only be bought if the Cargo budget is below 600 + credits, and the shuttle has just less than half of its usual refueling time + left. However, it gives the cargo budget an influx of 3000 credits! + - qol: Uncle Pete's Rollerdome has had its price increased, and the disco machine + is no longer unbreakable. + timothymtorres: + - qol: Emergency shuttle now gracefully display occupancy limits and prerequisites + in the communication console. + - balance: Change mousetraps to kill mice instead of damaging them (except regal + rats) +2023-08-13: + FernandoJ8: + - bugfix: Plumbing Constructors can now deconstruct every machine they can make, + including the plumbing IV. + - bugfix: Plumbing IV drips no longer drop metal when deconstructed + - bugfix: rabbits are now small-sized rather than human-sized, as well as capable + of being picked up + - bugfix: baseballs are now small sized rather than large + Ghommie: + - bugfix: Fixed wheelchairs being silent. + IndieanaJones: + - bugfix: After a collective brain fart lasting for 6 months, monkeys and xenomorphs + now know how to remove embedded objects from their own bodies. + Jacquerel: + - bugfix: Giant Spiders only have an antag datum if created by the round event. + - balance: Flesh spider eggs hatch into adult spiders instead of baby spiders. + - balance: The eggs spawned by the start of the spider infestation event hatch into + adult Midwife spiders instead of baby ones. + JohnFulpWillard: + - qol: The mining order console is now a bit more compact, and the search bar works + regardless of which tab you are currently on. + - bugfix: X'ing out of the podpeople no soul prompt will no longer harvest the seeds. + - bugfix: Mime spell books don't eat itself when used in the dark or cancelled out + of. + - qol: Gateway access no longer requires a Silver ID. + Melbert: + - bugfix: Fixes Shadow Walk + Sealed101: + - bugfix: Labor Camp Sustenance vendor is no longer free; instead, it takes your + labor points that you'd otherwise use for paying off your point goal. + - rscadd: you can upgrade laser pointers with a bluespace crystal to let them shine + through walls at double the power cost, if the laser in the pointer is of tier + 3 or higher. + - qol: laser pointer charge can be seen by examining it + - bugfix: fixed laser pointers luring dead cats when shone upon + - code_imp: laser pointer code cleaned up a tad + TheBoondock: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added Pulse of Entropy, a new ritual for rust heretic unlocked after leeching walk. This ritual can be completed with 20 iron sheets, 2 garbage items to rust in a 4 tiles radius round the rune. Useful for establishing bases and fighting area. - bugfix: fixed detect_room not running correctly when break_if_found is not passed +<<<<<<< HEAD - bugfix: Growing spiders will now retaliate against you like they were always meant to. - bugfix: After a collective brain fart lasting for 6 months, monkeys and xenomorphs @@ -654,11 +1183,20 @@ of. - qol: Emergency shuttle now gracefully display occupancy limits and prerequisites in the communication console. +======= + dieamond13: + - rscadd: Lets you grind things into a hauntium reagent which works similarly to + the solid form but is versatile and has some unique effects. + lizardqueenlexi: + - bugfix: The Nuke Op/Lone Op sniper briefcase now properly contains a sniper rifle. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Morphs are now basic mobs with a nice new ability to help you change forms rather than the old shift-click method, much more intuitive. - admin: With the morph rework comes a new ability you can add to mobs, "Assume Form". Feel free to add that to any simple or basic mob for le funnies as Runtime turns into a pen or something. +<<<<<<< HEAD - bugfix: The metastation law office's shutters now function again. - bugfix: Fixed wheelchairs being silent. - bugfix: Labor Camp Sustenance vendor is no longer free; instead, it takes your @@ -679,11 +1217,28 @@ vent and scrubber on the configuration panel. /:cl:' SkyratBot: - bugfix: You can no longer stand up without legs. +======= + - bugfix: Growing spiders will now retaliate against you like they were always meant + to. +2023-08-14: + CoiledLamb, Jacquerel: + - rscadd: Adds mining weather radio + EOBGames: + - bugfix: a few issues with Martian food + EuSouAFazer: + - bugfix: The chef can no longer close the shutters in Meta's HoP office. + - bugfix: Doctors no longer spawn in the bedroom in the northstar + - qol: The icebox bridge had its items moved to better positions. No items were + added or removed, and none left their original room (except the captain's electric + razor, which went to the bathroom). + Hatterhat: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Projectile damage multipliers on guns are now reflected in their combat information. - admin: Admins can now make a gun's fired projectiles better or worse at wounding by changing the gun's projectile_wound_bonus. Surely this will not have any repercussions. +<<<<<<< HEAD - qol: xenos rest verb now is a hud button instead - qol: The icebox bridge had its items moved to better positions. No items were added or removed, and none left their original room (except the captain's electric @@ -698,24 +1253,77 @@ - bugfix: The modular receiver is now only printable from a hacked autolathe. - bugfix: The chef can no longer close the shutters in Meta's HoP office. 2023-08-15: +======= + Helg2: + - bugfix: Inquisitor Commander now has just 1 box. + Jacquerel: + - bugfix: If you shapeshift into a mob which can eat things such as player corpses, + those things will fall out when you stop shapeshifting + - bugfix: Player-controlled basic mobs with ranged attacks can now only fire about + as fast as AI-controlled ones. + Shroopy: + - bugfix: You can no longer stand up without legs. + Vincent983: + - qol: xenos rest verb now is a hud button instead + lizardqueenlexi: + - bugfix: The modular receiver is now only printable from a hacked autolathe. +2023-08-15: + ABS-Helmet: + - image: modified glass pane wall mount icon + Comxy: + - rscadd: Added big slappy + - image: Added big slappy parts and big slappy sprites + DeerJesus: + - bugfix: you can no longer tactially stealth-hide donuts in your right hand + FernandoJ8: + - bugfix: mob holders no longer bug out and harddel when put into evidence bags. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The formatting on PDA messages displayed to observers is now back to what it used to be, rather than being all bold. - bugfix: PDA messages are now displayed to observers from dead players, and not just dedicated observers. +<<<<<<< HEAD - admin: The banning panel is now set to have all bans be global by default. +======= + Kapu1178: + - rscadd: Lockers, crates, and machines no longer block click attempts in adjacency + checks. Basically, you can reach tables cornered between lockers/machines. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Minor mapping work to Metastation. Wallmounts, decal changes, etc - especially around Medbay. - qol: Remapped Meta's Morgue slightly. +<<<<<<< HEAD ShizCalev: - bugfix: Medbots made with tactical medical kits now have the correct skin SkyratBot: - bugfix: fixed the Tram Pod Bay having no lights +======= + OrionTheFox: + - bugfix: fixed the Tram Pod Bay having no lights + ShizCalev: + - bugfix: Medbots made with tactical medical kits now have the correct skin + SmoSmoSmoSmok: + - refactor: ice whelps have been refactored to basic mobs + - rscadd: ice whelps have a new dangerous ability which theyll use once their enraged + meter is full + YehnBeep: + - bugfix: fixed missing seating at the All American Diner + carlarctg: + - rscadd: Adds a unique medibot to the Syndicate Infiltrator. It doesn't like nukes + - when one is armed, disarmed, or detonating, it says an unique line. Players + can optionally enable personalities on it if they want to. Probably best to + just let it stay on the shuttle though. (It's also in the Interdyne Pharmaceuticals + ship, renamed) + - bugfix: Fixed an issue that made mapload medibots unable to load custom skins. + vinylspiders: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixes a bug that can cause emotes to stop working if a client is being created or deleted - bugfix: fixes immerse overlays not being added the first time a mob enters a water turf +<<<<<<< HEAD - rscadd: Added big slappy - image: Added big slappy parts and big slappy sprites - rscadd: Lockers, crates, and machines no longer block click attempts in adjacency @@ -731,6 +1339,14 @@ Onule: - image: modified light fixtures' sprites and overlays to be more pronounced SkyratBot: +======= +2023-08-16: + DeerJesus: + - bugfix: removes bodybag welding tooltip + FernandoJ8: + - bugfix: items no longer stay in your hands after their respective arm is dismembered + MTandi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored Mech UI - refactor: Refactored mech radio into a utility module, adding extra slot to all mechs @@ -768,6 +1384,7 @@ - balance: Made mech RCS pack consume reasonable amount of gas - code_imp: Fixed some other minor bugs and made some minor changes in the mech code +<<<<<<< HEAD - bugfix: items no longer stay in your hands after their respective arm is dismembered - bugfix: mob holders no longer bug out and harddel when put into evidence bags. - bugfix: removes bodybag welding tooltip @@ -796,6 +1413,11 @@ - balance: Tangle spider's acid injection per bite reduced from 5 to 2.5. - bugfix: Colored ammo bands, such as those on .357 and .38 speedloaders, no longer permanently disappear upon icon update. +======= + Onule: + - image: modified light fixtures' sprites and overlays to be more pronounced + OrionTheFox: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the Bowtie! Bartenders start with one on, but they can also be found in the Bardrobe, Autodrobe, and Clothesmate. No need to tie it either, it's just a clip-on. @@ -806,10 +1428,28 @@ - image: updated the majority of Lawyer suit sprites, along with the Cook's Apron-Jacket and Hat, and updated/greyscaled Botany's Overalls! Also the Overalls are available in the clothesmate, and the Cook Jorts' shirt is less crusty. +<<<<<<< HEAD - balance: Ascending as an Ash Heretic now reduces the cooldown of Nightwatchers Rebirth to ten seconds, additionally Ash ascension has Bomb immunity added to the resistances it offers (no stun immunity though) - qol: the chemistry heater can now be unwrenched. +======= + Paxilmaniac: + - image: The Mosin-Nagant has been given new sprites and a reflavor, looking for + the old rifle? Look for the Sakhno Precision Rifle. + - balance: The tiniest balance thing, but since Silverscales use the Sakhno-Zhihao + rifle, which has a scope on it, their main weapon now has a scope. + - sound: The cargo rifle now has a new, considerably more rifle sized firing sound. + Gotten from tgmc from https://github.com/tgstation/TerraGov-Marine-Corps/pull/12280. + SyncIt21: + - bugfix: multiple balloon alerts when the plumbing RCD is low on ammo + - code_imp: organized all plumbing designs into static lists for memory savings + - refactor: removed unused vars for further memory savings + YehnBeep: + - bugfix: fixed a disconnected APC in Delta's tech storage. +2023-08-17: + BlueMemesauce: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Add policy for sentient mobs that were revived by lazarus injector (depends on config) @@ -817,6 +1457,7 @@ get enslaved to whoever revived them.' - bugfix: Servant golems get their master's real name (Won't be serving "Unknown" if their master is wearing a mask) +<<<<<<< HEAD - bugfix: Skeletons now heal burn damage with milk once again. - balance: metal bat damage changed from 12 -> 20 - bugfix: Gravitational Anomalies will now correctly clean up after themselves, @@ -844,10 +1485,22 @@ - rscadd: Added 28 new food recipes! - bugfix: Goliaths will try to attack mechs with their tentacles. - spellcheck: fixed the rat king text saying that they're summoning rats +======= + DaydreamIQ: + - balance: Ascending as an Ash Heretic now reduces the cooldown of Nightwatchers + Rebirth to ten seconds, additionally Ash ascension has Bomb immunity added to + the resistances it offers (no stun immunity though) + DeerJesus: + - bugfix: Makes the ectoplasm anomaly not randomly move so deadchat can actually + control it + - balance: metal bat damage changed from 12 -> 20 + FernandoJ8: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: dismemberment moodlets are replaced by a lesser mood debuff when you recover the limb in question. - balance: dismemberment moodlets can now stack for each limb you lose, and are cleared separately. Their descriptions have been updated to reflect this. +<<<<<<< HEAD - bugfix: Spaceacillin will once again provide antiviral effects for the deceased 2023-08-18: AnywayFarus: @@ -859,10 +1512,32 @@ Iajret: - bugfix: Mapped or spawned in rusted walls (such as on Birdstation or on charlie ghost role) can now be fully cleaned without needing to deconstruct them. +======= + - bugfix: items implanted on arms no longer become permanently stuck in-hand when + their limb is dismembered + - bugfix: quickly sheathing and unsheathing the vorpal scythe can no longer bug + out and prevent its effects from being applied + FlufflesTheDog: + - bugfix: Spaceacillin will once again provide antiviral effects for the deceased + Hatterhat: + - bugfix: Colored ammo bands, such as those on .357 and .38 speedloaders, no longer + permanently disappear upon icon update. + Helg2: + - bugfix: Skeletons now heal burn damage with milk once again. + IndieanaJones: + - balance: Hunter and viper spider toxins no longer deal liver damage. + - balance: Tangle spider's acid injection per bite reduced from 5 to 2.5. + Jacquerel: + - bugfix: Gravitational Anomalies will now correctly clean up after themselves, + instead of leaving an area of the station permanently heavy or with no gravity + at all. + - bugfix: Goliaths will try to attack mechs with their tentacles. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Base large airlock subtype no longer spawns a normal sized airlock - image: Added mapping icons for large airlocks - code_imp: Repathed all public airlocks to consistent naming +<<<<<<< HEAD Melbert: - balance: Red toolboxes go faster Paxilmaniac: @@ -890,12 +1565,71 @@ the ability's name, so you can much more quickly see what the ability is. - bugfix: formal closet will no longer spawn with two 'error' icon suits inside of it +======= + LemonInTheDark: + - balance: De-escalates terry powergaming by reducing the strength of sec + Melbert: + - balance: Red toolboxes go faster + MidoriWroth: + - rscadd: Added 28 new food recipes! + Mothblocks: + - rscadd: You can now set your voice to just blips. + Vincent983: + - qol: the chemistry heater can now be unwrenched. + Y0SH1M4S73R: + - bugfix: Head Revolutionaries no longer count towards a revolution's defeat if + they have become simplemobs, basic mobs, or xenomorphs. + iwishforducks: + - spellcheck: fixed the rat king text saying that they're summoning rats + mc-oofert: + - bugfix: fixed border-only firedoors being able to be walked through while closed + san7890: + - bugfix: Beam rifles will no longer inappropriately retain any bonuses they may + gain from wizardry. + - bugfix: Inappropriate stack traces over bonuses being applied to components that + gain bonuses innately (like Mythril stacks) should cease. + vinylspiders: + - bugfix: fixes a harddel in particle holders +2023-08-18: + DeerJesus: + - bugfix: replaced injector with working passive vent in birdshot incinerator + - bugfix: conveyor lever in birdshot incinerator + - bugfix: fixes all the martian drinks having 20 boozepower + EuSouAFazer: + - bugfix: Moved the RD's plant to its proper place in Northstar + Fikou: + - spellcheck: fixes the name of the incline bench press + - balance: you cant speed up the big slappy with slime potion + Ghommie: + - bugfix: Fixed some jank with the dynamic threat curve. + Hatterhat: + - spellcheck: Fixed a lack of plurality when ejecting multiple casings from a revolver. + IndieanaJones: + - rscdel: Removed tiny mob sprite abilities for large mobs + - rscadd: Add a Self Seethrough ability, given to most large mobs and all mobs affected + by a fugu gland + - bugfix: Space Dragon's overlay will no longer vanish at times +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Xenomorph Sentinel and Ambusher Spider's sneak ability now has a transition to a lower alpha as opposed to being immediate. - qol: The sneak ability now uses balloon alerts as opposed to chat alerts. - bugfix: Fixed the Xenomorph Sentinel's Sneak ability icon being an error. +<<<<<<< HEAD - spellcheck: Fixed a lack of plurality when ejecting multiple casings from a revolver. - bugfix: fixes all the martian drinks having 20 boozepower +======= + Jacquerel: + - admin: Adds Spider, Goliath, and Meteor Heart actions to the "Grant Mob Action" + menu. + - admin: Four players can ride the speedwagon + - bugfix: Turning into a space dragon with the polymorphic inverter will no longer + leave you existing in two places + - balance: You can no longer use the belt to transform into monkeys or xenomorphs, + for technical reasons. + - admin: The Add Mob Ability menu now prefixes the typepath of the ability with + the ability's name, so you can much more quickly see what the ability is. + Mothblocks: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - 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. @@ -903,6 +1637,7 @@ 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. +<<<<<<< HEAD - image: bowtie sprite has been tweaked slightly to look a little bit more bowtie-ish - bugfix: Turning into a space dragon with the polymorphic inverter will no longer leave you existing in two places @@ -942,12 +1677,62 @@ SkyratBot: - bugfix: No more stacked items in Meta's custodial closet - bugfix: you can actually tell what hand a reagent dartgun is in now +======= + mc-oofert: + - rscadd: cybernetic moth eyes and their variants + - bugfix: luminescent eyes no longer make you look like a cyclops in the dark + necromanceranne: + - rscadd: Settler quirk! Conqueror the great outdoors....in space. Just make sure + nobody asks you to get anything from the top shelf. + vinylspiders: + - image: bowtie sprite has been tweaked slightly to look a little bit more bowtie-ish + - bugfix: formal closet will no longer spawn with two 'error' icon suits inside + of it +2023-08-19: + DeerJesus: + - bugfix: you can actually tell what hand a reagent dartgun is in now + EuSouAFazer: + - qol: Delta's Detective Office looks better now. + - bugfix: No more stacked items in Meta's custodial closet + Ghommie: + - bugfix: Fixed dynamic. + Helg2: + - bugfix: fixed lavaland beach bartender closets looking off. + - qol: CTF assault class' (with shotgun and rocket gloves) description now mentions + that it has low armor and increased moving speed. + - balance: Decreased CTF recharge start delay for shields from 20 seconds to 12 + seconds. + - balance: Marksmans rifle now has 1.7 scope. + - bugfix: When toggling instagib mode for CTF and pressing a cross now will just + cancel instead of proceeding. + - bugfix: When clicking on other CTF teams spawners and after you already chose + your team no more will ask you to join some other team to make them even. + - bugfix: Base iron floor tiles now will be able to stack with other base iron floor + tiles after being reskined to the base subtype. + - bugfix: '[Waystation] Windoor for secret documents now can be accessed with away + station secoff''s id.' + - bugfix: '[Waystation] Deleted a window on the same place as windoor so it won''t + block your path to secret documents.' + Jacquerel: + - bugfix: the goliath and watcher mating season has ended and population has returned + to normal levels + carshalash: + - qol: Martian fried noodles now requires 2 grown peanuts instead of salted peanut + packet. + mc-oofert: + - bugfix: you can now toggle repair droids and plasma engines on mechas again + - bugfix: you can no longer destroy syndicate modsuits by just being on fire + necromanceranne: + - bugfix: Makes sure settlers are SHORTEST. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Regal Rats have been refactored into basic mobs. They should be a bit smarter and retain their docility (until attacked, in which case you should prepare to get rekt by summoned rats), and properly flee when they can instead of just sit there as you beat them to death. The framework for them interacting with stuff (i.e. opening doors while slobbering on food) is a bit more unified too, now. They also have cooler names too! +<<<<<<< HEAD - bugfix: the goliath and watcher mating season has ended and population has returned to normal levels - admin: Four players can ride the speedwagon @@ -960,6 +1745,11 @@ - bugfix: '[Waystation] Deleted a window on the same place as windoor so it won''t block your path to secret documents.' 2023-08-20: +======= +2023-08-20: + EuSouAFazer: + - qol: Made the cytology lab in many maps much more convenient. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, Armhulen, Sheets (+rep for Mothblocks and Potato): - bugfix: RD MODsuit outfit (admin only) no longer has a beret that blocks the activation of the suit @@ -970,11 +1760,19 @@ tool for editing transforms. - rscadd: MODLink system, available through scryers (from RnD and Charlie Station) and through MODsuits. Lets you call people with holographs! +<<<<<<< HEAD +======= + Jacquerel: + - qol: Added some textual feedback to new watcher abilities + - balance: Watchers will not attack for a short period following their gaze attack + - bugfix: Watchers won't interrupt one ability to use the other one +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Rotated multi-tile airlocks display correctly and won't create an invisible box next to itself Melbert: - bugfix: Reactive stealth armor decoys are half as healthy, as originally intended +<<<<<<< HEAD SkyratBot: - bugfix: Incompatible quirks in existing savefiles shouldn't be possible anymore. - bugfix: ripley MK2 upgrade now properly transfers servos @@ -1006,10 +1804,33 @@ - qol: Made the cytology lab in many maps much more convenient. 2023-08-21: SkyratBot: +======= + Striders13: + - admin: admins can now upload files to the server up to 5mb (used to be 2.5mb) + - config: file upload restriction is now config + iwishforducks: + - bugfix: Some RCD constructs took more material than manual construction. The RCD + cost should be consistent in comparison to manual construction now. + mc-oofert: + - bugfix: ripley MK2 upgrade now properly transfers servos + - spellcheck: inserting parts into mechas now properly says "installed" instead + of "intalled" + spookydonut: + - bugfix: Incompatible quirks in existing savefiles shouldn't be possible anymore. + zeroisthebiggay: + - bugfix: healing holoparas will no longer kill slime people +2023-08-21: + Deadgebert: + - qol: Added two magboots to engine SMES room on icebox station + Ghommie: + - bugfix: Fixed embedding for projectiles. + Jackal-boop: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the lion hunters rifle has been pegged down the knowledge tree. to make sure the tree is kept happy, the rust path and blade path can access rust charge - rscadd: rust charge - balance: the lion hunter ammo knowledge is free +<<<<<<< HEAD tf-4: - bugfix: Ass slapping now puts an overlay on the right person 2023-08-22: @@ -1017,6 +1838,60 @@ - code_imp: HUMAN_MAXHEALTH was made into a more formal define. - bugfix: Combat info readouts (the ones you get from examining ammo/melee weapons/etc) should now be more accurate to the increased health people have. +======= +2023-08-22: + CoiledLamb: + - bugfix: wellcheers is now based on sanity rather than mood + - image: resprites martian cans + - image: adds inhands for martian cans and wellcheers + - image: minor tweaks to other cans + - spellcheck: updates wellcheers mood text + DATA-xPUNGED: + - rscadd: Sacrificed heretic targets will now receive a phobia of heresy instead + of a phobia of the supernatural. Sacrificed heretics will not get this phobia, + but will lose knowledge points instead. + DeerJesus: + - rscadd: Adds green jester shoes that jingle to the autodrobe! + Ghommie: + - bugfix: The "Unlocked Achievements" score will now be properly saved at the end + of the round the first time it's loaded. + - rscadd: You can now feed fish with the can of fish feed without having to put + the fish in a aquarium first. + - balance: Some fish may survive in different, harsher atmospheres if given the + amphibious trait, like chasm chrabs on lavaland. + - qol: aquarium now uses balloon alerts when feeding fish. + - bugfix: The wary and shiny lover no longer incorrectly remove difficulty from + the minigame if conditions aren't met. + Helg2: + - bugfix: '[Birdshot] Morgue now has coroner''s surgery duffel bag instead of regular + surgery duffel.' + Ical92: + - bugfix: fixed beakers disappearing when swapped in a chem heater + IndieanaJones: + - balance: Lasers now have increased energy cost, reverting the cost back to the + initial value before the laser buff. + Jacquerel: + - balance: Watchers have less health + - balance: You can't be overwatched by several watchers at a time + - balance: Watchers won't overwatch you instantly upon seeing you + - balance: Goliaths won't launch tentacles at you instantly upon seeing you + JohnFulpWillard: + - refactor: AI's player-tracking eyes received an unwanted obligatory update, and + should now not tell you that a player is untrackable when they clearly obviously + can be. + - bugfix: Bots that can't be controlled (like beepsky) no longer has a stray 0 at + the very right side of its UI. + LukasBeedellCodestuff: + - rscadd: Added compact shotgun to the hos locker + - rscadd: Added compact shotgun as a traitor objective + - balance: gives the compact shotgun 1 extra shot + Melbert: + - bugfix: Fixed some tooltips in the sec records UI showing "false"s where they + shouldn't. + Profakos: + - bugfix: Mobs whose human appearance is set dynamically will once again have their + bespoke names and descriptions, instead of Unknown, with a blank description. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - rscadd: Ninjas can now temporarily disable cameras with the Ninja MOD right-click hacking ability. @@ -1035,6 +1910,7 @@ - rscadd: Ninjas can now hack open firelocks (temporarily) with right-click. - balance: Hacking open doors with the Ninja Hacking MODule will subtract a paltry amount of energy from your suit. +<<<<<<< HEAD SkyratBot: - bugfix: '[Birdshot] Morgue now has coroner''s surgery duffel bag instead of regular surgery duffel.' @@ -1045,6 +1921,19 @@ - qol: aquarium now uses balloon alerts when feeding fish. - bugfix: The wary and shiny lover no longer incorrectly remove difficulty from the minigame if conditions aren't met. +======= + SyncIt21: + - code_imp: removed unused procs in ore silo + - code_imp: merged repeated code segments when using materials from the ore silo + into a single proc + - code_imp: added auto docs & cleaned up some procs + - refactor: logging when an item is inserted or sheets are ejected from the silo + is now handled directly by the silo itself + - bugfix: plumbing ducts connects to other plumbing machinery again + - bugfix: you can detach signaller from wires without the machine deconstructing + itself + Timberpoes: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Traitor objectives to place posters and graffiti the station have been removed. - rscadd: The items associated with the poster and graffiti objectives can now be @@ -1060,6 +1949,7 @@ engineering to grab some insulated gloves or the psych office to kidnap their moth plush. - bugfix: Fixes an issue where the steal clown shoes objective would never be valid. +<<<<<<< HEAD - qol: Satchels can now be crafted using the same recipe (4 cloth) as backpacks. - bugfix: Fixed a light inside a wall on Delta Station. - refactor: AI's player-tracking eyes received an unwanted obligatory update, and @@ -1089,6 +1979,13 @@ - image: adds inhands for martian cans and wellcheers - image: minor tweaks to other cans - spellcheck: updates wellcheers mood text +======= + YehnBeep: + - qol: Satchels can now be crafted using the same recipe (4 cloth) as backpacks. + - bugfix: Fixed a light inside a wall on Delta Station. + dieamond13: + - image: adds new sprites for opened fireaxe/mech crowbar cabinets. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Replaced slime clone damage with a "Covered in Slime" status effect that deals brute damage over time and can be washed off by standing under a shower. @@ -1096,6 +1993,7 @@ - code_imp: Replaced the magic strings in slime code with macros. Also included some warnings to anyone daring to touch the macros. 2023-08-23: +<<<<<<< HEAD Melbert: - bugfix: Fixed some tooltips in the sec records UI showing "false"s where they shouldn't. @@ -1185,6 +2083,73 @@ as the tram moves - code_imp: Tram landmarks are now all subtyped instead of map varedits SkyratBot: +======= + Ben10Omintrix: + - refactor: the goldgrub has been refactored please report any bugs + - rscadd: the goldgrub can now be tamed and he can have babys + DATA-xPUNGED: + - rscadd: You can now fully color your hair with a hair spray! + - qol: splits hair sprays are now smoother on the transition, similar to the short + fades. + Deadgebert: + - bugfix: Birdshot pharmacy airlock now requires pharmacy access + FlufflesTheDog: + - bugfix: Taking a nap can once again heal minor wounds + - bugfix: A breath of healium will no longer knock you out for eternity + - bugfix: Healium sleep now respects sleep immunity + Melbert: + - code_imp: Cleans up limb wound examine text code a tad. + Rhials: + - bugfix: Metastation's arrivals area no longer has an intercom overlapping with + the request console. + ZephyrTFA: + - bugfix: pda messages are no longer hidden from dead players who are not observers +2023-08-24: + Fikou: + - rscadd: wizards are now introverts + JohnFulpWillard: + - balance: The Traitor's Camera bug is now a tablet app that works like a silent + camera console with an extra ability to track people through their nearby cameras. + MidoriWroth: + - bugfix: Moussaka now only uses eggplants instead of eggplants and potatoes + - bugfix: Pita bread no longer burns on the griddle/oven + Nerev4r & Zydras: + - image: Adds messenger bags to character setup and drobes/lockers! + Rhials: + - rscadd: The roundend report will now read out any achievements ("cheevos" as you + may know them) earned by players over the course of the round. + Vekter: + - balance: Grilles will now take 0-1 damage every time they shock something. + - balance: Powersinks are now available earlier in traitor progression. + YehnBeep: + - qol: Icebox perma now has holopads. +2023-08-25: + Ben10Omintrix: + - bugfix: regal rats now run away from whoever attacked them + - rscadd: new pet behavior which makes pets defend their owners if they got attacked + Deadgebert: + - qol: Adds air supply for cycling airlocks in ordnance and atmos incinerator on + all stations + - qol: Makes internal incinerator chamber a vacuum + - bugfix: Adds missing incinerator airlock control console to Tram station + Derpguy3: + - bugfix: Rotated a water tank in icebox's lower service hall, connecting the plumbing + to the water source. + Dmeto: + - bugfix: Some incident display adverts on Northstar and Birdshot have been unobstructed. + Donglesplonge: + - balance: removes the access restrictions from all animals found under the livestocks + tab of the cargo order console, now assistants can private order animals for + their farms without access hunting + Fikou: + - bugfix: fixes multitools possibly randomly losing their buffer + - bugfix: fixes modlinks checking battery charge without a battery and working without + charge + - qol: modlink stuff is a bit more explained + - bugfix: modlinks printed from rnd no longer start with a frequency (remember to + copy it from another one with a multitool buffer, robotics starts with 2 NT + frequency linked ones) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: ninja's stealth module gives silent footsteps when active - balance: all ninjas now have the light step and freerunning quirks - balance: ninja's hacker module shove no longer stuns in 1 hit. first shove knocks @@ -1194,6 +2159,7 @@ sprite is now an underlay, so you can click the person inside the net pretty easily and if you wanna hit the net you click the green part or the darker sides that the human sprite doesnt cover +<<<<<<< HEAD - bugfix: Rotated a water tank in icebox's lower service hall, connecting the plumbing to the water source. - qol: Adds air supply for cycling airlocks in ordnance and atmos incinerator on @@ -1242,10 +2208,40 @@ - balance: removes the access restrictions from all animals found under the livestocks tab of the cargo order console, now assistants can private order animals for their farms without access hunting +======= + Guillaume Prata: + - qol: QM jumpsuit/skirt expose the torso when adjusted. + Helg2: + - bugfix: fixed apocalypse rune applying invisibility to mobs. + - bugfix: Unholy water preview icon is now similar with the icon it has. + LT3: + - rscadd: Immovable rod will now battle the unstoppable tram should they cross paths + - bugfix: Birdshot's maint tram doors now work properly + - bugfix: Tramstation's exterior light fixtures no longer get destroyed as soon + as the tram moves + - code_imp: Tram landmarks are now all subtyped instead of map varedits + distributivgesetz: + - rscdel: Removes miscellaneous sources of clone damage from the game. + iwishforducks: + - bugfix: You should be able to click on lattices on icebox with the RCD and construct + a floor now + mc-oofert: + - rscadd: becoming a felinid makes your brain smaller (visually) +2023-08-26: + GoldenAlpharex: + - bugfix: Fixes the recycler being able to grind the server to a halt by trying + to recycle the same sheet worth of material over and over and over again. + Guillaume Prata: + - qol: Medical Kiosk now have their wand removed with a right click, got new screentips + and have a few of its chat messages turned into balloon alerts. + YehnBeep: + - qol: Messenger bags can be crafted with 4 cloth. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Replaces decloning clone damage with a strike system that you can replenish with Mutadone. - bugfix: The decloning virus is curable with rezadone again. +<<<<<<< HEAD tf-4: - spellcheck: Fixed examine text for gemital. 2023-08-27: @@ -1259,6 +2255,51 @@ can now be destroyed much easier and cut with wirecutters without unwrenching. - bugfix: Borgs no longer get permastunned by emotes - bugfix: Borg hud should not fuck up in few situations +======= + iwishforducks: + - bugfix: You should no longer attack RCD effects when they're done constructing. + san7890: + - admin: The "HREF Dock Exploit" message should now contain a bit more usable information + (such as a jump link) so you can investigate if something is really going wacky + with shuttles. + vinylspiders: + - refactor: fixed a bunch of instances of callbacks being qdeleted and cleaned up + related code +2023-08-27: + CoiledLamb: + - bugfix: the coroner medkit can now hold every item it spawns with + Deadgebert: + - bugfix: multitool can be used on APC/Teslacoil/SMES/emitter if it has exposed + wires. + - qol: Icebox monsters no longer spawn close enough to aggro Lia at round start + Fikou: + - bugfix: quartermasters get their voice of god power boost correctly + Ghommie: + - bugfix: Fixed the double-barreled shotgun not working properly + - qol: The Achievements UI now shows how many people have unlocked a given achievement. + - bugfix: The "Skills" Category for achievements should no longer be hidden. + Jacquerel: + - bugfix: Watchers won't retain an ethereal outline of their wings hovering over + their dead body. + Kubisopplay: + - bugfix: Borgs no longer get permastunned by emotes + - bugfix: Borg hud should not fuck up in few situations + MTandi: + - bugfix: Fixed Phazon construction message typo + RikuTheKiller: + - bugfix: Light eaters can no longer be eaten by their higher-grade brothers, the + trash eaters. (recyclers) + SyncIt21: + - bugfix: zipping a duffle bag closes the UI of all storage items opened inside + it + YehnBeep: + - qol: Stabilized yellow slime extracts no longer spam a message every charge pulse + (but examining characters will still show that it's active). + YesterdaysPromise: + - rscadd: 'Gave snow legions a separate corpse-drop pool: ash walkers excluded, + but eskimos included.' + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a syndicate AI card for nuke ops. Costs 12 TC, can be refunded. Activating it in-hand opens up a ghost poll like normal reinforcements. Base interaction range for syndicate AIs is one, which means they can handle electronics only @@ -1267,6 +2308,7 @@ and can be applied onto a syndicate AI (inside any container) to increase its interaction range by two per. (Three purchases are recommended for seven tiles of range!) +<<<<<<< HEAD - bugfix: greyscale colors will now update on the mob when modifying them via the VV menu - bugfix: the coroner medkit can now hold every item it spawns with @@ -1294,10 +2336,38 @@ - bugfix: fixed a bug that could cause the altar's religion selection ui to bug out if a previous chaplain left via cryo without selecting a religion themselves. 2023-08-28: +======= + iwishforducks: + - balance: Railings now only cost 2 rods and are much easier to construct. But they + can now be destroyed much easier and cut with wirecutters without unwrenching. + mc-oofert: + - qol: rats no longer spawn on multiz cable hubs + necromanceranne: + - bugfix: Ops wanting to get the CQC kit will actually get given the kit, and not + just the CQC book. + tf-4: + - spellcheck: Fixed a spelling error with the daps emote. + vinylspiders: + - bugfix: greyscale colors will now update on the mob when modifying them via the + VV menu + - qol: inserting new high luminosity eyes will now properly remember the previous + eyes' color and default to that initially +2023-08-28: + Comxy: + - rscadd: New rotator disposal pipe. + - bugfix: Flipped transit tube stations are now accessible in the RPD again. + - image: New rotator disposal pipe sprite. + Das15: + - bugfix: Big fuel tanks' capacity is back to 5000. + Ghommie: + - bugfix: Fixed an issue with the "recolor from string" option in the greyscale + modify menu that resulted in invisible icons. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - bugfix: Unary vents have a pressure cap on both their pressuring and siphoning mode now, preventing the bypass trick of putting "infinite" pressure on tiles/pipelines. - balance: Overclocked Volume Pumps do not have a pressure cap anymore. +<<<<<<< HEAD LT3: - bugfix: Using an airlock painter on a GAGS airlock works properly - bugfix: Tram will no longer fly off into space when admins try to reset the contents @@ -1334,10 +2404,30 @@ - rscadd: Proto-NRI/CIN food (and not only food) replicator - rscdel: Green IRP-B (or whatever it was idk idc) NRI MRE, replaced with a new unique one. +======= + Jacquerel: + - bugfix: You can't use the bioscrambler belt to turn yourself into a changeling. + JohnFulpWillard: + - qol: Display case chassis now uses balloon alerts, screentips, examine hints, + etc. Basically, the construction steps are more visible to players. + LT3: + - bugfix: Using an airlock painter on a GAGS airlock works properly + - bugfix: Tram will no longer fly off into space when admins try to reset the contents + MTandi: + - qol: Crafting menu "Can Make" category shows complex recipes first. + Sealed101: + - bugfix: after a long 6 years, alien alloy once again unlocks the Alien Technology + node (the one that lets you print alien alloy) + Watermelon914: + - rscadd: Added associative list variables and associative list variable manipulation + for finer data manipulation and storage. + - rscadd: List Find components will now return the index of the element it has found. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Add an achievement for saving a cascading engine from the final countdown. - balance: Damaging synchronous mesh blobs now incorporates damage resistance of other blob structures when dealing shared damage to those nearby. +<<<<<<< HEAD 2023-08-29: Iajret: - bugfix: changed contractor's modlink frequency to syndicate @@ -1349,11 +2439,64 @@ - bugfix: Quartermaster's Overcoat and Cargo's gorka can now hold stamps in their suit slots, just like their winter coat counterpart - bugfix: Made it easier to place tiles on multi z level holes +======= + mc-oofert: + - rscadd: clickdragging an autolathe changes its output direction + nikothedude: + - bugfix: Woundscans no longer runtime + - bugfix: Normal health analyzers can no longer give the first aid bonus when woundscanning + vinylspiders: + - code_imp: fixed some typos + - bugfix: fixes a runtime with arrow projectiles + xXPawnStarrXx: + - bugfix: fixed corn cobs not making seeds and lying to you in the text box. +2023-08-29: + Ben10Omintrix: + - bugfix: mobs do not get stuck when running away from danger + DATA-xPUNGED: + - bugfix: Quartermaster's Overcoat and Cargo's gorka can now hold stamps in their + suit slots, just like their winter coat counterpart + Fikou: + - bugfix: roundstart modlink scryers now come with the nt frequency + FlufflesTheDog: + - bugfix: Made it easier to place tiles on multi z level holes + - bugfix: Non-surgically debraining someone no longer makes their brain unusuable + Hatterhat: + - bugfix: Ash drakes, colossi, and Bubblegum spawn on Lavaland more often; a sharp + increase from the previous bugged amount of "basically never". + Jacquerel: + - image: progress bars and cleaning particles are now centered on the tile occupied + by the target, if it is a big sprite + LT3: + - balance: Pre-equipped engineering modsuit now includes emergency tether + - balance: Pre-equipped atmospherics modsuit now includes magboots + OrionTheFox: + - rscadd: Cargo now once again has access to a "Cargo Shortskirt", a skirt variant + of their shorts! + - image: tweaks and adjustments to the Cargo resprite have been made, as well as + respriting some missed icons such as the Winter Coats and QM Cloak + Seven: + - bugfix: Syndicate ranged mobs (and probably other basic mobs) properly update + their shell's description to show they are spent. + Vincent983: + - qol: Various jobs have gotten additional programs uploaded at roundstart, engineers + now have the canary and atmospheric scanner programs, atmospheric technicians + now have the supermatter monitor, and Robotisists/RDs now have the silliconnect + program. + carlarctg: + - bugfix: Items worn on a void cloak's suit storage are no longer visible on the + stripping menu. + - qol: Misclicking the turf below a heretic influence no longer leaves a fingerprint. + iwishforducks: + - bugfix: Railings no longer give more metal than they take + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The Lavaland Cursed Slot Machine of Greed suddenly seems a lot more sinister... - refactor: Instead of taking clone damage from the cursed slot machine, you now get a status effect with a number of curses associated with it. There's some interesting florid language associated with the status effect as a nicety until your eventual gibbing from chasing that prize. +<<<<<<< HEAD - bugfix: Non-surgically debraining someone no longer makes their brain unusuable - bugfix: Items worn on a void cloak's suit storage are no longer visible on the stripping menu. @@ -1391,10 +2534,50 @@ - rscadd: Added a set of new donator items - rscdel: Removed older, unused (and broken) donator items 2023-08-31: +======= +2023-08-30: + Ghommie: + - sound: Unlocking an achievement now plays a sound by default. You can change it + in the Sound category of the game preferences. + Melbert: + - balance: If your server has non-human morgue cadavers enabled, you will be guaranteed + one human cadaver no matter what. + - balance: All maps (with the exception of Birdboat) now have an additional morgue + cadaver roundstart. + RikuTheKiller: + - bugfix: Probital overdose no longer causes plasmamen and other inorganics to receive + the longest nap in their lives. + Sealed101: + - qol: Metastation has had more navigate landmarks added, namely for areas like + Medbay, Cargo, Engineering, department heads offices and a few more. + SyncIt21: + - refactor: sheets are merged in a better way when ejected from machines & material + related stuff + - bugfix: rcd can build wallmounts on reinforced walls + - qol: rcd can build directional windows without requiring/building a grill + Timberpoes: + - bugfix: Fixes an issue where role banned players would be able to accept certain + ghost roles they're meant to be banned from. + VladinXXV: + - qol: The coroner can now store scythes in their labcoat and winter coat suit storage. + Ask not for whom the bell tolls... + xPokee: + - bugfix: fixed skeleton wings not being visible from behind while closed +2023-08-31: + Comxy: + - bugfix: Fixes Star Gazer getting buckled + - image: Removes Star Gazer alpha pixels + Fikou: + - qol: removes the nukie tool parcel and places the tools directly in their box + GoldenAlpharex: + - bugfix: Fixes a rare issue that could lead to players entering an infinite disconnection + loop from having a null view. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: The "You can't move while buckled to X" is now a balloon alert instead of a to_chat message. Hopefully we all get buckle stuck processing why our inputs are not working less often for now on. +<<<<<<< HEAD Ldip999: - qol: Space hotel and Tarkon now comes with range ovens Motho: @@ -1422,17 +2605,34 @@ Shadow-Quill: - spellcheck: Fixed the ] appearing in cryopod action text. SkyratBot: +======= + LukasBeedellCodestuff: + - bugfix: Changed icebox permabrig door type to be correct + Momo8289: + - qol: Cryotubes will now notify medbay if the patient within is dead, and will + eject them if auto is on. + - qol: Cryotubes will now automatically turn on when a patient enters it if auto + is on, but you can no longer close the cryotube on yourself. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: autolathe prints the correct amount of stacks and merges it with existing stacks on the turf - bugfix: autolathe takes constant time when printing stacks - code_imp: autolathe will attempt to award you the "getting an upgrade" award only once when printing multiple items & updates UI immediately +<<<<<<< HEAD - sound: Unlocking an achievement now plays a sound by default. You can change it in the Sound category of the game preferences. +======= + iwishforducks: + - bugfix: Space heaters no longer give extra cells when deconstructed + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Compact fishing toolboxes no longer break space and time to contain any normal-sized object. Instead, they only break space and time to contain fishing rods. Settlers migrating to Nanotrasen space have no reasonable explanation for this phenomenon. +<<<<<<< HEAD - refactor: sheets are merged in a better way when ejected from machines & material related stuff - bugfix: Probital overdose no longer causes plasmamen and other inorganics to receive @@ -1462,3 +2662,13 @@ master_files olirant: - rscadd: 1 donator plush +======= + nikothedude: + - balance: Prosthetics and slimepeople can now have limbs dismembered + - balance: Slimepeople can now receive slash wounds, but cannot bleed + - balance: Most limbs can now be dislocated + - refactor: Scar backend reworked, scars will be wiped as they update to the new + format + san7890: + - bugfix: The Cursed Slot Machine should now actually give you more than one pull. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index a45513671ce..7a2deb66183 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -1,4 +1,5 @@ 2023-09-01: +<<<<<<< HEAD GoldenAlpharex: - bugfix: Fixes a rare issue that could lead to players entering an infinite disconnection loop from having a null view. @@ -36,10 +37,16 @@ - qol: Metastation has had more navigate landmarks added, namely for areas like Medbay, Cargo, Engineering, department heads offices and a few more. - qol: Adds accessibility to breasts for service members +======= + 1393F: + - balance: megafauna will now gut instead of dusting or gibbing + FernandoJ8: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: containers can no longer add more water to hydroponic trays than they actually contain. - bugfix: watering a hydroponic tray with amounts of water lesser than 1 will no longer be added to nutrients rather than water +<<<<<<< HEAD - rscadd: Cargo now once again has access to a "Cargo Shortskirt", a skirt variant of their shorts! - image: tweaks and adjustments to the Cargo resprite have been made, as well as @@ -53,10 +60,13 @@ - image: Resprited geraniums, poppies, and lilys, along with changing their worn icon. 2023-09-02: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Fixed the crafting menu being able to get stuck if your crafting recipe somehow goes missing. - code_imp: Improves the quality of the item crafting code slightly. +<<<<<<< HEAD Sealed101, EBAT_BASUHA for spritework: - rscadd: Wizard's Den now has a book of Summon Cheese in the Studies Room SkyratBot: @@ -188,6 +198,12 @@ meats for the purposes of reagent purity' - bugfix: It's now humanly possible to reach the legendary fisherman rank, get the achievement and the hat. +======= + Guillaume Prata: + - balance: Fanny packs are now silent, no one will get a chat message about what + you put in or take out. + MTandi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Mood buff power and duration depends on the ingredient quality and recipe complexity of the food. - rscadd: Hand-crafted food also gives a non-mood buff. The buff type depends on @@ -212,6 +228,7 @@ - qol: 'Seed Extractor now shows additional seed data: possible mutations, juicing result, grinding result, fermentation result' - bugfix: Reverts the unintended change of monkey cube biomass cost back to 50 +<<<<<<< HEAD - bugfix: kinesis plus properly lets you move again when grabbed once - rscadd: Adds the medbeam module for nukies, don't cross the damn beams. (Also removes the handheld one from the uplink) @@ -264,10 +281,221 @@ - qol: Adds cables under birdshot xeno containment shielding. - bugfix: Machine frames in NorthStar Cyto are now functional. - qol: Minor cable/pipe changes to NorthStar the xeno containment. +======= + Momo8289: + - bugfix: Meth will no longer explode when reacting in a body + Rhials: + - rscadd: Nuclear operatives have expanded the scope of their hiring practices. + Members of all species can now roll nukie! + - qol: The preferences menu now has an option to always be human when being selected + for a nuclear operative role. Check it out! + - image: Plasmaman operative envirosuits. + Sealed101, EBAT_BASUHA for spritework: + - rscadd: Wizard's Den now has a book of Summon Cheese in the Studies Room + Seven: + - bugfix: Fixes not being able to break out of graves + - qol: Graves are no longer dense (you can walk over them now) + VladinXXV: + - qol: The organ harvester's output is more predictable, and the direction can be + changed by alt-clicking with the panel screwed open. + carshalash: + - qol: Adds accessibility to breasts for service members + nikothedude: + - rscdel: Deleted a unused file + xPokee, Pirill: + - rscadd: Added flower crowns, craftable via the clothing menu. + - image: Resprited geraniums, poppies, and lilys, along with changing their worn + icon. +2023-09-02: + Jacquerel: + - bugfix: Prevents admins from accidentally gibbing people by closing a confirmation + window. + - bugfix: Traitors should generate with "free objective" less often, and will once + more be assigned to steal things. + Profakos: + - bugfix: Ex-Interdyne pirates can now successfully spawn on case sensitive host + systems, such as Linux + Shadow-Quill: + - bugfix: Hilbert's Hotel Research ruin now has a functioning tram. As a side effect, + the malfunctioning tram event should now only fire on maps with a tram! + Thebleh: + - bugfix: fixed access on a couple of Engineering and Atmos airlocks on DeltaStation +2023-09-03: + Ben10Omintrix: + - bugfix: basic ranged mobs will now chase victims + Capsandi: + - sound: 2 new ambient tracks for maintenance tunnels + Fikou: + - bugfix: you can now examine screen objects properly + Ghommie: + - bugfix: You can now actually fish soggy wallets from toilets, rare ores on ice + moon, some boney stuff in oil puddles (good luck finding them) and lube-fishes + by the seawater. + Guillaume Prata: + - rscadd: 'New funny internals for the clowns to spawn with. They come with O2 and + a secondary gas between 3 options: BZ, Helium and N2O. Talk with a "different + tone" with Helium, giggle and laugh "uncontrollably" while under the minor effects + of N2O or have "fun" hallucinations while under the minor effects of BZ.' + - balance: To not cut on how long the clown's O2 internals last due to the mixed + gases, the funny internals have 50% more gas volume, same as engineers' internals. + Iamgoofball: + - bugfix: You can no longer create non-synthesizable chemicals with bees. + Melbert: + - bugfix: Fix bastard sword granting infinite stun immunity + - balance: Ascended Blade Heretics no longer have blanket stun immunity, they now + have 45 seconds of stun absorption that recharges after 2 minutes - think His + Grace. This doesn't affect stamcrit (still immune to that) (assuming you haven't + consumed all of your immunity charge) but does affect hard CC such as slips, + flashbangs, or beepsky. + - balance: Ascended Blade Heretics now have a 0.75 modifier to incoming knockdowns. + Profakos: + - bugfix: The HUDs of mobs with dynamic human appearance will appear properly. + Rhials: + - qol: The pirate candidate gathering poll will now mention which pirate gang it + is gathering candidates for. + Sealed101: + - bugfix: fixed implanted legion cores being available for use when unconscious/dead. + blueDev2: + - bugfix: Soups are accepted by Kitchen Smartfridges + - bugfix: Soups are not accepted by drink showcases + carlarctg: + - rscdel: Removed the threshold for confusion symptom that adds illiteracy to the + disease. + - balance: Clamps confusion symptom's confusion to a maximum of 30 seconds. + - qol: Confusion as a debuff no longer guarantees random movement if you're resting. + nikothedude: + - bugfix: Slash wounds are now compatable with pierce wounds + xPokee: + - bugfix: Fixed the air inside of a penguin pen being way too cold +2023-09-04: + CoiledLamb: + - rscadd: adds medical carts and surgery trays + - image: gives the surgery razor a unique sprite + - image: resprites the genesploicer. + DaydreamIQ: + - rscadd: Adds the medbeam module for nukies, don't cross the damn beams. (Also + removes the handheld one from the uplink) + DrDiasyl: + - sound: 'Adds/modifies next sound files: airraid.ogg, bloblarm.ogg, alert.ogg, + notice3.ogg, announce_syndi.ogg' + - sound: Code Red, Delta, and other extreme emergencies now possess more unique + alarm sound effect + - sound: Captain's arrival now is announced by Captain's announcement sound, but + not for Acting Captain's + - sound: Making Captain announcement through emagged console; hijacking or fully + corrupting evacuation shuttle now plays more ominous sound + - sound: Making announcements through Requests Console now plays a more noticeable + sound + - image: Status Displays sprites have been fully changed. Now they include displays + for every Security Level + - qol: The "Red Alert" button in the Communications console status display menu + has been replaced with a "Current Alert" button showing the current station + Security Level display on Status Displays + - qol: Communications console status display menu got a new "Radiation" button which + shows radiation symbol on Status Displays + FernandoJ8: + - bugfix: boiled rice doesn't burn instantly after being baked + - code_imp: simplifies the way burning food is handled, grilled/baked food now turns + to a burnt mess rather than being set on fire, unless they have a baking/grilling + recipe + Fikou: + - bugfix: kinesis plus properly lets you move again when grabbed once + Guillaume Prata: + - rscadd: Atmos Tech now have new drip and will spawn with Atmos Overalls to protect + their clothing from gas leaks! (It will actually not protect you against fire + or leaks, but hey! It's the thought that counts!!) + Sealed101: + - bugfix: fixed basic mobs not dropping their butcher results when gibbed + Time-Green: + - rscdel: Removes the swarmer beacon achievements from the game (no one ever got + them, and they haven't been obtainable for years) + Whoneedspacee: + - bugfix: Multi-z Icebox ruins including the Demonic Frost Miner can now be placed + again + carlarctg: + - sound: Adds a sound effect for hypospray/medipen injections. Doesn't affect sleepy + pens or HMS injectors + distributivgesetz: + - code_imp: Moved some job-related achievements from the misc category to the jobs + category. + vinylspiders: + - bugfix: '''meat product'' and imitation carp meat are now considered synthetic + meats for the purposes of reagent purity' +2023-09-05: + Ben10Omintrix: + - qol: pollinating bees will now only attack players that are standing near the + beehive + Eronymun: + - bugfix: You can no longer walk into Birdshot's secure tech storage like you own + the place - unless you do own the place. + Ghommie: + - bugfix: It's now humanly possible to reach the legendary fisherman rank, get the + achievement and the hat. + - bugfix: fixed fishing skeleton mob spawners that immediately crumble back into + the void of whatever chasm you fished them from. + - balance: The fishing minigame should be easier now. + Iamgoofball: + - bugfix: Updates the changelog link for the pre-4407 changelog as it was moved + JohnFulpWillard: + - bugfix: PDAs being on silent no longer prevents PDAs from being sent to your chat, + again. + - rscadd: pAIs inserted into a PDA can now control the PDA, and will receive PDA + messages sent to it (and can respond under the PDA's name). + LT3: + - image: New medical bed and emergency roller bed + - code_imp: Added context hints for beds + Sealed101: + - bugfix: fixed bileworm evolution deleting anything they devoured; they will now + eject their contents upon evolution to vileworms + mc-oofert: + - bugfix: emissive appearances on glowy eyes and such now properly rotate +2023-09-06: + Acantharctia: + - rscadd: Added the Numb quirk, that makes you (almost) unable to perceive how much + your injuries hurt. + Ben10Omintrix: + - refactor: the minebots have been refactored please report any bugs + - rscadd: minebots can now mine walls and collect ores automatically and they will + alert everyone if they find u dead + CoiledLamb: + - image: cleans up the engineering emergency internals sprite slightly + Jackal-boop: + - spellcheck: re-writes cosmic heretic lore + Krysonism: + - image: resprites the noticeboard + carlarctg: + - bugfix: Fixed walking into grilles to destroy them + lizardqueenlexi: + - bugfix: Fixed all-in-one grinders not giving all the correct reagents when grinding. + - spellcheck: Improved phrasing and syntax on dismemberment mood messages. + - bugfix: Snow legions now drop only one corpse, and no longer drop Lavaland corpses. +2023-09-07: + Ben10Omintrix: + - bugfix: basic mobs can now use ranged burst attacks + Dmeto: + - bugfix: Machine frames in NorthStar Cyto are now functional. + - qol: Minor cable/pipe changes to NorthStar the xeno containment. + - qol: Adds cables under birdshot xeno containment shielding. + Eronymun: + - bugfix: The Birdshot Gaming Den now has arcade circuit boards and computer frames + that actually work. + Melbert: + - rscadd: '[Icebox] Remaps arrivals and the maintenance around it. Aux base out, + mass driver into a plasma lake in.' + Sealed101: + - bugfix: fixed mirrors not breaking when a curse effect is triggered + Thunder12345: + - bugfix: Public mining storage's camera is now on the mining network instead of + the gulag. + dieamond13: + - image: adds special sprites for lungs when you use the smoker quirk + norsvenska: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: NorthStar's departmental head offices have had their respective PDA & ID imprinters added! - qol: The NorthStar Head of Security office has gotten a small expansion. vinylspiders: +<<<<<<< HEAD - bugfix: mold on multi-z maps will no longer spawn in or spread resin to openspace turfs 2023-09-08: @@ -289,6 +517,19 @@ - image: adds special sprites for lungs when you use the smoker quirk - bugfix: basic mobs can now use ranged burst attacks - balance: gas mixer output now accurate to set ratio regardless of input temperatures +======= + - bugfix: leash unit test will time out less often and increases the timer until + it is considered 'timed out', to reduce false CI failures +2023-09-08: + Deadgebert: + - balance: gas mixer output now accurate to set ratio regardless of input temperatures + Ghommie: + - image: The glow shoes from the ClothesMate now actually glow and can be recolored, + even with a spraycan. + - spellcheck: Corrected the name of the telescopic fishing rod to "telescopic fishing + rod" from the more generic "fishing rod" + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Traitors, Changelings, Heretics, Wizards, Malfunctioning AIs, and Ninjas can now all reject their original objectives and provide one of their own in its place. A Heretic doing this will no longer be able to ascend. @@ -296,6 +537,7 @@ report success or failure upon round end.' - qol: Space Ninja spider charges will now display where they can be detonated when examined, if you are a ninja. +<<<<<<< HEAD 2023-09-09: LT3: - qol: Supermatter common channel alerts are less frequent if the crystal's integrity @@ -310,6 +552,9 @@ - bugfix: The messenger app can now be used when laying down. - bugfix: Cauteries now have 'heat', like lighters, welders, etc. - qol: You can smoke with a space helmet as long as you have internals on. +======= + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Getting a node researched now properly makes it no longer hidden. - bugfix: Ninjas draining RD servers now drains it from the connected techweb, rather than sniping Science. @@ -317,6 +562,7 @@ z-level, with the Science techweb remaining as fallback. - rscadd: Oldstation RND, comes with their own Techweb and special surgery to gain research points through dissecting Xenomorphs. +<<<<<<< HEAD - balance: Traitors who are activated as sleeper agents or arrive late on the arrivals shuttle will begin with more reputation and likely be able to immediately access most of the uplink catalogue. @@ -331,10 +577,46 @@ - code_imp: Removed extra calls to nightshift subsystem during delam - bugfix: Votes play an alert sound again SkyratBot: +======= + LT3: + - bugfix: Meteors no longer take damage from crossing certain unoccupied turfs + Sealed101: + - balance: colossus' near-death attack now starts after a 0.5 seconds delay + carlarctg: + - bugfix: Cauteries now have 'heat', like lighters, welders, etc. + - qol: You can smoke with a space helmet as long as you have internals on. + cnleth: + - bugfix: Megafauna now correctly prints the victim's name after a kill + san7890: + - refactor: If you transform into another mob and notice bugs with interacting with + the game world, please create a bug report as this framework was recently refactored. + vinylspiders: + - bugfix: fixes creamatorium not producing any suspicious ice cream, and fixes a + dead mouse related harrdel +2023-09-09: + CoiledLamb: + - image: updates medigel sprites + Jacquerel: + - balance: Traitors who are activated as sleeper agents or arrive late on the arrivals + shuttle will begin with more reputation and likely be able to immediately access + most of the uplink catalogue. + LT3: + - qol: Supermatter common channel alerts are less frequent if the crystal's integrity + is rising rapidly + Majkl-J: + - bugfix: The messenger app can now be used when laying down. + san7890: + - rscadd: Ever see a robot yawn? Don't worry, it makes sense now. +2023-09-10: + Jacquerel: + - bugfix: It is now possible to smoke cigarettes even if you aren't wearing a safety + helmet +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Golems can eat - bugfix: Cooked and crafted food should be edible - bugfix: Medborgs can now spawn vanilla ice cream instead of nothing ice cream - bugfix: Ghosts can examine food +<<<<<<< HEAD - bugfix: Exploration drones can't be used to reach Centcom anymore. - admin: Admins can add/remove the spawner component from arbitrary items again. - qol: adds some more traitor objective brainwashing default objectives. @@ -356,6 +638,34 @@ hand teleporters, citing a new "stand and deliver" doctrine established by more violent, militant arms of the organization. Melbert: +======= + - admin: Admins can add/remove the spawner component from arbitrary items again. + Rhials: + - qol: adds some more traitor objective brainwashing default objectives. + - spellcheck: fixes the double-punctuation on traitor objective brainwashing broadcasts. + - spellcheck: brainwashing deadchat broadcasts will now auto-punctuate. + carshalash: + - bugfix: ' Corrects various food types from the martian food expansion' + distributivgesetz: + - admin: The "Create Command Report" verb now has the option to not print report + papers at communications consoles. + leaKsi: + - bugfix: Exploration drones can't be used to reach Centcom anymore. + nikothedude: + - refactor: Refactored wounds yet again + - bugfix: Wounds are now picked from the most severe down again, meaning eswords + can jump to avulsions + - bugfix: Scar descs are now properly applied +2023-09-11: + Jacquerel: + - image: Hivelords have a new sprite. + - image: Hivelord and Legion brood have a death animation. + - bugfix: Your clothes and such should correctly reposition themselves if a black + charged slime extract turns you into a monkey. + Melbert: + - rscdel: Spacers are slightly shorter. They're still taller than other people, + just not as much. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Haunted 8-ball no longer requires the ghost orbit the petitioner to submit votes - qol: Haunted 8-ball ghosts can now change their vote after submitting it @@ -363,13 +673,29 @@ - bugfix: Haunted 8-ball no longer always reports default "yes", "no", or "maybe" and now gives a proper eight ball response - bugfix: Haunted 8-ball can be picked up via the stat panel +<<<<<<< HEAD RatFromTheJungle: - rscdel: Guns, collectively, can no longer right-click holdup people SkyratBot: +======= + Profakos: + - bugfix: Mortar and pestle can grind stuff again + Sealed101: + - balance: polymorph belt now blacklists mobs that are undead, humanoid, robotic + or spiritual (in nature, not religiously), as well as megafauna + - balance: however, this means that it works with more mobs that it should logically + work with, like slimes/bugs/lightgeists etc + - bugfix: fixed headslug shenanigans with the polymorph belt hopefully for good + this time + - bugfix: fixed headslug description mentioning its movement despite the slug being + dead + Vincent983: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Added the service borg "drink apparatus" upgrade, which adds an extra drinking apparatus to the borg, up to a maximum of 5 extra. :cl:' +<<<<<<< HEAD - bugfix: Changeling tentacle and bloodchiller from xenobio will no longer stop working if you have antimagic - qol: Rice Dough may be made in beaker instead of being crafted, but the rice and @@ -419,6 +745,29 @@ - bugfix: Your clothes and such should correctly reposition themselves if a black charged slime extract turns you into a monkey. - bugfix: Ninjas should be correctly credited for using their spider bombs +======= + Wallem, MTandi: + - image: Updates chem factory tank sprites + blueDev2: + - qol: Rice Dough may be made in beaker instead of being crafted, but the rice and + flour must be added first + cnleth: + - bugfix: Changeling tentacle and bloodchiller from xenobio will no longer stop + working if you have antimagic + mc-oofert: + - rscadd: humpback emergency shuttle +2023-09-12: + CoiledLamb, Time-Green: + - image: resprites the radioactive nebula shielding + GoldenAlpharex: + - bugfix: The message sent to admins when a new admin has been added via the Permissions + Panel will now properly show the new admin's ckey. + Jacquerel: + - bugfix: Ninjas should be correctly credited for using their spider bombs + LT3: + - code_imp: Status display shuttle timer no longer scrolls + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Supermatter zap power generation scales with the delta time between its last zaps, preventing faster zapping from scaling power generation to extreme levels. @@ -430,6 +779,7 @@ rate independent of subsystem lag. - qol: Xenomorph plasma generation and resin healing scales with the world's delta time, making their rates independent of subsystem lag. +<<<<<<< HEAD - balance: polymorph belt now blacklists mobs that are undead, humanoid, robotic or spiritual (in nature, not religiously), as well as megafauna - balance: however, this means that it works with more mobs that it should logically @@ -731,6 +1081,9 @@ Thebleh: - bugfix: Bluespace RPEDs can now be rigged again nikothedude: +======= + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Several common 'household' reagents can be used as improvised medicine treatment. - rscadd: Drinking tea will help mend (non-bone) wounds over time. @@ -752,6 +1105,7 @@ the specific recommended treatments bolded in the analysis text. They also have a 'unique' extra bit of info, telling you about improvised ways to remedy your wound. +<<<<<<< HEAD tf-4: - bugfix: fixes being able to eat, use pills etc through gas masks and such 2023-09-19: @@ -769,6 +1123,281 @@ with planks of wood" being spammed on objects. - bugfix: basic mobs retaliate targetting now selects targets they can attack - bugfix: Makes ethanol and sugar pure by default. +======= + necromanceranne: + - bugfix: The vorpal scythe is no longer as greedy about you murdering people, and + will once again accept striking any living creature to be sated. + nikothedude: + - bugfix: Medicine allergy can no longer roll quantum medicine + san7890: + - image: When you throw up nanites, your vomit should now be appropriately nanite-colored. + timothymtorres: + - bugfix: Fix capture devices allowing mob actions while inside +2023-09-13: + ArcaneMusic: + - qol: Shuttle engines now tell you how to install them in their screentips and + their examine text. + CoiledLamb: + - image: resprites pestkiller, weedkiller, and nolabel sprays + - image: updates shading on medigels + - image: resprites all spray bottles + Ghommie: + - bugfix: The holographic pufferfish from the holographic beach from the holodeck + no longer looks like a goldfish. + Ghommie (Based on an old PR by Trilbyspaceclone from Citadel): + - qol: The notepad app now includes basic nautical directions in its default message. + - qol: A tip about nautical directions, too. + Hatterhat: + - rscadd: The SC/FISHER disruptor pistol, a very compact, permanently silenced energy + gun, is now stocked in Nanotrasen-accessible black markets with a price generally + somewhere between 400 and 800 credits. Aspiring users are warned that it's really + bad for trying to actually kill people. Caveat emptor. + - rscadd: Guns now have a dry_fire_sound_volume variable, allowing for guns to be + less loud when trying to fire while empty. + - bugfix: Closets and crates now properly count as structures for pass flags again. + Jacquerel: + - rscadd: Operative MODsuits now have an attached "jump jet" which sends you upwards + and allows you to use your jetpack under gravity for a few seconds, perfect + for navigating the pits and valleys of Icebox Station. + JupiterJaeden: + - balance: removed anti-drop implants from the nuclear operative uplink + - balance: removed anti-drop implant from the nukie implants bundle and changed + its cost to 20 TC + Melbert: + - bugfix: Birdboat's Augment Theater is named less odd now + Rhials: + - bugfix: The psyker headset is no longer a syndicate headset subtype, and no longer + has syndie comms. + SuicidalPickles: + - qol: Cargo Coats/Jackets can now equip universal scanners on their suit-slots. + Wallem: + - qol: Examine a Dish Drive to see all the items inside of it, as well as the item + you'll pull out when you interact with it. + - qol: Dish Drive servo tier increases suction range + blueDev2: + - bugfix: Soup recipes, that make items, spawn the correct number of items per reaction + instead of just one item + - bugfix: Soup recipes, that make items, consumes the correct number of reagents + instead of the largest multiple of the reagents + starrm4nn: + - bugfix: the ablative coat's hood now hides the wearer's hair and ear + timothymtorres: + - balance: Add hypnosis vulnerability for drugged victims + vinylspiders: + - bugfix: fixed grown food items not getting the right seed type passed to them + upon creation +2023-09-14: + ArcaneMusic: + - qol: Conveyor belts now have screentips and a better examine tip to teach you + how to set one up properly. + - qol: Using a conveyor belt stack on a placed conveyor belt will extend the conveyor + belt to the output of that conveyor belt.. You can use this to place fully integrated + conveyor belts much easier now. + Das15: + - bugfix: You can no longer teleport to disabled beacon if the teleporter was previously + locked-on to it. + IHateGeese: + - bugfix: Nightmares can no longer receive wounds + - bugfix: Nightmares can no longer have limbs dismembered + Jacquerel: + - bugfix: Roundstart medbots and cleanbots are now more likely to be able to be + possessed by observers. + - admin: It's easier to modify the properties of bots to stop them from being possessed + or depossessed. + LT3: + - bugfix: Emergency shuttle should correctly scale timer up/down when changing security + levels + Mothblocks: + - bugfix: Dynamic now biases less heavily towards the exact average. + Rhials: + - rscadd: Shuttle Firesale positive station trait. Some emergency shuttle options + have been put on sale! + - rscadd: Misplaced Wallet positive station trait. You wouldn't steal from a missing + wallet, would you?? + - rscadd: Wisdom Cow Invasion positive station trait. + - rscadd: Advanced Medbots positive station trait. Better roundstart medbots! + - rscadd: Loaner Shuttle positive station trait. More shuttle loan offers and more + payout! + - qol: Station Trait titles are now italicized for easier reading. + - spellcheck: Fixes a "prerequisites" typo in the shuttle purchase menu. + Seven: + - balance: The supermatter delamination countdown has been lowered from 30 to 13 + seconds + - balance: Removing a sliver from the supermatter further lowers that down to 3 + seconds + - balance: The supermatter crystal uses bigger text on its final countdown + - spellcheck: Some supermatter delamination related mood descriptions have been + edited to explain the mood effect better + Timberpoes: + - bugfix: Fix poor dynamic threat distribution at lower population levels, causing + dynamic to generate better threat curves at lower population levels than it + did before. +2023-09-15: + Ghommie: + - bugfix: fixed fishing. + - bugfix: Fixed a race condition that made fishing yield no reward way too often. + - bugfix: The legendary fisher achievement is awarded even if you don't win the + minigame. + - bugfix: Fixed a fish hook exploit. + - bugfix: Baits are now properly consumed by caught fish and (alive) mobs. + ZephyrTFA: + - bugfix: you can no longer bypass html sanitization using the table element. >:( +2023-09-16: + AtomTheProphet: + - balance: The spontaneous brain trauma event will no longer occur if there are + fewer than 13 players. + Donglesplonge: + - bugfix: adds the bolted and welded helper to the bar backroom/kitchen coldroom + airlock on birdshot, as to prevent chefs from being able to access armor and + sunglasses roundstart with barely any work involved + Hatterhat: + - bugfix: Flares and candles no longer sound like flashlights when being turned + on. + - bugfix: Getting shot by an SC/FISHER now disables PDA lights for consistency's + sake. + - balance: Pulling embedded items e.g. shrapnel with hemostats is now a lot faster, + and scales appropriately with toolspeed. + - balance: You can now pull embedded items with wirecutters, at a speed penalty. + Jacquerel: + - balance: Watchers will no longer put you at gunpoint. + - bugfix: The nuclear operative MODsuit intellicard now actually downloads an AI + rather than simply kicking candidates from the game. + LovliestPlant: + - qol: '[Deltastation, Icebox, Metastation, Tramstation] Adds cell timers to isolation + cells. (they do not auto-open the doors)' + - qol: '[Birdshot, Deltastation, Icebox, Metastation, Northstar, Tramstation] Adds + translator glove modules to the stacks of "accessibility" (e.g. plasma fixation + / thermal regulator) modules found in security, medical, and engineering storage + rooms.' + - qol: '[Birdshot] Adds a roll of packaging paper to the cargo office.' + - qol: '[Icebox] Adds a hand labeler to security''s gear room.' + - qol: '[Northstar] Nudges the set of binoculars covering the mass driver controls + in ordnance over a few inches.' + - bugfix: '[Birdshot] Remaps the janitor''s closet such that the recycling machine + will now work.' + - bugfix: '[Icebox] Removes a duplicated hand labeler from the rack near security''s + brig cells.' + - bugfix: '[Metastation] Patches a broken corpse disposal pipe running from aux + surgery to the morgue.' + - bugfix: '[Northstar] Fixes the SM being hotwired at round-start (partially rewires + the SM room, moves the APC to the North wall).' + Pickle-Coding: + - bugfix: Fixes tesla coils duplicating the power of >7GeV supermatter zaps. + SyncIt21: + - bugfix: returning items to vendors works correctly + - bugfix: you can't return items that has stuff in it for e.g. a serving tray with + food in it + - bugfix: Unary vents & Injectors now link properly with air sensors via multitool + both ways + Thunder12345: + - rscadd: There's a new space ruin in town, be on the lookout for a hidden supply + cache. + - rscadd: Added a new type of wall which can only be destroyed by blowing it up. + Vincent983: + - qol: The supply beacon will no longer delete itself due to explosions, and you + can now anchor it with a wrench. + - spellcheck: Express console now correctly states that it needs cargo access instead + of QM access. + Zergspower: + - bugfix: Space ruin Anomaly Research - Fixes stacked windows and underplating + cnleth: + - spellcheck: Replaced an irrelevant tip of the round about scars with a better + one + mc-oofert: + - bugfix: the bank machine cannot print holochips worth 0 credits now + - rscadd: climbing hooks that allow you to go up holes for multiz, found in internals + boxes (on planetary maps), the uplink, cargo and nukie personal lockers + san7890: + - balance: You will be knocked down again on certain vomits. Don't worry, you'll + deserve it when it happens. + vinylspiders: + - bugfix: fixes a bug that would cause grown inedible plant seeds (like tower cap) + to vanish from existence upon being added to the seed extractor + - bugfix: fixes a issue that would cause fruit wine to bug out when trying to blend + its reagent color +2023-09-17: + ArcaneMusic: + - rscadd: Wall mounted objects (Things like APCs, Air Alarms, Light switches, Signs, + Posters, Newscasters, you name it) will now fall to the ground and break or + deconstruct when their attaching wall is changed or broken. + Ical92: + - bugfix: adds a few firelocks and alarms around IceBox + Timberpoes: + - bugfix: Forgetting to take dough out of the oven no longer progresses the server + to a crash-worthy state with infinite bread and ash and burned food products + for all. + Vincent983: + - qol: the recycler can now be rotated + blueDev2: + - bugfix: Lipolicide and other chems now puts you in crit, even if it is the only + source of damage + cnleth: + - image: Hercuri spray now uses the same sprite as the yellow medical spray + - spellcheck: Added a missing space to hercuri spray's description + mc-oofert: + - bugfix: the nukie medibot (oppenheimer) has access to the doors of the infiltrator + and is not shot at by the turrets + notlulz: + - bugfix: Monkeys have their tails back. + - bugfix: Recipe paper in the ruins now shows a normal recipe for Metalgen and Secret + sauce. + starrm4nn: + - spellcheck: Fixed some typos on QM's Overcoat +2023-09-18: + ArcaneMusic: + - rscadd: A new ruin has appeared on lavaland, featuring the site of an ancient + battle. + Jacquerel: + - rscadd: Ghosts (observers) can eat ghost burgers and booberry muffins. + - balance: Ghost burgers will not decay or pick up germs due to the fact that they + moved themselves off a table. + Melbert: + - balance: Humanoids without tongues cannot cast spells with vocal components + - balance: Humanoids without arms cannot cast spells with emotive components + SyncIt21: + - qol: Machines now transfer their local materials to silo during linking with multitool + - code_imp: added some null checks for general juicing & grinding items + - bugfix: grinding stacks now grinds as many pieces/sheets from the stack as possible + that can fit in a beaker/container without wasting the whole stack + - bugfix: plumbing chemical grinder now actually works again + - bugfix: the plumbing chemical grinder allows stuff to enter from any direction + but not mobs and also accepts items put inside it via hand including bags + - bugfix: You can remove the beaker from the all in 1 grinder when power is off + via right click + - bugfix: All in 1 grinder now mixes faster with upgraded parts + - refactor: you can no longer walk into a plumbing chemical grinder + - bugfix: Manually constructed windoors have correct unrestricted accesses applied + to them + - bugfix: Windoors created via RCD now actually have electronics inside them + - bugfix: Airlocks constructed via RCD have the shell component correctly installed + inside them and have no other missing variables + Thebleh: + - bugfix: Bluespace RPEDs can now be rigged again + Vincent983: + - bugfix: made the radiation protection crate's contents match it's description + ZephyrTFA: + - rscadd: NanoTrasen improved the quality of the local durathread strain; resulting + in it now being twice as filling! + jlsnow301: + - bugfix: Fixed a resource dupe in the ORM. + mc-oofert: + - refactor: heretic sacrifice room is now lazyloaded + - rscadd: added the inspectors hat to the detectives cabinet, a special hat that + allows the wearer to say a phrase to dispense a stored item + necromanceranne: + - code_imp: Cleans up some unnecessary code left over from caseless ammo. +2023-09-19: + Ben10Omintrix: + - bugfix: basic mobs retaliate targetting now selects targets they can attack + Ghommie (Thanks Sealed101): + - refactor: Reworked the fishing minigame into a game screen object from a TGUI + interface + Hypernoblium: + - bugfix: Fixes a selection window in the game rock-paper-scissors with death. + Jacquerel: + - rscadd: Many kinds of mobs can now be brought back to life through revival surgery. + - rscadd: Dogs can wear eyepatches. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Player-controlled basic mobs attack as fast as those mobs can when controlled by the AI - balance: Player-controlled Faithless can paralyse people they attack, like the @@ -776,6 +1405,7 @@ - balance: Player-controlled Star Gazers (if an admin felt like making one) apply the star mark on attack and deal damage to everything around them, like the AI does +<<<<<<< HEAD - rscadd: Many kinds of mobs can now be brought back to life through revival surgery. - rscadd: Dogs can wear eyepatches. - code_imp: Scars now stack trace if they fail to get a valid description @@ -798,6 +1428,21 @@ and the upper section of chapel - bugfix: normal ethereal blood now works for electrolysis, the hydrogen and oxygen output of the electrolysis recipe has been increased. +======= + Momo8289: + - bugfix: The Nightmare's Light Eater can no longer suck the light out of space + tiles. + Moose1002: + - bugfix: Nanotrasen has finally recalled their faulty multitools and replaced them + with working ones! The multitool's buffer now properly clears itself. + - qol: Moved multitool link messages to balloon alerts + RikuTheKiller: + - bugfix: Makes ethanol and sugar pure by default. + Shadow-Quill: + - qol: Surgery trays can now be crafted via the crafting menu (two rods, one silver), + and deconstructed via secondary click with a screwdriver! + Time-Green: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Only traitor, changeling, heretic, blood brother, headrev, wizard, obsessed, magic/gun survivalists and greentext book holders can now double their hardcore random score @@ -805,6 +1450,7 @@ instead of none (normal survival rules) - bugfix: End report screen will properly report hardcore random survival in case of station destruction +<<<<<<< HEAD 2023-09-20: LT3: - rscadd: 'New random event: Supermatter Surge' @@ -831,12 +1477,51 @@ - bugfix: Lava can no longer occasionally generate inside of previously loaded templates and breach and/or destroy shit - qol: mice and rats now are visually spaced out from eachother for visual clarity +======= + Vincent983: + - rscadd: mass drivers are now buildable, you activate them by attaching a signaler + to their launch wire, and can increase their power by pulsing the safeties wire, + and reset it back to normal by cutting the safeties wire. + - bugfix: normal ethereal blood now works for electrolysis, the hydrogen and oxygen + output of the electrolysis recipe has been increased. + YehnBeep: + - server: Default-configuration MINUTE_TOPIC_LIMIT has been increased + carlarctg: + - balance: Unholy and Eldritch water are self-consuming like holy water! They don't + need a liver to be processed. + distributivgesetz: + - bugfix: Fix a runtime when trying to cycle move intents with a hotkey as a dead + mob. + - rscdel: Removes the computer vendor. + - bugfix: Fixes a misplaced status display in Meta's medical storage. + mc-oofert: + - bugfix: pancake stack layering + - bugfix: pizzabox stack layering + - bugfix: pizzabox bombs that spawn unarmed now label their pizza correctly and + cannot spawn a spriteless pizza + - bugfix: added some missing firealarms on icebox in the hall towards departures + and the upper section of chapel + necromanceranne: + - bugfix: Makes sure pump-up properly grants the baton resistance trait. + nikothedude: + - code_imp: Scars now stack trace if they fail to get a valid description + timothymtorres: + - bugfix: Fix wooden barricade description "This looks like it can be barricaded + with planks of wood" being spammed on objects. +2023-09-20: + LT3: + - rscadd: 'New random event: Supermatter Surge' + - code_imp: Individual supermatter crystals can have custom gas properties + RikuTheKiller: + - spellcheck: Unreverted and improved resonance cascade message. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Supermatter now takes 15 seconds to delaminate normally and 5 if a sliver has been taken from it. Gives a little more time to escape in the case of the sliver and also evens out the times to please perfectionists. - bugfix: Supermatter now accurately reports it's detonation time. - spellcheck: Supermatter mood descriptions have been reverted back to their old, more flavorful selves. +<<<<<<< HEAD Zergspower: - qol: reworks the verb panel to be less of a CVS receipt vinylspiders: @@ -861,11 +1546,35 @@ - balance: Improvised shotgun shells now deal half as much damage to humans and cause less wounds, but do 50% more damage to structures and machines. They also require a glass shard for crafting. +======= + Thunder12345: + - balance: Improvised shotgun shells now deal half as much damage to humans and + cause less wounds, but do 50% more damage to structures and machines. They also + require a glass shard for crafting. + ZephyrTFA: + - bugfix: Lava can no longer occasionally generate inside of previously loaded templates + and breach and/or destroy shit + antropod: + - bugfix: Fixed Mafia achievements + carlarctg: + - qol: Crafting R&D guns from gun kits no longer requires tools or cable coil. The + decloner and energy crossbow still need reagents. + - qol: Halved R&D gun crafting time. 20->10 seconds. + intercepti0n: + - image: resprites t-ray scanner, gas analyzer, geiger counter and hand drill. + jlsnow301: + - refactor: Refactors the camera console UI. + mc-oofert: + - rscadd: heretic knock path and its respective items and award + - qol: mice and rats now are visually spaced out from eachother for visual clarity + nikothedude: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'EMP damage on augs: 2/1.5 from 3/2' - balance: Augs now only get paralyzed by EMP for 3/6 seconds if they are damaged below 70% HP, - balance: Aug EMP knockdown reduced to 3 seconds - balance: Synthetic ears now take far less EMP damage +<<<<<<< HEAD - bugfix: rescue hooks will once again drop the mob next to the fisherman instead of just displaying a balloon alert and doing nothing - bugfix: Recipe that converts Vegetable Oil into Olive Oil works properly @@ -926,22 +1635,88 @@ modes. - qol: Flashlights no longer pointlessly require power cells to function SkyratBot: +======= + vinylspiders: + - bugfix: fixes inedible grown items (such as tower caps) becoming unclickable when + harvested, fixes their seeds disappearing when inserted into the seed machine +2023-09-21: + Coconutwarrior97: + - bugfix: Fixes a bug allowing holopara injectors to be refundable when used. + Exester509: + - rscadd: Splashing antihol on a patient before surgery will make it to go slower. + GPeckman: + - bugfix: The caller in a holopad call should now be able to hear people on the + other end. + Rhials: + - qol: Restores holiday hats for drones. + - qol: Extends holiday hat behavior to assistants. Get festive! + Shadow-Quill: + - bugfix: RCD Construction effects will no longer fall into chasms. + SyncIt21: + - bugfix: wall mounted objects air alarms, fire alarms etc now actually falls off/gets + destroyed when their attached wall is deconstructed + - bugfix: wall mounts crafted in game also properly falls off/gets destroyed when + their attached wall is deconstructed + blueDev2: + - bugfix: Recipe that converts Vegetable Oil into Olive Oil works properly + nikothedude: + - bugfix: Projectiles no longer cause a blood graphic or blood splatters if they + hit a limb that cant bleed + - rscadd: Prosthetics/Augments now spark when shot + - bugfix: Gauze no longer falls off if a wound is demoted or promoted + vinylspiders: + - bugfix: rescue hooks will once again drop the mob next to the fisherman instead + of just displaying a balloon alert and doing nothing +2023-09-22: + Jacquerel: + - admin: Admins can transform misbehaving players into arbitrary objects at will. + Sealed101: + - bugfix: fixed moonicorns making space/chasm/lava/water bridges with their fairy + grass + Toastgoats: + - balance: Peacekeeper cyborg's emagged hug is no longer a hardstun. + intercepti0n: + - image: resprites t-ray scanner. +2023-09-23: + ArcaneMusic: + - bugfix: Conveyor belts now properly show their new screentips on mouseover with + tools. + Ben10Omintrix: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: seedlings have been refactored into basic mobs please report any bugs - rscadd: seedlings now can have different colored petals and can look after botanys plants - rscadd: seedlings are re-added to the game! they grow out of seedling seeds obtainable from exotic seed crates or traitor uplink +<<<<<<< HEAD - rscadd: The Message Monitor console's board can now be obtained via the telecoms research node. - bugfix: Conveyor belts now properly show their new screentips on mouseover with tools. - bugfix: clown bomb payload is no longer named badmin payload and no longer disperses clowns in cardinal directions only +======= + GPeckman: + - admin: Boneless smite should work properly again. + LT3: + - rscadd: Poly now causes a power surge when dusted by the supermatter crystal + - bugfix: Ghosts and godmode mobs will no longer create resonance when touching + the supermatter crystal + Shadow-Quill: + - rscadd: The Message Monitor console's board can now be obtained via the telecoms + research node. + distributivgesetz, CoiledLamb: + - rscadd: 'Added two new awards specifically for engineering and medical: The "Emergency + Services Award" and the "Atmospheric Mastery Award". CEs get 3 Emergency Services + Awards and 1 Atmospheric Mastery Award and CMOs get 3 Emergency Services Awards.' + lizardqueenlexi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Foods that have special conditions for liking/disliking them (such as donuts for sec officers) have these conditions again. - bugfix: Characters with ageusia properly ignore non-toxic food types that they eat. - bugfix: If you examine toxic food, it can no longer appear to you as edible. +<<<<<<< HEAD - admin: Boneless smite should work properly again. distributivgesetz, CoiledLamb: - rscadd: 'Added two new awards specifically for engineering and medical: The "Emergency @@ -961,12 +1736,22 @@ over tables when you shouldn't, and visa versa SkyratBot: - bugfix: Epinephrine will now update health properly. +======= + mc-oofert: + - bugfix: clown bomb payload is no longer named badmin payload and no longer disperses + clowns in cardinal directions only +2023-09-24: + GPeckman: + - bugfix: Epinephrine will now update health properly. + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Brimdemon corpses release an explosion shortly after death, just to keep you on your toes. - refactor: Brimdemons now use the basic mob framework which (should) improve their pathfinding somewhat. Please bug report any unusual behaviour. - admin: The brimdemon's beam ability can be given to any mob, for your Binding of Isaac event +<<<<<<< HEAD - refactor: clowns are basicmobs now - admin: Admins can now reset or modify the chaplain's sect from a UI panel lukevale: @@ -1020,6 +1805,36 @@ - bugfix: cigarettes no longer smoke themselves from inside your pockets or on your hands. - admin: First time user connections are now logged +======= + - admin: Admins can now reset or modify the chaplain's sect from a UI panel + LT3: + - bugfix: Fixed supermatter surges always being the lowest severity + Melbert: + - bugfix: Maybe fixes some weird occurrences where you lose the ability to pass + over tables when you shouldn't, and visa versa + jlsnow301: + - rscadd: Adds Bitrunning to supply department- a semi-offstation role that rewards + teamwork. + - rscadd: Adds new machines to complement the job- net pod, quantum server, quantum + consoles, and the nexacache vendor. + - rscadd: Adds several new maps which can be loaded and unloaded at will. + - rscadd: Some flair for the new bitrunning vendor. + - rscadd: Adds a new antagonist for the virtual domain only. Short lived ghost role + that fights bitrunners. + - rscdel: Removes the BEPIS machine, moves its tech into the Bitrunning vendor. + mc-oofert: + - refactor: clowns are basicmobs now +2023-09-25: + Ghommie: + - bugfix: Fixed beams rendering below mobs by default. + - bugfix: The fishing line beam is no longer emissive (it doesn't glow in the dark). + LemonInTheDark: + - admin: First time user connections are now logged + Melbert: + - rscadd: Changelings can now speak through their decoy brain if it is placed in + an MMI, to maintain the illusion they are actually dead and have been debrained. + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: NT CIMs shows how much power the supermatter is releasing. - qol: NT CIMs internal energy will adjust its prefix. - qol: Energy displays (such as multitooling grid) will use the full range of SI @@ -1030,6 +1845,63 @@ - bugfix: Fixes grounding rods lying about potential power you can generate. - code_imp: Convert supermatter_zap() and tesla_zap() zap_str argument unit to be in joules, and scales everything that uses that argument. +<<<<<<< HEAD +======= + Singul0: + - bugfix: Syndicate Modsuit AI's now downloads the current codespeak book upon being + downloaded. + Vekter: + - bugfix: Fixes Birdshot's recycler being turned the wrong direction. + Watermelon914: + - bugfix: Fixed the overflow role having less slots than it actually should. + - bugfix: Fixed players being able to roll antagonist without ever being eligible + to play any role. Players who have their preferences set up so that they're + likely to return to lobby when the round starts have a lowered chance of becoming + antagonist. + carlarctg: + - rscadd: Added the Hippocrates bust to medbay heirlooms. Paramedics don't get one. + - rscadd: You can now swear the Hippocratic oath with these busts! It'll give you + pacifism but nothing else. The process is reversible. + - rscadd: There's a very small chance that the Hippocrates bust was once wielded + by a certain German doctor. This chance is increased for coroner heirlooms. + distributivgesetz: + - bugfix: Clamping/closing a wound should now heal the bodypart that was damaged + instead of a random one. + nikothedude: + - code_imp: New flags/args to electrocute_act() + starrm4nn: + - balance: Makes it so Ephedrine spasms have a 10 * (1.5 - purity)% chance per second + to happen, Adding a downside to pure Ephedrine + timothymtorres: + - bugfix: Fix secret documents steal objective failing while inside folder. +2023-09-26: + Ben10Omintrix: + - rscadd: added ranged attack friendly fire checks for basic mobs. minebots and + hivebots will now try to avoid shooting their friends + GPeckman: + - bugfix: Stun immune people should no longer have issues with gripper gloves and + other tackle gloves. + - bugfix: Intellicards in computers are no longer deleted when the computer is destroyed. + - bugfix: Modular consoles can now be deconstructed by right clicking with a wrench. + Higgin: + - bugfix: cigarettes no longer smoke themselves from inside your pockets or on your + hands. + Jacquerel: + - bugfix: Selecting "Monkey" on a magic mirror will now once again turn you into + a Monkey rather than a disgusting freak of nature. + - bugfix: Tall Boys have once again been barred from joining the Wizard Federation. + LT3: + - admin: Successful restart votes will now restart on the current map + - code_imp: End round and persistence data will be saved before executing successful + restart vote + - spellcheck: Improved wording in greyscale JSON error message + Rhials: + - bugfix: '"Spooky" meteors will now properly spawn during halloween.' + Sealed101: + - bugfix: you can no longer push watchers (and any other lavaland basic mob) around + by running into them + Singul0: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds an advanced plastic surgery procedure, allowing you to imitate people in pictures. Simply hold a picture in your offhand of the person you wish to imitate as while conducting the surgery! Remember, it's not foolproof, it only @@ -1037,6 +1909,7 @@ - rscadd: You can obtain the disk containing the afromentioned surgery. as a role-restricted item to doctors and roboticists for 1TC, as a rare maint loot and BEPIS technode reward +<<<<<<< HEAD - bugfix: Centcom now rejects contraband that somehow makes it way onto the cargo shuttle mid-transit and returns it. - bugfix: you can no longer push watchers (and any other lavaland basic mob) around @@ -1136,11 +2009,73 @@ - balance: exodrone point scan and deep scan are faster - spellcheck: fixes several typos related to exodrones and gives scanner control console a description +======= + Thunder12345: + - bugfix: Metalgen can no longer be used to transmute indestructible turfs. + Timberpoes: + - bugfix: Centcom now rejects contraband that somehow makes it way onto the cargo + shuttle mid-transit and returns it. + Vincent983: + - image: the security records suspected status is now teal instead of orange + carlarctg: + - refactor: Heavily refactored mirrors to be less ass cancer 1998 code. Player facing + changes are that mirrors now use a radial menu, women can get beards in magic + mirrors, made the magic mirror 'change sex' option Woke (it supports the 4 official + genders and physique as well) + - bugfix: Fixed Pride Mirror teleporting you into the space on the first use. Now + it waits until you officially cancel and say 'I am Done' so you can customize + yourself to your liking. + jlsnow301: + - rscadd: Netpods and quantum servers now have more examination info + - bugfix: You no longer lose antag status if you receive it in the vdom. + - bugfix: Beach bar shouldn't have visible atmos piping anymore. + - bugfix: Adds more lighting to the vaporwave vdom level. + - balance: Buffed vdom megafauna health to compensate for new ability disks. + mc-oofert: + - bugfix: posibrains can be inserted again + san7890: + - bugfix: The custom error message for when there is only one map to vote for should + pop up in all cases rather than just a select few. + tattle: + - qol: Basic animals now make sounds for audible emotes + - sound: Added new sound effects for chicks, chickens, crabs, and insects + xPokee: + - image: adds a frog holoform for pAIs +2023-09-27: + Helg2: + - bugfix: '[Tramstation] Mass Driver in chapel now has tiny fan so you don''t space + yourself.' + Jacquerel: + - bugfix: Blob spores will respond to rallies more reliably (it won't runtime every + time they try and pathfind). + - bugfix: Blobbernaut pain animation overlays should align with the direction the + mob is facing instead of always facing South + - refactor: Blob spores, zombies, and blobbernauts now all use the basic mob framework. + They should work the same, but please report any issues. + Sealed101: + - bugfix: fixed Strong Stone ruin generation + Vekter: + - rscadd: Added a holodeck to Birdshot Station. It can be reached via the Crew Facilities + hallway. + Watermelon914: + - bugfix: Fixed job configs not being loaded properly. + admeeer: + - rscadd: Added a candle box crate for all your candle needs! +2023-09-28: + CoiledLamb: + - rscdel: removes surgical duffelbags + - bugfix: the surgery supply order now comes with a surgery tray + GPeckman: + - bugfix: The flight potion wings will no longer fail to work on lavaland/icemoon + on rare occasions. + Iamgoofball: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Gas masks now muffle your voice with TTS. - qol: Security Hailer masks now disguise your voice to protect your right to brutalize greytiders. - qol: Lizards, Ethereals, and Xenomorphs now have a vocal effect. - qol: Security Records now show someone's voice name. +<<<<<<< HEAD - bugfix: fixed geysers spawning on turfs with plants Tattle: - qol: drones now have individual names, instead of just "drone" @@ -1177,6 +2112,13 @@ - code_imp: adds a gas connector component that allows connection to the atmos piping system without the need of repathing - refactor: changes the cryo machine to use this new system +======= + Jacquerel: + - bugfix: Throwing things at cyborgs will now slow them down, as intended + - balance: Adjusted the calculation of throwforce -> slowdown for cyborgs such that + it is simply a flat duration for anything above a certain damage threshold (the + value of throwing iron rods) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Hivelords and Legions now use the basic mob framework. Please report any unusual behaviour. - rscadd: Hivelords shed more spawn when they are attacked. @@ -1191,13 +2133,155 @@ on your current health. - qol: You won't continue burning to a husk if consumed by a snow legion after being set on fire by an ice drake. +<<<<<<< HEAD - bugfix: removes incorrect stack traces when using some admin secrets +======= + Melbert: + - rscadd: Doctors can now get head mirrors from their clothes vendor, to complete + the doctor outfit + - config: Adds a config option for player respawning that enables respawns, but + forces you pick a new character. + - config: '"NORESPAWN" has been replaced with "ALLOW_RESPAWN 0". Unlimited respawns + is "ALLOW_RESPAWN 1" and character limited respawns is "ALLOW_RESPAWN 2".' + MidoriWroth: + - bugfix: Added complexity factors to foods that were missing them. + Profakos: + - rscadd: Added the BEPIS' minor rewards as purchasable products to the bitrunning + order console. + - rscdel: Removed the base BEPIS disk from the bitrunner console + Sealed101: + - qol: you can undeploy fulton beacons by clicking them with an empty hand + - qol: you can rename fulton beacons with a pen + - bugfix: fixed geysers spawning on turfs with plants + Tattle: + - qol: drones now have individual names, instead of just "drone" + Toastgoats: + - balance: Gave the bluespace geode pirates 4 more teleporter bolt turrets. + - bugfix: The bluespace geode pirates no longer have a bluespace portal to the bottomless + pit dimension. + - rscadd: Station-safe dirt tiles for all your mapping needs, but surely no station + maps use the chasm baseturf ones, right? Right? + Watermelon914: + - spellcheck: Tweaks the message that players get when not being able to qualify + for roundstart antag to be more accurate as to what's happening. + Xander3359: + - rscadd: Contractor baton in traitor uplink for 12 TC + - balance: Ebow no longer has a reputation requirement. + carlarctg: + - bugfix: Fixed zombies being able to infect headless corpses (Including former + zombies) + - bugfix: 'Fixed bio armor being totally useless against zombies. Now it checks + how hurt your limb is: If it''s more than the bio armor value, you get infected. + THICKMATERIAL clothing guarantees at least 25 damage required to infect you, + non-thick clothing reduces effective defence by 25. In practice this means people + with MODsuits, biosuits will resist infection unless they''re pummeled into + crit, and wearing a firesuit will save you from the first few slashes.' + - bugfix: Fixed the bomb hood armor not having the same bio armor value as bomb + armor. + - qol: Added a message to the zed when they succesfully infect someone. + - code_imp: Turned some proc names into snake_case rather than, uh, nospacecase. + - bugfix: Fixes full advanced surgery trays spawning with 'nothing' + - refactor: Turned slapcrafting into a component! You can examine compatible items + to see what recipes they can be used in, and what the ingredients for them are. + For example, spears and the head-on-spear crafting recipe. + - bugfix: Valentines and ERTs will no longer get mood boosts from traitor moodener + items + lizardqueenlexi: + - bugfix: Left-clicking an empty surgery tray will now tell you exactly why it does + nothing. + mc-oofert: + - bugfix: you can now deconstruct exodrone scanner arrays + - bugfix: the tree in space exodrone adventure no longer softlocks you + - qol: the exodrone launchers now tell you on examine how to remove their fuel canister + if you somehow needed to do that + - balance: exodrone wide scans are now capped at 10 minutes + - balance: exodrone travel times are 18% faster + - balance: you can now upgrade scanner arrays for faster wide scan + - balance: exodrone point scan and deep scan are faster + - spellcheck: fixes several typos related to exodrones and gives scanner control + console a description + nikothedude: + - bugfix: You can no longer break the game by AI rolling in a card or APC + - qol: AI Roll now doesnt require you to click the exact turf to move you + - qol: AI roll cooldown and roll time is now a variable, making it possible for + AIs to become terrifying catamari damacy balls + timothymtorres: + - bugfix: Fix altars not allowing items to be sacrificed + vinylspiders: + - bugfix: Seeds will no longer be removed from existence after receiving the "You + can't seem to add [seed type] to the seed extractor" message + - bugfix: Some seeds that were previously not able to be added to the seed extractor + may now be added (starthistle for example) + - bugfix: fixes replica pod seeds spawning humans in nullspace +2023-09-29: + A.C.M.O.: + - bugfix: Fixes the death sandwich, making it safe to examine. + BurgerBB: + - bugfix: Scrubbers and Vents will no longer reset their settings on map load. + GPeckman: + - admin: There is now a tool to apply a DNA Infuser entry to any human. + Ghilker: + - code_imp: adds a gas connector component that allows connection to the atmos piping + system without the need of repathing + - refactor: changes the cryo machine to use this new system + Ghommie: + - bugfix: Fixed crabs not correctly (kinda) walking sideway. + Higgin: + - balance: Diabetics rejoice! Nerfed sugar OD/hyperglycaemic shock to be an immediate + KO followed by drowsiness afterwards until the OD is gone. + Jacquerel: + - bugfix: The Nuke Op MODsuit AI downloader only works once per purchase, as intended. + - bugfix: Blob Zombies and Blobbernauts have had their attack speed restored to + its original value + JohnFulpWillard: + - code_imp: Your bodytype now decides what gendered sounds you make. + - balance: You can now remove and replace power cells from PDAs (with screwdriver). + - balance: PDAs now drain their power cells harder, and also take into account active + programs & their flashlight being on. + - balance: PDAs running out of charge now turn their flashlights off. + Melbert: + - qol: Examine blocked out roundstart / latejoin job information. + - qol: Captain gets a little bit more information about how their radio works roundstart. + - bugfix: Fixed roundstart players not getting radio information. + - balance: Transformation sting now lasts 8 minutes, down from permanent. However, + the effect is paused for dead and stasis mobs, making it permanent SO LONG AS + they stay dead or in stasis. The effect is also permanent if used on a monkey. + - balance: Transformation sting now costs 33 chemicals, down from 50. + - balance: Transformation sting now costs 2 dna points, down from 3. + - bugfix: Transformation sting works on monkeys again. + - refactor: Refactored a bit of human randomization. + Rhials: + - bugfix: The Polymorph Belt should now update its sprite when active. + - qol: The freedom implant has received minor feedback and other minor usage improvements. + Sealed101: + - bugfix: fixed lobstrosities becoming unmovable when killed during their charge + windup + SyncIt21: + - bugfix: removes incorrect stack traces when using some admin secrets + Vekter: + - bugfix: Fixes the missing grinder in Birdshot's Virology department + Vincent983: + - bugfix: the parole status and discharged status are now green and blue respectively + in the security record interface + Watermelon914: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Head revolutionaries and heads of staff are no longer immediately considered disqualified when going AFK or disconnecting and are given a 2 minute grace period. - admin: Admins now get a log when a head revolutionary or head of staff disconnects or goes AFK during a revolution. They also get the same log 1 minute after to give them a chance to act on the information. +<<<<<<< HEAD +======= + necromanceranne: + - bugfix: Splattercasting resets your blood to normal values when you transsform + into a vampire. + - bugfix: Gaining a new species will set your blood volume down to the normal volume + levels if higher than normal. + san7890: + - code_imp: Robot Customers have recently been touched codewise, please report any + bugs or unexpected behavior as there really should not be any. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Snakes have been refactored into basic mobs. This means that they are a bit more intelligent than previous snakes, making them more docile and averse to harming people (unless otherwise provoked). They do chomp all sorts of mice @@ -1205,6 +2289,7 @@ that. - sound: If you listen closely to snakes, you might be able to hear a small hissing sound... +<<<<<<< HEAD - bugfix: fixed lobstrosities becoming unmovable when killed during their charge windup - bugfix: Splattercasting resets your blood to normal values when you transsform @@ -1224,10 +2309,20 @@ differs from the gender default. softcerv: - rscadd: Adds in the ability for certain NIFSofts to be kept between rounds. +======= + timothymtorres: + - bugfix: Fix water puddle runtime when washing items + - rscadd: Add drinking water causes drunk mobs to become sober + - rscadd: Add candle design to biogenerator + yorii: + - bugfix: dead bodies now cool down to room temperature over time + - qol: allowed names to start with a number if AI/Borg +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-09-30: DrDiasyl aka DrTuxedo: - balance: Holsters can now be clipped to any suit, and house Captain antique gun and HoS gun. You now can buy holsters from the SecTech premium section. +<<<<<<< HEAD Paxilmaniac: - qol: The half mask respirator can have its TTS voice muffling properties toggled with control click @@ -1240,6 +2335,11 @@ way to spells. - bugfix: Lavaland syndicate operatives can no longer trivially use the jetpack on their modsuit to fly over the lava. +======= + Helg2: + - rscadd: SM crystal can now dust someone or something if it falls on it. + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: If two cosmic heretics ascend in the same round, their star gazer survival will be linked to each individual heretic and not shared by just one of them. - bugfix: You can't click the Knock heretic portal to join as a mob while already @@ -1248,6 +2348,7 @@ - balance: The Knock Heretic portal cannot summon Flesh Worms, but can summon Fire Sharks. - balance: The Knock Heretic portal will disperse if its creator is killed. +<<<<<<< HEAD - rscadd: SM crystal can now dust someone or something if it falls on it. - bugfix: The reverse revolver now looks like a normal Syndicate revolver on inspection. - bugfix: fixed the stamp in the metastation CMO office always spawning on the floor @@ -1260,3 +2361,34 @@ - rscadd: A waterbreathing quirk - qol: Waterbreathing is now documented on species pages of the species that have it +======= + - admin: Mob abilities can be granted to arbitrary mobs via the VV menu in a similar + way to spells. + - bugfix: Lavaland syndicate operatives can no longer trivially use the jetpack + on their modsuit to fly over the lava. + JohnFulpWillard: + - bugfix: PDA flashlights wont cause the cell to constantly drain faster and faster. + Singul0: + - bugfix: Fixes missing baseturfs and clowns in mining planet VDOM.. + SyncIt21: + - code_imp: removed some redundant code for airlocks + Timberpoes: + - balance: There are now 3 roundstart cyborg job slots open by default. + admeeer: + - bugfix: You can now spray paint the SM without getting dusted + jlsnow301: + - rscadd: Quantum servers now talk over supply channel when they're done cooling + off. Go outside! + - bugfix: You can no longer use dragon swoop to bypass cordons. + - bugfix: Netpod brain damage is now properly reduced upon server upgrades. + - bugfix: Fixed an bug where swapping bodies in vdom prevented you from disconnecting. + - bugfix: Fixed a bug where a quantum server could get locked out of loading new + domains. + - bugfix: Changed quantum console UI to display "no bandwidth" rather than "none" + lizardqueenlexi: + - bugfix: The reverse revolver now looks like a normal Syndicate revolver on inspection. + nikothedude: + - code_imp: Gauze removal is now handled by the gauze's destroy instead of seep_gauze + xPokee: + - bugfix: fixed the stamp in the metastation CMO office always spawning on the floor +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 2fcba69cf73..5332a1da41a 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -1,4 +1,5 @@ 2023-10-01: +<<<<<<< HEAD Hatterhat: - balance: Bullets have had their base type's wound bonus reduced back to 0, down from 20, because wounds are actually quite punishing. Funnily enough, most bullets @@ -19,6 +20,9 @@ - image: The buttondown shirts (underwear) have been updated with a better look and more contrasted palette SkyratBot: +======= + ArcaneMusic: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: A new export has arrived in the imports section, the Galactic Materials Market! You can use this to buy and sell minerals for profit or cost, as well as stock your station when you don't have any miners. @@ -29,6 +33,7 @@ budget by cargo crew, or privately by everyone else. - rscdel: Any material stacks that can be bought and sold on the market before have been removed from the cargo catalog. +<<<<<<< HEAD - rscadd: Adds Bitrunning to supply department- a semi-offstation role that rewards teamwork. - rscadd: Adds new machines to complement the job- net pod, quantum server, quantum @@ -63,6 +68,21 @@ domains. - bugfix: Changed quantum console UI to display "no bandwidth" rather than "none" - bugfix: Actually fixed the hooked item exploit. +======= + GPeckman: + - bugfix: Security officers can now download the crew manifest PDA app that they + start with. + Ghommie: + - bugfix: Actually fixed the hooked item exploit. + Higgin: + - bugfix: Added warden to list of default required enemies for rulesets. + NPC1314: + - image: new chaplain outfit + SyncIt21: + - bugfix: Aloe and other baked foods that don't have reagents can be baked again + without turning to ash + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Heretic Rebalance - balance: Researching the Main Knowledge paths that unlock Side Paths will grant one Side Point that can be used only on those side paths. You can still spend @@ -77,6 +97,7 @@ 'snowflake check' rituals can utilize. - balance: The first non-path knowledge, the Mansus Hand Mark, has had its cost reduced from 2->1 points. +<<<<<<< HEAD - bugfix: Aloe and other baked foods that don't have reagents can be baked again without turning to ash Vekter: @@ -86,14 +107,30 @@ - bugfix: the round end report will accurately report ashwalker sacrifices nikothedude: - code_imp: Gauze removal is now handled by the gauze's destroy instead of seep_gauze +======= + distributivgesetz: + - qol: Font settings in the chat panel applies to all text now. + nikothedude: + - balance: Sci now has access to the materials & canisters section in their departmental + order console +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ninjanomnom: - rscdel: An easter egg plushie that was spawning where it shouldn't has been brought back home. - rscadd: The secure closet can now spawn live gibtonite, enjoy your free bomb. +<<<<<<< HEAD 2023-10-02: SkyratBot: - balance: Sci now has access to the materials & canisters section in their departmental order console +======= + san7890: + - refactor: Supermatter Spiders have been refactored into basic mobs, on the extremely + off chance you spot one and also notice any weird bugs regarding it, please + report it. +2023-10-02: + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Expanded the fishing portal generator. It now comes with several portal options that can be unlocked by performing fish scanning experiments, which also award a modest amount of techweb points. @@ -107,12 +144,17 @@ the minigame UI to less generic ones. Reaching master level in fishing also does that. - qol: The experiment handler UI no longer shows unselectable experiments. +<<<<<<< HEAD - bugfix: Security officers can now download the crew manifest PDA app that they start with. +======= + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Wizards who complete the grand ritual can now gift everyone with eternal life distributivgesetz: - bugfix: Font scaling in TGUI chat has been reverted to its original implementation. +<<<<<<< HEAD softcerv: - rscadd: Adds the mini-soulcatcher, a more lightweight soulcatcher that can be attached to objects @@ -138,10 +180,18 @@ Coded by Jacquerel, Sprited by Dalmationer: - rscadd: Added tongs to the kitchen, which you can use to manipulate food from further away +======= +2023-10-03: + ArcaneMusic: + - image: Railings have had a visual update. + CoiledLamb: + - rscadd: adds boxes of bandages, a quick healing item +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fazzie: - rscadd: Added a budget solar crate to the derelict teleporter room - rscadd: Added a solar panel control to the north derelict solar - qol: The derelict's AI coridoor is now shorter and prettier +<<<<<<< HEAD - rscadd: A lot of new content has been added to the beach away mission - qol: It also looks substantially better, too! Motho: @@ -181,16 +231,45 @@ ninjanomnom: - admin: Appearance vars in VV now display instead of being left blank 2023-10-05: +======= + Ical92: + - bugfix: fixed misplaced door on syndicate listening post + Jacquerel: + - bugfix: Spiders, Morphs, Fire Sharks, and Regal Rats no longer have a reduced + click speed. + - balance: Kudzu will now be destroyed by adverse weather. + - balance: Kudzu will no longer spread over holes. + timothymtorres: + - bugfix: Fix organs having no DNA and become bloody when violently removed. +2023-10-04: + Coded by Jacquerel, Sprited by Dalmationer: + - rscadd: Added tongs to the kitchen, which you can use to manipulate food from + further away + Cruix: + - bugfix: Some icons for selecting character preferences are no longer scaled incorrectly. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 FIoppie: - sound: '*flap now makes a fluttering noise for moth wings' - sound: Moths now have a death sound - qol: '*tremble emote now is just "trembles!" instead of "trembles in fear!"' +<<<<<<< HEAD LT3: - image: Added colourable arm and leg wraps +======= + Fazzie: + - rscadd: A lot of new content has been added to the beach away mission + - qol: It also looks substantially better, too! + Jacquerel: + - refactor: Raw Prophets now use the basic mob framework. Please report any unusual + behaviour. + - admin: Admins can turn off dynamic rulesets (or force them on despite not meeting + the qualification criteria) on a per-round basis. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Moved a lot of maintenance spawnpoints out of non-maintenance rooms. Some antags (paradox clone, fugitives, nightmares, spiders) are now less likely to spawn in obvious places like the morgue, tech storage, or dorms rooms. +<<<<<<< HEAD Motho: - image: Sector 13's station air alarms and fire alarms have been updated to be more in line with other frontier station models. @@ -203,10 +282,21 @@ - balance: CQC legsweeps now cause knockdown instead of paralysis. - balance: CQC kicks now knockout a target on the floor for ten seconds if they reach stam crit. Helmet protection shortens the knockout length. +======= + TheBoondock: + - rscadd: Added blackout, happens when you drink...ALOT + Wallem: + - rscadd: Adds The Hand of Midas, an ancient Egyptian matchlock pistol. + ZephyrTFA: + - bugfix: The Syndicate have fired their previous construction company after poor + results in recent outposts. + lizardqueenlexi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Your heart will no longer be deleted if an admin heals you while you have corazargh in your system. - refactor: The cursed heart has been streamlined a bit, and now gives you a visual cooldown for when you can beat your heart again. +<<<<<<< HEAD Wallem: - rscadd: Adds The Hand of Midas, an ancient Egyptian matchlock pistol. honkpocket: @@ -237,12 +327,44 @@ - code_imp: converted plumbing reaction chamber & mixing chamber UI files to Typescript - refactor: plumbing mixing chamber now also accepts an TGUI input list to input it's chemicals +======= + - bugfix: Cutting open a hand-pressed paper bundle no longer deletes all of the + paper. + nikothedude: + - qol: Departmental order consoles now alert their department via radio when their + cooldown expires + ninjanomnom: + - admin: Appearance vars in VV now display instead of being left blank + timothymtorres: + - bugfix: Fix butchered monkeys to transfer reagents and diseases to meat + unit0016: + - rscadd: The funds the syndicate have been saving by restricting galley access + has been suddenly funneled into a singular mosaic pattern in the experiments + wing. + vinylspiders: + - refactor: fixed many instances of updatehealth() either being called needlessly + or not at all within on_mob_life() and in various other parts of the code + - refactor: damage procs now return useful information--the actual net change in + damage on the mob. added a unit test for this +2023-10-05: + lizardqueenlexi: + - bugfix: The Galactic Materials Market now offers things for sale as it should. + mc-oofert: + - code_imp: exploration drone adventures are now file-based and not database-based + timothymtorres: + - balance: CQC legsweeps now cause knockdown instead of paralysis. + - balance: CQC kicks now knockout a target on the floor for ten seconds if they + reach stam crit. Helmet protection shortens the knockout length. +2023-10-06: + EricZilla: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: We have received a new shipment of IDs, as the old ones were found out to be haunted. - image: Laser tag red team ID has received a massive nerf - image: Station budget cards have gotten a facelift - image: Emags and Doorjacks - bugfix: Numbered prisoner IDs will now be legible +<<<<<<< HEAD Wallem: - rscadd: Buffs the Active Sonar module with a radial scan, and makes the power costs more in-line with other modules. @@ -262,11 +384,61 @@ - balance: Hypovial capacity now matches bottle capacity - bugfix: Broken and placeholder hypovials can no longer be printed in the ChemMaster Melbert: +======= + SyncIt21: + - bugfix: plumbing reaction chamber now balances the ph of it's solution correctly + to the best of it's ability so no guarantees + - code_imp: converted plumbing reaction chamber & mixing chamber UI files to Typescript + - refactor: plumbing mixing chamber now also accepts an TGUI input list to input + it's chemicals + Wallem: + - rscadd: Buffs the Active Sonar module with a radial scan, and makes the power + costs more in-line with other modules. + mc-oofert: + - bugfix: you are now made a ghost faster if you get gibbed + neocloudy: + - bugfix: MetaStation disposal pipes from Cargo to Disposals/the rest of the station + are working again. +2023-10-07: + CoiledLamb: + - qol: allows janitor keys to be stored in janitor wintercoats and janibets + - qol: gives empty fireaxe and mech removal crowbars cabinets directional helpers + GPeckman: + - bugfix: Borgs will no longer become permanently upside-down if tipped over by + multiple people at the same time. + - bugfix: Adminheal will now properly clear negative mutations as intended. + - bugfix: The AI can no longer turn you off if you shapeshift into a robot. + - rscadd: The laser carbine, a weak but fully automatic sidegrade to the normal + laser gun, can now be ordered from cargo. + - bugfix: Engineering borgs can no longer grab and drop their own iron/glass sheet + module. + - bugfix: Ice whelps can now use spells given to them by admins, and people who + have polymorphed into ice whelps can now polymorph back to normal. + Ghommie: + - bugfix: Fixed silent catwalks. + - rscadd: Fish analyzers can now be used to perform fish scanning experiments. + - balance: They can now be singularly bought as a goodie pack for 125 cr each, instead + of a crate of three for 500 cr. + Isratosh: + - spellcheck: '"offical" has been officially corrected to "official" in several + official locations.' + Jacquerel: + - refactor: Rust Walkers, Ash Spirits, Flesh Stalkers, and The Maid in the Mirror + now use the basic mob framework. Please report any unusual behaviour. + Kapu1178: + - bugfix: Blood once again appears as small drops instead of splatters during minor + bleeding. + Likteer: + - rscadd: Fake moustaches are now poorly slapped on top of what you're wearing + Melbert: + - refactor: Refactors how ethereals update their color when damaged. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: AI, cyborg, and PAI camera (photo taking) behavior now uses balloon alerts and has sound effects associated - refactor: Refactored AI, cyborg, and PAI camera (photo taking) code - bugfix: fixed being unable to print photos as a cyborg when below 50% toner, even though photos only take 5% +<<<<<<< HEAD SkyratBot: - bugfix: Engineering borgs can no longer grab and drop their own iron/glass sheet module. @@ -342,10 +514,39 @@ - refactor: Refactored goats into basic mobs! Not much should have changed beyond their endless desire to retaliate should you attack them, they're still just as good as chomping away plant life as ever. +======= + ReezeBL: + - bugfix: fixed a PDA's messenger TGUI issue with handling of destroyed recipients. + Sealed101: + - bugfix: fixed bad food not having bad food reagents + necromanceranne: + - balance: Despite earlier reports suggesting that the famous lethality of the Regal + Condor was largely a myth, there has been rumors that the gun has once again + started to display its true killing potential on any station that it 'manifests'. + oranges: + - rscadd: Dogs now react to centrist grillers more realistically + san7890: + - refactor: Refactored goats into basic mobs! Not much should have changed beyond + their endless desire to retaliate should you attack them, they're still just + as good as chomping away plant life as ever. + timothymtorres: + - refactor: Refactor gib code to be more robust. + - qol: Gibbing a mob will result in all items being dropped instead of getting deleted. + There are a few exceptions (like admin gib self) where this will not take place. + unit0016: + - bugfix: It is no longer possible to chasm yourself on the geode. Again. +2023-10-08: + Comxy: + - bugfix: Spider types get properly checked again. + Ghommie: + - bugfix: People who are irremediably bald can still grow a beard with barber aid. + Hatterhat: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Miners can now tag monster spawners (necropolis tendrils, animal dens, demonic portals, and netherworld links) by using their mining scanner on it, which updates their GPS tag (and/or gives them one) to give it a numerical designation and a short identifier for what it's spawning. +<<<<<<< HEAD oranges: - rscadd: Dogs now react to centrist grillers more realistically 2023-10-09: @@ -357,23 +558,60 @@ forget to use a wrench. - bugfix: Slaughter/Laughter demon melee cooldowns have been fixed and now attack at the regular player character attack speed +======= + Jacquerel: + - bugfix: Flesh Worms will move smoothly more consistently. + LT3: + - image: Text alignment on ID cards slightly adjusted + Melbert: + - bugfix: Fixed an error from reading an ID card closely when you can't read + YehnBeep: + - qol: '"prison" intercoms have been renamed to "receive-only" intercoms to make + it clearer they cannot transmit.' + carlarctg: + - qol: Added slapcrafting to unloaded tech shells, click on them with ingredients + to quickly craft your shell. + san7890: + - refactor: Sloths are now basic mobs, however their overall sluggish behavior shouldn't + have changed much- let us know if anything is broken. + timothymtorres: + - bugfix: Fix bodies now lose fire stacks while husked. +2023-10-09: + Ben10Omintrix: + - refactor: ice demons have been refactored into basic mbos. please report any bugs + - rscadd: ice demons now have a unique trophy + IndieanaJones: + - bugfix: Slaughter/Laughter demon melee cooldowns have been fixed and now attack + at the regular player character attack speed + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The chemical gun and PKA pressure mod traitor items are now purchasable within 15 minutes of the round starting rather than 20/30. - balance: All preset bundle kits, the cash briefcase, the makarov, the revolver, the throwing weapon kit, c4, the detomatix cartridge, the large EMP bomb, gorillas, advanced mimery tome, pie cannon, clown car, His Grace, and the origami kit are now all purchasable at the start of a round. +<<<<<<< HEAD - refactor: ice demons have been refactored into basic mbos. please report any bugs - rscadd: ice demons now have a unique trophy - bugfix: Spider types get properly checked again. nikothedude: - bugfix: Borers work now 2023-10-10: +======= + distributivgesetz: + - qol: Supermatter shards can now be fastened with right click too. Now, just don't + forget to use a wrench. +2023-10-10: + BlueMemesauce: + - bugfix: fixed gibbing from having too much blood not working in some cases +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fazzie: - qol: NT's logo on Centcom's landing pad looks better - qol: Centcom's Cargo and other rooms had their items rearanged to look marginally better. Like you're every gonna see them! - bugfix: The Thunderdome on Centcom now has up-to-date cooking machinery +<<<<<<< HEAD GoldenAlpharex: - qol: "You can now bind the Shift Layer Up/Down verbs to keybinds! Look for \"\ shiftlayerup\" and \"shiftlayerdown\" respectively in your Game Preferences\ @@ -381,6 +619,21 @@ Hatterhat: - qol: Internal health analyzer no longer displays both health and chem scans at the same time; LMB for health, RMB for chems. +======= + FlufflesTheDog: + - bugfix: Virtual domain gondola meat will no longer have a small chance to turn + you into a weaker gondola variant + GPeckman: + - bugfix: Warm donk-pockets should now have omnizine in them again. + HWSensum: + - balance: Reviver Implant now able to revive dead people. + Hatterhat: + - bugfix: Necropolis tendrils and other mining mob spawners can be hit in melee + again. + Jacquerel: + - bugfix: Cowardly mobs will consistently run away from you instead of getting tired + and just sort of standing there after an initial burst of movement. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melber: - bugfix: Wearing bread (or roses, or other non-mask things) no longer prevents you from TTS speaking. @@ -388,6 +641,7 @@ - bugfix: Robotic bodyparts not attached to people are now properly affected by EMPs. - bugfix: Virtual Drink Glasses now look correct. +<<<<<<< HEAD Motho: - rscadd: Bitrunners can now have alternative job titles. FTU urges that these titles are purely cosmetic and not representative of bitrunning ability. @@ -420,6 +674,23 @@ and just sort of standing there after an initial burst of movement. - bugfix: Virtual domain gondola meat will no longer have a small chance to turn you into a weaker gondola variant +======= + SyncIt21: + - code_imp: moved some global procs and vars related to reagents to its own dedicated + file. removed some unused procs and macros + - code_imp: heavy auto docs for a lot of procs + - refactor: adds reagent sanity and bound check code + - refactor: multiple reagents are more uniformly distributed when transferring them + between beakers or dropper & in every other reagent dependent operation + Wallem: + - rscadd: Nuclear Operatives now have ready access to ancient cowboy technology + in the form of the Outlaw Bundle. Now you too can roll into town on your horse. + YehnBeep: + - qol: The autopsy tray (and surgery trays) can now hold the autopsy scanner + admeeer: + - code_imp: made an eensy teensie weensie change to some supermatter boilerplate + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Added extra checks to bitrunning domain cleanup so avatars are deleted properly. - rscadd: Quantum servers now look for a new machine called a byteforge to spawn @@ -427,6 +698,7 @@ after disasters. - rscadd: '*Most* bitrunning machinery is now researchable and buildable via circuits in the engineering protolathe.' +<<<<<<< HEAD - refactor: Refactor gib code to be more robust. - qol: Gibbing a mob will result in all items being dropped instead of getting deleted. There are a few exceptions (like admin gib self) where this will not take place. @@ -485,6 +757,18 @@ showing as selected - bugfix: Camera console search works again - bugfix: you can no longer polymorph belt into a holoparasite +======= + lizardqueenlexi: + - bugfix: Metastation disposals will no longer infinitely loop garbage around the + station. + mc-oofert: + - code_imp: COMSIG_GLOB_LIGHT_MECHANISM_COMPLETED is now COMSIG_GLOB_PUZZLE_COMPLETED + ninjanomnom: + - bugfix: Images are once more displayed as images in vv instead of as an appearance + - rscadd: Pipes now have a colored visual display that shows their contents at a + glance. + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Revenants, the mob that's split between planes of Life and Death, have been refactored into a basic mob. While this alone shouldn't touch behavior, a lot of the backend code has been gutted and refactored to try and furnish @@ -498,17 +782,49 @@ (by holy weapons) should be tweaked a bit to allow better management. This should mean that getting unstunned and such should be a bit more precise now. - qol: Revenant instructions are now relayed in a neat little examine block. +<<<<<<< HEAD - bugfix: Wound promotion and demotion no longer removes gauze from the limb +======= +2023-10-11: + GPeckman: + - bugfix: Borg modules can no longer be sold by pirates. + Iamgoofball: + - bugfix: Fixes a few runtimes with TTS and skips some code if TTS isn't enabled. + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The Changeling Space Suit has been replaced by a new ability which makes you passively spaceproof without replacing your clothing. - admin: Editing the atmos sensitivity variables on a basic mob during the game will now actually do something. +<<<<<<< HEAD +======= + - qol: You can now see what drones and gorillas are holding by examining them. + - admin: It's now easier to give handless mobs hands by applying the "dextrous" + element. + - balance: Spiders and Bears can now climb railings (you know if... they'd rather + do that than destroy them). + - bugfix: Heretic mobs will not be summoned with AI enabled, and won't turn into + small animals instead of summoning a flesh stalker. + JohnFulpWillard: + - bugfix: Antiglow now probably has negative glow power. + Melbert: + - bugfix: Miner's Salve, Sterilizine, and Space Cleaner now all properly affect + burn wounds + Sealed101: + - bugfix: you can no longer polymorph belt into a holoparasite + ViktorKoL: + - bugfix: fixed some faulty research connections in between heretic's blade and + rust paths. + carlarctg: + - rscadd: Adds practice carbines to all firing ranges. They don't deal damage. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Adds a base physical description proc to gameplay species, displays it on magic mirrors. It will give a description of not the lore of the species but in what way they differ from base species. - bugfix: Fixes a bad subtype on magical mirrors. - bugfix: Magical mirrors now give the user ADVANCEDTOOLUSER and LITERACY if they lack either of them, so monkey wizards aren't softlocked. +<<<<<<< HEAD - bugfix: Borg modules can no longer be sold by pirates. - balance: Unholy water acts as a coagulant for cultists. - bugfix: bitrunners will no longer be lumped in with assistants on the crew monitor @@ -545,15 +861,81 @@ - image: Blueshield's earpiece is no longer a bright blue tumor on the side of their head. LT3: +======= + jlsnow301: + - bugfix: Fixed some issues in the security camera UI - pressing next or back will + now loop through the cameras + - bugfix: Fixed some style issues in the camera console where selected cams weren't + showing as selected + - bugfix: Camera console search works again + lizardqueenlexi: + - refactor: Harvester constructs have been updated to the basic mob framework. This + should have very little impact on their behavior, but please report any issues. + mc-oofert: + - bugfix: count station food verb now counts food only onstation + necromanceranne: + - balance: Unholy water acts as a coagulant for cultists. + nikothedude: + - bugfix: Wound promotion and demotion no longer removes gauze from the limb + timothymtorres: + - sound: Add burning sound loop to bonfires and fireplaces + - code_imp: Improved fireplaces to only process when lit + vinylspiders: + - bugfix: fixes a runtime in organ on_death() + - bugfix: using a magic mirror to change gender or skintone will now update your + icon properly to match your selection + - bugfix: bitrunners will no longer be lumped in with assistants on the crew monitor + console's display + - bugfix: moved a garbage spawner on Tramstation that was causing random runtimes + due to sometimes spawning in space depending on which module got loaded +2023-10-12: + Ghommie: + - bugfix: Examining twice experiment handlers with an active fish-related experiment + now gives a comprehensible, correctly spaced list of scanned species rather + than something like "pufferfishguppyslimefishchasmchrab". + - bugfix: No more "line snapped" balloon messages everytime the fishing minigame + is over + - bugfix: Getting to the Master level of the fishing skill now correctly gives you + that slight helping hand to identify yet-to-be-caught fishes. + Isratosh: + - admin: Gondola supplypods are functional again. + Jacquerel: + - refactor: Gorillas now use the basic mob framework. Please report any unusual + side effects. + - rscadd: Adds a new lavaland ruin where you can find a unique egg. + - balance: Flesh Spiders heal automatically over time if they go a short time without + taking damage, instead of healing large chunks by clicking themselves and waiting + two seconds. + - qol: Spider egg clusters which only hatch into one kind of spider don't ask you + to select that one type from a radial menu with one option on it. + - qol: As a Flesh Spider, the game now tells you how you can heal yourself. + LT3: + - rscadd: Introducing Nanotrasen Wave! A Nanotrasen exclusive, Waveallows your PDA + to be charged wirelessly through microwave frequencies. You can Wave-charge + your device by placing it inside a compatible microwave and selecting the charge + mode. + - rscadd: Microwaves can be upgraded to add wireless charging + - rscadd: Cell-swappable microwave for the engineer on-the-go + - rscadd: Microwave now has a wire to swap charge/cook modes + - rscadd: Furnishings RCD upgrade now includes wireless microwave + - rscadd: Tramstation and Birdshot engineering break rooms now have microwave and + donk pockets. Some microwaves come pre-equipped with wireless charging and an + upgraded cell. + - bugfix: The microwave in the snowdin ruin is now real, not a fluff prop +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: After the untimely loss of too many novice HoPs, the Icebox "New IDs and You" instructions have been moved from the icemoon wastes to the HoP's office, ending this rite of passage - bugfix: Added some missing firelocks in the pharmacy area. Icebox pharmacy now has a shower +<<<<<<< HEAD OrionTheFox: - image: returns Lopland Security's blue ID trims, and updated a few modular ID trims for DS2/NRI SkyratBot: +======= + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: removed round robin method of transferring reagents which would result in some missing reagents after transferring. - code_imp: added some more rounding for reagent operations. @@ -568,6 +950,7 @@ to 4 decimal places for accuracy. - qol: droppers & beakers round the amount of reagents transferred before displaying them to chat for easy readibility +<<<<<<< HEAD - sound: the blood cult's rise to power is now accompanied by several new sound effects - rscadd: Adds a new lavaland ruin where you can find a unique egg. @@ -579,6 +962,8 @@ - qol: Spider egg clusters which only hatch into one kind of spider don't ask you to select that one type from a radial menu with one option on it. - qol: As a Flesh Spider, the game now tells you how you can heal yourself. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You cannot order with cargo budget if you don't have cargo access in the Galactic Market - bugfix: Private & Cargo orders no longer get mixed together in the same crate @@ -589,11 +974,18 @@ budget only after the order has been confirmed in the cargo request console & after the shuttle arrives with your order. This way you drain the budget only after your orders were successfully delivered and not before hand itself +<<<<<<< HEAD - qol: You can now see what drones and gorillas are holding by examining them. - admin: It's now easier to give handless mobs hands by applying the "dextrous" element. - balance: Spiders and Bears can now climb railings (you know if... they'd rather do that than destroy them). +======= + ViktorKoL: + - sound: the blood cult's rise to power is now accompanied by several new sound + effects + mc-oofert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: venus human traps are basicmobs now - balance: venus human traps have 100 health - balance: venus human traps take damage out of range of kudzu, heal near kudzu, @@ -601,6 +993,7 @@ random - balance: also venus human trap tangle ability now needs you to actually move backwards to pull victims +<<<<<<< HEAD - admin: Gondola supplypods are functional again. - bugfix: Examining twice experiment handlers with an active fish-related experiment now gives a comprehensible, correctly spaced list of scanned species rather @@ -644,11 +1037,40 @@ Paxilmaniac: - image: The sprites for forge structures have been vastly improved SkyratBot: +======= + vinylspiders: + - image: you can now change the style of lipstick to be higher or lower on the face + by alt-clicking the lipstick tube +2023-10-13: + EuSouAFazer: + - qol: The rollerdome is now better - the dance floor works now, and the bar is + groovier. + Jacquerel: + - bugfix: Dullahans can read, strip people, and utilise tools. + - bugfix: Dullahan brains and eyes will not decay while inside their living severed + head. + LT3: + - qol: Canisters can now be built in one step, no upgrading required + Paxilmaniac: + - image: Inhands for the Sakhno and related rifles will no longer be way too high + or big + Rhials: + - rscadd: Two new psyker-oriented virtual domains -- Crate Chaos and Infected Domain. + - rscadd: Map helper for cyber-police corpse spawn. + - rscadd: Map helper for swapping the encrypted crate in an area with a random crate + from that same area. + jlsnow301: + - bugfix: Fixed the errant bluescreen in the camera console. + mc-oofert: + - code_imp: basicmobs that delete on death, ghost before dying + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Holy Hand Grenade's effect on revealing a revenant had its duration accidentally nerfed, it is now back to 10 seconds. - bugfix: Revenant midrounds should now properly run. - bugfix: Revenant harvesting should now let you actually pass the final do_after so you can harvest that sweet essence. +<<<<<<< HEAD - refactor: Gorillas now use the basic mob framework. Please report any unusual side effects. - bugfix: Fixed the errant bluescreen in the camera console. @@ -673,6 +1095,32 @@ LT3: - image: Nitrogen canisters are now yellow, antinob are grey/yellow, empty are grey, hydrogen are red/white +======= +2023-10-14: + BlueMemesauce: + - bugfix: Modsuits can no longer be deepfried + DrDiasyl: + - sound: laser2.ogg sound has been changed. Now laser carbine uses it. + - image: Laser carbine and orange laser sprite have been improved. + IndieanaJones: + - bugfix: Space Dragon can break walls, eat corpses and destroy mechs more efficiently + again + - bugfix: Player-controlled lavaland elites can once again return to their tumor + after winning their fight + Jacquerel: + - bugfix: '"Mirror Walk" is once more the domain of the Maid in the Mirror rather + than "every heretic summon"' + - bugfix: Heretic mobs can once again survive space + - bugfix: Pete's anger management training has worn off, and he will once again + sometimes pick a fight with you for absolutely no reason. + - qol: Attacking a goat will not spam messages so frequently. + LT3: + - image: Nitrogen canisters are now yellow, antinob are grey/yellow, empty are grey, + hydrogen are red/white + MTandi: + - bugfix: The crew is instructed to place fax machines properly in the center of + a table without hanging. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixes Mauna Loa, Monover, Silibinin, Granibitaluri not exiting your system on metabolism @@ -680,25 +1128,39 @@ - bugfix: Holy Water no longer spams cultists with big text every time, it's much more tame now Rhials: +<<<<<<< HEAD - rscadd: Two new psyker-oriented virtual domains -- Crate Chaos and Infected Domain. - rscadd: Map helper for cyber-police corpse spawn. - rscadd: Map helper for swapping the encrypted crate in an area with a random crate from that same area. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: You can now return to your old body after being summoned by a manifest rune. - qol: You can now return to your old body after dying in CTF. - qol: You can now return to your old body after dying in the Medisim Shuttle battle area. - qol: You can no longer suicide in CTF areas, for integrity purposes. +<<<<<<< HEAD SkyratBot: - bugfix: Space Dragons can now, once again, tear down walls and eat corpses. They also have regained their special damage modifier when attacking mechs. - bugfix: Pete's anger management training has worn off, and he will once again sometimes pick a fight with you for absolutely no reason. - qol: Attacking a goat will not spam messages so frequently. +======= + bun235: + - rscadd: targetting someone's arm with *slap now has a unique message + dragomagol: + - qol: apples can now be sliced + mc-oofert: + - bugfix: sqdl2 query readout displays location of turfs properly + ninjanomnom: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: VV can now display the contents of special byond lists like filters, or client.images - admin: VV on images now displays the image in the header - admin: VV can now display filters and includes their type +<<<<<<< HEAD - qol: apples can now be sliced - bugfix: sqdl2 query readout displays location of turfs properly - sound: laser2.ogg sound has been changed. Now laser carbine uses it. @@ -723,11 +1185,30 @@ 2023-10-15: LT3: - bugfix: Fixed moldies event default weight overriding the configured event weight +======= + san7890: + - bugfix: Space Dragons can now, once again, tear down walls and eat corpses. They + also have regained their special damage modifier when attacking mechs. +2023-10-15: + GPeckman: + - bugfix: Having all augmented limbs will make you properly spaceproof once again. + - bugfix: Androids are immune to crit damage again. + - bugfix: Surgery on robotic limbs can be canceled. + Iamgoofball: + - balance: Allows spacemen to use age-appropriate drugs by making it so you can + now huff N2O to get high. + Jacquerel: + - refactor: Space Dragons are now basic mobs, please report any unexpected behaviour. + - balance: You can now see that a space dragon is destroying a wall with a visual + indicator of the wall being damaged. + - balance: Space Dragons can pry open airlocks. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Leaning now has a small animation associated. - qol: Cyborgs can now lean against walls. - bugfix: Fixed some runtimes associated with leaning. - bugfix: Fixed being able to lean while dead or in otherwise invalid states. +<<<<<<< HEAD SkyratBot: - bugfix: Fixes Monkey's Delight recipe - refactor: Space Dragons are now basic mobs, please report any unexpected behaviour. @@ -735,11 +1216,15 @@ indicator of the wall being damaged. - balance: Space Dragons can pry open airlocks. - bugfix: makes the riot helmet hide hair like other sec helmets +======= + ZephyrTFA: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Vent Pumps can now be overclocked, do some light reading in the air alarm to figure out what this means. - balance: Vent Pumps now have fan integrity, the damaging of which reduces their ability to move air. - sound: Overclocking sounds, including spool, stop, and loop +<<<<<<< HEAD - balance: Allows spacemen to use age-appropriate drugs by making it so you can now huff N2O to get high. honkpocket: @@ -753,6 +1238,21 @@ on the mask now require a pen. 2023-10-16: SkyratBot: +======= + carlarctg: + - qol: Bladists can now use silver *or* titanium while creating their blades + - bugfix: Fixes Monkey's Delight recipe + starrm4nn: + - bugfix: makes the riot helmet hide hair like other sec helmets +2023-10-16: + BlueMemesauce: + - spellcheck: Broken canisters now have a description + Cruix: + - rscadd: Added Afro (Huge) hairstyle + Melbert: + - code_imp: Removed species death and species hitby, replaced any uses with signals. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: plumbing setups should(hopefully) no longer grind to a halt nor will overflow with excess volume of reagents. - code_imp: created defines for min & max ph. Improved some reaction_reagent code. @@ -761,6 +1261,7 @@ Optimized it's code overall - refactor: examining each individual reagent will display their results back to 2 decimal places again and not 4 for easy readability. +<<<<<<< HEAD - qol: Bladists can now use silver *or* titanium while creating their blades - spellcheck: Broken canisters now have a description - rscadd: Added Afro (Huge) hairstyle @@ -786,15 +1287,53 @@ - bugfix: Fixed font scaling for announcements - bugfix: The remaining survival pod bed on Icebox is now a medical bed - bugfix: Announcement text now uses the intended CSS +======= + Wallem: + - bugfix: The active sonar module won't attempt to create 6000000 new pings per + process cycle anymore +2023-10-17: + DaydreamIQ: + - qol: Icebox Visitation now has a door connected to brig + Fazzie: + - rscadd: The free golem ship has been swapped for a much better one, with fishing + equipment. + - rscadd: The wizard's den now has a book with the guide to wizard. Hope that helps + their winrate! + - qol: The wizard's den no longer looks like a flying cucumber and has received + a major overhaul. Hooray! + - bugfix: Fixed the doors on the Beach away mission + - bugfix: Fixed the railings on the Beach away mission + GoldenAlpharex: + - code_imp: Got rid of a few more single-letter variables. Only over six thousand + left to go, woo! + - code_imp: Documented a huge part of telecommunications machinery and signal code, + and did some minor code improvements to said code. + - bugfix: Hands of cards will now properly display the last card added to the hand + all the time, even when there's more than five cards in that hand. + Higgin: + - bugfix: Fixes respiration-transmission advanced viruses to no longer have an always-guaranteed + infection chance per tick. + Jacquerel: + - bugfix: Megafauna, lavaland elites, and abstract mobs now correctly cannot be + spawned by a toolbox of ash drake summoning + LT3: + - bugfix: The remaining survival pod bed on Icebox is now a medical bed + - bugfix: Fixed font scaling for announcements +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Microwave will no longer get stuck turned on if a PDA has no cell - bugfix: Silicons can no longer silently change the microwave between cook and charge Melbert: +<<<<<<< HEAD +======= + - rscdel: Deleted a mapped in wrestling belt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored unarmed attacking mechanisms, this means dis-coordinated humans will now bite people like monkeys (like how coordinated monkeys punch people like humans?) - refactor: Dis-coordinated humans smashing up machines now use their hands, rather than their paws +<<<<<<< HEAD Motho: - sound: Plasmamen all across the sector have begun to announce their fright or pain in a new way. @@ -834,6 +1373,36 @@ - bugfix: air alarm and mass driver controller in Voidraptor disposals room will no longer overlap 2023-10-18: +======= + NamelessFairy: + - bugfix: TGC Mana and Health bars are correctly offset on the holodeck. + - bugfix: Players without bodies to return to can play CTF again. + RedBaronFlyer: + - sound: added sounds for scanning valued items with an export scanner + Rhials: + - balance: Random event frequency has been adjusted to fire events more often. + - code_imp: The event subsystem has been prettied up with comments and longer variable + names. + SyncIt21: + - code_imp: removed unnecessary calls to `update_total()` + Thunder12345: + - bugfix: Delta's cargo bay has been connected to the atmos pipe networks + - bugfix: Fuel tanks are explosive again + jlsnow301: + - bugfix: TGUI Say should no longer flash during initialization + mc-oofert: + - rscadd: added a new hallucination, your mother + vinylspiders: + - bugfix: ghost sheets will now have the correct flags for digi sprites + - bugfix: basic mobs will no longer runtime when trying to check the faction of + a porta turret + - refactor: faction checking is now done at the atom/movable level + - bugfix: Fixes a bug with the plasma flower core MODsuit that would cause a butterfly + murder scene wherever there were turrets +2023-10-18: + Ghommie: + - bugfix: Fish analyzers can now be actually used for experiments. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - refactor: Tram process/industrial lift refactored into transport subsystem - refactor: Nanotrasen has traded in last year's tram for a new 2563 model! @@ -866,13 +1435,20 @@ - image: Removed all unused/duplicate tram icons from .dmis - image: Colors are now consistent between status, tram, incident displays - admin: Reset tram commands available to admins in the debug panel +<<<<<<< HEAD Melbert: - bugfix: You can punch yourself again - rscdel: Deleted a mapped in wrestling belt +======= + MTandi: + - bugfix: Distilled drink quality is fixed - can't give a mood debuff anymore + Melbert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Revenants can now use Ouija Boards - rscadd: Ouija Boards now have more options to select from by default (and admins can VV it to even more options) - bugfix: Blind people are now worse at using Ouija Boards +<<<<<<< HEAD Paxilmaniac: - rscadd: The newly resprited peacekeeper uniforms for security can now be gotten in the loadout and in the clothing vendor. @@ -913,6 +1489,27 @@ - refactor: Find all the new stuff down on the October 17 changelog - image: Akula wetsuit now has a tail-less version SkyratBot: +======= + - bugfix: You can punch yourself again + ninjanomnom: + - admin: Invisimin can now be used on mobs that are already invisible, whether through + temporary or permanent effects. + - bugfix: Monkeyize/Humanize mob transformations no longer permanently reveal invisible + mobs if they had effects making them invisible otherwise. + - bugfix: Objects with the undertile element that have been made invisible through + other means are no longer revealed by being uncovered. + vinylspiders: + - bugfix: fixed runtime caused by simple mobs AttackingTarget() missing an arg + - bugfix: being killed or ghosting while being scoped will no longer cause the cursor + offset to persist in a bugged state +2023-10-19: + LT3: + - spellcheck: More announcement CSS fixes, now including light mode + Rhials: + - qol: As an observer, clicking on a bitrunning pod will let you orbit it's bitrunning + avatar. Cool! + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: 'Added slapcraft recipes for: Pillow suits, pillow helmets, bone and sinew tailoring/weaponry, pipeguns, ghetto jetpacks, and pneumatic cannons.' - code_imp: The base type of cowboy hats no longer looks and is named like a bounty @@ -921,6 +1518,7 @@ - bugfix: Fixed an issue where if a slapcraft recipe required more than one instance of its 'primary' slapcrafting item, it wouldn't show the additional instance when examining its recipes. +<<<<<<< HEAD - bugfix: '"line snapped" and "rod dropped" balloon alerts will now display when they are supposed to while fishing' - admin: Invisimin can now be used on mobs that are already invisible, whether through @@ -984,6 +1582,27 @@ - rscadd: Announcements have gotten a fresh coat of paint! They should be popping with splendid new colors and should have a lot less ugly linebreaks, while still managing to keep your attention at the screen. +======= + lizardqueenlexi: + - qol: Birdshot ordnance is now equipped with a second RPD and two holofan projectors. + - qol: Ordnance mishaps on Birdshot are significantly less likely to slam you into + an electrified window until you die. + vinylspiders: + - bugfix: fixes a tgui bluescreen bug with the bank account console that can occur + when there is bad bank account data + - bugfix: '"line snapped" and "rod dropped" balloon alerts will now display when + they are supposed to while fishing' +2023-10-20: + GPeckman: + - bugfix: B.O.R.I.S. modules can once again be properly applied to the unformatted + borg created when you reset an AI shell. + Higgin: + - bugfix: automatic breathers rejoice. oxyloss now knocks people out again. + LT3: + - bugfix: Maploaded medical beds now have correct brake lights + LemonInTheDark: + - rscadd: Screen is now more grungy for halloween +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Silicons don't spark when shot by disablers - bugfix: Changelings who fail to catch something with a tencacle will have throw @@ -995,6 +1614,7 @@ - refactor: Refactored bullet-mob interactions - refactor: Nightmare "shadow dodge" projectile ability is now sourced from their brain +<<<<<<< HEAD SkyratBot: - bugfix: Scream for me, the spell, now works - bugfix: Non-random puncture wounds can now be applied @@ -1005,6 +1625,70 @@ - code_imp: Bitrunner domains can now have spells or items from disks disabled if the domain maker wants such a thing - bugfix: '[Tramstation] fixed an unlinked Disposals Bin in the Pod Bay' +======= + - bugfix: Magic Mirrors can change your race again (?) + - bugfix: Magic Mirrors properly prevent you from being soft locked + - bugfix: Robo customers are as robust as before + - bugfix: Spasms won't trigger in stasis, incapacitated, if your hands are blocked, + or you are immobilized. + Rhials: + - qol: Ghosts will now be prompted to orbit when someone loses control due to being + blackout drunk. + - qol: Ghosts will now be prompted to orbit when a cultist begins inscribing a Nar'Sie + rune. + Yttriums: + - balance: reduces cellulose fibers required for advanced regenerative mesh creation + from 20u to 10u + carlarctg: + - code_imp: Adds 'Bloody Spreader' component that bloodies everything it touches! + - code_imp: For example inserting an item into it if it is a storage item. Or entering + it if it's a turf, or bumping onto it, or... you get the point, hopefully. + - rscadd: Added this component to the MEAT backpack, meat slabs, bouncy castles, + meateor fluff, meateor heart, and the heretic sanguine blade. + - rscadd: Gave most of these the blood walk component as well, which spreads blood + if it's dragged around. + - rscadd: Meat slabs contain a limited amount of both components, eventually they + will 'dry out'. + - code_imp: Added a signal for when an item is entered into storage. + lizardqueenlexi: + - bugfix: Heretic summons should now display the correct name when polling ghosts + to play as them. + san7890: + - bugfix: People should be crawling into welded vents a lot less now. + timothymtorres: + - bugfix: Airtank suicides will now drop items and organs again. + - bugfix: Fix husks fire decay rate to be slower. Pyre chaplains can now use husked + bodies (only caused by burns) to complete their burning sacrifice rite. + vinylspiders: + - bugfix: Fixes a bug where your mother would delete your species after calling + you a disappointment, rendering you a broken husk of a mob +2023-10-21: + Ben10Omintrix: + - rscadd: added a new syndicate item - the bee smoker + GPeckman: + - qol: Nonhuman autopsy, Tier Two Lasers, and several other experiments can now + be completed earlier. + - balance: Advanced robotics techweb node no longer requires neural programming + node. + - rscdel: Protolathe/circuit imprinter/techfab designs costing reagents is now totally + deprecated. + Ical92: + - bugfix: connected Meta's Cytology equipment properly + Jacquerel: + - bugfix: Blobbernauts will once again take damage when not on blob tiles. + LT3, san7890: + - rscadd: Announcements have gotten a fresh coat of paint! They should be popping + with splendid new colors and should have a lot less ugly linebreaks, while still + managing to keep your attention at the screen. + OrionTheFox: + - bugfix: '[Tramstation] fixed an unlinked Disposals Bin in the Pod Bay' + Paxilmaniac: + - code_imp: Bitrunner domains can now have spells or items from disks disabled if + the domain maker wants such a thing + Pickle-Coding: + - bugfix: Fixed tesla coil zaps cutting off too early. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: plumbing pill press & bottler won't stop when processing 50 unit bottles - code_imp: 'made a lot of variables defines and lists static to save memory for plumbing pill press. Moved global lists to it''s rightful @@ -1012,18 +1696,41 @@ place' - code_imp: copied over chem master pill & patch designs over to plumbing pill press and removed the old designs. resized UI +<<<<<<< HEAD - bugfix: making assembly activated bombs works again - bugfix: Fixed tesla coil zaps cutting off too early. +======= + - bugfix: RCD & RTD ui updates when switching between root categories + Watermelon914: + - admin: Added SS13.get_runner_ckey() and SS13.get_runner_client() which stores + the ckey and returns the client of the user who ran the lua script. Can be unreliable + if accessed after sleeping. + - admin: Added timer loop helpers to the SS13.lua module, check the docs + - admin: The SS13.lua module can now be made local without causing any errors. + lizardqueenlexi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Artificer constructs have been converted to the basic mob framework. This should change very little about them, but please report any bugs. NPC artificers are now smarter, and will focus on healing nearby wounded constructs - if you see them, take them out first! +<<<<<<< HEAD +======= + mc-oofert: + - bugfix: making assembly activated bombs works again + nikothedude: + - bugfix: Scream for me, the spell, now works + - bugfix: Non-random puncture wounds can now be applied + ninjanomnom: + - balance: It damages your eyes to look at the supermatter singularity + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Holodeck monkeys have been moved to the same system as old monkeys, and should retain the similar "ephermeal" behavior, while being a whole lot smarter by leveraging new AI. Please report anything that is completely wack about this. - balance: Slimes can't eat holodeck monkeys anymore, because apparently they could and that is wack. +<<<<<<< HEAD - bugfix: Blobbernauts will once again take damage when not on blob tiles. - qol: Nonhuman autopsy, Tier Two Lasers, and several other experiments can now be completed earlier. @@ -1086,6 +1793,16 @@ but no TGUI popup. Orbit the point of interest to be selected for the role. - refactor: A number of ghost spawns now feature this alert. Write an issue report if anything breaks. +======= + timothymtorres: + - rscadd: Add new fitness skill and mechanics for weight machines and punching bags. Working + out with a proper diet and good sleep will result in massive fitness gains. As + your fitness increases, so does your mass. +2023-10-22: + Ben10Omintrix: + - bugfix: fixes not being able to walk over or pull mook corpses + BlueMemesauce: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Export scanner no longer shows value of shipping manifests, now you actually have to read them. - balance: Shipping manifest penalty is now only half crate cost as well as capped @@ -1093,6 +1810,7 @@ - balance: Shipping manifests for private orders or locked crates can no longer have the incorrect contents error. Shipping manifests for departmental orders can n longer have any error. +<<<<<<< HEAD - qol: changed wording of a popup in the admin dressing menu - bugfix: fixes not being able to walk over or pull mook corpses - rscadd: Most pies can now be sliced rather than being consumed whole. @@ -1135,6 +1853,63 @@ - bugfix: items that require reagent containers & the reagents inside it for crafting(e.g. molotov) now crafts properly. - bugfix: most crafting recipes should work now +======= + FlufflesTheDog: + - bugfix: Kisses and emitters no longer make the SM crystal scream so much. + Ghommie: + - bugfix: Cooked meat no longer spreads blood around as if it weren't cooked. + Ical92: + - rscadd: Demonic-Frost Miner's ruin gets an aesthetic refresh + Jacquerel: + - bugfix: Meatwheat Clumps, Bungo Pits, and Eggplant Eggs should once again inherit + reagent purity from the grown item which produces them. + - bugfix: You should be revived properly when entering the mansus realm following + a heretic sacrifice + - bugfix: The buff which is supposed to heal you in the mansus realm will now do + that instead of unavoidably damaging you + - balance: The mansus realm's healing buff heals for 25% as much as it did before + it was broken + JohnFulpWillard, sprites by CoiledLamb: + - rscadd: You can now play Mafia on your PDA. + - balance: Mafia changelings can now only talk to eachother during the night. + - bugfix: Mafia abilities can't be repeatedly used on people. + Jolly: + - image: Colored labcoats have been GAGSed! Please report any weird oddities on + Github. + - bugfix: The coroners lab coat is no longer offset by one pixel. + LT3: + - bugfix: Fixed tram cabinet LMB/RMB actions being reversed + - bugfix: Tram cabinet can now read IDs inside PDAs and wallets + - bugfix: Crossing signals now correctly indicate broken/no power + - bugfix: Trying to repair tram (weld) without welding fuel fails + - bugfix: You can actually unbolt the tram controller from the wall + - qol: Tram spoilers now have visual and examine hints about being malfunctioning/emagged + - qol: Improved some tram error messages + - image: Added Halloween themed floor/tram tiles + LemonInTheDark: + - rscadd: Starlight should be a bit more intense, and flow better onto non space + tiles + MTandi: + - qol: changed wording of a popup in the admin dressing menu + - rscadd: Gygax type mechs now have an option to disable overclock when overheated. + - bugfix: Fixed overclocking having no effect on Ripley. + Melbert: + - rscadd: Adds Food Allergies as a -2 quirk. You can select which food you're allergic + to or rock a random option. + SyncIt21: + - bugfix: cryo and stuff that transfers reagents with a multiplier should transfer + correct volumes as expected. + Treach: + - bugfix: Skeleton Keys now fit in the Explorer's Webbing. + ZephyrTFA: + - qol: signalers now tell you their cooldown and also use balloon alerts + jlsnow301: + - rscadd: Adds a subtle ghost poll. This pings in dead chat and gives a screen alert, + but no TGUI popup. Orbit the point of interest to be selected for the role. + - refactor: A number of ghost spawns now feature this alert. Write an issue report + if anything breaks. + lizardqueenlexi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Maintenance Drones now use the basic mob framework. This shouldn't come with any noticeable gameplay changes, but please report any bugs. - bugfix: Drones can now interact normally with electrified doors. @@ -1144,6 +1919,7 @@ reinforced windows. - bugfix: Drones can now reboot or cannibalize other drones without being in combat mode. +<<<<<<< HEAD - qol: Adminwho messages are now in an examine block for heightened clarity. Vishenka0704: - qol: In OOC Notes/Flavor Text/Species lore url now are clickable @@ -1177,12 +1953,38 @@ - bugfix: Food created by mixing chemicals once again has a reagent purity based on the component chemicals. - bugfix: Replaced error spaghetti in thunderdome kitchen with regular cooked spaghetti +======= + ninjanomnom: + - rscadd: New dream that plays sound at you + timothymtorres: + - bugfix: Fix holodeck items from being eaten, crafted, recycled, juiced, or grinded. + - bugfix: Fix cqc kicks to only cause staminaloss when target is on the floor + vinylspiders: + - bugfix: admin triggering the Revenant event now works again + xXPawnStarrXx: + - rscadd: Most pies can now be sliced rather than being consumed whole. + - rscadd: Rootdough can be crafted using soy milk in place of eggs. + - rscadd: Two new lizard-safe rootbread sandwiches can be crafted. +2023-10-23: + SyncIt21: + - bugfix: items that require reagent containers & the reagents inside it for crafting(e.g. + molotov) now crafts properly. + - bugfix: most crafting recipes should work now + jlsnow301: + - rscadd: Just in time for Halloween- ghost notifications have been upgraded to + their own announcements. Boo! + san7890: + - qol: Adminwho messages are now in an examine block for heightened clarity. +2023-10-24: + DrDiasyl: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Command intercom now has a High-Volume setting like command headsets - qol: A memo telling frequencies of station radio channels are now present near the Command intercom and T-Comms room - image: Station, Command, and Prison intercoms have received new sprites - spellcheck: Station and Command intercom descriptions have been changed to tell about their functionality +<<<<<<< HEAD - bugfix: The polymorphic belt shouldn't work on animated objects. Logically wouldn't have DNA. nikothedude: @@ -1193,11 +1995,50 @@ - bugfix: Pollution (smoke et al.) will no longer be added to turfs when the subsystem is offline. Basically, you can now turn off pollution properly. - qol: Only player-made bonfires will produce smoke. +======= + Fikou: + - bugfix: surgical trays no longer animate when opened + Ghommie: + - bugfix: The polymorphic belt shouldn't work on animated objects. Logically wouldn't + have DNA. + Jacquerel: + - bugfix: Food created by mixing chemicals once again has a reagent purity based + on the component chemicals. + SyncIt21: + - bugfix: plastic sheet produces 4 tiles via the tiles option without using the + crafting menu + cnleth: + - bugfix: Replaced error spaghetti in thunderdome kitchen with regular cooked spaghetti + exdal: + - bugfix: hallucination announcements use new announcement style + jlsnow301: + - bugfix: Entering a virtual domain should no longer give you a message that it + doesn't forbid items +2023-10-25: + CoiledLamb: + - image: resprites air alarms + DrDiasyl: + - rscadd: New automatic weapon for the crew - Disabler SMG. Capable of rapidly firing + weak disabler beams. + - image: Muzzle flashes got a new sprite, each direction included! + - image: Temperature Gun "BAKE" beams are now lava colored + Hatterhat: + - qol: Universal scanners are now capable of recognizing the account owners and + assigned profit splits on barcodes. Cargo technicians are asked to do their + due diligence when matters call for it. + - rscadd: Anomaly-locked MODsuit modules can now be varedited to have unremovable + cores, or can be spawned with this functionality by using the /prebuilt/locked + subtype. + Jacquerel: + - bugfix: You will no longer be asked to construct meteor shields on stations which + cannot be hit by meteors. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored zombies to use the regenerator component. Now they'll have a slight glow/animation when the regeneration actually kicks in. - qol: Monkey cubes have a slight animation associated now. - bugfix: Cooking Deserts 101 grants all intended recipes +<<<<<<< HEAD RatFromTheJungle: - balance: made the colony fabricator's tools actually slower, removed the RCD per request @@ -1214,14 +2055,30 @@ want to burn/puncture people. - image: Muzzle flashes got a new sprite, each direction included! - image: Temperature Gun "BAKE" beams are now lava colored +======= + OrionTheFox: + - qol: Railings now have Examine hints for how to deconstruct them + - bugfix: '[Tramstation] fixed a missing Scrubber in the Civilian Radiation Shelter' + Rhials: + - bugfix: The Infected Domain should no longer fill up with smelly, poisonous gas + over time. + TheBoondock: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: improves blackout drunk character gameplay - bugfix: fixed improper prob() placement that caused blackout character to be forced sleep - sound: added hiccup sound +<<<<<<< HEAD +======= + jlsnow301: + - bugfix: Ghost alerts have been tuned down a bit. + lizardqueenlexi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Hostile skeleton NPCs now use the basic mob framework. They're a little smarter, and they also have a slightly improved set of attack effects and sounds. They love to drink milk, but will be harmed greatly if any heartless spaceman tricks them into drinking soymilk instead. Please report any bugs. +<<<<<<< HEAD - refactor: Juggernaut constructs now use the basic mob framework. Please report any bugs. - qol: Universal scanners are now capable of recognizing the account owners and @@ -1257,12 +2114,34 @@ make them a little smarter and more dangerous. Please report any bugs. - bugfix: Russian mobs will now actually use those knives they're holding. - bugfix: fixed hair gradients not applying correctly to huge afros +======= + - refactor: Hostile Nanotrasen mobs now use the basic mob framework. This should + make them a little smarter and more dangerous. Please report any bugs. + - bugfix: Russian mobs will now actually use those knives they're holding. + - refactor: Juggernaut constructs now use the basic mob framework. Please report + any bugs. + mc-oofert: + - bugfix: you may not enter knock path caretakers last refuge with the nuke disk + - bugfix: you can no longer cuff knock heretics in refuge + necromanceranne: + - bugfix: The nanites inside of thermal pistols are once again angry, and aggressively + want to burn/puncture people. +2023-10-26: + Cruix: + - bugfix: fixed hair gradients not applying correctly to huge afros + - bugfix: fixed hair gradients not applying properly on dismembered heads. + Xackii: + - bugfix: Fixed gorilla attack cooldown. Now attacking speed to mobs is the same + as attacking speed to objects. + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Adds charges to omens and omen smiting rather than only being permanent or one-use. Mirrors now grant seven bad luckers. - qol: Reduces omen bad luck if nobody's nearby to witness the funny. (Ghosts are included in the check!) - bugfix: Fixed an issue where a monkey check in doorcrushing was never actually able to pass. Also they screech now. +<<<<<<< HEAD - qol: Add smoke particles to burning fireplace - bugfix: Fixed gorilla attack cooldown. Now attacking speed to mobs is the same as attacking speed to objects. @@ -1315,12 +2194,21 @@ - bugfix: Damage will now be accurately carried between forms rather than being slightly reduced upon each transformation. - bugfix: venus human traps no longer die when on weeds +======= + timothymtorres: + - qol: Add smoke particles to burning fireplace +2023-10-27: + FlufflesTheDog: + - bugfix: Wigs now properly follow your head when you're any non-standard height + Hatterhat: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Examining an ammo box (incl. magazines) now tells you the top loaded round, so if you have different ammo types in different magazines, you can at least try to figure out which one is which. - spellcheck: Ammo boxes (incl. magazines) can now be set to use different phrasing for their ammunition (e.g. cartridges, shells, etc. instead of just mixing "rounds" and "shells"). +<<<<<<< HEAD sqnztb: - rscadd: Adds Vexcint's donation item. 2023-10-28: @@ -1342,6 +2230,28 @@ - rscadd: Adds the Praetorian modsuit to blueshield lockers. - code_imp: Added the Praetorian modsuit to list of items removed from cryo, in case a sleepy blueshield forgets to take off their suit. +======= + Jacquerel: + - bugfix: Dying when using (most) shapeshift spells will now kill you rather than + having you pop out of the corpse of your previous form. + - bugfix: Damage will now be accurately carried between forms rather than being + slightly reduced upon each transformation. + Watermelon914: + - rscadd: Reworked the colour schemes for the minor and major announcements as well + as their layout + - rscdel: Rolled back changes to deadchat notifications + - admin: Admins can now select the colour of their announcements as well as the + subheader when creating a command report. + mc-oofert: + - bugfix: venus human traps no longer die when on weeds +2023-10-28: + GPeckman: + - bugfix: The health bar on the mech diagnostic hud display should update consistently + now. + Jacquerel: + - bugfix: If a mob you are shapeshifted into attempts to grow up into a different + kind of mob then you will stop being shapeshifted +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Disablers and Lasers now show their on-impact effects on hit mobs again. - bugfix: People held at gunpoint can now flinch when being hit. @@ -1350,6 +2260,7 @@ - bugfix: Fixes some occasions which some effects (glass jaw, explodable worn items) won't respond to hits. - refactor: Refactored core code related to mobs sustaining damage. +<<<<<<< HEAD Nerev4r: - image: The Naga taur option has been replaced with a new sprite, with two Naga variants. @@ -1376,11 +2287,33 @@ projectkepler-ru: - image: gave the sindano proper inhand icon for both variant 2023-10-29: +======= + Xackii: + - balance: Sutures now heal a percentage of basic/animal max health instead of a + flat amount. + lizardqueenlexi: + - bugfix: Mobs without the "advanced tool user" trait - such as monkeys - are no + longer able to interact with camera consoles. + - bugfix: Monkeys can now properly attack parrots. + - bugfix: The Demonic Frost-Miner will no longer run around destroying the corpses + in its arena the moment the round begins. + unit0016: + - bugfix: Every misaligned railing ending has been corrected by the Nanotrasen Hall + Monitor's Lunchclub. +2023-10-29: + DrDiasyl: + - sound: Dying with a SecHailer on your face will make a unique death sound + Ghommie: + - rscadd: Added a few fish related bounties. + - rscadd: Fish cases to store and preserve life fish within can be now printed from + the service techfab and the autolathe. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - code_imp: Added support to the wet_floor component to make it so the wet overlay could not be applied to certain turfs if desired. - bugfix: Ice turfs no longer look tiled, and instead look smooth when placed next to one-another. +<<<<<<< HEAD Iajret: - bugfix: fixed new disabler smg having 20x more shots Kyo: @@ -1389,12 +2322,23 @@ - bugfix: Fixes being unable to open airlocks with telekinesis SkyratBot: - bugfix: Gnomes no longer runtime if they explode while sinking into the ground +======= + Melbert: + - bugfix: Fixes being unable to open airlocks with telekinesis + Paxilmaniac: + - code_imp: the deployable component has been tweaked and improved with some new + options to it + Profakos: + - bugfix: Gnomes no longer runtime if they explode while sinking into the ground + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Every person on the station now no longer has the Tranquility Evades the Shield Pinky Finger Shovegrab unarmed combat technique, an ancient and forbidden strike that allows anyone (literally anyone) to bypass all forms of blocking defense by simply not being in combat mode when they shove or grab their target. As a direct result, the chakra energy of the Spinward Sector has become severely misaligned. Oh well. +<<<<<<< HEAD - rscadd: Added a few fish related bounties. - rscadd: Fish cases to store and preserve life fish within can be now printed from the service techfab and the autolathe. @@ -1409,16 +2353,55 @@ LT3: - bugfix: Blueshift now has PDA charging microwaves available similar to other maps SkyratBot: +======= +2023-10-30: + GPeckman: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Light-Eaten objects can no longer emit light after being turned off and then back on. - code_imp: Flashlights now use light_on instead of defining their own variable. Please report buggy behavior. +<<<<<<< HEAD 2023-10-31: SkyratBot: - bugfix: Removed rare hard delete involving telecomms machines. - spellcheck: Changed candy description to read better - bugfix: Fixed an invisibility exploit on large mobs. Probably better this way +======= + - bugfix: Removed rare hard delete involving telecomms machines. +2023-10-31: + CRITAWAKETS: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Corn oil is now produced from corn instead of regular vegetable oil. - balance: Glycerol now uses corn oil instead of vegetable oil in it's recipe. - bugfix: Grinding corn now produces oil when it previously only made cornmeal despite having oil in it's reagents. +<<<<<<< HEAD +======= + Mothblocks: + - spellcheck: Changed candy description to read better + Toastgoats: + - rscadd: The Ethereal Vintner's Union has been "convinced" to trade their signature + Lanternfruit with Nanotrasen! + - image: Sprites for the aforementioned fruit. + jlsnow301: + - bugfix: Fixed an invisibility exploit on large mobs. Probably better this way + lizardqueenlexi: + - refactor: Wraith constructs have been converted to the basic mob framework. NPC + wraiths are now extra cruel and will attack the lowest-health mob they can see + at any given time. Make sure this isn't you! Please report any bugs. + - bugfix: Artificers and juggernauts no longer attack significantly more slowly + than intended. + - refactor: Pirate NPCs now use the basic mob framework. They'll be a little smarter + in combat, and if you're wearing your ID they'll siphon your bank account with + every melee attack! Beware! Please report any bugs. + mc-oofert: + - rscadd: living floor, living flesh, and other stuff for the bioresearch outpost + ruin + - rscadd: bioresearch outpost ruin + - bugfix: you may not defeat indestructible grilles and windows with mere tools + san7890: + - bugfix: Bitrunners can no longer get mass-mindswapped out of their avatar when + the wizard does the event. Something about machinery and magic not going well + together. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index ec29de4a419..ce2f6b50b1b 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -1,6 +1,29 @@ 2023-11-01: Data_: - bugfix: The detective's curtains can be closed again in Birdshot. +<<<<<<< HEAD +======= + EEASAS: + - rscadd: Added a new ruin to Ice Box Station, Lizard Gas Station + GPeckman: + - refactor: The wings you get from a flight potion (if any) are now determined by + your chest bodypart, not your species. + - qol: Functional wings can now be ground up to get the flight potion back, if you + want to get a different wing variant. + - bugfix: Practice laser carbines can no longer be used to rapidly fire regular + laser guns. + - bugfix: The fire visual on mobs should no longer persist after the fire has been + extinguished. + Iajret: + - code_imp: mod reskins now properly shows their icon when skins loaded from different + .dmi + Jackraxxus: + - bugfix: Obsessed's moodlets (Both positive and negative) go away when the trauma + is cured or the antag status is removed. + Jacquerel: + - bugfix: Non-human mobs can hallucinate their mothers without causing a runtime + error +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - code_imp: Changing security levels will only trigger the nightshift subsystem if lighting changes are required @@ -10,6 +33,7 @@ clean bloodied windows, as the janitor gods intended. It also means you can fill a spray bottle with Napalm, I guess. - refactor: Any cleaning object can now clean a microwave. +<<<<<<< HEAD NotDhu: - bugfix: Blueshift's white ship docking port should now work correctly. OrionTheFox: @@ -21,18 +45,35 @@ - bugfix: The Syndicate Revolver now has a Syndicate Firing Pin on the Nuke Ops uplink. - bugfix: Bluespace launchpads no longer work on shuttles +======= + Pickle-Coding: + - bugfix: Fixes tesla zaps being weird. + - admin: Logs explosions from explosive zaps. + Profakos: + - refactor: Traders are basic mobs now. Please alert us of any strange behaviours! + - code_imp: If there is only one option, radial lists will autopick it. This behaviour + can be turned off via a new argument. + SethLafuente: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added Abnormal Eggs - rscadd: Added Two new spiders - rscdel: Some Tarantula abilities - balance: Spiders speed are now connected to health - balance: Spiders now take more brute damage - balance: All egg laying now has a cooldown +<<<<<<< HEAD - rscdel: Removed extra consoles from birdshot's bitrunners - bugfix: Fixes tesla zaps being weird. - admin: Logs explosions from explosive zaps. - rscadd: The Ethereal Vintner's Union has been "convinced" to trade their signature Lanternfruit with Nanotrasen! - image: Sprites for the aforementioned fruit. +======= + SyncIt21: + - bugfix: Plumbing IV Drip has full control over its injection/draining rate. No + longer displays the message controlled by plumbing system + - bugfix: Plumbing IV Drip can be plunged by plunger again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Cargo will remove/cancel orders from its cart if that order exceeds the available budget (both private or cargo) and the player cannot cancel this order manually. All order costs are rounded up to integer values @@ -40,10 +81,36 @@ if it exceeds the available (private or cargo depending on the mode of ordering) budget & if it exceeds the available materials on the market. Galactic material market UI is overall improved. +<<<<<<< HEAD - rscdel: Remove duplicate light in battlecruiser starfury - refactor: Pirate NPCs now use the basic mob framework. They'll be a little smarter in combat, and if you're wearing your ID they'll siphon your bank account with every melee attack! Beware! Please report any bugs. +======= + Xackii: + - bugfix: chameleon projector now can copy icon for storage items(backpacks, box, + holsters etc) using right-click on it. + ZephyrTFA: + - bugfix: signals in circuits now actually function + deathrobotpunch1: + - rscdel: Removed the biometric scanning toggle from the PENLITE holobarrier + jlsnow301: + - bugfix: Paraplegics can now enter netpods. + - bugfix: Fixes an exploit caused by teleporting out of a netpod. + - bugfix: Outfit selection at netpods shouldn't give armor bonuses any longer. + - bugfix: Bluespace launchpads no longer work on shuttles + mc-oofert: + - rscadd: ctrlclicking the knock path eldritch id card will toggle whether it creates + inverted portals or not + moocowswag: + - bugfix: Modular shield generator modules no longer lose linkage when riding a + shuttle + - bugfix: Modular shield generators now gracefully turn off when being moved by + a shuttle rather than leaving their projections behind, the generator's description + was updated to advertise this behavior. + necromanceranne: + - bugfix: Lethal ballistic pellet-based shotgun shells no longer instantly delete. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Operatives can once again read about the basics of CQC at a reasonable price of 14 TC. - qol: All Syndicate MODsuits come with the potent ability to wear hats on their @@ -55,6 +122,7 @@ success as an operative. This is right at the top of the uplink, you can't miss it! Great for those operatives just starting out, or operatives who need all their baseline equipment NOW. +<<<<<<< HEAD - refactor: Traders are basic mobs now. Please alert us of any strange behaviours! - code_imp: If there is only one option, radial lists will autopick it. This behaviour can be turned off via a new argument. @@ -119,6 +187,26 @@ - qol: The RPD now accepts upgrade disks inserted by hand, as well as their original method of hitting the disk with the RPD - rscdel: Remove duplicate HoP shutter from birdshot +======= + - qol: To avoid poor magazine discipline, most combat-ready personnel have instructed + _not_ to put magazines into the gun loops on their armor vests. + rageguy505: + - rscdel: Removed extra consoles from birdshot's bitrunners + starrm4nn: + - bugfix: The Syndicate Revolver now has a Syndicate Firing Pin on the Nuke Ops + uplink. + timothymtorres: + - rscdel: Remove duplicate pipe on pirate ship + - rscdel: Remove duplicate power computer on oldstation ruin + - rscdel: Remove duplicate light in battlecruiser starfury + - rscdel: Remove duplicate space heater from snowcabin ruin + zxaber: + - balance: Malf Ability "Robotics Factory" can now be purchased multiple times. +2023-11-02: + ArcaneMusic: + - qol: Steam vents in maintenance now have tooltips. + DrDiasyl: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: There is now a more convenient way to prompt surrender to emote - the Security Pen. Each officer is equipped with one in their PDA. Simply click someone with it to prompt a 30-second surrender. They are printable at Security Techfab as @@ -126,14 +214,31 @@ - qol: Penlights now are printable at Medical Techfab. - image: Penlights got a new cleaner sprite to replace its ancient one - code_imp: The code for Penlight's holographic sign has been improved. +<<<<<<< HEAD - bugfix: Non-human mobs can hallucinate their mothers without causing a runtime error - rscdel: Removed duplicate northstar message monitor computer - spellcheck: basic mobs getting shoved by humans now display the mob's disarm response +======= + OrionTheFox: + - qol: The RPD now accepts upgrade disks inserted by hand, as well as their original + method of hitting the disk with the RPD + SyncIt21: + - bugfix: plumbing reaction chamber will attempt to balance the ph of the solution + a maximum of 5 times before giving up and thus preventing infinite loops, high + tick usage + - bugfix: plumbing bottler now only deals with bottles, beakers similar stuff but + not pills, patches, syringes or anything than can hold reagents. That & slime + extracts, slime industrial extract & shotgun shell + kawoppi: + - spellcheck: basic mobs getting shoved by humans now display the mob's disarm response + lizardqueenlexi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Proteon constructs now use the basic mob framework. The ones encountered in ruins are a bit flightier now, and will briefly flee combat if attacked - only so that they can return and menace you again soon after. Please report any bugs. +<<<<<<< HEAD - bugfix: plumbing reaction chamber will attempt to balance the ph of the solution a maximum of 5 times before giving up and thus preventing infinite loops, high tick usage @@ -147,10 +252,20 @@ - qol: Steam vents in maintenance now have tooltips. deathrobotpunch1: - rscdel: Removed the biometric scanning toggle from the PENLITE holobarrier +======= + timothymtorres: + - rscdel: Removed duplicate northstar message monitor computer + - rscdel: Remove duplicate syndi turret on waystation ruin + - rscdel: Remove duplicate HoP shutter from birdshot + - rscdel: Remove duplicate atmos fire alarm, cargo air alarm, and chemistry shutter + from icebox. + - rscdel: Remove duplicate machinery from russian derelict +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-11-03: Melbert: - balance: Changelings gutted by Megafauna now take 8x as long to finalize revival stasis (~5 minutes). +<<<<<<< HEAD SkyratBot: - bugfix: Basic mobs will no longer randomly walk into terrain that harms or kills them. @@ -198,11 +313,52 @@ please report any bugs. Syrox25: - bugfix: Cargo loaders are once again disposal and dishwasher safe +======= + Mickyan: + - spellcheck: The Mothic Rations Chart poster description now mentions Sparkweed + Cigarettes rather than Windgrass + Profakos: + - code_imp: creatures in cowboy boots will retaliate properly + Xackii: + - bugfix: Gorilla and dexterity holoparasite can now take things out of the backpack + while holding it in his hand. + jlsnow301: + - bugfix: Bubblegum should no longer teleport out of the simulation when threatened + - rscdel: Chamber of Echoes map removed as it conflicts with the actual Legion + - rscadd: Added some clarity to the range of netpods (4 tiles) in their exam text. + - bugfix: Heretics won't lose their living heart while bitrunning anymore. + - bugfix: You can no longer eavesdrop on nearby borgs' radio comms if they're using + encryption keys + - bugfix: Possessed blades can attempt to channel spirits again + larentoun: + - rscadd: Emote Panel TGUI added in IC category. + lizardqueenlexi: + - bugfix: Basic mobs will no longer randomly walk into terrain that harms or kills + them. + mc-oofert: + - bugfix: venus human traps heal in kudzu again + moocowswag: + - bugfix: Space carp that arrive via rifts are no longer stricken with rift travel + related sickness that causes them to become weaker. + ninjanomnom: + - bugfix: Fixes turrets being invisible when they shouldn't be + timothymtorres: + - bugfix: Fix fireplace smoke particles to work properly with all directions +2023-11-04: + Jacquerel: + - balance: Gorillas, Seedlings, Gold Grubs, Mooks, Constructs, Ascended Knock Heretics, + Fugu and mobs subject to a Fugu Gland now rip up walls in a slightly slower + but more cinematic way. + Melbert: + - admin: Admins without `R_POLL` no longer have access to "Server Poll Management", + not that they could have used it anyways. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Tattle: - bugfix: you should now be able to scrub through the library without lagging the server Zergspower: - bugfix: Bounties - Virus bounties work once more +<<<<<<< HEAD jjpark-kb: - balance: seed meshes now cost 1 plate, 2 chains instead of 1 plate, 4 chains - balance: seed meshes now will take 5 seconds to uncover any potential seeds instead @@ -248,11 +404,63 @@ 2023-11-07: Melbert: - rscadd: Fishers can now try their luck at fishing out of hydroponics basins. +======= + jlsnow301: + - bugfix: Added feedback for both extractor and extractee while using fulton extraction + packs. + - qol: Extraction packs now have better exam text. + - bugfix: Fixes midround selection for observers + - rscadd: Added a new fishing map to bitrunning. + - rscadd: You are no longer limited to pina coladas on the beach bar domain. Cheers! + lizardqueenlexi: + - refactor: Shades now use the basic mob framework. Please report any bugs. + nikothedude: + - qol: Character preferences now have descriptions as tooltips - hover over their + names to see them + rageguy505: + - rscdel: Removed a extra coffee pot in birdshot's security breakroom + san7890: + - refactor: The way mobs get specialized actions (like revenants shocking lights + or regal rats summoning rats to their side when you slap them) have been modified, + please report any bugs. + timothymtorres: + - rscdel: 'Remove duplicate machinery from Metastation: morgue disposal bin, medical + break room air alarm, and IV drip in permabrig medroom' + vinylspiders: + - bugfix: Softspoken quirk will no longer be applied to sign language +2023-11-05: + D4C-420: + - bugfix: lab coats no longer have directional sprites when thrown + Jacquerel: + - bugfix: Fugu can correctly destroy walls when they get big. + Profakos: + - bugfix: Basic mobs using JPS can move again + Tattle: + - bugfix: paintings can once again be filtered + lessthnthree: + - admin: Holobarrier creation now adds player fingerprint data + san7890: + - bugfix: The HFR will not print out a piece of paper every time you multitool it, + saving any desired energy to use for more useful processes. + timothymtorres: + - rscdel: Remove duplicate lighting from beach bar domain + timothymtorres, Rahlzel: + - sound: Port salute emote sound from Colonial Marines SS13 attributed to Rahlzel +2023-11-06: + JohnFulpWillard: + - bugfix: Mafia games can now start properly. + LT3: + - qol: Holobarriers will match the spray paint colour of their projector + - code_imp: Emergency shuttle announcements no longer use hardcoded values + - code_imp: Central Command announcements now correctly use its new name when changed + - spellcheck: Consistency pass on event announcements +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - code_imp: The notify_ghosts proc has been cleaned up. Please report any abnormal changes in deadchat notification behavior. - qol: The on-screen deadchat popups now contain the notification blurb when hovered with your mouse again. +<<<<<<< HEAD SkyratBot: - bugfix: fixed a couple missing and misplaced disposals pipes on metastation - qol: Improve the emote help verb to be more user friendly @@ -278,10 +486,38 @@ nikothedude: - qol: Rewrote most preference entry descriptions to be more useful 2023-11-08: +======= + SyncIt21: + - bugfix: reagent volumes should be consistent & non breaking across plumbing & + chemistry as a whole + - bugfix: plumbing reaction chambers are more proactive. Will attempt to take in + reagents more frequently +2023-11-07: + ArcaneMusic: + - qol: Light switches have tooltips, and may now be deconstructed with right click + using a screwdriver. + Deadgebert: + - bugfix: walls built next to firelocks no longer hold onto their alarms + FlufflesTheDog: + - balance: paraplegic is no longer exclusive with spacer or settler or spacer. Broken + legs don't discriminate! + Ghommie: + - image: Several holidays now have themed floor and tram tiling. + Higgin: + - bugfix: fixes synthflesh not dealing and in fact healing toxin damage. + Jacquerel: + - bugfix: The plasma river is about as deadly for animals as it is for humans. + - bugfix: Golems can now wade in the plasma river unscathed. + - bugfix: Undismemberable limbs will no longer be dismembered by the plasma river. + - balance: Golems and plasmamen cannot become husked. + - image: Robotic and Skeletal parts will remain distinct while the rest of the body + is husked. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Maximum smoothing turf groups now includes cliffs - bugfix: Tramstation floor tiles will correctly get custom station colors when they exist +<<<<<<< HEAD SkyratBot: - bugfix: The screen alert should no longer break ghost UI when it's huge - rscadd: Added a user type to integrated circuits @@ -319,6 +555,53 @@ - rscadd: The holocigar is now public. SkyratBot: - balance: Flightpotion wings will no longer make health analyzers list you as nonhuman. +======= + Melbert: + - rscadd: Fishers can now try their luck at fishing out of hydroponics basins. + MoffNyan: + - rscadd: Maltroach bar sign! + NeonNik2245: + - qol: Make notepad available for everyone, who has only laptop or console. + Watermelon914: + - rscadd: Added a user type to integrated circuits + cnleth: + - bugfix: Reagent lookup in chem dispensers now shows correct reagent metabolization + rates + lizardqueenlexi: + - bugfix: You will now only become blackout drunk if you've actually been drinking. + - bugfix: Observers should stop being notified that a nameless entity is blacking + out. + san7890: + - bugfix: Both magic mirrors and regular mirrors are far better at respecting the + choice of the beard you wish to wear (within reason, of course). + spockye: + - bugfix: fixed a couple missing and misplaced disposals pipes on metastation + timothymtorres: + - qol: Improve the emote help verb to be more user friendly + - bugfix: Fix light eater affecting lava, space, openspace, and transparent turfs + vinylspiders: + - bugfix: tails will no longer keep wagging even in death + - code_imp: added some trailing commas in lists that were missing them, fixed a + typo in comments + vvvv-vvvv: + - bugfix: Fix refresh button in log viewer +2023-11-08: + Ben10Omintrix: + - balance: sets the leaper move and pull forces to strong + Bumtickley00: + - spellcheck: You no longer hear weaponelding when deconstructing a closet. + D4C-420: + - rscadd: Being sufficiently drunk now has a chance to cause working out to fail + and harm you + Isratosh: + - bugfix: Nuclear operative induction implants now work correctly on antagonists + and fail on non-antagonists + jlsnow301: + - bugfix: The screen alert should no longer break ghost UI when it's huge + lizardqueenlexi: + - config: The bitrunner job now has a default config for server owners. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Harnessing Shoreline Quay (bluespace energy, probably), a mystical energy (total bullshit) that permeates the Astral Waterways (bluespace quantum dimensions, probably), Sleeping Carp users can now once against deflect projectiles with @@ -330,6 +613,7 @@ grabs and shoves. If the target of their grab has enough Stamina damage (80), they are knocked unconscious from a well placed nerve pinch. - balance: Sleeping carp users find it very hard to wake up once they fall asleep.... +<<<<<<< HEAD - bugfix: Material market buy buttons greys out correctly and thus prevent you from placing orders that exceeds the available budget. 2023-11-10: @@ -357,12 +641,32 @@ off kudzu. - bugfix: Nanotrasen has clarified an issue with their manual publishers, and these guides should now contain actual user-pertinent content. +======= + san7890: + - bugfix: Slimes now need to be on an open turf to reproduce and split into more + slimy slimes, instead of getting away with using phasing powers in pipes. + - bugfix: All vehicles (such as VIMs operated by a mouse or a lizard) will no longer + be able to phase through containment fields. +2023-11-09: + GPeckman: + - balance: Flightpotion wings will no longer make health analyzers list you as nonhuman. + KingkumaArt: + - rscadd: Enginenering rebar crossbows + tot kit + - rscadd: Added a bunch of ammos and crafting junk to make the ammo exist + - image: added icond for all the above + Melbert: + - rscadd: Anomalies, portals, and bluespace rifts will now wibble a bit. + SyncIt21: + - bugfix: Material market buy buttons greys out correctly and thus prevent you from + placing orders that exceeds the available budget. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: machines/devices that ask you to pick a reagent name from an input list have their names sorted alphabetically & preserves white space between words making them more readable. - qol: improves performance of plumbing reaction chamber furthur - code_imp: cleaned up code for portable chem mixer & chem dispenser. converted their ui to typescript +<<<<<<< HEAD - rscdel: Removed duplicate shutter from HoP office in birdboat, air alarm in northstar maint, and portable air pump in northstar maint. - bugfix: Fix holodeck items from being juiced or grinded with a biogenerator or @@ -490,6 +794,12 @@ They need to breath, and already got the suit for speed. - bugfix: '[Mafia] Obsessed now knows who their target is in their role description, and people playing on PDA are told in their chat.' +======= + Toastgoats: + - balance: Venus human traps now take 12.5 damage per second instead of 20 while + off kudzu. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: With the flood of Chi within the Spinward Sector receding, various masters of The Tunnel Arts, colloquially known as 'Maint-fu Masters', have started to refine the basics of their martial techniques. New forms have started to develop @@ -505,17 +815,130 @@ - refactor: Significantly changed how punching accuracy and knockdowns are calculated. - balance: Golem and mushroom limbs are a lot more effective at punching as a result of these various changes. As they should be. +<<<<<<< HEAD - bugfix: emped bar signs will now display the correct sprite - image: added a more detailed lightmask for the emp bar sign sprite - bugfix: Goats will now calm down after getting grumpy without causing a runtime error. - bugfix: fixes holodeck missing medical tools - spellcheck: Made the remembrance day greeting message more tasteful. +======= + xXPawnStarrXx: + - rscadd: Three new plants; Peppercorn, Saltcane and Butterbeans. + - rscadd: Soysauce fermentation to soybeans. + - rscadd: Saltcane can be dried into a replacement seaweedsheet for sushi. + zergspower: + - balance: NPC Syndicate Shotgunners range requirement returned +2023-11-10: + Jacquerel: + - qol: Adds the capability for some player-controlled mobs with ranged attacks to + repeatedly fire their natural weapons by holding down the mouse button. + Profakos: + - spellcheck: Renamed Knock to Locks, and changed most of the flavor text of knowledge + gain, and renamed some items and knowledges from the path. + SyncIt21: + - bugfix: Examining circuit boards now displays their detailed names(tier included) + correctly if required. + - bugfix: plumbing factories should not rarely/randomly brick at volumes like 0.9999(when + in fact it should have been 1) + - code_imp: removed order history, import & export value from cargo & economy subsystems. + Allow supply packs to be properly deleted. In general memory savings + Thunder12345: + - rscadd: New Oranges' Juicery bar sign for the OJ connoisseurs. + TwistedSilicon: + - bugfix: Cryo cells now use their direction to orient their initial connection + instead of defaulting to South. + Zxaber, DrDiasyl, Maurukas: + - rscadd: A new security-focused combat mech, the Paddy, has been added, intended + to be particularly helpful for lone sec officers. You will find one in the Security + main office, and a replacement can be built with late-game mech research. + - bugfix: Ripley MK-I and MK-II mechs no longer qdel their stored items when destroyed. + san7890: + - bugfix: Nanotrasen has clarified an issue with their manual publishers, and these + guides should now contain actual user-pertinent content. + starrm4nn: + - qol: Bandolier can quick gather items now. + - balance: Bandolier capacity increased to 24 and can carry .357 ammo now. + timothymtorres: + - bugfix: Fix holodeck items from being juiced or grinded with a biogenerator or + pestle and mortar + - rscdel: Removed duplicate shutter from HoP office in birdboat, air alarm in northstar + maint, and portable air pump in northstar maint. +2023-11-11: + DaCoolBoss: + - rscadd: 4 new space ruins + Jacquerel: + - image: Adds yet another bar sign, this one mining themed + KingkumaArt: + - bugfix: fixed engi crossbow being able to be used onehanded + ability to craft + with sci inducers + MTandi: + - qol: Ordnance burn, freezing and supermatter chamber air alarms now show the air + contents on the tile of the connected sensor inside the chamber. + nikothedude: + - balance: Snails no longer receive blunt wounds, meaning sharp weapons can dismember + them more easily + - balance: Slimes can no longer receive dislocations + timothymtorres: + - bugfix: Fix mapping linter not identifying duplicate blacklisted objects on a + turf + - code_imp: Add a mapping linter to check for stacked machinery + - rscdel: Remove duplicate windows from birdshot, delta, and anomaly research ruin. +2023-11-12: + DaCoolBoss: + - spellcheck: Fixed typos in the examine text for the lead pipe & lead-acid battery. + Jacquerel: + - refactor: Guardians/Powerminers/Holoparasites now use the basic mob framework. + Please report any unexpected changes or behaviour. + - qol: The verbs used to communicate with, recall, or banish your Guardian are now + action buttons. + - balance: If (as a Guardian) your host moves slightly out of range you will now + be dragged back into range if possible, rather than being instantly teleported + to them. + - balance: Protectors now have a shorter leash range rather than a longer one, in + order to more easily take advantage of their ability to drag their charge out + of danger. + - balance: Ranged Guardians can now hold down the mouse button to fire automatically. + - balance: People riding vehicles or other mobs now inherit all of their movement + traits, so riding a flying mob (or vehicle, if we have any of those) will allow + you to cross chasms and lava safely. + Melbert: + - bugfix: Split persons can talk to their host once again + - bugfix: AI controlled mobs which are immobilized are now properly immobilized + - bugfix: People with copied memories can modify their bank account ID as normal. + - rscdel: The Stethoscope no longer tells you if the target is missing a heart or + lungs. Now, it will simply say the target is lacking a pulse or not breathing. + vinylspiders: + - code_imp: gets rid of the rest of the instances of 'targetted' typo from code +2023-11-13: + DATA_: + - spellcheck: The examine message for a carbon with an empty golem stomach now properly + matches said carbon's gender. + Jacquerel: + - bugfix: Goats will now calm down after getting grumpy without causing a runtime + error. + JohnFulpWillard: + - bugfix: '[Mafia] Obsessed now knows who their target is in their role description, + and people playing on PDA are told in their chat.' + Melbert: + - bugfix: Fix being unable to resist out of ice cubes + Momo8289: + - spellcheck: Made the remembrance day greeting message more tasteful. + SethLafuente: + - bugfix: fixes holodeck missing medical tools + Vishenka0704: + - bugfix: Now you can refuse the pirates request. + YesterdaysPromise: + - bugfix: Replaces the jetpack in Interdyne pirates' suit storage with air tanks. + They need to breath, and already got the suit for speed. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Dread Disciples of Maint Khan, notorious Tunnel Arts practitioner and maintenance warlord, have been driven from Nanotrasen stations within the Spinward Sector. The average punch accuracy has been increased as a direct result, with the most exhausted puncher now having a max potential inaccuracy of 80%, rather than the absurd 20% of the Disciples. +<<<<<<< HEAD chemistrymain2: - qol: Mold mobs now delete on death. - bugfix: Toxic molds now correctly use a toxic spider instead of a guard spider @@ -533,15 +956,59 @@ vinylspiders: - bugfix: legally purchased suppressors no longer give illegal tech when deconstructed 2023-11-14: +======= + nikothedude: + - code_imp: Quirks are now customizable on the quirks page instead of on the character + prefs page + vinylspiders: + - bugfix: emped bar signs will now display the correct sprite + - image: added a more detailed lightmask for the emp bar sign sprite + zxaber: + - bugfix: Ashwalker Tendril Revives no longer ghost the player being revived. +2023-11-14: + 1393F: + - bugfix: The Sleeping Carp scroll no longer says deflect using throw mode. + Ben10Omintrix: + - refactor: gutlunches have been refactored into basic mobs. please report any bugs + - rscadd: ashwalkers have a small ranch they can manage + - bugfix: wall tearer compnent wont runtime when interacting with mineral walls + BlueMemesauce: + - bugfix: Fixed tcomms relays being weird, they should be sabotagable again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Danny Boy: - bugfix: Fixed Signer eyebrow raising/lowering indicators and emotes - bugfix: Fixed Signer RuneChat punctuation - bugfix: Signers no longer sign with their species' tongue +<<<<<<< HEAD +======= + GPeckman: + - qol: Fixed/improved feedback when failing to apply a direct law change to a cyborg. + - bugfix: Borgs who are unsynced from a malf AI now lose the zeroth law as intended. + Hatterhat: + - bugfix: Kronkaine's action speed buff now stops when metabolized out. + - bugfix: Drug-related moodlets should now time out properly. They still linger + after metabolization ends, but they no longer last forever. + Likteer: + - rscadd: Green Beer has an overdose effect now. It will permeate your skin. + MTandi: + - balance: Mech overclock coefficient is down to 1.25 from the default 1.5 for Ripley + and Clarke. + - balance: Mech overclock heating now scales with movespeed, higher speed - faster + overheat. + - bugfix: fixed pipe painter not applying pipe color properly + - qol: made spraycans work also as pipe painters + - qol: spraycans now have basic color presets for quick selection + - image: Crates got new sprites + - image: Added more crate styles + Majkl-J: + - bugfix: You can now eject blank IDs from modular computers +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - balance: Body temperature from being lit on fire will soft cap at 1,200 K. It will still increase beyond this, but with diminishing returns. For example, at 5,000 K, fire will heat 67x weaker. - bugfix: Fixes some potential exploits and issues involving shielded equipment. +<<<<<<< HEAD Rhials: - bugfix: The full mining lockers in the Lavaland Mafia map have been replaced with (empty) mining carts. @@ -562,6 +1029,25 @@ hopefully more stable in the future. - bugfix: The Sleeping Carp scroll no longer says deflect using throw mode. - bugfix: Fixed tcomms relays being weird, they should be sabotagable again +======= + OrionTheFox: + - image: Resprites the Reactive Anomaly Armor + Rhials: + - bugfix: The full mining lockers in the Lavaland Mafia map have been replaced with + (empty) mining carts. + SethLafuente: + - bugfix: fixes half-covering glassware protecting eyes from chemicals + SyncIt21: + - bugfix: suite storage units can be locked again. Remember to install a card reader + or set the access levels in the airlock electronics inside its stock parts & + finally swipe your ID to properly enforce access control. + distributivgesetz: + - bugfix: Removes some roundstart active turfs. + - bugfix: The PDA painter and the emergency shield generator can now be destroyed. + - code_imp: Atoms no longer break again after they are hit when broken, making them + hopefully more stable in the future. + larentoun: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: 'Gunpoint: Examining the target will show who is holding them at gunpoint' - qol: 'Gunpoint: Examining the shooter will show who they are holding at gunpoint' - balance: 'Gunpoint: If the target tries to grab, they will trigger the shot' @@ -571,6 +1057,7 @@ - balance: Both the target and the shooter can't be bumped anymore to avoid cheesing charged shot or removing the gunpoint by just moving around - bugfix: Clicking the alert button of the shooter will now correctly remove gunpoint +<<<<<<< HEAD - bugfix: fixed pipe painter not applying pipe color properly - qol: made spraycans work also as pipe painters - qol: spraycans now have basic color presets for quick selection @@ -596,12 +1083,39 @@ honkpocket: - bugfix: The SC/FISHER side-arm is now available in the OPFOR loadout. 2023-11-15: +======= + mc-oofert: + - bugfix: tramstation cargo disposals outlet has been repositioned to not softlock + whoever cannot lay down + san7890: + - bugfix: Gorillas and Regal Rats will no longer show up in the ghost-control menu + if they died without anyone ever taking control of them. + timothymtorres: + - rscadd: Add bamboo seeds to ash walker den. This lets them craft blowguns, crude + syringes, bamboo spears, punji stick traps, and more! +2023-11-15: + Ben10Omintrix: + - bugfix: bileworms will now attack + D4C-420: + - spellcheck: hopefully changed all instances of the word 'mjolnir' to 'mjollnir' + Ghommie: + - bugfix: Fixed a small issue with disposal outlets leaving contents about to be + ejected stuck inside the pipe beneath it if deleted. + Jacquerel: + - balance: Sapient brimdemons can't hurt themselves with their own beams + JohnFulpWillard: + - refactor: Destructive Analyzers now have a TGUI menu. + - bugfix: PDAs now log that they've been emagged, but will no longer log any further + programs they open beyond that. This means Nukies don't sell themselves out + by opening their disk tracking app. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Bad luck omen again raises your chance of getting shocked by the tram plate - bugfix: Tram plate checks and energizes when the tram is moving - code_imp: Omen component now applies the cursed trait Melbert: +<<<<<<< HEAD - bugfix: Fixes hallucination and encrypted announcements printing to the Newscaster. Nerev4r: - bugfix: Kicks are no longer supercharged by the dark energies of the Satsui no @@ -658,6 +1172,8 @@ - image: Added lights to the bluespace miner - refactor: Refactored bluespace miner code Melbert: +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: General heart code cleanup. - bugfix: Heartbeat sound effects are no longer sourced to the exact tile you fell into crit at @@ -665,16 +1181,22 @@ - bugfix: Ethereal hearts are less likely to become invisible or look wrong, and now properly spawn with their shine overlay - image: Adds heartbeat animation to beating Ethereal Hearts +<<<<<<< HEAD Motho: - image: The FTU has replaced their aging fleet of advanced shipping containers. Sector 13 is among the first few localities to enjoy them. SkyratBot: - qol: Dead human examines count as "soul departed" when the client is disconnected or the human doesn't have a brain anymore. +======= + - bugfix: Fixes hallucination and encrypted announcements printing to the Newscaster. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: drying rack now shows correct examines & screen tips. - code_imp: tone of code organization for smart fridges overall. changed ui to typescript. - qol: added more detailed examines & screen tips for smart fridges. drying racks can be dismantled with a crowbar and not simply pried open with it. +<<<<<<< HEAD - bugfix: Molotovs now splash before burning, not after - bugfix: The Galactic Material Market now respects quantity of materials purchased, removing them from the market when bought and preventing you from ordering more @@ -701,6 +1223,59 @@ 2023-11-17: Dalm: - image: A tea room sign for the bar +======= + TwistedSilicon: + - bugfix: invisimin verb now makes you invisible to all HUDs too! No more floating + healthbars or job identifiers giving you away while you sneak around. + jjpark-kb: + - qol: looms will now attempt to loop through stackable items (cotton as an example) + larentoun: + - rscadd: Emote Panel TGUI added in IC category. + mc-oofert: + - bugfix: The plaguebearer can no longer depower virology on Tramstation + san7890: + - bugfix: Safeties in the code have been added to prevent things in disposals going + into nullspace whenever they get ejected from a pipe - you will just magically + spawn at the turf that you were meant to be flung towards. + - qol: You will no longer be added to the list for ghost-orbit role polls if you + have opted out of getting antag ghost roles in your preferences. + - qol: You will get a tgui_alert to accept the ghost role if you were selected via + the orbit poll, instead of it just throwing you intot he role. + san7890, Ghommie: + - bugfix: The Blessing of Insanity now grants no damage slowdown and free hyperspace + movement correctly. +2023-11-16: + ArcaneMusic: + - bugfix: The Galactic Material Market now respects quantity of materials purchased, + removing them from the market when bought and preventing you from ordering more + than are available at a given time. + Fikou: + - qol: Dead human examines count as "soul departed" when the client is disconnected + or the human doesn't have a brain anymore. + Shroopy: + - bugfix: Molotovs now splash before burning, not after + deathrobotpunch: + - qol: the donksoft vendor refill cartridge is now available at the service lathe + falconignite: + - bugfix: Lizard tail wagging graphics + san7890: + - balance: Male Goats should no longer spawn with an udder, instead of it just being + Pete. +2023-11-17: + CRITAWAKETS: + - qol: The supermatter filters have been flipped on BirdshotStation to work like + the supermatters on every round, meaning the filtered gas goes in, and the non-filtered + gas comes out. + Dalm: + - image: A tea room sign for the bar + Fikou: + - bugfix: grabs no longer trigger krav maga + GPeckman: + - rscadd: Androids now have robotic brains instead of organic brains. + Ghommie: + - bugfix: Fixed catwalks over open space not making a sound when walked over. + - rscadd: The mother hallucination has more possible one-liners now. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - balance: Stop, drop, and roll no longer instantly clears 5 fire stacks off of you - Instead, it will clear 1 fire stack off of you every time you roll, with @@ -710,9 +1285,21 @@ cancel the roll, and you cannot use items while rolling around. - balance: Stop, drop, and roll will now repeat until the fire is put out or you get up. +<<<<<<< HEAD SkyratBot: - image: light tube inhand sprites are now grey, as are the icons for the light bulb/tube/mixed boxes +======= + RedBaronFlyer: + - image: light tube inhand sprites are now grey, as are the icons for the light + bulb/tube/mixed boxes + Shadow-Quill: + - bugfix: 'The CRAB-17 will now only take whole credits, as fractional credits were + found to be worth less. + + :cl:' + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: removed redundant procs `get_master_reagent_id()` & `get_master_reagent_name()` - code_imp: merged `remove_all_type()` proc with `remove_reagent()` now this proc can perform both functions. `remove_reagent()` now returns the total volume @@ -723,6 +1310,19 @@ ph of a solution making it less efficient but more faster. Just make the reaction chamber wait for longer periods of time to accurately balance ph - refactor: reagent holder code has been condensed. Report any bugs on GitHub +<<<<<<< HEAD +======= + Vekter (on behalf of Constellado): + - image: 'Added a new bar sign as one of the winners of our Bar Sign Contest: "The + Assembly Line".' + YesterdaysPromise: + - rscadd: Adds a chance that, when sharpened, a sufficiently potent carrot will + turn into a sword instead of a shiv. + Zergspower: + - bugfix: Space Ruin - All American Diner - Soda Machine now is scooted out of the + way + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Bitrunning Patch 1 features a host of changes! - rscadd: Added randomized mobs to virtual domains, which will be indicated with a unique icon. @@ -744,6 +1344,7 @@ new types. Check your preferences! - bugfix: The quantum server will now show its balloon alerts to all observers. - bugfix: Random domains should be fully random again. +<<<<<<< HEAD - rscadd: Adds a chance that, when sharpened, a sufficiently potent carrot will turn into a sword instead of a shiv. - qol: if you die in a mech you automatically eject @@ -753,11 +1354,20 @@ gas comes out. - bugfix: Space Ruin - All American Diner - Soda Machine now is scooted out of the way +======= + mc-oofert: + - qol: if you die in a mech you automatically eject + mogeoko: + - bugfix: Turbine parts will now use an amount of materials no greater than needed + for the upgrade + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Bar Bots (and several other mobs) will no longer aggro on you if you click on them with a "forceful" item from halfway across the room. - balance: After a string of unfortunate incidents, persons with telekinesis have been strongly warned against playing Russian Roulette, as they tend to hyperfixate on the gun a bit too much and end up firing it directly at their head. +<<<<<<< HEAD - bugfix: grabs no longer trigger krav maga - rscadd: Androids now have robotic brains instead of organic brains. - bugfix: 'The CRAB-17 will now only take whole credits, as fractional credits were @@ -774,10 +1384,18 @@ for the upgrade 2023-11-18: SkyratBot: +======= +2023-11-18: + Ben10Omintrix: + - bugfix: gutlunches will stop having too many children + - balance: gutlunches are no longer in the mining faction + JohnFulpWillard: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Secure briefcases are now actual briefcases. - refactor: Wall safes are now structures, rather than items that can't be picked up. - refactor: Lockable items (Wall safes & Secure Briefcases) now use TGUI. +<<<<<<< HEAD - bugfix: gutlunches will stop having too many children - balance: gutlunches are no longer in the mining faction - bugfix: After correcting a slight miscalculation, Bit Avatars now have hands again. @@ -787,6 +1405,27 @@ 2023-11-19: Deek-Za: - image: New Digitigrade icons for red sec officer and HoS uniforms. +======= + ZephyrTFA: + - rscadd: Chat Reliability Layer + - code_imp: TGUI chat messages now track their sequence and will be resent if the + client notices a discrepenency + jlsnow301: + - bugfix: After correcting a slight miscalculation, Bit Avatars now have hands again. + nikothedude: + - code_imp: TGUI preference lists can now have sorting prefixes to allow for specific + placement of items +2023-11-19: + DaCoolBoss: + - spellcheck: Nukie and ERT defibrillators now reference combat mode instead of + intents. + Ghommie: + - rscadd: Abductors have bigger brains. + JohnFulpWillard: + - rscadd: Infiltrators (Latejoin/Midround traitors) can now buy and use Contract + kits again. + - rscdel: Contractor baton can now only be purchased once. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tram will no longer electrocute innocent, law abiding crew trying to use the crosswalk when there's no tram in sight @@ -799,6 +1438,7 @@ - bugfix: Fried items now respect existing volume cap. - bugfix: Smartfridges now don't accept bulky food items, good thing we have none of those right guys? +<<<<<<< HEAD SkyratBot: - bugfix: ' Attaching a circuit to the air alarm now reads from the correct turf.' - bugfix: '"Old Chat" (AKA: The old-styled non-TGUI raw-HTMLesque chat that you @@ -821,6 +1461,49 @@ 2023-11-20: LT3: - bugfix: Delam counter will correctly show 0 the shift after a delam +======= + Rhials: + - spellcheck: The Grey ID Cargo Crate is now spelled properly. + SapphicOverload: + - bugfix: You can once again use alt to turn while strafing in a mech + Shroopy: + - qol: Implanted HUDs can now be toggled on and off with an action. + SyncIt21: + - bugfix: selling large amount of mats in cargo should not give you infinite credits + - bugfix: runtime when adjusting material market after buying + WarlockD: + - bugfix: ' Attaching a circuit to the air alarm now reads from the correct turf.' + YakumoChen: + - balance: Paint cans hold 20x more paint than before, painters rejoice! (Janitors + cry more) + distributivgesetz: + - bugfix: Fixes a runtime when the radioactive nebula trait runs with a map that + has no virology area. + mc-oofert: + - bugfix: you can climb over more stuff with a climbing hook + san7890: + - bugfix: '"Old Chat" (AKA: The old-styled non-TGUI raw-HTMLesque chat that you + might see when it prods you with the "Failed to load fancy chat!" issue) should + now get all text messages as expected.' +2023-11-20: + EuSouAFazer: + - qol: Slightly moved the universal enzyme on meta's kitchen to a prettier spot. + - bugfix: The universal enzyme on meta's kitchen is no longer unecessarely varedited. + Ghommie: + - bugfix: Fixed the infinite growth serum exploit. + - bugfix: Fixed generic nutriment processing even when dead. + - bugfix: Fixed an issue with un-hidden (alien, syndie etc.) nodes not being researchable. + - bugfix: The aquarium auto-feeding feature now works correctly. + JohnFulpWillard: + - qol: NTNet Downloader now has a search bar, and programs are now better sorted. + KingkumaArt: + - bugfix: Stopped a DS crash when shooting a rebar crossbow in specific circumstances. + LT3: + - bugfix: Delam counter will correctly show 0 the shift after a delam + MTandi: + - bugfix: Hydrotrays consume nutrients according to their proportion in the mix, + instead of randomly picking reagents to consume every cycle. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - admin: Adds a button to check-antagonists that allows admins to send Nuke Op reinforcements with a single button @@ -828,6 +1511,7 @@ declared) - bugfix: Fixes multiple nuke teams (or an admin) being able to declare war at once - rscdel: Heretic side path points are gone +<<<<<<< HEAD Nerev4r: - balance: Hemophages now have higher healing numbers, and liquid blood helps non-bone wounds like tea does. @@ -842,11 +1526,15 @@ - image: Sprites for the Bogseo done by me :333 Rhials: - spellcheck: The Grey ID Cargo Crate is now spelled properly. +======= + Rhials: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Nuclear Operatives, in an attempt to appeal to the more "tacticool" members of their cause, have begun using callsigns to designate themselves. Check your preferences to set your Operative Alias! - qol: At the request of the more vain members of the cause, hair dye has been added to the Operative Firebase dorms. +<<<<<<< HEAD SkyratBot: - bugfix: fixes bug that was preventing high luminosity eyes' light from turning on @@ -854,10 +1542,14 @@ - bugfix: Fixed the infinite growth serum exploit. - bugfix: Fixed generic nutriment processing even when dead. - rscadd: The mother hallucination has more possible one-liners now. +======= + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: debug chem synthesizer works again. cleaned up chem dispenser, portable chem dispenser & debug chem synthesizer ui code - qol: ui for displaying beaker reagents for debug chem synthesizer has been improved. Now displays input list for adding reagents +<<<<<<< HEAD - bugfix: Hydrotrays consume nutrients according to their proportion in the mix, instead of randomly picking reagents to consume every cycle. - bugfix: The aquarium auto-feeding feature now works correctly. @@ -871,6 +1563,8 @@ - bugfix: runtime when adjusting material market after buying - spellcheck: Some roundstart tips have been made clearer regarding "suits" vs. "exosuits". +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Removes & merges `get_multiple_reagent_amounts()` proc with `get_reagent_amount()` inside reagent holder - code_imp: Removes & merges `get_reagent()` proc with `has_reagent()` inside reagent @@ -878,10 +1572,17 @@ - code_imp: Removes & merges `has_chemical_flag()` proc with `has_reagent()` inside reagent holder - refactor: Reagent holder code has been further compressed. Report bugs on github +<<<<<<< HEAD +======= + Tattle: + - bugfix: admin painting manager works again + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Nearly every ghost alert should now feature a "VIEW" button, even those with click interaction. - rscdel: Ghost alerts no longer show the entire message in the tooltip, instead have been replaced with titles. +<<<<<<< HEAD - spellcheck: Nukie and ERT defibrillators now reference combat mode instead of intents. Tattle: @@ -897,6 +1598,24 @@ - rscadd: Added a seed shelf & produce bin - rscadd: Crafting recipes for stone cooking structures. - rscadd: Crafting recipes for Paxil's fences. +======= + - bugfix: Chat shouldn't bluescreen at the start of the round + - bugfix: Admins can spawn bitrunning events (again!) + lizardqueenlexi: + - bugfix: Hardcore Random will no longer assign incompatible quirks. + - spellcheck: Some roundstart tips have been made clearer regarding "suits" vs. + "exosuits". + san7890 and Ben10Omintrix/Kobsamobsa: + - refactor: Parrots (including Poly) have undergone a massive refactor, please report + any bugs or unexpected behavior that you may encounter. + - qol: Left-clicking a parrot with a cracker will tame it, right-clicking a parrot + with a cracker will now feed it the cracker. + vinylspiders: + - bugfix: fixed a race condition with mutations + - bugfix: fixes bug that was preventing high luminosity eyes' light from turning + on + - bugfix: fixes eyes being on the wrong side of the head when facing east/west +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yooriss: - refactor: Icemoon wolves now use the basic mob framework and should act more intelligently, defending their pack. @@ -905,6 +1624,22 @@ pet commands you'd expect, such as fetching things, and violently mauling people their owners point at. 2023-11-21: +<<<<<<< HEAD +======= + 00-Steven: + - balance: signers no longer suffer from social anxiety's speech changes when they + go non-verbal. Other effects are maintained. + DaCoolBoss: + - bugfix: Removed a duplicate grille from the abandoned mime outpost space ruin, + and replaced the 'energy weapon lenses' with spent revolver rounds. + EuSouAFazer: + - bugfix: Meta's recycler works again + Hatterhat: + - balance: The SC/FISHER disruptor pistol is now more likely to show up in black + market uplinks. + - balance: The SC/FISHER now has more range (21 tiles up from 14), and is usable + by pacifists. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Atrocinating mobs will now behave more as you'd expect. Meaning they don't slip on wet patches, can't trigger bear traps / landmines / mouse traps, ignore @@ -913,9 +1648,27 @@ glass tables - bugfix: Floating mobs won't squish stuff like roaches anymore - bugfix: Fixes bear traps triggering on floating / flying mobs +<<<<<<< HEAD SkyratBot: - balance: signers no longer suffer from social anxiety's speech changes when they go non-verbal. Other effects are maintained. +======= + OrionTheFox: + - qol: Allergy Dogtags (and any other dogtags, really) are now Tiny items and can + fit into wallets. + Thlumyn: + - bugfix: healing viruses can no longer have floor virus side effects + YesterdaysPromise: + - image: 'Following now have unique item sprites: syndicate war declaration radio, + curator and chief beacon''s, chaplain beacon.' + - image: 'Following now have unique inhand sprites: radio, export scanner, walkie-talkie, + syndicate war declaration radio, curator and chief beacon''s, chaplain beacon.' + dieamond13: + - bugfix: adds back one way exits to Tramstation science's entrance + necromanceranne: + - bugfix: When you successfully block a body collision, it does something rather + than nothing at all. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The battle against Maint Khan's forces rages on in the periphery stations of the Spinward Sector. And with it, a new breed of unarmed warrior has emerged; the cybernetic martial artist. Nanotrasen, rather than quell the minor maintenance @@ -932,6 +1685,7 @@ - balance: Surplus prosthetic limbs contribute more of their carried damage to overall health (AKA they make you actively more vulnerable to damage), and deal less damage with unarmed attacks. Take Quadruple Amputee at your own risk. +<<<<<<< HEAD - bugfix: When you successfully block a body collision, it does something rather than nothing at all. - qol: Allergy Dogtags (and any other dogtags, really) are now Tiny items and can @@ -960,10 +1714,13 @@ this in poor ways may displease the Gods. Woe upon your lineage. - rscadd: A single pack of glowshroom mycelium has been added to the Hearth's starting seed stores for the benefit of creative healers, shamans, and radiation enthusiasts. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-11-22: Bumtickley00: - balance: The CMO's hypospray now holds 60u, and can be set to inject smaller amounts of reagents +<<<<<<< HEAD Jane: - rscadd: Bargonia Bar Sign for Cargo Bar Enjoyers LT3: @@ -990,10 +1747,35 @@ - bugfix: adds back one way exits to Tramstation science's entrance - bugfix: Removed a duplicate grille from the abandoned mime outpost space ruin, and replaced the 'energy weapon lenses' with spent revolver rounds. +======= + Ghommie: + - spellcheck: Examining a human mob as an observer displays "Quirks", not "Traits" + Jane: + - rscadd: Bargonia Bar Sign for Cargo Bar Enjoyers + JohnFulpWillard: + - bugfix: '[Icebox] Atmos techs have access to the Engineering front desk windoor.' + - qol: '[Icebox] Security''s lower floor is not as easily cut off from the powernet + anymore.' + LT3: + - bugfix: Cursed/bad luck omen will now stick with the player for more than 1 incident + MTandi: + - bugfix: Emag overlay on lockers fixed + - image: New locker sprites + - image: Added new lockers + Xackii: + - bugfix: Androids cannot have overdose effect by any chems. + dieamond13: + - bugfix: removes a duplicate bookcase in icebox permabrig library + lizardqueenlexi: + - bugfix: Skillsoft's skillchip stations are now ADA-compliant (Astronauts with + Disabilities Act). Paraplegic characters can now implant themselves with skillchips, + the same as anyone else. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Heads impaled on spears now render in the correct place on the tip, instead of halfway down the shaft. - bugfix: Blind personnel are no longer able to magically see heads impaled on spears from a distance. +<<<<<<< HEAD - bugfix: Meta's recycler works again - qol: Slightly moved the universal enzyme on meta's kitchen to a prettier spot. - bugfix: The universal enzyme on meta's kitchen is no longer unecessarely varedited. @@ -1017,11 +1799,29 @@ Disabilities Act). Paraplegic characters can now implant themselves with skillchips, the same as anyone else. - qol: adds pixel perfect 4x, 4.5x, and 5x +======= +2023-11-23: + OrionTheFox: + - qol: Allergy Dogtags (and any other dogtags, really) are now actually whitelisted + to fit into wallets. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: autolathe does not diminish materials from custom material items like toolboxes when printing them in bulk. Also does not gray out that item in the UI - bugfix: autloathe correctly updates UI after inserting items into it +<<<<<<< HEAD - bugfix: fullupgrade chem dispensers will now spawn with all their chems +======= + Y0SH1M4S73R: + - rscadd: Certain types of pens now function like you expect they would when inserted + into a foam dart + - qol: Examining a foam dart closely will show you how to modify it, or what it + is modified with + aaaa1023: + - qol: adds pixel perfect 4x, 4.5x, and 5x + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Judo Joe, archnemesis of Maint Khan, has begun re-airing his midnight infomercials shilling his extremely expensive Tackle Supreme Judo Karate Training video tapes. Unable to pass up a 'bargain', Nanotrasen has purchased these tapes @@ -1048,6 +1848,7 @@ likely to eat shit on a whiff. DO OR DIE, BITCH. - refactor: Shoving slowdown and all its implementations now use a status effect, Staggered. +<<<<<<< HEAD - bugfix: Fix refresh button in log viewer - qol: Allergy Dogtags (and any other dogtags, really) are now actually whitelisted to fit into wallets. @@ -1077,16 +1878,36 @@ them. - bugfix: gutlunches now produce miner salve instead of milk, as well as the other reagents if fed the correct ore +======= + vinylspiders: + - bugfix: fullupgrade chem dispensers will now spawn with all their chems +2023-11-24: + Autisem: + - rscadd: Cyborg inducer for engineering borgs + - balance: The borg RPED can hold as many part as the BSRPED now + - balance: Cyborg chargers now draw from the power net as cell chargers do + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: A new skill chip can be found in maintenance or purchased from the vendor, allowing you to experience food in new and exciting ways. - rscadd: Abductors also have access to this incredible power, simply using their genius level brains. +<<<<<<< HEAD +======= + JohnFulpWillard: + - qol: Mafia panel no longer shows vote buttons if you're on stand, shows the roles + of revealed players, and list out who is on the stand, if any. + SyncIt21: + - bugfix: RCD can build directional windows on top of existing grills & without + them. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: removes & merges `expose_multiple()` proc into `expose()` proc inside reagent holder - code_imp: removes `conditonal_update()` proc & `on_update()` proc inside reagent holder and reagent - refactor: Reagent code has been trimmed and split into multiple files. report bugs on github +<<<<<<< HEAD - qol: Mafia panel no longer shows vote buttons if you're on stand, shows the roles of revealed players, and list out who is on the stand, if any. - qol: gives roundstart prisoners a key memory of what their crime is @@ -1148,6 +1969,34 @@ you get the chance why don't you? - image: So, so many sprites for new stuff made by me. SkyratBot: +======= + TwistedSilicon: + - bugfix: Window damage overlays have been fixed. + Xander3359: + - admin: Remove "Make AI" from VV dropdown + dieamond13: + - qol: gives roundstart prisoners a key memory of what their crime is + jjpark-kb: + - bugfix: gutlunches now produce miner salve instead of milk, as well as the other + reagents if fed the correct ore +2023-11-25: + MTandi: + - image: SM shard sprite updated + Rhials: + - qol: Gives Cargo areas its own wire layout, instead of having it use the same + wires as Service areas. + Time-Green: + - rscadd: Adds an arctangent2 component to circuitry! +2023-11-26: + DaydreamIQ: + - qol: Mothuchi's pizzeria has been improved slightly! Order yourself a fresh mothic + pizza today! + Majkl-J: + - code_imp: HUDs no longer use their own trait variable + Momo8289: + - bugfix: MOD quick carry modules now give the correct carry speed bonus + Profakos: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Slimes's colour, core type and mutation list is now held in a slime type datum - code_imp: Slime's variables have been documented, and renamed a bit to add clarity. @@ -1157,6 +2006,7 @@ of hiding it if a slime doesn't mutate further, or tweaking it if it might mutate back into itself. This will make it easier to parse which slime to breed further to get a rainbow slime. +<<<<<<< HEAD - bugfix: You can once again repaint robotic limbs to use alternate skins - bugfix: Poly should now remember phrases between shifts. - code_imp: removes unused proc `generate_possible_reactions()` from reagent holder @@ -1177,18 +2027,68 @@ GoldenAlpharex: - rscdel: The Radioactive Nebula station trait will no longer cause radiation storms, but all of its other effects remain. +======= + Rhials: + - code_imp: Bitrunning/Bitrunning Den areas are now cargo area subtypes, rather + than station area subtypes. + - qol: The area preceding Metastation Cargo's front door is now denoted as being + the "cargo lobby". + SuperNovaa41: + - bugfix: Fixes cyborged heretics seeing influences. + Time-Green: + - bugfix: Fixes nebula killing everyone when forced by an admin on icebox + Y0SH1M4S73R: + - bugfix: Rebar crossbow bolts are now reuseable again, without risking crashing + clients when fired at point-blank range. + - qol: Bitrunning glitches will not show up in the roundend report unless they escape + the virtual domain. + vinylspiders: + - bugfix: fixes a runtime in footstep code that would prevent the fov effect from + playing to nearby mobs +2023-11-27: + DaCoolBoss: + - qol: Oculine now tastes bitter, and not like toxin. + LemonInTheDark: + - server: Minimum compile version has been bumped to 515. clients still support + 514 but we're gonna start using 515 restricted features for serverside now. + Profakos: + - bugfix: You can once again repaint robotic limbs to use alternate skins + SyncIt21: + - code_imp: removes unused proc `generate_possible_reactions()` from reagent holder + san7890: + - bugfix: Poly should now remember phrases between shifts. + wesoda25: + - bugfix: the dismemberment moodlet will now properly clear for ethereals who regrew + a limb in their resurrection crystals +2023-11-28: + FeudeyTF: + - code_imp: Removed currency value for free products + Kylerace: + - code_imp: verb callbacks will no longer execute if the original client disconnected +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Bar signs can now be purchased from cargo. Neat! - qol: Bar signs can now be deconstructed with a screwdriver and wrench. - qol: Bar signs can now be smashed to pieces, rather than just disabled. +<<<<<<< HEAD SkyratBot: - code_imp: Removed currency value for free products - bugfix: Ranged Guardians (Holoparasites/Power Miners/etc.) can no longer use ranged attacks in scouting (incorporeal) mode. +======= + Y0SH1M4S73R: + - bugfix: People exposed to romerol while alive will once again revive as zombies + on death. + san7890: + - bugfix: Ranged Guardians (Holoparasites/Power Miners/etc.) can no longer use ranged + attacks in scouting (incorporeal) mode. + vinylspiders: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixes an overlay lighting hard del - bugfix: flashlights placed inside of backpacks and other storage items that were on the floor will no longer allow light to shine through - bugfix: fixed a null client runtime in advanced camera console +<<<<<<< HEAD - bugfix: People exposed to romerol while alive will once again revive as zombies on death. - bugfix: fixed a runtime in handle_dead_metabolism() @@ -1242,10 +2142,60 @@ rarytech: - bugfix: fixed the displaying of tacticool clothing for digi legs 2023-11-30: +======= + - bugfix: fixed a runtime in handle_dead_metabolism() +2023-11-29: + Ghommie: + - rscadd: Standing on structures such as crates, tables and bed will now look like + it. + Higgin: + - code_imp: Made ARDS death check respect maxHealth. + Iajret: + - bugfix: You can now destructively analyze syndicate and abductor items. It works + this time, I promise! + LT3: + - bugfix: Getting beheaded by the tram increments the scoreboard + - bugfix: 'Disease outbreak: classic spawned from the admin secrets panel no longer + fails to start' + - bugfix: Disease outbreak provides a message about why it fails to start + MGO: + - rscadd: Introduces new inverse reagents for Salicylic Acid, Oxandrolone, Salbutamol, + Pentetic Acid, Atropine, Ammoniated Mercury and Rezadone! + MTandi: + - bugfix: fixed chemical closet door not rendering when open + Momo8289: + - bugfix: The quick carry module should now correctly apply the appropriate traits + Mothblocks: + - image: Premade cleanbots are now always blue. + Rhials: + - bugfix: Renames a bar door from "Kitchen" to "Bar" on Metastation. + SyncIt21: + - bugfix: you no longer get an empty crate when ordering bluespace crystals from + the galactic material market. + Thlumyn: + - bugfix: bitrunning den shows up on the camera console now. + WarlockD: + - bugfix: All drones now can craft again + - rscadd: Non-Shy drones can now strip people of their things + - bugfix: Centered the "pull" button properly over the drop button + itseasytosee: + - bugfix: staggered targets now have the correct chance for escaping grapples. + - spellcheck: changed attack verb for punching a grappled target + san7890: + - bugfix: During the "Cursed Items" wizard event, you should only have smoke spawn + on you if you actually had a cursed item equipped to you. + vinylspiders: + - bugfix: fixed remaining footstep runtimes +2023-11-30: + Ben10Omintrix: + - refactor: cats are now basic pets. please report any bugs. + - rscadd: the cake cat and bread cat can now help the chef around in the kitchen +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The Radioactive Nebula station trait will now respect its upper intensity cap set at one hour and forty minutes, no longer scaling past that, as was initially intended. +<<<<<<< HEAD Majkl-J: - bugfix: Synth eyes now inhabit the correct body zone slot SkyratBot: @@ -1257,3 +2207,13 @@ - bugfix: Fixed warm coat, sweaters for digi sprites. capsaicinz: - spellcheck: your fiscal image is no longer actualized. +======= + Mothblocks: + - rscadd: Instead of teaming up random people together, blood brothers will now + start out with one player and let them convert a single other person over to + blood brother using a flash. + SuperNovaa41: + - bugfix: Cyber cops are now equipped with the correct outfit. + timothymtorres: + - bugfix: Fix bitrunning triggering claustrophobia +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml index 511d0b7b83e..c069d52c6c0 100644 --- a/html/changelogs/archive/2023-12.yml +++ b/html/changelogs/archive/2023-12.yml @@ -1,4 +1,5 @@ 2023-12-01: +<<<<<<< HEAD SkyratBot: - rscadd: turns triple ai mode into a station trait 2023-12-02: @@ -45,17 +46,117 @@ - bugfix: psyker heads no longer render an overlay of not having eyes - bugfix: Sign Language action properly toggles between an active/inactive background again. +======= + Fikou: + - rscadd: turns triple ai mode into a station trait + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Agent IDs once more trick Beepsky into treating you more leniently. - rscadd: Prisoner IDs make Beepsky treat you somewhat more suspiciously, as do Syndicate IDs. Wearing a Centcomm ID means that Beepsky is aware that you are above the law. - rscadd: Player-controlled security bots can view someone's assessed threat level by examining them. +<<<<<<< HEAD +======= + MidoriWroth: + - bugfix: Icebox chemistry lab shutters are controlled by the button in the chemistry + lab and not in the pharmacy again. + Pickle-Coding: + - code_imp: The singularity processing is a bit more important than the other subsystems. + TJatPBnJ: + - bugfix: Changelings will no longer get an objective to impersonate crew without + absorbable DNA. + - bugfix: Changelings will no longer start without an escape objective. + Thlumyn: + - rscadd: Slimepeople can now get wings from flight potions. + Vermidia: + - spellcheck: fixed typo in one of spacer's moodlets + - rscadd: Heterochromatic, Signer, Spacer, and Voracious quirks are now properly + accounted for in medical records. + jlsnow301: + - rscadd: Added a new modular bitrunning domain - Starfront Saloon. + - balance: Psyker shuffle domain was made slightly easier and has been given more + rewards. + mc-oofert: + - bugfix: shield wall gens actually use power now + - qol: shield wall gens may now be rebuilt and use some balloon alerts, and have + wiring + san7890: + - balance: The Meat Hook will now "ground" you whenever you fire it out at someone. + You get a very small immobilization every time you fire, which "upgrades" to + a full immobilization whenever you actually hit an atom and start to drag it + in. + - bugfix: A chain should now show up as you drag in something with the meat hooks. + - bugfix: Meat hooks should no longer play the "magical gun" suicide if you were + to use it, but instead do their own unique thing. +2023-12-02: + 00-Steven: + - bugfix: Sign Language action properly toggles between an active/inactive background + again. + Autisem: + - admin: A new debug verb to turn yourself into an MMI(almost the funniest thing) + - bugfix: MMI's inside mechs can now properly open doors like there posibrain counterparts + Ben10Omintrix: + - bugfix: fix parrots not appearing dead sometimes + Fikou: + - rscadd: Instead of punished sect healing people like the normal bibble- you take + their burdens on instead! + Ghommie: + - bugfix: Fixed an issue with the offsets of ridden vehicles on tables, and another + when buckled to a bed. + IsaacExists: + - sound: Added human laughter to felinids + Vekter: + - rscadd: Added a new hostile variant of cats, "feral cats". + - rscadd: Added a new traitor item, "feral cat grenades". For 5 TC, you too can + throw a grenade at someone and make five cats maul them to death. + - rscdel: Replaced the "monkey cube" in Birdshot's tool storage with a different + "monkey cube". + - rscadd: Added a fun surprise item to Birdshot's tool storage to compensate for + the above change. + jlsnow301: + - bugfix: Mod links are now disabled in the virtual realm. + san7890: + - admin: The Player Panel should now contain the unique mob tag associated to a + certain mob that a player might inhabit at one time, which is stored on their + player details datum on their client (which is guaranteed to always exist). + - admin: The "Old Names" details of a player is now visible in their own personal + per-player player panel. +2023-12-03: + Ben10Omintrix: + - refactor: medbots are now basic bots. please report any bugs + - rscadd: medbots can wear hats! + Fikou: + - qol: psyker echolocation cooldown time has been reduced from 2 to 1.8 seconds + - bugfix: psyker heads no longer render an overlay of not having eyes + Jackraxxus: + - bugfix: Digi legs work with the QM's jumpskirt + MrMelbert: + - bugfix: smartfridges no longer show false overlays + Rhials: + - spellcheck: Fixes a typo in the Factory Quartermaster outfit name. + SyncIt21: + - bugfix: crafting food or any other items that require reagents will not leave + behind blank reagents. That and properly updates the holder those reagents are + stored in + Vekter: + - bugfix: Fixed damage ranging on feral cats + - bugfix: Fixes hole in Birdshot hallway + distributivgesetz: + - spellcheck: Occurrences of "recieve" has been changed to "receive". + san7890: + - bugfix: Some mapped-in gifts that were supposed to guarantee a certain gift weren't + spawning that exact gift type, this has been patched to reflect the mapper's + intent. + tralezab: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Honorbound no longer cares about innocence when it comes to lesser creatures. They can still be considered unready in some cases. - balance: Attacking a cultist with a halo or a nuclear operative first instantly makes THEM guilty, allowing further attacks. - balance: More favor for converting someone to the honorbound rules +<<<<<<< HEAD - bugfix: Mod links are now disabled in the virtual realm. - bugfix: Fixed an issue with the offsets of ridden vehicles on tables, and another when buckled to a bed. @@ -68,6 +169,19 @@ minor additions. HoodMilk: - rscdel: Removed the holiday restriction on red-colored Christmas clothing. +======= +2023-12-04: + Ghommie: + - rscadd: Added the daily (roundstart) message server key to the Chief Engineer's + memories. + - bugfix: Fixed some oopsie whoopsie with elevation, trams and beds causing people + to visually ascend or descend to heaven or hell. + Hatterhat: + - bugfix: SecTech restocking units are now actually named SecTech restocking units, + and not Generic restocking units. + KittyNoodle: + - bugfix: Heretics can no longer cast all of their spells while in jaunt +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Falling down a z-level while standing now damages your legs rather than your entire body. This also means falling down multiple z-s may rarely break @@ -76,6 +190,7 @@ This replaces the knockdown with a short slowdown, and also has the trade-off of causing more leg damage. - rscadd: Cats can now fall z-levels without sustaining damage. +<<<<<<< HEAD MrDerpi: - bugfix: "synth livers not emp-able\n/\U0001F191\n" +<<<<<<< HEAD vorpal-void: - bugfix: yeah here we go, APC recharging, mission accomplished. - code_imp: power_cord.dm, whooping 4 lines of code. @@ -360,6 +512,51 @@ - refactor: 'TGUI V5: The UI has had its entire engine replaced with React v18.2. This might cause obvious or laughably broken UIs in places you wouldn''t expect. Please report any issues you find to the repo!' +======= + san7890: + - bugfix: 'Janitors rejoice (or lament): Floors should now be dirty shift-start. + + / \:cl:' +2023-12-06: + Ghommie: + - bugfix: Fixed the AI painting manager showing invalid choices. + - bugfix: "Fixed the painting manager search function.\n/\U0001F191" + Mothblocks: + - qol: Converting someone will now give a chat message. + - bugfix: Blood brothers can no longer get other antagonists, I hope. + dieamond13: + - rscadd: adds propeller hats, rainbow bowties, and swirl lollipops + norsvenska: + - rscadd: The NTSS Independence (Cruise Evac Shuttle) has received a makeover! Engineering + crews are still working on it, but it is operable and available for those who + have the money to rent it. +2023-12-07: + Chimpston, atlasle and aBlimpfox: + - image: "added Cult Cove, Neon Flamingo and Slowdive bar signs\n/\U0001F191" + Higgin: + - rscdel: Stagger animation no longer fires longer than it should on dead bodies + or on dead bodies period. + Tattle: + - balance: you can no longer teleport into chasms + Vermidia: + - bugfix: Medibots made from advanced medkits works again + - bugfix: Medibots made from brute medkits have their bonus healing again + - bugfix: Medibots can use robotic emotes again + san7890: + - admin: Spawning in Nar'Sie will no longer automatically trigger the round-ender, + you need to specifically start this chain of events through the new VV Dropdown + Option "Begin Nar'Sie Roundender". +2023-12-08: + Autisem: + - bugfix: Being revived inside a legion now sets you free + - bugfix: "in some rare cases gib() did infact not spawn gib\n/\U0001F191" + Ben10Omintrix: + - bugfix: medbots now drop hats when tipped and drop their items when they explode + GoldenAlpharex: + - bugfix: The typing indicator has overcome its shyness and is now back to its usual + form. + Higgin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: most diseases can now be slowed, mitigated, and eventually cured through being well-fed, resting, and using spaceacillin. Curing diseases through this way will give you immunity if you experience them at their peak/maximum and @@ -386,11 +583,117 @@ max your virus has. Experiment with different combinations using less than six symptoms to make viruses that are deceptively less-obvious and less quick to self-cure at the tradeoff of stats. +<<<<<<< HEAD +======= + LemonInTheDark: + - refactor: (Almost) all smoothed icons can now be edited in their pre cut forms + Melbert: + - qol: Replaces unused xeno weed extract item in abandoned crates with a random + assortment of cannabis. + OrionTheFox: + - image: resprited CTF ID Cards + ZeWaka: + - rscadd: TGUI Stack elements can now be zebra-styled (alternating colors for contrast) + timothymtorres: + - bugfix: Fix cult halo and eyes affecting deconverted cultists + vinylspiders: + - bugfix: fixed mutations holding onto refs after removal + - bugfix: fixes timed dna injectors +2023-12-09: + ATHATH: + - bugfix: Spacemen can no longer use curses to cheat at Russian roulette by selectively + blocking attempts to shoot themselves. + - rscadd: A Russian revolver has been added to the contraband section of each Good + Clean Fun vendor. + Ben10Omintrix: + - refactor: cleanbots are refactored into basic bots. please report all bugs + - bugfix: fixes cleanbots getting stuck sometimes while patrolling + - rscadd: janitors get a new skillchip which allow them to communicate with cleanbots + DaCoolBoss: + - bugfix: Minor bug fixes and improvements to the garbage truck space ruins. + - image: Claw hammer icon has been neatened up a little. + Fikou: + - bugfix: fixes punished sect giving you burden for stuff like changing species + Ghommie: + - bugfix: False anomaly alarms now work. + IsaacExists: + - rscadd: Added new modular Assault-Type domain "Abductor Ship" + - rscadd: Added new simple mob abductor agents team + KittyNoodle: + - balance: heretic robes now have wound armor + - balance: heretic blades now have knife-level wound bonuses + SyncIt21: + - bugfix: Cryostylane and oxygen reaction now cools down temps. Other reactions + with the `REACTION_HEAT_ARBITARY` flag also cools down temps correctly + - bugfix: coffin cookies are no longer invisible during the holiday seasons + - bugfix: Eggs don't leave behind their shells when cracked into a soup pot. Cups + end their attack chain early when dealing with specific items + - bugfix: canisters don't disappear when their colours are changed + - code_imp: changed some vars into defines to save memory, removed unused/useless + vars & added auto docs + - code_imp: converted UI to typescript. moved global canister list to its appropriate + folder + - refactor: removed prototype canisters and optimized canisters as a whole. + TJatPBnJ: + - bugfix: Bolt action rifles no longer open their bolt when firing their last bullet. + itseasytosee: + - rscadd: Sleeping carp/cqc users can now snap peoples necks by punching them in + the head while they are in a kill grab. + jlsnow301: + - refactor: 'TGUI V5: The UI has had its entire engine replaced with React v18.2. + This might cause obvious or laughably broken UIs in places you wouldn''t expect. + Please report any issues you find to the repo!' + vinylspiders: + - bugfix: false walls icons will now display again + whataboutism-alos: + - rscadd: Sprited and implemented a short lizard tail +2023-12-10: + Higgin: + - bugfix: Healing viruses now no longer self-cure for reasons they're not supposed + to and do for those that they are. + JohnFulpWillard: + - rscadd: PDAs with a dead power cell are now limited to using their Messenger app. + - bugfix: Microwaves now stop charging PDAs if the cell was removed mid-charge. + - bugfix: Microwaves can now charge laptops. + - bugfix: PDA Flashlights can't be turned on while the PDA is dead. + - bugfix: You can now hold a laptop up to a camera (if it has a notekeeper app installed) + like PDAs already could. + Melbert: + - refactor: Refactored some methods of items interacting with other objects or mobs, + such as surgery and health analzyers. Report if anything seems wrong + Rhials, MrMelbert: + - rscadd: The Tracker implant has had its teleport beacon functionality migrated + to the new (cargo accessible) Beacon implant. + - rscadd: Teleport Blocker security implant, that prevents the implantee from teleporting + by any means. Purchasable from cargo. + - rscadd: Security implants may now be harmlessly self-destructed at the Prisoner + Management Console. + - balance: The Tracker implant tracking radius has increased from 20 to 35 tiles. + The Prisoner Management Console will track and display the area the implantee + is in as well. + - balance: The exile implant now prevents implantees from operating shuttle controls. + - code_imp: Various code improvements and removal of unused vars in the Prisoner + Management Console + - code_imp: The HUD slots for chem/tracking implants have been converted to display + any implant with the IMPLANT_TYPE_SECURITY flag and an associated sprite. + - spellcheck: Modifies various implant pad readouts, removing false information + and rewriting some sections. + SyncIt21: + - bugfix: Pyrosium oxygen reaction now heats the holder and causes reactions inside + it. Also correctly sets the holder temperature to 20 kelvin & causes reactions + when first made + WarlockD: + - bugfix: 'The air_alarm_circuit to gets the environment from the proper turf. + + :cl:' + san7890: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Object Possession has been reworked, please report any potential bugs. - qol: Object Possession should now throw a screen alert for you to unpossess the object instead of you having to search the stat-panel for the "release obj" verb. You can still use the verb but it's a lot nicer now. Aghosting will also work now. +<<<<<<< HEAD - bugfix: fixed big rice pans getting worse with cooking. - qol: Add RMB hotkey and screentip UI to tracking beacons to toggle them on/off. - bugfix: 'The air_alarm_circuit to gets the environment from the proper turf. @@ -403,11 +706,26 @@ - bugfix: randomized spawned mobs will now have their species' random mutant colors and features applied properly 2023-12-12: +======= + timothymtorres: + - qol: Add RMB hotkey and screentip UI to tracking beacons to toggle them on/off. +2023-12-11: + MTandi: + - image: New cleanbot sprites + - image: New bucket sprites + - rscdel: All buckets and cleanbots are back to being blue + xXPawnStarrXx: + - bugfix: fixed big rice pans getting worse with cooking. +2023-12-12: + Ghommie: + - bugfix: Goldgrubs no longer block death bolts, even while alive. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: When using an item on a mob, you will always attempt to fix wounds AFTER surgery, BUT BEFORE the item's own interactions. As an example, this means using a mesh on a mob will attempt to progress surgery first, then attempt to fix any burn wounds, then heal burn damage. +<<<<<<< HEAD Rhials: - bugfix: Sunset Saloon virtual domain should no longer sometimes spawn with holes in the floor. @@ -431,10 +749,16 @@ and Medbay.' - bugfix: '[Blueshift] The forgotten exosuit fabricator will no longer attempt to output directly into the wall.' +======= + OrionTheFox: + - image: The Head of Security's "Sturdy Shako" hat now uses the same gold color + as his other hat +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Blackout drunkard personalities will now recieve a "you are about to sober up" warning at the 60/40/20 second mark, instead of repeatedly at the 50 second mark. +<<<<<<< HEAD Ryll/Shaps: - bugfix: You can no longer stack more than one applications of a burn wound at once @@ -449,10 +773,28 @@ - bugfix: fixed outdated item description - bugfix: You should be able to move stamps on paper again. - bugfix: climbing or being shoved into a glass table won't cause elevation issues. +======= + - bugfix: Sunset Saloon virtual domain should no longer sometimes spawn with holes + in the floor. + SyncIt21: + - bugfix: no runtime when unwrenching Atmos components + - spellcheck: fixed typo in attack chain define comment + jlsnow301: + - bugfix: Painting should be working again. + - bugfix: 'DNA Sequencer UI: You should be able to cycle in reverse with RMB again.' + - bugfix: Dropdowns should show what you've selected again. + vinylspiders: + - bugfix: fixes some AI runtimes that were caused by the pawn becoming null + vorpal-void: + - bugfix: fixed outdated item description +2023-12-13: + Ben10Omintrix: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: AIs can summon bots again - bugfix: cleanbots can clean floors directly underneath them and prioritize floors nearest to them - bugfix: medbots drop empty medkits now +<<<<<<< HEAD - bugfix: Bird Phobia now triggers on geese - bugfix: Dropdowns should show what you've selected again. - bugfix: no runtime when unwrenching Atmos components @@ -483,16 +825,75 @@ - server: The TGS -> Discord Relay Warning that detects if a cliented mob has a null loc should now be plaintext instead of being fully screwed up with useless codestuffs. +======= + Buyrcsp2: + - bugfix: Bird Phobia now triggers on geese + Ghommie: + - bugfix: climbing or being shoved into a glass table won't cause elevation issues. + Jacquerel: + - rscadd: Added subversive pins to the black market uplink which make security hate + you + - rscadd: The detective's spy cam can now be conveniently pinned onto people in + the same manner as medals + Jacquerel and Fikou: + - qol: If the station rolls the "Cargo Gorilla" station trait. you will be able + to sign up for the role from the game lobby. + - qol: If nobody signs up to be the Cargo Gorilla then you can select it from the + Late Join menu and arrive on the arrival shuttle. + - bugfix: The Cargo Gorilla will actually spawn. + LT3, Majkl-J: + - image: SM now has holiday lights + - image: You can now put a santa hat on the SM + Rex9001: + - admin: Updates the admin smite "Ocky icky phobia" with some new words + Ryll/Shaps: + - bugfix: You can no longer stack more than one applications of a burn wound at + once + Time-Green: + - bugfix: Highlander wont gib every person anymore + Watermelon914: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Organs can now be preserved by putting them in freezing temperatures. - balance: Morgue trays and freezers will now cool down the contents placed inside of them. - balance: Morgue trays will now properly display if someone stored within them is revivable and make periodic beeps every minute. +<<<<<<< HEAD - qol: The asteroid on Tramstation can now have areas expanded into or created within. +======= + jlsnow301: + - bugfix: You should be able to edit your character using the feature buttons again. + - bugfix: You should be able to move stamps on paper again. +2023-12-14: + Iamgoofball: + - balance: Light Footed now makes stepping on glass Knockdown instead of Paralyze + - code_imp: Fixes some single letter variable usage in caltrop.dm + LemonInTheDark, Donglesplonge: + - image: Redoes fov "mask" sprites. They're clean, have a very pleasant dithering + effect, and look real fuckin good! + - rscdel: Changed FOV, it no longer hides mobs, instead it blurs the hidden area, + and makes it a bit darker/oversaturated + Profakos: + - bugfix: Crabs will properly only target Tiny creatures + Y0SH1M4S73R: + - qol: The asteroid on Tramstation can now have areas expanded into or created within. + jlsnow301: + - bugfix: Cult chat, PDAs, succumbing, etc shouldn't blue screen anymore. + san7890: + - server: The TGS -> Discord Relay Warning that detects if a cliented mob has a + null loc should now be plaintext instead of being fully screwed up with useless + codestuffs. + - qol: For admins, in the "Spawn Atom" window where you pick atoms to spawn-by-type, + anything that is a subtype of `/mob/living/basic` should now be replaced with + the `BASIC` tag instead (like with carbons, reagent containers, turfs, etc.). + So, instead of having to scroll through and try and figure out what that weird + subtype of Poly is, it should now be easier to read in that smaller screen. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-12-15: ATHATH: - rscadd: If your bitrunning avatar somehow acquires and consumes a red pill, they will be disconnected from the Matrix. +<<<<<<< HEAD Jonnatonne: - rscadd: Adds new palmated antler horn type. SkyratBot: @@ -510,6 +911,25 @@ - bugfix: items that are rejected by the mat container will display the chat message saying that. - bugfix: Away lathes can now print robot navigational beacons +======= + Higgin: + - bugfix: Chemicals are now no longer less effective at curing advanced viruses + than they used to be. + IndieanaJones: + - bugfix: The clown car once again obtains the accesses of kidnapped crew within + the car. Supermatter crystals beware! + Profakos: + - bugfix: Away lathes can now print robot navigational beacons + Singul0: + - bugfix: Advanced Plastic Surgery is now unavailable shiftstart + SyncIt21: + - bugfix: mobs that have the `TRAIT_PERMANENTLY_ONFIRE` trait cannot be extinguished + by anything. + - bugfix: stuff thrown into lava should not runtime. it currently does not but if + there is a slight chance it does not happen + - bugfix: items that are rejected by the mat container will display the chat message + saying that. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: ORM will generate points regardless of how the ore enters it. - bugfix: Machines like autolathe, techfab etc can now be hit with iron sheets (or any other material item type those machines accept) when in combat mode rather @@ -519,6 +939,7 @@ - refactor: Machines like autolathe, techfab etc now display summed up material inserts to chats rather than each item individually. Also, will skip items & its contents if it cannot be processed thus saving time +<<<<<<< HEAD - bugfix: mobs that have the `TRAIT_PERMANENTLY_ONFIRE` trait cannot be extinguished by anything. - bugfix: stuff thrown into lava should not runtime. it currently does not but if @@ -532,10 +953,51 @@ - qol: Anesthetics tank description now mentions a rare quirk of anesthetic. - bugfix: fixes a bug which was causing certain mutations to only get partially removed +======= + Time-Green: + - bugfix: fixes zombie tumor not reviving + jlsnow301: + - bugfix: Admin interview panel should feel snappier. + - bugfix: Newscaster shouldn't bluescreen anymore. + - bugfix: Tram controls should work again. + timothymtorres: + - balance: Fitness level decreases the time it takes to firemany carry someone. + Fitness level determines how much of a positive mood the workout grants. Working + out is now more difficult and requires more nutrition. + - balance: Exercise no longer triggers double metabolism. + vinylspiders: + - bugfix: fixes a bug which was causing certain mutations to only get partially + removed + vvvv-vvvv: + - bugfix: Fix double-clicking in various UIs + zxaber: + - balance: Emagged and Hacked APCs now occasionally flicker a blue effect, and the + effect is not visible with cameras. + - rscadd: Adds a new discount experiment for unlocking the combat exosuit nodes + - complete it by scanning two exosuits with equipment in the left and right + hand slots. This replaces the prior discount experiment about destroying exosuits. +2023-12-16: + Derpguy3: + - spellcheck: Fixed a minor grammar mistake in the RD's job description and the + encrypted cache crate. + Ghommie: + - balance: '"Scarves" and "Wallets!" are now neutral traits.' + LT3: + - bugfix: Internal action buttons on computer consoles should work again + TheWolfbringer: + - bugfix: 'Bitrunners can now access the Northstar ORM + + :cl:' + distributivgesetz: + - balance: Delamination variants no longer change once the explosion point has been + reached. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Keybindings in prefs are able to be set again. - bugfix: Fixed the weird spacing on buttons. - bugfix: Confirmation buttons should be usable again. Bitrunning domains, command reports, etc. +<<<<<<< HEAD - balance: Emagged and Hacked APCs now occasionally flicker a blue effect, and the effect is not visible with cameras. - bugfix: Admin interview panel should feel snappier. @@ -565,11 +1027,42 @@ and no longer permanent. - balance: Mimes are back to being able to write while under a vow of silence. - bugfix: character setup screen no longer runtimes with all_nighter quirk +======= + tralezab: + - qol: Anesthetics tank description now mentions a rare quirk of anesthetic. +2023-12-17: + DATA-xPUNGED: + - balance: Exosuit Materials 1 now only requires one mech. + - qol: "Exosuit Materials 1 is much more lenient on the percentage it requires.\n\ + /\U0001F191" + Diamond-74: + - bugfix: character setup screen no longer runtimes with all_nighter quirk + Exester509: + - bugfix: ED-209s can no longer be crafted with most instances of helmet, you need + security ones just like Beepsky. + FlufflesTheDog: + - bugfix: Fixed a rare false positive with morgue tray alarms. + Ical92: + - bugfix: coffee cartridge racks start with a coffee cartridge in them + IndieanaJones: + - bugfix: Fixed runtime regarding thanking non-existent clown car drivers + Jacquerel: + - balance: Last Resort can now be used while unconscious or dead. + - balance: Last Resort stuns bystanders for slightly longer. + - rscadd: If you throw a bee at someone it will hit them sting-first and inject + that bee's reagent + - balance: Thick clothing can now protect you from the venom of bees, snakes, frogs, + and (small) spiders + - rscadd: Adds a new shuttle event, where space shuttles can experience minor turbulance. + Keep your belt on while the appropriate cabin light is lit. + lizardqueenlexi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Motorized wheelchairs will no longer spawn in a bugged state where they have no parts and can't be upgraded. - bugfix: Motorized wheelchairs will drop their power cell when destroyed or deconstructed. - qol: Power cells are now inserted into motorized wheelchairs as part of the crafting recipe, instead of as an extra step afterwards. +<<<<<<< HEAD - bugfix: Fixed a rare false positive with morgue tray alarms. - bugfix: fixed the oversight with martian food complexity. - balance: Exosuit Materials 1 now only requires one mech. @@ -651,11 +1144,94 @@ 2023-12-19: GreytideSkye: - bugfix: AI Announcement Help Is Now Not A Malfunction For The Not Black Mesa VOX +======= + tralezab: + - qol: Added a confirmation prompt to breaking your vow of silence. + - balance: Mimes can no longer repair the vow of silence once broken. + - balance: The negative moodlet from breaking your vow of silence is now lighter, + and no longer permanent. + - balance: Mimes are back to being able to write while under a vow of silence. + xXPawnStarrXx: + - bugfix: fixed the oversight with martian food complexity. +2023-12-18: + DarkHunter7756: + - bugfix: Aivime, Lentslurri, Eigenswap and Libitoil can now be cooked again. + - balance: Aivime now can stack blur effects for the soapiest game ever. + - spellcheck: Lenturri description become more actual + Diamond-74: + - bugfix: Reviver no longer attempts to revive impossible to defib mobs. + - refactor: Cleaned up unnecessary variables and re-arraigned code to have it perform + altogether in one tick. Additionally added a proper cooldown to revivers. + DrDiasyl: + - image: 'New Security clothing: Security High-Vis jacket!' + Fikou: + - rscadd: Bridge Assistant job accessible from a station trait. + Ical92: + - bugfix: fixed ghost role descriptions on NTTS Independence + Jacquerel: + - balance: Roundstart AIs are now made of positronic cubes, rather than brains inside + MMIs + LemonInTheDark: + - bugfix: Fire alarms no longer cause pitch blackness, instead creating a dark but + not black red light. + Melbert: + - bugfix: Fixes PAI health scan software + - bugfix: Fixes Laughter demons deleting the bodies of their friends. + Tattle: + - admin: obsession targets are logged + Time-Green: + - bugfix: Fixes losing HARS nullspacing your brain + - bugfix: Fixes AIize and borgize gibbing you + jlsnow301: + - bugfix: 'Interview UI should now be more obvious how it works: You must press + "enter" or save the answer.' + kawaiinick: + - code_imp: All nighters can now drink energy drinks to cope with their lack of + sleep. + uaioy: + - rscadd: Added 2 pocket quick equip keybinds + vvvv-vvvv: + - bugfix: Fix search categories in log viewer +2023-12-19: + Diamond-74: + - bugfix: Fixes runtime from augments not unregistering a signal. + - bugfix: Observers observing themselves no longer floods admins' logs. + Exester509: + - bugfix: Made Syndicate Stormtrooper and Nuclear Operative TGC card holograms visible + again + Fikou: + - bugfix: bridge assistant no longer passes some head of staff checks + - qol: if you steal a command member's liver, you can now sabre better! + - bugfix: qm's intern id is now "quartermaster-in-training" + - image: qm's id and hud icons now use the cargo tech icons (but blue) to be consistent + with the other heads of staff + Ghommie: + - rscadd: The Spectre-Meter modular computer app. A little, amatuerishly coded app + that, as the name implies, scan an area for spectral presence. It can be found + amongst other apps in maintenance computer disks. + - rscadd: An easier, lazier version of the Arcade app, also found in maintenance. + - rscadd: Black market computer disks, which contains programs not readily available + to the average assistant. + Mothblocks: + - bugfix: Fixed pressing Esc not unbinding keys in preferences. + OrionTheFox: + - image: the SpacePol bounty hunters have finally had a new run of Uniforms made, + bringing them back to the forefront of enforcement fashion! Wardens will find + their Police Jackets/Hats have been updated match SpacePol's new look as well. + - bugfix: fixed the Mafia Warden having a hat that didn't match his jacket, and + fixed SpacePol masks not covering the nose + Profakos: + - bugfix: The bitrunner domain completion screen alert is once again properly clickable + RedBaronFlyer: + - rscadd: Added orange hardhats, hazard vests, and pocket protectors to the cargo + drobe +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Seven: - bugfix: Ashwalkers can respawn fellow ashwalkers by bringing them back to their tendril again. - bugfix: Ashwalker tendrils no longer break hooded suits and modsuits. - bugfix: Ashwalkers can sacrifice silicons, it wont give anything though. +<<<<<<< HEAD SkyratBot: - qol: Assistants with <10h of playtime are now "Interns" - admin: Delete painting button is once again visible. @@ -670,10 +1246,14 @@ - rscdel: Removed Herobrine from the game - bugfix: The bitrunner domain completion screen alert is once again properly clickable - rscadd: Added 2 pocket quick equip keybinds +======= + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: crafting now transfers reagents from ingredients to final product making previously inedible foods (toasted seeds, kasei dango & snow cones) edible. Other crafted food products/items now differ in reagents based on the ingredients required. +<<<<<<< HEAD - bugfix: Observers observing themselves no longer floods admins' logs. Thlumyn: - image: added inhand sprites for towels @@ -685,6 +1265,29 @@ up from 0/10, respectively. LT3: - admin: Server wide admin announcements now use an alert box like other announcements +======= + Timberpoes: + - admin: Delete painting button is once again visible. + Time-Green: + - qol: Assistants with <10h of playtime are now "Interns" + - bugfix: Monkeys will no longer eat your organs while they're still inside of you + ZephyrTFA: + - rscadd: Map Votes are now weighted random. + - rscadd: Custom Votes can now take advantage of Weighted Random winner selection + - rscdel: Removed Herobrine from the game + jlsnow301: + - bugfix: Emojipedia shouldn't bluescreen anymore. + vinylspiders: + - bugfix: monkeys will no longer cause other monkeys to get angry at the mobs they + just poofed by attacking +2023-12-20: + LT3: + - admin: Server wide admin announcements now use an alert box like other announcements + Majkl-J: + - balance: Disallows siphoning credits outside of station + MelokGleb: + - image: cyborg tools became animated +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MrMelbert, Ghommie: - bugfix: Alien nests, and some other stuff, can be physically attacked again. - balance: x-mas trees (the ones with presents), are indestructibles. Truly protected @@ -692,6 +1295,7 @@ Rhials: - bugfix: Icebox escape pods will now land randomly on the surface, instead of only in certain ruins. +<<<<<<< HEAD SkyratBot: - bugfix: Fixes runtime from augments not unregistering a signal. - bugfix: qm's intern id is now "quartermaster-in-training" @@ -745,11 +1349,25 @@ - bugfix: fixes company imports bluescreen - bugfix: fixed a bug where certain loadout menu items would duplicate themselves across tabs +======= + jlsnow301: + - bugfix: Fixed a bluescreen while inputting a global variable in the circuit UI. + - bugfix: Emojipedia should copy the text on click properly, now +2023-12-21: + Rhials: + - bugfix: Disease Outbreak events will only select players on the station/lavaland + as patient zero. + ZephyrTFA: + - bugfix: Examine text on disconnected players is no longer accidentally subtle + vinylspiders: + - bugfix: fixes some dropdowns not displaying the right text after selecting something +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-12-22: LT3: - qol: Roundstart intercept report and security level announcements are combined into a single announcement Melbert: +<<<<<<< HEAD - qol: When you place a beaker in a chem-master, you no longer thwack it. - bugfix: Crewmembers immune to viruses won't be picked by the fake virus event. Paxilmaniac: @@ -768,11 +1386,44 @@ - bugfix: Many inputs should feel more responsive. - bugfix: Examine text on disconnected players is no longer accidentally subtle 2023-12-23: +======= + - bugfix: Crewmembers immune to viruses won't be picked by the fake virus event. + - qol: When you place a beaker in a chem-master, you no longer thwack it. + Profakos: + - qol: The bitrunning equipment vending machine now has a unique description for + each of the bitrunning disks + SSensum: + - rscadd: 'Added new quirk: Cyborg Lover!' + jlsnow301: + - bugfix: Name input in character setup should work properly now. + - bugfix: Many inputs should feel more responsive. + lizardqueenlexi: + - bugfix: Feature manipulation surgery will now properly update the patient's appearance. + - refactor: The tail portion of lizard spines will no longer draw on people who + do not have a tail. +2023-12-23: + 13spacemen: + - balance: Doing experiments AFTER their tech is researched now gives full 100% + points instead of 66%. + - refactor: Ghost roles now offer ghosts a clickable poll button. Ghosts can select + a role, deselect it, alt-click it for "Never For This Round", can cancel "Never", + can see the countdown, and can see how many other people are signed up for the + role poll. + Iamgoofball: + - bugfix: Fixes Holy Water giving you more blood and making you less drunk than + water normally does. + Jacquerel: + - rscadd: Nightmares retain their ability to dodge projectiles for a brief period + after leaving a dark area, meaning it is now possible to dodge lasers. + - qol: Nightmares and Shadow People now receive a screen alert when they are in + a sufficiently dark location that their abilities are active. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Gibbing a bot will no longer spawn bloody gibs. Rhials: - qol: Wizard apprentices now spawn on the same tile as the contract that summoned them. +<<<<<<< HEAD SkyratBot: - balance: Doing experiments AFTER their tech is researched now gives full 100% points instead of 66%. @@ -814,10 +1465,28 @@ - bugfix: Reactions whose temps/ph values fall way below their optimal values no longer restart & prevents infinite loops. Made reaction code slightly faster - rscadd: Added new GaGs santahats. +======= + SyncIt21: + - bugfix: Reactions whose temps/ph values fall way below their optimal values no + longer restart & prevents infinite loops. Made reaction code slightly faster + xXPawnStarrXx: + - rscadd: Added new GaGs santahats. + zeroisthebiggay: + - bugfix: '''A whole bunch of spiders in a SWAT suit'' to ''A whole bunch of spiders + in a MODsuit''' +2023-12-24: + BurgerBB: + - balance: Miasma is now filtered through gas mask filters, at medium strength. + Deadgebert: + - qol: Head of Security beret added to their garmet bag + - qol: Head of Security bowman added to their locker + Diamond-74: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Injecting yourself twice with a luxury medipen in pressure doesn't runtime and mechs with a cell with no max charge won't runtime. - refactor: Gives hyposprays a var to check if they're fully used up rather than setting total_volume to 0. +<<<<<<< HEAD StrangeWeirdKitten: - config: The headshot is no longer vetted or donor locked vinylspiders: @@ -870,11 +1539,24 @@ - rscadd: An easier, lazier version of the Arcade app, also found in maintenance. - rscadd: Black market computer disks, which contains programs not readily available to the average assistant. +======= + KannaLisvern: + - qol: Removed Bluespace Crystals and Diamonds from medical emergency bed's recipe. + Rex9001: + - balance: Ai's using the mech domination ability can now eject from the mech + Rhials: + - qol: Obsessed crewmembers are now displayed in the orbit panel. + - qol: The Paradox Clone orbit menu tab is now white. Neat! + SSensum: + - rscadd: Added weapon recharger boards to designs available to print on sec techfab. + Y0SH1M4S73R: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: MOD wearers and internal AIs can pin the individual actions in a MOD circuit module in a similar way to how they can pin modules. Circuit module actions can be pinned from the configuration menu of the circuit - refactor: The MOD action and BCI action components have been merged into one component - the Equipment Action component. +<<<<<<< HEAD - code_imp: removed excess calls to `update_total()` making reaction code slightly faster. - code_imp: removed excessive use of chemical constants (quantisation & rounding @@ -936,25 +1618,101 @@ - code_imp: adds helper proc to insert materials via the remote material component with proper context. - spellcheck: changes mutiline text to multiline text in vv +======= + jlsnow301: + - bugfix: Camera console search should update automatically + - bugfix: Autolathe search should now properly show designs + vinylspiders: + - bugfix: the boozeomat ui will stop duplicating space beer bottles + - refactor: refactored vending machine backend to have unique keys for their data + structures. should fix bugs related to items that happen to have the same name. +2023-12-25: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Camera circuits actually print pictures again! - qol: Camera circuits can now take pictures while on a carbon, whether held, hung around the neck, or sneakily hidden in either pocket. When held they try to deposit their pictures into the holder's hands if possible. - bugfix: Camera circuits should now actually use the camera's x axis picture size, rather than using the camera's y axis picture size setting for both axis. +<<<<<<< HEAD +======= + A.C.M.O.: + - bugfix: Fixed Personal AI cards, allowing them to wake up from sleep. + Iamgoofball: + - rscadd: Adds a mint condition clear PDA to the Goodies menu for 100,000 credits. + LT3: + - qol: TGUI will now wait longer trying to reconnect to a new round + Mothblocks: + - bugfix: Cut down a significant amount of time that caused the start of rounds + to lag. + - bugfix: Fixed a bug that would give you the chat message "/datum/element/damage_threshold + looks unharmed!" + SyncIt21: + - code_imp: removed excess calls to `update_total()` making reaction code slightly + faster. + - code_imp: removed excessive use of chemical constants (quantisation & rounding + constants) in places where they were not needed i.e. plumbing buffer, reaction + chamber, pyrotechnics & the liver. + Timberpoes: + - bugfix: Fixed an issue with polling ghost roles to control multiple mobs that + prevented Sentience Fun Balloons from working as intended. + Time-Green: + - bugfix: polymorphing into drone no longer gibs + Vermidia: + - rscadd: You can now look up and down through the IC menu + Watermelon914: + - balance: Cyborg lover has been replaced with Transhumanist. Transhumanists start + with a robotic limb and get mood buffs by being near to silicon-based lifeforms. + However, they get mood debuffs by being near organics, so there is a tradeoff + to taking this quirk. The cost for this quirk has been reduced from 2 to 0. + - bugfix: Fixed integrated circuit UI breaking. + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: AI voice changer UI should show defaults properly - bugfix: NTOS Software Hub should focus on the input immediately now - bugfix: Ore container UI should autofocus on the search bar now - bugfix: Vend-a-tray registration text should display as intended +<<<<<<< HEAD - qol: Wendigo Cave ruin gets an aesthetic refresh - bugfix: Wendigos (Wendigi?) no longer attack corpses - bugfix: fixes a hard del with thrown items - bugfix: Fixed integrated circuit UI breaking. +======= +2023-12-26: + 13spacemen: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Canisters now have wires! You can pulse wires to do various canister functions like opening/closing the valve. Make sure it has a cell though. - rscadd: You can rig assembly combos (igniter-timer, prox-signaler, etc.) onto canisters - qol: Canisters now have screentips +<<<<<<< HEAD +======= + - qol: You can now build multiple pipe layers with the RPD, with just 1 click! + Fikou: + - spellcheck: changes mutiline text to multiline text in vv + Ghommie: + - bugfix: Regal rats (and others), won't be punished by the automute system for + repeating the same command several times. + - rscadd: Added the 'Coupon Master' program for the PDA. Install it to receive periodical, + redeemable coupons for several cargo packs. Requires NTnet connection and the + messenger enabled to work. + - rscadd: Coupons are no longer only limited to goodies, but may also apply discount + to some other packs as well. + - bugfix: fixing damaged sandy dirt lacking an icon + Ical92: + - qol: Wendigo Cave ruin gets an aesthetic refresh + - bugfix: Wendigos (Wendigi?) no longer attack corpses + MelokGleb and KREKS: + - image: modified wizard weapon textures + ReinaCoder: + - rscadd: Adds a brown suit jacket to the detective's vendor + - image: 'Adds a new sprite for the a brown detective suit jacket + + :cl:' + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: debug chem heater now withdraws more than 100 units from its inserted beaker. - bugfix: chem heater has correct overlay when its panel is closed with a screwdriver @@ -964,6 +1722,7 @@ ui tracking code. Added auto doc for everything. - refactor: removed chem heater tutorial help button & its related reward, chem heater code has been optimized as a whole. +<<<<<<< HEAD Thlumyn: - rscadd: Added and moved some areas in the ghost cafe. - rscadd: Added an icewalker section to the ghost cafe. @@ -978,10 +1737,24 @@ - rscadd: icecats(?) can now respawn, similarly to ashwalkers zeroisthebiggay: - rscadd: icewalkers can be digitigrade +======= + - bugfix: plumbing rcd ui no longer has any graphical glitches + - bugfix: mat container displays correct number of sheets inserted for alloy materials. + - bugfix: remote materials now properly respect the `MATCONTAINER_NO_INSERT` flag. + - code_imp: removes material breakdown flags and related traits. + - code_imp: adds helper proc to insert materials via the remote material component + with proper context. + jlsnow301: + - bugfix: LUA editor should be usable again + vinylspiders: + - bugfix: fixes a potential mob hard del with cardboard boxes + - bugfix: fixes a hard del with thrown items +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-12-27: Melbert: - bugfix: Fixed some occasions in which heartbeat SFX will continue on revival for longer than expected +<<<<<<< HEAD Ryll/Shaps: - balance: Yawns are less likely to propagate SkyratBot: @@ -1003,10 +1776,36 @@ SkyratBot: - bugfix: mercury & lithium will no longer make you randomly move outside of cryotubes or in ground less turfs (space, water, lava etc) +======= + Mothblocks: + - bugfix: Fixed the surgery menu spamming chat messages when on the eyes section + of a player with no eyes. + Ryll/Shaps: + - balance: Yawns are less likely to propagate + jlsnow301: + - bugfix: NTOS Messenger should search as you type now + timothymtorres: + - qol: Add UI screentips to spraycans +2023-12-28: + Ben10Omintrix: + - rscadd: basic bots can now display their paths on huds + - bugfix: medbots can research healing again + Ghommie: + - rscadd: Added a "postal workers strike" negative station trait. In the case of + holidays and sunday though, it'll be a "postal system overtime" instead. + LemonInTheDark: + - rscdel: Removes the wires from canisters. It's a cool idea, but cheap controlled + maxcaps are bad actually + SyncIt21: + - bugfix: mercury & lithium will no longer make you randomly move outside of cryotubes + or in ground less turfs (space, water, lava etc) + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Fixes a typo in chat message when starting a Death Knell with the Vorpal Scythe - admin: Adds logging for the death knell, both when starts and when it is completed successfully. +<<<<<<< HEAD - qol: Add UI screentips to spraycans - rscadd: basic bots can now display their paths on huds - bugfix: medbots can research healing again @@ -1023,12 +1822,32 @@ - bugfix: Off station ORM's can redeem points again. - rscadd: Add 50% graffiti speed boost to tagger quirk - bugfix: Fix time duration of large graffiti not applying properly +======= +2023-12-29: + Diamond-74: + - bugfix: ai can now tell if it is in a do_after for resisting and will not interrupt + it. monkeys also now don't freeze up when aggressively grabbed and will resist + out of those and cuffs. + Ghommie, 13spacemen: + - bugfix: Signing or removing your candidature from ghost roles now properly updates + the screen button for it. + LemonInTheDark: + - bugfix: Dear mappers, the light debugger tool no longer deletes dragged wall lights + Mothblocks: + - bugfix: Fixed a lot of missing/broken images, such as emojis, language icons, + commendation hearts, icons in R&D menu, etc. + - refactor: Photo albums and photo frames are now more resilient to data loss, especially + when a server crashes. + - bugfix: Fixed "was shocked by /datum/component/energized" message. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: reaction chamber open its UI when inserting/removing beakers from it - bugfix: reaction chamber triggers new reactions & updates UI more often during heating - bugfix: instant and normal reactions now get triggered more often so for e.g. more plastic sheets from polymer reactions or more reactions occur when there are multiple reagents present +<<<<<<< HEAD - bugfix: Dear mappers, the light debugger tool no longer deletes dragged wall lights - bugfix: NTOS Messenger should clear on enter now - bugfix: ai can now tell if it is in a do_after for resisting and will not interrupt @@ -1047,6 +1866,29 @@ - bugfix: Poll alert buttons candidate number should be more responsive Useroth: - rscadd: Added a config entry for bypassing the veteran locks on jobs and quirks +======= + - bugfix: Off station ORM's can redeem points again. + jlsnow301: + - bugfix: NTOS Messenger should clear on enter now + timothymtorres: + - rscadd: Add 50% graffiti speed boost to tagger quirk + - bugfix: Fix time duration of large graffiti not applying properly + vinylspiders: + - bugfix: reduces lag in the tgui textarea input boxes + - spellcheck: changes some let's to lets +2023-12-30: + 13spacemen: + - bugfix: Poll alert buttons candidate number should be more responsive + Melbert: + - bugfix: Lizards now show a proper description in the magic mirror + ReturnToZender: + - bugfix: JSX files, when edited, cause TGUI to recompile on build + Tristrian: + - bugfix: Bot launchpads can deploy cleanbots and medibots again. + - spellcheck: Clarified the message when failling to recall a bot. + mc-oofert: + - rscadd: 69(roughly?) new vox phrases +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mogeoko: - bugfix: Atmospherics components will now move air into connected pipeline on deconstruction if possible. Otherwise, air will be released to the outside from open nodes. @@ -1056,6 +1898,7 @@ - bugfix: Atmospherics machinery will now share air from nodes after being rotated and reconnected to pipenet. 2023-12-31: +<<<<<<< HEAD Echomori: - bugfix: trying to move up or down while controlling an advanced camera console now properly moves the camera up or down, not your body @@ -1063,17 +1906,34 @@ - bugfix: Fixed BYOND membership status being available to non-BYOND members Melbert: - bugfix: Lizards now show a proper description in the magic mirror +======= + 13spacemen: + - bugfix: Dimensional anomlies converting airlocks preserves the old name + Echomori: + - bugfix: trying to move up or down while controlling an advanced camera console + now properly moves the camera up or down, not your body + Ghommie: + - bugfix: The transhumanist quirk now should work as intended. + GoldenAlpharex: + - bugfix: Vending machines now display the proper color customization options and + item quantities again! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PapaMichael: - sound: added *gaspshock emote sound effect to felinids Rhials: - code_imp: Unholy water no longer calls parent twice in on_mob_life(). +<<<<<<< HEAD SkyratBot: - bugfix: Dimensional anomlies converting airlocks preserves the old name - bugfix: The transhumanist quirk now should work as intended. +======= + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: chem heater now shows the new value of its buffer dispense volume immediately when it gets changed. - bugfix: debug chem synthesizer now shows the new values of amount & purity immediately when it gets changed. +<<<<<<< HEAD - bugfix: Bot launchpads can deploy cleanbots and medibots again. - spellcheck: Clarified the message when failling to recall a bot. - bugfix: Fixes borg polymorph @@ -1081,9 +1941,22 @@ - rscadd: 69(roughly?) new vox phrases - bugfix: Holodeck monkeys are properly cleaned up now - bugfix: Holodeck monkeys have organs now +======= + Time-Green: + - bugfix: Fixes borg polymorph + - bugfix: Holodeck monkeys are properly cleaned up now + - bugfix: Holodeck monkeys have organs now + vinylspiders: + - qol: makes modal list uis autofocus +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fishing up a spawner will now give you the spawned item instead of a broken, undeletable spawner object - code_imp: adds a warning to the stack trace when something tries to forceMove() a qdeleted spawner +<<<<<<< HEAD softcerv: - bugfix: fixes the NIF settings menu +======= + - bugfix: fixes textarea input boxes not updating on prop change (such as changing + tabs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-01.yml b/html/changelogs/archive/2024-01.yml index b98b0453365..16b55730d2c 100644 --- a/html/changelogs/archive/2024-01.yml +++ b/html/changelogs/archive/2024-01.yml @@ -1,4 +1,5 @@ 2024-01-01: +<<<<<<< HEAD A.C.M.O.: - bugfix: Fixed the Automatic Robotic Factory, making its cooldown timers visible to ghosts. @@ -9,11 +10,21 @@ GoldenAlpharex: - bugfix: Vending machines now display the proper color customization options and item quantities again! +======= + 13spacemen: + - rscadd: Atmos Holofan projectors can be right-clicked inhand to make their holograms + more transparent + Ben10Omintrix: + - refactor: hygeinebots are now basic bots. please report all the bugs + - bugfix: fixes hygenebots not being able to patrol + - rscadd: hygeinebots can now be controlled by Players +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored the area transformation colossus crystal effect to use the same system dimensional anomalies use. That means the colossus crystal now has access to some dimensional themes (bamboo, plasma, glass) and the dimensional anomaly now has access to some colossus themes (jungle, alien). +<<<<<<< HEAD Nova Sector: - qol: The names and descriptions of every paxilmaniac weapon have been improved to be shorter (names) and mention at least what bullet the weapon fires (description) @@ -77,11 +88,51 @@ your burn mix. - rscadd: Added new lizard variants of existing foods for equality of edibility. - qol: made pickle jars reusable and vinegar craftable. +======= + Time-Green: + - rscadd: Adds a geared assistant station trait! Spawn with a skateboard, toolbelt + or in your favorite bee suit! + - code_imp: Moves assistant code around + jlsnow301: + - bugfix: Dropdowns and pop-up menus have been rewritten. This should fix an issue + where dropdown text was accidentally scrolling if hovered. Please report any + issues on the repo + kawoppi: + - qol: added screentips to the janicart (pimpin' ride) + uaioy: + - bugfix: The sustenance vendor in perma actually serves food now + - bugfix: Cyborgs do not deathgasp twice when dying anymore + vinylspiders: + - bugfix: fixed fire extinguisher cabinets not appearing opened after removing the + fire extinguisher from them +2024-01-02: + 00-Steven: + - bugfix: slamming through a glass table while previously on a table no longer gives + you a negative offset. + 13spacemen: + - qol: Gas analyzer can scan adjacent turfs. No more roasting yourself just to scan + your burn mix. + - qol: The "Explosive Planted" alert for C4 actually shows the C4 + Majkl-J: + - bugfix: Having an inorganic chest/legs no longer makes you drop your ID, belt + or pocketed stuff upon losing your jumpsuit + Mothblocks: + - bugfix: Fixed footstep sounds. + OrionTheFox: + - image: resprited the Pirate/Sailor costumes, the pirate jacket, and the pirate + spacesuit + Rex9001: + - rscadd: A new heretic path opens up! Gaze up at the great sky for the path of + the moon opens and the lie shall be slain in pursuit of ultimate truth! + - bugfix: Fixes the syndicate delusion not working + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: you can set the chemical reaction chamber temps to 0k again - bugfix: used higher rounding value for reactions thus you get full volumes especially for endothermic reactions(no more 99.99 but 100 units). - bugfix: chem heater now applies heat per reaction step and sends updates to UI more frequently +<<<<<<< HEAD - bugfix: slamming through a glass table while previously on a table no longer gives you a negative offset. - rscadd: A new heretic path opens up! Gaze up at the great sky for the path of @@ -100,6 +151,29 @@ - code_imp: removed unused vars, auto doc procs and cleans up some code in turbine - image: Improved sprites for sailor school uniform - bugfix: Fixed integrated circuit speech logging +======= + YakumoChen: + - qol: Toggling an armour booster module on a MODsuit now gives a balloon alert + making the tradeoffs more clear. + jlsnow301: + - bugfix: Protolathe input should feel more responsive. + xXPawnStarrXx: + - rscadd: Added new lizard variants of existing foods for equality of edibility. + - qol: made pickle jars reusable and vinegar craftable. +2024-01-03: + 0-ERRORNAME-0: + - image: Improved sprites for sailor school uniform + Ghommie: + - rscadd: Reworked Binoculars to function like a scope from long-range rifles. They + also can be used while moving, albeit that'll slow you down significantly. + - rscadd: Authentic mothic softcaps can be found in the "Mothic Pioneer" curator + kit, which googles can also used to look into the distance. The date on the + boxed kit has been updated to match "muh lore". + - qol: Using a scope (and now binocs or moth cap) won't hide your mouse pointer + away now, so that you won't slip out of the game screen and close the game tab + by accident. + Profakos: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: attack_slime is completely gone - refactor: slime lifestate changes now have less boilerplate code - balance: baby slimes do a bit of a less damage on the low end, but all slime damage @@ -111,6 +185,7 @@ - bugfix: slimes can now properly drain basic mobs and simple animals that they can damage - bugfix: slimes can drift in zero gravity +<<<<<<< HEAD Vishenka0704: - admin: The ability to export a part(or z-level) of the map has been added. xXPawnStarrXx: @@ -187,10 +262,21 @@ - bugfix: the eZ-13 MK2 heavy pulse rifle does damage again - spellcheck: Corrects every misspelled 'kenetic' in the codebase. - spellcheck: Fixed punctuation in Luini Amaretto's description. +======= + SyncIt21: + - bugfix: turbine now shuts itself off when the room apc loses power or if it gets + damaged. Also uses a small amount of power for operation of internal electronics, + the green light & other stuff + - bugfix: No more runtime in turbine computer when parts are not fully connected + - qol: adds screentips & examines for turbine + - code_imp: removed unused vars, auto doc procs and cleans up some code in turbine + Tristrian: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Throwing things has now a sprite animation forward your target. - sound: Throwing things also has a sound accompagnying it. - spellcheck: Dwarves don't throw things hard like hulks. Instead their throws are described as "flimsily". +<<<<<<< HEAD - bugfix: Having a netpod destroyed will no longer grant you permanent healing. - bugfix: After a raid on the local drug mafia in the sector by TerraGov, the Russian Mobsters no longer have access to easy drugs and as a result are no longer 24/7 @@ -204,6 +290,108 @@ - bugfix: Morgue trays and freezing temperatures will no longer husk bodies - bugfix: Organs outside bodies will properly receive cold damage SkyratBot: +======= + Vishenka0704: + - admin: The ability to export a part(or z-level) of the map has been added. + Watermelon914: + - bugfix: Fixed integrated circuit speech logging +2024-01-04: + Ghommie: + - bugfix: food made with drying racks now counts as "chef-made" (ergo, can provide + a mild buff). + vinylspiders: + - bugfix: fixes some runtimes in pathfinding code, as well as one in the give direct + control admin verb +2024-01-05: + Ben10Omintrix: + - bugfix: stationary medbots will no longer ignore u for a while if u move out of + their way while healing + Ghommie: + - refactor: Introduced a simple budget system to station traits, so that smaller + things only count as half a trait, for example. + - balance: Increased the odds and maximum number of station traits that can be rolled + each shift. + Hatterhat: + - bugfix: Universal scanners are no longer invisible when set to the export or sales + tagger modes. + JohnFulpWillard: + - spellcheck: Fixed punctuation in Luini Amaretto's description. + - bugfix: Guardian host's ability buttons now works while the host is sleeping/unconscious. + LT3: + - bugfix: Alternate carpet colors will no longer reskin to normal carpet + - bugfix: OOC announcements will now be in shown in OOC colors + Melbert: + - bugfix: Some things which affect everything in an area are less laggy, the "all + lights are broken" station trait especially + - bugfix: Fixed runtime from blobbernauts attacking non-living things + - bugfix: Fixed Fugu Gland applying to mobs incorrectly + Rex9001: + - qol: Path of moon and lock now actually fit in the heretic tree + - balance: Certain path of moon rituals that needed brains now use easier to obtain + organs + - bugfix: the moon heretic ascension now produces lunatics again + - admin: Amputation Shear amputation is now logged + Thlumyn: + - bugfix: closets now have a working welder deconstruct screentip + Thunder12345: + - bugfix: 'Birdshot: Released gulag prisoners can now get off the gulag shuttle.' + - bugfix: 'Birdshot: The gulag shuttle airlocks will now cycle like other airlocks.' + - bugfix: 'Icebox: Added a fire alarm to the upstairs fore primary hallway.' + - bugfix: Gibtonite ore on ice planet gulags no longer spawns as lavaland rock. + jlsnow301: + - bugfix: 'TGUI: Sections should be scrollable on mouse hover' + - bugfix: Fixed redundant "Integrity:" in air alarms + mc-oofert: + - bugfix: you no longer fall down cliffs if you dont have gravity + vinylspiders: + - bugfix: fixed an /image hard del in ghost code + - bugfix: fixed a runtime in datum/thrownthing + - code_imp: progressbars no longer qdel their /image +2024-01-06: + 13spacemen: + - qol: The hub entry shows the next map and shuttle time, and no longer shows the + alert + - qol: Ghosts can now view Wanted Status and Sec Records by examining people + Melbert: + - bugfix: Strong arm implant users can shove more correctly. + Sightld2: + - bugfix: Cyborgs no longer think they're hitting themselves when stunned with a + stun baton + SomeRandomOwl: + - bugfix: Build Mode Export's options menu now knows when you want to cancel and + not change the options + WarlockD: + - bugfix: Queen bee's made with cytology now work + intercepti0n: + - image: resprited onmob cone icon. + jlsnow301: + - bugfix: Having a netpod destroyed will no longer grant you permanent healing. + - bugfix: Search bars for smaller lists should return to their former responsiveness. + - bugfix: Randomization button in prefs should look normal again. + - bugfix: Quirk customization shouldn't close immediately. + mc-oofert: + - bugfix: conveyor belts no longer maintain movement if whatever is on them suddenly + leaves their z level + - bugfix: After a raid on the local drug mafia in the sector by TerraGov, the Russian + Mobsters no longer have access to easy drugs and as a result are no longer 24/7 + running faster than the average spaceman. + - bugfix: the eZ-13 MK2 heavy pulse rifle does damage again + - bugfix: you can use your hand to make minebots go into combat mode again + necromanceranne: + - spellcheck: Corrects every misspelled 'kenetic' in the codebase. + vinylspiders: + - bugfix: fixes an image hard del + - code_imp: adds context to image hard dels to make them easier to track + - bugfix: fixes an /image harddel in station blueprints + - code_imp: cleaned up some more /image qdels +2024-01-07: + 13spacemen: + - bugfix: Hub shuttle time works correctly + LT3: + - bugfix: Morgue trays and freezing temperatures will no longer husk bodies + - bugfix: Organs outside bodies will properly receive cold damage + Mothblocks: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Instead of too much damage to the head beheading someone, it will now split their skull in half. While their skull is open, you can rip out their eyes with your hands. and they will spill their brain out of their head if they @@ -211,6 +399,7 @@ - balance: The Path of Blades ascension will accept either a beheaded person, or someone with their skull split open. - rscdel: Removed the beheading objectives from traitor. +<<<<<<< HEAD - bugfix: Hub shuttle time works correctly - bugfix: Papers no longer crash tgui - bugfix: Biogenerator no longer crash tgui @@ -271,10 +460,43 @@ theselfish: - rscadd: Skyrat races now produce butcher results closer to their ancestors. Cannibals rejoice. +======= + exdal: + - bugfix: Papers no longer crash tgui + - bugfix: Biogenerator no longer crash tgui +2024-01-08: + 13spacemen: + - bugfix: Jumping to C4 via ghost notification works again + DrDiasyl: + - qol: It is now possible to craft more Security bio suits + - qol: Bio-emergency crate from Cargo now contains a box of latex gloves and sterile + masks + Ghommie: + - bugfix: fixed coupon codes with expiration times. + - bugfix: Fixed H.A.R.S. fucking up the brains a little. + Majkl-J: + - bugfix: spasm_animation now correctly resets the transform, as it should + - bugfix: Spamming the weld on a robotic part no longer drains the fuel + Thunder12345: + - bugfix: The clown planet biodome and virtual domain can now be completed without + slipping directly into the exit. + fIoppie: + - qol: Cargo techs can now access the windoor in the delivery office on Delta. + jlsnow301: + - bugfix: Comms console should now update as you type. + mc-oofert: + - bugfix: vents that are turned off dont replay their animation if you go out of + sight and back in + - bugfix: adds missing navigation landmarks to tramstation + scriptis: + - refactor: some very large tgui lists (air alarms, all recipes techfab view, techweb + view) are loaded on-demand as you scroll, making them not lag so hard +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2024-01-09: Melbert: - bugfix: '"The sister and He Who Wept" Heretic painting will no longer cause big lag' +<<<<<<< HEAD SkyratBot: - bugfix: Spamming the weld on a robotic part no longer drains the fuel - qol: Ghosts can now view Wanted Status and Sec Records by examining people @@ -287,6 +509,24 @@ SkyratBot: - bugfix: The HoP's cartridge vending machine now sells regular PDAs instead of base command ones. +======= +2024-01-10: + 13spacemen: + - qol: If you can't heal a body part, you won't get a healing time delay. No more + spending 5 seconds healing a body part only to get a "can't heal that" message. + Absolucy: + - bugfix: Fixed the Codex Cicatrix always requiring a dead body, despite the description + saying leather or a hide would work too. + Chubbygummibear: + - bugfix: popup screen locs will work on clients >1614. Security cameras and Spyglass + will work + FlufflesTheDog: + - bugfix: Certain areas are now properly protected against grid check. Namely the + supermatter should consistently be protected. + Ghommie: + - bugfix: Fixed misfiring for firearms like tinkered detective revolvers. + IndieanaJones: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Dynamic midround rolls will properly consider roundstart players as part of the living population again, allowing antagonists with a minimum population value to spawn when they should be able to. @@ -294,6 +534,7 @@ roles again. - bugfix: Some antagonists which had elements that scale with living station population now function properly again. +<<<<<<< HEAD - bugfix: Ripley MK-Is and Paddys now correctly make incoming projectiles hit the pilot again. - bugfix: Medical records console should be useable again @@ -304,6 +545,21 @@ rather than kill them. 2024-01-11: Melbert: +======= + JohnFulpWillard: + - bugfix: Refried beans and Spanish rice now lets you take the bowl back after eating + it. + - bugfix: Eldritch reagent (the one that heals heretics) now heal heretic monsters + rather than kill them. + - bugfix: The HoP's cartridge vending machine now sells regular PDAs instead of + base command ones. + LT3: + - bugfix: Unencoded server admin announcements will now actually broadcast + Melbert: + - admin: Several types are now more accessible via the "spawn" verb (and friends), + meaning you can type 'Spawn" Modsuit' or 'Spawn "Jumpsuit' in the command bar + and it'll just give you a list of modsuits or jumpsuits to pick from. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Lionhunter Rifle is now available at the same point as Mawed Crucible, making it available to all paths again. - bugfix: Lock knowledge now goes the correct order. Mark -> Ritual -> Unique item, @@ -315,6 +571,7 @@ it after they are gibbed. - balance: Heretics no longer produce a Bastard Sword upon cult conversion. They are still immune to cult stun and cannot be converted by blood cultists. +<<<<<<< HEAD SkyratBot: - bugfix: Certain areas are now properly protected against grid check. Namely the supermatter should consistently be protected. @@ -349,11 +606,34 @@ - qol: ID cards now set their accounts with Alt-Right click. - bugfix: ID cards now once again have contextual screen tips showing what buttons do what actions. +======= + - bugfix: Carps now migrate slightly better, probably. + - bugfix: And Poly now talks better, probably. + OrionTheFox: + - image: Resprited a majority of undershirts + SyncIt21: + - bugfix: ejecting cells from microwaves via ctrl click now requires player proximity. + - code_imp: smart fridge content overlay now uses `base_icon_state` instead of a + separate var + jlsnow301: + - bugfix: Medical records console should be useable again + - admin: Fixed the bluescreen in the centcom pod launcher. + zxaber: + - bugfix: Ripley MK-Is and Paddys now correctly make incoming projectiles hit the + pilot again. + - bugfix: The various borg apparatuses can no longer pick up other internal borg + tools. +2024-01-11: + Thunder12345: + - bugfix: Pipeguns no longer have floating bayonets + vinylspiders: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: if your voice changes (e.g. through a voice changer or changeling mimicry) your runechat will now appear as the mob you are speaking in the voice of - bugfix: when doing emotes with your face obscured, your runechat color will now appear as either that of Unknown or the mob you are wearing the id of (if you are wearing a mask with someone else's id) +<<<<<<< HEAD - admin: Made logging for BSA targeting and firing easier to find for admins. - bugfix: Healing simplemobs with sutures and other stacks works again - spellcheck: Healing mobs with medical stacks like suture and mesh give better @@ -367,12 +647,56 @@ - qol: If you can't heal a body part, you won't get a healing time delay. No more spending 5 seconds healing a body part only to get a "can't heal that" message. - bugfix: Fixed being able to download the contractor program on the syndie store. +======= +2024-01-12: + 13spacemen: + - bugfix: Healing simplemobs with sutures and other stacks works again + - spellcheck: Healing mobs with medical stacks like suture and mesh give better + user feedback messages + - image: New liquid plasma sprites from SS14! + ArcaneMusic: + - admin: Added a new admin verb that ends all active weather within the weather + subsystem. + IndieanaJones: + - balance: Nightmare's Light Eater can now stun targets under certain conditions. + LT3: + - bugfix: Icebox kitchen has its light switch again + - bugfix: Icebox medbay hallway now has a fire alarm + Melbert: + - bugfix: Fix Ringleader's Rise not causing as many hallucinations as expected + - bugfix: Fixes some cult spells being unable to heal constructs (blood rites particularly) + - bugfix: Chameleon Suits will now automatically set your helmet into a hood if + using a hooded suit again + - bugfix: Blood Drunk Miner (Hunter version) should dash a bit more. + - bugfix: Ghost alert for buying a badass balloon should have a proper icon + TheVekter: + - admin: Made logging for BSA targeting and firing easier to find for admins. + Watermelon914: + - bugfix: Fixed being able to download the contractor program on the syndie store. + vinylspiders: + - code_imp: removed a dupe trait entry in the traits_by_type list +2024-01-13: + ArcaneMusic: + - qol: ID cards now set their accounts with Alt-Right click. + - bugfix: ID cards now once again have contextual screen tips showing what buttons + do what actions. + LT3: + - bugfix: Tramstation east APC will no longer be destroyed when the tram crashes + - qol: Tramstation central power and disposals moved out of the wall + Majkl-J: + - code_imp: The check that prevents your stuff from dropping when you have robotic + parts is now more robust + Melbert: + - bugfix: Lunar Parade has the potential to break less. + Paxilmaniac: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The heat-proof catwalk made by heat-proof rods will go away when a tile is placed on it, rather than sticking around and needing to be removed manually - bugfix: The lighting will not irreparably break on tiles where plating was placed on lava-proof catwalks - code_imp: Some single letter variables and the structure of the code around placing tiles on lava-proof catwalks has been improved +<<<<<<< HEAD - admin: Added a new admin verb that ends all active weather within the weather subsystem. - bugfix: Fixed misfiring for firearms like tinkered detective revolvers. @@ -443,11 +767,52 @@ - qol: Using a Lawyer badge in your hand now shows a thought bubble with the badge, rather than giving a lousy message in your chat. - image: the plumbing chemical splitter no longer has a wrongly rotated direction +======= + - bugfix: The deployable component will now actually stop rotating things when the + variable to not do that is set + - bugfix: The "required_container_accepts_subtypes" variable on chemical reactions + now actually works again + Rhials: + - bugfix: Specialty drinks crafted in the crafting menu will now create the intended + reagents, instead of containing the reagents used to craft it. + jlsnow301: + - bugfix: Dropdowns should be more performant +2024-01-14: + IndieanaJones: + - bugfix: Changeling eggs laid by headslugs work again + - bugfix: Changeling egg incubation times should feel much more consistent, hatching + after 4 minutes + LemonInTheDark: + - admin: Confirming that you have read an admin message now uh, works. it's been + 2 years bros + zxaber: + - bugfix: Borg tools that hold and use specific items now work correctly again. +2024-01-15: + Ghommie: + - bugfix: Animals enlargened by the fugu gland are now visually aligned with the + turf they're standing on. + IndieanaJones: + - qol: The combat mode toggle button is now present on the HUD for simple and basic + mobs. + - bugfix: Rat King's abilities no longer require the user to click twice in order + to activate them. + LT3: + - bugfix: Fixed missing power cable outside Tramstation medbay + Melbert: + - bugfix: Anomalies spawned by grand ritual runes sound act more like anomalies + RikuTheKiller: + - bugfix: Fixed round event controller pirate spawns. + SyncIt21: + - bugfix: chem heater with empty buffers can be refilled again +2024-01-16: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Signers no longer use the wrong verb when speaking directly into a radio for the first message after toggling sign language. - refactor: Moved the updating of verb variables into a new method which is called earlier in living's say, which should avoid this happening for other things which updated their verbs the same way. +<<<<<<< HEAD jjpark-kb: - rscadd: the bluespace miner will now produce more sheets depending on the matter bins' tier @@ -473,11 +838,86 @@ eyes. - code_imp: slightly cleans up dance machine code - bugfix: disco dances are less comparable to having a seizure +======= + 13spacemen: + - code_imp: Hub status shows if server is restarting, starting, time to start. The + "Time" is more accurate and based on roundstart now + Ben10Omintrix: + - bugfix: fix bileworm ai going insane after eating someone + Hatterhat: + - bugfix: Moodlets with parameters/effects e.g. limb reattachment moodlets should + probably disappear more appropriately. + JohnFulpWillard: + - qol: Using a Lawyer badge in your hand now shows a thought bubble with the badge, + rather than giving a lousy message in your chat. + Melbert: + - bugfix: Fixes some eldritch painting messages having no chat span + - bugfix: Fixes eldritch painting messages triggering before the examine, making + it hard to see + - bugfix: Fix beauty eldritch painting doing nothing to heretics who examine it + Time-Green: + - bugfix: Radiation shelters (wherever they are) will protect against nebula storms + Voudez: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Players are now able to see in chat when they are being hit by obj/machinery, got crushed into dense turf or get hit by thrown non carbon mob. - admin: Scenarios like mob hits dense turf, obj/machinery hits mob, item without "living thrower" hitting mob, mob gets hit by thrown non carbon mob now appear in logs. +<<<<<<< HEAD +======= + ZephyrTFA: + - bugfix: Autolathes no longer allow you to duplicate materials at higher levels + of stock parts + - qol: Autolathes now show name instead of typepath when selecting a custom material + - qol: Autolathe now print out items one by one instead of waiting for all of them + to print at once + jlsnow301: + - bugfix: Sections will be more polite by not stealing focus from Input boxes in + TGUI + - bugfix: Poppers (like the prefs menu options) shouldn't be hidden beneath the + character preview anymore. +2024-01-17: + SyncIt21: + - qol: adds more examines, screentips & balloon alerts for cryo actions, cryo can + be pried open with a crowbar when there is no power to free someone trapped + inside + - qol: cryo auto turns on immediately without a 2 second delay & without needing + auto eject mode on + - bugfix: ejecting beaker from cryotube will put it in the players hand & not drop + it on the floor + - bugfix: mobs & other stuff now render on top of cryo tubes and not bottom of it + - bugfix: cryo checks for if the mob is on the same turf as cryo is now fixed, i.e. + you can no longer close the machine on yourself + - code_imp: removed unused vars from cryo, autodocs vars, removed unused `transfer_amounts` + from some chem machinery ui + - refactor: removed unused icon states for cryo tube, cryo no longer processes round + start and it's UI is now typescript + Time-Green: + - code_imp: The mushroom cap is now an external organ (jungle station will never + happen) + - bugfix: Mushpeople caps are no longer solid black + mc-oofert: + - image: the plumbing chemical splitter no longer has a wrongly rotated direction + the-orange-cow: + - bugfix: Lock heretics may once again access 'the relentless heartbeat' after purchasing + 'burglars fineness'. + vinylspiders: + - code_imp: removed the timeout_mod arg from add_mood_event, which was only used + for one thing and causes more issues than it's worth +2024-01-18: + 00-Steven: + - bugfix: Immobile shells no longer work regardless of anchor state if you put the + circuit in while it's unanchored. + - bugfix: Immobile shells properly propagate their on/off state after wrenching + to inner modules. + DATA-xPUNGED: + - bugfix: Bystanders will no longer think they've pulled out a victim's eyes after + seeing someone else do it. + - qol: They will also be able to tell when someone starts pulling out a victim's + eyes. + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Most fishing rods come with a hook and line preinstalled. Fishing toolboxes come with separate reel and lines as usual. - balance: Fishing hooks are now required to fish. @@ -496,6 +936,7 @@ - bugfix: Reeling in items (and mobs) now respects movement resistance and anchorage. - bugfix: Fixed the fishing rod equipment UI being too small to fit its components. - sound: Reeling in something now plays a sound. +<<<<<<< HEAD 2024-01-19: SkyratBot: - code_imp: removed the timeout_mod arg from add_mood_event, which was only used @@ -517,6 +958,9 @@ 2024-01-20: SkyratBot: - bugfix: fix a runtime when loading ghosts to a mulebot +======= + - image: Resprited several fishes, and the aquarium. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Shields (and pillows) can be used to shove people around the same way barehanded right-clicking does. Xenos and borgs can actually be moved this way. - rscadd: Added a new MODsuit module, the bulwark module, which prevents knockdown @@ -530,6 +974,7 @@ - balance: Riot shields can tank a lot more damage against melee weapons, but less against bullets. - qol: strobe shields can now be used to bash people while combat mode is on. +<<<<<<< HEAD - bugfix: Hub time should be correct again - image: The "One Lean, Mean, Cleaning Machine" achievement now has its own icon. 2024-01-21: @@ -586,11 +1031,38 @@ - bugfix: Nanotrasen is now stocking proper french Cognac instead of discount Irish Cognac. It will now taste Smooth and French - bugfix: fixed some visual artifacts from achievement icons. +======= + JohnFulpWillard: + - refactor: Implant pads now use TGUI + - refactor: Ice cream vats now use a radial menu instead of an HTML one. + intercepti0n: + - refactor: Refactored Ore Silo Ui. + mc-oofert: + - code_imp: slightly cleans up dance machine code + - bugfix: disco dances are less comparable to having a seizure +2024-01-19: + 13spacemen: + - bugfix: Hub time should be correct again + Ben10Omintrix: + - bugfix: fix a runtime when loading ghosts to a mulebot +2024-01-20: + Diamond-74: + - bugfix: Monkeys don't get stuck on obstacles as often. + Ghommie: + - image: The "One Lean, Mean, Cleaning Machine" achievement now has its own icon. + Momo8289, Pepsilawn, Sinsinins, JohnFulpWillard: + - bugfix: Clown ops now get a code set for their nuke. +2024-01-21: + Ben10Omintrix: + - bugfix: fixes megafauna AI getting stuck attacking some corpses + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Modular Computers now support integrated circuits. What can be done with them depends on the programs installed and whether they're running (open or background). - rscadd: Modular Consoles (the machinery) now have a small backup cell they draw power from if the power goes out. +<<<<<<< HEAD - bugfix: Wagging tail spines now sync up properly with the tails they're attached to. 2024-01-24: @@ -611,11 +1083,76 @@ - bugfix: Losing control of a limb now sounds less weird in chat - bugfix: Fixed AIs who shunt to APCs causing their laws to be deleted. SkyratBot: +======= + - image: The honkbot now looks up to date. + - bugfix: Fixes how the aquarium looks. + JohnFulpWillard: + - bugfix: Prototype emitters now work. + - bugfix: Prototype emitters don't go invisible if screwdriver'd open. + - bugfix: Emitters no longer show up as their panel being closed when it is open. + LemonInTheDark: + - bugfix: The map saving tool will no longer lock up and prevent all further action + at random + - bugfix: Map saving now takes on the order of seconds, not minutes + - bugfix: Fixes an issue with lists that caused strongdmm to report saved maps as + broken + Majkl-J: + - bugfix: Borgs now use the hug module to substitute for hands, allowing them to + finish previously unfinishable surgeries + Melbert: + - bugfix: Items and mobs no longer hide behind big runes (heretic, cult, wizard) + Rex9001: + - bugfix: Lunatics spawned from moon ascension now actually have an objective to + assist their ringleader + - bugfix: Lunatics now get a moonlight amulette on the ground if they have full + hands + Rhials: + - spellcheck: Modifies some existing Emergency Shuttle prerequisite messages, and + adds some missing ones. + YehnBeep: + - bugfix: Icebox perma's cytology lab is now useable without outside repairs. + Zergspower: + - bugfix: fixes whispering formatting + lizardqueenlexi: + - bugfix: Filled trash bags show up properly when worn. + mc-oofert: + - bugfix: cyborg inducer respects cell changes +2024-01-22: + Absolucy: + - bugfix: Tool arm implant hotkeys will properly work even after you change your + arm/species now. + Ghommie: + - bugfix: fixed some visual artifacts from achievement icons. + carshalash: + - bugfix: Nanotrasen is now stocking proper french Cognac instead of discount Irish + Cognac. It will now taste Smooth and French + lizardqueenlexi: + - bugfix: Wagging tail spines now sync up properly with the tails they're attached + to. +2024-01-23: + 00-Steven: + - sound: APCs actually play the tool sound when exposing their wires. + A.C.M.O.: + - config: Added two new config flags for quirks, DISABLE_QUIRK_POINTS and MAX_POSITIVE_QUIRKS. + Ghommie: + - bugfix: Goldgrubs should no longer spit out things that aren't ore (e.g. stasised + mobs from the polymorph belt). + scriptis: + - spellcheck: iron sheets's what? +2024-01-24: + JohnFulpWillard: + - bugfix: pAIs downloaded while in a PDA now gets the action button to control said + PDA. + - bugfix: pAI cards can now be ejected from a PDA when there is no pAI inhabiting + it. + - bugfix: Moved the curator's treasure hunter fedora up by a single pixel. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Contractor support units now don't have flavortext telling them they work for someone else but their agent. - bugfix: Contractor support units now comes in an antag spawner (like syndicate monkey, nukie borgs/reinforcements). - bugfix: Syndicate monkeys now get their monkey antag datum. +<<<<<<< HEAD - bugfix: pAIs downloaded while in a PDA now gets the action button to control said PDA. - bugfix: pAI cards can now be ejected from a PDA when there is no pAI inhabiting @@ -627,6 +1164,75 @@ - bugfix: fixes a spurious CI failure from do_charge() signal overrides - bugfix: Moved the curator's treasure hunter fedora up by a single pixel. - bugfix: Missing fire alarms added to several rooms on Birdshot +======= + LT3: + - bugfix: Server announcements again no longer escape HTML by default + Melbert: + - bugfix: Replacing a limb fully claimed by an infested burn wound now properly + grants you control of the limb back + - bugfix: Losing control of a limb now sounds less weird in chat + SyncIt21: + - bugfix: reactions that create multiple reagents now terminate without looping + endlessly. + - bugfix: oatmeal reactions now terminate & produce the right quantity of results + but without milk. + vinylspiders: + - bugfix: fixes features not updating when changing character slots + - bugfix: fixes a spurious CI failure from do_charge() signal overrides +2024-01-25: + ArcaneMusic: + - refactor: Stock market events are now their own objects, and are handled by the + stock market individually. + - bugfix: The smelter and refinery now properly hold mining points, only taking + a small amount out of net gained points. + FernandoJ8: + - bugfix: the blur effects for hallucinogenic withdrawal and psychic projection + are now properly centered on the screen + LT3: + - bugfix: You can no longer interact with medical beds while incapacitated + SyncIt21: + - bugfix: fixes runtime when mineral scanning, passes right argument for scanner + in golem eyes +2024-01-26: + 13spacemen: + - bugfix: The hub time should be accurate for servers with different timezones + Ben10Omintrix: + - refactor: airlock controllers now use tgui + Ghommie: + - bugfix: Fixed the messenger circuit not sending messages. + - bugfix: Added several ports to modpc circuits that were missing or needing them. + - bugfix: Fixes ever-expanding ports whenever circuits are re-inserted in a modular + computer. + Isratosh: + - bugfix: Kidnapping traitor objective now properly returns the victim to the station + with their items + - bugfix: Missing fire alarms added to several rooms on Birdshot + JohnFulpWillard: + - bugfix: The library console's category search box now displays the category being + searched. + - refactor: Newspapers now use TGUI. + - bugfix: Fixed the newscaster's wanted section showing a non-existent photo. + JohnFulpWillard, Unit2E teaching me the TEG: + - bugfix: The TEG now works again (still unobtainable by regular means though). + - bugfix: the TEG and its circulators can now be rotated counterclockwise again. + - refactor: The TEG now uses a TGUI interface rather than the old HTML one. + LT3: + - bugfix: Fixed alignment of RPG titles + LemonInTheDark: + - bugfix: Icebox will no longer spawn a fuck ton of plasma after gibonite blows. + YW besties + Melbert: + - bugfix: Click CD applies to looking up and down correctly. + - bugfix: Fixed AIs who shunt to APCs causing their laws to be deleted. + - bugfix: You can no longer neck snap anyone with martial arts assuming you've got + someone in a tight grip. + SyncIt21: + - bugfix: items that contain recursive contents inside them (like foam dart boxes + from autolathes) now have their custom materials set to match with its design + cost rather than being nullified, meaning they are now recyclable. + - code_imp: all custom materials are now integer values. Improved code for how materials + are used in techfab & auto lathe for printing +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: added more screen tips & examines for ore silo, made UI wider, attach location name to each machine & grey out paused machines to make it more noticeable. - code_imp: auto docs proc & vars for silo log entry. Fixed return values of all @@ -634,6 +1240,7 @@ - bugfix: ore silo UI now functions correctly after removing an entry from the UI - bugfix: no runtimes when connecting a machine to silo that was previously disconnected via the ore silo UI +<<<<<<< HEAD - bugfix: reactions that create multiple reagents now terminate without looping endlessly. - bugfix: oatmeal reactions now terminate & produce the right quantity of results @@ -691,10 +1298,40 @@ any mob. - bugfix: Oppenheimer, the nukie medbot, has been reprogrammed to use Airplane Mode as a factory default. The station AI is no longer immediately aware of his presence! +======= + - refactor: chemical reaction tester in runtime station has been remastered from + ground up. + intercepti0n: + - refactor: Refactored Ore Processing Unit UI. + - bugfix: Ore Processing Unit UI no longer lags client. +2024-01-27: + 00-Steven: + - bugfix: Cats can be swabbed for feliform cells again. + - sound: Cats have had their mastery of silent walking revoked, and have their pitter-pattering + footsteps back again. + Melbert: + - bugfix: Rush Gland now triggers correctly on being grabbed by a Goliath + Whoneedspacee: + - refactor: Legions abilities have been changed into actions that can be added to + any mob. + vinylspiders: + - bugfix: fixes a hard del with decals +2024-01-28: + 00-Steven: + - spellcheck: You no longer fail to find "a anything" when swabbing something for + cytology that doesn't have swabbing results. + - bugfix: Removed kitten omniscience. (They stop pointing at you now.) + Ghommie: + - image: Added an icon to the "My Watchlist Status is Not Important" achievement. + LT3: + - bugfix: Emergency shuttle console now only works while on the emergency shuttle + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: shortened description for the PCM and capitalized some text for its examines. - code_imp: adds sanity checks and removed deprecated `content` tag from PCM UI. Stops hologram items from being inserted. +<<<<<<< HEAD - spellcheck: You no longer fail to find "a anything" when swabbing something for cytology that doesn't have swabbing results. - bugfix: Cats can be swabbed for feliform cells again. @@ -748,3 +1385,85 @@ - bugfix: Port Director now spawns with Port Director ID card - bugfix: Port Tarkon Residents spawn with Crowbars to fix lack of them in map, and it makes sense. +======= + VladinXXV: + - bugfix: Oppenheimer, the nukie medbot, has been reprogrammed to use Airplane Mode + as a factory default. The station AI is no longer immediately aware of his presence! + intercepti0n: + - refactor: 'Refactored Telecommunications Monitoring Console UI: added search bar, + made UI more compact.' +2024-01-29: + 00-Steven: + - bugfix: Blobs sitting on APCs no longer break them when already broken, and so + no longer spam the power down noise. + - bugfix: Jerry Tramstation can get laid again! (Fixed cat breeding.) + 13spacemen: + - refactor: Husk icons are now dynamically generated. See if you can identify what + species it was! + Ben10Omintrix: + - bugfix: fixes a runtime that sometimes happens in ai controllers + DaCoolBoss: + - spellcheck: typos fixed in the fireproof clothing religious rite + Krypandenej: + - bugfix: pesto pizza (cooked) is no longer raw, and cilbir is meat instead of fruit + LT3: + - bugfix: Tramstation external atmos ports are now properly connected + Melbert: + - bugfix: Wizarditis Timestop now has the desired effect. + - admin: Admins can now VV Timestop to make the caster not immune to their own Timestop. + If they really wanted. + SyncIt21: + - bugfix: sets minimum volume of reagent allowed to exist inside anything to 0.01 + therefore allowing plumbing iv drip small transfer rates to occur without reagents + disappearing. + - bugfix: auto lathes don't hog local apc supply when printing items + rageguy505: + - bugfix: ' The buttons for flashers on birdshot/tramstation now work' +2024-01-30: + 00-Steven: + - bugfix: Rootbread soup now uses poached egg (egg reagents in soup pot) instead + of raw unpeeled egg (which would break into reagents upon coming into contact + with the soup pot) and is thus craftable again. + ArcaneMusic: + - rscdel: The lathe tax on printing items has been removed from the game for both + humans and silicons. + Ghommie: + - image: Resprited the goldfish and lanternfish as well. + Inari-Whitebear: + - bugfix: Bone daggers and shivs are now longer electrically conductive + Melbert: + - bugfix: You can build on some niche tables again, such as the Wabbajack Altar. + Profakos: + - bugfix: The construction console drone becomes visible again while its in use + Rhials: + - bugfix: The encrypted bitrunner cache is now impervious to most conventional means + of destruction. + distributivgesetz: + - bugfix: Ambient loops will now refresh when entering a mob. + jjpark-kb: + - code_imp: added the code that allows the image overlays to work for the circulator + (teg) + - image: changed circulator's (teg) fast/slow turbine sprite + - image: added an anchor, panel, and flow overlay for the circulator (teg) +2024-01-31: + Jacquerel: + - bugfix: Cult pylons will no longer cover up "open space" (or water) with cult + floors + LT3: + - bugfix: ID card examine text shows how to set your linked bank account + - bugfix: ID card withdrawal from an unassigned account will ask if you want to + link an account + - bugfix: Tram power consumption will no longer will randomly drain APCs + - bugfix: Tram power moved to area based rectifiers + Melbert: + - bugfix: Fixed ore vent descriptions looking weird sometimes + - bugfix: Fixed being able to scan an ore vent multiple times at once + - bugfix: Fixed gaining scan points from scannning an ore vent without finishing + the scan + SapphicOverload: + - bugfix: Mk-II Ripley exosuits are spaceproof again. + - bugfix: Converted mechs now have their lights on if they did before the conversion. + distributivgesetz: + - bugfix: All Within Theoretical Limits should properly unlock now when the crystal + comes back from the countdown. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml index 53f187e2847..39223b1fd57 100644 --- a/html/changelogs/archive/2024-02.yml +++ b/html/changelogs/archive/2024-02.yml @@ -1,4 +1,5 @@ 2024-02-01: +<<<<<<< HEAD LT3: - bugfix: ID card examine text shows how to set your linked bank account - bugfix: ID card withdrawal from an unassigned account will ask if you want to @@ -21,16 +22,26 @@ - image: changed circulator's (teg) fast/slow turbine sprite - image: added an anchor, panel, and flow overlay for the circulator (teg) - bugfix: Cultists can now vote for a Cult leader again. +======= + Donglesplonge: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the top and top righthand doors of northstars cargo mail sorting room now use any supply general, mining, and bitden access, and the top righthand door no longer says its mining decontamination and uses the proper mail sorting room airlock instead. +<<<<<<< HEAD - bugfix: All Within Theoretical Limits should properly unlock now when the crystal comes back from the countdown. +======= + JohnFulpWillard: + - balance: Pirate suits can now hold the laser musket and smoothbore disabler. + - bugfix: Cultists can now vote for a Cult leader again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Slimes using Feed while buckled now stops feeding. - bugfix: Slimes are no longer prompted to feed off of dead people. - bugfix: Slimes that can only feed onto one person now immediately feeds off of them. +<<<<<<< HEAD - balance: Pirate suits can now hold the laser musket and smoothbore disabler. - rscadd: '[IceBox] Botany now has a service accessible bio generator' - qol: '[IceBox] Kitchen and service hall rearranged' @@ -91,19 +102,85 @@ 2024-02-05: LT3: - bugfix: Fixed alt-click validation for tram interactions +======= + K4rlox: + - bugfix: makes the experiment chamber in syndicate lavaland base no longer explode + when testing grenades +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Jukebox has been refactored. Jukebox music now updates as the player moves, mutes when the player is deafened, and overall sounds wayyy better. You can also now toggle song repeat on jukeboxes. +<<<<<<< HEAD SkyratBot: - sound: The Guide to Advanced Mimery book series now only make a very faint noise when turning their pages, in order to match their description - bugfix: burning a bible no longer gives you INFINITY curses +======= + ZephyrTFA: + - bugfix: Meteor Satellites no longer erroneously count every piece of paper as + a protected turf. + - bugfix: As a result the station goal is slightly more difficult + intercepti0n: + - bugfix: fixed ore vent's well being drawn over ash storm. + sylvia-from-fulp-station: + - rscadd: '[IceBox] Botany now has a service accessible bio generator' + - qol: '[IceBox] Kitchen and service hall rearranged' +2024-02-02: + 00-Steven: + - bugfix: Robotic voicebox actually lets you speak any language again (as long as + you know it). + Melbert: + - bugfix: Fixed examining modular PCs + - refactor: Big martial arts refactor, they should now overall act a ton more consistent. + Also technically any mob can do martial arts. Let me know if something is funky. + - bugfix: Robocontrol app maybe works better now. + Momo8289: + - rscadd: There's now a small chance to be a smartass when affected by Voice of + God + SapphicOverload: + - rscadd: Exosuit-mounted RCDs now have the same functionality as the handheld version. + SkeletalElite: + - rscadd: Wearing certain gloves (such as black gloves and combat oriented gloves) + allow you to cuff people faster + - balance: base handcuffing time is now 4 seconds + - balance: latex gloves now hide your fingerprints + ZephyrTFA: + - bugfix: lathes now respect always-powered areas + - balance: lathes now use power as they print instead of all at once + distributivgesetz: + - bugfix: Teleportations will no longer exceed reservation bounds. + intercepti0n: + - refactor: refactored experimentor UI to TGUI. + zxaber: + - balance: Mech wire panels are now blocked when the mech is occupied. I guess it + was moved to be behind the seat. +2024-02-03: + Justavidya: + - image: modified the cherry cupcake and blue-cherry cupcake sprites + Rhials: + - qol: Spider eggs will now close their spawn menu when you move away from them. + Whoneedspacee: + - bugfix: Ash drake's fire breath attack has proper cooldowns again +2024-02-04: + FernandoJ8: + - sound: The Guide to Advanced Mimery book series now only make a very faint noise + when turning their pages, in order to match their description + LT3: + - bugfix: Fixed alt-click validation for tram interactions + SapphicOverload: + - code_imp: Removes /obj/item/onetankbomb, assembly bombs are now handled by the + tank itself. + Swiftfeather: + - qol: Increased threshold of trace n2o required to make euphoria and giggles happen. + Xander3359: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Contractor baton costs 7 TC (down from 12 TC) - balance: Midroll/Latejoin traitors can no longer buy the baton, they must buy the whole kit - bugfix: Midroll/Latejoin traitors no longer have access to roundstart traitor exclusive items +<<<<<<< HEAD - qol: Increased threshold of trace n2o required to make euphoria and giggles happen. 2024-02-06: Melbert: @@ -130,17 +207,95 @@ xXPawnStarrXx: - rscadd: Added Alien toolset implants. 2024-02-08: +======= +2024-02-05: + Xander3359: + - bugfix: burning a bible no longer gives you INFINITY curses +2024-02-06: + Higgin: + - bugfix: fixes contractor abduction RRing people in the offmap hideout without + any feedback. You might not like how it turns out, but your body will get back + to the station now. + - qol: portable air pumps, scrubbers, heaters, canisters, liquid tanks, and racks + are now climbable. + Jacquerel: + - rscadd: Reading a newspaper will conceal your identity. + - bugfix: Making a mob sentient no longer gives you all of their factions. + - rscadd: Mothic Fleet Rations now no longer get dirty or decompose if left on the + floor, due to their wrappers. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: When placing an item into storage (such as backpacks), all nearby mobs now get a message, rather than just the first mob. - bugfix: TGC decks of cards should act a bit less odd when looking inside. - refactor: Refactored a bit of storage, cleaned up a fair bit of its code. Let me know if you notice anything funky about storage (like backpacks). +<<<<<<< HEAD +======= + - bugfix: Tinacusiate should break less, and break less things + - bugfix: Speaking to a Sign Languager with Tinacusiate in your system doesn't mess + with their text, because they're not speaking. + mc-oofert: + - bugfix: you may not toggle health assemblies from any range, even while crit + - bugfix: you may no longer altclick tape recorders at range to play them + - bugfix: you may no longer rip pillow tags at range without telekinesis or crit + or any other time you shouldnt be capable of it + - bugfix: you may no longer altclick ethereal disco balls while unconscious to anchor/unanchor + vinylspiders: + - bugfix: fixes a runtime in AI search_tactic +2024-02-07: + Higgin: + - bugfix: fixes ghetto surgery by gently adjusting time sensitivity cap and making + the cleaver not unintuitively bad at bone-sawing. + Momo8289: + - bugfix: Automated IV drips will now be on the layer set by the plumbing constructor + when created. + Rhials: + - bugfix: You can no longer convert assassination targets to your blood brother + team. + SyncIt21: + - bugfix: deleting objects with local material storage(autolathe, drone dispenser + etc) no longer drops sheets, they only drop materials when deconstructed +2024-02-08: + ArcaneMusic: + - bugfix: Icebox should have it's ore distribution and it's ore vents fixed, so + that vents should now produce ore. + - spellcheck: Boulder processing machines now don't mention things they don't do. + Higgin: + - bugfix: removed ability to buckle megafauna, constructs, blob minions, dragons, + and slimes. + IndieanaJones: + - bugfix: Regenerative Materia blobs can no longer drug non-carbons. + - bugfix: Alien Hunter's pounce ability no longer has any weird offset issues once + the pounce is completed. + - bugfix: Xenomorphs now have legcuffs applied to them properly. + Jacquerel: + - bugfix: Being consumed by the flesh of the necropolis while inside a cryo tube + will no longer convert the tube into a legion spawn point until the tube is + destroyed + JohnFulpWillard: + - rscadd: Paradox clones now have a bluespace stream instead of a syndicate poster + as their ghost poll icon. + - qol: Service personnel now show up in green in the crew monitor console. + - spellcheck: Mechs that have been renamed now are proper names, so are not described + as 'the' mech. + - bugfix: Science Xenos no longer turn the entire roundend report into bold letters. + Justice12354: + - qol: You no longer need to manually set the CC Commander's Headset to high-volume. + LemonInTheDark: + - rscadd: Ghost hair looks better now. Insert nerd shit about RGB vs HSL color space + here, go watch a youtube video or whatever. + Melbert: + - bugfix: The object overlay circuit component will no longer take things with it. + OrionTheFox: + - image: fixed some minor icon inconsistencies on the White Suit and Tan Suit +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PapaMichael: - bugfix: tramstation isolation cells now properly open on their timer. Rhials: - balance: Wallmounts now respect cameranets, and cannot be accessed from a view of the adjacent wall. +<<<<<<< HEAD - bugfix: You can no longer convert assassination targets to your blood brother team. SkyratBot: @@ -212,12 +367,24 @@ - bugfix: Fixed some things in Ice Box's gas station ruin - rscadd: Adds some things in Ice Box's gas station ruin - bugfix: icebox ore generation underground is normal again +======= + SyncIt21: + - bugfix: reactions now compute purity of reagents based on their volume, meaning + larger amounts of reagents created will have more significant effects on the + final purity of the solution + - bugfix: Instant reactions yield reagent results again + ViktorKoL: + - bugfix: smoothed out a few asymmetries in the heretic research tree + - bugfix: ash mark now properly lowers the cooldown of mansus grasp when triggered + Zargoar: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Adds in the Red Mons, The Wizard, The Rune and MOTHS-MOTHS-MOTHS bar signs from the bar sign contest. Congratulations to the winners!' - image: Adds in the Red Mons, The Wizard, The Rune and MOTHS-MOTHS-MOTHS bar signs from the bar sign contest. +<<<<<<< HEAD - qol: The barcode scanner is now part of computer tech and can be printed at the service techfab. - bugfix: Instant reactions yield reagent results again @@ -252,6 +419,45 @@ - bugfix: Fixed Finger Guns giving a misleading chat message - bugfix: Fixed some situations in which you couldn't interact with heretic runes SkyratBot: +======= + cnleth: + - balance: RD and QM coats can hold telebatons now + - qol: Quartermaster's coat can hold items that a normal jacket can hold, such as + small oxygen tanks + dragomagol: + - bugfix: blood brothers should now properly succeed in converting non-targets + mc-oofert: + - bugfix: you may no longer reset autolathe drop direction at times when you shouldnt + be able to + - bugfix: you may no longer altclick unanchored toiletbongs from any range in any + condition to rotate them + optimumtact, whomst didn't write this CL entry.: + - bugfix: Fixed the colorful lights of the ethereal disco ball. +2024-02-09: + EEASAS: + - bugfix: Fixed some things in Ice Box's gas station ruin + - rscadd: Adds some things in Ice Box's gas station ruin + Ghommie: + - bugfix: Fixed text effects for runechat messages (the stuff enclosed in +, | and + _ characters). + - spellcheck: Improved the tip for say/text effects. + JohnFulpWillard: + - qol: The barcode scanner is now part of computer tech and can be printed at the + service techfab. + - bugfix: Species that can eat mice don't get disgusted from seeing one in the toilet + bong. + - rscadd: Grabbing an unwrenched statue/mannequin/skeleton model will now move its + direction as you move yours, and you can talk through it. + LT3: + - bugfix: SM cascade delam messages no longer display to clients not in game + Melbert: + - bugfix: Fixed Puncture Repair surgery not having surgical sounds + - bugfix: Fixed Surgery Initiator potentially showing invalid surgeries + - bugfix: Krav Maga users can shove again + Swiftfeather: + - qol: Added a new head-only target hotkey, unbound by default. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds screentips & examines for screwdriver & crowbar acts & alt click. - qol: techfabs can now use the mouse drop functionality to set drop target. - qol: lathe printing animation plays on loop while printing rather than flicking @@ -265,6 +471,7 @@ each time. - code_imp: autodoc for some vars & procs, merges procs. - refactor: Optimized code for autolathe & techfabs in general. Report bugs on github +<<<<<<< HEAD - bugfix: Species that can eat mice don't get disgusted from seeing one in the toilet bong. - rscadd: Grabbing an unwrenched statue/mannequin/skeleton model will now move its @@ -294,10 +501,23 @@ - bugfix: Bolas in your pockets no longer slow you down. - rscdel: Removes halloween screen tint, we're taking him to retire by the seaside (he was alone and unloved) +======= + ViktorKoL: + - bugfix: fix heretic's rust mark failing to damage any items if the victim has + any container on them with another item inside, and maybe other bugs of similar + nature + Wallem: + - rscadd: Adds a new suicide_act() to the smite spell + Zergspower: + - bugfix: icebox ore generation underground is normal again +2024-02-10: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: As they should've for a while, screwdrivers (cocktail) actually work as screwdrivers (tool). - sound: The screwdriver cocktail also actually plays the screwdriver sound when used. +<<<<<<< HEAD - rscadd: settlers can rename their pets 2024-02-12: Atlasle, JohnFulpWillard: @@ -308,11 +528,66 @@ - qol: Glasses colors should be a lot less harsh, and being blind no longer also blinds your hud. - bugfix: Lavaland Beech Bartender's clothing storage is named the right thing now +======= + 1393F: + - bugfix: The HFR now provides the max temperature for recipes + - bugfix: the crystallizer now provides the dangerous object created instead of + itself in admin logging + Ben10Omintrix: + - rscadd: settlers can rename their pets + FernandoJ8: + - code_imp: added an IS_CHANGELING() helper and used it where applicable + Holoo-1: + - admin: remade everyone is traitor into everyone is antag in secrets panel + IndieanaJones: + - bugfix: Bolas in your pockets no longer slow you down. + JohnFulpWillard: + - rscadd: Changeling's reviving stasis ability now puts you in stasis. + LT3: + - qol: Health analyzer will now display blood alcohol content + LemonInTheDark: + - rscdel: Removes halloween screen tint, we're taking him to retire by the seaside + (he was alone and unloved) + Melbert: + - bugfix: Fixed some situations in which you couldn't interact with heretic runes + - bugfix: Fixed Finger Guns giving a misleading chat message + - bugfix: You know that one bug that makes the cryo cells on Deltastation unusuable? + Well it's not fixed but at least those cryo cells are usuable again, maybe at + the cost of another station's cryo cells. Who knows! + larentoun: + - bugfix: Now falsewalls visually don't close when they shouldn't. +2024-02-11: + Absolucy: + - bugfix: Fix succumb last words being double-encoded (i.e `i'm` becoming `i'lm`) + Higgin: + - bugfix: deathtrap recycler can now be moved. + - refactor: moved check for NO_DECONSTRUCTION flag to be inside can_be_unfasten_wrench, + allowing us to set specific machines to be movable but not deconstructable. + JohnFulpWillard: + - bugfix: Space Dragon's carp allies no longer turn the entire roundend report into + bold. + - bugfix: Uplinks now update their UI when you add telecrystals in them, so you + don't need to close and reopen it. + - bugfix: Bar bots asking for Cucumber Lemonade now gives you money for completing + it. + Melbert: + - balance: Rats are now 5x less likely to decide to eat a cable when idling. (1%, + down from 5%) + - refactor: Fire effects get added to mobs in a different way now. Maybe it will + get stuck less. Report any oddities. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Freedom Implants and Biodegrade can you free you of the shackles of knotted shoes. - rscadd: Shaft Miner's Bluespace Survival Capsules will now throw people away from it when it deploys. Be sure to heed the warning to "Stand back". +<<<<<<< HEAD Rhials: +======= + Momo8289: + - rscadd: Fire ants can now be scooped up and used as a chem like normal space ants + Rhials: + - bugfix: You can now refine ectoplasmic raw cores at the implosion machine thing. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Beacon and Teleport Blocker implants have been moved from cargo to the security lathe. - balance: A new research node has been created, requiring Subdermal Implants and @@ -321,6 +596,7 @@ basic cybernetic implants. - bugfix: The Energy Cake slice now does its on-eat effect AFTER being eaten, instead of before. +<<<<<<< HEAD - bugfix: You can now refine ectoplasmic raw cores at the implosion machine thing. - bugfix: The beach bar virtual domain's bar closets no longer have default locker doors. @@ -366,6 +642,61 @@ list grows too long. - bugfix: Paperwork should actually use the writing utensil's font, colour, and boldness outside of input fields again. +======= + - bugfix: The beach bar virtual domain's bar closets no longer have default locker + doors. + SyncIt21: + - bugfix: lathes now use moderate power for printing operations + necromanceranne: + - bugfix: The shove blocker module parent type now has the correct typepath. +2024-02-12: + Atlasle, JohnFulpWillard: + - rscadd: Adds the Touchy quirk, you need to be next to something to examine it, + for 2 extra quirk points. + Ed640: + - bugfix: Sculpted statues stop including light layers. + LT3: + - bugfix: MULEbot will correctly display its loaded cargo on BotKeeper + - bugfix: MULEbot home beacon can be set from control panel + - code_imp: MULEbot home location is automatically set on init + Melbert: + - qol: Glasses colors should be a lot less harsh, and being blind no longer also + blinds your hud. + - bugfix: Lavaland Beech Bartender's clothing storage is named the right thing now + - bugfix: Lipoplasty is An Option again + Momo8289: + - rscadd: Shakers can now pour drinks with custom names and descriptions! Alt-click + the shaker to enable this. + NeonNik2245: + - rscadd: 3 new masks for your characters (thanks to Kovac for the scarf sprites) + Rhials: + - bugfix: You can now click things as an alien larva again. + SyncIt21: + - bugfix: machines that should not drop contents when deleted no longer do. + - refactor: refactors how machines are deconstructed. report bugs on github. + Thunder12345: + - bugfix: The wizard's pets Jimmy and Jommy no longer fight to the death. + Xander3359: + - balance: Contractor kit no longer gets RNG items, it's a specific pool now + mc-oofert: + - rscadd: nanotrasen museum gateway map +2024-02-13: + 00-Steven: + - bugfix: Fixed stamps not accounting for scroll offset. You can actually stamp + paperwork properly without using accursed knowledge again. + - bugfix: Fixed PDA messenger not scrolling to the bottom when a new message gets + sent. + - bugfix: Paperwork should actually use the writing utensil's font, colour, and + boldness outside of input fields again. + LemonInTheDark: + - bugfix: Fixes fancy lights not updating their source location when picked up and + moved + Melbert: + - bugfix: You can once again see love on Valentines Day + MelokGleb and KREKS, McRamon, Ghommie: + - image: New sprites for changeling powers and items. Woooh. + Rex9001: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Smile of the moon's effects now last for longer and have a longer minimum active time - balance: Mark of moon detonations now do sanity damage @@ -373,11 +704,33 @@ a lunatic. - qol: People inside the ascended moon heretics sanity draining aura now gain an effect under their tile. +<<<<<<< HEAD +======= + Rhials: + - qol: Venus Human Traps are now visible in the orbit menu. Cool! + - bugfix: Spawning as a Venus Human Trap now properly gives you an antag datum/objective. + - bugfix: Venus human trap flowers no longer have a second, identical flower under + themselves. + - qol: Map hazard anomalies are no longer treated as points-of-interest in the orbit + menu. + Singul0: + - balance: Brainwashed individuals can no longer be debrainwashed through a mindshield + implant, they still protect you from brainwashing though! You just need to get + medical to fix them up. + - bugfix: You can now use bluespace launchpads from shuttles (except cargo and ferry + shuttles) + - bugfix: Fixes backwards engines in a few of centcom's ferries! + intercepti0n: + - bugfix: Separated logs list into pages in ore silo UI, thus fixing lag when logs + list grows too long. + siliconOpossum: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Getting blood on your hand when you only have one no longer makes your hands visually permanently bloody - bugfix: Holding bloodied gloves no longer makes your hands look bloody, bloodied gloves now look bloody when worn, and damaged gloves now look damaged when worn - bugfix: Gaining or losing an arm now correctly updates your hand overlays +<<<<<<< HEAD - bugfix: Fixed stamps not accounting for scroll offset. You can actually stamp paperwork properly without using accursed knowledge again. - bugfix: Fixed PDA messenger not scrolling to the bottom when a new message gets @@ -469,12 +822,22 @@ - bugfix: The crystallizer screentip for rotating it has been updated with the correct button 2024-02-20: +======= +2024-02-14: + Absolucy: + - rscadd: Painkillers (i.e morphine, miner's salve) now actually induce analgesic + effects, preventing various pain-related effects, such as screaming due to pain, + and also provides a speed bonus during surgery. + - rscadd: The tenacity trauma (traumatic neuropathy) also applies analgesic effects. + - refactor: Simplified code related to reagents adding traits. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Aylong: - rscadd: Added `Mute` button into `Chat Tabs` settings, it disables tab unread counter - rscadd: Added `Clear chat` button into `General` settings, you can clear your dirty chat like you did it before TGchat - bugfix: Case-sensitive highlighting now works properly +<<<<<<< HEAD Cursor: - rscadd: Security Officers are now Haram. LT3: @@ -488,6 +851,129 @@ - bugfix: MULEbot will correctly display its loaded cargo on BotKeeper - bugfix: MULEbot home beacon can be set from control panel - code_imp: MULEbot home location is automatically set on init +======= + JohnFulpWillard: + - bugfix: Revenants (and other flying mobs) will not make noise when walking into + pools of gibs, + Rhials: + - spellcheck: Some space ruin area names have been made more distinct. + - bugfix: Ghost role polls should spam you less when multiple of the same roll occur + in succession. + ViktorKoL: + - bugfix: heretics no longer lose their spells when returning from a shapeshift + - bugfix: knit flesh now heals organs as intended, and does not cause its victims + to be red forever if interrupted + - spellcheck: knit flesh chat messages are no longer gramatically incorrect + vinylspiders: + - bugfix: '*wag emote is now functional again' +2024-02-15: + CandleJaxx and Iamgoofball: + - bugfix: Fixes Krav Maga allowing pacifism bypasses. + IndieanaJones: + - balance: Nightmare's Light Eater takes less time in jaunt to gain a critical strike, + being reduced to 7 seconds from 15 seconds. + K4rlox: + - balance: Maintenance drones now can use RPED, RCD, Holosign, and Spray bottles + LemonInTheDark: + - rscadd: AI's acceleration now smoothly decays, instead of just falling back down + to 0 after 0.5 seconds + - bugfix: AI's standard movement (non accelerated) is smooth now, instead of constantly + jumping around + - bugfix: AIs will now follow their targets more closely, shouldn't have any issues + with them lagging behind anymore + Melbert: + - bugfix: Valentines no longer see themselves covered in hearts. They only see their + Valentine covered in hearts. + - balance: Scientists have discovered Nuka Cola is not good for short term health. +2024-02-16: + 00-Steven: + - bugfix: Fixed the lizardperson spine preference dropdown not showing up in the + character menu. + Kylerace: + - admin: admins/maintainers can now make the profiler focus on specific subsystems + by setting the subsystem var profile_focused to TRUE + LemonInTheDark: + - refactor: Fucks with how movement keys are handled. Please report any bugs + WinterDarkraven: + - rscadd: In an attempt to stop the greytide, NanoTrasen has increased security's + baton energy output. This has, through testing, done nothing but make the device + spark more than it used to. +2024-02-17: + 00-Steven: + - bugfix: Space cats CAN into space. (They're back to surviving being in unsuitable + atmos.) + 13spacemen: + - code_imp: Removed unused global lists and sprite accessories related to tail spines + - code_imp: removed redundant check for plasmamen in survival box code + Ghommie: + - rscadd: Added three new 'special' bedsheets. One of them is quite rare and made + from gondola hide. + IndieanaJones: + - bugfix: Tank spider corpses should no longer be conditionally invisible + - bugfix: Blob Zombies now render their blob heads correctly again. + MLGTASTICa: + - balance: Oxandrolone now scales with purity. Its default purity is 100% + - balance: Salicylic acid now scales with purity. Its default purity is 100% + Melbert: + - rscadd: Wizards have a new mobility option available, the Telegram Scepter. The + ability to travel anywhere you can see at the point of a wand... but at a price? + Sylphet: + - bugfix: cargo lockboxes update iconstates correctly now + SyncIt21: + - bugfix: Indestructible items like the pai card don't teleport to the ore silo + when you insert them into silo linked machine & also displays a message saying + it was rejected. + - qol: adds examines & screentips for ore box + - code_imp: cleans up some procs for ore box + - spellcheck: corrected description & ui notice of ore box to specify it can hold + boulders too + Thunder12345: + - qol: The bitrunning quantum console UI now lists domains in tabs by difficulty. + destrucktoid: + - bugfix: Restorative Nanites now heal Slimepeople just as well as they do other + people. + kawaiinick: + - rscadd: Your mouth now fits combat or survival knives(it's totally safe) + mc-oofert: + - balance: assemblybombs are bulky + - qol: you may altclick action buttons to bind them to a key + mogeoko: + - bugfix: Thermomachines now reconnect to pipes on multitool's act. + - bugfix: Multi-deck connectors won't connect pipes not located in front/top/bottom + of it. +2024-02-18: + 1393F: + - bugfix: The crystallizer screentip for rotating it has been updated with the correct + button + Ghommie: + - rscadd: Players holding cardboard cutouts will now assume their appearance, just + like for potted plants. + GoldenAlpharex: + - bugfix: The Spawners menu now accurately displays the amount of uses left in each + spawner option, taking into account individual spawners that either allow more + than one use, or an infinite amount of uses. + Melbert: + - bugfix: Lifeline can no longer track mobs with suit sensors off + Roastglue: + - bugfix: Crafting Bulgogi no longer makes Bibimbap. It instead makes Bulgogi. +2024-02-19: + Cursor: + - rscadd: Security Officers are now Haram. + Ghommie: + - qol: Circuit multitools can now mark (visible) items worn/held by a mob. + Kashargul: + - qol: makes the tgui_input_number user friendly for negative and decimal inputs + - code_imp: the onBlur={(_, value) => onBlur(value)} event should now be used on + all uses of RestrictedInput to ensure that the number is fully sanitized whenever + the user leaves the field or submits it through a button + - qol: hides the delete button on the main tab allows to reorder all other chat + tabs + LT3: + - rscadd: The tram has been equipped with enhanced safety glass to reduce the severity + of crew injuries + LemonInTheDark: + - bugfix: Maps loaded in after roundstart will no longer have broken smoothing +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Valentines Day now polls all players for candidates when it triggers rather than forcing all players to be a Valentine. Consent is important. @@ -496,10 +982,15 @@ burn them. - qol: Valentine's roundend report no longer takes up a massive amount of space and also no longer sound so, so weird. +<<<<<<< HEAD +======= + - bugfix: Fixes AI double-click tracking +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: You can only vote for 1 map at a time again - admin: You can now set someone's TC to 0 - admin: Removing Traitor from automatically removes the uplink from them - admin: Removing Uplink from someone no longer wipes ALL of their memories +<<<<<<< HEAD - bugfix: Fixes AI double-click tracking MelokGleb and KREKS, McRamon, Ghommie: - image: New sprites for changeling powers and items. Woooh. @@ -616,6 +1107,11 @@ - spellcheck: Removed a double space in health analyzer's message telling you someone is deaf. - bugfix: ForceEvent tgui panel search is more reliable. +======= + Rhials: + - bugfix: Removes the double-newscaster from the arrivals sec post. + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds examines & screentips for crowbar, screwdriver acts to BRM & refinery machines - qol: adds examines about the number of boulders stored & processed to BRM & refinery @@ -644,6 +1140,7 @@ a 3 second cooldown is applied to stop the conveyer belt from clogging up, With this BRM wires are removed as there is no need for timers to be attached to wires which intefers without our batch processing timings. +<<<<<<< HEAD - bugfix: Feature manipulation surgery will now properly update the patient's appearance. - refactor: The tail portion of lizard spines will no longer draw on people who do not have a tail. @@ -699,10 +1196,152 @@ SkyratBot: - balance: Adds a 1 second delay to moving up and down with the verb/keybinds to disable z-level combat cheese +======= + - bugfix: mecha drill won't use power & do other checks if the target cannot be + drilled. + - bugfix: mecha drill will stop drilling if the mech moves even without changing + direction. Also will use power & check other conditions every drill cycle. + - bugfix: Grill checks if the item got deleted to avoid runtimes. Also cook time + is set based on the individual items type & not a constant of 20 seconds + - bugfix: BBQ ribs can be grilled on a grill but now takes anywhere between 30 to + 40 seconds to get proper smoked ribs and not lightly smoked ribs or turn into + a mouldy mess on a girddle. Delicious. + mc-oofert: + - rscadd: deathmatch minigame + - bugfix: you may not put disposal outlets on cargo shuttle + - bugfix: forcefully pushing disposal outlets and chutes deconstructs them instead + of making them behave like budget eigenstatium lockers + rageguy505: + - bugfix: The door above tool storage on birdshot now has maintenance access on + it and officials can now enter the CC dock room. +2024-02-20: + Ghommie: + - rscadd: Curators now get a 22.5% cut on credits spent on painting patronages (divided + by the number of curators). The service department also gets another, 12.5% + cut. + - qol: Added a zoom in and out buttons to the painting UI. + JohnFulpWillard: + - bugfix: The DNA scanner's joker button no longer instantly activates itself when + the cooldown between uses is done. + - bugfix: Regenerative cores (and other monster organs) now work when using it in-hand + while resting. + LT3: + - qol: Air alarms now display the source of triggered fire alarms/firedoors + LemonInTheDark, Kryson: + - image: Modified railing sprites to be a bit more three-d + SyncIt21: + - bugfix: multiple reactions occuring in the same holder like mixing drinks will + yield correct reagent result volumes + - code_imp: ' Removes `update_total()` from instant reactions improving performance + slightly' + - code_imp: merges `remove_all_direct()` with `remove_all()` to reduce code size + - bugfix: boulders are no longer lost when teleported by the BRM + - bugfix: batch processing cooldown works when teleporting multiple boulders + mc-oofert: + - code_imp: deathmatch lobbies take 8 seconds to start as to give lighting a breather +2024-02-21: + 00-Steven: + - bugfix: Ethereal heart revive doesn't delete organs alien to your species, like + prosthetics, cybernetics, and possibly itself. + - bugfix: Nightmare heart revive doesn't delete organs alien to your species, like + itself, upon which it would stop the conversion to shadowperson. + Cheshify: + - bugfix: The North Star's disposals are now functional! + - qol: The North Star has had a staggering amount of quality of life changes. + - rscadd: Nanotrasen has now supplied North Star security outposts with a disposals + line leading directly to the drunk tank. + Ghommie: + - bugfix: fixed an issue with tactical appearance (potted plants / cardboard cutouts) + not going away after giving the item to someone else. + - bugfix: Fixed slaughter demon cutouts being invisible. Also fixed another issue + with the tactical appearance not going away when the cardboard cutout is pushed + down. + mc-oofert: + - bugfix: you may not teleport in or out of deathmatch arenas + - bugfix: if you died as a changeling/anyone that has cool mind spells you do not + get them in deathmatch +2024-02-22: + Derpguy3: + - bugfix: Adds a missing servo component into the MK1 Ripley Crate ordered from + cargo. + Ghommie: + - bugfix: sec-hailers no longer apply filters on TTS when pushed out of the way. + Melbert: + - bugfix: Chasms no longer break your verbs + - refactor: Frames have been refactored, you know the things you use to build computers + and machines, report any oddities + - bugfix: You can now smack (de)constructed computer and machine frames to break + them, rather than doing nothing. + - rscadd: Machine frames can now be deconstructed with screwdrivers, and computer + frames can now be deconstructed with welding torches. Welders are faster. + - bugfix: Organs have the blood DNA of their owns on them again +2024-02-23: + 00-Steven: + - bugfix: Chefs (not to be confused with cooks) actually display as being a part + of service on the crew monitor. + 13spacemen: + - refactor: Bloody item overlays no longer use icon procs to generate the overlay + 13spacemen, Kapu1178: + - refactor: Footprint sprites are now based on your shoes and legs, shoes have priority + - image: Monkey legs now produce pawprints instead of footprints + JohnFulpWillard: + - refactor: Holographic mobs now gives better feedback to players and should more + consistently not give any drops. + - spellcheck: Removed a double space in health analyzer's message telling you someone + is deaf. + Melbert: + - bugfix: You can now take our your anger upon arcade cabinets upon losing (they + can be hit again) + - rscdel: Deletes Mythril Coins from random coin spawners + - rscdel: Replaces Mythril sheets in icebox vent fishing with Runite sheets + SgtHunk: + - bugfix: The Summon Simians spell will now properly check for monkey faction, allowing + people who are monkeys to not be mauled. + nevimer: + - bugfix: ForceEvent tgui panel search is more reliable. +2024-02-24: + 00-Steven: + - bugfix: Chef and department security have the assignment on their ID imprinted + onto their PDA by default, instead of defaulting to Cook/Security Officer and + requiring you to do so manually. + A.C.M.O.: + - qol: CPR can be administered by species which do not need to breathe, so long + as they have functional lungs. + ArcaneMusic: + - bugfix: Mining cyborgs now keep the state of their mining scanner when stored, + without shutting off. + Echriser: + - bugfix: you can no longer feed people with covered mouths using spoons or ladles + JohnFulpWillard: + - bugfix: Alien larvas' examine text no longer tells you they are missing arms and + legs. + Melbert: + - bugfix: Cyborgs spark and spit out oil when smacked again. Among other things. + vinylspiders: + - bugfix: fixes spurious CI failure in museum + - code_imp: adds a blacklist feature to spawners +2024-02-25: + bigfatbananacyclops: + - rscadd: floortile camouflage suit, boots, gloves and crate containing the former + items +2024-02-26: + 00-Steven: + - bugfix: Disabled the popsicle stick maximizer. (Producing popsicle sticks actually + deletes the input logs.) + 13spacemen: + - refactor: Bodytypes to do with character sprite shape now have their own bodyshape + var, all sprite handling is done with bodyshape and not bodytype anymore + Cheshify: + - bugfix: meatwheat is now firmly made out of meat, instead of sometimes being wheat + and sometimes being meat and sometimes being both. + - bugfix: The North Star finally has a bluespace gas sender system. + Derpguy3: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Three stationary water tanks on Birdshot which supplied a sink in the bar, a sink in the medical storage and a sink in the perma-brig's kitchen are now properly rotated and connected with the plumbing. - bugfix: The unisex showers on Birdshot have been given a water tank for its plumbing. +<<<<<<< HEAD - bugfix: Chef and department security have the assignment on their ID imprinted onto their PDA by default, instead of defaulting to Cook/Security Officer and requiring you to do so manually. @@ -769,6 +1408,16 @@ - bugfix: The North Star finally has a bluespace gas sender system. - bugfix: Lobby manifest shows the head/captain symbols next to heads and captains with custom titles, as long as they're registered with a head/captain trim. +======= + EEASAS: + - balance: buffs corporate modsuit(centcom only) + Higgin: + - qol: Blood Brother convert objective now explains who you can convert and what + to do if you mess up with your flash. + MrDas: + - spellcheck: The tier of servo in mech construction is no longer explicitly stated. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Nanotrasen, in direct response to the increasing danger posed by wannabe martial artists and rioters in the fringes of the Spinward Sector, have upgraded the impact dampeners found in their riot armor. Staff have also started to rediscover @@ -785,13 +1434,99 @@ - rscadd: A new module, the Safety-First Head Protection module, protects you from head trauma! Available in most modsuits expected to take hits to the head often. And from roundstart exofabricators. +<<<<<<< HEAD - qol: The chapel has been slightly overhauled on Birdshot, with the chaplain now having a place to preach sermons. - bugfix: Sparring chaplains are now able to operate on Birdshot! +======= +2024-02-27: + 00-Steven: + - bugfix: Newscasters no longer say "No wanted issue posted. Have a secure day." + when there is, in fact, an active wanted issue currently posted. + - bugfix: Medical/security records now show an icon based on the registered trim, + rather than showing a question mark for records with customized titles. + 13spacemen: + - bugfix: Blood overlays on items no longer leak onto other objects + Absolucy: + - qol: Constructs now reuse the victim's mind instead of just moving their client + ArcaneMusic: + - bugfix: Fixed instances where holochip/holocredits would spawn with a total of + zero credits contained within. + Ben10Omintrix: + - bugfix: fixes pokemon ai still being active when inside the pokeball + Iamgoofball: + - balance: Adds a 1 second delay to moving up and down with the verb/keybinds to + disable z-level combat cheese + IndieanaJones: + - balance: Gorillas are faster, stronger, but not bigger too. Note while holding + an item, they are the same speed as they were prior. + - balance: Gorillas now have the understanding of languages as monkeys do. + - balance: The Gorilla Cube Box for traitors has been replaced with a singular gorilla + cube. Due to the aforementioned changes, this singular gorilla should be as + scary if not scarier than 3 gorillas were prior. + - balance: ' Magillitis Serum Autoinjector now grants the resulting gorilla a slow + passive regeneration effect which kicks in after not taking damage for 12 seconds.' + JohnFulpWillard: + - qol: You can use atmos machines, holopads, crayons, spray cans, and disposal bins + while floored. + - bugfix: You can close extinguisher cabinets while floored. + - bugfix: You can climb onto a photocopier from the floor. + Melbert: + - bugfix: The Paddy's Claw should be properly unusable in situations which it should + be properly unusable. + Singul0: + - bugfix: The say TGUI would recognize :g (changeling hivemind) prefix. and give + a visual indicator in it that you are talking in the right channel + SyncIt21: + - qol: adds examines & screentips for building & deconstructing both machine & computer + frames. + - qol: Adding a circuitboard from a rped to n computer frame will automatically + screw it in place like before. + - code_imp: merged procs for computer & machine frames. autodocs them where possible. + - code_imp: moved code for machine frame into its own file. + - bugfix: RCD converts miscellaneous turfs like basalt, sand, beach etc to plating + first & not put a wall directly on top of them + TJatPBnJ: + - balance: Power crepes are now finger food + mc-oofert: + - bugfix: You may no longer make deathmatch arenas dark with a lightswitch. + - rscadd: Added an option to deathmatch loadout dropdown that allows you to pick + a random loadout + - bugfix: In deathmatch, plasmamen are made humans and the UI supports more players + vinylspiders: + - bugfix: fixes cardboard cutouts not updating when held and using the crayon on + them to change their appearance, and fixes the alt_appearance being added to + the cutout instead of the mob holding it +2024-02-28: + 00-Steven: + - bugfix: Lobby manifest shows the head/captain symbols next to heads and captains + with custom titles, as long as they're registered with a head/captain trim. + - bugfix: Fixed Bluespace RPEDs failing to apply circuits from a distance if you + had to select between multiple. + ArcaneMusic: + - image: New sprites for plant grafts! + Cheshify: + - bugfix: the north star's main intersections are brighter, the elevator is properly + lit, and a single floating poster was moved. + - qol: The chapel has been slightly overhauled on Birdshot, with the chaplain now + having a place to preach sermons. + - bugfix: Sparring chaplains are now able to operate on Birdshot! + DrDiasyl: + - rscadd: 'NEW TRAIT JOB: Veteran Security Advisor! Advise HoS and Captain on Security + matters, mentor Security Officers. Note that they are paraplegic and are suffering + PTSD due to their past experience.' + Ghommie: + - rscadd: Added a multi-dimensional bomb payload to the black market. It's very + expensive. + - balance: '"Freshness Jars full of Natural Bait" is now a goodie and costs 200 + credits instead of 2000' + Iamgoofball: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: xenomorph stomachs will no longer destroy items directly, refactored it to use acid_act() - bugfix: fixes xenomorph vore accidentally destroying mobs it wasn't supposed to destroy, im thinking this was modified list in place shenanigans +<<<<<<< HEAD - image: New sprites for plant grafts! - bugfix: fixes cardboard cutouts not updating when held and using the crayon on them to change their appearance, and fixes the alt_appearance being added to @@ -803,3 +1538,53 @@ - rscadd: a list of items called vendor_nocrush that vendors dont deal integrity damage to upon hitting them. - bugfix: Makes vending machines no longer crush chairs and conveyors. +======= + IndieanaJones: + - rscadd: 'New Changeling Ability: Hive Head' + - bugfix: Fixed bees having an improper sprite offset + Jacquerel: + - rscadd: Displaying the voting statistics is now optional on a per-poll basis, + and is disabled for map voting. + JohnFulpWillard: + - qol: Intelligent monkeys now punch people instead of biting them. + KingkumaArt: + - rscadd: a list of items called vendor_nocrush that vendors dont deal integrity + damage to upon hitting them. + - bugfix: Makes vending machines no longer crush chairs and conveyors. + LT3: + - code_imp: Tram throwing now breaks grilles consistently + - code_imp: Tram malfunction lethality/throw chance are now a multiplier instead + of flat value + - code_imp: Tram throw chance can be adjusted + - code_imp: Unlucky trait is now used in tram throw calculation + Melbert: + - bugfix: Rat hearts apply their damage modifier malus correctly + PapaMichael: + - balance: Fugitive hunters will spawn early if the emergency shuttle is called. + softcerv: + - code_imp: TRAIT_DEAF now works on non-carbon mobs +2024-02-29: + 13spacemen: + - bugfix: You can build material airlocks again + A.C.M.O.: + - bugfix: Fixed the AI hologram's ability to copy the appearance of crew members. + Jacquerel: + - image: adds a visual effect for hive head bees despawning + Momo8289: + - bugfix: Fixes the slot machine's jackpot. It should now give all of the available + prize money + 10,000 credits as payout for a jackpot. + - refactor: Converts the slot machine's UI over to TGUI + - rscadd: The slot machine now has a whole new type of jackpot! This one's a banger! + SyncIt21: + - bugfix: Cryostylane reaction now has a moderate & not extreme cooling effect. + Helps you achieve more pure amounts of Cryostylane + TheVekter: + - rscadd: Added a new law to the Artist lawset in order to encourage Artist AIs + to build an audience. + mc-oofert: + - bugfix: Grilles dont break by just walking into them under any circumstances + necromanceranne: + - bugfix: Being in a Swat Suit appropriately protects you from collisions with a + body, rather than the body thrown at you having these protections protecting + YOU, the victim of the collision. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index e78e7b8bdd8..561b4ea990e 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -1,4 +1,5 @@ 2024-03-01: +<<<<<<< HEAD A.C.M.O.: - bugfix: Fixed the AI hologram's ability to copy the appearance of crew members. Majkl-J: @@ -45,11 +46,63 @@ - bugfix: Elder atmosian armor appears properly on digis. 2024-03-02: SkyratBot: +======= + Ben10Omintrix: + - rscadd: new virtual pet app on the pda + Cheshify: + - spellcheck: changed the fitness skill title to powerlifter + Echriser: + - qol: Allows dragging from boxes into All-In-One Grinders + Ghommie: + - bugfix: Fixed (cross)bows' strings not loosening once fired. + - bugfix: the multi-dimensional bomb payload now works as intended and doesn't break + once you select a theme. + - bugfix: Meat and other bloody things will not spread blood forever. + Higgin: + - balance: the shadow eyes of nightmares and shadowpeople more broadly are now sensitive + to light, requiring additional protection. + Melbert: + - bugfix: Fixes grabbing yourself when you tackle someone. + Momo8289: + - qol: HUD implants will now notify you when toggled on or off + Pickle-Coding: + - admin: Logs holosign swatting. + TheSmallBlue: + - qol: added an HUD button to go up and down floors + bigfatbananacyclops: + - rscadd: box with a set of floortile camo, which can be ordered in black market + uplink + - rscadd: also adds a backpack to camouflage + - bugfix: i had the crate under emagged console, should be fixed now. + mc-oofert: + - rscadd: Pipebombs + - rscdel: Improvised Firebombs + necromanceranne: + - bugfix: The M-90GL now correctly states that it accepts .223 toploader magazines. + vinylspiders: + - bugfix: fixes an issue where being gibbed while under the HARS mutation can sometimes + lead to the brain being deleted when it's not supposed to be +2024-03-02: + 13spacemen: + - refactor: Butt sprites are based on the chest bodypart for humans, instead of + the species + - image: Moths have their own special butt sprites + DrDiasyl: + - rscadd: Adds 2 new shields to the game! Ballistic Shield - researched by Science, + and Improvised Shield - made out of iron and sticky tape + - image: Riot, Strobe, Telescopic, Energy shields got new less flat sprites! + Ghommie: + - rscadd: Fishes love kronkaine. + - qol: Examining a fishing spot twice with sufficiently high fishing skill (or the + skillchip) will get you a list of fishes that can be caught. + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Bubblegum Hallucination Surround Charge, Wendigo Shockwave Scream, and Ice Demon Floor Freeze all have more appropriate action icons. - qol: Adds a tooltip to Ice Demon Afterimages ability. - image: Cyborg view items now use the same sprites as their corresponding goggles instead of old versions of those sprites. +<<<<<<< HEAD - rscadd: Adds 2 new shields to the game! Ballistic Shield - researched by Science, and Improvised Shield - made out of iron and sticky tape - image: Riot, Strobe, Telescopic, Energy shields got new less flat sprites! @@ -72,11 +125,38 @@ - rscadd: Fishes love kronkaine. - qol: Examining a fishing spot twice with sufficiently high fishing skill (or the skillchip) will get you a list of fishes that can be caught. +======= + JohnFulpWillard: + - bugfix: Buying the advanced plastic surgery disk from the uplink now gives you + advanced plastic surgery instead of brainwashing. + Melbert: + - rscadd: Spies may now roam the halls of Space Station 13. Watch your belongings + closely. + Rhials: + - bugfix: Pete can no longer eat vines while dead. +2024-03-03: + Rhials: + - bugfix: Fixes some tiles outside the Icebox AI satellite not getting hit by storms. + - code_imp: Splits up the nuclear operative antagonist datum folder. + xXPawnStarrXx: + - bugfix: makes custom pizzas dairy and vegetable free, unless you choose to add + them. +2024-03-04: + LT3: + - image: Tram frame is now tram girder, because it acts like one + Melbert: + - bugfix: Fixed spy stolen machines not dumping everything that needed to be dumped + Nerev4r: + - qol: Ethereal charging now loops when they're charging (from) APCs or from power + cells! + Singul0: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a new changeling ability, "Darkness Adaptation". Making you more translucent, especially in darkness and allowing you to see slightly better in the dark - balance: The changeling power "Chameleon Skin" has been buffed, Reduces the cost to 1 and sped up the time it takes to turn invisible +<<<<<<< HEAD 2024-03-05: LT3: - image: medical and improvised gauze are visibly different from cloth @@ -131,11 +211,84 @@ the usual expected danger. - balance: Tweaked the cost of various restock modules up and down. - qol: Restock modules can now be sold for 50 credits. +======= + ViktorKoL: + - bugfix: made some heretic descriptions more accurate + - spellcheck: improved english of the heretical eldritch patrons + starrm4nn: + - bugfix: Makes Metastation surgery access more consistent with other maps +2024-03-05: + DaliIsTaken: + - rscadd: added the lightbearer moth set, available in the character setup. + - image: added icons for the lightbearer set; new moth wings, antennae and markings. + LT3: + - bugfix: Tram floor tiles constructed inhand provides 4 instead of 1 + - bugfix: Tram floor tiles provide correct stack item when pulled up + - image: Tram floor tiles have their own inhand icons + - qol: Tram floor tiles available in the engineering protolathe + - bugfix: You can reconstruct deconstructed tram benches + - image: medical and improvised gauze are visibly different from cloth + Rerik007: + - bugfix: fixed the chances of living flesh actions + Rhials: + - bugfix: Some tiny tiny changes to the smoking room ruin to make it a little less + ugly. + ValuedEmployee: + - rscadd: Added new clown shoes "moffers" + - rscadd: Added moffers to the contraband list of the autodrobe + ViktorKoL: + - bugfix: fixed some issues when calculating the duration of moon smile's effects + Zergspower: + - admin: renames ruin names to have an identifier in front of it + - refactor: converts map plate and jump to ruin to tguilist + mc-oofert: + - bugfix: fixes deathmatch baseturfs (you cant crowbar the floor to breach to space) +2024-03-06: + KingkumaArt: + - rscadd: Shiny joke mi-go variant (not xenobio spawnable) + - rscdel: Removed unused mi-go static sprites + - image: Resprited mi-gos to not use plagarized art from CDDA + - image: Also allowed mi-gos to have directional facing instead of always facing + east + Melbert: + - rscadd: The animation that plays when an alert pops up on your screen is different. + - bugfix: Moving "down" as an observer is no longer janky. + - bugfix: All bibles are no longer suspiciously hollow + - bugfix: Extremely Minor Delta Morgue Fixes. See if you can spot them. + Seven: + - rscadd: Lockers and crates now shake when someone is attempting to resist out + of them. + SpaceLove: + - bugfix: Central Command Logistics department noticed the missing items on their + listings for robotics assembly crate. They have updated it! + Wallem: + - bugfix: The cursed coupon now only triggers a cursed event once, rather than infinite + times. + intercepti0n: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Pipe connector no longer appears on a hidden connector. - bugfix: Re-wrenched atmospherics pipes no longer get extra offset. - bugfix: All unary devices like injectors, passive vents etc. are centered while hidden. - image: Added smooth transition between hidden and visible pipes. +<<<<<<< HEAD +======= +2024-03-07: + 00-Steven: + - bugfix: Alternate job titles such as chef and department security actually get + injected to the manifest as their respective ID trims, instead of being assigned + the job they're based off. + - bugfix: Alternate job titles such as chef and department security actually show + up under the right department on the manifest, instead of no department. + 13spacemen: + - rscdel: Removed Orbit Polling component, all orbit polls now use the Poll Alerts + system + - code_imp: Poll alerts support small border pictures in the chat message + - code_imp: Poll alert alert picture and jump target do not have to be the same + - qol: Slime intelligence potions ask the user for a reason, this will be shown + to ghosts + ArcaneMusic: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The stock market now fires slower, has stock market events occur more often, and the stock market has fewer minerals that are available to buy in a single purchase before restocking. @@ -148,6 +301,7 @@ their rarity and a timer to show how long until it updates. - rscadd: New Stock market events, one locks a material from being purchased, the other maximizes the value and quantity of a material for sale. +<<<<<<< HEAD - bugfix: Tackle and wellcheers code for sanity values now function. - image: The minigames icon now has an icon for the deathmatch minigamee - admin: Made it easier for admins to adjust blood brother teams using admin tools. @@ -187,10 +341,86 @@ - rscadd: The ghost of Poly can no longer be shuttle-crushed, nor can anything incorporeal. - rscdel: Removed a nanomachine pizza from the deathmatch meat tower map that allowed you to become a borg +======= + Hatterhat: + - bugfix: Basic mobs no longer have the (unintended) ability to shoot out of containers, + like bluespace body bags. + Higgin: + - balance: personal flashes now Knockdown rather than Paralyze direct targets. + Jacquerel: + - admin: Made it easier for admins to adjust blood brother teams using admin tools. + - bugfix: Correct blood brother conversion logging. + - bugfix: AI-controlled spiders can correctly recognise where they can place webs. + - image: New sprites for most kinds of spider web + Majkl-J: + - bugfix: Prevents polymorphing deleting items by consuming them when transformed + then leaving the polymorph + Melbert: + - refactor: Food hunger bar has been refactored, and moved. Now it sits next to + the moodlet face. + - refactor: Food moodlets now update a lot more snappily. There is now a moodlet + tier between "being fat" and "being normal", to reduce accidentally gorging + yourself to "fatness" tier. + - rscdel: You can't hallucinate being hungry... for now. + - rscadd: Boulder refineries and smelters can refine Golems. + ViktorKoL: + - image: 'added unique icons for spells: caretaker''s refuge, apetra vulnera and + ascended shapechange' + aaaa1023: + - bugfix: Revenants can now again emag Medibots, Cleanbots, and Hygienebots. + san7890: + - qol: If your OOC message gets eaten due to some weird circumstance in how your + message is handled, it will feed the applicable message back to you so you can + copy-paste and try to send it again. +2024-03-08: + 2whatever2: + - bugfix: Tackle and wellcheers code for sanity values now function. + ArcaneMusic: + - rscadd: Vending machines now track how many credits have been spent on them, and + when restocked will pay out that saved portion to the restocker, with a 50% + match going to the cargo department. + - rscadd: Adds the restock tracker app, an NTOS app that tracks how well stocked + the station's vending machine units are at a glance as well as how much is contained + in each. + - refactor: Vending machines now use the payment component for money handling behavior, + meaning it will now accept held or pulled coins/cash/credits + - qol: Attacking vending machines can drop a portion of it's stored credits, at + the usual expected danger. + - balance: Tweaked the cost of various restock modules up and down. + - qol: Restock modules can now be sold for 50 credits. + Ben10Omintrix: + - bugfix: fixes ore vent spawned wolves being untammable + JohnFulpWillard: + - image: The minigames icon now has an icon for the deathmatch minigamee + Melbert: + - rscadd: You can talk via plushies, action figures, and toy mechs via `.l` or `.r`, + same as a ventriloquist dummy or decapitated dead + - rscdel: Talking via a plushie, action figure, toy mech, ventriloqiest dummy, decapitated + head, or marionette won't transmit over open mic comms + - refactor: Some say refactor and code cleanup. Vending machines now properly respect + being shut up. Report any oddities. + ValuedEmployee: + - sound: Added the new moffers sound effect and made moffers use it instead + cnleth: + - qol: Tramstation botany now has roundstart watering cans and syringes + intercepti0n: + - qol: ID cards in modular computers can now be swapped. + starrm4nn: + - bugfix: MetaStation Pharmacy is no longer accessible with general medical access, + Also changes the Chemistry and Pharmacy airlocks into medical ones. +2024-03-09: + 00-Steven: + - bugfix: Plexagon Access Management actually updates the shown template list on + authentication, avoiding needing to refresh/reopen/somesuch the program manually. + Drag: + - rscadd: Adds the Shark and Shork costume. Blahaj lovers rejoice! + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed the tgui text input trimming the last character of the input if it hits the maximum length. - bugfix: This also fixes the PIN pad leading to the right wing of the museum away mission. +<<<<<<< HEAD - qol: EVA can be given now in common access slots for non-command crewmembers. - balance: Adjusts the values and contents of the Contraband Crate's item loot table. - code_imp: Use a common list for acceptable silo materials for some stuff. Renamed @@ -232,6 +462,71 @@ like hypnoflash - bugfix: Silicons can use asterisks in binary without fear of saying something interesting. +======= + Pickle-Coding: + - qol: Extended the metric prefixes. + mc-oofert: + - rscdel: Removed a nanomachine pizza from the deathmatch meat tower map that allowed + you to become a borg + necromanceranne: + - bugfix: Spies no longer have access to infinite use autosurgeons. + starrm4nn: + - qol: EVA can be given now in common access slots for non-command crewmembers. +2024-03-10: + 00-Steven: + - bugfix: When a carbon talks over robotic it uses their voice instead of visible + name. Meaning, voice changers work like they do over other comms regardless + of face covering. + Absolucy: + - refactor: Improved shuttle gibbing code, adding a new resistance flag, `SHUTTLE_CRUSH_PROOF`. + - bugfix: Immortality revival spectres can no longer be crushed by shuttles. + - rscadd: The ghost of Poly can no longer be shuttle-crushed, nor can anything incorporeal. + JohnFulpWillard, Tattax: + - rscadd: 'Adds a new station trait job: The Human AI.' + LemonInTheDark: + - rscadd: Tweaked the saturation, color and intensity of a bunch of lights + Momo8289: + - rscadd: Wheat and meatwheat can now be worn in the mask slot. Farmers rejoice! + - code_imp: Chem stun reductions are now applied more consistently. + - bugfix: Chem stun reductions should now more consistently apply to unconsciousness. + PapaMichael: + - bugfix: Removed erroneous information on some health analyzer's examine text. + Rhials: + - code_imp: Players now receive antag datums specific for reinforcements/support + borgs. + Shroopy: + - qol: Uninverted the inverted corner of the Icebox medbay treatment center. + Singul0: + - rscadd: Adds 3 new kits into the syndie-kit spawn pool, 2 for special and another + for tactical + SyncIt21: + - code_imp: Use a common list for acceptable silo materials for some stuff. Renamed + ore category into silo category. + - bugfix: fixes toolact screentips & balloon alerts for boulder machines & machine + frame + Thunder12345: + - rscadd: Added secondary objectives to bitrunning! + - rscadd: Pick up encrypted curiosities and return them to the safehouse to claim + their contents. + - rscadd: Glacier Grind has been given a secondary objective, look out for the limited + edition hat. + - rscadd: Bitrunning domains can now be modified during the round by admins. + Zergspower: + - qol: Curtains and shower curtains are no longer solid objects that defy common + sense + necromanceranne: + - balance: Bulldog Shotguns now have a 2-round burst fire. + - balance: Lone Operatives now come with some additional Bulldog Shotgun magazines. + - balance: Adjusts the values and contents of the Contraband Crate's item loot table. +2024-03-11: + LemonInTheDark: + - balance: Nerfs the burn times of flares and glowsticks, from 25/35 to 10/15 and + 50/60! to 20/25. + - balance: Glowsticks now dim as they burn + - rscadd: Glowsticks no longer leave an unusable action button sitting around then + they're lit + - bugfix: Glowsticks actually burn down now (The code was broken) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Pickle-Coding and Rhials: - admin: RCD construction and deconstruction are logged. - admin: Hallucinated projectiles no longer log. @@ -240,7 +535,34 @@ - admin: Frozen object shattering is logged. Rhials: - bugfix: Fugitive hunters no longer spawn after 1 minute of the fugitives' arrival. +<<<<<<< HEAD SkyratBot: +======= + SyncIt21: + - qol: adds examines & screentips for HPLC + - qol: HPLC will now display the status of each reagent if it can be purified or + not before starting the refining process. + - bugfix: HPLC won't accept hologram items. + - bugfix: HPLC uses the correct off icon state & pauses processing when opened, + powered off, unanchored or broken + - bugfix: HPLC will ignore reagents that are either already at max purity or are + inverse thus lowering eta & work done to purify your remaining reagents + - code_imp: merged procs to reduce code size. auto Doc procs for HPLC + - refactor: converted UI to typescript. + TiviPlus: + - bugfix: fixed some errors with the prepackaged tts + moocowswag: + - balance: Reinforced sections of station hull have gotten better at mitigating + explosive shockwaves. + necromanceranne: + - bugfix: A recent glitch within the Syndicate-coded uplinks resulted in a number + of Cybersun-branded cybernetics being distributed for absolutely no cost at + all, except to the company itself. This embarrassment has resulted in increased + tensions within the Syndicate as a culprit for this costly mistake is sought + out. +2024-03-12: + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds examines & screentips for grill (the machine for grilling food), converts some chats to balloon alerts - qol: foods that can be re-grilled any number of times @@ -255,6 +577,7 @@ - code_imp: autodoc procs & vars for the grill (the machine for grilling food) - refactor: grills (the machine for grilling food) has been refactored. report bugs on github, also they only start processing after putting food/fuel into them. +<<<<<<< HEAD - rscadd: Tweaked the saturation, color and intensity of a bunch of lights - qol: added an HUD button to go up and down floors - balance: Nerfs the burn times of flares and glowsticks, from 25/35 to 10/15 and @@ -334,10 +657,104 @@ - bugfix: Fuck you coupons ACTUALLY trigger only once again. As a consequence, they also burn up when expended for their one-time fuck you. - bugfix: Fuck you coupons work regardless of whether you had a free hand or not. +======= +2024-03-13: + ArcaneMusic: + - bugfix: The black market illegal fish case now correctly initializes. + EEASAS: + - rscadd: New Lizard's Gas ruin, this time in lavaland + Ghommie: + - bugfix: The museum piggy bank now spawns with at least 400 creds in it. + Iajret: + - bugfix: As a borg you shouldn't be able to resist from grab while locked down + JohnFulpWillard, Atlasle: + - balance: You no longer feel cold if you're drunk. You still take damage, but get + no warning or slowdown. + Melbert: + - bugfix: Some things which should pacify people (but aren't) now will properly, + like hypnoflash + - bugfix: Silicons can use asterisks in binary without fear of saying something + interesting. + SyncIt21: + - bugfix: inserting a material sheet into an lathes should show the correct animation + color + Vermidia: + - bugfix: Doors with ID scan disabled will no longer open when an ID is thrown at + them + san7890: + - bugfix: All basic mobs are able to get wet. This means, among other things, that + you can clear the "slimed" status effect off your holoparasite or dog or whatever. + vinylspiders: + - bugfix: fixes a spurious CI runtime caused by explosive mines quite literally + blowing up the unit test area +2024-03-14: + 00-Steven: + - bugfix: Buttons let you take out their electronics again, hooray. + - bugfix: Fuck you coupons ACTUALLY trigger only once again. As a consequence, they + also burn up when expended for their one-time fuck you. + - bugfix: Fuck you coupons work regardless of whether you had a free hand or not. + ArcaneMusic: + - bugfix: Ore vents have to be scanned while standing next to them. + - bugfix: Menacing ore vents now correctly only spawn in a node drone after the + boss is defeated, instead of before. + - image: Your station's standard issue E-219 laser turrets within the AI upload + and AI satellite have been updated to a newer, shinier model. + Derpguy3: + - bugfix: A missing recharger has been added into science's testing range on Birdshot + station. + Ghommie: + - rscadd: Added a Skub-related station trait. You can now choose if you want to + be pro-skub or anti-skub, complete of shirt and stickers. Please don't shank + each other over it. + - balance: Halved the weight of station traits such as scarves, wallets and glitched + PDAs. + - balance: Buffed the duration of the SC/FISHER Saboteur Handgun's disruption effects. + It's also stealthier and it won't conspiciously alert living mobs hit by it. + - rscadd: Added saboteur interactions with radios, pAIs, turrets, secbots and APCs. + - bugfix: Fixed the larva "hide" ability not properly hiding larvas under tables. + - bugfix: Fixed the "Fenced Goods" black market category. + - balance: Removed the LTSRBT from cargo and added it to the blackmarket, reduced + the price from 4000 to 625 on average. + - balance: The time it takes for captured mobs to be automatically sent back to + the station from the holding facility has been increased from 3-4 minutes to + 6. + - rscadd: You can buy mobs captured by contractors, traitors and pirates from the + black market and have them sent back to the station in advance. For safety, + they'll also be handcuffed (not always) upon delivery. + - rscadd: Human mobs sold by pirates are not deleted anymore. Instead, they're now + captured and sent to the holding facility. + IndieanaJones: + - balance: Max level Summon Simians now grants the wizard a free gorilla transformation + spell as opposed to allowing the wizard to summon fully-grown gorillas. + Jacquerel: + - balance: All materials except glass are now worth more gulag points than before. + - balance: Mining skill decreases the time it takes to break boulders, and makes + it less tiring. + Justice12354: + - spellcheck: Fixed grammar and formatting on the description of friendly elite + mining mobs. + Pickle-Coding: + - bugfix: Prevent runtime from humans with biowares gettingn deleted. + Rhials: + - balance: Irradiated meteors now hit harder and leave behind radioactive goop. + SyncIt21: + - bugfix: search bars don't swallow characters or lag behind your typing speed + - bugfix: Clicking sub sections in the design menu of lathe's UIs will auto scroll + to them. + - bugfix: NumberInput(used in chem heater, plumbing reaction chamber etc) highlighting + & editing requires only single click like before + - refactor: Typescript conversion for NumberInput TGUI Component + ValuedEmployee: + - rscadd: Added Moffers as a crafting recipe in the entertainment section. + intercepti0n: + - image: Resprited T-ray & Geiger counter. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Thermal pistols can now be 'cranked' to recharge shots. You must have a holster equipped in order to utilize this feature. Also, they have a tighter dual-wield cone. - balance: Thermal pistol crates are now 2000 credits, up from 1400 credits. +<<<<<<< HEAD - bugfix: Fixed the larva "hide" ability not properly hiding larvas under tables. - bugfix: Prevent runtime from humans with biowares gettingn deleted. - balance: All materials except glass are now worth more gulag points than before. @@ -348,6 +765,26 @@ - balance: Irradiated meteors now hit harder and leave behind radioactive goop. SkyratBot: - qol: Tramstation botany now has roundstart watering cans and syringes +======= + starrm4nn: + - balance: Ephedrine spasms won't affect small or tiny items + - balance: Ephedrine's movement speed bonus now scales with purity. +2024-03-15: + 13spacemen: + - bugfix: Fixed some poll alerts runtiming + ArcaneMusic: + - code_imp: We now log how many ores spawned on lavaland each round, as well as + the sizes of all of the ore vents. + Ghommie: + - rscadd: Added a 'Closet Anomaly' station trait, which links and turns a portion + of the roundstart closets into impromptu teleporters. + - rscadd: Added a persistent piggy bank to the vault, which can carry up to a modest + 2000 credits worth of dosh between rounds. + Jacquerel: + - image: Updated button icon for Summon Simians and Gorilla Transformation. + JohnFulpWillard: + - refactor: Instruments now use TGUI. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Crusher marks no longer overwrite eachother, fauna can have one from each crusher. - balance: Ash drake's crusher trophy no longer affects people the same faction @@ -356,6 +793,7 @@ having to worry about friendly fire with this, for 750 mining points at your mining vendor.' - bugfix: Minebot passthrough upgrade now properly makes PKAs pass through minebots. +<<<<<<< HEAD - bugfix: fixed some errors with the prepackaged tts - bugfix: A missing recharger has been added into science's testing range on Birdshot station. @@ -384,6 +822,61 @@ SkyratBot: - bugfix: now spiders get extra damage by fly swatter - bugfix: Modsuit Pathfinder module is significantly better at finding it's destination. +======= +2024-03-16: + 00-Steven: + - sound: Placing paper in a paperbin is no longer silent. + ArcaneMusic: + - qol: Vending machines now have contextual tooltips for interactions with tools/objects/restocking/returns. + - qol: Vending machines can now be examined to see what type of restock module they + need to be refilled. + Bilbo367: + - bugfix: now spiders get extra damage by fly swatter + FlufflesTheDog: + - bugfix: Cleanbots once again require an emag to spray acid on people. They can + still acid trash objects normally. + JohnFulpWillard: + - bugfix: Time on servers hosted outside of the UK should now properly have their + timezone offset. + Kapu1178: + - bugfix: Modsuit Pathfinder module is significantly better at finding it's destination. + Webcomicartist: + - bugfix: Fixed RLD,RTD and Rebar crossbow not being storable on the engineering + winter coat slot. + intercepti0n: + - bugfix: Fixed cap overlay being added even when pipe is not hidden. + - bugfix: Fixed cap overlay being visible on turfs that are masked with darkness + plane, but still visible via mesons, cameras etc. + kawoppi: + - qol: added tooltip to newscaster to tell people that they need to insert paper + if they want to print a newspaper + projectkepler-ru: + - rscadd: The Bartender's double barrel shotgun can be purchased for 1,800 credits + on goodie tab + xXPawnStarrXx: + - image: added gags sprites for; Sailor dress, Evening gown, Cardigan skirts and + striped dresses. +2024-03-17: + ArcaneMusic: + - bugfix: Tramstation now has a pepperspray dispenser in it's science security outpost, + as with other security outposts. + - bugfix: Fixes the conveyor belts found on north star's boulder processing room + to all work when the lever is thrown. + Bilbo367: + - bugfix: ID locking and unlocking work. + FlufflesTheDog: + - bugfix: Psyker vision no longer causes infinitely worsening lag + Ghommie: + - rscadd: Added a collar bomb to the black market. + - rscadd: Added a possible kit to the special syndie bundle B, which also has uses + these collars. + - rscadd: Added 20+ modifiers to the deathmatch minigame, which can be enabled by + the host. + - rscadd: Ice cream and frozen treats now have a chilling effect. + - rscadd: You can add a scoop of ice cream on waffles. + - balance: added an action speed modifier to the generic food haste effect (you + do things, and not just run, an itsy bitsy faster) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The pro skateboard and hoverboard are now faster. - balance: The improvised skateboard is a nick more unstable than the standard, so the two aren't exactly the same. @@ -393,6 +886,7 @@ are a caveat to it: It cannot be ridden on open space gaps deeper than one level or actual space, unless there''re objects that prevent falls, like lattice or catwalks.' +<<<<<<< HEAD - bugfix: NumberInput(used in chem heater, plumbing reaction chamber etc) highlighting & editing requires only single click like before - refactor: Typescript conversion for NumberInput TGUI Component @@ -465,10 +959,118 @@ - image: modified gi sprites, making them more customisable. - qol: Can now use wirecutters when performing Tend Wounds. - code_imp: Mineral logging now collects ore names more cleanly. +======= + Jacquerel: + - balance: If you work out under heavier-than-earth gravity, you will get gains + faster. + JohnFulpWillard: + - bugfix: The captain's safe is no longer on the wall, therefore cannot be cheesed + by breaking the wall it sits on. + - bugfix: Tearing down a wall that a safe is on now drops the safe with its contents, + rather than dropping the contents onto the floor. The safe's contents cannot + be interacted with while it's not on a wall. + - bugfix: Security camera consoles no longer have infinite range. + - bugfix: Human AI now closes regular AI job positions. + Melbert: + - rscadd: MODsuits now use the "suit charge" HUD element to show how much charge + they have left, rather than a screen alert + Rhials: + - qol: Posters now return to your hand when the hanging process is cancelled, or + they are snipped down. + - qol: Abductor posters can now only be cut down with abductor-tier wirecutters. + SyncIt21: + - bugfix: Lathes don't hang if materials run out mid printing. Also displays message + if materials are put on hold while printing + Tattle: + - rscadd: Getting shrunk makes you talk small +2024-03-18: + Bilbo367: + - bugfix: Deathmatch players should no longer be able to roll any midround antagonist. + Exester509: + - bugfix: Plasmamen will become human in the deathmatch so they don't instantly + die + Ghommie: + - bugfix: FIXED CARGO EXPORTS! + JohnFulpWillard: + - bugfix: Action abilities hidden from players are now not shown to observers either. + Rhials: + - bugfix: Plasmamen nukie reinforcements are now properly given a plasmaman-safe + outfit. + RikuTheKiller: + - balance: Smoke Machines, Showers, Vapes, etc will no longer arbitrarily delete + a random amount of the chems they are processing + Runa-Dacino: + - bugfix: fixed consecutive tgui text input inheriting user input from previous + input form within the same proc + san7890: + - bugfix: If you place a headset on a non-Poly Parrot, you should be able to remove + it from the parrot as-expected now rather than having the parrot send it to + the shadow realm. + xXPawnStarrXx: + - image: modified gi sprites, making them more customisable. +2024-03-19: + 13spacemen: + - qol: Sentience potion reason is set via alt-click + ArcaneMusic: + - rscadd: Disposal bins can now hold destination taggers using right click, and + can be removed the same way. Some disposal bins should have some pre-loaded + as well. + Ghommie: + - bugfix: The deathmatch modifiers modal menu can actually be opened now. Also fixed + a bunch of issues it had. + LT3: + - bugfix: Export barcodes are visible on wrapped packages + Momo8289: + - bugfix: You can no longer determine the result of a dice roll from off-screen. + Rhials: + - code_imp: Deathmatch files, map names, and keys should all be consistent now. + SyncIt21: + - bugfix: Selling stuff in cargo gives us money again. + san7890: + - bugfix: Prisoners who are teleported to the Nanotrasen Work Camp should now always + be stripped of their gear to prevent escapes. +2024-03-20: + Nidvex250: + - qol: Can now use wirecutters when performing Tend Wounds. + Watermelon914: + - bugfix: Fixed the lua editor being outright broken. + Y0SH1M4S73R: + - bugfix: lua scripting should work on BYOND 515.1633 + antropod: + - bugfix: Vending machine no longer shocks you twice when you pulse high voltage + wire. + - bugfix: Airlock wires window closes when you get shocked +2024-03-21: + 00-Steven: + - rscadd: Hemiplegic now lets you pick which side is disabled. + - rscadd: The medical records text for hemiplegics now shows which side is disabled. + ArcaneMusic: + - bugfix: Vending machines now show the correct vending refill name when examine + and not full. + - code_imp: Mineral logging now collects ore names more cleanly. + Bilbo367: + - admin: cluster bombs stop spamming admin logs + Higgin: + - bugfix: basic mob pirates no longer drop fake energy weapon lenses when shooting + you to death with lasers. + JohnFulpWillard: + - bugfix: Clients joining a round twice as a crewmember (via admins or otherwise) + no longer break security/medical record consoles permanently. + Melbert: + - refactor: Infrared emitters now function better (or at least more how you would + expect them) (hopefully). Report any oddities + - qol: Hand labels now have a visual effect associated, and are also affected by + heat / can be cleaned off like stickers. + - refactor: Refactored hand labels. They're objects now! + Singul0: + - bugfix: You can't complete a genetic makeup scan when the targets moves out of + target anymore using a genetic sequencer +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SomeRandomOwl: - admin: Deathmatch Bombs, Smoke, and Liquid floods are now suppressed in the logs and will not actively spam admin logs. - code_imp: adds a area flag to suppress logging for floods and bombs +<<<<<<< HEAD 2024-03-23: SkyratBot: - rscadd: Added secondary objectives to bitrunning! @@ -504,11 +1106,30 @@ - bugfix: reagent containers like cup & syringe only update target appearance if action was successful. - bugfix: envelops don't stack overlays when interacting with cup & syringes. +======= + TheVekter: + - rscadd: Added 5 new Felinid ear options, ported from Orbstation! (Sprites by Or-Fi-S) + Thlumyn: + - rscadd: Added corner filled warning decals + Xander3359: + - bugfix: Fix hack comms console/locate weakpoint objective showing up multiple + times +2024-03-22: + AnturK: + - bugfix: Painting patronage works again when there's no curator present during + the round. + Ghommie: + - rscadd: Active skillchips are now copied on bitrunning avatars. + - rscadd: To celebrate it, a skillchip is now available from the bitrunning order + console, which lets you dodge projectiles for the duration of your flips, at + the cost of stamina. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed the (non-working) "Perma-Flipping" and "Echolocation" deathmatch modifiers. - rscadd: Added "No Slowdown", "Random Teleports", "Snail Crawl", "Forcefield Trail" and "Manual Blinking/Breathing" modifiers. - bugfix: Fixed deathmatch cruise missiles looking like standard pods. +<<<<<<< HEAD - rscadd: Added corner filled warning decals - bugfix: Alternate job titles such as chef and department security actually get injected to the manifest as their respective ID trims, instead of being assigned @@ -519,10 +1140,31 @@ - bugfix: Vending machines won't brick if the payment fails (like due to lose of ID) for any reason - bugfix: pet carrier unfriending pets put in it. +======= + Melbert: + - rscadd: 'Adds 3 Traumas: Primal Instincts (special), Kleptomania (severe), and + Possessive (mild)' + Rhials: + - bugfix: Removes some dirt tiles on the Sunrise deathmatch map, which would fill + the map with lavaland atmos. + SyncIt21: + - bugfix: Vending machines will update its UI if ID is lost at any point + - bugfix: Vending machines won't brick if the payment fails (like due to lose of + ID) for any reason + - bugfix: failing to equip a dual handed item should properly clear out all status + effects related to equipping it, for e.g. remove the action button from chainsaw + - bugfix: reagent containers like cup & syringe only update target appearance if + action was successful. + - bugfix: envelops don't stack overlays when interacting with cup & syringes. + Watermelon914: + - refactor: Auxlua no longer uses the timer subsystem to get stuff done, lua scripts + shouldn't slow down timers anymore. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 myraowo: - rscadd: Added the Chief Engineer's turtleneck and turtleneck skirt to the game. - rscadd: Added the Chief Engineer and Chief Medical Officer's turtlenecks to their respectives garment bags. +<<<<<<< HEAD 2024-03-26: Melbert: - qol: A few species (such as Jellypeople) now have proper(ish) preference menu @@ -535,6 +1177,101 @@ SkyratBot: - qol: Fishfood is now more easily acquired through cargo - qol: Smoke machines can actually be rotated with alt-click when unwrenched. +======= +2024-03-23: + Ben10Omintrix: + - rscadd: cultists can now convert pets to their side + Bilbo367: + - bugfix: Fixes ghosts being able to change a lathes output direction. + - image: fixed Fulton balloon having its smallest sprite copy pasted over itself + DaCoolBoss: + - bugfix: A broken item was removed from the mimesvsclowns ruin. In its place is + a spent revolver round. + Ghommie: + - bugfix: Fixed the LTSRBT. + Jacquerel: + - bugfix: Driving a vehicle into the supermatter will kill everyone riding the vehicle + Singul0: + - qol: Adds contextual screentips to air alarms + SyncIt21: + - bugfix: RCD logs are more human readable & stores the player name behind the action. + Thunder12345: + - image: Everything that used the old gangtool sprites (door remotes, landing field + designators, some choice beacons, windicate borg reinforcements) has been resprited. + - image: Door remotes now visibly show their current mode. + carshalash: + - qol: Fishfood is now more easily acquired through cargo +2024-03-24: + 00-Steven: + - bugfix: Fixed patronizing paintings not giving a cut to the curators. + Bilbo367: + - bugfix: pet carrier unfriending pets put in it. + JohnFulpWillard: + - bugfix: Importing songs into instruments no longer cuts the first line of the + song. + Melberet: + - bugfix: Jellyperson, Luminescent, and Stargazer hair no longer look bad. All jellyperson + types no longer have eyesockets. + Melbert: + - refactor: Refactored bioware slightly (the stuff experimental surgeries gives + you). Report any weirdness + Pickle-Coding: + - bugfix: Fixes conservation of energy issues relating to charging powercells. + - qol: APCs will display how much power they are using to charge their cell. This + is accounted for in the power monitoring console. + - qol: All arbitrary power cell energy units you see are replaced with prefixed + joules. + - balance: As a consequence of the conservation of energy issues getting fixed, + the power consumption for charging cells is now very significant. + - balance: APCs only use surplus power from the grid after every machine processes + when charging, preventing APCs from causing others to discharge while charging. + - balance: Engineering SMES start at max charge to combat the increased energy loss + due to conservation of energy fixes. + Thlumyn: + - rscadd: Crowbars/wirecutters now deconstruct wooden/cardboard crates/boxes + Watermelon914: + - bugfix: Fixed lua error logging. + - bugfix: Fixed the SS13.start_loop function not working properly. +2024-03-25: + 00-Steven: + - qol: Smoke machines can actually be rotated with alt-click when unwrenched. + JohnFulpWillard: + - bugfix: Changelings with a flesh ID now properly show the icon of the disguised + ID in examine. + Melbert: + - bugfix: Slimepeople and Luminescents are now 50% burn resistant like Stargazers + - refactor: Blood deficiency and slimepeople now handle blood a tiny bit differently, + report any oddities. + - refactor: Blood deficiency now handles its mail goods a tiny bit different, report + any oddities. + - bugfix: Fixed Slimepeople's hair not matching their slimey colors. + Pickle-Coding: + - bugfix: Fixes flamethrower runtime preventing them from working. + Rhials: + - bugfix: Venus Human Traps can once again entangle victims and drag them into their + web. + Sadboysuss: + - bugfix: Musiver, Godblood, Synaphydramine, Hollow water and unholy water will + no longer show up in secret recipes + SyncIt21: + - bugfix: text fields which should save their value after hitting enter/closing + the UI now actually does that + - bugfix: lathe search bar now saves its previous search query after the UI is closed + and also reloads search results correctly + - bugfix: number input dragging will only send payload to backend when its value + changes, Same applies when you hit enter or click outside the field, the value + must have changed to trigger the back end + - bugfix: You can once again drag your mouse anywhere in the window outside the + number input field to vary the value by large amounts + - code_imp: removed unnecessary variables(suppressFlickering, updateRate & event + object param for handlers) from Number Input + TheBoondock: + - qol: Gold and silver crates now accurately reflects NT's greed + mc-oofert: + - bugfix: the virgin mary picture no longer makes its initiates harddelete +2024-03-26: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Touched most of the code for racks. It should function almost entirely the same save for what's noted here, please report any issues. - code_imp: Wrenching moved to wrenching procs. Side-effect, rack items are only @@ -550,6 +1287,7 @@ - rscdel: Killed ancient rack code for dragging your active item onto a rack. Just click it does the same thing. This allows you to actually dump items onto racks, though currently disorderly. +<<<<<<< HEAD - bugfix: Changelings with a flesh ID now properly show the icon of the disguised ID in examine. - qol: Gold and silver crates now accurately reflects NT's greed @@ -562,10 +1300,36 @@ the UI now actually does that - bugfix: lathe search bar now saves its previous search query after the UI is closed and also reloads search results correctly +======= + LT3: + - bugfix: "Fixes Schr\xF6dinger's space heater, where a space heater both consumes\ + \ a power cell instantly while also not consuming power when heating adjacent\ + \ tiles" + Melbert: + - bugfix: Fixed Suit Storage Unit cell charging rate + - qol: A few species (such as Jellypeople) now have proper(ish) preference menu + setups + - config: The in-repo species config has been updated. Well it's still the same + by default, but it's now updated for newer species. + - bugfix: Fixed space suit thermal regulators cell usage. + NeonNik2245: + - qol: makes surgery cap small + Pickle-Coding: + - bugfix: Fixes static power usage from being able to not draw power. + SyncIt21: + - bugfix: Fixed cell energy usage for a bunch of stuff(Part 1). See PR 82197 for + details + - bugfix: recharge stations draw the same amount of power as before but directly + from grid(without using apc cell power) and won't waste any excess power + - bugfix: Fixed more energy usages for cells(Part 2). See PR 82198 for details + - bugfix: Fixed more energy usages for cells(Part 3). See PR 82204 for details + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Crank weapons now can actually be charged using their crank. - bugfix: Stun batons and their variants now actually meaningfully consume charge when used. 2024-03-27: +<<<<<<< HEAD Melbert: - rscadd: You can talk via plushies, action figures, and toy mechs via `.l` or `.r`, same as a ventriloquist dummy or decapitated dead @@ -636,3 +1400,210 @@ they'll also be handcuffed (not always) upon delivery. - rscadd: Human mobs sold by pirates are not deleted anymore. Instead, they're now captured and sent to the holding facility. +======= + 13spacemen: + - bugfix: the follow link upon poll completion should work properly now + Alecksohs: + - image: Updated the Advanced Surgical Tool's sprites + - code_imp: Updated the Advanced Surgical Tool's light code + JohnFulpWillard: + - refactor: Xenomorphs (Lavaland & Oldstation ones) are now basic mobs. + Melbert: + - bugfix: Puzzlegrids now report their answers properly + - rscadd: Bitrunners can now broadcast their Bitruns to the station's Entertainment + Monitors. + - bugfix: Blocks mobs from trying to "physically" interact with some of their hud + elements, such as using Telekinesis or point a gun at your mood meter. + Paxilmaniac: + - rscadd: The PML-9's name has been changed to something that's a little less boring + random numbers and letters, and something that TTS can likely pronounce much + nicer than before. Get blown up by a Dardo rocket launcher today. + - image: Sprites for rocket launchers, rockets, and rocket projectiles have been + changed to something fresher looking. + - balance: Rocket launchers can be worn on your back or armor vest. + SyncIt21: + - bugfix: abstract(like the dual hand thingy on your hand) & hologram things can't + be put inside storage items + - qol: adds examines & screentips for tool acts & other operations for reagent grinder + - qol: adds an off icon for when the grinder panel is open/not powered + - code_imp: auto docs vars & procs. Shared common proc for grinding or juicing + - code_imp: removed trait for blended dust, changed some item interactions to end + the attack chain early & save time + - bugfix: no inserting hologram items into the reagent grinder + - bugfix: 'you can hit the reagent grinder tools like screwdriver, wrench, crowbar + & even beakers/ingredients etc when in combat mode + + fix; adds sanity checks for when & how mobs interact with the reagent grinder' + - bugfix: examining a reagent grinder by an AI/Human with AI access now actually + works. + - bugfix: you can insert Nova flowers & other food items from any bag type + - bugfix: reagent grinder now grinds all the contents of an item recursively to + produce maximum reagents like a real grinder would + - refactor: reagent grinder now measures available capacity to store items as total + weight of stored items & not number. Capacity can be increased with upgraded + matter bin + - refactor: reagent grinder power usage is now a function of duration & total weight + of items blended, meaining blending more number of items/larger items will consume + more power + - refactor: reagent grinder code has been optimized overall. Report bugs on github + Watermelon914: + - admin: Admins can now run lua files bigger than 36 KB by importing them directly. + YakumoChen: + - bugfix: Removed erroneous light switch in janitor office + carshalash: + - balance: The polymorph belt will no longer register space dragons as acceptable + DNA. + zxaber: + - rscadd: Added a new Neutral Quirk to indicate to Medical you're willing to be + borged +2024-03-28: + Ghommie: + - bugfix: Made sure that mapped critters (i.e. penguins on the snow cabin away mission) + can survive in the environment they're spawned in. + - bugfix: 'Fixed the "Drop Pod: Syndies" deathmatch modifier.' + JohnFulpWillard: + - bugfix: Cameras built in-round can be upgraded again. + - bugfix: Deconstructing cameras now more consistently return to you the upgrades + inside of the camera. + - bugfix: RD's telescreen can now properly see Ordnance cameras again. + - bugfix: '[Deltastation] Library art gallery no longer has an invisible camera.' + JohnFulpWillard, Twox: + - rscadd: Added a new photobooth machine to the HoP's line. + - bugfix: Things checking for access now checks your off hand, too. + LT3: + - bugfix: 'Fixed modular computers failing to boot up using cell power (eg: contractor + tablet)' + - bugfix: Fixed being unable to start self surgery + Melbert: + - qol: Suit Storage Units charge MODsuits while their cell panel is closed or open, + rather than only when screwed open + - qol: Inducers can charge MODsuits while their cell panel is closed or open, rather + than only when screwed open + - qol: Suit Storage Units will charge all items within simultaneously (if possible) + - bugfix: Non-PKA kinetic blasts should work better + - bugfix: Clown PDAs slip people when not worn + - qol: Cargobus chat console and Departmental Order console are now combined into + one. + - qol: Mod PCs active on the "chat client" apps no longer look like AI uploads (and + now have their own sprite) + - refactor: Departmental order consoles were refactored a bit, report any oddities. + - bugfix: Stabilized Red extracts no longer bypass Immutably Slow items + - bugfix: Settler equipment speed modifier no longer applied to Immutably Slow items + - bugfix: Immutably Slow items no longer block construction of certain items + - bugfix: Robocontrol should work better. + Profakos: + - refactor: Slimes are now basic mobs. Please report any strange behaviours! + - balance: Slimes only stun you for two seconds when they shock you, the rest of + the duration is a knockdown. + - balance: Slimes are not stunned from the cold, but rather, get frozen in a freon + icecube. BZ also puts them in complete stasis, instead of making them unconscious. + Their speed is likewise unchanged by temperatures. + - balance: Slimes do not passively heal, they instead rely on feeding. + - bugfix: Slimes can use the buckling screen alert to unbuckle and stop feeding, + along with clicking on the mob they are riding + Rhials: + - qol: Dynamic midrounds "Obsession Awakening" and "Blob Host" now have ghost orbit + popups, so you can see them happening in real time. + - qol: There is no longer a ghost orbit popup for players being shocked by an electrified + tram rail. + - qol: The Stray Cargo orbit popup no longer has a half-second window to orbit before + it becomes useless. + SyncIt21: + - bugfix: Fixed more energy usages for cells(Part 4). See PR 82227 for details + ZephyrTFA: + - balance: You can now adjust the suit sensors of another player in the strip menu. + No longer must you first take it off. + icequibe: + - qol: Allowed players to fully use the underground hermits without assistance outside + of ruin + mc-oofert: + - bugfix: turret id panel checks the access of the attacking item instead + san7890: + - admin: Advanced Debug Cards will still provide a whole lot of access, but the + way the money on those cards work is now a bit different. Players shouldn't + be able to use the money on those cards in any context though, don't fret about + that. Just know that the money printer goes wrrrr +2024-03-29: + BurgerBB: + - balance: 'You can no longer visually track something (See: AI tracking) if that + object is inside something. You are also considered invisible by tracking if + your alpha level is less than 50.' + Higgin: + - bugfix: air analyzers work again + Jacquerel: + - rscadd: Wise cows produce surprising milk. + - spellcheck: You now milk the owner of an udder, not the udder. + - spellcheck: fixed grammatical error in chemical splashing + Kapu1178: + - bugfix: Botanists will be given dank pizza when consuming the infinite pizza + Melbert: + - bugfix: '"Mind Gate" does self brain damage as intended' + SyncIt21: + - bugfix: anything that has reagents can be either grinded or juiced + - bugfix: stuff that does not have reagents but has grind results can still be grinded + but not juiced + bigfatbananacyclops: + - balance: secbots no longer can be buckled + mc-oofert: + - bugfix: Certain weather types that arent supposed to be glowing no longer glow + - image: Snow storms no longer glow + moocowswag: + - bugfix: Circuit multitools can now correctly scan carbons who are wearing clothes + or holding objects again. + necromanceranne: + - bugfix: Unfathomable Curios now properly block as expected. + - bugfix: The shielded component actually respects the shield_inhand when determining + blocking potential. + - bugfix: Ensures that the shielded component has a wearer before attempting to + block, and that this wearer is the same as the owner of the item. + zeroisthebiggay: + - spellcheck: however, he burn`s` his finger in the process. +2024-03-30: + 00-Steven: + - bugfix: You can actually hit racks with objects when in combat mode again. Importantly, + painting them with spraycans like that works again. + Ghommie: + - bugfix: Fixed the "Random" deathmatch modifier. Also turned the "Heightened Hearing" + option into a modifier as well. + Majkl-J: + - code_imp: Borgo rightclick ranged code + Pickle-Coding: + - bugfix: Fixes lavaland SMES and other crap from not starting with enough energy. + - bugfix: The pirate SMES are now magical instead of secretly infinite. + Profakos: + - code_imp: Made the easter rabbits spawn on a more curated list. + - bugfix: Slimes now feed faster, and should only need one monkey to reach their + next lifestage. + Xander3359: + - qol: You can now open airlocks (That you have access to) while inside a stealth + implant box + Zytolg: + - qol: Wholesale Revamp of Birdshots Engineering Department + - bugfix: Some Birdshot Amtospherics Concerns + - bugfix: Some Birdshot Engine Concerns +2024-03-31: + Absolucy: + - bugfix: Fixed double-encoded messages with AI holocalls. + Ben10Omintrix: + - balance: minebots have been buffed and have recieved new upgrades + DATA-xPUNGED: + - rscadd: Prosthetic organ users are now allowed to pick what they want to start + with. + - rscadd: Junkie of all kinds, including smokers and alcoholics, are also able to + pick their favorite type. + Iamgoofball: + - balance: Your heart stops beating when you die now. + Profakos: + - bugfix: Slimes stop being in stasis when taken out of a BZ filled environment + - bugfix: Slimes no longer become hungry while in stasis + SyncIt21: + - bugfix: chem dispenser UI doesn't brick when beaker is ejected while recording + recipes + - code_imp: removed deprecated `content` tag from buttons in chem dispenser + - bugfix: Fixed cell energy usage for a bunch of stuff(Part 5). See PR 82296 for + details + Thunder12345: + - image: Pinpointers have been resprited + mc-oofert: + - bugfix: elevators may no longer pick up things from under the floor during movement +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 4d369516ae9..25ad1bf8ac2 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -1,4 +1,5 @@ 2024-04-01: +<<<<<<< HEAD SkyratBot: - balance: Your heart stops beating when you die now. 2024-04-02: @@ -142,6 +143,11 @@ - rscadd: Added a new Neutral Quirk to indicate to Medical you're willing to be borged - rscadd: You can now fax painted canvases in order to send memes to each other. +======= + 00-Steven: + - bugfix: Ethereal starvation has been updated to the new joules/watts standard. + Congratulations Ethereals! You can starve again! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Whether something counts as a stimulant to All Nighter is now handled by the reagent itself when metabolized, for everyone's sanity. Side-effect, you need a liver to process stimulants for All Nighter. @@ -149,6 +155,7 @@ Nighter. This includes all coffee/tea variants, a few other drinks that would have a high enough caffeine level, kronkaine, ephedrine, and in case you're insane you can straight up eat coffee or tea grounds. +<<<<<<< HEAD - bugfix: buying & selling huge quantities of materials on the market won't cause their prices & quantities to go beyond bounds. - spellcheck: fixed grammatical error in chemical splashing @@ -173,6 +180,34 @@ - image: Snow storms no longer glow - bugfix: Circuit multitools can now correctly scan carbons who are wearing clothes or holding objects again. +======= + KingkumaArt: + - bugfix: ' Hatsune mi-go now is a friendly gold slime mob, and doesn''t hurt your + ears.' + - rscadd: Hatsune mi-go drops a keyboard synth on death (you monster.) + Majkl-J: + - bugfix: after 9 years, adds a single dot to the dragnet code, making it deal stamina + damage as intended + Melbert: + - qol: Socially Anxious people should be able to talk a bit more clearer while still + maintaining the stuttering "charm" + Melbret: + - bugfix: Revival Surgery, Strange Reagent, and the Reviver Implant will restart + your heart when you are revived + Profakos: + - bugfix: Slime properly load their slowdown values from the config files. + - bugfix: Slimes who lose their AI controller will no longer runtime when they get + hungry. + Thunder12345: + - image: Supermatter slivers and the tools used to steal them have been resprited. + - image: The jester costume now supports GAGS + hyperjll: + - rscadd: Added a 'kaching' sound to the game, and made uplinks play this sound + locally to the user whenever a purchase is made. + moocowswag: + - bugfix: anchored circuits no longer blow up after 2 components are used. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The eye of god now protects from the madness inducing effects of supermatter crystals and singularities. This trait is shared by the meson night vision goggles (which this is a better version of) @@ -185,6 +220,7 @@ - code_imp: The status effect that was called Stagger (not Staggered, which is separate) is now called Rebuked. - balance: Rebuked applies a x2 action delay cooldown, rather than x1.5. +<<<<<<< HEAD - qol: Makes it easier for heretics to click on influences without accidentally drawing a rune with their codex cicatrix because the animation shifted and made you click on the floor instead. @@ -195,6 +231,52 @@ - balance: evil seedlings can no longer be mass produced - qol: some experiments now give you more helpful hints at why your failing - code_imp: changes around some experiment code to make it more understandable +======= +2024-04-02: + SyncIt21,Pickle-Coding: + - bugfix: space heater(including improvised) turns off when cell is drained + - bugfix: optimized power usage for both improvised and main space heater. Improvised + heater now works & uses beaker heat capacity +2024-04-03: + 00-Steven: + - bugfix: Fix using a multitool on a power object with wires not actually opening + the wires menu when it should. + - bugfix: Fix a runtime from a power object being deleted before selecting what + cable layer to put it at. + - bugfix: Fix power object cable changing not caring about whether you were still + adjacent, still holding your multitool, or whether it even still existed after + the selection menu was closed. + Absolucy: + - qol: Makes it easier for heretics to click on influences without accidentally + drawing a rune with their codex cicatrix because the animation shifted and made + you click on the floor instead. + Ben10Omintrix: + - balance: evil seedlings can no longer be mass produced + Bilbo367: + - qol: some experiments now give you more helpful hints at why your failing + - code_imp: changes around some experiment code to make it more understandable + Cyprex: + - config: mech logging is now on by default. Existing config setups will not mirror + this change. + DATA-xPUNGED: + - bugfix: Fixed Prosthetic limb quirk preferences + Iamgoofball: + - balance: Makes the Captain's Spare safe actually secure from being smashed open + now that it's been removed from a wall. Damage Deflection of 30 has been added + to it. + Jacquerel: + - balance: Traitors can no longer turn themselves into dragons. + - rscadd: You can now fax painted canvases in order to send memes to each other. + LT3: + - code_imp: APCs can now calculate time-to-charge + - qol: Overloaded lathes will now tell you the wait time until they're ready to + print again + Melbert: + - bugfix: Psicodine helps Socially Anxious people again (as does signing) + - bugfix: Speech effects such as stuttering no longer applies its TTS filter if + the resulting message doesn't actually change the message + Pickle-Coding: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Halon combustion releases 2.5 moles of pluoxium per mole of halon consumed. - balance: Halon combustion no longer releases carbon dioxide. - balance: Halon combustion releases resin foam. @@ -204,6 +286,7 @@ instead accelerates at higher temperatures. It is much faster overall. - balance: Halon formation releases 91.2321kJ of thermal energy per mole of halon consumed. +<<<<<<< HEAD - bugfix: destructive analyzers can now get screwdrivered instead of put it in. - bugfix: destructive analyzer now accepts alien wire cutters, and emags. - qol: Dynamic midrounds "Obsession Awakening" and "Blob Host" now have ghost orbit @@ -369,10 +452,174 @@ like toolboxes and doesn't grey out its print button - bugfix: 'LUA: Registering a signal on a deleted datum will throw a more descriptive error message.' +======= + SyncIt21: + - bugfix: buying & selling huge quantities of materials on the market won't cause + their prices & quantities to go beyond bounds. + - bugfix: igniter in meta station ordinance burn chamber works again + - bugfix: Mechbay & modsuit rechargers waste a small amount of energy as heat + - bugfix: Mechbay recharger console displays mech charge as joules & charges directly + from the grid thus sparing the rooms apc cell from huge loads + - qol: adds missing examine for when machine frames can be deconstructed + - qol: both machine & computer frames must be unanchored before it can be deconstructed + & adds examines to explain the same + Zytolg: + - balance: Readds some N2O to the Birdshot AI sat. I'll be working on a better solution + for this in the coming weeks. + - bugfix: Due to a Misprint, the Atmos Gas -> Pure pipes were incorrectly labeled + on Birdshot. Your Cargo Techs have since remedied this. + - bugfix: Our cable laying intern team didn't lay cable to the Secure Storage APC + in Enigneering. Getting coffee instead of working is a big no-no here at Nanotrasen + Tech Support, and they have since been reassigned. Your Chief Engineers have + been instructed to make the modifications on all Birdshot Class Stations. + - bugfix: We've noticed some Heads-Of-Staff getting lost on Birdshot. While Telecommunications + does have a GPS waypoint, our staffs stubbornness often means this is ineffective. + Additional Signage has been placed to help direct our most senior of staff. + - bugfix: The Birdshot Turbine will no longer Pre-Load itself with highly flammable + Plasma Gas. Do your own jobs you lazy atmos bums. + mc-oofert: + - qol: AIs now get a z level indicator + moocowswag: + - bugfix: Modular shields now give correct feedback and no longer dissuade individuals + from breaking them. + necromanceranne: + - bugfix: Detective revolvers can no longer exist in a quantum state of both being + chambered in .38 and .357, without risk of misfire. Detectives, cowboy enthusiasts + and reckless federal agents across the Spinward Sector mourn the loss. +2024-04-04: + 00-Steven: + - refactor: APCs have had their item interaction chain refactored. This should functionally + be the same, but please report any issues. + Bilbo367: + - bugfix: fixes reagent production selection overwrite updating during selection + - code_imp: updates reagent menu for Odysseus + - bugfix: aheal no longer turns monkies into humans + - qol: Player panel "make monkey" turns humans into monkeys through mutation instead + of making a new mob + - bugfix: destructive analyzers can now get screwdrivered instead of put it in. + - bugfix: destructive analyzer now accepts alien wire cutters, and emags. + Bisar: + - bugfix: Adjusted the code for changeling reviving stasis to only make them spend + chemicals once. + necromanceranne: + - qol: Makes the clown anomalous crystal actually useful for once rather than an + open griefing tool. It now revives the dead...as clowns! + - admin: Adds logging for the anomalous crystal activation, including fingerprints. +2024-04-05: + 00-Steven: + - bugfix: 'All Nighter: fixed a runtime from not having a head, whether from hars/deletion/somesuch.' + - bugfix: 'All Nighter: losing and regaining your head while you had eyebags no + longer removes your eyebags until you''ve slept.' + Bilbo367: + - bugfix: material experiments not scanning + DATA-xPUNGED: + - bugfix: Fixes Alcoholic quirk selection + - bugfix: Fixes Junkie, Smoker, and Alcoholic not giving you more addiction when + you come clean. + KingkumaArt: + - bugfix: Moves that one wall on NorthStar to not block the maints passage + Majkl-J: + - bugfix: Observers can now see people's quirks again + Melbert: + - qol: Breathing cold air now has a particle effect associated, careful not to let + your glasses fog up. + - qol: Breathing cold air will now occasionally make your spaceman shiver. Brrr. + - bugfix: Heretic sac restarts your heart + Momo8289: + - bugfix: Holographic energy swords have undergone some more rigorous safety inspections, + and should no longer be a danger to clumsy crew members. + Zergspower: + - bugfix: borg panel access now requires robotics access again + nikothedude: + - bugfix: Root beer no longer causes laser carbines and disabler smgs to fire infinitely + fast. +2024-04-06: + 00-Steven: + - admin: Refresh button on the View Round Logs menu actually works, instead of just + adding a runtime to the logs (and not updating them). + Archie700: + - bugfix: changed value of cell charge from 5000 to 5 megajoules + Artemchik542: + - bugfix: aheal now properly heals ears deafness + Blacklist897: + - balance: suit and cell chargers should draw from grid preventing instant apc blackouts + in most cases. + EnterTheJake: + - balance: CNS Rebooter Implant will now pull you out of stamcrit and grant you + a few seconds of stun immunity + JohnFulpWillard: + - admin: Removing components button now lists components to remove + Rhials: + - rscadd: Nuclear Operatives now purchase an Intelligence Agent, who can watch cameras + and bodycams, move the shuttle, and provide radio support. Only 12 Telecrystals! + SyncIt21: + - refactor: refactors how objects are deconstructed in relation to the `NO_DECONSTRUCTION` + flag. Certain objects & machinery may display different tool interactions & + behaviours when destroyed/deconstructed. Report these changes if you feel like + they are bugs + Zergspower: + - bugfix: fixes Borg and Syndicate inducers not working + jlsnow301, infraredbaron: + - rscadd: Added a new UI element over players that are interacting, building, etc. +2024-04-07: + Bilbo367: + - bugfix: Narcolepsy is no longer activated while neutered. + JohnFulpWillard: + - bugfix: You can no longer take chemicals out of medipens with a syringe. + - balance: Basic mob AIs with no mobs on the Z level now stop. + Melbert: + - bugfix: Fix fancy anomaly theme being broken + - bugfix: Skill rewards should properly be dropped out of unworthy player's hands + - bugfix: Items will properly pass through slime on occasion + - bugfix: Captive Xeno end round report should make a tad more sense + Skeleton-In-Disguise: + - rscadd: Transhumanist now allows you to select your augmentation + - rscadd: Transhumanist can now provide a robotic voice box, or flashlight eyes + - spellcheck: Transhumanist's roundstart text has been re-written to not be wrong + Vishenka0704: + - qol: Added search bar to character prefs catalogs + mc-oofert: + - balance: punches no longer knock down or deal stamina damage + necromanceranne: + - rscadd: Watcher wreaths. Made from the mangled remains of a watcher, now a handsome + accessory for you to wear a few inches behind your head. Comes in Normal and + Icewing variants. + - rscadd: Some bounties for the two variants of watcher wreaths. +2024-04-08: + Fluffles: + - bugfix: Hats/glasses/masks should hopefully behave more predictably for the purposes + of eye/mouth surgery. + Jacquerel: + - rscadd: Adds a new Final Objective where you force your fellow crew to fight to + the death on pain of... death. + LemonInTheDark: + - bugfix: The color matrix editor now works properly again + Metekillot: + - bugfix: Broken chameleon kits can't be unbroken by an EMP. + Rhials: + - bugfix: Sweeps a tile of dust off of the Maint Mania deathmatch map, which was + causing errors. +2024-04-09: + JohnFulpWillard, Zeek the Rat: + - rscadd: Battle Arcade has been completely overhauled in a new progression system, + this time using TGUI. + - rscadd: The Curator's keys can now reset arcade cabinets. + - balance: You now need to be literate to play arcade games, except for Mediborg's + Amputation Adventure. + - bugfix: You can no longer screwdriver emagged arcade consoles. Accept your fate. + - bugfix: Silicons can no longer play Mediborg's Amputation Adventure. + Melbert: + - spellcheck: Shoes and Gloves are now referred to as "a pair of" rather than "some". + - spellcheck: Reinforced Window's description is less out of place. + - spellcheck: Fixed an empty space in examining a human's bloody hands. + - code_imp: It's a tad easier to exit an atom's examine text now. + mc-oofert: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: slaughter/laughter demons have a cooler round end report - qol: you may not bodyslam yourself as a demon - code_imp: slaughter and laughter demons are given their antag datum when their mind initializes +<<<<<<< HEAD - bugfix: Medipens can no longer be deepfried, closing an exploit that allowed people to drain/inject chems into it with saltshakers and IV drips. - bugfix: fixes ody sleeper UI not updating to new chems to inject. @@ -457,12 +704,162 @@ Melbert: - bugfix: Playing Cards memory now reads better SkyratBot: +======= +2024-04-10: + 00-Steven: + - bugfix: Lead acid batteries have had their power values fixed. + 00-Steven, SyncIt21: + - bugfix: Wrench table deconstruction gives the right materials again. + - bugfix: Screwdriver table deconstruction only deconstructs the top again. + ArcaneMusic: + - bugfix: Vorpal Scythe execute messages now read correctly. + Bisar: + - bugfix: Mechs will no longer delete their living non-occupant contents when destroyed. + Higgin: + - balance: 'Spies can now get five additional types of objective: Protect Human, + Protect Nonhuman, Detain, Jailbreak, and Escape (Exile).' + - balance: Spy objectives now feature a much wider array of targets and treatments. + - refactor: added no_failure var to objectives. Objectives with no_failure = TRUE + do not print a success at roundend. Custom objectives use this now instead of + a separate string. + IndieanaJones: + - qol: Basic dexterous mobs now have a health doll and screen damage indication + like other basic mobs. + JohnFulpWillard: + - rscadd: A bunch of new medipens you can refill with the medipen refiller (survival/luxury/mutadone/saturnx/meth) + - bugfix: Mech pads, door buttons, message monitors, tram machines, abductor consoles + & holodeck computers now use power. + JohnFulpWillard, Tattax: + - rscadd: Monkeys can now wear all jumpsuits. + - rscadd: Bioscrambler anomalies can now give monkey legs. + - bugfix: Monkeys can have their tails removed, and tails are no longer invisible + when implanted into another species. + Melbert: + - bugfix: You can't fit items which are normally too large for a storage by fitting + it in the storage when it is small, then growing it to a larger size. + NeonNik2245: + - rscadd: Adds anosmia quirk + Pickle-Coding: + - bugfix: Fixes many instances of energy sources for ethereals supplying a thousand + times less energy than intended. + - bugfix: Fixes recharging stations not being able to charge ethereals. + - bugfix: Fixes recharge stations charging too fast. + - qol: Recharge stations display their recharging speed in formatted power, rather + than unformatted energy per cycle. + - balance: Cells will only consider 0.1% of their charge for calculating shock damage. + Rhials: + - bugfix: The tide of post-round blob zombies when a blob wins will no longer break + the speakers in your headset. + SyncIt21: + - bugfix: Reagent grinders display reagents of its beaker on examination + Thunder12345: + - rscadd: Added support for directional explosions. + - rscadd: Rocket launcher backblast is now 271% more explosive, check your six for + friendlies! + - rscadd: X4 charges now explode in a cone away from the user when placed on a sufficiently + solid object. + - bugfix: 'X4 charges will now behave correctly when placed on dense atoms (note: + don''t try to read a variable from an atom you just blew up)' + mc-oofert: + - bugfix: deathmatch can no longer occassionally send people to nullspace + necromanceranne: + - image: Updates the colors of various material datum to bring them closer in-line + with their actual material stacks + - image: Improves the sprites for the material knight armor and helmet. +2024-04-11: + Absolucy: + - qol: Added balloon alerts whenever you start plunging something (i.e ) + Bilbo367: + - bugfix: fixes ody sleeper UI not updating to new chems to inject. + - bugfix: fixes ody sleeper not telling user why they can't pick up a person. + - code_imp: gives a common method for giving reagent list data to .tsx + Boviro: + - qol: Atmospherics Overalls now can store fire extinguishers in the suit storage + slot + - balance: Increased Advanced Extinguisher capacity to 100u + Jacquerel: + - bugfix: Medbots can no longer be used as especially large golden ID cards + JohnFulpWillard: + - refactor: Blueprints now use TGUI. + - qol: Blueprints can now be used while lying down. + SethLafuente: + - bugfix: Fixes Radiation Hood not having FOV blockage + SyncIt21: + - qol: Adds screen tips & examines for screwdriver, wrench, crowbar & beaker insertion, + removal & replacing actions + - qol: Analyzing reagents no longer blocks other players from doing other operations. + Multiple players can analyze different reagents on the same machine + - qol: You cannot do any tool acts on the machine while printing to prevent any + side effects. + - qol: The preferred container for the master reagent in the beaker is now showed + in both condiment & chem master. The feature can be enabled/disabled via a check + box + - code_imp: removed defines for reagent transfer, vars for reagent analyzis to save + memory. Autodoc for other vars & procs + - bugfix: You can hit the chem master with tools like screwdriver, crowbar, wrench + & beaker in combat mode + - bugfix: You cannot insert hologram items into the chem master + - bugfix: Deconstructing a condiment master will give you the circuit board already + pre-programmed with that option + - bugfix: You now print the exact amount of containers requested even with upgraded + parts without creating empty containers. Max printable containers is 13 with + tier 4 parts able to print 50 containers. + - refactor: Optimized client side UI code & chem master as a whole. + - bugfix: Autolathe correctly computes the print amount of custom material items + like toolboxes and doesn't grey out its print button + Watermelon914: + - admin: LUA - Adds a new library called handler_group. Include it in your files + by doing require('handler_group') + YesterdaysPromise: + - rscadd: Added long balloon box to the clown's starting inventory, and a skill-chip + of long lost honk-motherian knowledge to their brain. + - rscadd: Added long balloons. Consequently, added balloon animals to make from + such balloons. Also, balloon top hat, vest, helmet, and a mallet. Don't ask + about the mallet. + - rscadd: A long balloons box harvested fresh from the farms on the clown planet + will be able to be shipped in a crate to the cargo department near you! + - rscadd: As per requests; water balloons can now be printed at service lathe, and + entertainment modsuit can now blow long balloons! + - image: Balloons will now have an unique sprite when in the inventory, compared + when to on the ground. +2024-04-12: + 00-Steven: + - bugfix: Standard RPEDs work on machines again. + Jacquerel: + - spellcheck: Effectively hitting furniture and machines with objects will no longer + be double punctuated. + - bugfix: Goliaths can't grab their own riders with tentacles + Melbert: + - qol: Basic Bots will use their "salute" emotes less often. + - rscdel: Basic bot fists. + Pickle-Coding: + - balance: Atmos resin can directly cool the floor. + SyncIt21: + - code_imp: renamed `NO_DECONSTRUCTION` to `NO_DEBRIS_AFTER_DECONSTRUCTION` so its + name matches its intended purpose + - bugfix: fixes some items that incorrectly used `NO_DECONSTRUCTION` prior to its + refactor, meaning makes some objects non deconstructable again + disappointedButNotSuprised: + - rscadd: Coffee machines can now carry over reagents from the beans to the coffee + (surely no one will inject poison into them) +2024-04-13: + 00-Steven: + - refactor: Instead of being hardcoded to the pen, renaming items is now an element. + Currently only pens have this, and functionality should be the same, but please + report it if you find any items that were renamable but now aren't. + DaCoolBoss: + - spellcheck: Fixes a typo in the cargo console. + Horatio22: + - spellcheck: grammar fixes in the roundstart advisory warnings + Iamgoofball: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes AI lag by re-adding idle mode to all AI that was lost with the simple mob to basic mob conversion. - bugfix: AI controllers with no clients around for 14 tiles will move into idle mode and stop planning or acting. - bugfix: AI controllers will now record how much time was spent on planning or un-idling AI controllers. +<<<<<<< HEAD - bugfix: The rebar crossbows now properly loosen their bowstring upon firing. - balance: Longfall modules no logner stun you when they activate. - balance: Falling from a height greater than one z-level while using the longfall @@ -477,6 +874,196 @@ - qol: Tuberculosis makes you cough more - qol: Nicotine Addiciton makes you cough less - qol: Medicine Addiction maybe makes you cough more, maybe makes you cough less +======= + Jacquerel: + - balance: The Bioscrambler will now actively attempt to get closer to living targets + rather than chilling in a closet nobody goes into (unless you trap it in a containment + field). + - balance: Because it can now travel through walls, the Bioscrambler will no longer + transform you THROUGH walls. + JohnFulpWillard: + - bugfix: Advanced camera consoles now boots you off when you're moved out of reach. + Ketrai: + - qol: chef equipment can now deposit and withdraw to/from trays! + - qol: chef now has access to griddle and oven sized trays! + - qol: service can now print soup pots + Melbert: + - bugfix: You can't change the GPS tag of something unless you can actually use + the GPS + - bugfix: You can't set the teleporter to a location unless you can actually use + the teleporter + - bugfix: You can't reply to request console requests unless you can actually use + the console + - bugfix: You can't update AI lawboards unless you're actually holding them + - bugfix: You can't update a borg rename board unless you're actually holding it + - bugfix: You can't mess with plumbing machines unless you can actually use them + - bugfix: You can't recolor / relayer ducts unless you're actually holding them + - bugfix: You can't magically wire APCs and SMESs unless you're right by them + - bugfix: You can't use Stargazer Telepathy on people who you can't see + - bugfix: You can't configure the Inspector Hat unless you can actually use it + StrangeWeirdKitten: + - balance: The upload and communication boards directly have trackers installed, + activated only when authenticated. + SyncIt21: + - bugfix: chem master properly shuts down if it loses power mid printing and won't + transfer reagents for the same + Watermelon914: + - bugfix: 'LUA: Registering a signal on a deleted datum will throw a more descriptive + error message.' + ZephyrTFA: + - admin: Something changed, but you shouldn't be able to notice. If verbs are funky + report this to <@946283057915232337> on discord. + hyperjll: + - balance: Haloperidol now purges 2 units per second of itself, should the victim + have zero stamina. (Stamcrit) + jlsnow301: + - bugfix: 'Deviants buffed: Rogue shoelacing, pickpocketing and restraint resisting + no longer give cogbar icons.' + - bugfix: Airlock electronics and other access-config type UIs should look much + better. + wesoda25: + - bugfix: blood rites - will no longer delete after running out of charges + - bugfix: blood rites - now heal shades as well + - bugfix: blood rites - now charge 1.65x for self healing as opposed to the ~2x + they were before + - code_imp: blood rites code hurts my eyes a bit less now +2024-04-14: + 00-Steven: + - bugfix: Clicking the buckled alert unbuckles you again. + Bisar: + - qol: Cyborgs now understand door and APC wires at a glance, among others + Jacquerel: + - bugfix: Living Limbs created by Bioscrambler will be alive. + - bugfix: Living Limbs can once more attach themselves to your body. + - balance: Living Limbs will prioritise attacking your limbs. + - bugfix: Basic Mobs will once again spread their damage across body zones instead + of only attacking your chest. + JohnFulpWillard: + - bugfix: The HoP's photobooth button is now consistently connected to the HoP's + photobooth. + Metekillot: + - bugfix: Being in critical condition no longer damages zombies. + - code_imp: TRAIT_NODEATH will actually stop you dying in (most) cases. + SyncIt21: + - bugfix: Operating computers clears its ui display procedures if patient is moved + out of the operating table in any way + - bugfix: you can put back the oven tray after you take it out + - bugfix: only oven trays are allowed in ovens preventing baked food runtimes + - bugfix: advanced camera consoles correctly deactivate when something happens(no + proximity, no power etc) to its user + kaylexis: + - image: Updates old belt sprites. Mostly the bags, but some misc. ones as well + like the chainsword and RPED +2024-04-15: + AMyriad: + - image: Updated the ability icons used by AIs and station bots + AyIong: + - qol: General settings tab into TGchat, looks better now, and is more convenient + to use. Also, each button has a font written on it. + Ben10Omintrix: + - bugfix: minebots no longer bomb each other (and other miners) through landmines + - bugfix: minebot shields will no longer lose color in lower z levels + JohnFulpWillard: + - bugfix: Battle arcade's higher levels no longer gives you a "Gear" gear, and counterattacks + can now properly kill enemies. + - qol: Crayons can now draw up to 4 letters at a time per tile. + Thunder12345: + - spellcheck: Pre-Approved Cyborg Candidates are no longer "Cantidates" + jlsnow301: + - rscadd: Added a loot window for alt-clicking tiles. + - rscdel: Removed the item browser from the stat panel. +2024-04-16: + Iajret: + - bugfix: wiring newly built SMESes should place new teminal under the player and + not under the SMES itself. + TheRyeGuyWhoWillNowDie: + - bugfix: strip menu sensors change respects locked sensors +2024-04-17: + 00-Steven: + - bugfix: RPEDs can be used on vendors again. Note that only bluespace RPEDs can + carry vendor refills as of writing. + - bugfix: RPEDs can display vendor parts again. + - bugfix: Restocking vendors gives credits whether done manually or by RPEDs. + - bugfix: Vendors reset their contained credits when restocked. + AMyriad: + - bugfix: Probably fixed directional tinted windows looking like directional frosted + windows + - image: Deleted a bunch of unused structure sprites + - image: Fixed the lobby menu's collapse button being offset by a pixel + Ben10Omintrix: + - bugfix: basic bots no longer start with all access + Jacquerel: + - bugfix: Anomalous Research ruin Bioscrambler anomalies won't home in on targets + - bugfix: Bioscrambler won't randomly drop its target for no reason + - admin: Reactivating an anomaly core via the anomaly releaser is now logged. + - bugfix: Fixes various bugs related to dimensional/spectral anomalies moving when + they should not. + JohnFulpWillard: + - bugfix: Medipens can no longer be deepfried, closing an exploit that allowed people + to drain/inject chems into it with saltshakers and IV drips. + Melbert: + - refactor: Staff of Healing should perform slightly better. + - bugfix: Blobs may rejoice, welding torches now consume fuel when attacking objects + again after two years. + Rhials: + - sound: Nightmare has a new sound effect for entering/exiting shadow jaunt. It + also no longer can be heard through walls. + SyncIt21: + - bugfix: Ordinance lab igniter in Icebox works again + - bugfix: facescarf ui toggle button works again + - bugfix: closets & crates will dump all contents out first before deleting itself + regardless of `NO_DEBRIS_AFTER_DECONSTRUCTION` thus not for e.g. hard deleting + mobs inside it + Vect0r: + - bugfix: 'BIRDSHOT: the clown now has a megaphone. Go honk!' + Xackii: + - bugfix: Birdshot now have engi wardrope + Zytolg: + - bugfix: Cleans up some rocks on Birdshot + jlsnow301: + - rscadd: The lootpanel now works at range. + - rscadd: Screentips for reskinnable items. + - bugfix: Alt click interactions have been refactored, which may lead to unintentional + changes to gameplay. Report any issues, please. + - bugfix: CentCom dispatched a team of interns to fix the loot panel's loading message. + It should now load properly. It did before too, but now the message is fixed. + mc-oofert: + - bugfix: tramstation AI sat starts full +2024-04-18: + Ben10Omintrix: + - code_imp: The way mobs idle has been refactored, please report any issues with + non-reactive mobs + - rscadd: miners can now purchase grapple guns + Melbert: + - rscadd: Adds the Strong Stomach quirk, which allows you to eat grimy food without + worry about disease, and makes you a bit more resilient to the effects of vomiting. + - rscdel: Deviant Tastes no longer prevents you from getting a negative moodlet + from eating dirty food. Strong Stomach does that now. + - bugfix: Height now applies less weird to certain worn items, bare-handed bloody + hands, and damage overlays. + jlsnow301: + - bugfix: Bit avatars no longer have access to free binary comms with the AI outfit + - bugfix: Netpods have had their security against exploits increased. + mc-oofert: + - bugfix: you no longer need to put your sleeping carp gloves off and on in Deathmatch + to get the martial art + san7890: + - rscadd: Regal Rats are now able to tear down those colorful posters those weird + grey creatures keep spackling up on the walls of their rightful domain. +2024-04-19: + Iajret: + - bugfix: cooling and anti-disruption RCD upgrades can now be printed in ancient + protolathes + Jacquerel: + - balance: Gulag mining has been rebalanced so that every boulder is worth the same + amount of points to mine for a prisoner regardless of what it contains, and + should be more consistent. + - rscadd: A vent which boulders can be hauled out of by hand has been added to the + gulag which you can use if there's nothing left to mine. It is very slow, but + at least it gives you a workout... + Melbert: + - refactor: Atom-Item interactions have been refactored once more. Report any oddities. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Being deafnened from a loud sound (flashbang, explosions) will now force people not naturally deaf to shout - rscadd: Ear damage multiplier now only applies to taking damage, not healing damage, @@ -486,6 +1073,7 @@ snappily Rhials: - qol: Water tiles now extinguish fires on items and people. +<<<<<<< HEAD SkyratBot: - bugfix: basic bots no longer start with all access - bugfix: being revived with a cyber-heart now properly restarts the cyber heart @@ -530,10 +1118,280 @@ - bugfix: vinegar may once again be crafted with wine, water, and sugar - rscadd: Added a short scene when getting an Ordeal of Sisyphus achievement. - bugfix: All alert polls ignore option works +======= + SyncIt21: + - code_imp: most cell power usages are scaled with defined constants to help adapt + to future changes + - bugfix: smart pipes release their gases into the air when unwrenched + - bugfix: cryo pipe connector component has no side effects of gas reallocation + when deleted + TheRyeGuyWhoWillNowDie: + - bugfix: being revived with a cyber-heart now properly restarts the cyber heart + Watermelon914: + - bugfix: Fixed RnD consoles not being able to be opened. + jlsnow301: + - rscdel: Due to a need for company restructuring, virologists have been laid off + by CentCom and doctors can optionally take their place. + - bugfix: TGUI Alerts shouldn't have such wonky buttons any more + - bugfix: Fixed a bluescreen in cargo console + - bugfix: 'Lootpanel additions: Condensed item names for the quick of draw' + san7890: + - qol: There's a bit more user feedback when it comes to attempting to handcuff + someone. + starrm4nn: + - qol: Replaced the surgical tools in the Primary Surgery Theatre with 2 Surgery + Trays. +2024-04-20: + Ben10Omintrix: + - qol: slimes will stay active without needing any one to watch over + Bmon: + - bugfix: Fixed on-mob sprite alightment for the NT SWAT helmet. + Iamgoofball: + - bugfix: Carps migrating through the station no longer idle so they don't get stuck + after spawning until someone walks by. + Melbert: + - bugfix: Primal Instincts and Living Flesh should be a tad more reactive + - bugfix: You can handcuff people with 2 arms and you can no longer handcuff people + with 0 arms + Motho: + - rscadd: Added wizard-themed deathmatch map. + - rscadd: Added mystery wand box. + Sightld2: + - bugfix: Ants are no longer picky eaters. Low Purity sugar will no longer result + in less Ants than you started with. + SyncIt21: + - bugfix: plumbing machinery begins processing only when wrenched & ends when unwrenched + - bugfix: plumbing machinery uses energy only when wrenched & doing work, will stop/use + less energy when idle + - bugfix: plumbing grinder chemical will grinds & juice stuff correctly i.e. prefer + grinding over juicing for most stuff + Vishenka0704: + - qol: added mass craft for personal crafting + ZephyrTFA: + - admin: Controller Overview UI. Check the Server Tab. + grungussuss: + - sound: cyborgs now have sounds to indicate they are moving + iliyaxox: + - spellcheck: '''inisimin'' verb corrected to ''invisimin''' + jlsnow301: + - bugfix: Mecha pilots are no longer bothered by incessant loot panels while holding + ALT for strafe disable. + - bugfix: Dropdowns received some much-needed QoL, like having the scrollbar follow + your selection. + - bugfix: AI voice changer now shows its current voice selection. + - bugfix: Deathmatch screen has been touched up. + - bugfix: Prefs menu has their dropdowns simplified, hopefully fixing issues +2024-04-21: + ZephyrTFA: + - admin: New dropdown to force change a mob's name and the attached client's preferences. + - admin: Player Panel is back + jlsnow301: + - bugfix: Fixed the targeting capability of mobs with full auto + - bugfix: You can now fire the marksman revolver at things you can see +2024-04-22: + FlufflesTheDog: + - bugfix: loading oven trays from serving trays and other containers works again + Iajret: + - rscadd: added ventpointer that points toward nearby ore vents and can be bought + with mining points + - balance: scanned ore vents can now be found with GPS + - bugfix: fixed ore vents missing overlay icon for uranium + Melbert: + - bugfix: You can open bags with alt click while resting again + - qol: Many items which previously required you to stand to alt-click now don't, + such as bedsheets and spray cans + Rhials: + - qol: Lava and plasma rivers now immerse you in them. + Singul0: + - rscadd: Adds an omnitoolset for both engineering and medical cyborgs, containing + various basic tools + - qol: Engineer and Medical module inventory space is now significantly decluttered + SyncIt21: + - bugfix: HPLC can purify inverted chems and are now coloured green(clean) in the + UI + - bugfix: pseudo circuit adapter computes recharge delay durations correctly & won't + use power when on cooldown + - code_imp: uses standard cell defines for N-spect scanner + - bugfix: off station & round start lathes with local storage don't have infinite + storage size. + jlsnow301: + - bugfix: Fixes the sight range on lootpanel. + vinylspiders: + - bugfix: dropdowns that use display_names as an alias for numeric values will no + longer cause tgui bluescreens +2024-04-23: + EvilDragonfiend: + - code_imp: /appearance type references are now investigatable in vv editor. + - code_imp: '/image references display a summarised name with its dmi file name + and icon_state when it''s investigated from a datum where it uses. Format is: + "mob_hud_image = /image (hud.dmi:medical) [0x00000]"' + - code_imp: /image types no longer show first image incorrectly when its icon_state + is null + FlufflesTheDog: + - bugfix: Stone tiles (and things on them) no longer get immersed in lava + Melbert: + - qol: Getting up from prone, moving up or down a z-level (not via ladders, naturally. + Like flight), and de/activating your modsuit no longer shows cogwheel effect + Pickle-Coding: + - bugfix: Fixes mechanical sect gaining 1,000 times the favor from a cell sacrifice. + SyncIt21: + - bugfix: Fixes runtime in advanced camera console when power is turned off + jlsnow301: + - bugfix: Cargo's supply console has been upgraded visually. + necromanceranne: + - rscadd: Replaces Fitness with Athletics; same skill, but now more specifically + applicable to boxing. + - rscadd: Athletics does not increase sprite size. + - balance: Overhauls Boxing to add a lot more depth to the interactions. Only applicable + to other boxers, however. You can still punch the snot out of non-boxers though. + But only up to stamcrit or unconsciousness. No hitting someone who can't fight + back! + - balance: Adds Evil Boxing, which is the evil and fucked up version of boxing that + you kill people with and are allowed to flout the sacred rules of boxing as + you please. Everyone is a victim! + san7890: + - bugfix: Evolved aliens should no longer have two numbers in their name. +2024-04-24: + Ben10Omintrix: + - bugfix: brimdemons (and other mobs) will act normally + Jacquerel and Melbert: + - rscadd: A new achievement for moving a boulder from one place to another, at great + effort. + - balance: Hauling a boulder around makes you move slower, as it does when dragging + it. + Melbert: + - qol: Tuberculosis makes you cough more + - qol: Nicotine Addiciton makes you cough less + - qol: Medicine Addiction maybe makes you cough more, maybe makes you cough less + - bugfix: Only brute damage causes brain damage when applied to the forehead, rather + than all damage types + - bugfix: Playing Cards memory now reads better + - qol: Coughing will now no longer print to chat, IE, it is runechat only. If you + have runechat emotes disabled, however, it will still print to chat. + - qol: Snapping now has a visual component. + - bugfix: All emotes are no longer considered audible, meaning blind people go back + to not being able to see people do flips and jumps + - bugfix: However, blind people are now told when they do a visible emote like flipping + (because they can, obviously, feel themselves flipping). Likewise, deaf people + are told when they do some audible emotes, like coughing or screaming. + Rhials: + - bugfix: Fake handcuffs/Zipties no longer block clicks for a few seconds after + being resisted out of. + SyncIt21: + - bugfix: plumbing & chem reaction chamber heating effects accurately reflect the + beakers heat capacity & power usage + - bugfix: plumbing reaction will not use power when emptying or when there are no + reagents to heat + - bugfix: you can hit the chem reaction chamber with items like beakers, screwdrivers, + crowbars and what not + jlsnow301: + - rscadd: Admin tools buffed, check the Controller Overview + - rscadd: Controller Overview moved to debug tab + - bugfix: 'Cargo express console fixed: No more bluescreen' + necromanceranne: + - rscadd: Adds a higher capacity SMES unit to lower maintenance areas and maps. + - bugfix: Miners can actually access and fix their engineering issues on the lavaland + base via the engineering section of the base. + - bugfix: The gulag SMES unit is no longer needlessly draining the entire power + grid of the main mining base. + uaioy: + - rscadd: New heavy weight pirates, medieval warmongers + - rscadd: Adds military spear, shortsword, boarding axe, kite shields + - rscadd: Adds warlord and crude armor + - rscadd: Adds medieval shuttle (made by striders18) +2024-04-25: + Fikou: + - bugfix: brimbeams no longer make a cog appear above the mob + - bugfix: you can no longer take off someones glasses or mask through atmos hardhat + - bugfix: once you adjust a welding helmet or something it no longer makes your + cigarette or sunglasses invisible + - bugfix: welding gas mask works once again + - bugfix: quick equips dont drop the item if you cant equip it + Momo8289: + - rscadd: The crew monitor now has sorting options and a search bar. + grungussuss: + - rscadd: whistle emote + - refactor: Refactored how laugh, sneeze, cough and cry sound is called in the code, + report strange behavior with these emotes. + - sound: added sounds for whistle, cry, cough, sneeze, laugh for moths and lizards + emotes + necromanceranne: + - balance: Longfall modules no logner stun you when they activate. + - balance: Falling from a height greater than one z-level while using the longfall + module will still stagger you. +2024-04-26: + Ben10Omintrix: + - bugfix: all bots have their normal accesses restored + Bisar: + - bugfix: AI controlled monkeys are no longer catatonic, and they have primal eyes + again when turned into humans. + - spellcheck: Noticable organs now have more modular grammar, and their current + grammar is fixed. + - refactor: Refactored the code for displaying the messages for noticable organs. + - config: Added a documented define of all our pronouns + KingkumaArt: + - bugfix: The rebar crossbows now properly loosen their bowstring upon firing. + LT3: + - balance: ChemMaster can again print a maximum of 50 pills/patches per run + - balance: Higher tier servos increase ChemMaster printing speed + Singul0: + - bugfix: fixed cyborg bonesetter not working for compound fractures + - bugfix: butchering not disabling in cyborg omnitool + - bugfix: fixes a bug where if you select the omnitool it would be stuck in surgery + initiator mode + - bugfix: cautery in off hand for cyborg omnitools not working + jlsnow301: + - bugfix: Restored silicon alt-clicking capability + necromanceranne: + - bugfix: The plasma flower modsuit core now actually contains a reasonable quantity + of power. +2024-04-27: + Maurukas: + - bugfix: Removed a power loop on icebox + - bugfix: Disconnected aux power smes from icebox grid at roundstart + - bugfix: Removed some power cables connecting Deltastation's aux power + - bugfix: Fixed tramstation's gravity generator SMES, now functions and charged + at roundstart. + - bugfix: NorthStar's gravity generator SMES is now properly charged at roundstart + ZephyrTFA: + - admin: The return of IPIntel + grungussuss: + - bugfix: fixed being able to install multiple of the same upgrade to medical cyborgs +2024-04-28: + Ben10Omintrix: + - bugfix: fixes mobs getting stuck trying to reach something unreachable + EnterTheJake: + - bugfix: Spraycan no longer spams your chat when you mouse over it. + Melbert: + - bugfix: Midround malf can roll again + Rhials: + - bugfix: Overwatch Intelligence Agents no longer get their own uplinks, leading + to a self-replicating grey goo scenario. + jlsnow301: + - bugfix: Fixes clipping in the ESC menu between buttons and long station names. +2024-04-29: + 13spacemen: + - bugfix: All alert polls ignore option works + - code_imp: Unarmed attacks (punches, etc.) now support multiple attack verbs instead + of only one + EnterTheJake: + - image: The Infiltrator Suit has received a new model, sleeker than ever! + FlufflesTheDog: + - bugfix: minebot shields are now actually orderable + - bugfix: vinegar may once again be crafted with wine, water, and sugar + JohnFulpWillard: + - bugfix: Examining someone with Med/Sec HUDs will no longer filter the message + under Radio. + - bugfix: pAI requests should no longer randomly permanently break in a round. + Melbert: + - bugfix: Plasma cutters work again + Metekillot: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Mech domination now properly integrates with shunting. - bugfix: Combat upgraded AIs no longer get two buggy malf ability pickers if they also become malfunctioning - refactor: Refactored most of the functionality around malf AI shunting, mech control +<<<<<<< HEAD - bugfix: The start-of-the-round tips will no longer feature virologists, but will, however, start featuring heretics and coroners. - admin: Possess Object is now back in the right-click context menu. @@ -549,3 +1407,28 @@ - bugfix: pAI requests should no longer randomly permanently break in a round. scabs3: - rscadd: Added new lines and responses to the 'dark and brooding lizard plushie' +======= + Rhials: + - admin: Lazy loading map templates now gives you the option to not ghost/teleport + to the loaded area upon completion. + Sadboysuss: + - admin: spy can now be rolebanned + VexingRaven: + - bugfix: The debug box no longer spills its contents everywhere + improvedname: + - qol: Arrivals shuttle is now more player friendly + san7890: + - admin: Possess Object is now back in the right-click context menu. +2024-04-30: + Jacquerel: + - balance: Netguardian Prime can see in the dark. + - image: You can see Netguardian Prime in the dark. + SyncIt21: + - bugfix: Eigenstasium exposed & Anomaly station trait affected closets work again. + Eigenstasium closets are tainted blue + YesterdaysPromise: + - bugfix: The start-of-the-round tips will no longer feature virologists, but will, + however, start featuring heretics and coroners. + intercepti0n: + - rscadd: Added a short scene when getting an Ordeal of Sisyphus achievement. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml index c0e83654669..1f3751fa983 100644 --- a/html/changelogs/archive/2024-05.yml +++ b/html/changelogs/archive/2024-05.yml @@ -1,4 +1,5 @@ 2024-05-01: +<<<<<<< HEAD Erol509: - rscadd: Added back TEG to techwebs and engineering protolathe - image: Changed TEG sprites from YogStation. Credits to original author. @@ -81,22 +82,99 @@ Majkl-J: - qol: Health analyzers now include basic information on treatment of husked bodies. - bugfix: Synth computers no longer force open the messenger app +======= + 13spacemen: + - bugfix: Ethereal unarmed attacks "sear" instead of "singe", which was buggy + Constellado: + - qol: Made birdshot atmos easier to use. + - bugfix: The Birdshot engineering department is no longer using a second hand broken + microwave. + Fikou: + - rscadd: you can use a photo with blueprints on it to read wires + Flleeppyy, Absolucy: + - sound: Added unique announcement jingles to each heretic path's ascension, replacing + the old "space-time anomalies detected" announcement. + JohnFulpWillard: + - bugfix: Genetic sequence scanners now show the sequence to mutated genes from + scanned individuals. + - bugfix: QM is now excluded from getting tasked with stealing telescopic batons + and the captain's spare ID, like all other command personnel are. + - qol: The Human AI's advanced security console can be repackaged with a screwdriver + if you wish to move it. + LT3: + - qol: The various RCD upgrade disks no longer look identical + Maurukas: + - bugfix: On examine PDAs will now inform players that the power cell can be removed + for recharging or replacement, and how to do so. + SyncIt21: + - bugfix: computers don't deconstruct themselves twice so machines like slotmachine + don't spawn excess chips upon deconstruction + improvedname: + - bugfix: Fixes tramstation gravgen wiring + - bugfix: Fixes tramstation turbine wiring + - bugfix: Fixes northstar cmo button name + jlsnow301: + - bugfix: Fixes a bluescreen in the deathmatch lobby UI. + larentoun: + - bugfix: Infinite-range laser pointer (for "AI" Big Brother) now has a correct + diode. If you accidentaly remove it then you can put it back! + mc-oofert: + - rscadd: trainship hijack deathmatch map + necromanceranne: + - bugfix: If you are a freerunner, you don't end up faceplanting despite having + catlike grace. +2024-05-02: + Echriser: + - qol: conveyor switches now have direction-specific input signals + Fluffles: + - qol: you can pick up wheelchairs while on the ground + - qol: you can place wheelchairs a tile away from you, like roller beds + JohnFulpWillard: + - bugfix: Monkey changelings that are disguised as someone can now take off their + flesh clothes. + - bugfix: You can now re-construct pod doors that had deconstruction started. + - qol: You can now make pod door assemblies using plasteel in-hand. + - bugfix: Monkeys can no longer be knocked over by walking into a windoor on combat + mode while they're behind it. + - admin: Debug uplinks now shows all categories and won't lock upon buying items + like his grace and the syndicate balloon. + - bugfix: Constantly fleeing in Battle Arcade will no longer give you a very large + amount of decimals due to halving your gold every time. + - bugfix: AIs can now track Silicon as long as their built-in camera is online. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - admin: Custom Single and Custom Multi votes are now combined into one vote - admin: Admins can now end votes instantly, rather than cancelling them - admin: Admins can now reset the vote cooldown - bugfix: Vote cooldown actually applies now +<<<<<<< HEAD SkyratBot: - qol: You can now quickly stamp papers with a right click - image: added directional sprites for radiation shutters +======= + Pickle-Coding: + - bugfix: Fixes hypercharged slime core cells and circuit guns having 1,000 times + less energy than intended. + Watermelon914: + - bugfix: Fixed the ipintel subsystem not working. + kawoppi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the civilian bounty control terminal displays the payout of new bounty options again - qol: the civilian bounty control terminal displays the description of new bounty options +<<<<<<< HEAD +======= + nikothedude: + - bugfix: Jousting no longer bypasses pacifism +2024-05-03: + Echriser: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: conveyors now use left and right click controls - qol: add screentips for conveyor switches - rscdel: removes circuit conveyor circuit default trigger behavior in favor in favor of the three state triggers +<<<<<<< HEAD - bugfix: fix runtime when no events were drafted to be picked from - config: make events frequency configurable - rscadd: increased the size of the pool that Machine Blessing draws from @@ -138,10 +216,55 @@ - bugfix: Blood Brothers should spawn knowing what their objectives are. - bugfix: Teams of 3 Blood Brothers will once more have an additional objective. - bugfix: Fixed lua scripts breaking when turfs with registered signals get deleted. +======= + Gaxeer: + - bugfix: fix runtime when no events were drafted to be picked from + - config: make events frequency configurable + StrangeWeirdKitten: + - qol: You can now quickly stamp papers with a right click + Zenog400: + - rscadd: increased the size of the pool that Machine Blessing draws from + - balance: weighted some of the implants that Machine Blessing can give + mc-oofert: + - image: added directional sprites for radiation shutters +2024-05-04: + Ben10Omintrix: + - bugfix: mobs in the same faction will no longer be at odds against one another + - bugfix: mobs can now perform behaviors alongside searching for targets + - bugfix: mobs will no longer be starting and stopping when chasing targets + Ghommie: + - rscadd: Adds an Icebox-specific station trait that brightens outdoors areas on + the surface level. + Ikalpo: + - bugfix: Stage 2 singularities should no longer escape containment + Melbert: + - bugfix: New machine god blessings now actually works probably + Profakos: + - balance: Bitrunners can now earn Bepis disks, once per medium domain or above, + if they scored at least an A. + - rscdel: Bitrunners can not buy Bepis disks from their vendors. + Ryll/Shaps: + - bugfix: Pacifists can no longer endlessly spam the backblast functionality of + loaded rocket launchers that they cannot actually fire + Watermelon914: + - bugfix: Fixed lua scripts breaking when turfs with registered signals get deleted. + Xander3359: + - bugfix: You can no longer bypass construction restrictions via the crafting menu + cnleth: + - bugfix: Fire ant colonies created by burning regular ants will now contain fire + ants as their reagent + jlsnow301: + - bugfix: Candy corn is once again available to detective fedoras + mogeoko: + - bugfix: Ventcrawling mobs can change Z-level using multiz-decks again. +2024-05-05: + Isratosh: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: If kidnapped and ransomed by pirates, you will now properly return to the station automatically after 6 minutes. - bugfix: You can no longer be kidnapped and held for ransom by cargo technicians posing as pirates. +<<<<<<< HEAD Useroth: - bugfix: Fixes transfer votes - refactor: Removes modular piece of code related to electrocution that is no longer @@ -168,6 +291,46 @@ BurgerBB: - qol: The inspector's Fedora now uses regex. When saying commands, it is much more generous on picking up trigger word. +======= + Jacquerel: + - bugfix: Blood Brothers should spawn knowing what their objectives are. + - bugfix: Teams of 3 Blood Brothers will once more have an additional objective. + Melbert: + - refactor: Random Name Generation has been refactored. Report any instances of + people having weird (or "Unknown") names. + - qol: Felinids, Slimepeople, Podpeople, and some other species without defined + namelists now automatically generate names based on their primary language(s). + - qol: More non-human names can be generated in codewords (and other misc. areas) + than just lizard names. + larentoun: + - bugfix: Materials are now correctly applied to crafted items (chairs, toilets, + etc) +2024-05-06: + improvedname: + - bugfix: fixes traditional equipment crate name + paganiy: + - qol: Admin modsuit now has a radiation protect module +2024-05-07: + CandleJaxx: + - rscadd: '''puppy'' ''kitten'' and ''spider'' pai skins' +2024-05-08: + '@MrEmre12, @Majkl-J': + - rscadd: Fishing pool introduced to metastation garden + - refactor: All water tiles now handle fishing through a unified fishing_datum variable + BurgerBB: + - qol: The inspector's Fedora now uses regex. When saying commands, it is much more + generous on picking up trigger word. + Derpguy3: + - bugfix: A meter attached to distribution pipes in Birdshot's atmospherics has + been moved to the matching pipe layer. + Fikou: + - rscdel: You can no longer use another station's blueprint photo to look at wires + or do the traitor objective with. + Iamgoofball: + - balance: Spies can now use other spies' uplinks. + Melbert: + - balance: To see wires in photos of blueprints, you first must squint at the photo. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ReturnToZender (hitting delete on a power cable): - rscdel: Single loose power cable in icebox maintenance Rhials: @@ -178,6 +341,7 @@ ShizCalev: - bugfix: Inducers no longer break completely after trying to charge a PDA with them. +<<<<<<< HEAD SkyratBot: - bugfix: Lootpanel now requires 515.1635 to generate most icons. TG support for 514 ended May 1. Update your client to fix the icons. @@ -205,12 +369,57 @@ 2024-05-10: GoldenAlpharex: - bugfix: Removed another rogue cable from underneath a disconnected SMES. +======= + delingar: + - rscadd: RD's skillchip adds cyborg wires knowledge + jlsnow301: + - bugfix: Lootpanel now requires 515.1635 to generate most icons. TG support for + 514 ended May 1. Update your client to fix the icons. + mc-oofert: + - qol: temporarily soulless (deathmatch, etc) bodies dont appear as soulless on + medhud +2024-05-09: + 00-Steven: + - bugfix: Pride pins can be reskinned again with alt-click. + AMyriad: + - bugfix: Removed stray pixels appearing on certain parts of railing + Bisar: + - balance: Knockdown effects will know consistently disarm, instead of failing to + disarm if you're already lying down. + Ghommie: + - bugfix: Added the missing bulwark MOD module and the jawed fishing hook to the + black market. + GoldenAlpharex: + - bugfix: Removed another rogue cable from underneath a disconnected SMES. + Jane: + - qol: The Coroner's Ritual Knife can now sit upon Med Belts! + Melbert: + - bugfix: DNA infusing tiers works again + - bugfix: Cult can build again + - qol: There is now a slight animation to entering a portal or teleporter. + - qol: Spies may spawn in less numbers, but rarely may also spawn in more numbers. + XElectricX: + - qol: Mech drills can auto-mine by walking into rock. + jlsnow301: + - bugfix: Silicons can set the teleporter destinations again. + - bugfix: The quick equip 'E' hotkey shouldn't warn if one of your bags is full + anymore +2024-05-10: + 00-Steven: + - qol: Added alt-click usage context to toggle_icon component + - bugfix: The stomach pump surgery actually works again. + - spellcheck: '"brusing" to "bruising" in the message you get when failing the stomach + pump surgery.' + Echriser: + - bugfix: conveyor switches work for cyborgs again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex for the code, Thlumyn for the sprites: - bugfix: Fixed smoothing turfs displaying some incorrect damaged overlays because of a non-smoothing damage overlay of different dimensions than the smoothing sprite used as the base. Less black void, let's go! - image: Added smooth broken/burnt overlays for grass, meaning that it's going to look a lot less broken when the grass tile is at the edge of a smoothing group. +<<<<<<< HEAD Jane: - qol: The Coroner's Ritual Knife can now sit upon Med Belts! Melbert: @@ -240,6 +449,9 @@ - bugfix: Removed stray pixels appearing on certain parts of railing - bugfix: Supermatter shards now have screentips with a wrench in hand - qol: Added alt-click usage context to toggle_icon component +======= + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Being sacrified by a Heretic no longer gives you an incurable phobia. - rscadd: Being sacrificed by a Heretic will drop 2-4 of your organs on the ground and replace them with "corrupt organs" with negative effects which can be suppressed @@ -247,6 +459,7 @@ - rscadd: Players who have been sacrificed by Heretics will experience additional and rapidly lethal consequences for attempting to fight someone who previously sacrificed them, as long as that person is wearing a focus. +<<<<<<< HEAD - bugfix: Pride pins can be reskinned again with alt-click. - bugfix: moths with functional/flight potion wings get an animation when they *flap once again, and it makes a sound @@ -271,6 +484,46 @@ Erol509: - rscadd: Leashes have been stocked in a very particular vendor in the dormitories. 2024-05-15: +======= + - sound: Lasers adjust their pitch as they run out of charge, rather than frequency + Melbert: + - qol: Morgue trays (and the contents inside) are now animated on open and close + MrStonedOne & Lilah Novi: + - rscadd: Say commands typed in the command bar now trigger typing indicators + Pickle-Coding: + - qol: The labor camp shuttle properly sets people to parole after they complete + their work. + - qol: The labor camp shuttle specifies which person returned to the station. + ShizCalev: + - bugfix: Cursed Items wizard event actually works again. + TiviPlus: + - bugfix: fixed clients being seen as stuck doing tutorials in some cases when changing + mobs + jlsnow301: + - bugfix: Supermatter shards now have screentips with a wrench in hand + malton33: + - bugfix: space heaters now display the correct mode when the maintenance panel + is closed + paganiy: + - bugfix: The shuttle will no longer delete you while you are in jaunt + vinylspiders: + - bugfix: moths with functional/flight potion wings get an animation when they *flap + once again, and it makes a sound +2024-05-11: + carlarctg: + - rscadd: Chance to become crab on nonlethal DNA meltdown + norsvenska: + - bugfix: The Coroner and Bitrunner can now be selected as a target for kidnapping + and heirloom destruction objectives. + - bugfix: The Chief Engineer is now a valid target for heirloom destruction objectives. +2024-05-12: + Higgin: + - bugfix: Spies no longer get the 'nothing' / 'free objective' due to trying to + make Protect objectives without targets. + Xander3359: + - bugfix: Ale now has a drinking_glass style +2024-05-13: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - qol: Most of the alternate click modes (right click, control clicking, shift clicking, etc) have been enabled in the alt-click item menu. @@ -279,23 +532,33 @@ Melbert: - rscadd: Cigarette smoke is now more smokey. - rscadd: Taking a cigarette out of your mouth will let out a big puff of smoke. +<<<<<<< HEAD - qol: Some alerts, such as Fleshmend's, show their remaining duration on their icon. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PapaMichael: - bugfix: Rat Kings can no longer trap mice inside of pipes by creating them while ventcrawling. - balance: Rat Kings can no longer create grime and miasma while ventcrawling. Rhials: - rscadd: Bitrunners now have their own job figurine. Cool! +<<<<<<< HEAD Shayoki, Wolf751: - image: The frontier gas masks now fit properly on your snouts. SkyratBot: - bugfix: Deleting someones brain kills them again - qol: Gives Health sensor assemblies a UI so its easier to use. +======= + nikothedude: + - spellcheck: Added a period to the end of the wendigo deathrattle + paganiy: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Now you can put a cigarette in your mouth just by hitting the pack of cigarettes on yourself. - bugfix: The cigarette pack no longer moves under the spaceman when they interacts with it with the RMB +<<<<<<< HEAD - bugfix: Accelerator laser gun no longer shoots sun size projectiles. - bugfix: Spies no longer get the 'nothing' / 'free objective' due to trying to make Protect objectives without targets. @@ -322,6 +585,49 @@ - bugfix: You can hit the smoke machine with tools & beakers when in combat mode - bugfix: no abstract & hologram item interactions allowed with smoke machine 2024-05-17: +======= +2024-05-14: + Jacquerel: + - rscadd: People who spend time improving their bodies are able to evaluate the + relative physical strength of those they examine as a kind of "power level". + - rscadd: Changeling transformation copies the target's athletics skill level. + Time-Green: + - bugfix: Deleting someones brain kills them again + jlsnow301: + - bugfix: Alt click will draw the captain's sabre again + paganiy: + - bugfix: Accelerator laser gun no longer shoots sun size projectiles. + starrm4nn: + - qol: Gives Health sensor assemblies a UI so its easier to use. +2024-05-15: + DaCoolBoss: + - bugfix: The random arcade machines in the 'Interdyne Spinward Research Base's + now function. + Melbert: + - qol: Some alerts, such as Fleshmend's, show their remaining duration on their + icon. + Seven: + - bugfix: Fixed a runtime when using the cultist blood rites on yourself. + Webcomicartist: + - bugfix: The lavaland mining shuttle doors no longer trap cargo security on lavaland + due to access weirdness. + iwishforducks: + - bugfix: Fixes random decal in space on Tramstation + necromanceranne: + - bugfix: Fixes an accidental reversion to greyscale plate armor. +2024-05-16: + Ben10Omintrix: + - rscadd: parrots will now try to immitate the speaker's voice + DaxDupont: + - bugfix: Fixes error when running docker compose on apt upgrade + Derpguy3: + - qol: Additional box types can be crafted from cardboard. Happy organizing. + - spellcheck: A typo in box crafting for prescription glasses has been fixed. + Hatterhat: + - bugfix: The SC/FISHER can now shoot floor lights. + Jacquerel: + - admin: Admins can now more easily modify whether a Blood Brother can convert someone +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jane: - qol: Shovels, Serrated Bone Shovels, and Entrenching Tools can now be hung upon Miner and Coroner Winter Coats, as well as the Coroner's Labcoat! @@ -331,12 +637,54 @@ the item rather than take it. - qol: Examine blocks for screen alert examining. - qol: Screentips for offer alerts. +<<<<<<< HEAD Seven: - bugfix: Fixed a runtime when using the cultist blood rites on yourself. ShizCalev: - bugfix: Spam clicking a modkit with a kinetic accelerator can no longer lead to ghosted versions of the modkits appearing in the modkit list, breaking the gun. SkyratBot: +======= + PKPenguin321: + - rscadd: New funny wizard staff/wand that shrinks stuff. + - rscadd: Being shrunken now leaves you vulnerable to being crushed to death. + Pickle-Coding: + - balance: There are reports of malfunctioning guns being confiscated. + Seven: + - bugfix: Destroyed solar panels no longer drop their overlays + Shadow-Quill: + - qol: The "Confirm Order" button on Cargo consoles is now active when the cargo + shuttle is at Central Command instead of at the station. + ShizCalev: + - bugfix: Spam clicking a modkit with a kinetic accelerator can no longer lead to + ghosted versions of the modkits appearing in the modkit list, breaking the gun. + SyncIt21: + - bugfix: cell chargers, mechbay port chargers & recharge stations heat lost is + directly proportional to energy drawn from the grid to charge their respective + cells + - bugfix: cyborgs should charge more frequently & to their max capacity at recharge + stations + - qol: adds examines & screentips for tool & container actions on the smoke machine + - qol: smoke machine no longer requires a power cell for construction + - code_imp: autodocs & removes vars for some machine, Updated attack chain to latest + standards for smoke machine + - bugfix: You no longer hit the smoke machine with the beaker + - bugfix: You can hit the smoke machine with tools & beakers when in combat mode + - bugfix: no abstract & hologram item interactions allowed with smoke machine + Time-Green: + - bugfix: Space Ninja and other space spawned antags get a 1 minute radiation shield + in the radioactive nebula + grungussuss and Virgilcore: + - sound: portals now have a unique sound to them + jlsnow301: + - bugfix: Bitrunning antagonists no longer gib on teleport + - bugfix: Cyber tac now have a visible name / ID + - bugfix: 'Renamed the bitrunning malfunction event to just "Malfunction: x"' + - bugfix: You can adjust your uniform while lying down again + necromanceranne: + - bugfix: Fixes the knife offset for pipeguns + tmyqlfpir: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Add tooltips to circuit editor buttons - qol: Add grid alignment mode to circuit editor - rscadd: Added new compare health state component @@ -345,6 +693,7 @@ - qol: Added activity toggle to voice activator component - qol: Added quiet mode to speech component - qol: NTNet send component will not use power/trigger if NTNet is offline +<<<<<<< HEAD - bugfix: The SC/FISHER can now shoot floor lights. - rscadd: parrots will now try to immitate the speaker's voice - bugfix: Fixes error when running docker compose on apt upgrade @@ -391,6 +740,10 @@ cyborg crowbar from being pointy. - bugfix: Fixes cyborg omnitools not using the correct wound bonus and armour penetration values. +======= +2024-05-17: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Emotion masks no longer use a janky workaround for infinite reskinning. - bugfix: Mech pilot suit shows reskinning usage context correctly. - bugfix: Accessories show "wear above/below suit" usage context appropriately. @@ -399,9 +752,13 @@ rather than whether it's in storage or not. - rscdel: Removed redundant reskinning usage context code from medical sprays, now shows reskinning usage context like other reskinnables. +<<<<<<< HEAD - bugfix: Fixed the spess knife's cutter tool icon being invisible. - code_imp: Most instances of parse_zone now refer to the limb's plaintext_zone var +======= + EnterTheJake: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Rust Heretics rusting is now consistent and tied to knowledge progression. - balance: Walking on rust applies disgust and chem purge to non-heretics and brute damage to silicons. @@ -420,6 +777,38 @@ - balance: Resist cold trait now gives immunity to freeze effects, and has now been added to Rustbringer's oath along with slowdown immunity. - bugfix: Fixed glowing runes being invisible. +<<<<<<< HEAD +======= + JohnFulpWillard: + - bugfix: Snails no longer move at normal speed while resting. + - bugfix: Snails can no longer get insane speed from getting their legs replaced. + - bugfix: Humans don't become immensely slow when getting a Snail leg. + - admin: lube walking element is now much easier to mess with to fit however you + want to use it for. + Melbert: + - bugfix: After 3 years, radiation now causes you to go bald and mutate again + Pickle-Coding: + - bugfix: Fixes engineering cyborg screwdriver not being pointy. Fixes engineering + cyborg crowbar from being pointy. + - bugfix: Fixes cyborg omnitools not using the correct wound bonus and armour penetration + values. + Rengan: + - bugfix: Officers sabre and grilles now conducts electricity as it should. + Seven: + - bugfix: Wings no longer work in space if you activated them beforehand. + ShizCalev: + - bugfix: Atoms on the border of a tile will now only trigger landmines if they + ACTUALLY pass over said mine. + Thunder12345: + - bugfix: Pyre chaplains can no longer generate infinite favour for free by buying + and selling candles. Candles now offer for 40 favour, down from 50. + Xander3359: + - rscdel: Removes the sleeper protocol traitor objective + - balance: RND server/Telecomms sabotage can now show up even later in the round + improvedname: + - bugfix: fixes metastation science scrubber pipeline + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an issue preventing space ninjas from having a hud icon - rscadd: 'ORBIT UI CHANGES:' - rscadd: AFK players are greyed out. @@ -430,6 +819,7 @@ - rscadd: Round ending "critical" items will be listed at the top. - rscadd: Click the settings button to expand for more info - rscadd: Your current orbit target is highlighted. +<<<<<<< HEAD - bugfix: Pyre chaplains can no longer generate infinite favour for free by buying and selling candles. Candles now offer for 40 favour, down from 50. - bugfix: fixes metastation science scrubber pipeline @@ -454,11 +844,38 @@ - bugfix: Fixed a scenario in which a turret would have its covers closed while still firing. SkyratBot: +======= + - bugfix: Simplebot UI won't display '0' anymore when locked + mc-oofert: + - rscadd: mobile defibrillator mount + nikothedude: + - code_imp: Most instances of parse_zone now refer to the limb's plaintext_zone + var + siliconOpossum: + - qol: Neckties are now worn underneath suit items and accessories, they can still + be optionally worn over them in case you want the "business space suit" look + - bugfix: Fixed a bug where accessories wouldn't correctly apply over suits if you + equipped the jumpsuit they're attached to after the suit + starrm4nn: + - spellcheck: Fixes some typos in the goodies section and makes it look a bit more + consistent. + - bugfix: Fixed the spess knife's cutter tool icon being invisible. +2024-05-18: + Absolucy: + - bugfix: You will now be ejected from Space Phase if you lose your focus or lose + consciousness somehow during the jaunt. + DaCoolBoss: + - bugfix: adds missing prefix to name of The Lizard's Gas Lava land ruin. + Echriser: + - bugfix: Fixes a bunch of hearts turning into errors when you try to eat them + Hatterhat: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Ansem, suppressor, and SC/FISHER included in the Fisher gimmick bundle now come together as one whole gun, the Ansem/SC. It's integrally suppressed, and fires the disruptor on right-click. - bugfix: The SC/FISHER disrupts APCs for an appropriate amount of time, not ten times the intended disruption length. +<<<<<<< HEAD - spellcheck: Fixes some typos in the goodies section and makes it look a bit more consistent. - rscdel: Due to a need for company restructuring, virologists have been laid off @@ -495,18 +912,76 @@ sheets, spacemenart, ben10omintrix, goofball, infrared baron, aofie: - rscadd: adds lavaland raptors and the raptor ranch 2024-05-21: +======= + Jacquerel: + - bugfix: Mob spawners (such as lavaland tendrils) won't spawn more mobs than they + are supposed to, faster than they should. + Melbert: + - rscadd: Adds Minecarts, (possibly admin only depending on when this PR is merged + in relation to the Icebox Bar PR) + - rscadd: 'Icebox: The bar returns to its home.' + - rscadd: 'Icebox: Standardizes some decal styles in the main hallway.' + - bugfix: 'Icebox: The lower brig''s missing air alarm has been found.' + Sadboysuss: + - bugfix: fixed malf AI being able to overload shuttle consoles and the gateway + control console + ShizCalev: + - bugfix: Malf AI can now override/overload closed turrets. + - bugfix: Fixed a scenario in which a turret would have its covers closed while + still firing. + grungussuss: + - qol: suit sensors can now be maxed by ctrl clicking your jumpsuit + improvedname: + - balance: Nukies ordnance now include more gasses and stock parts + sheets, spacemenart, ben10omintrix, goofball, infrared baron, aofie: + - rscadd: adds lavaland raptors and the raptor ranch +2024-05-21: + ArcaneMusic: + - balance: Ore vents, if blocked off from all four sides while being defended, now + cause a mild gas explosion, resulting in a mild dissuasive explosion. + - bugfix: NODE drones spawned from ore vent defense have lower maximum health. + Ben10Omintrix: + - bugfix: ' fixes being able to ride all mobs through space' + - bugfix: playful raptors now correctly play with owners + EnterTheJake: + - spellcheck: Pulse of entropy description now displays the correct reagents for + the ritual + Fikou: + - bugfix: carps now properly stop floating when you kill them + - refactor: modsuits have been refactored if you see bugs report them + - bugfix: admin cargo tech modsuit outfit now works correctly + Jacquerel: + - balance: Certain unhealthy organs can be detected via the advanced health scanner + - balance: If you can't absorb a species' DNA as a changeling, you also can't use + transform sting to turn someone into that species. + - admin: Various bad things that can happen as a result of Legion organs are now + logged +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Custom emotes now default to both visible and audible rather than just audible - qol: Invoking the custom emote verb now explains how to set your custom emote to visible or audible +<<<<<<< HEAD - rscadd: 'Icebox: The bar returns to its home.' - rscadd: 'Icebox: Standardizes some decal styles in the main hallway.' - bugfix: 'Icebox: The lower brig''s missing air alarm has been found.' ShizCalev: +======= + Pickle-Coding: + - balance: Cargo ripley's cell starts fully charged. + Profakos: + - bugfix: Slimes will no longer consider feeding upon slime people + Sadboysuss: + - bugfix: HoS on birdshot now has a pet like on all other maps + - bugfix: jumpsuit sensors quick maxing now works + ShizCalev: + - bugfix: Icecream vats will no longer eat cyborg beakers. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Balloons are no longer invisible when held. - bugfix: Malf AI can now properly interact with APCs under their control - bugfix: Malf AI & their slaved cyborgs won't be told that access is denied when trying to right-click lock/unlock APCs. +<<<<<<< HEAD - bugfix: Icecream vats will no longer eat cyborg beakers. SkyratBot: - bugfix: jumpsuit sensors quick maxing now works @@ -533,11 +1008,48 @@ grungussuss and Virgilcore: - sound: added sounds for the gateway 2024-05-23: +======= + Striders13: + - admin: sentience balloon can now assign antag to affected mobs + Watermelon914: + - bugfix: Fixed spies having a slightly increased chance of getting a different + cost model for the elite syndicate hardsuit + Xander3359: + - bugfix: The RD remote works on the AI upload door now + carlarctg: + - balance: Halved Psyker echolocation cooldown. This will hopefully make it actually + usable. + dopamiin0: + - rscadd: Nanotrasen has made strides in their frontier sector food networks, increasing + the selection of produce available to chefs. + grungussuss and Virgilcore: + - sound: added sounds for the gateway + iwishforducks: + - image: Medical doctors and CMOs now start with their jumpsuits rather than surgery + scrubs and caps. + kawoppi: + - bugfix: 'underage drinkers beware: the Booze-O-Mat and ShadyCigs Deluxe check + your age again' + necromanceranne: + - bugfix: Miners can actually access and fix their engineering issues on the lavaland + base via the engineering section of the base. AGAIN. + - bugfix: The gulag SMES unit is no longer needlessly draining the entire power + grid of the main mining base. AGAIN. + nikothedude: + - spellcheck: Improved the grammar/spelling of a few raptor descriptions + starrm4nn: + - balance: Buffs Antihol's purge rate to 8u/tick when pure (6u/tick minimum). + - balance: Multiver stops purging when Anacea is present in the bloodstream. + tmyqlfpir: + - bugfix: '[Metastation] Service hallway door being bypassed by lying down' +2024-05-22: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - balance: A wound being inflicted doesn't get broadcasted to everyone in view until a higher severity now. - sound: Wound sounds drop off more quickly, and no longer travel through walls. This has no effect on attack sounds. +<<<<<<< HEAD SkyratBot: - rscadd: Added smoke kit (5 grenades) with four grenades to uplink by 2 TC - spellcheck: Removes a shit clown name and adds a better clown name instead @@ -574,12 +1086,39 @@ base via the engineering section of the base. AGAIN. - bugfix: The gulag SMES unit is no longer needlessly draining the entire power grid of the main mining base. AGAIN. +======= + Fikou: + - spellcheck: the nuke op reinforcement beacon no longer talks about clones + Horatio22: + - spellcheck: Corrects spelling of "amulette" to "amulet" + - spellcheck: Correctly spells "received." + Iamgoofball: + - spellcheck: Removes a shit clown name and adds a better clown name instead + SyncIt21: + - bugfix: Crafting menu loads long lists faster + - bugfix: Monkey power reactions are instant and won't occur when exact reagent + requirements (50u power & 1u water) or above aren't met. Stops players from + cheesing monkeys from plumbing factories + Watermelon914: + - qol: New players will no longer start with ghost ears, ghost sight and ghost whispers + on by default. + Wayland-Smithy: + - qol: Crew Monitor UI now scrolls properly even after clicking the inner list. + Xander3359: + - bugfix: fixed a weird door in icebox bridge + hack-wrench: + - rscadd: Added smoke kit (5 grenades) with four grenades to uplink by 2 TC + improvedname: + - rscdel: Removes night vision quirk + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The Research Director is now actually strong. - rscadd: Fitness bros will determine the Research Director to be stronger than they actually are, without even working out. How does he do it? - balance: Suplexing a rod grants a large burst of athletics experience. - rscadd: The more sentient casualties of the rod, the more experience suplexing that rod grants. Absorb the souls of the weak and feeble. +<<<<<<< HEAD 2024-05-24: Melbert: - bugfix: Height now applies less weird to certain worn items, bare-handed bloody @@ -687,13 +1226,129 @@ Man Trap - balance: Mobs significantly larger than humans, such as Space Dragons and Xenomorph Queens, breakout of being arrested by a mech significantly faster. +======= + nikothedude: + - rscadd: Adds a new deathmatch modifier that enables quirks + - bugfix: The deathmatch modifier menu works now + norsvenska: + - spellcheck: The message displayed when adjusting a mask no longer incorrectly + states the way in which the mask has moved. +2024-05-23: + Jacquerel: + - balance: The melee attacks from small mobs spawned by Legions can now be dodged. + - balance: Legions spawn their mobs less often. + - bugfix: Legions cannot spawn mobs while inside pipes or closets. + Muffindrake: + - balance: reduced claymore/weak force from 30 to 24 and armor penetration from + 15 to 10 + hack-wrench: + - rscadd: Added RUN_SERVER.bat for maintainer issues + paganiy: + - balance: Auto-aim in combat mode at mobs on the floor is disabled after the projectile + passes 10 tiles. +2024-05-24: + 00-Steven: + - bugfix: Smoker quirk users can select a favourite brand again. + Ben10Omintrix: + - rscadd: adds a new fish to lava and plasma rivers, the lava loop + DATA-xPUNGED: + - bugfix: The Lance Crew Evacuation System now moves in the right direction in Hyperspace. + EEASAS: + - rscadd: Remapped NorthStar's medbay a little bit + Rhials: + - spellcheck: Fixes a typo with latejoin AIs + by INFRARED_BARON: + - image: 'Changes icons of: Gygax, d-gygax, durand, ripley variants, firefighter + statue, phazon & odysseus. Adds new icons for polar hide item.' +2024-05-25: + 00-Steven: + - bugfix: Airlock electronics created by deconstructing roundstart airlocks inherit + their cycling id properly. + - spellcheck: Examining a renamed airlock assembly no longer says it has a paper + placard that is "labelled with written on it is". + - bugfix: Mixing the reagents for moon rocks, bLaSToFF ampoules, or SaturnX globs + in amounts less than the minimum for the recipe no longer eats the reagents + without doing anything. + - bugfix: Airlocks without access requirements no longer create airlock electronics + with a broken menu. + - spellcheck: When a vendor tells you something dropped onto the floor, the line + no longer starts with a broken character in the case of cigarette boxes. + Ben10Omintrix: + - balance: you can now polymorph into raptors + - balance: raptors overall have less health and no longer have armor against ranged + attacks + BramvanZijp: + - bugfix: Fixed an inconsistency regarding the interactions between the Piercing + Hypo Borg upgrade and Hacked Borg Hypos. + Derpguy3: + - spellcheck: A handful of grammar errors in some department signs has been fixed. + Jacquerel: + - bugfix: The destructive analyser once more hungers for multitools + PapaMichael: + - bugfix: Epinephrine will prevent metabolism of all allergic reagents (instead + of just one), if taken with multiple chemicals that one is allergic to. + TiviPlus: + - qol: Added a "Remind me later" button for tutorials + Twaticus: + - image: resprites egg (and more) + jlsnow301: + - bugfix: You can no longer open the loot panel at range as a blind person and cheese + item names + nikothedude: + - code_imp: New signals for atom storage remove and insert +2024-05-26: + Jacquerel: + - bugfix: Ghosts can more reliably become a harvester. + OverwatchVoice: + - qol: The "Proto-Nitrate BZ response" atmsopheric reaction now lists it's required + temperature. + Rhials: + - admin: Admins can now reroll random events into something else. + grungussuss: + - qol: tramstation upload now has an extra motion camera + - qol: tramstation SM setup now has an emergency cooling setup + - bugfix: changed layout of Northstar dining hall so customer bots can reach the + kitchen counter + paganiy: + - bugfix: You can shoot at items on the floor again + thegrb93: + - qol: Made borg inventory not shift around depending on equipped items + tmyqlfpir: + - bugfix: '[Ice Box Station] Dorm 1''s door no longer shares ID with dorm 2''s door' +2024-05-27: + Melbert: + - refactor: Refactored the way high toxins cause you to vomit. + Time-Green: + - rscdel: Removes sentient disease from the game + - rscdel: Miasma and gibs no longer generates random diseases + YesterdaysPromise: + - image: Cleaned a single stray pixel in a single frame of a bite telegraphing accidentaly + found while re-organizing the files. + by INFRARED_BARON: + - image: Changes the sprites of bone and ash drake armor (suit + helmet mob/objs) + necromanceranne: + - bugfix: Material floor tiles once again have their improved sprite. +2024-05-28: + Echriser: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: computers with no lights can now turn on using the on/off signal - bugfix: RGB lights on PDA circuits now use a signal - bugfix: the is_off signal now works on consoles - bugfix: printing text on a console component now uses a signal - refactor: each input signal in console circuits now have their own proc +<<<<<<< HEAD - refactor: Wendigos abilities have been changed into actions that can be added to any mob. +======= + EnterTheJake: + - bugfix: Rust debuffs now gets properly removed if you derust a tile you are standing + on. + Fikou: + - image: makes food hud burger icon have a sharp outline + Fluffles: + - bugfix: echolocation is less laggy. and works. + Higgin: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Viruses now self-heal much more effectively with good mood, sleep, food, and spaceacillin. - balance: Viruses now punish being hungry more. Stay fed! @@ -702,6 +1357,7 @@ - balance: Viruses now progress slightly slower. - balance: Viruses now only hide if their stealth stat is greater than their total computed severity. +<<<<<<< HEAD - rscadd: Added a screentip for hilbert's hotel door - bugfix: Fixed alt-click interaction with hilbert's hotel door - sound: Disposal chutes will no longer play a sound for each item when many items @@ -719,6 +1375,57 @@ Fluffles: - bugfix: holodecks no longer use increasing amounts of power the longer they're on +======= + Jacquerel: + - balance: Mobs significantly larger than humans, such as Space Dragons and Xenomorph + Queens, breakout of being arrested by a mech significantly faster. + - bugfix: Venus Man Traps cannot use vines to drag around machines or objects that + are bolted, welded, rooted to, or otherwise are part of the ground + - bugfix: Standing on a table will not prevent you from being grappled by a Venus + Man Trap + LemonInTheDark: + - refactor: I have reworked how parallax and its animations (space travel) work. + Please report any bugs lads! + Pickle-Coding: + - spellcheck: Fixes labour camp shuttle retrieval message starting with "/p". + Whoneedspacee: + - refactor: Wendigos abilities have been changed into actions that can be added + to any mob. + zxaber: + - qol: Traitor-created Infected AIs no longer hear the Malf AI antag sound alert. +2024-05-29: + Absolucy: + - bugfix: Fix a rare issue where a turf would remain permanently "elevated" if an + elevated object was initialized inside of a non-turf object. + Capsandi: + - sound: Disposal chutes will no longer play a sound for each item when many items + enter it at once + FearfulFurnishing: + - bugfix: fixed watcher wreath bounties being incompletable + FlufflesTheDog: + - bugfix: some missing modsuit (un)sealing messages should no longer be missing + - bugfix: MOD circuit adapter core deployed parts output should work again + - bugfix: Modsuit painter works again + Melbert: + - bugfix: The Bar on Icebox should receive less trash + Mey-Ha-Zah: + - image: Revamped Contractor Gear. You'll stand out more now, but hey, that's why + the syndicate contracts out work in the first place. + NewyearnewmeUwu: + - bugfix: Fixed a typo preventing creation of paystands using an ID. + Time-Green: + - rscdel: Wipes the last echo of sentient disease from existence + jlsnow301: + - rscadd: Added a screentip for hilbert's hotel door + - bugfix: Fixed alt-click interaction with hilbert's hotel door + - bugfix: Lootpanel no longer opens up when alt clicking objects on your person +2024-05-30: + Fluffles: + - bugfix: holodecks no longer use increasing amounts of power the longer they're + on + FlufflesTheDog: + - bugfix: viruses can no longer potentially have 8 symptoms +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - qol: Grown logs no longer spam your chat when cut into planks, instead displaying balloon alerts informing you of how many planks were made! @@ -726,10 +1433,25 @@ a balloon alert instead. - bugfix: Cotton and Durathread bundles no longer runtime when creating raw cotton/durathread from the created stack having been merged with an existing one. +<<<<<<< HEAD +======= + Gottfrei: + - bugfix: "\u0421ertain cooldowns should now be more accurate and will no longer\ + \ take an extra decisecond to clear." + Jacquerel: + - bugfix: When removing a corrupted organ from a patient, the patient will now be + checked for Holy Water or magic resistance, rather than the person performing + the surgery. + - balance: Bioscramblers pulse more often but with less range, plus you can see + them pulsing. + Pickle-Coding: + - admin: fix_air will also fix the turfs' temperatures. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Trees will no longer be growing through railings on forest planets - bugfix: Trees/plants will no longer grow through wood pathways on Icebox - bugfix: Railings will no longer appear ontop of rock walls on icebox +<<<<<<< HEAD SkyratBot: - bugfix: Fixed a typo preventing creation of paystands using an ID. - balance: Adds a threshold to oculine and increases metabolism, and reduces the @@ -755,9 +1477,43 @@ - bugfix: Fixed a missing access helper in Northstar Medbay. Assistants should no longer be trapped post-mending. - bugfix: Replaced an incorrect disposal variant in Northstar's Medbay. +======= + Vekter: + - bugfix: Fixed a missing access helper in Northstar Medbay. Assistants should no + longer be trapped post-mending. + - bugfix: Replaced an incorrect disposal variant in Northstar's Medbay. + - spellcheck: Fixed a grammar inconsistency in round tips. + Wayland-Smithy: + - spellcheck: Fixed a missing space typo in ion law logic. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 grungussus: - bugfix: fixed metal foam plating description and add more user friendly explanation on how to replace tiling. grungussuss: +<<<<<<< HEAD - balance: The DNA vault now requires less animal and plant DNA to be completed - admin: admin RCD now works much faster. +======= + - admin: admin RCD now works much faster. + improvedname: + - balance: Adds a threshold to oculine and increases metabolism, and reduces the + amount of oculine in a carrot + jlsnow301: + - bugfix: Slightly cleaned up PAI software downloads interface + - bugfix: Fixed screentips not appearing on clip on neckties + tmyqlfpir: + - bugfix: Drones stored inside objects will call the stored object's relaymove() + and return upon move +2024-05-31: + Capsandi: + - sound: Shuttle docking and undocking is quieter now + - sound: The volume of the gravity generator has been halved + Rhials: + - bugfix: You can no longer force NODE Drones off of ore vents. That includes using + fulton packs! + - bugfix: When a NODE Drone is forcibly separated from its vent, it will fly away. + grungussuss: + - balance: The DNA vault now requires less animal and plant DNA to be completed + oranges: + - spellcheck: Gripper gloves are now Enhanced Retrieval gloves +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index 7cb939f1e00..6fa56bb5ff2 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -1,3 +1,4 @@ +<<<<<<< HEAD 2024-06-02: '@xXPawnStarrXx, @Majkl-J': - bugfix: fixed an erroneous path to make the produce bin sprite appear. @@ -8,10 +9,29 @@ fulton packs! - bugfix: When a NODE Drone is forcibly separated from its vent, it will fly away. SkyratBot: +======= +2024-06-01: + JohnFulpWillard: + - rscadd: The Law office now has a pet goldfish. + - refactor: Gondolas (including gondola pods) are now basic mobs. + Time-Green: + - rscadd: 'Station-Wide Background Checks (station trait, rare): Disables crew antagonists, + but get a lot more non-crew antagonists' + - bugfix: Fixes railings being invisible + - bugfix: Snow walls dont spawn on railings anymore in icebox + carlarctg: + - balance: Reworks Adrenaline Glands into Repurposed Glands (Realingment). Lose + the use of your arms, but you can escape any situation! + tmyqlfpir: + - bugfix: '[Tramstation] Departures and under east tram distro/waste pipes now properly + connected' + tralezab: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: New fish, the anxious zipzap - rscadd: New syndicate fish, the monocloning jumpercable - rscadd: New aquarium, the bioelectricity generator - bugfix: Mixotrophic fish now properly lack food requirements +<<<<<<< HEAD - rscadd: The Law office now has a pet goldfish. - rscadd: 'Station-Wide Background Checks (station trait, rare): Disables crew antagonists, but get a lot more non-crew antagonists' @@ -25,10 +45,14 @@ - bugfix: When removing a corrupted organ from a patient, the patient will now be checked for Holy Water or magic resistance, rather than the person performing the surgery. +======= + zxaber: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Minebots purchased via mining points are no longer stuck in idle mode. Clicking on them will activate their AI. - spellcheck: Removed the examine text about feeding ore to minebots; this functionality was removed already. +<<<<<<< HEAD - bugfix: Fixes janitor borgs killing the machinery subsystem by charging light replacers 200k times a tick. oranges: @@ -38,6 +62,23 @@ xXPawnStarrXx: - bugfix: fixed an erroneous path 2024-06-03: +======= +2024-06-02: + 00-Steven: + - spellcheck: Photo descriptions containing living entities no longer have a pile + of unnecessary periods. .. Which they used to have between describing different + entities. .. Also removed that additional space they had too sometimes.. + - qol: Photo descriptions containing living entities have these sub-descriptions + split into newlines for ease of reading. + - bugfix: Imaginary friend brain trauma works again. + - bugfix: Imaginary friends can be heard by their hosts from more than a tile away + again. + Echriser: + - bugfix: you are now able to cancel the look up/down verbs from anywhere + Gaxeer: + - bugfix: ambush spider (should instantly agressive grab) and other giant spiders + can now agressively grab +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - qol: Fermenting (wooden) barrels can now be emptied when opened by right-clicking with an empty hand! @@ -45,13 +86,38 @@ - qol: Fermenting (wooden) barrels now have contextual helpers, to show what you need to do at a glance to interact with them. - code_imp: Documented a few of the fermenting barrel's variables. +<<<<<<< HEAD +======= + Higgin: + - bugfix: positive viruses are no longer hidden. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jane: - image: Central Command has cut funding to the Mining department, resulting in leather sleeves for the Shaft Miner Explorer Suit rather than the metal plates of before. +<<<<<<< HEAD LT3: - bugfix: Fixed bug where players could be invisibly attached to the tram forever Melbert: +======= + JohnFulpWillard: + - rscadd: You can now flush toilets. You can also put fish in the toilet. And flush + them. + - bugfix: Urinals can no longer be used to delete items. + - bugfix: Urinals no longer grant infinite urinal cakes. + LT3: + - bugfix: Fixed bug where players could be invisibly attached to the tram forever + Majkl-J: + - bugfix: Fixed some borg modules just being constantly eaten up by borgs even when + they shouldn't allow duplicates + - refactor: Borg module code now has better handling for adding/removing items, + and to prevent duplicate module usage (Unless one wishes to override the behaviour. + - bugfix: Fixes janitor borgs killing the machinery subsystem by charging light + replacers 200k times a tick. + Melbert: + - balance: Re-ups the cost of the new ling adrenal ability + - bugfix: Patches an exploit with new ling adrenal ability +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Wearing a mask can now prevent you from being spread airborne diseases. Prior, it only stopped you from spreading it yourself. - balance: Wearing a mask no longer 100% guarantees you don't spread viruses to @@ -64,6 +130,7 @@ (every eight seconds), rather than every two seconds. The chance of spread is the same, though - it has been scaled up to accommodate. - code_imp: Cleaned up a fair bid of airborne-transmission-code. Report any oddities. +<<<<<<< HEAD - balance: Re-ups the cost of the new ling adrenal ability - bugfix: Patches an exploit with new ling adrenal ability SkyratBot: @@ -73,11 +140,39 @@ - bugfix: Cryo tube respects `NO_DEBRIS_AFTER_DECONSTRUCTION` for the occupants visual contents flags & traits & won't allow hologram/abstract item interactions - code_imp: Cryo has improved attack chain & uses defines for reagent volume rounding +======= + Metekillot: + - qol: Sign language users can now sign in cuffs, but to a very limited degree. + They also have more descriptive emotes for questions, exclamations, and a combination + of the two. + Seven: + - bugfix: Paradox clones (and changelings) now properly copy hair gradients and + heterochromia eye colors. + - bugfix: Hardcore random no longer mistakenly makes your hair white, this was not + a feature. + SyncIt21: + - refactor: ghetto chem separator has been reworked from scratch. See PR 83275 for + details + - qol: adds examines & screentips for ghetto chem separator + - bugfix: Cryo tube respects `NO_DEBRIS_AFTER_DECONSTRUCTION` for the occupants + visual contents flags & traits & won't allow hologram/abstract item interactions + - code_imp: Cryo has improved attack chain & uses defines for reagent volume rounding + TheBoondock: + - balance: Attack with a pillow now consumes 5 stamina regardless of wielded or + not. + Vekter: + - rscadd: Adds an ion law possibility that changes the human status of station pets. + Wayland-Smithy: + - balance: When an AI is alive, on main power, and not SSD its bolts cannot be raised + or lowered externally. + carlarctg: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added crutches! Wooden ones can be made with wood. Medical ones can be bought from the medvendor. - rscadd: Crutches will reduce slowdown from missing a leg by 60%, and they will remove the limping from fractured bones. (canes do that now too) They're also a fairly decent bludgeon. However, they do nothing if both legs are cut off. +<<<<<<< HEAD - refactor: Gondolas (including gondola pods) are now basic mobs. - bugfix: Fixed some borg modules just being constantly eaten up by borgs even when they shouldn't allow duplicates @@ -99,6 +194,19 @@ entities. .. Also removed that additional space they had too sometimes.. - qol: Photo descriptions containing living entities have these sub-descriptions split into newlines for ease of reading. +======= + grungussuss: + - qol: lathes will now print cables coils in packs of 5 + - bugfix: added missing context tips for atmos canisters + jlsnow301: + - bugfix: Fixed the biogenerator's tabs + - bugfix: Orbit UI icons are no longer scrollable.. + junkgle01: + - rscadd: Changes the layout of MetaStation's cargo to fit with new Nanotrasen guidelines. + mc-oofert: + - balance: you may not decap people with a plasma cutter + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The various mining related suits now have consistent suit storage. Try putting a knife into your explorer suit's suit storage today! - balance: Bone armor work similarly to explorer suits, with similar armor values @@ -118,6 +226,7 @@ - balance: Berserker rage now halves brute damage rather than just adding Melee Armor to you and your squishy body. - qol: Berserker and H.E.C.K. helmets can be used for internals. +<<<<<<< HEAD - bugfix: ambush spider (should instantly agressive grab) and other giant spiders can now agressively grab - bugfix: positive viruses are no longer hidden. @@ -128,10 +237,16 @@ not. - bugfix: COMSIG_ATOM_POST_DIR_CHANGE is now a functional signal - balance: you may not decap people with a plasma cutter +======= + nikothedude: + - bugfix: COMSIG_ATOM_POST_DIR_CHANGE is now a functional signal + norsvenska: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The NTSS Independence cryogenics thermomachine is now properly hooked up to the cryo loop. - qol: The NTSS Independence's medical bay has received improvements. The medibot and the sleeper are upgraded, and advanced surgery equipment has been added. +<<<<<<< HEAD - bugfix: you are now able to cancel the look up/down verbs from anywhere - refactor: ghetto chem separator has been reworked from scratch. See PR 83275 for details @@ -149,6 +264,30 @@ Goat: - bugfix: meta's cargo lobby and mining maintenance APCs is now connected to the power line +======= +2024-06-03: + MTandi: + - balance: 'Floor diseases cures are now common chemicals: Milk, Chlorine, Space + Cleaner' + Rhials: + - rscadd: Shovels and entrenching tools can be used to dig graves on asteroid/dirt/etc. + surfaces. Neat! + - rscadd: The Icebox Morgue has been given a fenced-off graveyard in the back. + - code_imp: burn_tile() is no longer double-defined on asteroid turfs. + Zytolg: + - qol: Many Janitors have cleaned up Birdshot station. Permanently. + - qol: Loose floortiles on Birdshot Station have been properly affixed to the floor + by the Engineering and Atmospherics Teams. + - bugfix: Birdshot Dorms have been reworked and incorporated the Holodeck Ship as + an actual and permanent installment. Come visit our new and improved barber + shop! + jwc1015: + - bugfix: Made the anxious zipzap accessible. +2024-06-04: + Iajret: + - bugfix: fixed being able to confirm cargo orders from cargo request console (and, + probably, from PDAs) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jane: - balance: Spider Breachers and Vipers have swapped castes. Breachers come from Enriched Eggs while Vipers come from Abnormals! Breachers can no longer survive @@ -156,6 +295,7 @@ healed per wrap. Melbert: - sound: Boiling soup now makes a sound. +<<<<<<< HEAD PapaMichael: - spellcheck: Nukie uplinks no longer claim to have nonexistent "Tesla Energy Relays" SkyratBot: @@ -178,6 +318,21 @@ - bugfix: Fix artistic module not installable - qol: Made artistic module accessible at round start for any borg module 2024-06-07: +======= + Time-Green: + - bugfix: fixes touching a crutch permanently crippling you + - bugfix: fixes crutches giving permanent speedboosts even when dropped +2024-06-05: + Absolucy: + - qol: The memories for Smoker and Alcoholic now actually mention the preferred + brand. + Derpguy3: + - bugfix: A tiny fan was added to Tramstation's disposal room under the blast doors. + No more accidental depressurizations. + Goat: + - bugfix: meta's cargo lobby and mining maintenance APCs is now connected to the + power line +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - rscadd: Added Biomes capabilities to the Cave Generator, to allow for procedurally-placed biomes to be introduced in cave generation. This feature is not currently used @@ -186,6 +341,7 @@ - code_imp: Biomes can now affect features (which are usually structures), on top of flora and fauna. LT3: +<<<<<<< HEAD - balance: Doubled number of assignable wildcard slots on grey ID cards - balance: Doubled number of assignable wildcard slots on silver ID cards - balance: Doubled number of assignable wildcard slots on agent/chameleon ID cards @@ -199,6 +355,55 @@ single letter vars NullDagaf: - rscadd: watchers can now drop a new trophy +======= + - qol: Icebox's service hall has a disposal unit again + MelokGleb: + - code_imp: crab17 telegraph now uses animated spinning telegraph circle instead + of sniper scope button + PapaMichael: + - spellcheck: Nukie uplinks no longer claim to have nonexistent "Tesla Energy Relays" + Wayland-Smithy: + - qol: AI's jump to AI Core button works while on backup power (likely when needed + most). + carlarctg: + - qol: Disgust vomit knocks you down rather than stunning you. + - rscdel: Mitogen Metabolism Factor knocks you down rather than stunning you. + githubuser4141: + - image: New icons for berserker, godslayer and adamantine armor. Removes the old + icons. + grungussuss: + - sound: frog sounds will no longer explode your ears + mc-oofert: + - rscadd: wawastation, the station map + necromanceranne: + - qol: Failing to hit someone with a proto-kinetic crusher one-handedly no longer + force drops everything in your hands. + norsvenska: + - bugfix: Metastation's vault is now connected to the power grid + san7890: + - bugfix: Status displays should now no longer sporadically randomly break when + in the custom message mode + sprites by INFRARED_BARON: + - image: New icons for Marauder, Seraph, Mauler and adjusts the Phazon/Dark Gygax's + sprites. + vendingmachine24: + - spellcheck: Changed grammar in cat_house.dm +2024-06-06: + Ben10Omintrix: + - refactor: honkbots are now basic mobs, please report any bugs + - rscadd: honkbots will try to slip people on banana peels + Jacquerel: + - balance: Mutadone restores your originally monkey status, rather than always turning + monkeys into humans + - rscadd: A unique kind of mob is created when a Monkey is infested by a Legion. + - balance: Corrosive slime left behind after a slime fails to eat you can be scraped + off with your hands, or shaken off in some other way, by clicking on the debuff. + This is slower and less effective than washing it off using water. + LT3: + - balance: Doubled number of assignable wildcard slots on grey ID cards + - balance: Doubled number of assignable wildcard slots on silver ID cards + - balance: Doubled number of assignable wildcard slots on agent/chameleon ID cards +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - balance: cultist shades can no longer contribute to rune invocation until they've been out of their soulstone for a minute. Put them in a shell for God's sake! @@ -206,6 +411,7 @@ - code_imp: cult shades now have their own antag datum. - bugfix: constructs now properly clear the cultist antag datum and transfer the mind slightly earlier. +<<<<<<< HEAD - admin: Admins can now reroll random events into something else. SkyratBot: - bugfix: RLD glowsticks actually glow again. @@ -273,6 +479,9 @@ - bugfix: some missing modsuit (un)sealing messages should no longer be missing - bugfix: MOD circuit adapter core deployed parts output should work again - bugfix: Modsuit painter works again +======= + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: more examines & screentips for plumbing machinery - qol: plumbing grinder has a grind/juice mode which be toggled by hand - code_imp: improved attack chain for RPLD & plumbing grinder @@ -281,6 +490,7 @@ getting that item consumed - bugfix: You cannot grind abstract/ hologram items in the plumbing grinder - bugfix: growing vat now uses the correct layer selected on rapid plumbing device +<<<<<<< HEAD - qol: you now don't need to weld a closet to install/uninstall electronics/card readers. - bugfix: 'Tool-based flashes (read: from welders) are no longer incorrectly locked @@ -302,10 +512,108 @@ 2024-06-09: Goat: - bugfix: mobs no longer move during cutscenes +======= + mc-oofert: + - balance: cult stun gets weaker when they get red eyes and later more when they + have halos +2024-06-07: + 00-Steven: + - bugfix: RLD glowsticks actually glow again. + Absolucy: + - bugfix: When implanting functional wings into a new body, they will actually be + able to use said wings now. + EEASAS: + - bugfix: fixed the mis-rotated disposals pipe on birdshot + Erol509: + - qol: Cyborgs on AI statpanel now have jules energy format. + EuSouAFazer: + - qol: 'Swabbing the clown''s stamp also gives clown cells. + + :cl:' + IsaacExists: + - rscadd: You may choose a color preference for your blindfold with the blindness + quirk. + LT3: + - bugfix: Fixed timing issue where tram crossing signals would be out of sync with + the moving tram + - bugfix: Tram crossing signals consistently show green when safe, blue when broken + - bugfix: Tram crossing signals show red instead of yellow when degraded + Pickle-Coding: + - bugfix: Fixes the brig cell timer adjustment not working correctly on live timers. + - bugfix: Fixes paradox clones using a different voice from the owner. + RedBaronFlyer: + - rscadd: Janitorial keyrings are now part of every janitor's toolkit instead of + just the first one. + Sadboysuss: + - bugfix: curator whip will no longer disarm when parried + - qol: you now don't need to weld a closet to install/uninstall electronics/card + readers. + ShizCalev: + - bugfix: Syndicate AI can no longer be selected via the station law upload console. + - bugfix: Non-syndicate borgs can no longer accidentally be slaved to syndicate + AI by pulsing their AI wires. + - bugfix: Syndicate borgs can no longer be slaved to the station AI by pulsing their + AI wires. + - bugfix: Syndicate operatives onboard the station can no longer end up with an + objective to destroy their own syndicate AI. + SyncIt21: + - bugfix: autolathes don't hang when printing items in areas without apc or if it + runs out of materials mid printing + Wayland-Smithy: + - bugfix: Pre-Loaded Syndicate Intellicard AI's no longer appear in PDA messenger. + Whoneedspacee: + - bugfix: Bubblegum can no longer melee you while using his charge abilities. + githubuser4141: + - balance: Antag/Centcom mechs now have top notch un-upgradeable armor out of the + box. You can't add armor to centcom or nukie mechs anymore, but their default + armor rating is a lot higher. + necromanceranne: + - bugfix: The armor plate component only adds the prefix once. + - bugfix: Drake empowerment for berserker armor now uses valuable drake remains, + made from ashdrake hides and bones. + - rscadd: Drake armor is made use drake remains to construct. (This is a net neutral + to the previous recipe) + - qol: Coffee types are overall more consistent, causing jittering only from the + overdose effect. + - bugfix: Pumpkin lattes will actually work like coffee. + nikothedude: + - bugfix: COMSIG_ATOM_POST_DIR_CHANGE should ACTUALLY work now + san7890: + - bugfix: Using the 'ESC' key on your keyboard to unbind a key in the keybindings + preferences menu should now work as expected. This should also be fixed for + people in a variety of other spots too. + zxaber: + - bugfix: 'Tool-based flashes (read: from welders) are no longer incorrectly locked + at flash level 1. Wear proper PPE!' +2024-06-08: + 00-Steven: + - refactor: Refactored wall button code, please report any issues. + - bugfix: Wall buttons actually drop their contents when destroyed. + - sound: Putting items into wall buttons actually plays a sound. This matters for + assembly devices, but airlock electronics do not have a sound. + - qol: Added screentips to wall buttons. + - qol: You can now take out the airlock electronics or assembly device out of wall + buttons individually. Left click prioritises the board, right click prioritises + the device. + - qol: Wall buttons are renamable with a pen when opened. + - qol: Attempting to wrench deconstruct a wall button or put in airlock electronics + or an assembly device when you can't actually gives feedback. + DaCoolBoss: + - bugfix: Fixed entries in config file 'spaceruinsblacklist.txt'. + EnterTheJake: + - balance: Rust walkers' summoning ritual now requires 5 sheets of Titanium instead + of Iron. + - bugfix: Magic resistance grants complete immunity from the passive disgust buildup + from standing on Rusted turfs. + Melbert: + - bugfix: Fix some modifiers to do after speed (sanity, midas gun) stacking when + they shouldn't +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MichiRecRoom: - qol: Personal AI's face display selection is now a radial menu. As a bonus, now you can see what the faces look like before selecting them. Rhials: +<<<<<<< HEAD - rscadd: Adds some more station-trait dependent pulsar star reports. Keep an eye on that roundstart command report! - bugfix: Only filled graves will impact your mood. @@ -380,6 +688,51 @@ - bugfix: Hardcore random no longer mistakenly makes your hair white, this was not a feature. ShizCalev: +======= + - bugfix: Only filled graves will impact your mood. + SyncIt21: + - spellcheck: Corrected wrench contextual screentip typo for smart fridge + - refactor: alt right click has been refactored. report bugs on github + - bugfix: techfabs don't runtime & hang when printing in no apc areas + nikothedude: + - rscadd: 'New deathmatch modifier: "Random martial arts"' + projectkepler-ru: + - bugfix: smoking pipe not showing sprite when lit + thegrb93: + - bugfix: Borg emag module jank when no longer emagged + - bugfix: Borg piercing hypospray fail message + zxaber: + - bugfix: Fixed borg chargers (especially unpowered ones) constantly draining a + borg's cell. +2024-06-09: + 00-Steven: + - bugfix: Latejoiners with heterochromatic eyes no longer have the wrong fingerprint + in the security records. + - bugfix: Latejoiners actually have their quirks visible in the medical records. + Ben10Omintrix: + - bugfix: lobstrosities will no longer be able to fish out multiple necropolis chests + DATA-xPUNGED: + - rscadd: NT reports indicate that the Syndicate have increased listening activities + on Icemoon, crew is advised to watch out for possible communication interference. + DustanHache: + - bugfix: Lobstrosities are no longer pre-cooked through bluespace shenanigans. + Goat: + - bugfix: mobs no longer move during cutscenes + Jackraxxus: + - admin: The auto-mute system yells at you harder when you send a bunch of identical + messages. + Majkl-J: + - bugfix: The orbit menu clicks are accurate again + - bugfix: Fixes several service and item-handling borg modules not functioning + Melbert: + - balance: Coders are now locked to the coderbus + Rhials: + - rscadd: Adds some more station-trait dependent pulsar star reports. Keep an eye + on that roundstart command report! + ShizCalev: + - bugfix: Basic bots are now in the proper faction and will no longer be targeted + by turrets. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The spooky element will now apply the spooked mood event when someone is spooked. - bugfix: Fixed spookers getting a popup message when spooking mobs not actively @@ -388,9 +741,62 @@ heresy mood event. - bugfix: Seeing skeletons while having the skeleton phobia will now apply the spooked (by skeletons) mood event. +<<<<<<< HEAD - bugfix: Basic bots are now in the proper faction and will no longer be targeted by turrets. SkyratBot: +======= + - bugfix: Getting surgically cut open while conscious will now give you the "THEY'RE + CUTTING ME OPEN!!" surgical mood event. + TheBoondock: + - sound: added operating sounds for wrench, wirecutter and crowbar + Thlumyn: + - bugfix: add general engineering access to birdshot engineering entrance + Time-Green: + - bugfix: admins can force rulesets on background checks station trait (fucking + lame) + Watermelon914: + - spellcheck: Intern announcer no longer has a weird space before the introduction + message. + Wayland-Smithy: + - bugfix: Fixed Silicons not being able to (un)lock Air Alarms. + Zenitheevee: + - bugfix: fish with the Anxiety gene wont die when in the same loc as any 3 items + carlarctg: + - qol: Adds a chat message for fishing in a chasm with a normal and rescue hook, + to clarify that only rescue hooks can drag up corpses. + grungussuss: + - spellcheck: all instances of reactive armor are now spelt the same + improvedname: + - balance: Roundstart mutadone pills now have less chems in them from 50 to 5 + krookodilehunter: + - spellcheck: fixes bad raptor grammar + mc-oofert: + - code_imp: stacking machine consoles check in area instead of a tiny view range + on init + thegrb93: + - bugfix: Fixes admin borg panel upgrade functions + tmyqlfpir: + - rscadd: Added new circuit camera components + - qol: Circuit drones can now recharge at recharge stations + zxaber: + - qol: Plexagon Access Management now tells you that you need an ID Trim before + applying a Template, rather than silently failing. +2024-06-10: + EuSouAFazer: + - qol: The ERT's ship has better mapping now. + Higgin: + - bugfix: energy bolas now work on prone targets and don't leave behind a fake item + when they whiff. + - balance: buffed healing values of helbital, probital, lenturi, hercuri, syriniver, + musiver, and tirimol for their respective damage types. + - balance: Tirimol now uses oxygen as a catalyst rather than consuming it over time + making it easier to make without babysitting. Tirimol now requires much more + careful management of impurity in order to make Super Melatonin. + - rscadd: medical chem vendors now sell bottles of calomel, a potent full-range + chemical purger. + Iamgoofball: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Changelings now do not like fire, as is tradition. - balance: If they are on fire, they no longer generate chemicals until they put the fire out. @@ -406,6 +812,7 @@ - bugfix: Fixes items you're holding not catching on fire alongside the rest of you when you light on fire. - bugfix: Fixes the Changeling Shield having one more hit than it was supposed to. +<<<<<<< HEAD - code_imp: stacking machine consoles check in area instead of a tiny view range on init - bugfix: Fixes several service and item-handling borg modules not functioning @@ -445,6 +852,29 @@ - bugfix: The orbit menu clicks are accurate again Thlumyn: - bugfix: add general engineering access to birdshot engineering entrance +======= + IsaacExists: + - bugfix: You may no longer submit, or obtain, a spy bounty for the contractor baton. + LT3: + - rscadd: Telecoms now has a central tram controller + - rscadd: Tram controller is now included in communications blackout event + - qol: Tram malfunction event only stops tram once, requiring engineering to reset + (no tools required) + - qol: Tram malfunction event no longer sends a Central Command announcement when + fixed + - rscdel: Tram doors no longer force crush you during tram malfunction event + - rscdel: Silicons can no longer control the tram when communication is lost + - bugfix: Tram doors can now be constructed and assemblies built + - bugfix: Emergency opening tram doors no longer spam balloon alerts + - bugfix: Tram doors open faster on arrival + - bugfix: Tram doors correctly force close on attempt 3 + NewyearnewmeUwu: + - bugfix: Fixes certain quirks being erased by slimeperson cloning. + Time-Green: + - rscadd: Adds a positronic sphere to bepis tech and roboticist mail goodies. It + can now wreack havoc across the robotics lab while whining for a DURAND body, + but you can also punt it! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 WebcomicArtist: - rscadd: Added zaukerite (high damage/embed, low AP) and metallic hydrogen (High AP and piercing, but low embed) crossbow ammo for the rebar crossbows @@ -463,6 +893,7 @@ - bugfix: fixed rebar crossbow shots not dropping items on hitting walls - bugfix: fixed traitor crossbow having worse wound chance than the base one - sound: added new crossbow firing sound effect +<<<<<<< HEAD sprites by INFRARED_BARON: - image: New icons for Marauder, Seraph, Mauler and adjusts the Phazon/Dark Gygax's sprites. @@ -516,6 +947,36 @@ 2024-06-13: Majkl-J: - bugfix: Events can now spawn again +======= +2024-06-11: + Addust: + - bugfix: The Syndicate has corrected some technical issues at a listening post + in the Icemoon. + DaCoolBoss: + - rscadd: The Lizard's Gas ruin in Lavaland has been revamped, and now dispenses + plasma gas fuel. + EnterTheJake: + - rscadd: adds the MOD shock-absorption module, into the game. + - rscadd: The MOD shock-absorption module into the the uplinks, costs 4 TC. + - balance: Nukie modsuits come with the shock_absorption module preinstalled. + EuSouAFazer: + - rscadd: New room in Wawastation, the Cytology Lab! Positioned behind the test + fire range. + IsaacExists: + - bugfix: Eastern icebox visitation door no longer missing a floor tile. + grungususs: + - bugfix: fixed the hole in lawyer's office on tramstation + improvedname: + - qol: Adds additional piping to wawastation ordnance + - bugfix: Adds a missing atmos waste vent for wawastation + junkgle01: + - bugfix: Polishes up new Meta Cargo's decals and associated amenities. +2024-06-12: + Goat: + - bugfix: blood drunk miner can now path over lava + NewyearnewmeUwu: + - balance: Pacifists can now use psychotic brawling, at major mood costs. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PowerfulAtom111: - rscadd: after a quick galactic meeting, insane people around the universe can now speak gibbering to express their ideas free from the prying ears of the @@ -524,17 +985,27 @@ all the other insane people are speaking - spellcheck: added a bit of text to the RDS quirk and the RDS medical record text to highlight the insane's new abilities +<<<<<<< HEAD SkyratBot: - bugfix: The recyclers in the snow cabin gateway, the cyborg mothership, and the deep storage space ruin are now rotated properly. - bugfix: there is now one more crayon in the Mortidrobe. - rscadd: Added another ruin to Lavaland - balance: Pacifists can now use psychotic brawling, at major mood costs. +======= + aaaa1023: + - bugfix: there is now one more crayon in the Mortidrobe. + grungussuss: + - bugfix: fixed getting a fake white dwarf report when the shift isn't extended + mode, which lead to meta knowledge being used. + munchyi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'added a new virtual domain :cl: ![image](https://github.com/tgstation/tgstation/assets/154919526/2d94fe21-bc45-40dc-9f84-4b69088b353c)' +<<<<<<< HEAD grungussuss: - bugfix: fixed getting a fake white dwarf report when the shift isn't extended mode, which lead to meta knowledge being used. @@ -611,6 +1082,36 @@ gender. - sound: '*gasp now makes a sound, it''s the same as *gaspshock.' - sound: Xenos (or anything with hands) can clap +======= + norsvenska: + - bugfix: The recyclers in the snow cabin gateway, the cyborg mothership, and the + deep storage space ruin are now rotated properly. + r3dj4ck0424: + - rscadd: Added another ruin to Lavaland + sylvia-from-fulp-station: + - image: Adds a unique sprite for envyknife + uaioy: + - qol: the first Medieval pirate to spawn will be the Warlord, warlord and crude + helmet have flash protection + - bugfix: Medieval shuttle has actual engines now + - bugfix: Shortsword has its original colours + - bugfix: Crude helmet no longer makes you bald +2024-06-13: + Capsandi: + - sound: Some ambience tracks are quieter now. + Goat: + - bugfix: Enviro suit lights no longer stay on when the welding visor is activated. + Kocma-san: + - rscadd: Added new keywords (%d, %date, %t, %time) for fields + LT3: + - sound: You can now experience tram crashes in higher fidelity than ever! + Majkl-J: + - bugfix: EMPs on carbons no longer happen twice + - code_imp: Moves organ emps under bodyparts, changes how bodyparts handle emp effects + Melbert: + - rscadd: Character Loadouts + - rscdel: Pride Pin quirk (it's in the Loadout menu now) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Over 200 item interactions have been refactored to use a newer, easier-to-use system. Report any oddities with using items on other objects you may see (such as surgery, reagent containers like cups and spray bottles, or construction @@ -622,23 +1123,156 @@ such as hotkey, clicking on the storage boxes, and mousedrop will still work). - refactor: The detective's scanner will now be inserted into storage items if clicked normally, and will scan the storage item if on combat mode +<<<<<<< HEAD - sound: Portals made by portal guns now make sounds as expected - sound: Wormholes from the wormhole event now make sounds when formed - bugfix: Human mousedropping - bugfix: Fix inability to make r-glass by hand inside your backpack - balance: Taking stamina damage in stamcrit has diminishing returns associated, meaning you cannot be infinitely stamcrit. +======= + - balance: Taking stamina damage in stamcrit has diminishing returns associated, + meaning you cannot be infinitely stamcrit. + Rhials: + - bugfix: The "mopper" gimmick assistant outfit spawns with one cart instead of + nine. + SyncIt21: + - bugfix: ' RCD, RPLD & RTD cancels their build process if their design is changed + during build.' + carlarctg: + - qol: Cult pylons slowly close bleeding wounds + - refactor: allowed aura healing to clot wounds shut +2024-06-14: + Addust: + - bugfix: the syndicate now imports warm air instead of cold air to their icemoon + listening post + Goat: + - qol: Mining's PKAs and PKCs are now fireproof. + JupiterJaeden: + - qol: you can now take pulled objects with you when going up and down in zero gravity + - bugfix: conga lines now work correctly when going up and down ladders, and in + zero gravity + Kocma-san: + - bugfix: special networks are now displayed in the fax if it is the only one in + the world + MGOOOOOO: + - bugfix: Missing legs no longer slow you down in non-gravity environments. + - bugfix: Catwalk deconstruction yields iron rods as intended. + Rex9001: + - balance: Moon Smile only does a knockdown if the targets sanity is low enough + and the minimum duration of its abilities have been decreased + ShizCalev: + - bugfix: Autolathes now print the correct number of cable coils. + - bugfix: Fixed a bug with station traits being added to modify weights for events + that couldn't actually occur on the current map! + SyncIt21: + - refactor: Ctrl click & Ctrl shift click has been refactored. Please report bugs + on GitHub + - refactor: Mouse drag & drop attack chain has been refactored. Report any bugs + on GitHub + - bugfix: You cannot close the cryo tube on yourself with Alt click like before + Watermelon914: + - qol: Bots can now bind voice lines to an action slot. Lowers cooldown for all + bot voicelines to 5 seconds. + carlarctg: + - balance: Corpses won't remain cultists when ghouled by a flesheretic + cnleth: + - balance: Juicing and distilling plants only consumes nutriment and vitamin + - balance: Lanternfruit and polypore mushrooms now contain nutriment + - balance: Increased the amount of nutriment in sugarcane and saltcane + jlsnow301: + - rscadd: Added screentips to extinguishers. + - bugfix: Fixed alt-click interaction with extinguishers and mod control units. + junkgle01: + - bugfix: added an id trim painter that was missing to MetaStation's QM office. + larentoun: + - balance: Now regaining a tail has three states. If you got your tail back - you'll + get a temporarily debuff in exchange of infinite "tail missing" debuff (new). + If it's NOT your tail and of same species - this temporarily debuff will be + a bit stronger (new). If it's NOT your tail and NOT of same species - it will + be a considerably stronger debuff (currently on live). + lizelive: + - qol: make the cart hold 2.5x more water + necromanceranne: + - bugfix: Peter Jr. is capable of surviving in the environment they spawn in. + thegrb93: + - bugfix: Fix bug where you can't interact with a shocked door without shock protection + even if it is depowered. +2024-06-15: + BurgerBB: + - bugfix: Tweaks some instances of get_safe_turf so things like the nuclear disk + doesn't accidentally teleport to the Icebox Syndicate Base + EnterTheJake: + - image: Rust Heretic's blade now has a new, slicker sprite. + Exester509: + - balance: Phazon mechs use ectoplasm cores now + - balance: You can now acquire ectoplasm cores from the science supply interface + Goat-Real: + - bugfix: Icebox's service hall now now has a regular hand labeler. + GoblinBackwards: + - bugfix: Fixed thermal pistols sometimes not recognising an equipped holster when + trying to spin them to recharge. + Jacquerel: + - bugfix: Neutralising an anomaly cannot produce more anomaly cores than are supposed + to exist in a single round + LucyGrind: + - bugfix: Crayons now fit in pdas + MTandi: + - image: Updated slime sprites + Melbert: + - bugfix: Human mousedropping + - qol: Attack animations for cult spells on attackable objects (people, airlocks) + - bugfix: Fix cult spells on non-attackable objects (metal sheets, blood decals) + - bugfix: Humans can't cough on menthol again + - bugfix: Moth and lizard emotes decide what sound to play based on body type, not + gender. + - sound: '*gasp now makes a sound, it''s the same as *gaspshock.' + - sound: Xenos (or anything with hands) can clap +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Re-adds Bagulo - balance: 'The max number of bluespace cores available to the crew has been reduced to 3 (was: 8)' - balance: Chucking a BoH into an uncharged singulo may save the station. +<<<<<<< HEAD Moostard: - rscadd: New armor piercing hypospray design can be researched now. +======= + - sound: Portals made by portal guns now make sounds as expected + - sound: Wormholes from the wormhole event now make sounds when formed + - bugfix: Heirophant Club Blink at range + - bugfix: Crusher Loot + - bugfix: RCD material reclamation + mc-oofert: + - rscadd: the flatpacker, a machine unlocked at industrial engineering +2024-06-16: + Archie700: + - qol: Changes description of steal objective to match the name + EnterTheJake: + - qol: You can now repair portable scrubbers and pumps. + GPeckman: + - bugfix: The reset button in the bluespace launchpad UI should work again. + Goat: + - bugfix: A wrecked shuttle on lavaland no longer has asteroid tiles containing + the danger of space. + - code_imp: Added volcanic versions of all mineral turfs for those that did not + have it. + GoblinBackwards: + - bugfix: Fixed the patient information for the mech sleeper module not displaying + when the mech didn't also have a syringe gun. + Jacquerel: + - rscadd: Cats and Dogs can lick slashing wounds clean. + - rscadd: Basic Mobs with hands can relocate dislocated bones, and pluck eyeballs + out of pulped skulls. + - balance: Gorillas can strangle people. + Melbert: + - bugfix: Fix inability to make r-glass by hand inside your backpack +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Fixed some surgery failure states not properly setting the correct mood event. - refactor: Minor refactor to how surgery events work, there is now better support for per-surgery mood events! +<<<<<<< HEAD - bugfix: Fixed a bug with station traits being added to modify weights for events that couldn't actually occur on the current map! SkyratBot: @@ -702,10 +1336,21 @@ 2024-06-17: Gandalf2k15: - bugfix: You are no longer GBJd +======= + Wayland-Smithy: + - bugfix: Fixed revenant spawning next to brains and other unharvestable dead mobs. + WebcomicArtist: + - bugfix: Healium bolt now no longer affects silicons. + carlarctg: + - bugfix: Cosmos spells will no longer star mark your steed + - qol: Baby plushies are now smaller than their parents +2024-06-17: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Hacks-The-Doors: - balance: dental pills can now be used in crit. - balance: dental pills now give off a message when you start using them - balance: dental pills have a 2.5 second delay when in soft crit +<<<<<<< HEAD SkyratBot: - sound: added compressed air sound for when air tanks are inserted into machinery - balance: Certain changeling abilities won't work while on fire. @@ -714,6 +1359,14 @@ xXPawnStarrXx: - rscadd: Added new primitive, power free farming methods. - bugfix: stopped shelves spawning clay. (You don't think I saw you, but I did...) +======= + JackEnoff: + - balance: Certain changeling abilities won't work while on fire. + TheBoondock: + - sound: added compressed air sound for when air tanks are inserted into machinery + grungussuss: + - rscadd: Added Misha the bear to the HoS office on icebox. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2024-06-18: Bisar: - balance: Replaced the free reagent purging with actually purging by exploding @@ -721,6 +1374,7 @@ Let's go practice medicine! - bugfix: Fixed the free reagent purging mechanic from causing an explosion so weak that it doesn't cause any damage. +<<<<<<< HEAD Goat: - qol: fire extinguishers can now be filled via stationary tanks. (and water coolers) LT3: @@ -867,6 +1521,23 @@ beam rifle. It shoots black holes. You can make this in-game. That's right, YOU! - balance: Only one vortex anomaly can be made in a round. +======= + GPeckman: + - bugfix: Mining borgs can get multiple modkits of the same type installed again. + Goat: + - qol: fire extinguishers can now be filled via stationary tanks. (and water coolers) + GoblinBackwards: + - bugfix: Fixed mulebots being able to run over people who are leaning against a + wall. + - bugfix: Fixed anomaly cores from the high-intensity grav anomaly event creating + the wrong type of reactive armour. + Kaostico: + - bugfix: Transcendent Olfaction mutation now works properly + LucyGrind: + - bugfix: allows cigarette grinding in mortar + MTandi: + - bugfix: Non-metallic slime types are semi-transparent +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Reshuffled tech tree, making nodes more specialized - qol: Research points devided by the amount generated per second, so now research points correspond to seconds @@ -876,6 +1547,7 @@ - rscadd: Added a variant of machinery scan experiment that accepts any machines with upgraded parts (required for tier 3 parts) - rscdel: Removed material scanning experiments from the tech tree +<<<<<<< HEAD - image: Resprited all jetpacks - qol: Fullscreen mode can now be toggled by pressing F11 or the button at the top right @@ -883,6 +1555,118 @@ - rscadd: Added disks for accelerator modkits and crusher trophies to the bitrunning vendor - bugfix: Conga lines of more than 2 no longer break when going up and down stairs. +======= + Melbert: + - qol: Block'd out armor readout, should be more readable now + - bugfix: Crusher Fix For Real + SyncIt21: + - bugfix: ctrl+shift clicking on a ghost will only quick spawn that clicked target + and not you + TheBoondock: + - sound: added squeaky turn and gas hissing sound to gas valve + TheRyeGuyWhoWillNowDie: + - qol: adds a confirmation to malf AI shunting into APCs + mc-oofert: + - bugfix: build mode and space dragons dont harddel on destroy + - bugfix: you may now open the panel of a flatpacker with a screwdriver + san7890: + - qol: A message with a link to publicly accessible logs (if enabled by your server + operators) should now be visible far earlier when a world is about to reboot. +2024-06-19: + Bisar: + - rscadd: The Nanotrasen safety commission reminds employees to properly clean themselves + of all flammable material before going on smoke breaks. + - rscadd: Sparks now ignite flammable things. Including you. Keep a fire extinguisher + handy or stop dousing yourself in welding fuel! + - bugfix: Fixed a few oversights with welding fuel pools not igniting when you throw + lit/hot things into them or when you walk into them while on fire. + GPeckman: + - bugfix: Airlocks should no longer appear closed sometimes when fireman carrying + someone into them. + Jacquerel: + - balance: Gorillas have big fingers, which mostly just prevents them from using + laser pointers and stun batons + - balance: Items held in your hands can catch fire. + - balance: Items you are holding won't catch fire if your hands cannot catch fire. + - balance: When you stop being on fire so will items you are holding. + - balance: If you roll around on your burning items they will stop being on fire. + Melbert: + - bugfix: Fixed hand tele portals being forever + - bugfix: Enabling or disabling ambience mid round will properly enable or disable + ambience + - qol: Added descriptions differentiating "Ship ambience" from "ambience" + TheRyeGuyWhoWillNowDie: + - rscadd: the advanced omnitool upgrade now hastens the mediborg's syringe too + Time-Green: + - refactor: Lizard and moth markings now use the bodypart overlay system + carlarctg: + - balance: Negative mutations now allow you to have more positive mutations, via + reducing your instability! + - code_imp: All mutations have been overall standardized via defines on their instability + values. Many mediocre positive mutations have had their cost reduced significantly! + - rscadd: 'Added a new height mutation: Acromegaly! It''s the opposite of Dwarfism + and makes you uncannily tall. It also makes you hit your head 8% or 4% (with + synch) of the time you pass through airlocks. Wear a helmet!' + - rscadd: Gigantism is now a recipe mutation, mix Acromegaly with Strength to get + it. + - qol: Injectors and activators' duration is now dependent on the in/stability (absolute + value) of the mutations to be injected! With a minimum of 5-10-15 seconds for + each type of injector. Also changed up a bit how part upgrade cooldowns work, + by making each tier reduce cooldowns by 25-15-10% for each injector type. + jlsnow301: + - bugfix: TGUI say will no longer spill your /me contents when you get attacked +2024-06-20: + Absolucy: + - qol: Prettied up the Chemical Analyzer's output in chat, making it easier to read, + especially when scanning multiple things. + Ben10Omintrix: + - rscadd: vendrobes may have mothroaches inside them + - rscadd: mothroaches will now seek out clothes to eat them + FlufflesTheDog: + - bugfix: limbs that are both robotic and something else can be repaired properly + GPeckman: + - bugfix: The chaplain altar can once again be buckled to. + LT3: + - spellcheck: Melon fruit bowl now comes with a side of foreshadowing for people + who want to experience an explosion of flavour + MTandi: + - bugfix: Fixed techweb app showing wrong designs on Details button click + - bugfix: Fixed new compressor UI + - refactor: Compressor UI to TypeScript + - qol: Simplified Compressor UI layout + - bugfix: Made 10 MJ & 20 MJ cells properly correspond to tiers 1 & 2 in lathes. + - image: Updated cell sprites to correspond to other stock parts of their tiers. + - image: Updated plasma cell, 500KJ cell and 2.5MJ cell sprites + - qol: APC has wires for machinery/lights/environment channels + Metekillot: + - bugfix: Sparks will no longer turn areas with wooden furniture or similar into + naught but a field of ashes; they no longer ignite furniture, (unless it's made + of plasma(?!)) and have a decreasing chance to ignite items bigger than small + size. + Rhials: + - bugfix: Fixes a door in the Fredington Fasting Bear Five Nights and Fnafbears + map. + - balance: The energy bola slowdown has been (roughly) halved, to allow for more + retaliation when used on a criminal. + SyncIt21: + - bugfix: Techfabs now print 5x cable coil + - bugfix: no more runtimes when dragging turfs onto other stuff + - code_imp: most actions now properly check for recursive locs & better adjacency + - bugfix: You can move around ui buttons in your action bar + Vishenka0704: + - qol: Ability to delete characters(yourself) + grungussuss: + - bugfix: mimes can now break their vow while borged or an MMI + mc-oofert: + - bugfix: wawa centcom interns may actually leave the stationside dock + - bugfix: wawa hop office and cap office get keycard auths + - bugfix: wawa disposals blast doors work properly + - bugfix: wawa med elevator controls on the bottom floor are accessible + - bugfix: sci entrance actually has access restrictions + - bugfix: gasping makes sound now +2024-06-21: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Updated cards/ids to use the proper item interaction system instead of attackby, please report any issues. - bugfix: You can no longer recolour an ID at any point if you open the menu but @@ -891,6 +1675,41 @@ - qol: Prisoner IDs show genpop sentence time in hours/minutes/seconds instead of seconds. - qol: Prisoner IDs have genpop usage tips in their examine. +<<<<<<< HEAD +======= + ArcaneMusic: + - qol: Vending machines now give audio feedback when you restock a vending refill + and get a payout. + - qol: The Restock tracker NTOS app for tracking vending machine contents now works + on all consoles, and comes pre-installed on the cargochat cargo computers. + - balance: Vending machines now offer a bit more credits when missing contents at + the start of a round after getting restocked. + BeagleGaming1: + - rscadd: Added disks for accelerator modkits and crusher trophies to the bitrunning + vendor + Bisar: + - rscadd: Ashwalkers are now better at riding, taming animals, and fishing. + - code_imp: Behavior for the settler trait has been partially atomized into several + traits instead. + EdgeLordExe: + - rscadd: Adds Feast of Owls ritual to heretic which allows one to forsake their + ascension in exchange for immediate power. + GPeckman: + - bugfix: When on 'stream' mode, the cleaning spray from a bottle of space cleaner + should no longer be blocked by just about everything. + Goat: + - bugfix: Icebox's raptor den is now lined with asbestos and lead and no longer + gets hit with radiation. + JackEnoff: + - bugfix: Repurposed Glands (Adrenals) now show their correct duration and chemical + cost in its description. + LT3: + - bugfix: Fixed paramedics not having access to the Icebox NanoDrug using the west + airlock + MTandi: + - image: New gibber sprite + - image: New food/slime processor sprite +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Added ordnance to extra access of geneticists and roboticists - balance: Reduced parts scanning tests' machine count to 4 from 8 - balance: Reduced augmented organs scanning tests mob count to 1 from 2 @@ -899,6 +1718,7 @@ - bugfix: Allowed NTNet relay in away circuit imprinter for NT Frontier app - qol: NT Frontier app installed on RD and Scientists` PDAs by default - qol: Updated NT Frontier app to be more user-friendly +<<<<<<< HEAD - bugfix: Repurposed Glands (Adrenals) now show their correct duration and chemical cost in its description. grungussuss: @@ -913,6 +1733,65 @@ - rscadd: Character Loadouts - rscdel: Pride Pin quirk (it's in the Loadout menu now) SkyratBot: +======= + Rex9001: + - bugfix: lunatics now get their hud properly + - bugfix: lunatics now get objectives + - qol: ascended moon heretics are now labelled as ringleaders and are easier for + lunatics to spot + Rhials: + - balance: DRAGnets now come with a beacon they can be synced to, which will set + the destination for the snare round's teleport ability. + SmArtKar: + - image: Resprited all jetpacks + SyncIt21: + - bugfix: breaking an APC will depower the area + Xander3359: + - bugfix: Fix rust heretic being unable to rust walls or floors + grungussuss: + - bugfix: Welding protection module for MODsuits protect flash-sensitives from welding + arcs + mc-oofert: + - rscadd: every engineering lobby starts with a flatpacked flatpacker and multitool + - bugfix: fixed wrong access on one door on wawastation and also made lights on + elevators not break (On Wawastation) + necromanceranne: + - rscadd: Replaces the Particle Acceleration Rifle with the Event Horizon anti-existential + beam rifle. It shoots black holes. You can make this in-game. That's right, + YOU! + - balance: Only one vortex anomaly can be made in a round. + projectkepler-ru: + - bugfix: Wawastation bridge now has the correct access on their suit storage and + medkit now actually starts filled + r3dj4ck0424: + - bugfix: puts tiles under the wawa tool storage doors + - bugfix: allows you to access a door and a fire alarm on wawa's prison second floor +2024-06-22: + AyIong: + - qol: Fullscreen mode can now be toggled by pressing F11 or the button at the top + right + Bisar: + - bugfix: Felinids no longer remember losing their tail and regaining it roundstart; + you need to do it during the round to get that mood event. + FlufflesTheDog: + - bugfix: sanitization on citation pda alerts + JupiterJaeden: + - bugfix: Conga lines of more than 2 no longer break when going up and down stairs. + MelokGleb: + - image: added sprite for debug heretic painting + Mothblocks: + - qol: Dramatically improves delete character UI and UX. + Thunder12345: + - rscdel: Locker staffs have been removed from the Ragin' Mages deathmatch lootcrate + pool. + mc-oofert: + - bugfix: borg factory gives you your preference borg name +2024-06-23: + Donglesplonge: + - balance: most livestock crates, with some exception, have been made cheaper to + facilitate healthier mental states in the crew, go build a farm! + jlsnow301: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Bitrunning made more illegal: Increased the rate at which antags spawn.' - bugfix: '"Temporary" bitrunning antagonists and spawners are made actually temporary. You will return to your original body after death, just like CTF.' @@ -922,6 +1801,7 @@ by clicking the hololadder and netpod respectively. - rscdel: Removed the starfront saloon BR map. - bugfix: 'Syndicate assault map: Added pistols, reduced exploits.' +<<<<<<< HEAD - balance: most livestock crates, with some exception, have been made cheaper to facilitate healthier mental states in the crew, go build a farm! - image: added sprite for debug heretic painting @@ -941,6 +1821,9 @@ SkyratBot: - bugfix: crayons interact with washing machine once again 2024-06-25: +======= +2024-06-24: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - balance: Sparks have been heavily adjusted; they only affect items made of plasma, pools of welding fuel, flammable people, cigarettes, and items that contain @@ -948,14 +1831,31 @@ has been untouched. DATA, with sounds by Beebblie: - sound: Added sounds for turning on and off internals. +<<<<<<< HEAD LT3: - bugfix: Smartfridge will now correctly respond 'no power' instead of 'forbidden item' when it doesn't have power Melbert: +======= + GoblinBackwards: + - rscadd: Breathing nitrium now has a chance to make you burp. + Kocma-san: + - bugfix: you can hold Ian in your arms + LT3: + - bugfix: Smartfridge will now correctly respond 'no power' instead of 'forbidden + item' when it doesn't have power + LucyGrind: + - bugfix: crayons interact with washing machine once again + Melbert: + - bugfix: Touch Spells now apply click CD again + - bugfix: Touch Spells now apply fingerprints again + - bugfix: Touch Spells now check if your hands are blocked again +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed plate shards not randomizing icon correctly - qol: Gives plate sharts a more fitting hitsound / caltrop sound, gives them a set caltrop stun duration (instead of default) - bugfix: Fix DNA vault probes +<<<<<<< HEAD - bugfix: Touch Spells now apply click CD again - bugfix: Touch Spells now apply fingerprints again - bugfix: Touch Spells now check if your hands are blocked again @@ -986,6 +1886,36 @@ 2024-06-26: Bisar: - bugfix: The light eater can now again eat lights from things with lights. +======= + - bugfix: Bloody footprints now go until you run out of blood on your feet instead + if only a single tile + - rscadd: Adds an effect for emagging an emag + - rscadd: Adds an effect for emagging a fake emag + Paxilmaniac: + - rscadd: Electric eels now prefer used car batteries for bait. + Rhials: + - bugfix: Admin-only deadchat broadcasts don't append a second "this message is + for admins only" string for every admin online. + ShizCalev: + - qol: Oven trays now count as valid trays to cut food on. + - rscadd: The game settings menu can now actually be accessed through the escape + menu. +2024-06-25: + 00-Steven: + - refactor: Modular computers (PDAs, laptops, etc) and their applications have had + their item interaction logic refactored. Please report any issues. + - bugfix: You can deposit cash into IDs inside of PDAs by slapping it against the + PDA again. + ArcaneMusic: + - admin: Admins have a new secret to mass revive and heal all players on the server. + Bisar: + - bugfix: The light eater can now again eat lights from things with lights. + DaCoolBoss: + - spellcheck: fixed typos in a few heretic items + - spellcheck: rewrote parts of the lunar heretic's abilities, items and traumas + - spellcheck: rewrote GLA device's description for clarity + - spellcheck: Grapple gun's description has been updated. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fluffles: - bugfix: emoji show up in the messenger UI - bugfix: emoji show up in the message server monitor UI @@ -997,6 +1927,7 @@ - bugfix: deadchat pda messages show the imprinted sender's name instead of whoever is holding the pda - bugfix: emoji show up in deadchat pda messages +<<<<<<< HEAD Goat: - rscadd: Added boards for the library's book binder and scanner, printable at the service fabricator once computer tech is researched. Spritework done by lepiromano. @@ -1010,19 +1941,80 @@ color corresponding to the type of said dart loaded in it instead of a generic bullet sprite. SkyratBot: +======= + FlufflesTheDog: + - bugfix: printed medical beds are no longer randomly offset + Goat: + - rscadd: Added boards for the library's book binder and scanner, printable at the + service fabricator once computer tech is researched. Spritework done by lepiromano. + GoblinBackwards: + - bugfix: Fixed ctrl-click not dragging the bluespace gas sender or hydroponics + trays. + Guestify: + - bugfix: Fixed secbots and mulebots bold text + IsaacExists: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Shrapnel removal messages now have closing parenthesis, removed unnecessary punctuation. - spellcheck: The nutriment pump implant's description in the lathes are no longer typo'd. +<<<<<<< HEAD - bugfix: printed medical beds are no longer randomly offset - admin: Admins have a new secret to mass revive and heal all players on the server. - rscadd: wawastation stand-in shuttle +======= + Jacquerel: + - bugfix: Minebots, Tamed Wolves, and Regal Rat Minions will now give you some space + if you start attacking yourself, rather than joining in. + MGOOOOOO: + - bugfix: Orange balloons are no longer invisible in the hand slot. + MTandi: + - qol: NT Frontier app now allows to select experiments from inserted data disks + - bugfix: Autopsy experiments for techweb can be performed roundstart + MrDas: + - bugfix: Fixed the duration of wizard's mutate spell. + Rhials: + - sound: The abductor team now has their own antag stinger. + - bugfix: Drone fabricator subtypes that spawn pre-loaded now actually start with + materials inside. + - bugfix: The binocular fabriactor on the MediSim shuttle works again. + ShizCalev: + - image: Foam darts in the magazine of a toy/riot C20R45 will now show the correct + color corresponding to the type of said dart loaded in it instead of a generic + bullet sprite. + SmArtKar: + - bugfix: Fixed crayons not being usable on anything except turfs (including washing + machines) + - rscadd: You can now click pens! Clickity clickery click! + - bugfix: E-Daggers can now break lockers/other renamable objects, and pendrivers + can now extract their electronics. + - code_imp: Most pen typechecks now check for writing implements. + SyncIt21: + - bugfix: you can piggyback on players again + - bugfix: you can strip someone while lying down + - bugfix: paraplegics can buckle others & themselves to chairs & mobs + - qol: improved feedback messages when an action cannot be done + mc-oofert: + - bugfix: wawa ordnance air alarms dont send alerts roundstart + - qol: wawa ordnance gets more portable atmos machines to compensate for having + next to no actual portable atmos machines + - bugfix: wawa ordnance gets 3 random roundstart cores (forgor to add) + necromanceranne: + - bugfix: The Infiltrator module now has the same welding protections as the engineering + module. + - bugfix: The infiltrator module now properly protects you from head impacts. Helpful + if you wipe out on your hoverboard while fleeing the cops. + - code_imp: Improves the definitions for welding protection values. + - bugfix: The Stimmed mutation now has the appropriate instability value for a largely + meaningless mutation. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The nullblade, a nullrod variant that is weaker outright, but can inflict severe wounds by performing a sneak attack. Debilitate your target or attack from behind. - bugfix: The shortsword sprite no longer has a misaligned handle. - code_imp: Organized the nullrod file, and removed some unnecessary subtyping on various types of nullrods. +<<<<<<< HEAD - bugfix: Refactored borg omnitool code, fixing most of the unique interaction issues. - bugfix: The Infiltrator module now has the same welding protections as the engineering module. @@ -1090,11 +2082,52 @@ - qol: ' The xenobio console''s monkey placing command also clears dead monkeys on the tile.' - bugfix: Spraycans can once more paint things. +======= + norsvenska: + - bugfix: '[IceBox] The Head of Personnel''s Requests Console announcements now + correctly display the HoP as the announcer, rather than "Unknown"' + san7890: + - bugfix: You should no longer attack mobs that don't have a chest in the chest + (bots). + the-orange-cow: + - bugfix: Medicated suture, advanced regenerative mesh, and mourning poultice reactions + should more consistently spawn the items they are meant to produce. + uaioy: + - spellcheck: fixed typo in raptor emote + vinylspiders: + - bugfix: fixes an issue that was causing the quirk config tooltips to render behind + the window, making them nearly impossible to read. + zxaber: + - bugfix: Refactored borg omnitool code, fixing most of the unique interaction issues. +2024-06-26: + Ben10Omintrix: + - refactor: vibebots are not basic bots + - rscadd: vibebots will now seek out the depressed and cheer them up + FlufflesTheDog: + - bugfix: multi-z hole repair works better, especially when the turf below is blocked + by items + GPeckman: + - bugfix: Analyzers should work on bioscrambler anomalies again. + GoblinBackwards: + - bugfix: Interacting with an assembly bomb in hand will now allow you to interact + with the attached assembly instead of opening the gas tank UI. Right-clicking + will display the gas tank UI instead. + Guestify: + - bugfix: The visor of the welding mask no longer goes down when you enable internals + NewyearnewmeUwu: + - qol: ' The xenobio console''s monkey placing command also clears dead monkeys + on the tile.' + SmArtKar: + - bugfix: Spraycans can once more paint things. + - bugfix: RND console now properly rounds research points + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: alt click runtime no more when using style meter - code_imp: improved alt & ctrl click code Vekter: - balance: The Event Horizon Anti-Existential Beam Rifle now requires Unregulated Bluespace Research to be constructed. +<<<<<<< HEAD 2024-06-28: LT3: - rscadd: New DeForest heavy medical kit, technician satchel @@ -1109,11 +2142,66 @@ effects from being 1-small as well - bugfix: Lizards and Moths don't deathgasp twice when they die - bugfix: Fixed cyborg omnitools being unusable on some things +======= + Watermelon, Mayhazah: + - balance: Drastically reduces the power consumption and max charge of power cells + - balance: Added a new stock part called the battery, used primarily in the construction + of APCs and SMESs. + - rscadd: Suiciding with a cell/battery will shock you and potentially dust you/shock + the people around you if the charge is great enough. + carlarctg: + - bugfix: There's now a limit to how many dental implants you can cram into your + mouth, which is governed by your species' teeth limit. + - refactor: Most species have 32 teeth, due to being based on humans, weirding me + out when thinking about their teeth, or lack of enough information + - refactor: Moths and flypeople have NO teeth. They CAN'T get dental implants. I'm + NERFING moths. + - refactor: Lizards have seventy-five (!!!) teeth. Lizards are weird. + hyperjll: + - balance: Thanks to incredible strides in selective slime breeding, slimes require + substantially less nutrients to grow into adults, and split into children. + jlsnow301: + - rscadd: 'Bitrunning: You can now choose your hacker alias in prefs.' + - rscadd: Bit avatars get orbit icons. + mc-oofert: + - qol: space dragon can see in the dark and the invalid rift location alert is more + informative + - rscadd: wawastation stand-in shuttle + - bugfix: durand shield doesnt immediately depower the mech when taking stamina + damage + - balance: durand shield is a bit stronger +2024-06-28: + Ben10Omintrix: + - refactor: firebots are now basic bots + Deadgebert: + - rscadd: Crystallizer boards added to Delta and Tram HFR rooms + GPeckman: + - bugfix: Protolathes/Circuit Imprinters/Techfabs with better parts should now print + items faster again. + GremlinSeeker: + - bugfix: Fixed disconnected APC on birdshot and other minor service fixes. + Kapu1178: + - bugfix: MODsuit pathfinder module works. Again. + - code_imp: AI pathfinding should produce slightly better paths. + MTandi: + - rscdel: Removed tank dispenser UI to use left/right clicks instead + - rscadd: There is a chance that Spess Knife will be in a mail for engi and clowns + - qol: Updated Microscope UI + - qol: Microscope is easier to use - you can remove dish with right click and swap + dishes + Melbert: + - bugfix: Fixed cyborg omnitools being unusable on some things + - bugfix: Fix timestop being 1 tile too small again, and fixes a lot of other field + effects from being 1-small as well + - sound: Glug-glug sound when dragging a leaking gas tank + - bugfix: Lizards and Moths don't deathgasp twice when they die +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melberte: - rscadd: Cool Sword Cursor Maintenance App ShizCalev, SpaceLove: - refactor: Techweb strings are defined now so to maintain modularity - balance: Research papers will have less overall point generation. +<<<<<<< HEAD SkyratBot: - rscadd: Crystallizer boards added to Delta and Tram HFR rooms - balance: Mediborg surgical omnitool upgrade makes the health analyzer advanced @@ -1161,6 +2249,11 @@ - balance: Adamantine golem shells require 3 sheets rather than 1, due to unknown circumstances. - bugfix: Fixed disconnected APC on birdshot and other minor service fixes. +======= + SmArtKar: + - bugfix: Retracted pens can be put into PDAs + SyncIt21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds examines, screentips & balloon alerts for flatpacker, flatpack box & cart - qol: adds correct material colour insertion animation for flat packer, continuous @@ -1178,16 +2271,52 @@ - bugfix: correct cost of the design scaled with `creation_coefficiency` is displayed in the UI - code_imp: overall improved code quality of all things flat pack related +<<<<<<< HEAD Vekter: - bugfix: Fixed the visibility of a pipe in Northstar's ordnance lab - bugfix: Fixes the door-bolting buttons in the dorms and bathrooms on Birdshot. 2024-06-30: +======= + - bugfix: actions buttons can be dragged anywhere again + Viralmilk22: + - rscadd: Shifted up the service departments on Birdshot. + - rscadd: Added an arcade. + alien3301: + - balance: Mediborg surgical omnitool upgrade makes the health analyzer advanced + carlarctg: + - bugfix: Fixed hunger affecting your speed in nograv + hyperjll: + - balance: 'Due to selective breeding of slimes, some species require roughly 3x + more plasma than normal to activate a plasma reaction. Slime extracts affected + are: Oil, Adamantine, Orange, and Gold. Yellow slimes require 3x more blood + to activate a blood reaction.' + - balance: Oil slime extracts have become less potent during a plasma reaction due + to selective breeding conditions. + - balance: Gold slime extracts give rise to one less monster during a plasma reaction + due to selective breeding conditions. + - balance: Yellow slime extracts have become less potent during a blood reaction + due to selective breeding conditions. + - balance: Adamantine golem shells require 3 sheets rather than 1, due to unknown + circumstances. + necromanceranne: + - bugfix: Headprotector modules and constructor modules work properly once more. + - bugfix: Space heaters do not completely drain their starting cell while trying + to change their room temperature by a few degrees. + uaioy: + - bugfix: infiltrator modsuit sprite is not misaligned anymore + vinylspiders: + - qol: 'polypore mycelium no longer contains sugar, preventing it from instantly + creating fringe weaver beverage when ground up. qol: sugar may be acquired from + grinding fireblossoms instead of polypore mycelium.' +2024-06-29: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - rscadd: Ashwalkers now start out allied to lavaland fauna (except for raptors). Attacking the fauna will break this alliance with the attacked beast and any who witness it. - bugfix: Ashwalkers are now actually in the ashwalker faction, instead of the neutral one. +<<<<<<< HEAD JohnFulpWillard, Tattax: - rscadd: Monkeys can now wear all jumpsuits. - rscadd: Bioscrambler anomalies can now give monkey legs. @@ -1206,11 +2335,37 @@ - bugfix: Airlocks will now correctly said what other airlock they are cyclelinked with. - bugfix: Portaturrets no longer go invisible when unwrenched from the ground. +======= + EnterTheJake: + - rscadd: A new Anomaly organ has been introduced, The Voltaic Combat Cyberheart! + Higgin: + - bugfix: Mood buffs/penalties are now properly equal on both positive/negative + sides. + JackEnoff: + - balance: Changelings regenerate chemicals faster when not on fire + - balance: Changelings regenerate chemicals slower when on fire + MGOOOOOO: + - qol: The "Dental Implant" surgery no longer forces itself to restart after implanting + one pill. Now implanting pills in the surgery has another step to either search + the patient's mouth for another tooth to implant, or cauterization to end the + surgery. + Melbert: + - bugfix: Fixed modsuit interactions slightly. No longer requires combat mode to + use tools on it, plasma core works as intended as well. (Using combat mode, + however, will make you insert the item) + - refactor: Refactored lockboxes + - refactor: Refactored medbot skin application + Moonlit2000: + - bugfix: peg legs can't bleed + ShizCalev: + - bugfix: Toggling ambient ship sounds will now instantly turn it on/off. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Deafened mobs will no longer hear the station's ambient sounds. - bugfix: Fixed ambient sounds resetting their loop when entering different bodies (ie admin ghosting, being moved to other mobs, ect.) - bugfix: Monkeys that become sentient through the sentience helmet will no longer be notified that they can ventcrawl. +<<<<<<< HEAD - bugfix: Toggling ambient ship sounds will now instantly turn it on/off. - bugfix: The soups wiki page no longer has error icons for soups that don't have unique sprites. @@ -1296,3 +2451,97 @@ properly - code_imp: Various improvements to taur leg code - code_imp: Taur bodies are properly subtyped +======= + - bugfix: Airlocks will now correctly said what other airlock they are cyclelinked + with. + - bugfix: Portaturrets no longer go invisible when unwrenched from the ground. + SmArtKar: + - code_imp: Rewrote a portion of storage UI code to allow it to be influenced by + UI style. + - image: Prettified storage UI and made it affected by UI theme. + - image: Ripley and Ripley-based mechs now have consistent outlines + SyncIt21: + - bugfix: Holodeck closet & crate items are marked as holograms as well + - bugfix: Holodeck closet & crate items delete themselves when the program is changed + - bugfix: you can access your inventory when lying down + TheBoondock: + - sound: added liquid pouring sounds to pouring of any reagents + Thlumyn: + - bugfix: fixed active turfs in icebox listening post + Vekter: + - bugfix: Fixed the visibility of a pipe in Northstar's ordnance lab + - rscadd: Bitrunners can now access specific bounties asking for the item rewards + from specific bitrunning domains. + - bugfix: Fixed bitrunner pulling from a pool of literally every bounty available. + - bugfix: Fixes the door-bolting buttons in the dorms and bathrooms on Birdshot. + aaaa1023: + - bugfix: Removed a bush trapped inside a wall above morgue on Tramstation + carlarctg: + - rscadd: Reworked blood loss effects on the user to be much more noticeable. + - code_imp: Changed the blood volume defines to be based on the BLOOD_VOLUME_NORMAL + define, with a multiplier of blood loss applied, to be more understandable. + - rscadd: Added tons of new mutations to Genetics, alongside some recipes! + - rscadd: Thermal Adaptation has been made a combination mutation from the stronger + but narrower Cold and Heat adaptations. + - balance: Cryobeams have 9 tile range, and fiery sweat doesn't cause spread on + contact. + - image: Added some neat new sprites for the new mutations, and added a greyscale + version of the magic hand sprites. + - code_imp: Infinitesmally improved mutation code. + delingar: + - bugfix: Lavaland elite are at lavaland fauna faction now + hyperjll: + - bugfix: Inducers now accept megacells AND regular cells. + junkgle01: + - bugfix: added a keycard auth to QM room + necromanceranne: + - bugfix: Emergency firesuits no longer hide your gloves. + - qol: Punching bags are now a equal method of training to the fitness machinery. + - qol: Boxing grants more experience overall for participation. +2024-06-30: + Exester509: + - spellcheck: Fixed two typos in the heretic lore + Ghommie: + - bugfix: cigarettes and vapes are no longer treated as clothing (eg. They no longer + get shredded and need to be repaired with... cloth). + GoblinBackwards: + - bugfix: Fixed gas canister shields turning themselves off in unpowered areas when + they weren't drawing any cell power. + LT3: + - code_imp: Blood filter only pings and says finished when it's actually finished + Sadboysuss: + - bugfix: fixed cyborgs and monkeys not being able to buckle to chairs + SmArtKar: + - bugfix: Storage no longer deletes all of its viewers upon being deleted + - bugfix: Storage UI now renders properly + - bugfix: Guns no longer can be overfilled by 1 bullet + - bugfix: Russian revolvers now spawn with only 1 live round as originally intended, + and click when firing a blank. + Xander3359: + - bugfix: Fix being unable to add a flux core to new the combat heart cybernetic + aaaa1023: + - bugfix: Fixed the camera offset for the navigation console on a handful of Whiteships. + - bugfix: Fixed the Pubby Whiteship drifting sideways through hyperspace when in + flight. + - bugfix: Fixed the Kilo Whiteship flying backwards through hyperspace when in flight. + - bugfix: The Birdshot Whiteship should actually be able to spawn now. + - spellcheck: fixed spelling of "aggressive" in the shuttle manipulator description + for the Birdshot Whiteship. + carlarctg: + - spellcheck: Syndicate jaws of life are now jaws of death! + - spellcheck: Made its desc. more descriptive, stating that its faster. + - rscadd: Heretics can now sacrifice Cultists for sweet loot. + - rscadd: Cultists can now sacrifice Heretics for sick trinkets. + - rscdel: Removed Bastard Blade from the game, code, and life + - balance: Aggressive Spread now rusts non-turfs next to you as well + - balance: Raise Construction cd raised to 7, now breaks rust walls as well, improved + autoaim making it actually usable midfight + - refactor: Auto-aim code now works on any atoms if configured + grungussuss , Kayozz: + - sound: exosuit fabricators, Autolathes and Techfabs will now produce sounds when + printing items + grungususs: + - bugfix: fixed the name of a request console in the medical sec outpost on metastation + mc-oofert: + - bugfix: both engineers and roboticists may now access the controls of a firebot +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index ab120efd6ca..526fe6b10a4 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -1,4 +1,5 @@ 2024-07-01: +<<<<<<< HEAD LT3: - rscdel: Removed references to security medic cargo packs - code_imp: Blood filter only pings and says finished when it's actually finished @@ -50,10 +51,16 @@ xXPawnStarrXx: - rscadd: Added new medical tools 2024-07-02: +======= + Ben10Omintrix: + - balance: raptors will now knock off their rider and disable them if hit by any + energy projectiles or if they recieve any stamina damage +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Chestlet: - bugfix: Nanotrasen sent us a batch of faulty canisters. They've been recalled and replaced with less faulty canisters. - bugfix: Zauker SM interaction works correctly now. +<<<<<<< HEAD Kapu (ported by StrangeWeirdKitten): - bugfix: Ambience buzz will now respect ship ambience prefrences for observers. - sound: Ambience buzz requires APC enviorment power to function @@ -74,6 +81,64 @@ a few invocation types. - balance: portable air scrubbers scrub in a 3x3 square + hold as much gas as a canister +======= + DaCoolBoss: + - image: Relics ("strange objects") now have unique sprites. + Iajret: + - bugfix: fixed blood loss knocking you down at somewhat safe (~80%) blood levels + LemonInTheDark: + - rscadd: Shield generators and shield gen walls now glow a light blue. Pretty! + MTandi: + - qol: Made light tiles available in the crafting menu + - qol: Circuit tile variants can be cycled in-hand + - rscadd: Moved loose tiles and wall frames from lathe designs to other tiles and + frames in the crafting menu + Melbert: + - rscadd: Humanizing a monkey removes undergarments such as socks + - qol: Handheld Genetic Scanners fit in Geneticist equipment suit storage + Pickle-Coding: + - code_imp: Supermatter zap power generation takes perspective of the machines subsystem. + Rhials: + - rscadd: Bounty Hunter teams now have personalized announcements for when they + are spawned in. + ShizCalev: + - bugfix: The power for all science burn chambers across all maps now works properly. + SmArtKar: + - image: Captain's spare safe received a new texture + - bugfix: Vent-born wendigos no longer create one-way portals + - image: Decluttered card textures + - bugfix: You can grind slime extracts in reagent grinders once more. + - bugfix: Pyrokinesis bolts no longer have infinite range and create trails of fiery + doom. + - qol: RD's labcoat is now classified as an actual labcoat instead of a glorified + jacket, allowing them to put science-related stuffs into it + - image: You can now toggle RD's labcoat + ViktorKoL: + - rscadd: Added a new UI for heretic research. + Wallem: + - rscadd: The detective now starts with the DET.ekt Skillchip, which allows them + to identify chemicals and bloodtypes by taste. + YesterdaysPromise: + - image: updated halloween metoer sprites. + aaaa1023: + - qol: 'Increased the viewrange in the navigation camera console on the following + shuttles: Silverscale pirate shuttle, the Flying Dutchman pirate shuttle, the + IRS pirate shuttle, and the Greytide pirate shuttle.' + - bugfix: Fixed the Battlecruiser corvette, Silverscale pirate shuttle, and the + Greytide pirate shuttle flying in incorrect directions in hyperspace. + - bugfix: Fixed the Navigation console camera eye on various pirate ships being + off centre. + carlarctg: + - spellcheck: Heretic spell invocations now use one dead language per path. Altered + a few invocation types. + grungussuss: + - qol: Windoors now stay open for 8 seconds instead of 5 + - qol: Secure windoors now stay open for 5 seconds instead of 2 + mc-oofert: + - bugfix: brig cell timer ui works properly now + - bugfix: wawastation arrivals has firealarms so you may now leave + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Mecha weaponry is capable, for the first time ever, of experiencing recoil. This was an intended mechanic, I promise. The code just literally never worked. - bugfix: Mecha bump melee attacks and click melee attacks are now on the same cooldown, @@ -82,6 +147,7 @@ - bugfix: You must be in combat mode to punch objects and to bumpsmash into objects. - bugfix: Stops mecha being able to punch literally any object and damage them. - code_imp: Tidies up some of the autodoc comments for mech weapons. +<<<<<<< HEAD - rscadd: Shield generators and shield gen walls now glow a light blue. Pretty! - bugfix: You can grind slime extracts in reagent grinders once more. - bugfix: Fixed some UI bugs in the power monitor screen. @@ -176,6 +242,17 @@ - bugfix: Fixed experimental dissection surgeries giving too many points - balance: 'Techweb: Moved NTNet relay back to tcomms node' - balance: 'Techweb: Moved blood pack and chem pack to the starting node' +======= + spockye: + - bugfix: fixed Wawastation areas + - bugfix: fixed wawastation disposals + thegrb93: + - bugfix: Game not refocusing after closing a TGUI + xXPawnStarrXx: + - rscdel: Removed cordons on deathmatch maps, since they're autoadded now. +2024-07-02: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Moved bedsheet bin interactions to the item interaction code. Please report any issues. - qol: Made bedsheet bin tool interactions right click, such that left click is @@ -184,7 +261,10 @@ - qol: Added more feedback to failing to hide items in bedsheet bins. - sound: Made putting items in bedsheet bins not silent (If the items have associated pickup/drop sounds). +<<<<<<< HEAD - image: Fixed shading on some metal ingots. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Deconstructing light switches now uses the proper tool action and tool usage code, please report any issues. - bugfix: Attempting to deconstruct a light switch by unscrewing it no longer makes @@ -198,6 +278,7 @@ - qol: Added an examine hint denoting light switches are screwed to the wall. - qol: Added visible messages for someone deconstructing a light switch parallel to deconstructing intercoms. +<<<<<<< HEAD - bugfix: portascrubbers also scrub the tile theyre on - rscadd: Ghost role food truck merchants may occasionally turn up at the station. - rscadd: Adds a new fugitive hunter type, MI13 secret agents. @@ -275,12 +356,126 @@ - rscadd: You can now microwave station pets that you can pick up, with predictable outcomes - image: The sprites for the projectile dampener field have been updated +======= + Bisar: + - qol: Loot panels should update more predictably and informatively now. + - code_imp: Lootpanels have more consistent logic on when they automatically update. + Jolly: + - code_imp: Behind the scenes, maps had a little bit of tweaking. If you see things + rendering in weird ways, or they don't look like how they used to/supposed to, + please report them on GitHub! + Kapu (ported by StrangeWeirdKitten): + - bugfix: Ambience buzz will now respect ship ambience prefrences for observers. + - sound: Ambience buzz requires APC enviorment power to function + Kocma-san: + - qol: you can now swap pens in pdas + LemonInTheDark: + - bugfix: Some varieties of snow now visually melt properly again when burned + ShizCalev: + - bugfix: Fixed a number of shuttles having parts (such as lattices) completely + disappearing. + - bugfix: Fixed the ceilings above shuttles on station maps being full-bright. + - bugfix: Fixed lattices sometimes appearing at random locations in space on station + maps. + - bugfix: Cleaned up a number of accidentally placed objects in space across all + station maps. + - bugfix: Fixed a false positive with the mapload_space_verification unit test failing + on turfs that weren't actually part of shuttles. + - code_imp: Added a unit test that automatically finds all base space turfs with + objects on them, as well as non-space turfs that are set to space areas (meaning + that these squares weren't lit properly.) + SmArtKar: + - bugfix: You no longer get dusted upon trying to store your supermatter sliver. + - bugfix: Fulton animation is no longer sideways. + - bugfix: Hand of Midas now works point-blank. + TheBoondock: + - sound: added pickup and drop sound for beakers + carlarctg: + - bugfix: Fix /datum/weakref appearing when linking airlock heretic portals + hyperjll: + - bugfix: 'Hostile plant monsters (EX: Killer Tomatoes) no longer act hostile toward + Seedlings.' + jlsnow301: + - bugfix: Fixed some UI bugs in the power monitor screen. + lorwp: + - bugfix: extinguishers now can be filled with subtypes of water again (Namely, + holy water) + mc-oofert: + - balance: Facehuggers dont make people go to sleep but muffles speech + - code_imp: Very very minor xenomorph code cleanup + - refactor: Muzzles are now an element + - balance: portable air scrubbers scrub in a 3x3 square + hold as much gas as a + canister + nikothedude: + - rscadd: Being cursed now enables disembowlements/cranial fissures outside of hardcrit +2024-07-03: + 00-Steven: + - bugfix: Fixed telekinesis letting you grab people at a distance, and teleport + them to you by strangling them. + DaCoolBoss: + - bugfix: Removed three traitor posters from Cargo Warehouse's walls. (Metastation) + - balance: Added one traitor poster each to the QM's Office, Vault and Evidence + Storage to compensate. (Metastation) + - rscadd: Ghost role food truck merchants may occasionally turn up at the station. + - rscadd: Adds a new fugitive hunter type, MI13 secret agents. + DrDiasyl aka DrTuxedo: + - sound: Shoves now produce more meaty sound! + GremlinSeeker: + - bugfix: fixed Birdshot bar and surrounding areas not properly connected to the + power grid. + LT3: + - qol: Crew monitor defaults to sort by vitals + MTandi: + - image: New linen bin / basket sprites + - qol: It is easier to do some required techweb experiments on Charlie station now + - bugfix: Fixed experimental dissection surgeries giving too many points + - balance: 'Techweb: Moved NTNet relay back to tcomms node' + - balance: 'Techweb: Moved blood pack and chem pack to the starting node' + MrDas: + - bugfix: Bolas now slowdown properly. + - bugfix: Cult bolas no longer leave in-hand sprite when they ensnare to non-cult + user. + OrbisAnima: + - bugfix: Fixed the basic Sandwich recipe and tags, now it matches the description + and original intent. + - bugfix: Brought the fishing rewards experiments to normal values. + - bugfix: Bio Emergency crates now bring Bio Suits and Hoods compatible with the + Security Hoods and Suits Schematics. + Rhials: + - balance: All cameras in bathrooms and showers have been removed. + SmArtKar: + - bugfix: Dark matteors no longer claim that they have missed when they actually + impacted the station + - image: Fixed shading on some metal ingots. + Sosmaster9000: + - balance: 'Xenobiologists now have a BZ-filled containment pen. Don''t breathe + that! + + balance:Some items which either cannot be printed elsewhere or are part of game + progression (e.g. teleporter endpoints and, of course, Nanners) have been moved. + Alien Spawnpoints are in the same spot.' + bob-b-b: + - rscadd: Added flatpacker & multitool to all R&D labs + carlarctg: + - rscdel: Removed Trichromatic Larynx per @mothblocks decision that it looks uggo. + - rscdel: Replaced heckacious laryncks' color and size changes with random bolding, + italics, and underlining. + - rscadd: Stoner has been un-locked and replaces TL in the above's recipe. + - bugfix: Fixed elastic arms users being unable to use abstract items like mending + touch or shock touch. + - bugfix: Fixed mending touch being bad + mc-oofert: + - bugfix: portascrubbers also scrub the tile theyre on +2024-07-04: + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Moved bedsheet interactions to the item interaction code. Please report any issues. - bugfix: Bedsheets adjust their offset to match that of the living they're tucking in. - sound: Bedsheets use the cloth drop/pickup sounds instead of being silent. - qol: You can tuck someone in telekinetically. +<<<<<<< HEAD - rscadd: mecha wire that shoots you or anyone nearby if pulsed or cut - bugfix: mecha shock wire shocks you - bugfix: Reverts the fully interactive lootpanel, please just refresh it if you @@ -315,10 +510,57 @@ - bugfix: Mending touch no longer damages non-humans - bugfix: fixes mansus grasp not clearing runes - image: Fixed the cargo crate having wrong stripe width in open state +======= + ArcaneDefence: + - rscadd: You can now microwave station pets that you can pick up, with predictable + outcomes + Ben10Omintrix: + - bugfix: fixes mansus grasp not clearing runes + - bugfix: fixes not being able to clean microwaves + Bisar: + - bugfix: Dastardly clowns will no longer be able to get counted for three times + the steps by moving diagonally. + Ghommie: + - bugfix: Fixed toggleable screen colors for glasses. + - code_imp: De-hardcoded, refactored the above, now-fixed feature. + - rscadd: Pumpkin hardhats and the hood of the flash suit now affect the color of + your screen. + - rscadd: Prism glasses, obtainable through xenobiology crossbreeding, now also + affect the color of your screen. + - qol: You no longer need to reach the very edge of the game screen to reach the + maximum zoom range when scoped. + LT3: + - sound: Changed blood filter cycle sound + MTandi: + - image: Fixed the cargo crate having wrong stripe width in open state + - rscadd: Added Pipe Scrubber portable atmos machine + Melbert: + - rscadd: Humonkeys and random corpse spawns now look more... human. + Paxilmaniac: + - image: The sprites for the projectile dampener field have been updated + Profakos: + - bugfix: Instruments enhanced with portable tuning can perform the rites that have + been granted + SmArtKar: + - image: Some gloves have received new sprites + - bugfix: Mending touch no longer damages non-humans + - rscdel: You can no longer get turned into a dullahan by a genetic meltdown + - refactor: Refactored genetic meltdown code into datums, making it more extendable. + - image: Updated diamond stacks to fit its "unstacked" version. + - refactor: Bayonet attachment is now a component. + SyncIt21: + - bugfix: omni crowbar tool interaction for replacing tiles has been fixed + - bugfix: techfab screentip does not runtime when you hover over it with an omnitool + multitool + - bugfix: medi borgs can do brain surgery again + - code_imp: improved multitool & general tool code for some machines + - bugfix: you can hold your wound while resting via ctrl click +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: material container won't consume the contents of an item if that item itself is rejected for any reason - qol: you can use any storage medium & not just bags/boxes to dump stuff into material containers +<<<<<<< HEAD - balance: Facehuggers dont make people go to sleep but muffles speech - code_imp: Very very minor xenomorph code cleanup - refactor: Muzzles are now an element @@ -354,6 +596,70 @@ - rscdel: Removed science variant of plumbing RCD - bugfix: Fixed a bug when machines without stock parts didn't spawn frames on deconstruction - bugfix: Fixed vat grower not growing +======= + - code_imp: improved mouse drag & drop code + - code_imp: Improves cpu performance of transferring & removing reagents + - bugfix: plumbing machinery should have consistent volumes throughout the course + of its operations + - bugfix: plumbing iv drop now only accepts reagents from ducts but won't put reagents + back into it i.e. it only has a input pipe + Thunder12345: + - bugfix: Birdshot's AI core no longer has windoors concealed under open shutters. + ViktorKoL: + - rscadd: the Feast of Owls now leaves more dramatic messages in your chat + - sound: the Feast of Owls now has a little theme + carlarctg: + - qol: Transhumanist and prosthetic limb no longer conflict. If you pick the same + limb for both it uses the weaker prosthetic (dumbass) + - code_imp: Made the name for prosthetic limb global list more intelligible + jlsnow301: + - bugfix: Reverts the fully interactive lootpanel, please just refresh it if you + want to see new contents + - rscadd: 'Added a bitrunning deathmatch map: Island Brawl. Both ghosts and runners + get many more spawns than normal.' + - bugfix: Lowered the static vision time in domain load in. + - bugfix: Bitrunning hacker aliases are now much more permissive + mc-oofert: + - rscadd: 254 new vox lines + - balance: removed tasers, the unfirable turret gun, death wand, polymorph wands + and the enchanted modsuit from lootbox loot tables + - bugfix: lootbox guns should now mostly not have syndicate firing pins so you can + actually use them + - bugfix: deathmatch OSHA Violator map has actually functioning field gens now + - bugfix: being polymorphed in deathmatch does not count you dead + - bugfix: deathmatch cyborgs may not talk in binary + - qol: deathmatch map names are sorted alphabetically + - spellcheck: deathmatch final destination clown and chef loadouts have been renamed + to avoid confusion + - rscadd: mecha wire that shoots you or anyone nearby if pulsed or cut + - bugfix: mecha shock wire shocks you +2024-07-05: + Absolucy: + - qol: Linked speech now prevents messages from highlighting if its a message you + sent, or if you are the owner of said link.. + - qol: Linked speech messages are now marked as radio messages, for chat tab purposes. + ArcaneMusic: + - rscadd: The Illumination Applications technode now includes a gunkit for a new + gun, the Photon Cannon. + DATA_, with sounds made by Beebblie: + - sound: You will now be able to hear your muffled breathing while using internals. + This can be turned off in the game settings. + Ghommie: + - rscadd: A station trait that fills maintenance with glowsticks. + Iamgoofball: + - rscadd: You can now craft a singularity hammer using all nine anomaly cores and + the supermatter. + LemonInTheDark: + - bugfix: Grass turfs will render properly now. Reworked how floors render, please + report any bugs! + - bugfix: Cameras now properly capture lighting + - bugfix: The layering seen in photos should better match the actual game + MTandi: + - bugfix: 'Techweb: Moved upgraded cyber organs to tier 3 from tier 4' + - qol: 'Techweb: Added fully augmented android scan discount experiment for Advanced + Cybernetic Organs techweb node' + - qol: Data disks are now printed in lathes instead of circuit imprinter +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Techweb: High yield explosive is now a discount experiment for Exotic Ammo node, giving more free points' - balance: 'Techweb: Replaced the botany/xenobio discount experiments with a new @@ -372,15 +678,37 @@ trees' - qol: Made air horn craftable from a spraycan and a bikehorn - qol: 'Techweb: Better wording on the slime scan experiment' +<<<<<<< HEAD - balance: Settlers are a bit slower on their steeds. - image: Goody case locked/unlocked sprites have been swapped again, having a gap for unlocked and no gap for locked. +======= + - refactor: Vat grower is a normal machine now that doesn't need plumbing + - qol: Cytology petri dish smartfridge starts with 3 random samples + - rscadd: Added protein powder condiment bottle, available in the cytology supplies + locker and the cargo pack + - rscdel: Removed science variant of plumbing RCD + - bugfix: Fixed a bug when machines without stock parts didn't spawn frames on deconstruction + - bugfix: Fixed vat grower not growing + - qol: portable scubber, pump and pipe scrubber are buildable as any other machines + OrionTheFox: + - rscadd: updated Icebox's lavaland ruin. The incursion grows... + Rhials: + - admin: Quiet-announce random events still announce to admins and can therefore + be rerolled. + Xackii: + - rscadd: 'New traitor mech: Justice. Emag fabricator to get it.' + Zergspower: + - bugfix: fixes borgs ability to climb + aaaa1023: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Increased view_range on the Psyker Bounty Hunters' Shuttle navigation console. - bugfix: 'Fixed the shuttle navigation console camera eye being incorrectly offset on: the SpacePol van, the Russian bounty hunters, the default bounty hunters, the Psyker bounty hunters, and the MI13 Foodtruck.' - bugfix: Fixed the SpacePol van, Russian bounty hunters, default bounty hunters, and Psyker bounty hunters' shuttles all flying in incorrect directions. +<<<<<<< HEAD - qol: Linked speech now prevents messages from highlighting if its a message you sent, or if you are the owner of said link.. - qol: Linked speech messages are now marked as radio messages, for chat tab purposes. @@ -460,6 +788,76 @@ 2024-07-09: LT3: - bugfix: Fixed medical stacks like mesh and sutures not treating wounds +======= + - bugfix: 'Fixed the following shuttles flying in unexpected directions: Pubby escape + pod, Humpback emergency shuttle, Pubby monastery shuttle, Birdboat emergency + shuttle, Birdshot emergency shuttle' +2024-07-06: + 00-Steven: + - image: Goody case locked/unlocked sprites have been swapped again, having a gap + for unlocked and no gap for locked. + ArcaneMusic: + - qol: Examining a windoor will now provide the construction steps, like other standard + buildable objects. + DaCoolBoss: + - code_imp: Cleaned up relic code. + - image: Added necrotech themed relics. + GoblinBackwards: + - bugfix: Firefighting backpack tank nozzle can be used to hit objects and destroy + atmos resin again. + MTandi: + - bugfix: Binary devices no longer ignore the volume of the output pipe network + - bugfix: Fixed the augmented organs experiment + OrionTheFox: + - image: fixed and touched up the icons for the Doorjack and Cryptographic Sequencer + (EMAG) + Seven: + - balance: Bloody footprint trails go a longer distance now. + SyncIt21: + - bugfix: Autolathe won't eat the borg omni tool + carlarctg: + - bugfix: Fixed temp n space adaptations not conflicting + - rscadd: Projectile Dampener field now reduces stuns and stamina damage from incoming + projectiles + hyperjll: + - bugfix: Reagent containers are no longer mysteriously fireproof. + mc-oofert: + - qol: CE and Engineer start with their hardhat as the respective welding hard hat + variant + necromanceranne: + - balance: Settlers are a bit slower on their steeds. +2024-07-07: + Holoo-1: + - bugfix: fixed ninja's adrenaline boost module not being rechargable + SyncIt21: + - bugfix: you can craft the singulo hammer with either a supermatter engine/shard + again +2024-07-08: + 00-Steven: + - bugfix: Fixes hacker alias name preference not working. + Ben10Omintrix: + - bugfix: raptors don't easily stress out in lavaland environments + Ghommie: + - rscadd: Night vision goggles now subtly tint your screen. + - rscadd: You can turn your night vision goggles off. Doing so removes the tint + and the eye protection malus. + - bugfix: Hoverboards properly dysfunction in space without any kind of support + underneath them. + - qol: Mood more promptly reacts to the beauty of an area as it changes, and not + just when changing areas. + - rscadd: Coroners (and potentially other mobs with the morbid trait), now like + degradated-looking rooms. + - rscadd: Aquariums now influence the beauty score of an area based on their contents. + - rscadd: Morbid people now get a positive moodlet when admiring an aquarium full + of dead fish, and a negative one when fish are alive. + - admin: Added a config that regulares random spawners weights. + - rscadd: 12% chance of a ouija board spawning in the chaplain office. Wawastation + always has one. + GremlinSeeker: + - bugfix: ' Birdshot botany is resized. bar is also smaller.' + - bugfix: Birdshot public shrine now uses the correct dirt. (Goodbye chasms) + LT3: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Advanced Medbay Equipment research node lowered to tier 3 - balance: Advanced Medbay Equipment now requires haloperidol scan experiment - balance: Haloperidol and cryostylane experiments can be performed roundstart @@ -467,6 +865,7 @@ - balance: Cryostasis now has Fusion instead of Controlled Plasma as a prerequisite - balance: Cryostasis cryostylane scan is now a discount experiment - balance: Crystallizer moved from Controlled Plasma to Fusion +<<<<<<< HEAD Majkl-J: - bugfix: Brings loadouts back on par with the old system mechanically Melbert: @@ -512,10 +911,22 @@ - bugfix: Fixed the bluescreen while setting a custom font in tgui panel - rscadd: 12% chance of a ouija board spawning in the chaplain office. Wawastation always has one. +======= + Loafin34: + - rscadd: There's a previously undiscovered variant of a nullrod, recently revealed + from the depths of the skating rink.. + Melbert: + - qol: Vending Machines have a search bar + - qol: Random player characters now look less like rainbow vomit and more like some + of the most average people you know. + SmArtKar: + - bugfix: Added a forgotten firelock on second floor of wawa +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed glass shards generated from falling vending machines or tackling windows not being able to embed into anyone. - refactor: Refactored embedding code to use datums instead of bespoke elements and ugly associated lists. +<<<<<<< HEAD - balance: Bait quality now influences the probabilities of getting a rarer fish compared to the most common one(s) - bugfix: paintings can be sponsored again @@ -528,18 +939,103 @@ xXPawnStarrXx: - bugfix: fixed my medical tools not being printable. 2024-07-10: +======= + - bugfix: You require breathing once more. + Toastgoats: + - rscadd: Added the designer EVA suit, a unique pirate hardsuit for Silverscales. + - balance: Increased the equipment available to Silverscales + - image: Sprites for the designer EVA suit + carlarctg: + - spellcheck: Renamed the organ thrower module to the 'organizer' + - spellcheck: Made its description more accurate. Did you know it instantly replaces + up to 5 organs in active surgery? + homexp13: + - bugfix: ' Examining a fishing spot twice with sufficiently high fishing skill + (or the skillchip) will get you a list of fishes that can ACTUALLY be caught' + jlsnow301: + - bugfix: Fixed the bluescreen while setting a custom font in tgui panel + - bugfix: Fixed the orbit icons scrolling sometimes + lorwp: + - rscadd: using 'skibidi' as a chaplain deity now gives you brain damage + mc-oofert: + - bugfix: defibrillator no longer has an abstract cell + - code_imp: defibrillator attackby replaced with item_interaction + - balance: All jetpacks are now modsuit jetpack speed + - rscdel: Adv. Ion Jetpack module has been removed + - bugfix: you may now use a legion core on an elite tumor + necromanceranne: + - balance: You can only stun someone with a shove if they have been shoved into + objects or people, or have been hit by telescopic batons, contractor batons + or the Mansus Grasp. + - balance: If someone is knocked to the floor, however, you can still disarm them + of any object with a shove. + - bugfix: Knight helmets no longer burn as though made of cloth. + - rscadd: Fletching starter kit! Make your own bow, shoot your friends in an unfortunate + workplace accident. Replace all those holy arrows you lost. + - bugfix: Bows now properly undraw once they have fired an arrow. + - code_imp: Bows now utilize overlays in order to display loaded arrows. Unique + overlays per arrow. +2024-07-09: + 00-Steven: + - qol: You can now copy blast door controller IDs directly onto shutters/blast doors, + avoiding the need to open a menu for each one. Additionally, this lets you fix + sets of roundstart shutters without needing to change the IDs on all of the + ones in that set. + ArcaneMusic: + - bugfix: Ore vents that are caught in the cross-fire of a lavaland tendril collapsing + will now spare the ore vent and it's associated turf. + Astrogem2: + - sound: Added audible zipping to winter coats. + DGamerL: + - refactor: refactored `GetExactComponent` to be 1641 compatible + Derpguy3: + - bugfix: Missing janitor access restrictions have been added to Birdshot's custodial + closet doors. + EnterTheJake: + - balance: Jetpacks are now briefly disabled by EMP. + - balance: Mirage module has been removed from Sec modsuits. + - balance: Security modsuits now spawn with a better cell and the jetpack module + preinstalled. + FernandoJ8: + - bugfix: humanoid species featured are randomized correctly once again + Ghommie: + - balance: Bait quality now influences the probabilities of getting a rarer fish + compared to the most common one(s) + GoblinBackwards: + - bugfix: Fixed missing wires leading to the port hallway APC on Birdshot. + Inari-Whitebear: + - bugfix: Fixed space heater heating power and power consumption + JackEnoff: + - bugfix: Welding helmet and hardhat will now properly protect against pepperspray + while its down + JohnFulpWillard: + - qol: You can now use a spoon or ladle on an ice cream vat to spill a reagent, + ridding the machine of all reagent of that type. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - code_imp: Behind the scenes, atmos machines (freezers/mixers) in maps were tweaked a bit. If you see them no longer connected to specific pipenets, please make an issue report, this is not intended behavior!! +<<<<<<< HEAD LT3: - qol: Hypospray and flashlight can be put in labcoat pockets Rhials: +======= + Kocma-san: + - qol: the disposal unit has been added to the cargo bay and miner's office. + - bugfix: missed disposal pipe returned at QM's office + LemonInTheDark: + - rscadd: Most door animations now better line up with when they are/are not passable. + Rhials: + - admin: Narrate verbs will now allow you to pick what text formatting span you + want to use before you send them, if any. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Certain items can no longer be purchased or be offered with a discount on a loneop uplink. This is stuff like base cards (functionally useless) or Overwatch Intel Agents (which break the role). - balance: Loneops may now purchase chameleon noslips, station blackout triggers, and station comms failure triggers. +<<<<<<< HEAD SkyratBot: - bugfix: Missing janitor access restrictions have been added to Birdshot's custodial closet doors. @@ -563,6 +1059,62 @@ preinstalled. - bugfix: fixed CNS rebooter/Changeling adrenaline not preventing/fixing stamina crit +======= + SmArtKar: + - bugfix: Blood filters should filter out reagents completely now instead of leaving + a small amount no matter what. + - image: You can now flip your security helmet's visor up with alt-click! However, + doing so will (obviously) expose your eyes. + - bugfix: Embedding now properly changes its values. + - bugfix: Bloody footprints no longer bloody your shoes even more when walked over. + SyncIt21: + - bugfix: paintings can be sponsored again + - bugfix: hydroponic trays take in all reagents "proportionally" from plumbing ducts + without leaving any behind + - bugfix: plumbing bottler pumps out all reagents "proportionally" into output beakers + Xackii: + - balance: 'Demon: bloodcrawl now deal damage when you using it.' + - balance: 'Demon: demon can eat only carbon human beings.' + Xander3359: + - bugfix: fixed CNS rebooter/Changeling adrenaline not preventing/fixing stamina + crit + carlarctg: + - qol: Using a multitool inhand tells you where the area APC is + - code_imp: Added the subtype vendor which lets admins and coders vend subtypes + of a path + - code_imp: Added the vendor and both varieties of omnitool to runtime station + grungussuss: + - sound: pen click now has a proper sound + - sound: scalpel cutting sound now has a clean sound. + - bugfix: fixed an unrestricted airlock in metastation brig maints + grungussuss, ported from Beestation: + - sound: abductee, hypnotized and brainwashed now have sound when becoming one. + mc-oofert: + - qol: blood bros get a hud to see eachother + - code_imp: teambased antagonists may not see the HUDs of other teams + rageguy505: + - bugfix: no more xenobio active turfs +2024-07-10: + Ghommie: + - bugfix: Fixed a whoopsie with bait-related calculations for fishing. + GoblinBackwards: + - qol: Docked emergency shuttles will always reset their departure timer when a + hostile environment is stopped, regardless of if the timer displays ETD or ERR. + Kocma-san: + - bugfix: Fixed lights stopping emitting light in some situations + SmArtKar: + - refactor: Refactored a lot of speech modifiers to use a component instead of copied + over code. + - bugfix: Living limbs can no longer make you touch ghosts or abstract concepts + of start, landmark, influence or job + - spellcheck: Fixed improper word usage and improved grammar for living limbs + - rscadd: Living flesh arms have a chance to actually touch the thing they're targeting + instead of pulling it. Careful with supermatter! + - bugfix: Exosuit Stress Failure experiment now works + SyncIt21: + - bugfix: stacking machines can be linked with its console via multitool + aaaa1023: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: 'Removed the shuttle manipulator entries for the following shuttles: Northstar ferry, Omegastation arrivals shuttle, and Donutstation cargo ferry. (These shuttles didn''t actually exist but they still had entries in the manipulator.)' @@ -571,6 +1123,7 @@ Pubby cargo shuttle, and Delta cargo shuttle.' - bugfix: Fixed the ERT bounty shuttle having incorrect offsets in the shuttle navigation console. +<<<<<<< HEAD - qol: the disposal unit has been added to the cargo bay and miner's office. - bugfix: missed disposal pipe returned at QM's office - rscadd: Living flesh arms have a chance to actually touch the thing they're targeting @@ -609,6 +1162,26 @@ instead, it uses the janitors regular area.' - bugfix: '[Birdshot] The entertainment center now has an APC.' - bugfix: '[Birdshot] A handful of smaller areas have received air alarms.' +======= + grungussuss: + - sound: Zippos, Lighters and cigarettes now have sound + lizardqueenlexi: + - bugfix: Amputating a paraplegic's leg no longer miraculously allows them to walk. + zoomachina: + - bugfix: fixed dubious chem dispenser feedback when the beaker is full +2024-07-11: + 00-Steven: + - bugfix: Using a dual wielded deck to add another card to a single card bases the + position of the resulting hand of cards on the position of the card. + Gaxeer: + - refactor: move `status_display_bottom_text` and `fire_alarm_light_color` to security + level prototypes + Ghommie: + - balance: Buffed the matrix flip skillchip duration. Lowered the stamina cost very, + very slightly. + - qol: You can now longer matrix-flip yourself into exhaustion, unless the emote + is unintentional. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: 'Bot Language station trait split into two: One that affects bots (retains the old weight and cost) and one that affects machine (half weight, double the @@ -617,6 +1190,7 @@ longer affect newly created machines or bots, just those present at game start - rscdel: Machine Language station trait cannot affect the Automated Announcer in telecomms +<<<<<<< HEAD SkyratBot: - refactor: move `status_display_bottom_text` and `fire_alarm_light_color` to security level prototypes @@ -936,6 +1510,17 @@ now just being allowed to beep. - qol: Moths that pray get a moffin 2024-07-21: +======= + SmArtKar: + - bugfix: Vapes use correct fill level overlays + - bugfix: You no longer try to pull out someones eyes in combat mode if they have + cranial fissure + Xackii: + - rscadd: You can emag grapple gun to use it on station. + carlarctg: + - bugfix: Fixed an oversight that caused knockdown vomits to stun instead. +2024-07-12: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 00-Steven: - bugfix: You can see runechat above fullscreen overlays on lower multi-z levels again. Rejoice, blind players. Please report any weird rendering layering issues. @@ -953,6 +1538,391 @@ - qol: N-spect scanner contextual screentips. - balance: Recharger security bounties ask for a quantity of 1, down from 3. - qol: security, cargo, and medbay have access to scanner gate boards. +<<<<<<< HEAD +======= + Deadgebert: + - balance: Moves XL beaker from Chemical Synthesis to Medbay Equipment + - balance: Removes Plumbing node and moves most items to Chemical synthesis node + - balance: Moves piercing syringe from Plumbing node to Advanced Medbay Equipment + GPeckman: + - spellcheck: The techweb no longer erroneously refers to MODsuits as exosuits. + - bugfix: The modsuit paint kit is no longer broken. + - bugfix: Mapped in grounding rods can be upgraded again (not that upgraded parts + do anything for it) and don't disappear when deconstructed anymore. + - bugfix: H.A.R.S. will no longer disable your skillchips or show you text reserved + for total brain removal. + - balance: If you remove a security officer's mindshield, then you can flash them + to make them your blood brother. + - qol: Clothing now tells you if it is pressure-proof and insulated enough for spacewalking + when examining it. + Ghommie: + - rscadd: Add the National Ice Cream Day holiday, which falls on the third Sunday + of July. + - balance: Tetrodotoxin can now be synthesized (bees, the odysseus mech, strange + seeds...) + - balance: Upped the amount of tetrodotoxin you can harvest from pufferfishes (or + any fish with the trait). + - spellcheck: Fixed some typos with the toxin. + GoblinBackwards: + - bugfix: Fixed being unable to cauterise wounds with improvised cautery tools such + as welders. + Hardly3D: + - rscadd: 'Added new hairstyle: Short Bangs 2' + Ical92: + - bugfix: gave tram's primary tool storage functional disposals + JackEnoff: + - balance: Experimentor will no longer duplicate Bags of Holding + Jolly: + - bugfix: '[Birdshot] The Ordnance freezer chamber is now linked to an APC, much + like the burn chamber.' + - bugfix: '[Birdshot] The Janitors quarters no longer uses `/area/station/commons`, + instead, it uses the janitors regular area.' + - bugfix: '[Birdshot] The entertainment center now has an APC.' + - bugfix: '[Birdshot] A handful of smaller areas have received air alarms.' + LT3: + - image: Incident displays got a makeover + MTandi: + - balance: War declaration gives 600 research points to the station + Melbert: + - qol: Roundstart Mannitol pills are 15u (up from 14u) + OrionTheFox: + - image: re-sprited Catwalk Floor Tiles to fit with TG floor tiles + Singul0: + - qol: adds an oxygen chamber for wawastation ordnance + - qol: adds some missing critical items needed to do ordnance and xenobiology + SmArtKar: + - bugfix: Steaks and meatpacks no longer have an absurd amount of blood stored inside + of them. + SyncIt21: + - bugfix: all icons in the crafting menu (some that you missed) are now fixed permanently + Yobrocharlie: + - bugfix: makes outpost45 cause less lag + aaaa1023: + - bugfix: Added a Mechbay power console to the Metastation cargo warehouse so that + the cargo ripley is able to be charged. + carlarctg: + - rscadd: Adds six new strange object powers! Drink dispenser, bioscrambler, recharger, + hugger, dimensional, disguiser. + - code_imp: 'Removed some unused code and items, and added a proc that returns a + random #colorstring.' + - qol: TV helmet no longer has gas mask FOV, nor does it give you flash sensitivity. + - qol: Since those are gone, removed pepper proof from it as well. + imedial: + - code_imp: added a crash report and removes an arg + jlsnow301: + - bugfix: Fixed a bluescreen in the heretic research ui + mc-oofert: + - bugfix: fixes the rightmost wawastation cryo cell + necromanceranne: + - balance: Cryokinesis and pyrokinesis more severely adjust temperature. + - balance: Cryokinesis forces a target to slow down on hit for a few seconds. + - balance: Pyrokinesis can ignite objects. + - balance: Temperature projectiles change the temperature of the target's contained + reagents. + r3dj4ck0424: + - qol: Our glorious corporate overlords have provided the funding for iron sheets + in Wawastation's robotics and science rooms at roundstart. + vinylspiders: + - bugfix: french berets will no longer force the user to speak spanish + zoomachina: + - balance: bluespace navigation gigabeacons are now unlocked with Applied Bluespace + Research +2024-07-13: + Ben10Omintrix: + - refactor: request managers have been refactored to typescript + - bugfix: request manager type filter now works + MTandi: + - bugfix: Fixed dead slime icon not showing when cores are extracted + - qol: Slime core removal surgery extracts all cores on completion + NewyearnewmeUwu: + - image: the smoking pipe's directional looks have been altered to make it less + ugly + Sadboysuss: + - rscadd: Changed the layout of birdshot engineering atmos and SM, added a proper + engineering storage area. + Singul0: + - bugfix: Fixes Icemoon syndie listening station APC's from being affected by station-side + events + SmArtKar: + - qol: Using ctrl + your quick MOD button now opens module selector on your mouse + position + - rscadd: A new ork mutation which can be acquired by mixing hulk and clumsy. + - bugfix: Other mobs no longer hear your breathing + - image: MOD hyposprays no longer use syringe fill sprites + - bugfix: Fixed tables and racks being climbable from half a mile away + - balance: Experimentor's reduction chance is multiplicative, and chance to copy + an object has been slightly lowered. + - qol: Heads of staff PDAs start with twice as much disk space + Vishenka0704: + - qol: With voting turned off for the dead, you can now understand why you can't + vote (being dead). + - admin: Voting switch for the dead players + necromanceranne: + - rscadd: Adds the Herculean Gravitronic Spinal Implant; an implant that makes you + better at athletics. You can upgrade it into an Atlas implant using a gravity + anomaly core. + - balance: Gravity anomaly cores have had their max number of cores reduces from + 8 to 6. + - balance: Your athletic ability allows you to climb faster. + vinylspiders: + - bugfix: password doors and shutters will now play their sound effects again instead + of just silently opening/closing +2024-07-14: + EuSouAFazer: + - rscadd: Cytology Lab has been added to Icebox + - rscadd: Delta now has soy seeds on the Cytology Lab + - bugfix: Cytology is playable again on Icebox + MTandi: + - rscadd: Added airlock pump atmos device to create cycling airlocks + carlarctg: + - bugfix: Fixed new charger power not working fior strange objects +2024-07-15: + Thedragmeme: + - bugfix: Fixes the Plague hat having what the Plague mask should have +2024-07-16: + 00-Steven: + - rscadd: Love is now stored in the heart. + - balance: Characters with the Friendly quirk now have physically bigger hearts. + Ben10Omintrix: + - bugfix: mothroaches will no longer be crawling out of bags every minute + FearfulFurnishing: + - bugfix: fixing speech modifiers being applied to a tongue's native languages. + FlufflesTheDog: + - bugfix: Attachment points on toolset implants have been improved, to prevent against + recycler related decouplings. + GPeckman: + - bugfix: You can't attach guns/drills/etc. to the Justice traitor mech anymore. + Ghommie: + - balance: Grinding fish no longer gives you uselessly high amount of blood and + gibs (unless they're very big) + - balance: tweaked the Linked Closets station trait. + - rscadd: Megaphones now affect text-to-speech. + - rscadd: Examining high-value paintings now can give a positive moodlet. + - qol: Observers can now zoom paintings in and out in the UI. + - bugfix: ACTUALLY fixed hoverboards being able to be used in space. + - balance: However, you can soar space with the holy skateboard. at a slower speed. + - qol: removed a redundant, annoying reach check that prevents casting a fishing + rod before the projectile is generated. + - qol: You can now unhook the currently hooked item of a fishing rod with right-click. + - balance: reduced the prices of some blackmarket items across the board. + - balance: the thermite bottle (from the contraband spawner and the blackmarket), + now spawns with 50u of thermite vs 30, enough to melt one reinforced wall. + - rscadd: Replaced the science googles from the blackmarket with a security + health + scanner HUD. + - rscadd: Replaced the single shotgun dart from the blackmarket with a box of XL + shotgun darts. + - rscadd: The donk pocket box from the blackmarket now comes in different flavors. + Hardly3D: + - bugfix: Added a preview assistant outfit, allowing assistant jumpskirts to be + previewed again on character preferences. + MTandi: + - qol: Research nodes can be queued, one per player. RDs can place their node at + the beginning of the queue. + Melbert: + - qol: Lattices now make the same footstep sound as catwalks + - qol: If you're in oxycrit (>50 oxy damage) or otherwise made unconscious through + other means, blood loss will only kill you if you're *actually* missing a lethal + amount of blood. + MrDas: + - bugfix: Clown operative reinforcements' uplink no longer break the syndicates' + economy by creating TC from nothingness. + Profakos: + - bugfix: Fixes dead raptors getting excited when petted or groomed + Sadboysuss: + - sound: all materials now have a sound for picking up and dropping + - code_imp: items now have pitch vary sound support for dropping and picking up + items + - bugfix: Wawastation xenobio is no longer filled with BZ + SmArtKar: + - admin: Ghosts can no longer create deathmatch lobbies or join existing ones when + admins disable minigames + - admin: Outfit manager UI no longer harddels after closing and thus is usable more + than once + - qol: Pathfinder MODule can now be triggered while wearing the MODsuit to implant + yourself without having to pull it out of the suit. + - spellcheck: Firelocks no longer output their full name in their balloon alert. + - spellcheck: Failure message when a xenomorph tries to force open a welded firelock + is now a balloon alert. + - bugfix: You can no longer fit an infinite amount of drivers into a clown car - + making spy-acquired clown cars usable! + - bugfix: Accelerator cannon projectiles no longer grow to absurd sizes after a + bit of travel. + - bugfix: Fixes overwatch glasses not adding HUDs + TheBoondock: + - sound: added pickup, dropping and opening sound for pill bottle + Xackii: + - rscadd: new wizard spells category - perks. + - rscadd: adds 9 wizard perks. + itseasytosee: + - image: Changed some default options in the character creator. + larentoun: + - bugfix: Correct emote plays when a human scream. Should have sound now. + lizardqueenlexi: + - bugfix: The Icebox ordnance lab is now once again a habitable temperature. + - bugfix: Icebox cytology now has cameras in it. + - bugfix: Atmosphere can no longer flow through closed necropolis gates. + - bugfix: You can no longer cause a bluescreen by attempting to recolor non-recolorable + loadout items. + necromanceranne: + - rscadd: Pipe pistols now magdump their entire magazine when fired. + - rscadd: Pipeguns and their subtypes have a knockback effect. + - bugfix: Pipe pistols cannot be bayoneted, as intended. + - bugfix: Junk rounds now actually do their extra damage effects against certain + mob types. Borgs across the Spinward tremble at the knowledge that these junk + weapons can obliterate them with ease. + paganiy: + - rscadd: If you can't shoot a gun, then... JUST TOSS IT AT THEM (for 0.5 seconds + of knockdown and 10-20 an additional brute damage) + r3dj4ck0424: + - bugfix: Destroying the jungle grass tiles in Tramstation's science wing should + no longer open a chasm. +2024-07-17: + 00-Steven: + - rscadd: Having a robotic voicebox installed now lets you use silicon emotes. + - balance: MMI'd brains/posibrains can now use silicon emotes. + - balance: Simple and basic bots can actually beep. + - bugfix: MMI'd brains/posibrains are no longer both allowed AND blocked from beeping, + now just being allowed to beep. + JohnFulpWillard: + - balance: Human AIs no longer have a teleport blocking implant or borg costume, + but now has a portable crew monitor. + Melbert: + - bugfix: Using hulk (and a myriad of similar effects) now properly updates your + movespeed to ignore the damage movespeed penalty + - bugfix: Some things which temporarily make you fly don't make you fly forever + - bugfix: MODsuit ball module now properly makes you immune to damage movespeed + penalty when in ball form + - bugfix: Adding Hulk via VV dropdown doesn't default to adding the strongest hulk + available (that which is used by the medieval pirates) + SmArtKar: + - bugfix: Ghosts can no longer move chairs + - bugfix: You can attack bookshelves in a variety of states once more + - bugfix: Style meter text is no longer blurry and doesnt overlap with UI anymore. + - qol: You can fire PKAs/plasma cutters point blank at turfs. + Thedragmeme: + - qol: re-maps the raptor barn to not stick out like a sore thumb + - bugfix: Miners and the public both can access the raptor barn without having to + make a bridge themselves +2024-07-18: + Artemchik542: + - bugfix: Justice mech invisibility fix + Ben10Omintrix: + - bugfix: fixes sentient firebots mauling things from a distance + DATA-xPUNGED: + - bugfix: Plague Doctor Mask can now be used with internals again, and is no longer + unintentionally pepperproof. + DeltaFire15: + - bugfix: cold- & heat protection no longer have decimal precision issues. + MTandi: + - bugfix: Fixed emitters, shield gens and other wired machinery having lower power + consumption priority than APCs + - qol: Made APCs charge more evenly to ensure that environment and lights are working + everywhere before giving the power for equipment + NewyearnewmeUwu: + - image: the smoking pipe east/west sprites are now more consistent + Pickle-Coding: + - bugfix: Fixes space heater cell relative consumption inadvertently being changed + from the introduction of megacells. + - qol: The improvised chemical heater gives a more accurate description of its heating + power on examine. + - qol: Improved feedback when attempting to turn on a space heater that is lacking + a cell, has no charge or is broken. + - code_imp: Space heater relative cell consumption is consistent regardless of the + cell charge scale. + Rhials: + - bugfix: Xenos have a "resist" ui element now. Cool! + Sadboysuss: + - bugfix: added a missing cable to Wawastation perma + SmArtKar: + - bugfix: Fixes hulks being able to activate dualsabers despite not being able to + actually do anything with them + - qol: Ghost orbit menu now always displays person's real name and their roundstart + job and cannot be fooled by disguises. + - qol: You can properly aim mining bombs at turfs now + - bugfix: Point blank piercing shots no longer fly directly north after hitting + their intended target + - qol: Stopping orbiting now automatically breaks you out of autoobserve + SmArtKar, Kapu: + - balance: Projectiles now can hit border objects on other turfs instead of passing + through them + SyncIt21: + - bugfix: fixes runtime in storage datums when hiding the ui + - bugfix: you can insert the withdrawal beaker into the portable chem mixer when + locked + - bugfix: acid/base buffers should update your target & source holder + - bugfix: remove reagent operations won't trigger excessive workload + - bugfix: borgs can't put their integrated tools into the reagent grinder + Yobrocharlie: + - bugfix: Removed bitrunning beach brawl fax machine + afonamos2: + - bugfix: malf ai voice changer no longer accepts dangerous inputs + grungussuss: + - rscadd: You can now buckle to bar stools + grungususs: + - spellcheck: fixed a typo for carrot sword description + imedial: + - rscadd: standing on a closed crate now gives loud mode + - spellcheck: fixed a typo in borg research + larentoun: + - bugfix: Free items in research queue will now correctly be researched automatically. + norsvenska: + - spellcheck: Removed an unnecessary apostrophe in DeltaStation's genetics monkey + pen door. + xXPawnStarrXx: + - qol: made fish better quality when butchered, smushy koibeans and useable gunner + jellyfish. + zoomachina: + - bugfix: deleting reagents from the chemmaster buffer works without a beaker inserted +2024-07-19: + Ghommie: + - bugfix: Fixed beyblade *flipping. + Kocma-san: + - bugfix: fixed a table in the mining office at the metastation + L0pz: + - image: Added new unique sprites for cyborg upgrade modules + MTandi: + - bugfix: APC icon properly turns green on full charge + - bugfix: APC shows correct charging rate in UI + - code_imp: Added early machine process for shield generators and emitters to prioritize + power draw + - code_imp: Added late machine process for power monitors to gather accurate powernet + load + Melbert: + - qol: Monkeys that pray are given bonana + - bugfix: When Monkified or Humanified, you are no longer knocked down. + - bugfix: When cured of Monkified, you get the cure text now. + - bugfix: The text shown when cured / given Monkification now has color. + - bugfix: Being humanified now tells you what species you become rather than assuming + you are a human. + - bugfix: Fixes xenos being able to do that one mechanic that involves mouse-dragging + people to you + - bugfix: Non-humans should look less transparent while in space + Momo8289: + - qol: Tweaked the colour of orange atmos pipes to be more distinct from the red + pipes, especially in darkness. + SmArtKar: + - bugfix: Revenge of the Pun Pun no longer runtimes on init + - bugfix: Fixed kinesis runtime due to un-unregistered signals + - bugfix: Removed some rogue decals and added a wall to Birdshot atmos storage, + and added cycling to upload/telecommunication entrances. + - bugfix: Elevator music no longer haunts you endlessly if you step off mid-transit + - refactor: HUD traits now apply their corresponding hud automatically + TheNobodyofimportance: + - qol: Holofan and two thermomachine and emitter boards in lavaland syndicate base. + carlarctg: + - qol: Moths that pray get a moffin + - bugfix: Fixed sometimes obtaining the nodrop highlander kilt with relics + - bugfix: Fixed bioscramble function not working for strange objects unless dropped + - bugfix: Fixed the disguiser cardboard ID not overlaying properly + kawaiinick: + - qol: secmods jetpacks are now pinned by default + vinylspiders: + - bugfix: fixed a hard del with soapboxes +2024-07-20: + AyIong: + - bugfix: Announcement subheader will no longer overlap the header if the second + one is very long +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo: - rscadd: Security and Engineering holosigns can now be opened with their projector by clicking them from afar @@ -965,6 +1935,7 @@ - spellcheck: Holosigns and holosign creators' descriptions give more information now GPeckman: +<<<<<<< HEAD - spellcheck: The techweb no longer erroneously refers to MODsuits as exosuits. Hardly3D: - rscadd: 'Added new hairstyle: Short Bangs 2' @@ -1002,6 +1973,8 @@ - qol: The Coroner Drobe got sorted into less 'shove everything in' and more 'in a sane format'. - image: Changed some default options in the character creator. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the civilian modsuit module as a standalone model. It offers no slowdown while activated but does NOT protect you from the void of space. You can print the plating from an exosuit fabricator and build it like a normal @@ -1010,6 +1983,7 @@ model. - image: Tweaked the sprites for the civilian modsuit head, both in-hand and on the mob. Also added a civilian mod plating sprite. +<<<<<<< HEAD - image: Brainwashing victims now have smoothed out brain sprites without those pesky wrinkles - balance: reduced the prices of some blackmarket items across the board. @@ -1064,6 +2038,47 @@ - bugfix: another clothing file fixed - rscadd: Added admin spawnable Redsec varients to the override file 2024-07-22: +======= + Ghommie: + - bugfix: fixed megaphone tts filter. + MTandi: + - image: New deep fryer sprite + SmArtKar: + - refactor: Refactored parrying to be projectile-side and not user-side. + - rscadd: You can now parry crusher projectiles to give them some more range, add + damage and make the mark always count as a backstab. + - rscadd: Projectile parrying has been significantly improved, making parrying and + boosting projectiles actually possible. Includes a small grace period as lag + compensation for players with higher pings. + - balance: Crusher marks can now be detonated by any crusher, not only the one that + applied it, as to incentivise coop mining for crusher users. + - balance: Projectile boosting now gives a significantly bigger damage and speed + increase + - bugfix: Fixed a signal reg error caused by add_occupant being called twice + - bugfix: Sentient floorbots can now rip up tiles when emagged + - code_imp: Slight cleanup in floorbot code + - image: Brainwashing victims now have smoothed out brain sprites without those + pesky wrinkles + - bugfix: Blob victory no longer spams spore zombie notifications to ghosts + paganiy: + - qol: Moving the light bulb removal function from the left mouse button to the + right one. + - qol: Added & improved tips related to the light fixture + san7890: + - admin: Ticking "Job Playtime Exempt" on a player's Job Playtime Tracker panel + will also exempt them from BYOND Account Age restrictions now. It previously + only exempted them from actual living playtime minutes - this is for the BYOND + Account Age in days. + thegrb93: + - qol: Allow custom borg hat placement for custom borg skins + theselfish: + - rscadd: Bitrunning and (spawn) Miner jumpsuits are now in their drobe. + - qol: The Coroner Drobe got sorted into less 'shove everything in' and more 'in + a sane format'. + zoomachina: + - qol: chem dispenser displays units instead of kilowatts +2024-07-21: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo: - rscadd: Scanner gates now blare into the chat the reason why it got triggered - rscadd: Scanner gates now can have false positives/negatives, and the chance of @@ -1074,6 +2089,7 @@ - qol: Scanner gates description now tells to what mode they are set - bugfix: You no longer can remove N-Spector from scanner gates without unlocking them first +<<<<<<< HEAD SkyratBot: - qol: Mod UI is narrow again - bugfix: Closing mind transfer popup does not transfer your mind anymore @@ -1091,6 +2107,25 @@ for you, you gotta update byond man, you're like a year out of date. - rscadd: Fox infusion has more content related to it now SkyratBot: +======= + Inari-Whitebear: + - spellcheck: Fixed a typo in the description for the Syndicate Rebar Crossbow in + the Uplink. + MTandi: + - qol: Mod UI is narrow again + Melbert: + - bugfix: Fixed roundstart monkeys not having monkified + - bugfix: Fixed being "de-monkified" while dead making it difficult to actually + de-monkey you going forward + - bugfix: Fixed genetic scanner showing dead mobs as "transforming" + SmArtKar: + - bugfix: Closing mind transfer popup does not transfer your mind anymore + - bugfix: Recalling lantern wisp now properly removes its effects from you + - bugfix: Context maptext now properly dynamically adjusts itself instead of using + hardcoded pixel values + - bugfix: Fixes organizer sometimes deleting brains + Time-Green: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Gives voidwalker telepathy - bugfix: Fixes the Unsettle ability ignoring line of sight (which was it's sole gimmick, im just dumb) @@ -1104,6 +2139,7 @@ - balance: Gives voidwalkers chunky fingers - balance: Voidwalker applies NODEATH on hit - balance: Voided victims get dumped in safer places +<<<<<<< HEAD - rscadd: Adds Untie Shoes, a 1-point wizard spell. It can be upgraded to untie jackboots, summon shoes to untie, and become completely silent! - bugfix: Fixes fishing rods not working on adjacent targets. @@ -1113,10 +2149,26 @@ - bugfix: HONK mech now waddles - rscadd: 'Charlie: Replaced external cycling airlocks with airlock pumps' - bugfix: Shuttle events meteors now dont sometimes kill everyone +======= + carlarctg: + - bugfix: Fixed null description in cerulean regenerative extract +2024-07-22: + 00-Steven: + - refactor: Refactored table item interactions, please report any issues. + - bugfix: Fixed being unable to use decks to draw cards directly onto tables. + - qol: Right clicking a table with a tray puts it down regardless of it having contents. + Ical92: + - bugfix: general bitrunning fixes and 102% faster loading times + - bugfix: bitrunning domains are no longer affected by nebulas in the real world + Jackriip: + - refactor: refactored global set_basalt_light proc into object proc + JoshAdamPowell: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: 'Nanotrasen has brought Central Command kicking and screaming into the 20th Century by providing them with a real fax machine. :cl:' +<<<<<<< HEAD - bugfix: Surgical tape and edagger's embedding values have been fixed - refactor: Refactored table item interactions, please report any issues. - bugfix: Fixed being unable to use decks to draw cards directly onto tables. @@ -1158,6 +2210,26 @@ - bugfix: You can no longer dupe metal by breaking walls under small light fixtures - bugfix: Animal/people skin is no longer metallic sounding - bugfix: Fixed fishing. +======= + MTandi: + - rscadd: 'Charlie: Replaced external cycling airlocks with airlock pumps' + - qol: Updated smart fridge UI + Melbert: + - rscadd: Fox infusion has more content related to it now + - refactor: Refactored how vending machine icons are displayed, please report if + you see any broken icons. Also if all the icons look like missing file icons + for you, you gotta update byond man, you're like a year out of date. + SmArtKar: + - refactor: Pod code now uses datums instead of being a huge nested list + - qol: Self-respiration no longer sends misleading messages and instead tells about + lack of need to breathe once it actually gives you the effect + Thedragmeme: + - image: Adds a series of traditional yukata's and kimono's + - image: Adds in black sandals and a traditional hairpin for the back of the hair + carlarctg: + - rscadd: Adds Untie Shoes, a 1-point wizard spell. It can be upgraded to untie + jackboots, summon shoes to untie, and become completely silent! +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Renamed the Crimson Focus to the Crimson Medallion - bugfix: Fixed harvesters not being properly bound to their master, nor dying when they do @@ -1166,6 +2238,7 @@ - rscadd: Added wooshing, shaking, and glowing to flinging around with the heretic blade - balance: Removed the probability to not gain a reward when sacrificing a cultist +<<<<<<< HEAD - bugfix: Restores some of the items accidentally lost in the autodrobe. - bugfix: You can now put dead mice into mortars/grinders properly - qol: Now IDs and PDAs have money-reader module for picking some cash into your @@ -1174,6 +2247,55 @@ - bugfix: Fixes Hereditary Manifold Sickness's 4th stage not updating health when it should - config: Added an entry for TRAITOR_SCALING_MULTIPLIER, disabled by default +======= + - bugfix: HONK mech now waddles + necromanceranne: + - qol: There is a larger stock of roundstart clothing availalbe in the clothing + vendors. Now you can get your entire gang in matching outfits! +2024-07-23: + AyIong: + - qol: Chat notifications are now at the top + Ben10Omintrix: + - refactor: mulebot UI has been refactored + Ghommie: + - bugfix: Fixes fishing rods not working on adjacent targets. + - rscadd: You can now fish with explosives. + - bugfix: Fixed an inconsistency with examining fishing spots with sufficiently + high fishing skill (or skillchip). + Holoo-1: + - bugfix: fixed ghost huds + MTandi: + - rscadd: Dehydrator, a machine version of drying rack, with a circuit board and + available on some kitchens roundstart. + - image: Updated the color palette of Smart Fridge + SmArtKar: + - code_imp: Removed 8 cases of double indentation + - bugfix: Holopads no longer suck in unsuspecting people when crowbared + - bugfix: Surgical tape and edagger's embedding values have been fixed + Time-Green: + - bugfix: Shuttle events meteors now dont sometimes kill everyone + necromanceranne: + - rscadd: Robotic variants of many of the standard and advanced humanoid surgeries. + You cannot perform self surgery with these surgeries. + - balance: It is easier to do robotic surgeries with normal surgery tools. + - qol: It is now possible to detect EMP organ failure cascades via health scanners. + - qol: EMP organ failure cascades can be reversed by doing organ repair surgeries + targeting the failing organ. +2024-07-24: + AyIong: + - qol: Photocopier updated their UI + Ben10Omintrix: + - qol: fish analyzers now have a UI + DaCoolBoss: + - rscadd: Adds the Haunted Trading Post space ruin. + - rscadd: Adds 10+ unique items for the Haunted Trading Post + - rscadd: Adds 5 dangerous mobs for the Haunted Trading Post + - rscadd: Adds 4 new types of hazardous traps for the Haunted Trading Post. + FeenieRU: + - qol: Now IDs and PDAs have money-reader module for picking some cash into your + bank by swiping on money. + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can raise lobstrosities from chasm chrabs inside an aquarium with the 'allow breeding' setting on. Keep the fish well fed, healthy and not lonely if you don't want an hostile one. @@ -1182,7 +2304,24 @@ - rscadd: For lobstrosities grown from aquariums, they can have additional effects based on the fish traits they had in the aquarium, like being venomous or even flying. +<<<<<<< HEAD - qol: Chat notifications are now at the top +======= + Jacquerel, Kok0nut, Imaginos: + - image: Wall-mounted and Table-mounted ID card authorisation machines now use different + sprites + - bugfix: Wall-mounted ID card authorisation devices will now be destroyed if their + wall is destroyed + Majkl-J: + - bugfix: fixes bitrunning breaking upon repeatedly climbing in and out the pod + Paxilmaniac: + - bugfix: Fixes bulldog shotgun unique mag display not working on the sprite + - image: resprites the bulldog shotgun along with inhands and new worn sprites + - code_imp: cleans up a little of the code surrounding the bulldog + SmArtKar: + - bugfix: Stacking machine consoles link to machinery now + - bugfix: You can now put dead mice into mortars/grinders properly +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Mechs now take armor into consideration when calculating punch damage - bugfix: Mechs no longer deal direct limb damage - bugfix: Drills automatically pick up ore on non-ripley mechs now without having @@ -1191,6 +2330,7 @@ - bugfix: Drills now take armor from correct bodyparts when attacking - code_imp: Cleaned up one-letter variables in mech drill code - bugfix: You can no longer microwave kisses, slappers, and other abstract items +<<<<<<< HEAD - bugfix: fixes bitrunning breaking upon repeatedly climbing in and out the pod - qol: Photocopier updated their UI - bugfix: Stacking machine consoles link to machinery now @@ -1278,11 +2418,38 @@ - code_imp: Cleaned up clamp code. - bugfix: Clamp no longer anchors down some objects upon failing to pick them up - bugfix: Deathsquad KILL CLAMP finally works once more +======= + - bugfix: Having your liver fail no longer keeps drug traits active without metabolizing + them + - code_imp: Cleaned up clamp code. + - bugfix: Clamp no longer anchors down some objects upon failing to pick them up + - bugfix: Deathsquad KILL CLAMP finally works once more + - bugfix: Fixes Hereditary Manifold Sickness's 4th stage not updating health when + it should + - bugfix: You can no longer dupe metal by breaking walls under small light fixtures + Time-Green: + - bugfix: Animal/people skin is no longer metallic sounding + larentoun: + - config: Added an entry for TRAITOR_SCALING_MULTIPLIER, disabled by default + nikothedude: + - bugfix: Alexander no longer causes harddels + - bugfix: Removed a theoretical infinite block exploit from alexander +2024-07-25: + Ghommie: + - bugfix: Fixed fishing. + MTandi: + - bugfix: Borgs and AI can now use research queue + Vekter: + - spellcheck: Reworded Voidwalker's objectives to be more descriptive of their actual + goals as opposed to just fluff. + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Strong-arm implants go on cooldown when activated, but deal more overall lethal damage on a single blow. - balance: The strong-arm implant does additional damage to fauna and some other dangerous mobs. - qol: You can pair toolset arm implants with the strong-arm implants. +<<<<<<< HEAD SpaceLoveSs13: - refactor: HUD traits now apply their corresponding hud automatically theselfish: @@ -1291,10 +2458,108 @@ DrDiasyl aka DrTuxedo: - sound: Hearing and talking into the radio now produces a sound. Heads get a special sound. +======= + - balance: Quality cybernetic hearts combat bleeds and restore blood, rather than + inject you with epinephrine when you enter crit. This can result in mild toxin + buildup, however. + - balance: Upgraded cybernetic hearts give an extremely brief amount of action when + you enter softcrit (but not hardcrit). + - bugfix: Restores some of the items accidentally lost in the autodrobe. +2024-07-26: + LT3: + - bugfix: Fixed elevator panel allowing conflicting inputs + - bugfix: Fixed elevator sound being out of sync with movement + SmArtKar: + - bugfix: Xenomorphs and door pryer basic mobs can now attack airlocks in combat + mode + - bugfix: Borgs now unequip their equipment upon module change like they should + YesterdaysPromise: + - rscadd: All the melons are now sliceable, and have inhands, instead of just watermelon + and holymelon respectively. + - rscadd: You can now hollow out melons of all kinds with a spoon to make helmets + or chestplates, based on the potency! If you are unlucky, you can tie up three + helmets into a chestplate with durathread using the crafting menu. + - rscadd: You can now make a bo staff out of bamboo and steelcap logs. + - rscadd: You can now make a moonflower buckler out of moonflowers and steelcap + logs. + - rscadd: You can also hollow out chantarelle to make mock-up wizard hat. + - rscadd: Parsnips, as mutation of carrots, become equaly able to be sharpaned, + turning into shivs, or with potency and luck, sabres. + - rscadd: You can now craft a durathread robe, and customize it into different variants + using specific plants in crafting menu. + - rscadd: Carrots gain a new possible mutation; cahn'root, brewable into root beer + and sharpanable into shivs or daggers! + - rscadd: Rice hat, made from bamboo, now has an alternative style, allowing you + to wear it in reverse and be much cooler. + - rscadd: Two new arrow variants appear in the crafting menu; sticky and poisonous + ones! If you want to make arrows at all though, remember to order bow-maker's + crate at cargo. +2024-07-27: + 00-Steven: + - bugfix: Fixes borgs not being able to place apparatus-held items on tables. As + a side-effect, they can now combat mode right click splash containers as normal + instead of having their own right-click floor splash. + Ghommie: + - bugfix: Centcom technicians have been trained to recognize cargo-bought fish. + You will no longer be able to trick the economy system by buying fish and sending + it right back. Also nerfed fish selling price very slightly. + - bugfix: Fixes projectiles facing north if ricocheting, deflected or homing + - rscdel: Removed a janky fish bounty + - rscadd: introduced exporting fish through cargo. + - balance: reduced the average weight of the jumpercable. Conversely, eased up the + requirements for the bone fish evolution. + Ical92: + - bugfix: Tram's Tool Storage now has proper lighting + Jacquerel: + - balance: If a bluespace cookie fails to teleport you then you will trip over. + LT3: + - bugfix: Fixed delam counter stuck in window near Ice Box bridge + - bugfix: Fixed disease outbreak announcement sometimes missing the disease name + - bugfix: False supermatter surge announcements are now identical to real ones + - bugfix: Tram will no longer eat its own rails as it travels + MTandi: + - bugfix: Janicart inserts items into the attached trash bag again (manual and vacuumed) + Melbert: + - qol: All randomly spawned monkeys (and lizardpeople) will spawn with tails. You + can still select to be tailless. + - code_imp: Cleaned up some code relating to species features (like tails, markings, + etc). Report any oddities + SmArtKar: + - image: Updated gas flow meter sprites + Thlumyn: + - bugfix: self-resp viruses don't spam messages as often + afonamos2: + - bugfix: Firelocks will once again respect fire alarm's thermal sensors being disabled. + carlarctg: + - bugfix: Fixed possessed blades being broken + - code_imp: If testing is enabled everyone is polled in ghost polls. + mc-oofert: + - bugfix: wawastation ordnance no longer has a light fixture on a window and looks + objectively slightly better + - bugfix: wawastation engineering water tanks are now highcap +2024-07-28: + 00-Steven: + - bugfix: Clicking on a table in the lootpanel with an item in-hand tries to place + it in the center again. + Axidyuwu: + - bugfix: now Justice invisibility turns off in non combat mode as it supposed to + Deadgebert: + - bugfix: peg limbs can now be amputated + DrDiasyl aka DrTuxedo: + - sound: Hearing and talking into the radio now produces a sound. Heads get a special + sound. + Helg2: + - rscadd: Emergency climbing hooks now spawn in emergency boxes on all of the multi-z + level stations. + JohnFulpWillard: + - bugfix: '[Mafia] The show_help button no longer shows you who the Obsessed''s + target is.' +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Players now receive a notification when trying to perform surgery steps that involve chemicals Rhials: +<<<<<<< HEAD - bugfix: Clown Ops gear has been returned to being available only to clown ops. Whoops! - bugfix: Monkey wizards can now interact with grand ritual runes. @@ -1332,10 +2597,37 @@ SkyratBot: - qol: drones now have soap in their internal storage! - bugfix: VIM no longer requires hands to enter +======= + - bugfix: Monkey wizards can now interact with grand ritual runes. + - bugfix: Clown Ops gear has been returned to being available only to clown ops. + Whoops! + SmArtKar: + - bugfix: People with tooltips enabled no longer lag the server when they move their + mouse. Oops. + - bugfix: Mirage grenade dispensers and ionic jump jets now work + StrangeWeirdKitten: + - bugfix: Voidwalker should not run on planetary maps. + grungussuss: + - bugfix: Med sec telescreens are no longer the same item as the CMO telescreen. + - spellcheck: correcte name for the CMO telescreen mount + - bugfix: birdshot holodeck's lighting has been fixed. + - sound: medkits now have sounds + - sound: gas tanks now have sound + - sound: the default metal sound has been changed + - bugfix: lavaland no longer has roundstart atmos processing because of a passive + vent + - sound: only the scream emote can be heard through walls + - sound: the sneeze projectile no longer makes a sound when making contact. +2024-07-29: + DaCoolBoss: + - spellcheck: military javelin's name is now fully uncapitalised + SmArtKar: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Mining headsets now allow you to make callouts via pointing. You can use them to communicate with fellow miners or order your army of bots and raptors! - rscadd: Mining headsets keep your voice loud and clear in low-pressure environments (not vacuum!) +<<<<<<< HEAD - spellcheck: military javelin's name is now fully uncapitalised - rscadd: Cosmic Skull glows purple. Vekter: @@ -1343,3 +2635,94 @@ the Heretic dimension. theselfish: - bugfix: Unbroke the Patrol Cap, whoops!! +======= + - qol: If you have auto fit viewport enabled, it will trigger upon entering or exiting + fullscreen + - bugfix: VIM no longer requires hands to enter + - bugfix: Recyclers no longer recycle contents of indestructible items + - bugfix: Grass sheath now holds parsnip sabres like its supposed to + - spellcheck: Fixed up parsnip sabre description grammar + StrangeWeirdKitten: + - rscadd: Cosmic Skull glows purple. + Time-Green: + - bugfix: Fixes void eater not refreshing + - bugfix: Fixes planetary gravity not killing voidwalkers and voideds + Y0SH1M4S73R: + - admin: Admin lua scripting uses a new library that (probably) will not break when + BYOND updates. +2024-07-30: + 13spacemen: + - balance: TTV bombs can be implanted into people's chest once again + AyIong: + - rscadd: Stat Panel now scales like a chat, depends on the font size. Defaults + from the chat font size, but you can separate it. + - refactor: Refactored Stat Panel styles and Byond skin theme applying. Stat Panel + now looks more like a TGUI + Bisar: + - bugfix: All mining mobs now properly listen to the signals sent by attackers and + will respond appropriately. + Gaxeer: + - refactor: replace some copypaste code for pod spawn to use `podspawn` proc instead + - code_imp: modify `podspawn` proc to accept amount of item type to spawn in `spawn` + specification + Ghommie: + - qol: Aquariums start unanchored and don't autoconnect to plumbing. Their reproduction + prevention is also disabled by default. + - balance: Made it a tad easier to control the bait during the minigame. Buffed + the fishing skill. No fishing duds at all when using ANY bait. + - balance: Chasm Chrabs take less time to grow into Lobstrosities but need food + a bit more frequently. + - balance: '"Profound fisher" mobs will have less RNG-dependant time fishing.' + - bugfix: You can now ACTUALLY interact with other things while fishing if the fishing + rod isn't in your active hand. + - config: Added a config for specific gateway delays so locations like the beach + and the museum don't have to take 30 minutes to become available like the rest. + Jackriip: + - refactor: moves the create_all_lighting_objects proc to the lighting subsystem + KazooBard: + - rscadd: The heretic's ritual of knowledge no longer requires binoculars + - rscadd: Clipboards are craftable using a wood plank, an iron rod and wirecutters + Paxilmaniac: + - balance: The nukeops surplus smg, the pp-95, has been reworked into the Abielle + Smart-SMG. It performs nearly identically to the pp-95, however it's projectiles + get a slight homing ability towards whatever you click on. + - sound: New firing sounds for the surplus smg, credit to the m41 sound effects + from tgmc + - image: New sprites for the surplus smg, made by me + SmArtKar: + - bugfix: Fixed mapload circuit floors not drawing power and deconstructing circuit + floors not reducing power load + - bugfix: Projectile dampener, recycler and ninja stealth MOD modules now work properly + - bugfix: You can no longer tear peoples arms off with non-killer clamps + - bugfix: Mechs can no longer equip infinite amount of weapons + - bugfix: Mining MODsuits now can store everything that explorer suits can + Vekter: + - bugfix: Fixes an exploit that allowed players to open a Bag of Holding rift in + the Heretic dimension. + deathrobotpunch: + - qol: drones now have soap in their internal storage! + grungussuss: + - sound: leather, skins and cardboard have their own sound now + - bugfix: smuggler satchels will no longer spawn in space + - sound: added sniff sounds + - sound: added sigh sounds + grungussuss and Kayozz: + - sound: more maintenance ambience has been added + rroqc: + - bugfix: plants no longer select reagent genes they already have while cross pollinating + - code_imp: 'improves reagent cross pollination code + + :cl:' +2024-07-31: + Jacquerel: + - image: Big balls are now much rounder, to more easily slide down into a cannon. + SmArtKar: + - image: All implants have received a fresh coat of paint + rroqc: + - bugfix: 'fix a bug where botany reagents would dissapear from existing plants + + :cl:' + thegrb93: + - bugfix: Fixes getting permanently hot or cold if wearing thermal insulation as + a lizard +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index 2c7d1af871f..8c093be7ec5 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -1,4 +1,5 @@ 2024-08-01: +<<<<<<< HEAD Bisar: - bugfix: All mining mobs now properly listen to the signals sent by attackers and will respond appropriately. @@ -52,11 +53,15 @@ - bugfix: Removed a rogue wall grinder on icebox - bugfix: Fixes getting permanently hot or cold if wearing thermal insulation as a lizard +======= + 00-Steven: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You no longer render on top of tall enough objects that get vertically offset when anchored to a table when standing on the tile directly to the north of them. Examples are soda and booze dispensers. - bugfix: Removing the vertical offset some objects get when anchored to a table can be done by unanchoring it at any point, rather than only on a table. +<<<<<<< HEAD - bugfix: 'fix a bug where botany reagents would dissapear from existing plants :cl:' @@ -106,10 +111,18 @@ damage. - code_imp: Moves quirks to a standalone folder 2024-08-05: +======= + ArcaneMusic: + - qol: NODE drones summoned to tap a vent within ore vents now display a green status + light to show how much longer they need the vent defended for. + Axidyuwu: + - bugfix: fixes a way of duplicating iron with wallmounted sparklers and light switches +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - qol: Machines check their parts during initialization now; this will usually apply in cases such as a machine in a prefab having been varedited to be upgraded. - code_imp: All machines check their parts during initialization. +<<<<<<< HEAD LT3: - bugfix: Bouncer now shows up as part of the service department - bugfix: Synths have their own version of Blessed Lobotomy @@ -237,6 +250,9 @@ - spellcheck: Fixed up parsnip sabre description grammar - image: Ash Blade has received a new sprite. - bugfix: Fixed a runtime error after draining a heretic influence. +======= + Ghommie: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added tadpoles, which can be scooped from puddles with right-click. Functionally they're like most fish, which require an aquarium to survive, and also need to be fed fairly frequently, however they quickly become frogs after about 3 @@ -245,6 +261,7 @@ other in prison. - qol: Changed the name of an aquarium UI button from "Reproduction Prevention" to "Reproduction and Growth", as it controls both fish breeding and growth. +<<<<<<< HEAD - bugfix: juvenile lobstrosities will now look for food - qol: Renamed seed packs to have the plant name at the beginning - bugfix: Bamboo staves can now be wielded @@ -285,11 +302,22 @@ - bugfix: Circuit UI scale no longer has weird rounding - bugfix: Circuit UI no longer gets covered by components menu 2024-08-12: +======= + - rscadd: Carps, frogs and young lobstrosities now fear people wearing fishing hats! + Adults and megacarp favour the 'fight' part of the fear reflex however. + - bugfix: The hat stabilizer module now inherits the clothing traits of the attached + hat. + Helg2: + - bugfix: Emergency climbing hooks now shouldn't spawn on non multi-z stations. + Jackraxxus: + - bugfix: AI mech control beacons and malf AI dominate mech work again. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Scanner gate now detects items thrown through it - bugfix: Scanner gate does not alarm for guns on players with mindshield - bugfix: Scanner gate does not alarm for guns on players with weapons ID card access - sound: Reduced volume of scanner gate alarm +<<<<<<< HEAD Majkl-J: - bugfix: fixed assistant jumpsuits overriding the loadout - bugfix: smoking addiction is now fixed @@ -304,10 +332,183 @@ someone else aKromatopzia: - bugfix: teshari back item sprites work again +======= + MTandi: + - image: Made chem master container icons not blurry + - bugfix: Portable atmos machine circuit boards list correct components + - bugfix: Portable atmos machine circuit boards accept unwrenched fittings + - bugfix: Portable atmos machines are movable on construction + - qol: smart fridge UI now groups items by type+name instead of just type + - qol: smart fridge UI now shows item names next to the images + - qol: smart fridge UI has a list view option (default for chem and viro versions) + - bugfix: fixed smart fridge stacking sounds when dispensing multiple items + - qol: Renamed seed packs to have the plant name at the beginning + Majkl-J: + - bugfix: Fixes the echolocation screen overlay not appearing with default arguments + due to using the wrong icon state + Momo8289: + - bugfix: The charge indicators on power cells now work properly. + - code_imp: Removed some now redundant power cell appearance updates + Rhials: + - qol: Sentience potions can now be used without a provided summon reason. + - rscadd: Spies can now pick their own custom objectives, if they so choose. + Sadboysuss: + - bugfix: The clown planet domain is now completable + - bugfix: rod sounds will now vary in pitch + - bugfix: spray can face spraying will no longer work on light-sensitives with eyewear + and people wearing eye covering masks + - bugfix: birdshot engineering feedback has been applied + SmArtKar: + - bugfix: Bank cards speak once more + - bugfix: Removed a rogue wall grinder on icebox + - bugfix: Silicons and simplemobs can also hear radio chatter now + - bugfix: Heart eater wizard perk no longer works activates on organs that haven't + been used before + - qol: You can now reorder items inside storages by dragging them + - balance: Mining MODsuits are now considered thick clothing and gained expanded + storage. + - image: Mining MODsuits got a slight glowup and hide belts now + - bugfix: Fixed advanced pods showing up as cultist pods + - admin: Subtype vendor no longer requries an ID + - qol: You no longer goofily swap with others trying to move in the same direction + as you if you're not faster than them + - code_imp: Moved mobswap check logic into a separate proc and made it more readable + - balance: Discounts now pick 4-6 items each from a unique category + - balance: Items that cost below 4 TC cannot get discounted anymore + - balance: Elite syndicate MODs for traitors can no longer get discounted + - bugfix: Fixed NT Frontier discounts not applying + Watermelon914: + - admin: Turfs in lua will no longer become invalid on deletion. + - bugfix: Fixes SS13.wait not working when called multiple times before it finishes + waiting. + Xackii: + - bugfix: Justice design no longer disappears + - bugfix: Mechs can attack other mechs in melee + - rscadd: RD can emag mech fabricator(like roboticist). + carlarctg: + - rscdel: Revert "Heretic spell invocations now use one dead language per path" + grungussuss: + - bugfix: the abandoned plasma research facility on icemoon no longer has an item + that shouldn't exist + mc-oofert: + - bugfix: wawastation pharmacy now has a hand labeller + rroqc: + - rscadd: 'durathread robes can now store botany gear + + :cl:' +2024-08-02: + FlufflesTheDog: + - bugfix: Existing gas flow meters have been recalled and replaced due to a faulty + screen connection, and once again convey pressure and temperature + Ghommie: + - qol: Skills are passed down to bitrunning avatars and then back to the original + body. + - bugfix: Stop clientless lobstrosities from fishing other lobstrosities, which + in turn can fish other lobstrosities and so on. + - balance: Stop clientless lobstrosities from fishing the lavaland fishing spot + chest. + Jacquerel: + - admin: Adds some missing traits to the mob trait list in VV + MTandi: + - qol: new uplink UI + - qol: made it possible to buy a custom amount of TC, instead of bundles with fixed + amounts + Majkl-J: + - bugfix: Flashdarks now broduce darkness upon toggling + SmArtKar: + - bugfix: Bamboo staves can now be wielded + - bugfix: Bostaff no longer disappears forever when wielded + - bugfix: Rice hat no longer disappears upon being toggled and can be raised back + up. Toggling sprites is now done by alt-clicking + - qol: Callouts and MODsuit quick module pickers now track user + - qol: Cable coil and welding tool healing now loops similarly to sutures/meshes + - bugfix: Fixed cable coil/welding tool heal message not displaying when healing + someone else + - bugfix: Putting people you're fireman carrying into contractor pods no longer + sends both of you to zelda's shadow realm + Tattle: + - qol: dead cyborgs now blink yellow lights + - qol: damaged cyborgs have smoke particles when they've taken brute damage, and + sparks for burn + Y0SH1M4S73R: + - admin: The layout of the lua editor has been tweaked slightly. + - admin: In the lua editor, you can now toggle whether to log runtimes the viewed + state is involved in. + carlarctg: + - rscadd: Adds a bronze dimensional theme + necromanceranne: + - bugfix: Shoving someone onto a table now causes them to become vulnerable to being + stunned. +2024-08-03: + Watermelon914: + - bugfix: Fixed an infinite TC glitch dupe + Y0SH1M4S73R: + - admin: The "Suppress Runtime Logging" toggle in the lua editor actually does what + it says +2024-08-05: + Ben10Omintrix: + - bugfix: juvenile lobstrosities will now look for food + OrionTheFox: + - image: added and updated belt/suit/mask storage sprites for several knives missing + them + SmArtKar: + - bugfix: Lizards no longer die from cold on icebox despite wearing insulation + - bugfix: Fixed handyman assistants spawning without a PDA + Y0SH1M4S73R: + - bugfix: lua scripting now works on linux +2024-08-06: + Ben10Omintrix: + - refactor: refactors pet collars and cultist pets into elements + EnterTheJake: + - image: Ash Blade has received a new sprite. + Gaxeer: + - rscdel: Remove narsie and ratvar plushies from loadout + SmArtKar: + - bugfix: Plasmamen helmets now display their smiles + can be painted with spraycans + - bugfix: Elevator music no longer restarts when you take a step + - image: Resprited teleporter beacons + - code_imp: Removed multiple cases of unnecessary updatehealth + - bugfix: Bitrunning crate capture zones can no longer be destroyed + mc-oofert: + - admin: fix hard restart option +2024-08-07: + Absolucy: + - bugfix: Fixed a runtime error after draining a heretic influence. + LT3: + - bugfix: Fixed players being incorrectly immune to certain virus severities + MrMelbert, SmArtKar: + - bugfix: Holding someone at gunpoint no longer makes all shots count as point blank + SmArtKar: + - image: Updated clipboard sprite, adds white and black clipboard skins for med/sci + and security + - bugfix: Tinacusiate no longer changes hearing spans for every single person in-game +2024-08-08: + MTandi: + - bugfix: Smartfridges properly dispense `\Improper` items + Rhials: + - sound: Zipties no longer make handcuff noises when picked up or dropped. +2024-08-09: + SmArtKar: + - bugfix: Circuit UI scale no longer has weird rounding + - bugfix: Circuit UI no longer gets covered by components menu + - bugfix: Fixed Charlie MOD installer not installing MODsuit unless you have a backpack + to drop +2024-08-10: + FlufflesTheDog: + - bugfix: tadpoles can actually be scooped from ponds +2024-08-11: + DaCoolBoss: + - spellcheck: fixed many incorrect spellings of Waffle Corp and Donk Co. +2024-08-12: + SmArtKar: + - bugfix: You no longer kill yourself in cockroach form if you attempt to unposess + it +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 grungussuss: - sound: ore and sandstone blocks have their own sound grungussuss and kayozz: - sound: white noise from some ambience sounds has been pruned +<<<<<<< HEAD plsleavemealon: - balance: rebalanced synthetic surgery to also heal organic limbs xXPawnStarrXx: @@ -352,6 +553,22 @@ - image: Durand shield got a glowup - bugfix: Durand shield no longer instantly drains its battery - bugfix: Mech UI no longer lies about the amount of power your mech has left +======= +2024-08-13: + Majkl-J: + - bugfix: Felinids no longer phase through diagonal gaps upon seeing a laser +2024-08-15: + 00-Steven: + - bugfix: Fixed pipes/cables/disposals rendering above closed catwalks. + - bugfix: Fixed catwalks covering pipes generating illogical pipe caps when screwed. + - bugfix: Opened catwalks are no longer assumed to be above-floor for the sake of + generating pipe caps. + - bugfix: Fixes getting a "You are too far away!" interaction block on inventory + items when inside of another object. This includes accessing storage or using + your PDA from a closet, or as pAI using your digital messenger while inside + of your card. + Archemagus: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Strange zeros in paid off citations on sec records - bugfix: Now invalidating citations works - bugfix: You can change crimes description @@ -359,6 +576,7 @@ - qol: Paying off citation now automaticaly voiding it - qol: Crime issuer can void the crime without armory access - qol: In case of invalidation crime shows who voided it +<<<<<<< HEAD - bugfix: Ash drakes no longer get stuck in flight if their target changes Z levels or is destroyed and doesn't spawn lavaland turfs after the lava arena attack ends @@ -474,6 +692,47 @@ easy to access (albeit expensive) cargo goodie! - balance: price for the cargo crate with 2 pill bottles of experimental medication has been increased to 600 to better reflect the goodie case price. +======= + Astrogem2: + - bugfix: Raw durathread bundles and sinew strands no longer make metal clang sounds. + Ben10Omintrix: + - bugfix: wolf AI will no longer get stuck + - bugfix: idle basic mobs will now plan behaviors rather than completely shut down + - bugfix: fixes monkey ai hitting u from a distance with unloaded guns + Bisar: + - qol: The preserved terrarium vault now has tier 4 hydroponics trays, making volume + based tray chemistry take less time. + - rscadd: The interns remembered to water the plants around the station; their foilage + is so thick that it totally hides the identity of anyone holding them! + DATA-xPUNGED: + - qol: Nanotrasen has fitted the Janitorial Emergency Response Team with equipment + better suited for the job. + Dmeto: + - bugfix: Wawastation Science is connected to distro,Floor Electrical Relay cable + fixed + - qol: Cargo Gorka suit slot now allows emergency/plasmaman internals. + FlufflesTheDog: + - bugfix: pre-upgraded soda dispensers are actually pre-upgraded again + GPeckman: + - bugfix: Hydraulic clamps (the mech tool) can force powered doors open again. + - balance: Abductors (the antag, not the species) can no longer be converted by + any antagonist. + Kocma-san: + - code_imp: "\u0441hanges for a fax located on the CC" + - qol: 'added centcom stamps to centcom + + /:cl + + + + ' + MTandi: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'TechWeb: NT Frontier partners now give full discounts for many high tier nodes, corresponding to the partner theme, instead of partial discounts for random nodes' @@ -488,6 +747,7 @@ one' - bugfix: 'TechWeb: Cryostasis node properly requires advanced medbay equipment as it should' +<<<<<<< HEAD - sound: generic ship ambience volume has been reduced - bugfix: fixes pickup animation not matching player offset - bugfix: corrects offset of cobweb fluff object @@ -511,10 +771,202 @@ - rscadd: You can sell items on the blackmarket with the LTSRBT now. - bugfix: Added some checks to prevent the swapper device and bluespace anomalies from theorically being able to send things and people to nullspace. +======= + Melbert: + - rscadd: 'Adds a copy of the famous 1995 musical "Space Station 13: The Musical" + to contraband of the autodrobe' + Paxilmaniac: + - rscadd: The new smartgun has replaced the unusable energy cannon in mystery boxes + ? Raccoff, aa07, ActionNinja, ArcaneMusic, Armhulen, Azlan, Ben10Omintrix, BigBimmer, + Capsandi, CapybaraExtravagante, Draco, Floyd, Iamgoofball, Imaginos16, Infrared, + Jacquerel, Justice12354, Kryson, KylerAce, LemonInTheDark, Meyhazah, Mothblocks, + MTandi, Ninjanomnom, oranges, Rohesie, Runi-c, san7890, Senefi, SimplyLogan, SomeAngryMiner, + SpaceSmithers, Tattle, Thunder12345, Time-Green, Twaticus, unit0016, Viro, Waltermeldon, + WatlerJe, ZephyrTFA with thanks to the Mojave Sun team! + : - rscadd: Resprites or offsets almost all "tall" objects in the game to match + a 3/4ths perspective + - rscadd: Bunch of rendering mumbo jumbo to make said 3/4ths perspective work + Rhials: + - bugfix: Centcom ERT hiring standards have been expanded to include plasmamen, + again. + Runi-c: + - bugfix: Wellcheers no longer does nothing half the time + ShadowLarkens: + - bugfix: Fixed action buttons relative to EAST,SOUTH, or CENTER being improperly + moved during view_audit_buttons() + SmArtKar: + - bugfix: Circuit health analyzer/state components now work on targets inside lockers + - image: Resprited all main assemblies + - bugfix: Ninjas can cloak again + - image: Durand shield got a glowup + - bugfix: Durand shield no longer instantly drains its battery + - bugfix: Mech UI no longer lies about the amount of power your mech has left + - bugfix: Fixed chanterelles runtiming upon being hollowed out with a spoon and + not spawning a hat + - bugfix: Ash drakes no longer get stuck in flight if their target changes Z levels + or is destroyed and doesn't spawn lavaland turfs after the lava arena attack + ends + - bugfix: Fixed shuttle loan paperwork being unstampable + - balance: Multiple gloves/shoes that had armor values but failed to apply them + got fixed + - bugfix: Soulscythe now deletes the soul mob when destroyed + - bugfix: Bubblegum can no longer bloodcrawl to other Z levels + - bugfix: Fixed portable chem mixer spamming you if not held while its UI is open + - bugfix: Fixed bileworms not having a deaggro range + - bugfix: Heretic sacrifice area no longer modifies global ambience lists + - bugfix: Fixed fish analyzers not being able to scan fish + - bugfix: Fixed DNA samplers not being able to interact with non-scannable objects + - bugfix: Fake aurora caelus event no longer permanently paints space green + - code_imp: Cult magic item paths are no longer strings + - bugfix: Fixed monk staffs not displaying a wielded sprite + - bugfix: Fixed nuke toggle, smite and machine upgrade admin verbs using incorrect + sorting + - admin: Updated nuke toggle, smite and machine upgrade admin verbs to use TGUI + - qol: Magicarps no longer fire their projectiles while out of combat mode + - bugfix: Chameleon gun counts as harmless and can be fired by pacifists + - qol: Integrated circuit modules now can be linked to component printers + - bugfix: You can no longer shove people into closets through directional glass + - bugfix: Slimes no longer can feed when they're inside of objects or attacking + a target that became invalid after they chose their dinner + - bugfix: Fixed Creatures not being able to use non-jaunt actions when seen + - bugfix: Void storm now updates mob health + - qol: Circuit components can now be recycles in circuit printers, and automatically + do so upon being removed if a circuit has a linked printer + - spellcheck: Recycling a single item no longer outputs a line with a rogue space + infront of it + Vekter: + - balance: Removes the research requirement from cyborg endoskeletons, meaning they + can be built at roundstart again. + Watermelon914: + - bugfix: Fixed activating specific BCI actions whilst unconsious + - balance: Space suits no longer provide all of the slowdown when wearing space + gear. Helmets now share the burden and you can now move faster when wearing + only a space suit. Helmets now provide a bit of slowdown when worn alone as + a result. + Xackii: + - bugfix: Firelocks can be opened with crowbar rigth-click in combat mode. + carlarctg: + - balance: Supermatter bioscrambler anomalies are now docile. + - balance: Reduced caltrop default paralyze timer from 6 to 2 + flleeppyy: + - rscadd: the cyborg shaker in service borgs now have the ability to open the reaction + search menu + grungussuss: + - balance: bushes and other flora have had their HP reduced from 150 to 100. Trees + still have 150 HP + - balance: flora now has an X4 modifier to damage from burn sources + - balance: MODsuits now deploy 2 times faster + - balance: The infiltrator MODsuit now deploys 4 times faster + - sound: 'added rustle sounds for: toolbox, medkit, box' + - sound: 'added open sounds for: toolbox, box' + - code_imp: added support for giving container items rustle sounds + grungussuss and Beeblie: + - sound: internals breathing sound has received more variance and had its volume + reduced + hack-wrench: + - rscadd: add syndicate branded lipstick to uplink (6 TC), after applying lipstick + *kiss deals damage equal to energy gun + - bugfix: fix wallhit sound for projectile + imedial: + - bugfix: fixed nested radios with encryption keys giving free comms + itseasytosee: + - bugfix: illustrious ethereals now properly get the tenacious trait + - code_imp: more species features have been moved to their individual body parts. + lbnesquik: + - qol: Clarified what the Medical Cyborg Omnitool Upgrade does + - rscadd: Added a cyborg plunger for janitorial modules + loganuk: + - bugfix: AI Players can now operate the BRM (Boulder Retrival Matrix) + mc-oofert: + - bugfix: breaking certain terrain in deathmatch doesnt instantly breach to space + r3dj4ck0424: + - bugfix: In light of recent allegations of wizardry among the kitchen staff, our + cooks will now need bowls when crafting food that comes in bowls. This should + also stop said bowls from vanishing once the food is gone. + raffclar: + - bugfix: Various fixes to TGUI notepad + - bugfix: The first tab is now selected with ore redemption machines when opened + for the first time + tmyqlfpir: + - balance: Reduced pathfinding circuit component cooldown from 30 seconds to 5 seconds +2024-08-16: + Absolucy: + - bugfix: Empty blood brother teams will now be cleaned up, instead of clogging + up the roundend report. + Ben10Omintrix: + - bugfix: fixes surgery table buckle offsets + - bugfix: fixes rcds accounting for player dir only before construction + - bugfix: fixes pickup animation not matching player offset + Bisar: + - bugfix: Potted plants no longer permanently mark you as one of their own. + DATA-xPUNGED: + - qol: Paraplegics can now opt into appearing on the shift without their legs. + Ghommie: + - image: Resprited more types of fillets, and moonfish eggs + - rscadd: Crabs and lobstrosities (as well as the lobster foam helmet and the fishing + hat) now pack a boatload of fish puns. + Jacquerel: + - bugfix: corrects offset of cobweb fluff object + - bugfix: Dimensional anomalies should once again create cool walls, not boring + grey ones + - bugfix: Mobs shown in ghost alerts shouldn't be offset out of the box + - image: Several midround dynamic alert icons should be more demonstrative of what + is spawning + Melbert: + - bugfix: Less floating things on Delta + - rscadd: Auto-generated digitigrade clothing sprites for most jumpsuits + Metekillot: + - bugfix: Raptors properly respect their own factions now. + Sadboysuss: + - qol: atmos meters can now be attached to layer 1 and 5 + - sound: generic ship ambience volume has been reduced + Shadow-Quill: + - bugfix: You can no longer hear radio sounds if you're deaf. + SmArtKar: + - image: Mirrors have been successfully wallened + - bugfix: You can now move horizontally on tall stairs and they no longer have a + hole in them when facing south + - bugfix: Fixed improvised shield crafting recipe being overriden by moonflowers + - image: Floor lights no longer use outdated textures + - balance: Deja Vu perk now teleports you to where you were before the last teleport, + instead of where you arrived on the station + - bugfix: Deja Vu can no longer be used to return to the wizard ship + - bugfix: Blade heretic ascension now gives you floating blades once again + deathrobotpunch: + - rscadd: big pharma now supplies a single pack of experimental medication as an + easy to access (albeit expensive) cargo goodie! + - balance: price for the cargo crate with 2 pill bottles of experimental medication + has been increased to 600 to better reflect the goodie case price. + grungussuss: + - sound: some sheets that shouldn't be making metal sounds no longer make those + sounds + - sound: added new sounds for RCD, RPD and Plumbing Constructor. + tralezab: + - bugfix: bedsheets are laid on beds properly now +2024-08-17: + Ghommie: + - rscadd: Added a treasure chest you can rarely fish from the ocean/beach, with + loot being a mix of fishing and piratey stuff. + - rscadd: You can revive fish with strange reagent now. + - rscadd: You can sell items on the blackmarket with the LTSRBT now. + - bugfix: Added some checks to prevent the swapper device and bluespace anomalies + from theorically being able to send things and people to nullspace. + Jacquerel: + - bugfix: Beepsky and Mice have more appropriately positioned shadows. + Majkl-J: + - bugfix: Trying to repair someone's undamaged limb with a welder or wires no longer + has you smacking them + Shroopy: + - bugfix: Added a light switch to the science hallway in Metastation + SmArtKar: + - rscadd: You can now lean on windows the same way you can lean on walls + - bugfix: You no longer stop leaning on walls after clicking on anything +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Dumping things into microwave en-masse is done via RMB (drag'n'drop support coming soon!) - bugfix: RPEDs can now upgrade microwaves - bugfix: Spies can finally steal microwaves (Use RMB!) +<<<<<<< HEAD - bugfix: Mechs' directional armor now actually works - bugfix: Added a light switch to the science hallway in Metastation - bugfix: Air alarms stuck in warning state despite area completely fine @@ -524,6 +976,65 @@ is spawning - bugfix: Fixed the shower water visually not coming out behind the showerhead. - bugfix: fixes surgery table buckle offsets +======= + TheVekter: + - bugfix: Updated Metastation for Wallening + Time-Green: + - qol: The Voidwalker wisp void now loops you + unit0016: + - bugfix: Indestructible reinforced walls now mimic their destructible counterparts + as intended. + - bugfix: Every bitrunner domain's been patched up for the new perspective shift. + zxaber: + - image: Airlocks have a better sprite for indicating which directions (if any) + you can pass through without ID access. +2024-08-18: + Ben10Omintrix: + - bugfix: fixes ai controllers incorrectly idling when changing z level + Ghommie: + - bugfix: lights placed on walls with the RLD now face the correct direction. + - bugfix: Fixes lobby buttons from station traits having no name and being unexaminable. + - bugfix: Fixed the shower water visually not coming out behind the showerhead. + Justice12354: + - bugfix: Fixes the rotation of Centcom's Airlocks + KingkumaArt: + - image: Resprited mech drills, plasma cutter, pka and cargo clamp. + LemonInTheDark: + - admin: Subsystem Overview now has the ability to track a rolling average of tick + by tick subsystem cpu usage. + Melbert: + - qol: Icebox now has a trapdoor from Medbay leading into the Morgue (for corpses, + of course) + - bugfix: Patch exploit allowing nigh-infinite heretic points + - qol: Xenos and digi lizards have claw footprints + - qol: Some wall mounts will now consistently layer over others (light switches + and cameras, notably, should always layer above other mounts like signs and + status displays) + MrBagHead: + - bugfix: Swapped East and West sprites for access buttons to correct previous misalignment. + - rscadd: Added South-facing sprite for access buttons. + SmArtKar: + - bugfix: Mechs' directional armor now actually works + - bugfix: Alien beds no longer pretend they can be deconstructed with a wrench + - qol: Wallmount balloons are now clickable + - admin: Stat change is now logged for living mobs + - bugfix: Fixed elephant graveyard active turfs + - bugfix: Fixed random lipstick texture, fake syndie lipstick no longer can randomly + spawn + Timberpoes: + - bugfix: Having the Overflow Role set to On will properly ensure you get that role + at a High priority as intended by the game code. + - bugfix: Job selection is now a little bit more random. Fixes an unintentional + bias in random job assignment that could lead to feast-or-famine for roles where + everyone is assigned one job and nobody is assigned another job. + YesterdaysPromise: + - image: adjusted security barriers to be in 3/4 perspective. + Zytolg: + - bugfix: Updates much of Birdshot for the Wallening + mc-oofert: + - rscadd: portable gravity unit, bought at cargo + necromanceranne: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Drunken fist fighting now has bonuses and penalties based on how intoxicated you are. Controlled liquor intake could make you a better brawler. Though you might vomit if you go too hard. @@ -535,6 +1046,7 @@ - qol: Unarmed effects that would utilize stamina values now use a split of half brute, half burn to determine outcomes or for meeting thresholds. This affects; punch accuracy, stagger combo thresholds and grab vulnerability thresholds. +<<<<<<< HEAD - rscadd: You can now lean on windows the same way you can lean on walls - bugfix: You no longer stop leaning on walls after clicking on anything - rscadd: add syndicate branded lipstick to uplink (6 TC), after applying lipstick @@ -618,6 +1130,27 @@ - balance: Inducers can now be recharged with plasma - balance: Inducers ordered from cargo now start with upgraded megacells instead of upgraded batteries +======= + thegrb93: + - bugfix: Air alarms stuck in warning state despite area completely fine +2024-08-19: + ArcaneMusic: + - bugfix: Runtimestation's APC is now connected to the grid again. + - rscadd: White crayons (Renamed to Sticks of Chalk) may now be used on dead bodies + to draw a body outline onto the ground easily. + Bisar: + - bugfix: The Nanotrasen Emergency Religious Response Team has blessed the station; + heretic summon rituals now actually consume resources, fixing infinite summon + loops. + Ghommie: + - image: Ported and adapted several food sprites from Aurora, Bay and one instance + from Paradise -- Bacon, plant meat, slime meat, cutlets, crab meat, crab rangoon, + bechamel sauce, cheese curd, waffles, chips, shrimp chips, cheesie honkers, + space twinkie, jerky, peanuts bags, chocolate, boritos, syndicake, popcorn, + pesto, tomato sauce, pineapple slice, pineapple salsa, bran request cereals + and bronx bar have been resprited. + - rscdel: Waffles no longer magically conjure a "waffle tray" trash item when eaten. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Shrunk the arrow shown when pointing at things to be less invasive. - rscadd: Wearing an ID with the trim of a command/leader position gives you bigger arrows (about the size of arrows before this PR) which may also be of different @@ -627,6 +1160,7 @@ - bugfix: ERT engies and medics now come with the engineering and entrails-reader skillchips respectively, like their station counterparts. - bugfix: Fixed not facing atoms that you're pointing at. +<<<<<<< HEAD - rscadd: portable gravity unit, bought at cargo - image: Utility belts got new tool overlay sprites - spellcheck: CE's toolbelt is no longer capitalized or considered an improper noun @@ -679,12 +1213,15 @@ - bugfix: The area of the CentCom Z-Level dedicated to the Lobby Screen should look far better now, with a solid black title screen should the lobby image not load in/get deleted. +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added a bluespace fish case to the advanced fishing node. - balance: Fish cases will keep a fish from getting hungrier or ready to reproduce, while also healing it up to 65% health. - balance: Examining a fish with zero fishing skill whatsoever won't give a reading on its size and weight. Conversely, examining one with the skill leveled two times will give general information on if it's starving, sick, hungry, or dead. +<<<<<<< HEAD - rscadd: Added a treasure chest you can rarely fish from the ocean/beach, with loot being a mix of fishing and piratey stuff. - rscadd: You can revive fish with strange reagent now. @@ -728,11 +1265,131 @@ stuck - balance: Changed max refined vortex cores from 1 to 3. Changed the Event Horizon Anti-Existential Beam Rifle recipe to require 2 vortex cores. +======= + - bugfix: paintings now drop canvas and frame when knocked off the wall. + Jacquerel: + - bugfix: Whatever the roaches were getting into which made them hover above the + ground seems to have worn off. + - bugfix: Carp, bat, parrot, and dragon corpses no longer float in the air. + Rhials: + - code_imp: Radios/encryption keys now use a single variable for "special" frequencies. + Please report if you experience any strangeness with accessing/being unable + to access the Centcom, Syndicate, or Cyborg radio. + SmArtKar: + - bugfix: Random spraypaint setting now properly paints large decals + - image: Added emissives to departamental signs + - image: Gas tanks got updated worn sprites + - bugfix: Examine balloons for wall-mounted buttons no longer inflate themselves + infinitely + - bugfix: Fixed active turfs on crashsite ruin + - bugfix: Captain's spare safe no longer turns invisible when opened + - bugfix: Fixed soapbox component sometimes runtiming roundstart + - bugfix: Fixed circuit drone pixel/shadow offsets + TwistedSilicon: + - bugfix: Clarkes will no longer become unable to dump ores upon picking a boulder + up. Mine away. + mc-oofert: + - balance: wheelchairs no longer double your movement cooldown if you moved diagonally + norsvenska: + - qol: The CentCom officer's beret has had its slowdown removed to be in line with + the winter coat. + r3dj4ck0424: + - rscadd: A new vendor of cytology equipment, the CytoPro, is now available in your + local science department! + san7890: + - bugfix: The area of the CentCom Z-Level dedicated to the Lobby Screen should look + far better now, with a solid black title screen should the lobby image not load + in/get deleted. + - qol: Reporting issues on the Github should now be a far more simpler experience. + Hitting the "Report Issue" button in the top-right of your BYOND Client Screen + will still autofill in the fields as expected. +2024-08-20: + JohnFulpWillard: + - rscadd: Added Taunting, a faster and cooldowned version of the Spin emote. + - balance: Wizards blocking projectiles with Transparence and the bitrunner matrix + skillchip now have a visible effect of deflecting the projectile. + - balance: The bitrunner skillchip now uses taunt instead of flip. + - balance: The style meter now uses taunting instead of flips and spins. + - bugfix: Statues don't count as eyes to creatures. + - bugfix: Human AIs and Admin ghosts no longer get kicked off of machines that aren't + on cameranets. + SmArtKar: + - image: Utility belts got new tool overlay sprites + - spellcheck: CE's toolbelt is no longer capitalized or considered an improper noun + - balance: PACMANs now have significantly increased power output and take longer + to consume a single sheet + - balance: Inducers can now be recharged with plasma + - balance: Inducers ordered from cargo now start with upgraded megacells instead + of upgraded batteries + - balance: Vomiting from disgust now removes 50 of it from you. + Vekter: + - bugfix: Fixed further Wallening issues on Metastation, including Cargo's shuttle + door buttons and Xenobiology's access buttons. + - rscdel: Removed department directional signs from Metastation as they are currently + broken. They will return once they've been fixed. + Zytolg: + - bugfix: Continues to update Birdshot into a postwallening playable state + carlarctg: + - rscadd: Added three new DM maps - Ragnarok, Lattice Battles, Species Showdown. + mc-oofert: + - bugfix: spawning on a table or other elevated object does not offset you forever +2024-08-21: + Ghommie: + - rscadd: Added twelve new fish types to the game. Some are cool, other are not, + some come with their own special traits and some are straight-up weapons. + - rscadd: Added more fishing spots to the game. Sand, ice, rivers, the cursed spring... + - balance: A few fish like salmon, swordfish and pufferfish (poisonous btw) now + give better quality fillets when butchered, which can improve the quality of + food that uses them even further. + - balance: Excessive fish weight will make the fish slowier to carry, while excessive + size may make it require two hands. + - balance: Adjusted size, weight and cooldowns of several fish, for the better. + Iamgoofball: + - balance: Air alarms are now usable by Station Engineers as well as Atmospherics + Technicians. + Rhials: + - bugfix: Adjusts some areas by the Icebox Cliffside Bench to generate a bit less + weirdly. + - sound: '"radio message received" audio now has a brief cooldown.' + - bugfix: Beepsky will now salute commissioned bots, instead of himself, when encountering + one. + SmArtKar: + - bugfix: Ragnarok deathmatch arena now has noteleport area + - bugfix: Replaced a locked cabinet that you cannot open in ninja den with an unlocked + one + - qol: Haunted 8ball now gives you a TGUI input with your question for ghosts instead + of telling them the last thing it heard. + - image: 8ball has received a resprite + - bugfix: Fixed examine balloons not being click transparent even while inactive + - image: Updated cryostasis beaker's sprite + grungussuss: + - sound: computers now make clicky clacky sounds +2024-08-22: + Absolucy: + - qol: Clicking floor tiles now also closes curator/morgue doors, like with normal + airlocks. + - qol: Unarmed attacks with carp jaws now uses a bite effect rather than a punch + effect. + Ben10Omintrix: + - bugfix: fences will no longer appear pitch black and they will layer properly + Bisar: + - rscadd: Nanotrasen Intelligence has received reports of botanical experimentation + in a Syndicate base on lavaland. What fiendish flora are taking root in their + secret lair? + Ghommie: + - rscadd: Fishing toolboxes (and occasionally maintenance) now come with a paper + slip containing fishing-related tips. + - rscadd: Buckshot is back on the menu, on the blackmarket. + - balance: the integrity of firearms now counts toward projectile damage. A gun + that's on the very verge of breaking down will deal half as much damage. + Jacquerel: +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Pacifist carp can now be spawned from the friendly gold core reaction, and no longer appear from the hostile one. - bugfix: The teeth of toothless carp will not occasionally reappear - bugfix: Crabs will now run from attackers larger than them and attack things smaller than them, as intended. +<<<<<<< HEAD - qol: Unarmed attacks with carp jaws now uses a bite effect rather than a punch effect. - bugfix: custom pies and cakes are craftable again @@ -827,12 +1484,119 @@ - bugfix: Juicing and grinding should break less SkyratBot: - qol: revolver in roundstart holsters is on the last slot and not on first +======= + Redrover1760: + - balance: Changed max refined vortex cores from 1 to 3. Changed the Event Horizon + Anti-Existential Beam Rifle recipe to require 2 vortex cores. + Rhials: + - qol: Delivery/Bot pathing nodes have been added to the middle room of Runtime + station. + - sound: Windows blown out by a Voidwalker blade now have a cool sound that plays + as they reform. + - admin: You can now choose the humanoid species spawned by an ERT summon in the + summon menu. + SmArtKar: + - bugfix: Fixes kudzu being able to spawn on openspace turfs resulting in it getting + stuck + - bugfix: Radioactive nebula no longer runtimes on runtime station + - bugfix: Fixed delam counter going over objects + by Xackii, sprites by ArcaneMusic: + - rscadd: Added big manipulators. + lizelive: + - balance: reticence requires progression + r3dj4ck0424: + - balance: The CytoPro has had prices raised to slightly more reasonable levels. +2024-08-23: + MMMiracles: + - bugfix: More various Tramstation-adjacent wallening fixes. + Majkl-J: + - bugfix: custom pies and cakes are craftable again + SmArtKar: + - image: Updated goliath cloak sprites + necromanceranne: + - rscadd: Punching mitts! Punch wildlife to death and scream the whole time. ADVENTURE! + - balance: Megafauna can be affected by martial arts. +2024-08-24: + DaCoolBoss: + - bugfix: Aquarium decorations now contain plastic. + - spellcheck: Added item descriptions for aquarium decorations. + EnterTheJake: + - balance: Rusted Ritual now requries 10 sheets of Iron instead of Titanium. + Ghommie: + - rscadd: Added Athletic Fishing Gloves and Fishing Glove Module to the advanced + fishing tech node. Both can be used to fish without having to hold a fishing + rod. The athletic fishing gloves will also train your athletics skill. + LT3: + - spellcheck: Sneak a peek of Hilbert's Hotel, not a sneak peak + SmArtKar: + - bugfix: Marine helmets no longer change their sprite to security helmets when + their flashlight is toggled + - spellcheck: Hierophant no longer lies about obliterating someone + TheBoondock: + - qol: goliath arm can defuse gibonite by bumping or direct click +2024-08-25: + DrDiasyl aka DrTuxedo: + - rscadd: Curator has received a new BROADCAST CAMERA which can broadcast the surroundings + LIVE on Entertainment Screens/ Alongside with some other Journalism related + gear in his Heroic Beacon + - sound: Entertainment screens now play muffled speech when hearing a message on + Entertainment frequency + Ghommie: + - rscadd: You can place papers, photos and cash bills (no holochips) inside bottles + and then toss them into the ocean (or fishing portal gen with relative settings) + with right-click, for others to fish them up on future rounds. + - bugfix: You can no longer pickup closets and crates wrapped in a package with + a fishing rod. + - bugfix: Fixed a few harddel issues with mob spawns that caused charred corpses + fished from lavaland to create an invisible blockade. + - bugfix: Fixed being able to fish up mobs that have fallen in totally different + z-levels with a rescue hook (i.e. from bitrunning domains to lavaland). + SmArtKar: + - bugfix: Removed all ways of teleportation from deathmatch and replaced all consoles + on a certain map with non-functional variants. Loadouts have been adjusted to + account for this. + - rscdel: Species Warfare no longer has atmospherics-related equipment on it. + YesterdaysPromise: + - rscadd: Added crates of the following varieties; Interdyne, Interdyne freezer, + Tiger Co-Op, S.E.L.F. MI13, A.R.C., Cybersun (4 colour variants), Waffle Corp, + Donk, Gorlex, Gorlex weapons, DeForest, Nakamure Engineeing, Robust Industries +2024-08-26: + GPeckman: + - bugfix: The instagib, ragecage, mech madness, secu-ring, shooting range, and sniper + elite deathmatch maps are available again. + Ghommie: + - bugfix: Fixes the chainsaw evolution for goldfishes. + Majkl-J: + - rscadd: Achievement for eating 500 cigarettes + - balance: Cigarettes are now edible + - code_imp: Adds a variable to hide the food examine on the edible element + - bugfix: SSPolling no longer fills in the candidate list with empty entries to + guarantee it returns a list size of amount_to_pick + SmArtKar: + - spellcheck: Fixed a typo on snowdin shuttle transi(s)t consoles + grungussuss: + - sound: lead pipe has sound + vinylspiders: + - bugfix: wet hides and hairless hides no longer make metal clanging noises when + picked up/dropped +2024-08-27: + Ben10Omintrix: + - bugfix: fixes blob spore and slime AI endlessly attacking the dead + Sakamoto4ka: + - rscadd: Added salt electrolysis reaction + SmArtKar: + - bugfix: Bioscrambler anomalies no longer affect inorganic species +2024-08-28: + Melbert: + - bugfix: Juicing and grinding should break less +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vekter: - bugfix: Fixed an issue causing Quartermaster office access to show in the wrong area on Plexagon Access Management. - bugfix: Fixed an inconsistency in the naming for QM Office access. grungussuss: - bugfix: after 4 years, computer sound loop now works properly +<<<<<<< HEAD 2024-08-31: LT3: - bugfix: Blueshift's cargo shuttle buttons are no longer trapped under glass windows @@ -844,3 +1608,22 @@ - bugfix: Stagger animation is no longer horrilbly jittery thegrb93: - bugfix: Fixes not being able to disassemble the lewd machines +======= +2024-08-29: + FeudeyTF: + - rscadd: Added board for detective's evidences + Rhials: + - rscadd: Smokey remains have appeared in maintenance. Make sure to walk when near + them! + SmArtKar: + - bugfix: Stagger animation is no longer horrilbly jittery + Xackii: + - qol: revolver in roundstart holsters is on the last slot and not on first +2024-08-30: + SmArtKar: + - bugfix: Projectiles no longer always play turf hit sound + - balance: Plexagon Crew Manifest is now a default PDA app for everyone, and is + free. + - balance: Plexagon Crew Manifest no longer provides Detomatix resistance, but security + records and status display control now do. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml index c092cd6ade3..cdd2fd27b29 100644 --- a/html/changelogs/archive/2024-09.yml +++ b/html/changelogs/archive/2024-09.yml @@ -1,3 +1,4 @@ +<<<<<<< HEAD 2024-09-03: Moostard: - bugfix: Ceremonial rifle crate now contains 3 rifles as advertised. The naming @@ -68,3 +69,199 @@ - sound: gravity generator has a new sound xXPawnStarrXx: - bugfix: fixed cyborg upgrades deleting the bonesetter and giving no alternative. +======= +2024-09-04: + 00-Steven: + - balance: Fax machines with hacked input servos can now send chap slices and cookies. + Please accept them. + - bugfix: Buckling yourself to a bed or stasis bed will now make you actually use + the headrest/pillow and face up. + - qol: Multi-z disposal segments can actually be made with an RPD. + - image: Upwards multi-z disposal segments no longer have wonky sprites. + - bugfix: Big manipulator hands now move smoothly with the base when it's moved. + Absolucy: + - bugfix: You will now be ejected from any jaunt (i.e bloodcrawl or shadow walk) + if you lose consciousness somehow during the jaunt. + Artemchik542: + - bugfix: typo in CRUSH_CRIT_PARAPLEGIC + AyIong: + - qol: Stat Panel settings moved to personal tab + - bugfix: Stat Panel tabs no longer create horizontal scrollbar by default, but + you can return it into the settings + - bugfix: Hovering over a truncated statpanel button, doesn't blocks the button + below it anymore + FeudeyTF: + - bugfix: fixed detective board placing + Hardly: + - sound: Added sounds for conveyor belt switches + JohnFulpWillard: + - bugfix: Ice cream vats can be refilled with beakers again. + LT3: + - bugfix: You can now put Skub back in the Skub box, as intended + - bugfix: Ice Box lower floor maints is properly protected during radstorms + - bugfix: Fixed malfunctioning tram crossing signals sometimes staying green + Melbert: + - bugfix: Some spy items should spawn less broken + Redrover1760: + - bugfix: Fixed light overloads not draining significant amounts of energy. + - bugfix: Power sinks now drain APCs at a significant rate instead of glacially + slow. + - balance: Power sinks are adjusted to not explode within 30 seconds of the average + power output a station produces. + SmArtKar: + - image: Added new sprites for hellfire lasers + - bugfix: Cardborg costume no longer gets its appearance deleted when you drop a + second hat/suit you are holding in your hand + Watermelon914: + - bugfix: Fixed a bug that breaks signal handlers on an object if one of the signal + handlers doesn't return a number value. + Xackii: + - bugfix: fixed that screwdriwing radio headset in combat mode don't do anything. + alien3301: + - balance: When silicons use their radio they will not whisper out loud anymore + grungussuss: + - sound: being sacrificed by a heretic is now spookier + grungussuss and kayozz: + - sound: gravity generator has a new sound + vinylspiders: + - bugfix: due to a clerical error, all ballistic guns were shipping with built-in + silencers. this has been resolved-they will now make noise once again when fired. + - bugfix: fixes a crafting exploit that allowed you to get more resources back from + disassembling than you put into the recipe + - bugfix: fixed 'Enable Radio Noise' pref only being respected for deaf people +2024-09-05: + Archimus12: + - bugfix: Makes the Cytology Vendor sell science bio suits instead of medical bio + suits. + - bugfix: Makes the Cytology Vendor sell science lab coats instead of normal lab + coats. + Astrogem2: + - spellcheck: fixed a few typos with energy shield descriptions. + Ben10Omintrix: + - bugfix: aquarium ui now displays props and fishes correctly + - refactor: able_to_run and incapacitated have been refactored to be event based + - bugfix: wooden fences will no longer appear pitch black in lower levels of icebox + - qol: gives aquariums a new easier to use UI + Bisar: + - code_imp: The (currently unused) TGUI checkbox components returns a BYOND friendly + list of the indexes of any choices now. + EnterTheJake: + - rscadd: A Syndicate Rebar Quiver has been added to the uplink + - qol: Left clicking with a rebar crossbow will now draw/undraw the string. + - balance: Rebar quivers are now a neck slot item. + - balance: ' Hydrogen bolts damage has been upped to 55 brute and can now pierce + through walls, they no longer have infinite piercing and can no longer embed + however.' + - code_imp: removed the TRAIT_ALWAYS_HIT_ZONE, replaced with 2 new variables. + - bugfix: fixes rebar crossbows having a higher capacity than intended if a bolt + had already been chambered. + FeudeyTF: + - bugfix: fixed an UI problems of evidence board + Ghommie: + - bugfix: Rum can be synthetized again. + JohnFulpWillard: + - qol: Smartfridges now lets you set how many pills you want to vend, rather than + popping out a second separate tgui window. + LT3: + - rscadd: Added Chief Engineer SEAL OF APPROVAL sticker + - code_imp: Stickers now come in sticker packs, not boxes + - code_imp: Stickers can now add examine text to whatever they're stuck on + Rhials: + - spellcheck: Anomaly suicides now use proper grammar. + - bugfix: Anomaly suicides work again. + Time-Green: + - qol: Unsettle (Voidwalker) doesn't go on cooldown if line of sight is broken + grungussuss: + - sound: fish now have new sounds + oranges: + - rscadd: ghosts can now jump, bhop your way to life + r3dj4ck0424: + - rscadd: The vendor of cytology equipment, the CytoPro, is once again available + in your local science department! +2024-09-06: + Absolucy: + - refactor: Refactored some functions related to line-of-sight and reach to improve + performance. + Ghommie: + - bugfix: Syndie sleepers now drop the appropriate syndicate sleeper boards. + - bugfix: fixed a few minor nits with aquarium fish visuals. + - qol: You can kill germs by actually cooking the food (i.e. frying and grilling) + now, or by setting it on fire. + Hardly: + - sound: Plumbing Constructor and Rapid-Tiling-Device now has RCD's pick up and + UI sounds + - bugfix: Fixes ghosts being able to interact with the RCD, RPLD and RPDs + Jewelry-x: + - spellcheck: fixed a wrong extension in the RUNNING_A_SERVER.md + KazooBard: + - qol: All cans (soda cans etc) fit on utility belts now. Drink on the job! + LT3: + - image: 'The ''shit is fucked'' default turf no longer flashes + + /:cl' + Majkl-J: + - bugfix: Embed updating now actually updates embeds + Melbert: + - refactor: Refactored heretic influences a tiny bit, now ghosts can see them! Report + any oddities. + OverwatchVoice: + - spellcheck: Changed description of Rebar crossbow. + - bugfix: Rebar crossbow description will no longer lie about it's missfire potential. + Rhials: + - bugfix: Runtime station has delivery beacons and navbeacons again. + Singul0: + - sound: adds sounds for energy shieldbashing + - code_imp: Shieldbashing feature is now consistent across all shield types + SmArtKar: + - bugfix: Changelings can no longer spawn undetectable spider eggs inside of vents + - bugfix: Acromegaly no longer makes you bonk your head on airlocks while you're + inside of objects + TwistedSilicon: + - bugfix: The Codex Cicatrix ritual now consumes the item in the case where a hide + was used instead of a corpse. No more free books. + Y0SH1M4S73R: + - admin: Dreamluau provides a more informative error message when trying to pass + references to qdeleted datums back to BYOND. + grungussuss: + - sound: some more items will vary in pitch when picking them up and placing them + down + jlsnow301: + - rscadd: 'Added two new bitrunning maps: Grasslands Hunt and Meta Central.' + - rscadd: Deer are now more complex animals, granting them enhanced ability to run + amok and chew your favorite plants. + - balance: Reduced the cost of most BR vendor items. + - bugfix: Fixes an issue where modular virtual domains spawned less mobs than intended. + - bugfix: These modular spawns are now valid mutation targets to become an antagonist. + r3dj4ck0424: + - spellcheck: made the grammar on the brimdemon horn crusher trophy nicer + vinylspiders: + - bugfix: fixed a bug that could sometimes cause jump boots users to retain the + floating trait indefinitely when using the ability +2024-09-07: + Ben10Omintrix: + - bugfix: fixes basic mobs not losing their aggroed appearance after death + Ghommie: + - rscadd: Added fishing lures to the game. They don't get used up like baits and + let you catch specific kinds of fish, though they need to be spun every few + seconds. The whole set can be ordered from cargo for 450 credits. + - balance: The magnet hook now removes dud chances. + - rscadd: 'Added five new fish types: perch, two types of pike, monkfish, plaice + and squid. Squids have a fairly special ink production trait, which lets you + use them (unless dead) to ink people face at close range, and can be butchered + for an ink sac, which can either be processed into canned squid ink, or thrown + at someone.' + - bugfix: Refactored throwing a little. Some items (specifically components/elements) + won't be triggered when caught. no more plates shattering despite being caught + for example. + - rscadd: Goldfish, lavaloops, needlefish and armorfish can now be used as baits. + MrStonedOne: + - bugfix: Fixed the taskbar/menu bar icon showing the virgin orange byond icon instead + of the chad blue ss13 icon. + Rhials: + - rscadd: Code-Violet Medical Support ERT teams have been rolled out for deployment + to Space Station 13 and related Nanotrasen Installations. + Singul0: + - bugfix: Fixes makarov-stechkin mix up on forgotten ship virtual domain. + Xackii: + - qol: You don't need two hands to stream with broadcast camera. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/statbrowser.css b/html/statbrowser.css index cd1d63bf7c0..bef17092c05 100644 --- a/html/statbrowser.css +++ b/html/statbrowser.css @@ -16,7 +16,11 @@ a:hover { } h3 { +<<<<<<< HEAD margin: 0 -0.5em 0.25em; +======= + margin: 0 -0.5em 0.5em; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 padding: 1em 0.66em 0.5em; border-bottom: 0.1667em solid; } @@ -41,6 +45,30 @@ img { background-color: #ffffff; } +<<<<<<< HEAD +======= +.menu-wrap { + flex-wrap: wrap-reverse; +} + +#menu.tabs-classic { + padding: 0.15em; +} + +#menu.tabs-classic .button { + min-width: 2em; + margin: 0.1em; + padding: 0.25em 0.4em; + border: 0; + border-radius: 0.25em; +} + +#menu.tabs-classic .button.active { + background-color: #0668b8; + color: white; +} + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .button { display: inline-table; cursor: pointer; @@ -62,6 +90,10 @@ img { } .button.active { +<<<<<<< HEAD +======= + cursor: default; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 background-color: #dfdfdf; color: black; border-bottom-color: #000000; @@ -80,7 +112,11 @@ img { } .grid-container { +<<<<<<< HEAD margin: 0; +======= + margin: -0.25em; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } .grid-item { @@ -89,13 +125,22 @@ img { user-select: none; -ms-user-select: none; /* Remove after Byond 516 */ width: 100%; +<<<<<<< HEAD box-sizing: border-box; +======= + max-height: 1.85em; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 text-decoration: none; background-color: transparent; color: black; } +<<<<<<< HEAD .grid-item:hover { +======= +.grid-item:hover, +.grid-item:active { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color: #003399; z-index: 1; } @@ -104,21 +149,35 @@ img { display: inline-block; overflow: hidden; text-overflow: ellipsis; +<<<<<<< HEAD box-sizing: border-box; white-space: nowrap; +======= + white-space: nowrap; + pointer-events: none; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 width: 100%; padding: 0.33em 0.5em; border-radius: 0.25em; } +<<<<<<< HEAD .grid-item-text:hover { position: absolute; top: -1.33em; +======= +.grid-item:hover .grid-item-text { + overflow: visible; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 white-space: normal; background-color: #ececec; } +<<<<<<< HEAD .grid-item-text:active { +======= +.grid-item:active .grid-item-text { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 background-color: #dfdfdf; } @@ -173,7 +232,12 @@ body.dark { } .dark a:hover, +<<<<<<< HEAD .dark .grid-item:hover { +======= +.dark .grid-item:hover, +.dark .grid-item:active { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color: #80bfff; } @@ -181,6 +245,13 @@ body.dark { background-color: #131313; } +<<<<<<< HEAD +======= +.dark #menu.tabs-classic .button.active { + background-color: #20b142; +} + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .dark .button { color: rgba(255, 255, 255, 0.5); } @@ -203,10 +274,18 @@ body.dark { color: #b2c4dd; } +<<<<<<< HEAD .dark .grid-item-text:hover { background-color: #252525; } .dark .grid-item-text:active { +======= +.dark .grid-item:hover .grid-item-text { + background-color: #252525; +} + +.dark .grid-item:active .grid-item-text { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 background-color: #313131; } diff --git a/html/statbrowser.js b/html/statbrowser.js index f6c188c6edd..62f8110860f 100644 --- a/html/statbrowser.js +++ b/html/statbrowser.js @@ -716,6 +716,22 @@ function set_font_size(size) { document.body.style.setProperty('font-size', size); } +<<<<<<< HEAD +======= +function set_tabs_style(style) { + if (style == "default") { + menu.classList.add('menu-wrap'); + menu.classList.remove('tabs-classic'); + } else if (style == "classic") { + menu.classList.add('menu-wrap'); + menu.classList.add('tabs-classic'); + } else if (style == "scrollable") { + menu.classList.remove('menu-wrap'); + menu.classList.remove('tabs-classic'); + } +} + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 function set_style_sheet(sheet) { if (document.getElementById("goonStyle")) { var currentSheet = document.getElementById("goonStyle"); diff --git a/icons/effects/crayondecal.dmi b/icons/effects/crayondecal.dmi old mode 100755 new mode 100644 diff --git a/icons/effects/parallax.dmi b/icons/effects/parallax.dmi old mode 100755 new mode 100644 diff --git a/icons/mob/clothing/under/digi_template.dmi b/icons/mob/clothing/under/digi_template.dmi new file mode 100644 index 00000000000..0c9db80eb1c Binary files /dev/null and b/icons/mob/clothing/under/digi_template.dmi differ diff --git a/icons/mob/effects/blocking.dmi b/icons/mob/effects/blocking.dmi new file mode 100644 index 00000000000..03872fa0fe3 Binary files /dev/null and b/icons/mob/effects/blocking.dmi differ diff --git a/icons/mob/effects/face_decal.dmi b/icons/mob/effects/face_decal.dmi new file mode 100644 index 00000000000..6caecf7d767 Binary files /dev/null and b/icons/mob/effects/face_decal.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi deleted file mode 100644 index a1a253be4e7..00000000000 Binary files a/icons/obj/chemical.dmi and /dev/null differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi deleted file mode 100644 index 26b36cd52aa..00000000000 Binary files a/icons/obj/kitchen.dmi and /dev/null differ diff --git a/icons/obj/machines/stasis.dmi b/icons/obj/machines/stasis.dmi old mode 100755 new mode 100644 diff --git a/icons/obj/service/broadcast.dmi b/icons/obj/service/broadcast.dmi new file mode 100644 index 00000000000..e82023791f3 Binary files /dev/null and b/icons/obj/service/broadcast.dmi differ diff --git a/interface/skin.dmf b/interface/skin.dmf index 41d615afe12..fd0bfad4bce 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -126,6 +126,7 @@ window "mapwindow" right-click = true saved-params = "zoom;letterbox;zoom-mode" style = ".center { text-align: center; } .maptext { font-family: 'Grand9K Pixel'; font-size: 6pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold; } .context { font-family: 'Pixellari'; font-size: 12pt; -dm-text-outline: 1px black; } .subcontext { font-family: 'TinyUnicode'; font-size: 12pt; line-height: 0.75; } .small { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; } .big { font-family: 'Pixellari'; font-size: 12pt; } .reallybig { font-size: 12pt; } .extremelybig { font-size: 12pt; } .greentext { color: #00FF00; font-size: 6pt; } .redtext { color: #FF0000; font-size: 6pt; } .clown { color: #FF69BF; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; }" +<<<<<<< HEAD elem "title_browser" type = BROWSER pos = 0,0 @@ -137,6 +138,8 @@ window "mapwindow" is-disabled = true saved-params = "" auto-format = false +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 elem "status_bar" type = LABEL pos = 0,464 diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index b18f723f0ae..cd13e5381b6 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -51,6 +51,7 @@ em {font-style: normal; font-weight: bold;} .syndradio {color: #6d3f40;} .centcomradio {color: #686868;} .aiprivradio {color: #ff00ff;} +.enteradio {color: #00ff99;} .redteamradio {color: #ff0000;} .blueteamradio {color: #0000ff;} .greenteamradio {color: #00ff00;} @@ -64,7 +65,10 @@ h1.alert, h2.alert {color: #000000;} .emote {} .infoplain {} +<<<<<<< HEAD .mentor {} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .userdanger {color: #ff0000; font-weight: bold; font-size: 3;} .danger {color: #ff0000; font-weight: bold;} diff --git a/lua/SS13_base.lua b/lua/SS13_base.lua index ea04c8c6503..33d1571d452 100644 --- a/lua/SS13_base.lua +++ b/lua/SS13_base.lua @@ -5,13 +5,18 @@ local SS13 = {} __SS13_signal_handlers = __SS13_signal_handlers or {} +<<<<<<< HEAD SS13.SSlua = dm.global_vars.vars.SSlua +======= +SS13.SSlua = dm.global_vars.SSlua +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SS13.global_proc = "some_magic_bullshit" SS13.state = state.state function SS13.get_runner_ckey() +<<<<<<< HEAD return SS13.state:get_var("ckey_last_runner") end @@ -44,11 +49,32 @@ end function SS13.qdel(datum) if SS13.is_valid(datum) then dm.global_proc("qdel", datum) +======= + return SS13.state.ckey_last_runner +end + +function SS13.get_runner_client() + return dm.global_vars.GLOB.directory[SS13.get_runner_ckey()] +end + +SS13.type = dm.global_procs._text2path + +function SS13.istype(thing, type) + return dm.global_procs._istype(thing, SS13.type(type)) == 1 +end + +SS13.new = dm.new + +function SS13.qdel(datum) + if SS13.is_valid(datum) then + dm.global_procs.qdel(datum) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return true end return false end +<<<<<<< HEAD function SS13.new_untracked(type, ...) return dm.global_proc("_new", type, { ... }) end @@ -58,6 +84,10 @@ function SS13.is_valid(datum) return true end return false +======= +function SS13.is_valid(datum) + return dm.is_valid_ref(datum) and not datum.gc_destroyed +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end function SS13.await(thing_to_call, proc_to_call, ...) @@ -67,6 +97,7 @@ function SS13.await(thing_to_call, proc_to_call, ...) if thing_to_call == SS13.global_proc then proc_to_call = "/proc/" .. proc_to_call end +<<<<<<< HEAD local promise = SS13.new("/datum/auxtools_promise", thing_to_call, proc_to_call, ...) local promise_vars = promise.vars while promise_vars.status == 0 do @@ -78,10 +109,57 @@ function SS13.await(thing_to_call, proc_to_call, ...) end function SS13.register_signal(datum, signal, func) +======= + local promise = SS13.new("/datum/promise", thing_to_call, proc_to_call, ...) + while promise.status == 0 do + sleep() + end + return promise.return_value, promise.runtime_message +end + +local function signal_handler(data, ...) + local output = 0 + for func, _ in data.functions do + local result = func(...) + if type(result) == "number" then + output = bit32.bor(output, math.floor(result)) + end + end + return output +end + +local function create_qdeleting_callback(datum) + local callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first") + callback:RegisterSignal(datum, "parent_qdeleting", "Invoke") + local path = { + "__SS13_signal_handlers", + dm.global_procs.WEAKREF(datum), + "parent_qdeleting", + "handler", + } + callback.arguments = { path } + local handler_data = { callback = callback, functions = {} } + handler_data.handler = function(source, ...) + local result = signal_handler(handler_data, source, ...) + for signal, signal_data in __SS13_signal_handlers[source] do + signal_data.callback:UnregisterSignal(source, signal) + end + __SS13_signal_handlers[source] = nil + return result + end + __SS13_signal_handlers[datum]["parent_qdeleting"] = handler_data +end + +function SS13.register_signal(datum, signal, func) + if not type(func) == "function" then + return + end +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if not SS13.istype(datum, "/datum") then return end if not SS13.is_valid(datum) then +<<<<<<< HEAD error("Tried to register a signal on a deleted datum!", 2) return end @@ -186,4 +264,64 @@ function SS13.signal_handler_cleanup(datumWeakRef) __SS13_signal_handlers[datumWeakRef] = nil end +======= + error("Tried to register a signal on a deleted datum", 2) + end + if not __SS13_signal_handlers[datum] then + __SS13_signal_handlers[datum] = {} + -- Turfs don't remove their signals on deletion. + if not SS13.istype(datum, "/turf") then + create_qdeleting_callback(datum) + end + end + local handler_data = __SS13_signal_handlers[datum][signal] + if not handler_data then + handler_data = { callback = nil, functions = {} } + local callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first") + callback:RegisterSignal(datum, signal, "Invoke") + local path = { + "__SS13_signal_handlers", + dm.global_procs.WEAKREF(datum), + signal, + "handler", + } + callback.arguments = { path } + handler_data.callback = callback + handler_data.handler = function(...) + return signal_handler(handler_data, ...) + end + __SS13_signal_handlers[datum][signal] = handler_data + end + handler_data.functions[func] = true + return true +end + +function SS13.unregister_signal(datum, signal, func) + if not (func == nil or type(func) == "function") then + return + end + if not __SS13_signal_handlers[datum] then + return + end + local handler_data = __SS13_signal_handlers[datum][signal] + if not handler_data then + return + end + if func == nil then + if signal == "parent_qdeleting" then + handler_data.functions = {} + else + handler_data.callback:UnregisterSignal(datum, signal) + __SS13_signal_handlers[datum][signal] = nil + end + else + handler_data.functions[func] = nil + if not (#handler_data.functions or (signal == "parent_qdeleting")) then + handler_data.callback:UnregisterSignal(datum, signal) + __SS13_signal_handlers[datum][signal] = nil + end + end +end + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return SS13 diff --git a/lua/handler_group.lua b/lua/handler_group.lua index 0246d33c744..6cf664297bb 100644 --- a/lua/handler_group.lua +++ b/lua/handler_group.lua @@ -1,29 +1,52 @@ +<<<<<<< HEAD local SS13 = require('SS13') +======= +local SS13 = require("SS13") +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 local HandlerGroup = {} HandlerGroup.__index = HandlerGroup function HandlerGroup.new() return setmetatable({ +<<<<<<< HEAD registered = {} +======= + registered = {}, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, HandlerGroup) end -- Registers a signal on a datum for this handler group instance. function HandlerGroup:register_signal(datum, signal, func) +<<<<<<< HEAD local callback = SS13.register_signal(datum, signal, func) if not callback then return end table.insert(self.registered, { datum = dm.global_proc("WEAKREF", datum), signal = signal, callback = callback }) +======= + local registered_successfully = SS13.register_signal(datum, signal, func) + if not registered_successfully then + return + end + table.insert(self.registered, { datum = datum, signal = signal, func = func }) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end -- Clears all the signals that have been registered on this HandlerGroup function HandlerGroup:clear() for _, data in self.registered do +<<<<<<< HEAD if not data.callback or not data.datum then continue end SS13.unregister_signal(data.datum, data.signal, data.callback) +======= + if not data.func or not SS13.is_valid(data.datum) then + continue + end + SS13.unregister_signal(data.datum, data.signal, data.func) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end table.clear(self.registered) end @@ -45,5 +68,8 @@ function HandlerGroup.register_once(datum, signal, func) return callback end +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return HandlerGroup diff --git a/lua/state.lua b/lua/state.lua index 080ee9f7eb3..641250539d9 100644 --- a/lua/state.lua +++ b/lua/state.lua @@ -1,7 +1,14 @@ +<<<<<<< HEAD local SSlua = dm.global_vars:get_var("SSlua") for _, state in SSlua:get_var("states") do if state:get_var("internal_id") == dm.state_id then +======= +local SSlua = dm.global_vars.SSlua + +for _, state in SSlua.states do + if state.internal_id == _state_id then +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return { state = state } end end diff --git a/lua/timer.lua b/lua/timer.lua index e88fdd80607..e12aba8c4fd 100644 --- a/lua/timer.lua +++ b/lua/timer.lua @@ -2,19 +2,31 @@ local state = require("state") local Timer = {} +<<<<<<< HEAD local SSlua = dm.global_vars:get_var("SSlua") +======= +local SSlua = dm.global_vars.SSlua +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 __Timer_timers = __Timer_timers or {} __Timer_callbacks = __Timer_callbacks or {} function __add_internal_timer(func, time, loop) local timer = { loop = loop, +<<<<<<< HEAD executeTime = time + dm.world:get_var("time") +======= + executeTime = time + dm.world.time, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } __Timer_callbacks[tostring(func)] = function() timer.executing = false if loop and timer.terminate ~= true then +<<<<<<< HEAD timer.executeTime = dm.world:get_var("time") + time +======= + timer.executeTime = dm.world.time + time +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else __stop_internal_timer(tostring(func)) end @@ -37,22 +49,37 @@ function __stop_internal_timer(func) end __Timer_timer_processing = __Timer_timer_processing or false +<<<<<<< HEAD state.state:set_var("timer_enabled", 1) +======= +state.state.timer_enabled = 1 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 __Timer_timer_process = function(seconds_per_tick) if __Timer_timer_processing then return 0 end __Timer_timer_processing = true +<<<<<<< HEAD local time = dm.world:get_var("time") +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for func, timeData in __Timer_timers do if timeData.executing == true then continue end +<<<<<<< HEAD if over_exec_usage(0.85) then sleep() end if time >= timeData.executeTime then state.state:get_var("functions_to_execute"):add(func) +======= + if _exec.time / (dm.world.tick_lag * 100) > 0.85 then + sleep() + end + if dm.world.time >= timeData.executeTime then + list.add(state.state.functions_to_execute, func) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timeData.executing = true end end @@ -61,6 +88,7 @@ __Timer_timer_process = function(seconds_per_tick) end function Timer.wait(time) +<<<<<<< HEAD <<<<<<< HEAD local next_yield_index = __next_yield_index __add_internal_timer(function() @@ -70,6 +98,11 @@ function Timer.wait(time) __add_internal_timer(function() SSlua:queue_resume(state.state, yieldIndex) >>>>>>> 6577c58b948b (Fixes lua function SS13.wait. (#85427)) +======= + local yieldIndex = _exec.next_yield_index + __add_internal_timer(function() + SSlua:queue_resume(state.state, yieldIndex) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end, time * 10, false) coroutine.yield() end diff --git a/modular_skyrat/master_files/icons/import.dmi b/modular_skyrat/master_files/icons/import.dmi deleted file mode 100644 index cf74d73796c..00000000000 Binary files a/modular_skyrat/master_files/icons/import.dmi and /dev/null differ diff --git a/modular_skyrat/modules/clock_cult/sound/machinery/ark_scream.ogg b/modular_skyrat/modules/clock_cult/sound/machinery/ark_scream.ogg deleted file mode 100644 index 3e2fde4fdac..00000000000 Binary files a/modular_skyrat/modules/clock_cult/sound/machinery/ark_scream.ogg and /dev/null differ diff --git a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg index fc2836ff1f4..14b3868d067 100644 Binary files a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg and b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg differ diff --git a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot2.ogg b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot2.ogg deleted file mode 100644 index 635116cb67c..00000000000 Binary files a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot2.ogg and /dev/null differ diff --git a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-target.ogg b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-target.ogg deleted file mode 100644 index 557437a6721..00000000000 Binary files a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-target.ogg and /dev/null differ diff --git a/modular_skyrat/modules/clock_cult/sound/magic/scripture_tier_up.ogg b/modular_skyrat/modules/clock_cult/sound/magic/scripture_tier_up.ogg deleted file mode 100644 index 7a8d51a4c08..00000000000 Binary files a/modular_skyrat/modules/clock_cult/sound/magic/scripture_tier_up.ogg and /dev/null differ diff --git a/modular_skyrat/modules/emotes/sound/voice/goose_honk.ogg b/modular_skyrat/modules/emotes/sound/voice/goose_honk.ogg deleted file mode 100644 index b15b7695b32..00000000000 Binary files a/modular_skyrat/modules/emotes/sound/voice/goose_honk.ogg and /dev/null differ diff --git a/modular_skyrat/modules/goofsec/code/hud.dm b/modular_skyrat/modules/goofsec/code/hud.dm deleted file mode 100644 index b9491c4a625..00000000000 --- a/modular_skyrat/modules/goofsec/code/hud.dm +++ /dev/null @@ -1,30 +0,0 @@ -// WEE WOO WEE WOO WANTED -/datum/hud - var/atom/movable/screen/wanted/wanted_lvl - -/atom/movable/screen/wanted - name = "Space Police Alertness" - desc = "Shows the current level of hostility the space police is planning to rain down on you. Better be careful." - icon = 'icons/obj/antags/gang/wanted_160x32.dmi' - icon_state = "wanted_0" - base_icon_state = "wanted" - screen_loc = ui_wanted_lvl - /// Wanted level, affects the hud icon. Level 0 is default, and the level 0 icon is blank, so in case of no families gamemode (and thus no wanted level), this HUD element will never appear. - var/level = 0 - /// Boolean, have the cops arrived? If so, the icon stops changing and remains the same. - var/cops_arrived = 0 - -/atom/movable/screen/wanted/Initialize(mapload) - . = ..() - update_appearance() - -/atom/movable/screen/wanted/MouseEntered(location,control,params) - . = ..() - openToolTip(usr,src,params,title = name,content = desc, theme = "alerttooltipstyle") - -/atom/movable/screen/wanted/MouseExited() - closeToolTip(usr) - -/atom/movable/screen/wanted/update_icon_state() - icon_state = "[base_icon_state]_[level][cops_arrived ? "_active" : null]" - return ..() diff --git a/sound/attributions.txt b/sound/attributions.txt index 123fde0794c..caaef320757 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -209,3 +209,10 @@ beaker_pickup.ogg was made by lowering pitch: Bottle Tap.wav by alex_alexalex -- https://freesound.org/s/395492/ -- License: Attribution NonCommercial 3.0 beaker_place.ogg was made by cutting and lowering pitch: place glass object.wav by milpower -- https://freesound.org/s/353105/ -- License: Creative Commons 0 +<<<<<<< HEAD +======= + +glass_reverse.ogg is adapted from a combination of: +https://freesound.org/people/C_Rogers/sounds/203368/ -- glass-shattering-hit_01.ogg by C_Rogers on freesound.org (CC0) +https://freesound.org/people/Czarcazas/sounds/330800/ -- Audio reversal/fading of Shattering Glass (Small) by Czarcazas -- https://freesound.org/s/330800/ -- License: Attribution 3.0 +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/sound/creatures/fish/attritbution.txt b/sound/creatures/fish/attritbution.txt new file mode 100644 index 00000000000..2b3d80f408e --- /dev/null +++ b/sound/creatures/fish/attritbution.txt @@ -0,0 +1,7 @@ +{ +fish_drop1.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0 +fish_pickup1.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0 +fish_pickup2.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0 +fish_slap1.ogg - Slap - Cartoony by AdminMP -- https://freesound.org/s/383201/ -- License: Creative Commons 0 +fish_slap2.ogg - Major punch by janbezouska -- https://freesound.org/s/399183/ -- License: Creative Commons 0 +} - edited by sadboysuss diff --git a/sound/creatures/fish/fish_drop1.ogg b/sound/creatures/fish/fish_drop1.ogg new file mode 100644 index 00000000000..3c658a19768 Binary files /dev/null and b/sound/creatures/fish/fish_drop1.ogg differ diff --git a/sound/creatures/fish/fish_pickup1.ogg b/sound/creatures/fish/fish_pickup1.ogg new file mode 100644 index 00000000000..7f1fe68080b Binary files /dev/null and b/sound/creatures/fish/fish_pickup1.ogg differ diff --git a/sound/creatures/fish/fish_pickup2.ogg b/sound/creatures/fish/fish_pickup2.ogg new file mode 100644 index 00000000000..70d240bad66 Binary files /dev/null and b/sound/creatures/fish/fish_pickup2.ogg differ diff --git a/sound/creatures/fish/fish_slap1.ogg b/sound/creatures/fish/fish_slap1.ogg new file mode 100644 index 00000000000..984e1cf1088 Binary files /dev/null and b/sound/creatures/fish/fish_slap1.ogg differ diff --git a/sound/creatures/fish/fish_slap2.ogg b/sound/creatures/fish/fish_slap2.ogg new file mode 100644 index 00000000000..581cf17e688 Binary files /dev/null and b/sound/creatures/fish/fish_slap2.ogg differ diff --git a/sound/effects/glass_reverse.ogg b/sound/effects/glass_reverse.ogg new file mode 100644 index 00000000000..af1492d9b86 Binary files /dev/null and b/sound/effects/glass_reverse.ogg differ diff --git a/sound/effects/muffspeech/muffspeech1.ogg b/sound/effects/muffspeech/muffspeech1.ogg new file mode 100644 index 00000000000..b8b2f5f40b1 Binary files /dev/null and b/sound/effects/muffspeech/muffspeech1.ogg differ diff --git a/sound/effects/muffspeech/muffspeech2.ogg b/sound/effects/muffspeech/muffspeech2.ogg new file mode 100644 index 00000000000..9ffecadf61e Binary files /dev/null and b/sound/effects/muffspeech/muffspeech2.ogg differ diff --git a/sound/effects/muffspeech/muffspeech3.ogg b/sound/effects/muffspeech/muffspeech3.ogg new file mode 100644 index 00000000000..dff0e567dac Binary files /dev/null and b/sound/effects/muffspeech/muffspeech3.ogg differ diff --git a/sound/effects/muffspeech/muffspeech4.ogg b/sound/effects/muffspeech/muffspeech4.ogg new file mode 100644 index 00000000000..4e46c7a707a Binary files /dev/null and b/sound/effects/muffspeech/muffspeech4.ogg differ diff --git a/sound/effects/muffspeech/muffspeech5.ogg b/sound/effects/muffspeech/muffspeech5.ogg new file mode 100644 index 00000000000..ff1c9948c56 Binary files /dev/null and b/sound/effects/muffspeech/muffspeech5.ogg differ diff --git a/sound/effects/muffspeech/muffspeech6.ogg b/sound/effects/muffspeech/muffspeech6.ogg new file mode 100644 index 00000000000..13b70731ac3 Binary files /dev/null and b/sound/effects/muffspeech/muffspeech6.ogg differ diff --git a/sound/effects/muffspeech/muffspeech7.ogg b/sound/effects/muffspeech/muffspeech7.ogg new file mode 100644 index 00000000000..ea566e6ef58 Binary files /dev/null and b/sound/effects/muffspeech/muffspeech7.ogg differ diff --git a/sound/effects/muffspeech/muffspeech8.ogg b/sound/effects/muffspeech/muffspeech8.ogg new file mode 100644 index 00000000000..ad51432d2da Binary files /dev/null and b/sound/effects/muffspeech/muffspeech8.ogg differ diff --git a/sound/effects/muffspeech/muffspeech9.ogg b/sound/effects/muffspeech/muffspeech9.ogg new file mode 100644 index 00000000000..5d1be3b745f Binary files /dev/null and b/sound/effects/muffspeech/muffspeech9.ogg differ diff --git a/sound/machines/lever_start.ogg b/sound/machines/lever_start.ogg new file mode 100644 index 00000000000..4160f39026a Binary files /dev/null and b/sound/machines/lever_start.ogg differ diff --git a/sound/machines/lever_stop.ogg b/sound/machines/lever_stop.ogg new file mode 100644 index 00000000000..22f8875019d Binary files /dev/null and b/sound/machines/lever_stop.ogg differ diff --git a/sound/machines/license.txt b/sound/machines/license.txt index 6a54969a191..75fc8b74cfa 100644 --- a/sound/machines/license.txt +++ b/sound/machines/license.txt @@ -7,4 +7,12 @@ coffeemaker_brew.ogg originally made by Adriana Lopez (Acekat13X31), edited to r This is licensed under CC-BY 4.0, found at https://creativecommons.org/licenses/by/4.0/ shutter.ogg adapted from Joseph Sardin on BigSoundBank -https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html \ No newline at end of file +<<<<<<< HEAD +https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html +======= +https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html + +lever_start.ogg and lever_stop.ogg are made by A_Kuha on FreeSound +https://freesound.org/people/A_Kuha/sounds/676412 +This is licensed under CC-0, found at https://creativecommons.org/publicdomain/zero/1.0/ +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/sound/misc/compiler-failure.ogg b/sound/misc/compiler-failure.ogg old mode 100755 new mode 100644 diff --git a/sound/misc/compiler-stage1.ogg b/sound/misc/compiler-stage1.ogg old mode 100755 new mode 100644 diff --git a/sound/misc/compiler-stage2.ogg b/sound/misc/compiler-stage2.ogg old mode 100755 new mode 100644 diff --git a/sound/misc/server-ready.ogg b/sound/misc/server-ready.ogg old mode 100755 new mode 100644 diff --git a/strings/fishing_tips.txt b/strings/fishing_tips.txt index 66e52a2ba88..1c9e31f5085 100644 --- a/strings/fishing_tips.txt +++ b/strings/fishing_tips.txt @@ -39,4 +39,10 @@ The sludgefish from the toilets can be used as a steady supply of cheap fish and In a jiffy, you can scoop tadpoles from ponds with your bare hands, place them inside aquariums and quickly raise them into frogs. The legendary fishing hat isn't just cosmetic. Space carps (as well as young lobstrosities and frogs) do truly fear those who wear it. Have you ever heard a lobster or crab talk? Well, neither have I, but they say they're quite the fishy punsters. -You can get an experiscanner from science to perform fish scanning experiments, which can unlock more modules for the fishing portal, as well as fishing technology nodes (better equipment) for research. \ No newline at end of file +<<<<<<< HEAD +You can get an experiscanner from science to perform fish scanning experiments, which can unlock more modules for the fishing portal, as well as fishing technology nodes (better equipment) for research. +======= +You can get an experiscanner from science to perform fish scanning experiments, which can unlock more modules for the fishing portal, as well as fishing technology nodes (better equipment) for research. +If you have enough credits, you can buy a set of fishing lures from cargo. Each lure allows you to catch different species of fish and won't get consumed, however they need to be spun at intervals to work. +This may sound silly, but squids and their ink sacs can be used as weapons to temporarily blind people. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/strings/modular_maps/safehouse.toml b/strings/modular_maps/safehouse.toml index 90faf735140..3b149e35b16 100644 --- a/strings/modular_maps/safehouse.toml +++ b/strings/modular_maps/safehouse.toml @@ -32,9 +32,12 @@ modules = ["test_only_safehouse.dmm"] [rooms.wood] modules = ["wood.dmm"] +<<<<<<< HEAD # SKYRAT EDIT ADDITION START - custom domains / Disabled until solution found [rooms.ancient_milsim] modules = ["skyrat_ancientmilsim.dmm"] # SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/strings/names/mime.txt b/strings/names/mime.txt index dfdd02ea76c..d8f44e1073f 100644 --- a/strings/names/mime.txt +++ b/strings/names/mime.txt @@ -47,4 +47,8 @@ Victimless Mime Voiceless Dead Wall Runner Wes +<<<<<<< HEAD Zips-the-Lips +======= +Zips-the-Lips +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/strings/pirates.json b/strings/pirates.json index 191cc927de7..24573636117 100644 --- a/strings/pirates.json +++ b/strings/pirates.json @@ -139,6 +139,7 @@ "Spaceflower", "Status Quo", "Swords and Sandals", +<<<<<<< HEAD "Thesaurus Terror", "Archduke's Silver Ring", "Silver Steed" @@ -173,6 +174,9 @@ "Ivan Godwhisperer 64", "Two-By-Ten Apostols 13", "Novomoskovsk 65" +======= + "Thesaurus Terror" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ], "skeleton_names":[ "Flying Dutchman" diff --git a/strings/tips.txt b/strings/tips.txt index 782be800415..78e871166c4 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -200,7 +200,11 @@ As the Detective, your revolver can be loaded with .357 ammunition obtained from As the Head of Personnel, you are not higher ranking than other heads of staff, even though you are expected to take the Captain's place first should he go missing. If the situation seems too rough for you, consider allowing another head to become temporary Captain. As the Head of Security, don't let the power go to your head. You may have high access, great equipment, and a miniature army at your side, but being a terrible person without a good reason is grounds for banning. As the Head of Security, you are expected to coordinate your security force to handle any threat that comes to the station. Sometimes it means making use of the armory to handle a blob, sometimes it means being ruthless during a revolution or cult. +<<<<<<< HEAD As the Head of Security, you can call for executions or forced cyborgization, which require the Captain's or the Prisoner's consent, respectively. +======= +As the Head of Security, you can call for executions or forced cyborgization, but may require the Captain's approval. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime. As the Lawyer, you can try to convince the Captain and Head of Security to hold trials for prisoners in the courtroom. As the Malfunctioning AI, look into flooding the station with plasma fires to kill off large portions of the crew, letting you pick off the remaining few with space suits who escaped. @@ -225,7 +229,11 @@ Basketball requires skill. Spinning drains stamina, reduces accuracy, but gives Basketball requires teamwork. Passing the ball with LMB is instant and costs no stamina. Clicking on a windoor rather then bumping into it will keep it open, you can click it again to close it. Different weapons have different strengths. Some weapons, such as spears, floor tiles, and throwing stars, deal more damage when thrown compared to when attacked normally. +<<<<<<< HEAD Don't be afraid to ask for help, whether from your peers or from mentors. +======= +Don't be afraid to ask for help, whether from your peers or from admins. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Experiment with different setups of the Supermatter engine to maximize output, but don't risk the crew's safety to do so! Felinids get temporarily distracted by laser pointers. Use this to your advantage when being pursued by one. Firesuits and winter coats offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all. diff --git a/tgstation.dme b/tgstation.dme index d169b09831b..4963b148bcf 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -12,6 +12,7 @@ // END_PREFERENCES // BEGIN_INCLUDE +#include "__odlint.dm" #include "_maps\_basemap.dm" #include "code\__byond_version_compat.dm" #include "code\_compile_options.dm" @@ -393,100 +394,6 @@ #include "code\__DEFINES\traits\declarations.dm" #include "code\__DEFINES\traits\macros.dm" #include "code\__DEFINES\traits\sources.dm" -#include "code\__DEFINES\~skyrat_defines\_organ_defines.dm" -#include "code\__DEFINES\~skyrat_defines\access.dm" -#include "code\__DEFINES\~skyrat_defines\actionspeed_modification.dm" -#include "code\__DEFINES\~skyrat_defines\admin.dm" -#include "code\__DEFINES\~skyrat_defines\airlock.dm" -#include "code\__DEFINES\~skyrat_defines\ammo_defines.dm" -#include "code\__DEFINES\~skyrat_defines\antagonists.dm" -#include "code\__DEFINES\~skyrat_defines\apc_defines.dm" -#include "code\__DEFINES\~skyrat_defines\armaments.dm" -#include "code\__DEFINES\~skyrat_defines\armor_defines.dm" -#include "code\__DEFINES\~skyrat_defines\atom_hud.dm" -#include "code\__DEFINES\~skyrat_defines\augment.dm" -#include "code\__DEFINES\~skyrat_defines\automapper.dm" -#include "code\__DEFINES\~skyrat_defines\banning.dm" -#include "code\__DEFINES\~skyrat_defines\barsigns.dm" -#include "code\__DEFINES\~skyrat_defines\baton_upgrades.dm" -#include "code\__DEFINES\~skyrat_defines\cargo_import_companies.dm" -#include "code\__DEFINES\~skyrat_defines\cells.dm" -#include "code\__DEFINES\~skyrat_defines\chat.dm" -#include "code\__DEFINES\~skyrat_defines\clock_cult.dm" -#include "code\__DEFINES\~skyrat_defines\colony_fabricator_misc.dm" -#include "code\__DEFINES\~skyrat_defines\colors.dm" -#include "code\__DEFINES\~skyrat_defines\combat.dm" -#include "code\__DEFINES\~skyrat_defines\computers.dm" -#include "code\__DEFINES\~skyrat_defines\construction.dm" -#include "code\__DEFINES\~skyrat_defines\DNA.dm" -#include "code\__DEFINES\~skyrat_defines\economy.dm" -#include "code\__DEFINES\~skyrat_defines\events.dm" -#include "code\__DEFINES\~skyrat_defines\examine_defines.dm" -#include "code\__DEFINES\~skyrat_defines\faction.dm" -#include "code\__DEFINES\~skyrat_defines\factions.dm" -#include "code\__DEFINES\~skyrat_defines\flavor_defines.dm" -#include "code\__DEFINES\~skyrat_defines\food.dm" -#include "code\__DEFINES\~skyrat_defines\game_options.dm" -#include "code\__DEFINES\~skyrat_defines\hud.dm" -#include "code\__DEFINES\~skyrat_defines\id_cards.dm" -#include "code\__DEFINES\~skyrat_defines\integrated_electronics.dm" -#include "code\__DEFINES\~skyrat_defines\interactions.dm" -#include "code\__DEFINES\~skyrat_defines\inventory.dm" -#include "code\__DEFINES\~skyrat_defines\jobs.dm" -#include "code\__DEFINES\~skyrat_defines\keybindings.dm" -#include "code\__DEFINES\~skyrat_defines\language.dm" -#include "code\__DEFINES\~skyrat_defines\lazy_templates.dm" -#include "code\__DEFINES\~skyrat_defines\lewd_defines.dm" -#include "code\__DEFINES\~skyrat_defines\limbs.dm" -#include "code\__DEFINES\~skyrat_defines\liquids.dm" -#include "code\__DEFINES\~skyrat_defines\living.dm" -#include "code\__DEFINES\~skyrat_defines\loadout.dm" -#include "code\__DEFINES\~skyrat_defines\logging.dm" -#include "code\__DEFINES\~skyrat_defines\manufacturer_strings.dm" -#include "code\__DEFINES\~skyrat_defines\mapping.dm" -#include "code\__DEFINES\~skyrat_defines\maths.dm" -#include "code\__DEFINES\~skyrat_defines\medical_defines.dm" -#include "code\__DEFINES\~skyrat_defines\mobs.dm" -#include "code\__DEFINES\~skyrat_defines\nifsofts.dm" -#include "code\__DEFINES\~skyrat_defines\obj_flags.dm" -#include "code\__DEFINES\~skyrat_defines\opposing_force_defines.dm" -#include "code\__DEFINES\~skyrat_defines\pinpointers.dm" -#include "code\__DEFINES\~skyrat_defines\pollution.dm" -#include "code\__DEFINES\~skyrat_defines\preferences.dm" -#include "code\__DEFINES\~skyrat_defines\projectiles.dm" -#include "code\__DEFINES\~skyrat_defines\quirks.dm" -#include "code\__DEFINES\~skyrat_defines\reagents.dm" -#include "code\__DEFINES\~skyrat_defines\research.dm" -#include "code\__DEFINES\~skyrat_defines\research_categories.dm" -#include "code\__DEFINES\~skyrat_defines\reskin_defines.dm" -#include "code\__DEFINES\~skyrat_defines\robot_defines.dm" -#include "code\__DEFINES\~skyrat_defines\say.dm" -#include "code\__DEFINES\~skyrat_defines\security_alerts.dm" -#include "code\__DEFINES\~skyrat_defines\signals.dm" -#include "code\__DEFINES\~skyrat_defines\solfed.dm" -#include "code\__DEFINES\~skyrat_defines\sound.dm" -#include "code\__DEFINES\~skyrat_defines\span.dm" -#include "code\__DEFINES\~skyrat_defines\species_clothing_paths.dm" -#include "code\__DEFINES\~skyrat_defines\strippable.dm" -#include "code\__DEFINES\~skyrat_defines\synth_defines.dm" -#include "code\__DEFINES\~skyrat_defines\techweb_nodes.dm" -#include "code\__DEFINES\~skyrat_defines\teshari_clothing_paths.dm" -#include "code\__DEFINES\~skyrat_defines\text.dm" -#include "code\__DEFINES\~skyrat_defines\tools.dm" -#include "code\__DEFINES\~skyrat_defines\traits.dm" -#include "code\__DEFINES\~skyrat_defines\turfs.dm" -#include "code\__DEFINES\~skyrat_defines\vox_defines.dm" -#include "code\__DEFINES\~skyrat_defines\vv.dm" -#include "code\__DEFINES\~skyrat_defines\wounds.dm" -#include "code\__DEFINES\~skyrat_defines\_globalvars\bitfields.dm" -#include "code\__DEFINES\~skyrat_defines\_globalvars\food.dm" -#include "code\__DEFINES\~skyrat_defines\_globalvars\logging.dm" -#include "code\__DEFINES\~skyrat_defines\_globalvars\lists\mapping.dm" -#include "code\__DEFINES\~skyrat_defines\_HELPERS\atmos_mapping_helpers.dm" -#include "code\__DEFINES\~skyrat_defines\_HELPERS\lighting.dm" -#include "code\__DEFINES\~skyrat_defines\_HELPERS\offset_index.dm" -#include "code\__DEFINES\~skyrat_defines\signals\signals_human.dm" -#include "code\__DEFINES\~skyrat_defines\traits\declarations.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_dreamluau.dm" #include "code\__HELPERS\_lists.dm" @@ -601,10 +508,6 @@ #include "code\__HELPERS\paths\sssp.dm" #include "code\__HELPERS\sorts\helpers.dm" #include "code\__HELPERS\sorts\sort_instance.dm" -#include "code\__HELPERS\~skyrat_helpers\is_helpers.dm" -#include "code\__HELPERS\~skyrat_helpers\level_traits.dm" -#include "code\__HELPERS\~skyrat_helpers\logging.dm" -#include "code\__HELPERS\~skyrat_helpers\unsorted.dm" #include "code\_globalvars\_regexes.dm" #include "code\_globalvars\admin.dm" #include "code\_globalvars\arcade.dm" @@ -832,6 +735,7 @@ #include "code\controllers\subsystem\persistence\counter_tram_hits.dm" #include "code\controllers\subsystem\persistence\custom_outfits.dm" #include "code\controllers\subsystem\persistence\engravings.dm" +#include "code\controllers\subsystem\persistence\message_bottles.dm" #include "code\controllers\subsystem\persistence\photo_albums.dm" #include "code\controllers\subsystem\persistence\piggy_banks.dm" #include "code\controllers\subsystem\persistence\recipes.dm" @@ -940,6 +844,7 @@ #include "code\datums\actions\items\cult_dagger.dm" #include "code\datums\actions\items\hands_free.dm" #include "code\datums\actions\items\organ_action.dm" +#include "code\datums\actions\items\reload_rebar.dm" #include "code\datums\actions\items\set_internals.dm" #include "code\datums\actions\items\stealth_box.dm" #include "code\datums\actions\items\summon_stickmen.dm" @@ -986,6 +891,7 @@ #include "code\datums\ai\basic_mobs\basic_ai_behaviors\basic_attacking.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\befriend_target.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\climb_tree.dm" +#include "code\datums\ai\basic_mobs\basic_ai_behaviors\emote_with_target.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\find_parent.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\nearest_targeting.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\pick_up_item.dm" @@ -1326,6 +1232,7 @@ #include "code\datums\components\spin2win.dm" #include "code\datums\components\spinny.dm" #include "code\datums\components\spirit_holding.dm" +#include "code\datums\components\splat.dm" #include "code\datums\components\splattercasting.dm" #include "code\datums\components\squashable.dm" #include "code\datums\components\squeak.dm" @@ -1620,6 +1527,7 @@ #include "code\datums\elements\proficient_miner.dm" #include "code\datums\elements\projectile_drop.dm" #include "code\datums\elements\projectile_shield.dm" +#include "code\datums\elements\quality_food_ingredient.dm" #include "code\datums\elements\radiation_protected_clothing.dm" #include "code\datums\elements\radioactive.dm" #include "code\datums\elements\ranged_armour.dm" @@ -2054,7 +1962,6 @@ #include "code\datums\wounds\pierce.dm" #include "code\datums\wounds\slash.dm" #include "code\datums\wounds\scars\_scars.dm" -#include "code\datums\wounds\scars\_static_scar_data.dm" #include "code\game\atoms_movable.dm" #include "code\game\communications.dm" #include "code\game\data_huds.dm" @@ -2372,6 +2279,7 @@ #include "code\game\objects\effects\spawners\bombspawner.dm" #include "code\game\objects\effects\spawners\costume.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" +#include "code\game\objects\effects\spawners\message_in_a_bottle.dm" #include "code\game\objects\effects\spawners\structure.dm" #include "code\game\objects\effects\spawners\xeno_egg_delivery.dm" #include "code\game\objects\effects\spawners\random\ai_module.dm" @@ -2524,6 +2432,7 @@ #include "code\game\objects\items\devices\anomaly_releaser.dm" #include "code\game\objects\items\devices\battle_royale.dm" #include "code\game\objects\items\devices\beacon.dm" +#include "code\game\objects\items\devices\broadcast_camera.dm" #include "code\game\objects\items\devices\chameleonproj.dm" #include "code\game\objects\items\devices\destabilizing_crystal.dm" #include "code\game\objects\items\devices\desynchronizer.dm" @@ -2765,6 +2674,7 @@ #include "code\game\objects\structures\curtains.dm" #include "code\game\objects\structures\deployable_turret.dm" #include "code\game\objects\structures\destructible_structures.dm" +#include "code\game\objects\structures\detectiveboard.dm" #include "code\game\objects\structures\displaycase.dm" #include "code\game\objects\structures\divine.dm" #include "code\game\objects\structures\door_assembly.dm" @@ -3066,7 +2976,6 @@ #include "code\modules\admin\verbs\shuttlepanel.dm" #include "code\modules\admin\verbs\spawnobjasmob.dm" #include "code\modules\admin\verbs\special_verbs.dm" -#include "code\modules\admin\verbs\lua\_hooks.dm" #include "code\modules\admin\verbs\lua\_wrappers.dm" #include "code\modules\admin\verbs\lua\helpers.dm" #include "code\modules\admin\verbs\lua\lua_editor.dm" @@ -3698,8 +3607,10 @@ #include "code\modules\bitrunning\virtual_domain\domains\colossus.dm" #include "code\modules\bitrunning\virtual_domain\domains\fredingtonfastingbear.dm" #include "code\modules\bitrunning\virtual_domain\domains\gondola_asteroid.dm" +#include "code\modules\bitrunning\virtual_domain\domains\grassland_hunt.dm" #include "code\modules\bitrunning\virtual_domain\domains\hierophant.dm" #include "code\modules\bitrunning\virtual_domain\domains\island_brawl.dm" +#include "code\modules\bitrunning\virtual_domain\domains\meta_central.dm" #include "code\modules\bitrunning\virtual_domain\domains\pipedream.dm" #include "code\modules\bitrunning\virtual_domain\domains\pirates.dm" #include "code\modules\bitrunning\virtual_domain\domains\psyker_shuffle.dm" @@ -3894,7 +3805,6 @@ #include "code\modules\client\preferences\window_flashing.dm" #include "code\modules\client\preferences\middleware\_middleware.dm" #include "code\modules\client\preferences\middleware\antags.dm" -#include "code\modules\client\preferences\middleware\food.dm" #include "code\modules\client\preferences\middleware\jobs.dm" #include "code\modules\client\preferences\middleware\keybindings.dm" #include "code\modules\client\preferences\middleware\legacy_toggles.dm" @@ -4242,6 +4152,7 @@ #include "code\modules\fishing\admin.dm" #include "code\modules\fishing\bait.dm" #include "code\modules\fishing\fish_catalog.dm" +#include "code\modules\fishing\fish_movement.dm" #include "code\modules\fishing\fishing_equipment.dm" #include "code\modules\fishing\fishing_minigame.dm" #include "code\modules\fishing\fishing_portal_machine.dm" @@ -4254,7 +4165,16 @@ #include "code\modules\fishing\fish\chasm_detritus.dm" #include "code\modules\fishing\fish\fish_evolution.dm" #include "code\modules\fishing\fish\fish_traits.dm" -#include "code\modules\fishing\fish\fish_types.dm" +#include "code\modules\fishing\fish\types\air_space.dm" +#include "code\modules\fishing\fish\types\anadromous.dm" +#include "code\modules\fishing\fish\types\freshwater.dm" +#include "code\modules\fishing\fish\types\holographic.dm" +#include "code\modules\fishing\fish\types\mining.dm" +#include "code\modules\fishing\fish\types\ruins.dm" +#include "code\modules\fishing\fish\types\saltwater.dm" +#include "code\modules\fishing\fish\types\station.dm" +#include "code\modules\fishing\fish\types\syndicate.dm" +#include "code\modules\fishing\fish\types\tiziran.dm" #include "code\modules\fishing\sources\_fish_source.dm" #include "code\modules\fishing\sources\source_types.dm" #include "code\modules\flufftext\Dreaming.dm" @@ -4567,7 +4487,8 @@ #include "code\modules\library\random_books.dm" #include "code\modules\library\skill_learning\skill_station.dm" #include "code\modules\library\skill_learning\skillchip.dm" -#include "code\modules\library\skill_learning\generic_skillchips\matrix_flip.dm" +#include "code\modules\library\skill_learning\generic_skillchips\matrix_taunt.dm" +#include "code\modules\library\skill_learning\generic_skillchips\point.dm" #include "code\modules\library\skill_learning\generic_skillchips\rod_suplex.dm" #include "code\modules\library\skill_learning\job_skillchips\_job.dm" #include "code\modules\library\skill_learning\job_skillchips\chef.dm" @@ -4823,6 +4744,7 @@ #include "code\modules\mob\living\basic\basic_defense.dm" #include "code\modules\mob\living\basic\festivus_pole.dm" #include "code\modules\mob\living\basic\health_adjustment.dm" +#include "code\modules\mob\living\basic\revolutionary.dm" #include "code\modules\mob\living\basic\tree.dm" #include "code\modules\mob\living\basic\alien\_alien.dm" #include "code\modules\mob\living\basic\alien\alien_ai.dm" @@ -4873,7 +4795,6 @@ #include "code\modules\mob\living\basic\drone\inventory.dm" #include "code\modules\mob\living\basic\drone\verbs.dm" #include "code\modules\mob\living\basic\drone\visuals_icons.dm" -#include "code\modules\mob\living\basic\farm_animals\deer.dm" #include "code\modules\mob\living\basic\farm_animals\pig.dm" #include "code\modules\mob\living\basic\farm_animals\pony.dm" #include "code\modules\mob\living\basic\farm_animals\rabbit.dm" @@ -4887,6 +4808,8 @@ #include "code\modules\mob\living\basic\farm_animals\cow\cow_ai.dm" #include "code\modules\mob\living\basic\farm_animals\cow\cow_moonicorn.dm" #include "code\modules\mob\living\basic\farm_animals\cow\cow_wisdom.dm" +#include "code\modules\mob\living\basic\farm_animals\deer\deer.dm" +#include "code\modules\mob\living\basic\farm_animals\deer\deer_ai.dm" #include "code\modules\mob\living\basic\farm_animals\goat\_goat.dm" #include "code\modules\mob\living\basic\farm_animals\goat\goat_ai.dm" #include "code\modules\mob\living\basic\farm_animals\goat\goat_subtypes.dm" @@ -6109,7 +6032,7 @@ #include "code\modules\surgery\organs\autosurgeon.dm" #include "code\modules\surgery\organs\helpers.dm" #include "code\modules\surgery\organs\organ_movement.dm" -#include "code\modules\surgery\organs\external\_external_organ.dm" +#include "code\modules\surgery\organs\external\_visual_organs.dm" #include "code\modules\surgery\organs\external\restyling.dm" #include "code\modules\surgery\organs\external\spines.dm" #include "code\modules\surgery\organs\external\tails.dm" @@ -6291,6 +6214,7 @@ #include "code\modules\vending\clothesmate.dm" #include "code\modules\vending\coffee.dm" #include "code\modules\vending\cola.dm" +#include "code\modules\vending\cytopro.dm" #include "code\modules\vending\donk.dm" #include "code\modules\vending\drinnerware.dm" #include "code\modules\vending\engineering.dm" @@ -6470,6 +6394,12 @@ #include "interface\fonts\spess_font.dm" #include "interface\fonts\tiny_unicode.dm" #include "interface\fonts\vcr_osd_mono.dm" +#include "interface\fonts\fonts_datum.dm" +#include "interface\fonts\grand_9k.dm" +#include "interface\fonts\pixellari.dm" +#include "interface\fonts\spess_font.dm" +#include "interface\fonts\tiny_unicode.dm" +#include "interface\fonts\vcr_osd_mono.dm" #include "modular_skyrat\master_files\code\_globalvars\configuration.dm" #include "modular_skyrat\master_files\code\_globalvars\regexes.dm" #include "modular_skyrat\master_files\code\_globalvars\religion.dm" diff --git a/tgui/.eslintrc-harder.yml b/tgui/.eslintrc-harder.yml deleted file mode 100644 index d4661259679..00000000000 --- a/tgui/.eslintrc-harder.yml +++ /dev/null @@ -1,43 +0,0 @@ -rules: - ## Enforce a maximum cyclomatic complexity allowed in a program - # complexity: [warn, { max: 25 }] - ## Enforce consistent brace style for blocks - # brace-style: [warn, stroustrup, { allowSingleLine: false }] - ## Enforce the consistent use of either backticks, double, or single quotes - # quotes: [warn, single, { - # avoidEscape: true, - # allowTemplateLiterals: true, - # }] - # react/jsx-closing-bracket-location: [warn, { - # selfClosing: after-props, - # nonEmpty: after-props, - # }] - # react/display-name: warn - - ## Radar - ## ------------------------------------------------------ - # radar/cognitive-complexity: warn - radar/max-switch-cases: warn - radar/no-all-duplicated-branches: warn - radar/no-collapsible-if: warn - radar/no-collection-size-mischeck: warn - radar/no-duplicate-string: warn - radar/no-duplicated-branches: warn - radar/no-element-overwrite: warn - radar/no-extra-arguments: warn - radar/no-identical-conditions: warn - radar/no-identical-expressions: warn - radar/no-identical-functions: warn - radar/no-inverted-boolean-check: warn - radar/no-one-iteration-loop: warn - radar/no-redundant-boolean: warn - radar/no-redundant-jump: warn - radar/no-same-line-conditional: warn - radar/no-small-switch: warn - radar/no-unused-collection: warn - radar/no-use-of-empty-return-value: warn - radar/no-useless-catch: warn - radar/prefer-immediate-return: warn - radar/prefer-object-literal: warn - radar/prefer-single-boolean-return: warn - radar/prefer-while: warn diff --git a/tgui/bin/tgui b/tgui/bin/tgui deleted file mode 100755 index b827c912916..00000000000 --- a/tgui/bin/tgui +++ /dev/null @@ -1,207 +0,0 @@ -#!/usr/bin/env bash -## Copyright (c) 2020 Aleksej Komarov -## SPDX-License-Identifier: MIT - -set -e -shopt -s globstar -shopt -s expand_aliases - -## Initial set-up -## -------------------------------------------------------- - -## Returns an absolute path to file -alias tgui-realpath="readlink -f" - -## Fallbacks for GNU readlink -## Detecting GNU coreutils http://stackoverflow.com/a/8748344/319952 -if ! readlink --version >/dev/null 2>&1; then - if hash greadlink 2>/dev/null; then - alias tgui-realpath="greadlink -f" - else - alias tgui-realpath="perl -MCwd -le 'print Cwd::abs_path(shift)'" - fi -fi - -## Find a canonical path to project root -base_dir="$(dirname "$(tgui-realpath "${0}")")/.." -base_dir="$(tgui-realpath "${base_dir}")" - -## Make use of nvm if it exists -if [[ -e "${HOME}/.nvm/nvm.sh" ]]; then - source "${HOME}/.nvm/nvm.sh" -fi - -## Fall back to running Yarn from the repo -if ! hash yarn 2>/dev/null; then - yarn_releases=("${base_dir}"/.yarn/releases/yarn-*.cjs) - yarn_release="${yarn_releases[0]}" - yarn() { - node "${yarn_release}" "${@}" - } -fi - - -## Functions -## -------------------------------------------------------- - -## Installs node modules -task-install() { - cd "${base_dir}" - yarn install -} - -## Runs webpack -task-webpack() { - cd "${base_dir}" - yarn run webpack-cli "${@}" -} - -## Runs a development server -task-dev-server() { - cd "${base_dir}" - yarn node --experimental-modules packages/tgui-dev-server/index.js "${@}" -} - -## Run a linter through all packages -task-lint() { - cd "${base_dir}" - yarn run tsc - echo "tgui: type check passed" - yarn run eslint packages --ext .js,.cjs,.ts,.tsx "${@}" - echo "tgui: eslint check passed" -} - -task-test() { - cd "${base_dir}" - yarn run jest -} - -## Mr. Proper -task-clean() { - cd "${base_dir}" - ## Build artifacts - rm -rf public/.tmp - rm -f public/*.map - rm -f public/*.chunk.* - rm -f public/*.bundle.* - rm -f public/*.hot-update.* - ## Yarn artifacts - rm -rf .yarn/cache - rm -rf .yarn/unplugged - rm -rf .yarn/webpack - rm -f .yarn/build-state.yml - rm -f .yarn/install-state.gz - rm -f .yarn/install-target - rm -f .pnp.* - ## NPM artifacts - rm -rf **/node_modules - rm -f **/package-lock.json -} - -## Installs merge drivers and git hooks -task-install-git-hooks() { - cd "${base_dir}" - local git_root - local git_base_dir - git_root="$(git rev-parse --show-toplevel)" - git_base_dir="${base_dir/${git_root}/.}" - git config --replace-all merge.tgui-merge-bundle.driver \ - "${git_base_dir}/bin/tgui --merge=bundle %O %A %B %L" - echo "tgui: Merge drivers have been successfully installed!" -} - -## Bundle merge driver -task-merge-bundle() { - local file_ancestor="${1}" - local file_current="${2}" - local file_other="${3}" - local conflict_marker_size="${4}" - echo "tgui: Discarding a local tgui build" - ## Do nothing (file_current will be merged and is what we want to keep). - exit 0 -} - - -## Main -## -------------------------------------------------------- - -if [[ ${1} == "--merge"* ]]; then - if [[ ${1} == "--merge=bundle" ]]; then - shift 1 - task-merge-bundle "${@}" - fi - echo "Unknown merge strategy: ${1}" - exit 1 -fi - -if [[ ${1} == "--install-git-hooks" ]]; then - shift 1 - task-install-git-hooks - exit 0 -fi - -if [[ ${1} == "--clean" ]]; then - task-clean - exit 0 -fi - -if [[ ${1} == "--dev" ]]; then - shift - task-install - task-dev-server "${@}" - exit 0 -fi - -if [[ ${1} == '--lint' ]]; then - shift 1 - task-install - task-lint "${@}" - exit 0 -fi - -if [[ ${1} == '--lint-harder' ]]; then - shift 1 - task-install - task-lint -c .eslintrc-harder.yml "${@}" - exit 0 -fi - -if [[ ${1} == '--fix' ]]; then - shift 1 - task-install - task-lint --fix "${@}" - exit 0 -fi - -if [[ ${1} == '--test' ]]; then - shift 1 - task-install - task-test "${@}" - exit 0 -fi - -## Analyze the bundle -if [[ ${1} == '--analyze' ]]; then - task-install - task-webpack --mode=production --analyze - exit 0 -fi - -## Make a production webpack build -if [[ ${1} == '--build' ]]; then - task-install - task-webpack --mode=production - exit 0 -fi - -## Make a production webpack build + Run eslint -if [[ -z ${1} ]]; then - task-install - task-lint --fix - task-webpack --mode=production - exit 0 -fi - -## Run webpack with custom flags -task-install -task-webpack "${@}" diff --git a/tgui/bin/tgui-dev-server.bat b/tgui/bin/tgui-dev-server.bat deleted file mode 100644 index 21b2ea4e962..00000000000 --- a/tgui/bin/tgui-dev-server.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -rem Copyright (c) 2020 Aleksej Komarov -rem SPDX-License-Identifier: MIT -call powershell.exe -NoLogo -ExecutionPolicy Bypass -File "%~dp0\tgui_.ps1" --dev %* -rem Pause if launched in a separate shell unless initiated from powershell -echo %PSModulePath% | findstr %USERPROFILE% >NUL -if %errorlevel% equ 0 exit 0 -echo %cmdcmdline% | find /i "/c" -if %errorlevel% equ 0 pause diff --git a/tgui/docs/tutorial-and-examples.md b/tgui/docs/tutorial-and-examples.md index 2e02f0e491a..115b1559d42 100644 --- a/tgui/docs/tutorial-and-examples.md +++ b/tgui/docs/tutorial-and-examples.md @@ -75,7 +75,11 @@ Finally, the `ui_act` proc is called by the interface whenever the user used an input. The input's `action` and `params` are passed to the proc. ```dm +<<<<<<< HEAD /obj/machinery/my_machine/ui_act(action, params) +======= +/obj/machinery/my_machine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -311,7 +315,7 @@ upon code review): data["var"] = var return data -/obj/copypasta/ui_act(action, params) +/obj/copypasta/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) if(..()) return switch(action) diff --git a/tgui/package.json b/tgui/package.json index 332f0ec273d..96ad9a40368 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -50,7 +50,11 @@ "swc-loader": "^0.2.6", "typescript": "^5.4.3", "url-loader": "^4.1.1", +<<<<<<< HEAD "webpack": "^5.94.0", +======= + "webpack": "^5.91.0", +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "webpack-bundle-analyzer": "^4.10.1", "webpack-cli": "^5.1.4" } diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index aaa72cdcd8e..8a29c6f636c 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -4,10 +4,18 @@ "version": "5.0.1", "type": "module", "dependencies": { +<<<<<<< HEAD "axios": "^1.7.4", "glob": "^7.2.3", "source-map": "^0.7.4", "stacktrace-parser": "^0.1.10", "ws": "^8.17.1" +======= + "axios": "^1.6.8", + "glob": "^7.2.3", + "source-map": "^0.7.4", + "stacktrace-parser": "^0.1.10", + "ws": "^8.16.0" +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } } diff --git a/tgui/packages/tgui-panel/chat/constants.ts b/tgui/packages/tgui-panel/chat/constants.ts index c77a7fc70bb..706b8b68de1 100644 --- a/tgui/packages/tgui-panel/chat/constants.ts +++ b/tgui/packages/tgui-panel/chat/constants.ts @@ -37,7 +37,10 @@ export const MESSAGE_TYPE_EVENTCHAT = 'eventchat'; export const MESSAGE_TYPE_ADMINLOG = 'adminlog'; export const MESSAGE_TYPE_ATTACKLOG = 'attacklog'; export const MESSAGE_TYPE_DEBUG = 'debug'; +<<<<<<< HEAD export const MESSAGE_TYPE_MENTOR = 'mentor'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Metadata for each message type export const MESSAGE_TYPES = [ @@ -54,14 +57,22 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_LOCALCHAT, name: 'Local', description: 'In-character local messages (say, emote, etc)', +<<<<<<< HEAD selector: '.say, .emote, .looc', +======= + selector: '.say, .emote', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, { type: MESSAGE_TYPE_RADIO, name: 'Radio', description: 'All departments of radio messages', selector: +<<<<<<< HEAD '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling', +======= + '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .enteradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, { type: MESSAGE_TYPE_INFO, @@ -87,7 +98,11 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_OOC, name: 'OOC', description: 'The bluewall of global OOC messages', +<<<<<<< HEAD selector: '.ooc, .adminooc, .adminobserverooc, .oocplain, .looc, .rlooc', +======= + selector: '.ooc, .adminooc, .adminobserverooc, .oocplain', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, { type: MESSAGE_TYPE_ADMINPM, @@ -146,10 +161,13 @@ export const MESSAGE_TYPES = [ description: 'DEBUG: SSPlanets subsystem Recover().', admin: true, }, +<<<<<<< HEAD { type: MESSAGE_TYPE_MENTOR, // SKYRAT EDIT name: 'Mentor Log', description: 'Mentor PMs and other mentor things.', selector: '.mentor, .mentornotice', }, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ]; diff --git a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx index 3599f24e707..e2159dccf90 100644 --- a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx +++ b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx @@ -20,11 +20,18 @@ import { FONTS } from './constants'; import { selectSettings } from './selectors'; export function SettingsGeneral(props) { +<<<<<<< HEAD const { theme, fontFamily, fontSize, lineHeight, statLinked, statFontSize } = useSelector(selectSettings); const dispatch = useDispatch(); const [freeFont, setFreeFont] = useState(false); const [statFont, setStatFont] = useState(false); +======= + const { theme, fontFamily, fontSize, lineHeight } = + useSelector(selectSettings); + const dispatch = useDispatch(); + const [freeFont, setFreeFont] = useState(false); +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return (
@@ -119,6 +126,7 @@ export function SettingsGeneral(props) { stepPixelSize={20} minValue={8} maxValue={32} +<<<<<<< HEAD value={statFont ? statFontSize : fontSize} unit="px" format={(value) => toFixed(value)} @@ -159,6 +167,16 @@ export function SettingsGeneral(props) { /> )} +======= + value={fontSize} + unit="px" + format={(value) => toFixed(value)} + onChange={(e, value) => + dispatch(updateSettings({ fontSize: value })) + } + /> + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.tsx b/tgui/packages/tgui-panel/settings/SettingsPanel.tsx index abb0ef86f63..37848bec028 100644 --- a/tgui/packages/tgui-panel/settings/SettingsPanel.tsx +++ b/tgui/packages/tgui-panel/settings/SettingsPanel.tsx @@ -12,6 +12,10 @@ import { changeSettingsTab } from './actions'; import { SETTINGS_TABS } from './constants'; import { selectActiveTab } from './selectors'; import { SettingsGeneral } from './SettingsGeneral'; +<<<<<<< HEAD +======= +import { SettingsStatPanel } from './SettingsStatPanel'; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { TextHighlightSettings } from './TextHighlight'; export function SettingsPanel(props) { @@ -45,6 +49,10 @@ export function SettingsPanel(props) { {activeTab === 'general' && } {activeTab === 'chatPage' && } {activeTab === 'textHighlight' && } +<<<<<<< HEAD +======= + {activeTab === 'statPanel' && } +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); diff --git a/tgui/packages/tgui-panel/settings/SettingsStatPanel.tsx b/tgui/packages/tgui-panel/settings/SettingsStatPanel.tsx new file mode 100644 index 00000000000..68ca14131c0 --- /dev/null +++ b/tgui/packages/tgui-panel/settings/SettingsStatPanel.tsx @@ -0,0 +1,84 @@ +import { toFixed } from 'common/math'; +import { capitalize } from 'common/string'; +import { useDispatch, useSelector } from 'tgui/backend'; +import { + Button, + LabeledList, + NoticeBox, + Section, + Slider, + Stack, +} from 'tgui/components'; + +import { updateSettings } from './actions'; +import { selectSettings } from './selectors'; + +const TabsViews = ['default', 'classic', 'scrollable']; +const LinkedToChat = () => ( + Unlink Stat Panel from chat! +); + +export function SettingsStatPanel(props) { + const { statLinked, statFontSize, statTabsStyle } = + useSelector(selectSettings); + const dispatch = useDispatch(); + + return ( +
+ + + + + {TabsViews.map((view) => ( + + ))} + + + + {statLinked ? ( + + ) : ( + toFixed(value)} + onChange={(e, value) => + dispatch(updateSettings({ statFontSize: value })) + } + /> + )} + + + + + + + + + +
+ ); +} diff --git a/tgui/packages/tgui-panel/settings/constants.ts b/tgui/packages/tgui-panel/settings/constants.ts index 86ac41a23eb..fdafdb2614f 100644 --- a/tgui/packages/tgui-panel/settings/constants.ts +++ b/tgui/packages/tgui-panel/settings/constants.ts @@ -18,6 +18,13 @@ export const SETTINGS_TABS = [ id: 'chatPage', name: 'Chat Tabs', }, +<<<<<<< HEAD +======= + { + id: 'statPanel', + name: 'Stat Panel', + }, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ]; export const FONTS_DISABLED = 'Default'; diff --git a/tgui/packages/tgui-panel/settings/middleware.ts b/tgui/packages/tgui-panel/settings/middleware.ts index b867d36de0d..370fc3a9485 100644 --- a/tgui/packages/tgui-panel/settings/middleware.ts +++ b/tgui/packages/tgui-panel/settings/middleware.ts @@ -17,7 +17,12 @@ import { import { FONTS_DISABLED } from './constants'; import { selectSettings } from './selectors'; +<<<<<<< HEAD let setStatFontTimer: NodeJS.Timeout; +======= +let statFontTimer: NodeJS.Timeout; +let statTabsTimer: NodeJS.Timeout; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 let overrideRule: HTMLStyleElement; let overrideFontFamily: string | undefined; let overrideFontSize: string; @@ -53,11 +58,19 @@ function setGlobalFontSize( overrideFontSize = `${fontSize}px`; // Used solution from theme.ts +<<<<<<< HEAD clearInterval(setStatFontTimer); Byond.command( `.output statbrowser:set_font_size ${statLinked ? fontSize : statFontSize}px`, ); setStatFontTimer = setTimeout(() => { +======= + clearInterval(statFontTimer); + Byond.command( + `.output statbrowser:set_font_size ${statLinked ? fontSize : statFontSize}px`, + ); + statFontTimer = setTimeout(() => { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Byond.command( `.output statbrowser:set_font_size ${statLinked ? fontSize : statFontSize}px`, ); @@ -68,6 +81,17 @@ function setGlobalFontFamily(fontFamily: string) { overrideFontFamily = fontFamily === FONTS_DISABLED ? undefined : fontFamily; } +<<<<<<< HEAD +======= +function setStatTabsStyle(style: string) { + clearInterval(statTabsTimer); + Byond.command(`.output statbrowser:set_tabs_style ${style}`); + statTabsTimer = setTimeout(() => { + Byond.command(`.output statbrowser:set_tabs_style ${style}`); + }, 1500); +} + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export function settingsMiddleware(store) { let initialized = false; @@ -101,6 +125,12 @@ export function settingsMiddleware(store) { const settings = selectSettings(store.getState()); +<<<<<<< HEAD +======= + // Update stat panel settings + setStatTabsStyle(settings.statTabsStyle); + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Update global UI font size setGlobalFontSize( settings.fontSize, diff --git a/tgui/packages/tgui-panel/settings/reducer.ts b/tgui/packages/tgui-panel/settings/reducer.ts index 33df1a745f6..fa97fb9e295 100644 --- a/tgui/packages/tgui-panel/settings/reducer.ts +++ b/tgui/packages/tgui-panel/settings/reducer.ts @@ -40,6 +40,10 @@ const initialState = { }, statLinked: true, statFontSize: 12, +<<<<<<< HEAD +======= + statTabsStyle: 'default', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } as const; export function settingsReducer( diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index d926f3cc4be..84de6b59eba 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -302,8 +302,12 @@ em { .emote, .infoplain, .oocplain, +<<<<<<< HEAD .warningplain, .mentor { +======= +.warningplain { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } .deadsay { @@ -374,6 +378,13 @@ em { color: #d65d95; } +<<<<<<< HEAD +======= +.enteradio { + color: #00ff99; +} + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .redteamradio { color: #ff4444 !important; } @@ -825,6 +836,7 @@ em { color: #7adbf3; } } +<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN .velvet { @@ -923,6 +935,8 @@ em { } } // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .phobia { color: #dd0000; @@ -1230,6 +1244,7 @@ $border-width-px: $border-width * 1px; background-color: darken(map.get($alert-stripe-colors, $color-name), 5); } } +<<<<<<< HEAD /* SKYRAT EDIT ADDITION START - DARK MODE CLASSES */ .mentor { @@ -1328,3 +1343,5 @@ $border-width-px: $border-width * 1px; font-style: italic; } // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index 1f9388ff13f..ed2a6e3e98e 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -320,8 +320,12 @@ em { .emote, .infoplain, .oocplain, +<<<<<<< HEAD .warningplain, .mentor { +======= +.warningplain { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } .deadsay { @@ -391,6 +395,13 @@ em { color: #ff00ff; } +<<<<<<< HEAD +======= +.enteradio { + color: #00d680; +} + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .redteamradio { color: #ff0000 !important; } @@ -1165,6 +1176,7 @@ $border-width-px: $border-width * 1px; ); } } +<<<<<<< HEAD /* SKYRAT EDIT ADDITION START - LIGHT MODE CLASSES */ .mentor { @@ -1282,3 +1294,5 @@ $border-width-px: $border-width * 1px; } } // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui-say/ChannelIterator.test.ts b/tgui/packages/tgui-say/ChannelIterator.test.ts index f1e86f0449f..52a51c77f7f 100644 --- a/tgui/packages/tgui-say/ChannelIterator.test.ts +++ b/tgui/packages/tgui-say/ChannelIterator.test.ts @@ -11,10 +11,13 @@ describe('ChannelIterator', () => { expect(channelIterator.current()).toBe('Say'); expect(channelIterator.next()).toBe('Radio'); expect(channelIterator.next()).toBe('Me'); +<<<<<<< HEAD // SKYRAT EDIT ADDITION START expect(channelIterator.next()).toBe('Whis'); expect(channelIterator.next()).toBe('LOOC'); // SKYRAT EDIT ADDITION END +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 expect(channelIterator.next()).toBe('OOC'); expect(channelIterator.next()).toBe('Say'); // Admin is blacklisted so it should be skipped }); diff --git a/tgui/packages/tgui-say/ChannelIterator.ts b/tgui/packages/tgui-say/ChannelIterator.ts index ffe592d1e07..d0921a5ac38 100644 --- a/tgui/packages/tgui-say/ChannelIterator.ts +++ b/tgui/packages/tgui-say/ChannelIterator.ts @@ -1,3 +1,4 @@ +<<<<<<< HEAD export type Channel = | 'Say' | 'Radio' @@ -8,6 +9,9 @@ export type Channel = // SKYRAT EDIT ADDITION END | 'OOC' | 'Admin'; +======= +export type Channel = 'Say' | 'Radio' | 'Me' | 'OOC' | 'Admin'; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * ### ChannelIterator @@ -17,6 +21,7 @@ export type Channel = */ export class ChannelIterator { private index: number = 0; +<<<<<<< HEAD private readonly channels: Channel[] = [ 'Say', 'Radio', @@ -30,6 +35,11 @@ export class ChannelIterator { ]; private readonly blacklist: Channel[] = ['Admin']; private readonly quiet: Channel[] = ['OOC', 'LOOC', 'Admin']; // SKYRAT EDIT CHANGE (Add LOOC) +======= + private readonly channels: Channel[] = ['Say', 'Radio', 'Me', 'OOC', 'Admin']; + private readonly blacklist: Channel[] = ['Admin']; + private readonly quiet: Channel[] = ['OOC', 'Admin']; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 public next(): Channel { if (this.blacklist.includes(this.channels[this.index])) { diff --git a/tgui/packages/tgui-say/constants.ts b/tgui/packages/tgui-say/constants.ts index 0c3d7943c26..2692e8f7b33 100644 --- a/tgui/packages/tgui-say/constants.ts +++ b/tgui/packages/tgui-say/constants.ts @@ -25,6 +25,10 @@ export const RADIO_PREFIXES = { ':m ': 'Med', ':n ': 'Sci', ':o ': 'AI', +<<<<<<< HEAD +======= + ':p ': 'Ent', +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ':s ': 'Sec', ':t ': 'Synd', ':u ': 'Supp', diff --git a/tgui/packages/tgui-say/styles/colors.scss b/tgui/packages/tgui-say/styles/colors.scss index 2d5341da5d5..d0201289965 100644 --- a/tgui/packages/tgui-say/styles/colors.scss +++ b/tgui/packages/tgui-say/styles/colors.scss @@ -15,11 +15,18 @@ $_channel_map: ( 'Engi': #f37746, 'Hive': #855d85, 'io': #1e90ff, +<<<<<<< HEAD // SKYRAT EDIT ADDITION 'LOOC': #ffceb6, 'Me': #5975da, 'Med': #57b8f0, 'OOC': #cca300, +======= + 'Me': #5975da, + 'Med': #57b8f0, + 'OOC': #cca300, + 'Ent': #00ff99, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 'Radio': #1ecc43, 'Say': #a4bad6, 'Sci': #c68cfa, @@ -27,8 +34,11 @@ $_channel_map: ( 'Supp': #b88646, 'Svc': #6ca729, 'Synd': #8f4a4b, +<<<<<<< HEAD // SKYRAT EDIT ADDITION 'Whis': #7c7fd9, +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); $channel_keys: map.keys($_channel_map) !default; diff --git a/tgui/packages/tgui/components/AnimatedNumber.tsx b/tgui/packages/tgui/components/AnimatedNumber.tsx index 572fef2b5ee..699421f01a0 100644 --- a/tgui/packages/tgui/components/AnimatedNumber.tsx +++ b/tgui/packages/tgui/components/AnimatedNumber.tsx @@ -145,7 +145,13 @@ export class AnimatedNumber extends Component { this.stopTicking(); } +<<<<<<< HEAD if (Math.abs(value - this.currentValue) < EPSILON) { +======= + if ( + Math.abs(value - this.currentValue) < Math.max(EPSILON, EPSILON * value) + ) { +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // We're about as close as we're going to get--snap to the value and // stop ticking. this.currentValue = value; diff --git a/tgui/packages/tgui/components/Box.tsx b/tgui/packages/tgui/components/Box.tsx index e5808277914..bac2e54db1c 100644 --- a/tgui/packages/tgui/components/Box.tsx +++ b/tgui/packages/tgui/components/Box.tsx @@ -7,6 +7,10 @@ import { BooleanLike, classes } from 'common/react'; import { createElement, +<<<<<<< HEAD +======= + DragEventHandler, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 KeyboardEventHandler, MouseEventHandler, ReactNode, @@ -32,6 +36,10 @@ export type EventHandlers = Partial<{ onMouseOver: MouseEventHandler; onMouseUp: MouseEventHandler; onScroll: UIEventHandler; +<<<<<<< HEAD +======= + onDrop: DragEventHandler; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }>; export type BoxProps = Partial<{ diff --git a/tgui/packages/tgui/components/Button.tsx b/tgui/packages/tgui/components/Button.tsx index ec621de621e..887e399cec4 100644 --- a/tgui/packages/tgui/components/Button.tsx +++ b/tgui/packages/tgui/components/Button.tsx @@ -367,7 +367,11 @@ Button.Input = ButtonInput; type FileProps = { accept: string; multiple?: boolean; +<<<<<<< HEAD onSelectFiles: (files: string | string[]) => void; +======= + onSelectFiles: (files: FileList) => void; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } & Props; /** Accepts file input */ @@ -376,6 +380,7 @@ function ButtonFile(props: FileProps) { const inputRef = useRef(null); +<<<<<<< HEAD async function read(files: FileList) { const promises = Array.from(files).map((file) => { const reader = new FileReader(); @@ -394,6 +399,13 @@ function ButtonFile(props: FileProps) { if (files?.length) { const readFiles = await read(files); onSelectFiles(multiple ? readFiles : readFiles[0]); +======= + async function handleChange(event: ChangeEvent) { + const files = event.target.files; + if (files?.length) { + onSelectFiles(files); + event.target.value = ''; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } } diff --git a/tgui/packages/tgui/components/TextArea.tsx b/tgui/packages/tgui/components/TextArea.tsx index 0482229b8fd..95bc6b40f4f 100644 --- a/tgui/packages/tgui/components/TextArea.tsx +++ b/tgui/packages/tgui/components/TextArea.tsx @@ -9,6 +9,10 @@ import { isEscape, KEY } from 'common/keys'; import { classes } from 'common/react'; import { forwardRef, +<<<<<<< HEAD +======= + ReactElement, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RefObject, useEffect, useImperativeHandle, @@ -23,7 +27,11 @@ import { toInputValue } from './Input'; type Props = Partial<{ autoFocus: boolean; autoSelect: boolean; +<<<<<<< HEAD displayedValue: string; +======= + displayedValue: ReactElement; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dontUseTabForIndent: boolean; fluid: boolean; maxLength: number; diff --git a/tgui/packages/tgui/index.tsx b/tgui/packages/tgui/index.tsx index 7e1712fed15..61446be1131 100644 --- a/tgui/packages/tgui/index.tsx +++ b/tgui/packages/tgui/index.tsx @@ -25,7 +25,10 @@ import './styles/themes/retro.scss'; import './styles/themes/syndicate.scss'; import './styles/themes/wizard.scss'; import './styles/themes/admin.scss'; +<<<<<<< HEAD import './styles/themes/clockwork.scss'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { perf } from 'common/perf'; import { setupHotReloading } from 'tgui-dev-server/link/client.cjs'; diff --git a/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx b/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx index 0fdb6016a77..a33f1beccb7 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx @@ -9,7 +9,10 @@ import { import { useBackend } from '../backend'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective } from './common/Objectives'; type Data = { @@ -33,7 +36,10 @@ export const AntagInfoBlob = (props) => { +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
diff --git a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx index 48fecbbc2ab..a70548df7a1 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx @@ -11,7 +11,10 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -67,10 +70,16 @@ type Info = { can_change_objective: BooleanLike; }; +<<<<<<< HEAD // SKYRAT EDIT change height from 750 to 900 export const AntagInfoChangeling = (props) => { return ( +======= +export const AntagInfoChangeling = (props) => { + return ( + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 { +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx index b540b42552a..ff8a829f5aa 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx @@ -2,7 +2,10 @@ import { Section, Stack } from 'tgui-core/components'; import { useBackend } from '../backend'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout } from './common/Objectives'; type Info = { @@ -10,23 +13,33 @@ type Info = { objectives: Objective[]; }; +<<<<<<< HEAD // SKYRAT EDIT increase height from 250 to 500 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const AntagInfoGeneric = (props) => { const { data } = useBackend(); const { antag_name, objectives } = data; return ( +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
You are the {antag_name}! +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx index 389fecb5770..65f75b1818e 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx @@ -12,7 +12,10 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -91,25 +94,36 @@ const IntroductionSection = (props) => { +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 {!ascended && ( >>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } objectives={objectives} objectiveFollowup={ diff --git a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx index 88520752b1e..29ea3ccfd70 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx @@ -4,7 +4,10 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -61,7 +64,10 @@ const IntroductionSection = (props) => { /> } /> +<<<<<<< HEAD +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
@@ -80,17 +86,27 @@ const FlavorSection = (props) => { mr={-0.8} mt={-0.5} icon="hammer" +<<<<<<< HEAD /* SKYRAT EDIT: ORIGINAL TOOLTIP +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tooltip={` This is a gameplay suggestion for bored ais. You don't have to follow it, unless you want some ideas for how to spend the round.`} +<<<<<<< HEAD */ tooltip={` Please refer to the 'Antagonist Policy' section of the wiki if you have any questions.`} tooltipPosition="bottom-start" /> +======= + tooltipPosition="bottom-start" + > + Policy + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } > diff --git a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx index 97782ffab9c..8a5da41d207 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx @@ -1,7 +1,10 @@ import { BlockQuote, Stack } from 'tgui-core/components'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const goodstyle = { color: 'lightgreen', @@ -50,11 +53,14 @@ export const AntagInfoMorph = (props) => { {' '} +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx index a1243ff5fe6..c07f0c5cb56 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx @@ -1,7 +1,10 @@ import { BlockQuote, LabeledList, Section, Stack } from 'tgui-core/components'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const tipstyle = { color: 'white', @@ -71,11 +74,14 @@ export const AntagInfoNightmare = (props) => { +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx index fd2a2d921ce..82b0ed18198 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx @@ -3,7 +3,10 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -54,11 +57,14 @@ export const AntagInfoNinja = (props) => { what you can do! +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 >>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout } from './common/Objectives'; const allystyle = { @@ -56,6 +59,7 @@ const IntroductionSection = (props) => { +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION START */} @@ -64,6 +68,8 @@ const IntroductionSection = (props) => { {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); @@ -236,12 +242,19 @@ const CodewordsSection = (props) => { ); }; +<<<<<<< HEAD // SKYRAT EDIT: change height from 580 to 650 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const AntagInfoTraitor = (props) => { const { data } = useBackend(); const { theme, given_uplink } = data; return ( +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx index e316de69c13..02e0b0150ef 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx @@ -3,7 +3,10 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; +<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -54,13 +57,20 @@ type Info = { can_change_objective: BooleanLike; }; +<<<<<<< HEAD // SKYRAT EDIT CHANGE - height from 630 to 700 +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const AntagInfoWizard = (props) => { const { data, act } = useBackend(); const { ritual, objectives, can_change_objective } = data; return ( +<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 @@ -85,11 +95,14 @@ export const AntagInfoWizard = (props) => { +<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/Aquarium.tsx b/tgui/packages/tgui/interfaces/Aquarium.tsx index 6f29920fc0b..cb8bb4578c3 100644 --- a/tgui/packages/tgui/interfaces/Aquarium.tsx +++ b/tgui/packages/tgui/interfaces/Aquarium.tsx @@ -1,3 +1,4 @@ +<<<<<<< HEAD import { Button, Flex, @@ -5,6 +6,20 @@ import { LabeledControls, NumberInput, Section, +======= +import { capitalizeFirst } from 'common/string'; +import { + Box, + Button, + DmIcon, + Flex, + Icon, + Knob, + LabeledList, + NumberInput, + Section, + Stack, +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } from 'tgui-core/components'; import { BooleanLike } from 'tgui-core/react'; @@ -13,6 +28,7 @@ import { Window } from '../layouts'; type Data = { temperature: number; +<<<<<<< HEAD fluid_type: string; minTemperature: number; maxTemperature: number; @@ -20,10 +36,40 @@ type Data = { contents: { ref: string; name: string }[]; allow_breeding: BooleanLike; feeding_interval: number; +======= + fluidType: string; + minTemperature: number; + maxTemperature: number; + fluidTypes: string[]; + fishData: FishData[]; + propData: PropData[]; + allowBreeding: BooleanLike; + feedingInterval: number; + heartIcon: string; + heartIconState: string; + heartEmptyIconState: string; +}; + +type FishData = { + fish_ref: string; + fish_name: string; + fish_happiness: number; + fish_icon: string; + fish_icon_state: string; + fish_health: number; +}; + +type PropData = { + prop_ref: string; + prop_name: string; + prop_icon: string; + prop_icon_state: string; +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; export const Aquarium = (props) => { const { act, data } = useBackend(); +<<<<<<< HEAD const { temperature, fluid_type, @@ -104,7 +150,312 @@ export const Aquarium = (props) => { /> ))} +======= + const { fishData } = data; + + return ( + + + + + + + + + +
+ + {fishData.map((fish) => ( + + + + ))} + +
+ + + + + + + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); }; +<<<<<<< HEAD +======= + +const FishInfo = (props) => { + const { act, data } = useBackend(); + const { fish } = props; + + return ( + + + + + + + + + + {fish.fish_name.toUpperCase()} + + 0 ? -4 : 1}> + {(fish.fish_health > 0 && ( + + )) || } + + + + + + + + + { + act('rename_fish', { + fish_reference: fish.fish_ref, + chosen_name: value, + }); + }} + style={{ + padding: '3px', + borderRadius: '1em', + background: '#151326', + }} + > + + + + + Rename + + + + + + + ); +}; + +const PropTypes = (props) => { + const { act, data } = useBackend(); + const { propData } = data; + + return ( +
+ + {propData.map((prop) => ( + + + + ))} + +
+ ); +}; + +const CalculateHappiness = (props) => { + const { data } = useBackend(); + const { heartIcon } = data; + const { happiness } = props; + + return ( + + {Array.from({ length: 5 }, (_, index) => ( + = index ? 'full_heart' : 'empty_heart'} + height="48px" + width="48px" + /> + ))} + + ); +}; + +const Settings = (props) => { + const { act, data } = useBackend(); + const { + temperature, + minTemperature, + maxTemperature, + fluidTypes, + fluidType, + allowBreeding, + feedingInterval, + } = data; + + return ( + + +
+ + act('temperature', { + temperature: value, + }) + } + /> +
+ + +
+ + {fluidTypes.map((f) => ( + + + + ))} + +
+ + +
+ + + +
+ + + ); +}; +function dissectName(input: string): string { + return input.split(' ')[0].slice(0, 18); +} +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/Cargo/index.tsx b/tgui/packages/tgui/interfaces/Cargo/index.tsx index b3c169ec94c..5920d5dfb2f 100644 --- a/tgui/packages/tgui/interfaces/Cargo/index.tsx +++ b/tgui/packages/tgui/interfaces/Cargo/index.tsx @@ -11,9 +11,12 @@ import { CargoData } from './types'; enum TAB { Catalog = 'catalog', Requests = 'requests', +<<<<<<< HEAD /* SKYRAT EDIT BELOW - ADDS company imports */ Imports = 'company_import_window', /* SKYRAT EDIT END */ +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Cart = 'cart', Help = 'help', } @@ -29,9 +32,13 @@ export function Cargo(props) { } export function CargoContent(props) { +<<<<<<< HEAD /* SKYRAT EDIT BELOW - ADDS act */ const { act, data } = useBackend(); /* SKYRAT EDIT END */ +======= + const { data } = useBackend(); +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const { cart = [], requests = [], requestonly } = data; @@ -56,6 +63,7 @@ export function CargoContent(props) { > Catalog +<<<<<<< HEAD {/* SKYRAT EDIT START - Company imports */} {/* SKYRAT EDIT END */} +======= +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 0 && 'yellow'} diff --git a/tgui/packages/tgui/interfaces/Changelog.jsx b/tgui/packages/tgui/interfaces/Changelog.jsx index 07eef1cf3dc..3638b0626b8 100644 --- a/tgui/packages/tgui/interfaces/Changelog.jsx +++ b/tgui/packages/tgui/interfaces/Changelog.jsx @@ -185,6 +185,7 @@ export class Changelog extends Component { const header = (
+<<<<<<< HEAD

Skyrat Space Station 13

Thanks to: @@ -198,13 +199,33 @@ export class Changelog extends Component { here {', recent GitHub contributors can be found '} +======= +

Traditional Games Space Station 13

+

+ Thanks to: + Baystation 12, /vg/station, NTstation, CDK Station devs, + FacepunchStation, GoonStation devs, the original Space Station 13 + developers, Invisty for the title image and the countless others who + have contributed to the game, issue tracker or wiki over the years. +

+

+ {'Current organization members can be found '} + here + {', recent GitHub contributors can be found '} + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 here .

+<<<<<<< HEAD {'You can also join our forums '} here. +======= + {'You can also join our discord '} + here. +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3

{dateDropdown}
diff --git a/tgui/packages/tgui/interfaces/CheckboxInput.tsx b/tgui/packages/tgui/interfaces/CheckboxInput.tsx index 6ff49847df4..3058de08efa 100644 --- a/tgui/packages/tgui/interfaces/CheckboxInput.tsx +++ b/tgui/packages/tgui/interfaces/CheckboxInput.tsx @@ -51,6 +51,12 @@ export const CheckboxInput = (props) => { setSelections(newSelections); }; +<<<<<<< HEAD +======= + const selectionIndexes = selections.map( + (selected: string) => items.indexOf(selected) + 1, + ); +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ( @@ -103,7 +109,11 @@ export const CheckboxInput = (props) => {
+<<<<<<< HEAD +======= + +>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.tsx b/tgui/packages/tgui/interfaces/ChemDispenser.tsx index b92b7015442..18a35ccad2e 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.tsx +++ b/tgui/packages/tgui/interfaces/ChemDispenser.tsx @@ -164,11 +164,14 @@ export const ChemDispenser = (props) => { {recipes.length === 0 && No recipes.} +<<<<<<< HEAD + } + > + + + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.tsx b/tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.tsx new file mode 100644 index 00000000000..c078ff22506 --- /dev/null +++ b/tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.tsx @@ -0,0 +1,47 @@ +import hljs from 'highlight.js/lib/core'; +import { Dispatch, SetStateAction } from 'react'; + +import { Box, Button, Modal, Section } from '../../components'; +import { sanitizeText } from '../../sanitize'; +import { LuaEditorModal } from './types'; + +type ChunkViewModalProps = { + setModal: Dispatch>; + viewedChunk: string; + setViewedChunk: Dispatch>; +}; + +export const ChunkViewModal = (props: ChunkViewModalProps) => { + const { setModal, viewedChunk, setViewedChunk } = props; + return ( + +
{ + setModal(undefined); + setViewedChunk(undefined); + }} + > + Close + + } + > + +
+ + ); +}; diff --git a/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.tsx b/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.tsx new file mode 100644 index 00000000000..be87295e2bf --- /dev/null +++ b/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.tsx @@ -0,0 +1,288 @@ +import { BooleanLike } from 'common/react'; +import React, { Dispatch, SetStateAction } from 'react'; + +import { useBackend } from '../../backend'; +import { + Box, + Button, + Collapsible, + LabeledList, + Section, + Tooltip, +} from '../../components'; +import { BoxProps } from '../../components/Box'; +import { logger } from '../../logging'; +import { CallInfo, LuaEditorModal, Variant, VariantList } from './types'; +import { ListElement, ListPath } from './types'; + +const mapListVariantsInner = (value: any, variant: Variant) => { + if (Array.isArray(variant)) { + const [variant_inner, param] = variant; + switch (variant_inner) { + case 'list': + return mapListVariants(value, param); + case 'cycle': + return ( + + Circular Reference + + ); + case 'ref': + return ( + + {`${value} ${param}`} + + ); + } + } else { + switch (variant) { + case 'error': + return ( + + + Conversion Error + + + ); + case 'function': + return ( + + {value} + + ); + case 'thread': + return ( + + Thread: {value} + + ); + case 'userdata': + return ( + + Userdata: {value} + + ); + case 'error_as_value': + return ( + + {value} + + ); + default: + return value; + } + } +}; + +const mapListVariants = (list: any[], variants: VariantList) => { + logger.log(list, variants); + return list.map((element, i) => { + const { key, value } = element; + const { key: key_variant = null, value: value_variant = null } = + variants[i] || {}; + if (typeof key === 'number') { + return { + key: key, + value: mapListVariantsInner(value, key_variant), + }; + } else { + return { + key: mapListVariantsInner(key, key_variant), + value: mapListVariantsInner(value, value_variant), + }; + } + }); +}; + +type ListMapperProps = BoxProps & { + list: ListElement[]; +} & Partial<{ + variants: VariantList; + editable: BooleanLike; + name: string; + vvAct: (path: ListPath) => void; + skipNulls: BooleanLike; + collapsible: BooleanLike; + callType: 'callFunction' | 'resumeTask'; + path: ListPath; + setToCall: Dispatch>; + setModal: Dispatch>; + }>; + +export const ListMapper = (props: ListMapperProps) => { + const { act } = useBackend(); + + const { variants, list: _, ...safeProps } = props; + + const { + path, + editable, + name, + vvAct, + skipNulls, + collapsible, + setToCall, + setModal, + ...rest + } = safeProps; + + let { list } = props; + + if (variants) { + list = mapListVariants(list, variants); + } + + const ThingNode = ( + thing: any, + path: ListPath, + canCall: BooleanLike, + overrideProps?: ListMapperProps, + ) => { + if (Array.isArray(thing)) { + return ( + + ); + } else if (React.isValidElement(thing)) { + switch (thing.key) { + case 'ref': + return ( + + + ); + } + return ( + <> + {i > 0 && } + + {output} + + {repeats && ( + + x{repeats + 1} + + )} + + ); + }); +}; diff --git a/tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.tsx b/tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.tsx new file mode 100644 index 00000000000..4ff3deeb09b --- /dev/null +++ b/tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.tsx @@ -0,0 +1,68 @@ +import { useState } from 'react'; + +import { useBackend } from '../../backend'; +import { Button, Input, Modal, Section, Stack } from '../../components'; +import { LuaEditorData, LuaEditorModal } from './types'; + +type StateSelectModalProps = { + setModal: (modal: LuaEditorModal) => void; +}; + +export const StateSelectModal = (props: StateSelectModalProps) => { + const { act, data } = useBackend(); + const { setModal } = props; + const [input, setInput] = useState(); + const { states } = data; + return ( + +
{ + setModal(undefined); + }} + > + Cancel + + } + > + {states.map((value, i) => ( + + ))} + + + { + setInput(value); + }} + /> + + +
+ + ); +}; diff --git a/tgui/packages/tgui/interfaces/LuaEditor/TaskManager.tsx b/tgui/packages/tgui/interfaces/LuaEditor/TaskManager.tsx new file mode 100644 index 00000000000..d534f2011f2 --- /dev/null +++ b/tgui/packages/tgui/interfaces/LuaEditor/TaskManager.tsx @@ -0,0 +1,70 @@ +import { Dispatch, SetStateAction } from 'react'; + +import { useBackend } from '../../backend'; +import { Button, LabeledList, Section, Stack } from '../../components'; +import { CallInfo, LuaEditorData, LuaEditorModal } from './types'; + +type TaskManagerProps = { + setToCall: Dispatch>; + setModal: Dispatch>; +}; + +export const TaskManager = (props: TaskManagerProps) => { + const { act, data } = useBackend(); + const { setToCall, setModal } = props; + const { tasks } = data; + const { sleeps = [], yields = [] } = tasks; + return ( + + +
+ + {sleeps.map(({ index, name }, i) => ( + + + + ))} + +
+ + +
+ + {yields.map(({ index, name }, i) => ( + + + + + ))} + +
+ + + ); +}; diff --git a/tgui/packages/tgui/interfaces/LuaEditor/index.tsx b/tgui/packages/tgui/interfaces/LuaEditor/index.tsx new file mode 100644 index 00000000000..5d8b8873a80 --- /dev/null +++ b/tgui/packages/tgui/interfaces/LuaEditor/index.tsx @@ -0,0 +1,421 @@ +import 'blob-polyfill'; + +import hljs from 'highlight.js/lib/core'; +import lua from 'highlight.js/lib/languages/lua'; +import { + ReactNode, + useCallback, + useEffect, + useLayoutEffect, + useRef, + useState, +} from 'react'; + +import { useBackend } from '../../backend'; +import { + Box, + Button, + Flex, + MenuBar, + ProgressBar, + Section, + Stack, + Tabs, + TextArea, +} from '../../components'; +import { Window } from '../../layouts'; +import { CallModal } from './CallModal'; +import { ChunkViewModal } from './ChunkViewModal'; +import { ListMapper } from './ListMapper'; +import { Log } from './Log'; +import { StateSelectModal } from './StateSelectModal'; +import { TaskManager } from './TaskManager'; +import { CallInfo, LuaEditorData, LuaEditorModal } from './types'; +hljs.registerLanguage('lua', lua); + +export const LuaEditor = () => { + const { act, data } = useBackend(); + const { + noStateYet, + globals, + tasks, + showGlobalTable, + page, + pageCount, + lastError, + supressRuntimes, + } = data; + + const modalState = useState( + noStateYet ? 'states' : undefined, + ); + const [modal, setModal] = modalState; + const [activeTab, setActiveTab] = useState<'tasks' | 'log' | 'globals'>( + 'log', + ); + const [showJumpToBottomButton, setShowJumpToBottomButton] = + useState(); + const [scriptInput, setScriptInput] = useState(''); + const [openMenuBar, setOpenMenuBar] = useState(null); + const [openOnHover, setOpenOnHover] = useState(false); + + const [viewedChunk, setViewedChunk] = useState(); + + const [toCall, setToCall] = useState(); + + const sectionRef = useRef(null); + const fileInputRef = useRef(null); + + useLayoutEffect(() => { + const { data } = useBackend(); + const { forceModal, forceViewChunk, forceInput } = data; + if (forceModal || forceViewChunk) { + setModal(forceModal); + setViewedChunk(forceViewChunk); + } + if (forceInput) { + setScriptInput(forceInput); + } + }, []); + + const handleSectionScroll = useCallback(() => { + const scrollableCurrent = sectionRef.current; + if (scrollableCurrent) { + const { scrollHeight, scrollTop, clientHeight } = scrollableCurrent; + if (!showJumpToBottomButton && scrollHeight > scrollTop + clientHeight) { + setShowJumpToBottomButton(true); + } else if ( + showJumpToBottomButton && + scrollTop + clientHeight >= scrollHeight + ) { + setShowJumpToBottomButton(false); + } + } + }, [showJumpToBottomButton, sectionRef]); + + useEffect(handleSectionScroll); + + useLayoutEffect(() => { + handleSectionScroll(); + window.addEventListener('resize', handleSectionScroll); + return () => window.removeEventListener('resize', handleSectionScroll); + }, [handleSectionScroll]); + + let tabContent: ReactNode; + switch (activeTab) { + case 'globals': { + if (!globals) { + tabContent = ( +

+ Could not retrieve the global table. Was it corrupted or shadowed? +

+ ); + } else { + const { values, variants } = globals; + tabContent = ( + act('vvGlobal', { indices: path })} + callType="callFunction" + setToCall={setToCall} + setModal={setModal} + /> + ); + } + break; + } + case 'tasks': { + if (!tasks) { + tabContent =

Could not retrieve task info.

; + } else { + tabContent = ; + } + break; + } + case 'log': { + tabContent = ; + break; + } + } + + const menuBarProps = { + openMenuBar: openMenuBar, + setOpenMenuBar: setOpenMenuBar, + openOnHover: openOnHover, + setOpenOnHover: setOpenOnHover, + }; + + const closeMenuAndThen = (func?: () => void) => { + return () => { + setOpenMenuBar(null); + setOpenOnHover(false); + func?.(); + }; + }; + + return ( + + + { + if (event.target.files?.length) { + setScriptInput(await event.target.files[0].text()); + event.target.value = ''; + } + }} + /> + + + { + setModal('states'); + })} + /> + fileInputRef.current?.click())} + /> + act('runCodeFile'))} + /> + + + {noStateYet ? ( + +

Please select or create a lua state to get started.

+ + ) : ( + + + + +
+ + +